From 74fdf75ff3adff1b99cd8de3871f5d3f8112b927 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 18 Dec 2025 19:24:16 +0100 Subject: [PATCH 001/246] taradino: add update script Signed-off-by: Marcin Serwin --- pkgs/by-name/ta/taradino/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ta/taradino/package.nix b/pkgs/by-name/ta/taradino/package.nix index 7b3aef8e2819..3816f22749f1 100644 --- a/pkgs/by-name/ta/taradino/package.nix +++ b/pkgs/by-name/ta/taradino/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, fetchzip, + nix-update-script, ninja, cmake, SDL2, @@ -58,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: { unzip -d "$out/${datadir}" ${sharewareData}/ROTTSW13.SHR ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "SDL2 port of Rise of the Triad"; mainProgram = "taradino" + lib.optionalString buildShareware "-shareware"; From 28c10ac22bbe48f6347adc7f8ec35275b56ca72a Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 18 Dec 2025 19:26:54 +0100 Subject: [PATCH 002/246] taradino: 20251031 -> 20251222 Signed-off-by: Marcin Serwin --- pkgs/by-name/ta/taradino/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/taradino/package.nix b/pkgs/by-name/ta/taradino/package.nix index 3816f22749f1..a6c749717895 100644 --- a/pkgs/by-name/ta/taradino/package.nix +++ b/pkgs/by-name/ta/taradino/package.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taradino" + lib.optionalString buildShareware "-shareware"; - version = "20251031"; + version = "20251222"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = "taradino"; tag = finalAttrs.version; - hash = "sha256-Z3yAT4CxZIQ63F6G7ZUAdz2VK+8dcv6WHyQJ8Pmz4Zk="; + hash = "sha256-nB6FNET9OCgK7xqku5gaXfuaIIhYPj8Lo03gINCZSFI="; }; strictDeps = true; From c1663a924aaf3a1c785a6e278171b2db75e4a10e Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sat, 31 Jan 2026 17:33:31 +0100 Subject: [PATCH 003/246] noriskclient-launcher-unwrapped: 0.6.17 -> 0.6.19 --- .../no/noriskclient-launcher-unwrapped/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix index 8ca4aa456618..6e75a16038e0 100644 --- a/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix +++ b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "noriskclient-launcher-unwrapped"; - version = "0.6.17"; + version = "0.6.19"; src = fetchFromGitHub { owner = "NoRiskClient"; repo = "noriskclient-launcher"; tag = "v${finalAttrs.version}"; - hash = "sha256-SihBoCh8QRU0UkgMyjm9fmiq+9GuUAhpvHC6UOjSkxA="; + hash = "sha256-SHLYCpflIjslCuCPROyuVsIdNIkHWl2BVflgxAz3RYg="; }; yarnOfflineCache = fetchYarnDeps { @@ -45,11 +45,16 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" ''; - cargoHash = "sha256-mldZg4Y12o6Laf2RJSeLzKCcqBpFesUbHhmxRjT9MDI="; + cargoHash = "sha256-j41whr62i0FlTe/fWoPsMS9kX5aPgCjM9TckeZpnwgw="; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; + checkFlags = [ + # test fails to find correct function + "--skip=utils::string_utils::safe_truncate" + ]; + nativeBuildInputs = [ cargo-tauri.hook desktop-file-utils From e69cbb5feaf2e46bc1efa3850be1dffe2d92a7cc Mon Sep 17 00:00:00 2001 From: kashw2 Date: Mon, 9 Feb 2026 23:09:13 +1000 Subject: [PATCH 004/246] d2: fix missing playwright dependencies --- pkgs/by-name/d2/d2/package.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix index a082aea94973..62b5ac36525b 100644 --- a/pkgs/by-name/d2/d2/package.nix +++ b/pkgs/by-name/d2/d2/package.nix @@ -6,6 +6,9 @@ git, testers, d2, + libgbm, + makeWrapper, + playwright-driver, }: buildGoModule (finalAttrs: { @@ -29,13 +32,25 @@ buildGoModule (finalAttrs: { "-X oss.terrastruct.com/d2/lib/version.Version=v${finalAttrs.version}" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; + + buildInputs = [ + libgbm + playwright-driver.browsers + ]; + + nativeCheckInputs = [ git ]; postInstall = '' installManPage ci/release/template/man/d2.1 - ''; - nativeCheckInputs = [ git ]; + # Wrap the d2 executable to set LD_LIBRARY_PATH for Playwright + wrapProgram $out/bin/d2 \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} + ''; preCheck = '' # See https://github.com/terrastruct/d2/blob/master/docs/CONTRIBUTING.md#running-tests. From 6e418aa53dc4ad06edcca858277947661fe8b6d0 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Feb 2026 21:27:32 +0100 Subject: [PATCH 005/246] aligator: 0.16.0 -> 0.18.0 Diff: https://github.com/Simple-Robotics/aligator/compare/v0.16.0...v0.18.0 Changelog: https://github.com/Simple-Robotics/aligator/blob/v0.18.0/CHANGELOG.md --- pkgs/by-name/al/aligator/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index 0fdd49972d1c..811942810136 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -14,6 +14,7 @@ # buildInputs fmt, + mimalloc, # propagatedBuildInputs suitesparse, @@ -27,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aligator"; - version = "0.16.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "aligator"; tag = "v${finalAttrs.version}"; - hash = "sha256-OyCJa2iTkCxVLooSKdVgBd0y7rHObo4vFcc56t48TSY="; + hash = "sha256-qdXZo7IvgcUFEJARwxpSaHJVRlZ6HdgRADPOiY3oCpk="; }; outputs = [ @@ -52,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fmt + mimalloc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp From ecea3af07db963c2863d075ff46bd98da2b6567c Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Feb 2026 21:55:03 +0100 Subject: [PATCH 006/246] aligator: remove suitesparse ref. https://github.com/Simple-Robotics/aligator/pull/345 --- pkgs/by-name/al/aligator/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index 811942810136..7905a26f7384 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -17,7 +17,6 @@ mimalloc, # propagatedBuildInputs - suitesparse, crocoddyl, pinocchio, @@ -62,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ crocoddyl pinocchio - suitesparse ]; checkInputs = [ From cd957465c4b3d524a7f4c493e1d023c675e72acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Mon, 9 Feb 2026 21:59:45 +0100 Subject: [PATCH 007/246] himalaya: 1.1.0 -> 1.2.0 --- pkgs/by-name/hi/himalaya/package.nix | 115 ++++++++++++++++----------- 1 file changed, 69 insertions(+), 46 deletions(-) diff --git a/pkgs/by-name/hi/himalaya/package.nix b/pkgs/by-name/hi/himalaya/package.nix index 015ad9d24bf2..2af45fcb3993 100644 --- a/pkgs/by-name/hi/himalaya/package.nix +++ b/pkgs/by-name/hi/himalaya/package.nix @@ -1,40 +1,55 @@ { - lib, - rustPlatform, - fetchFromGitHub, - stdenv, - buildPackages, - pkg-config, apple-sdk, - installShellFiles, - installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, - installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, - notmuch, - gpgme, - buildNoDefaultFeatures ? false, buildFeatures ? [ ], - withNoDefaultFeatures ? buildNoDefaultFeatures, - withFeatures ? buildFeatures, -}@args: + buildNoDefaultFeatures ? false, + buildPackages, + dbus, + fetchFromGitHub, + gpgme, + installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + installShellFiles, + lib, + notmuch, + pkg-config, + rustPlatform, + stdenv, +}: let - version = "1.1.0"; - hash = "sha256-gdrhzyhxRHZkALB3SG/aWOdA5iMYkel3Cjk5VBy3E4M="; - cargoHash = "sha256-ulqMjpW3UI509vs3jVHXAEQUhxU/f/hN8XiIo8UBRq8="; + version = "1.2.0"; + hash = "sha256-BBzfDeNu7s010ARCYuydCyR7QWrbeI3/B4CxA6d4olw="; + cargoHash = "sha256-IkvRiU9NuD6n7aCF8J235u2LjjmLftnF1n874IWVcN0="; - noDefaultFeatures = - lib.warnIf (args ? buildNoDefaultFeatures) - "buildNoDefaultFeatures is deprecated in favour of withNoDefaultFeatures and will be removed in the next release" - withNoDefaultFeatures; + inherit (stdenv.hostPlatform) + isLinux + isWindows + isAarch64 + ; + + emulator = stdenv.hostPlatform.emulator buildPackages; + exe = stdenv.hostPlatform.extensions.executable; + + hasPgpGpgFeature = builtins.elem "pgp-gpg" buildFeatures; + hasKeyringFeature = builtins.elem "keyring" buildFeatures; + hasNotmuchFeature = builtins.elem "notmuch" buildFeatures; + + dbus' = dbus.overrideAttrs (old: { + env = (old.env or { }) // { + NIX_CFLAGS_COMPILE = + (old.env.NIX_CFLAGS_COMPILE or "") + # required for D-Bus on Linux AArch64 + + lib.optionalString (isLinux && isAarch64) " -mno-outline-atomics"; + }; + }); - features = - lib.warnIf (args ? buildFeatures) - "buildFeatures is deprecated in favour of withFeatures and will be removed in the next release" - withFeatures; in - rustPlatform.buildRustPackage { - inherit version cargoHash; + inherit + version + cargoHash + buildNoDefaultFeatures + ; pname = "himalaya"; @@ -45,36 +60,44 @@ rustPlatform.buildRustPackage { rev = "v${version}"; }; - buildNoDefaultFeatures = noDefaultFeatures; - buildFeatures = features; + env = { + # OpenSSL should not be provided by vendors, not even on Windows + OPENSSL_NO_VENDOR = "1"; + }; - nativeBuildInputs = [ - pkg-config - ] - ++ lib.optional (installManPages || installShellCompletions) installShellFiles; + nativeBuildInputs = + [ ] + ++ lib.optional (hasPgpGpgFeature || hasKeyringFeature || hasNotmuchFeature) pkg-config + ++ lib.optional (installManPages || installShellCompletions) installShellFiles; buildInputs = [ ] - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk - ++ lib.optional (builtins.elem "notmuch" withFeatures) notmuch - ++ lib.optional (builtins.elem "pgp-gpg" withFeatures) gpgme; + ++ lib.optional hasPgpGpgFeature gpgme + ++ lib.optional (hasKeyringFeature && !isWindows) dbus' + ++ lib.optional hasNotmuchFeature notmuch; + + buildFeatures = + buildFeatures + # D-Bus is provided by vendors on Windows + ++ lib.optional (hasKeyringFeature && isWindows) "vendored"; # most of the tests are lib side doCheck = false; postInstall = - let - emulator = stdenv.hostPlatform.emulator buildPackages; - in + lib.optionalString (lib.hasInfix "wine" emulator) '' + export WINEPREFIX="''${WINEPREFIX:-$(mktemp -d)}" + mkdir -p $WINEPREFIX '' + + '' mkdir -p $out/share/{applications,completions,man} cp assets/himalaya.desktop "$out"/share/applications/ - ${emulator} "$out"/bin/himalaya man "$out"/share/man - ${emulator} "$out"/bin/himalaya completion bash > "$out"/share/completions/himalaya.bash - ${emulator} "$out"/bin/himalaya completion elvish > "$out"/share/completions/himalaya.elvish - ${emulator} "$out"/bin/himalaya completion fish > "$out"/share/completions/himalaya.fish - ${emulator} "$out"/bin/himalaya completion powershell > "$out"/share/completions/himalaya.powershell - ${emulator} "$out"/bin/himalaya completion zsh > "$out"/share/completions/himalaya.zsh + ${emulator} "$out"/bin/himalaya${exe} man "$out"/share/man + ${emulator} "$out"/bin/himalaya${exe} completion bash > "$out"/share/completions/himalaya.bash + ${emulator} "$out"/bin/himalaya${exe} completion elvish > "$out"/share/completions/himalaya.elvish + ${emulator} "$out"/bin/himalaya${exe} completion fish > "$out"/share/completions/himalaya.fish + ${emulator} "$out"/bin/himalaya${exe} completion powershell > "$out"/share/completions/himalaya.powershell + ${emulator} "$out"/bin/himalaya${exe} completion zsh > "$out"/share/completions/himalaya.zsh '' + lib.optionalString installManPages '' installManPage "$out"/share/man/* From 2ac0b1ff7b89e30a312a80936cef76fdd218f023 Mon Sep 17 00:00:00 2001 From: Golbinex <2061409-Golbinex@users.noreply.gitlab.com> Date: Thu, 19 Feb 2026 08:35:05 +0000 Subject: [PATCH 008/246] devede: 4.21.0 -> 4.21.3.1 --- pkgs/by-name/de/devede/package.nix | 14 ++++++++------ pkgs/by-name/de/devede/update.sh | 7 +++++++ 2 files changed, 15 insertions(+), 6 deletions(-) create mode 100755 pkgs/by-name/de/devede/update.sh diff --git a/pkgs/by-name/de/devede/package.nix b/pkgs/by-name/de/devede/package.nix index 999c413e1d46..12b452c4e33a 100644 --- a/pkgs/by-name/de/devede/package.nix +++ b/pkgs/by-name/de/devede/package.nix @@ -8,7 +8,6 @@ cdrkit, dvdauthor, gtk3, - gettext, wrapGAppsHook3, gdk-pixbuf, gobject-introspection, @@ -22,23 +21,25 @@ let pygobject3 urllib3 setuptools + setuptools-gettext + importlib-metadata ; in buildPythonApplication (finalAttrs: { pname = "devede"; - version = "4.21.0"; - format = "setuptools"; + version = "4.21.3.1"; + format = "pyproject"; namePrefix = ""; src = fetchFromGitLab { owner = "rastersoft"; repo = "devedeng"; rev = finalAttrs.version; - hash = "sha256-sLJkIKw0ciX6spugbdO0eZ1dIkoHfuu5e/f2XwA70a0="; + hash = "sha256-81H063PpBF/+JDsRgBLwfAevb11yNkDtH4KdtOAL/Fg="; }; nativeBuildInputs = [ - gettext + setuptools-gettext wrapGAppsHook3 gobject-introspection ]; @@ -59,6 +60,7 @@ buildPythonApplication (finalAttrs: { cdrkit urllib3 setuptools + importlib-metadata ]; postPatch = '' @@ -68,7 +70,7 @@ buildPythonApplication (finalAttrs: { --replace "/usr/local/share" "$out/share" ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = ./update.sh; meta = { description = "DVD Creator for Linux"; diff --git a/pkgs/by-name/de/devede/update.sh b/pkgs/by-name/de/devede/update.sh new file mode 100755 index 000000000000..d0b48b41fafb --- /dev/null +++ b/pkgs/by-name/de/devede/update.sh @@ -0,0 +1,7 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl nix-update xmlstarlet + +set -euo pipefail + +latest_tag=$(curl -s "https://gitlab.com/rastersoft/devedeng/-/tags?format=atom" | xmlstarlet sel -t -v "(//*[local-name()='entry']/*[local-name()='title'])[1]") +nix-update devede --version $latest_tag From 39e07a554e3e0fbdef3470cde10788fd1c3aa17c Mon Sep 17 00:00:00 2001 From: Gabriela Moreira Date: Fri, 27 Feb 2026 15:28:13 -0300 Subject: [PATCH 009/246] quint: 0.30.0 -> 0.31.0 --- pkgs/by-name/qu/quint/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/qu/quint/package.nix b/pkgs/by-name/qu/quint/package.nix index 598c48f9ec7c..6ecf1714b05d 100644 --- a/pkgs/by-name/qu/quint/package.nix +++ b/pkgs/by-name/qu/quint/package.nix @@ -14,12 +14,13 @@ gnugrep, nix-update, common-updater-scripts, + libiconv, }: let - version = "0.30.0"; + version = "0.31.0"; apalacheVersion = "0.51.1"; - evaluatorVersion = "0.4.0"; + evaluatorVersion = "0.5.0"; metaCommon = { description = "Formal specification language with TLA+ semantics"; @@ -33,7 +34,7 @@ let owner = "informalsystems"; repo = "quint"; tag = "v${version}"; - hash = "sha256-4gZUGw5T4iVbg7IWkXXIpSib/dPVXhK6Srt1kNewPGA="; + hash = "sha256-d1iCkpUh5z+Gr2AbjpyfwiR4XZ6vYk96UHCeippC6iw="; }; # Build the Quint CLI from source @@ -43,7 +44,7 @@ let sourceRoot = "${src.name}/quint"; - npmDepsHash = "sha256-qmekskqCePyI/k1AaBRVfc6q6SQNCA4K61E6GxfsAUI="; + npmDepsHash = "sha256-UZbATCXqyAulEX+oxLEsT5VPm7y4NiCgnAwyugbzc9g="; npmBuildScript = "compile"; @@ -75,7 +76,11 @@ let # Skip tests during build, as many rust tests rely on the Quint CLI doCheck = false; - cargoHash = "sha256-beWqUDaWWCbGL+V1LNtf35wZrIqWCCbFLYo5HCZF7FI="; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + cargoHash = "sha256-aGVs/J+lAPHOsi01xShfZHBeUjd6eONpraNuMkaVfO8="; meta = metaCommon // { description = "Evaluator for the Quint formal specification language"; @@ -132,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: { }) (writeShellScript "update" '' src=$(nix build --print-out-paths --no-link .#quint.src) - QUINT_EVALUATOR_VERSION=$(${lib.getExe gnugrep} -m1 "const QUINT_EVALUATOR_VERSION" $src/quint/src/quintRustWrapper.ts | sed -E "s/.*= 'v?([^']+)'.*/\1/") + QUINT_EVALUATOR_VERSION=$(${lib.getExe gnugrep} -m1 "const QUINT_EVALUATOR_VERSION" $src/quint/src/rust/binaryManager.ts | sed -E "s/.*= 'v?([^']+)'.*/\1/") ${lib.getExe nix-update} quint.quint-evaluator --version $QUINT_EVALUATOR_VERSION DEFAULT_APALACHE_VERSION_TAG=$(${lib.getExe gnugrep} "DEFAULT_APALACHE_VERSION_TAG" $src/quint/src/apalache.ts | sed -E "s/.*= '([^']+)'.*/\1/") ${lib.getExe' common-updater-scripts "update-source-version"} quint $DEFAULT_APALACHE_VERSION_TAG --version-key=apalacheVersion --source-key=apalacheDist --ignore-same-version --ignore-same-hash From 043a5a82d669184afc354b5a861de5984eaaf8c2 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 5 Mar 2026 16:49:39 +0100 Subject: [PATCH 010/246] directx-shader-compiler: 1.8.2505.1 -> 1.9.2602 --- pkgs/by-name/di/directx-shader-compiler/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/directx-shader-compiler/package.nix b/pkgs/by-name/di/directx-shader-compiler/package.nix index cf52a8ade9fa..5eff273801cb 100644 --- a/pkgs/by-name/di/directx-shader-compiler/package.nix +++ b/pkgs/by-name/di/directx-shader-compiler/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "directx-shader-compiler"; - version = "1.8.2505.1"; + version = "1.9.2602"; # Put headers in dev, there are lot of them which aren't necessary for # using the compiler binary. @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "microsoft"; repo = "DirectXShaderCompiler"; rev = "v${finalAttrs.version}"; - hash = "sha256-d8qJ9crS5CStbsGOe/OSHtUEV4vr3sLCQp+6KsEq/A4="; + hash = "sha256-S3ar1LTV/9fYU2B5y8x0ESB20lMnAx8XQw9n3G4z0nk="; fetchSubmodules = true; }; @@ -34,7 +34,12 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; - cmakeFlags = [ "-C../cmake/caches/PredefinedParams.cmake" ]; + cmakeFlags = [ + "-C../cmake/caches/PredefinedParams.cmake" + # Tries to download prebuilt dxcs + (lib.cmakeBool "LLVM_INCLUDE_TESTS" false) + (lib.cmakeBool "HLSL_INCLUDE_TESTS" false) + ]; # The default install target installs heaps of LLVM stuff. # From d02c27e5cb47df667fbf47a67e0267d210ecc9ac Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Tue, 10 Mar 2026 19:40:37 +0000 Subject: [PATCH 011/246] pat: 0.19.1 -> 0.19.2 --- pkgs/by-name/pa/pat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/pat/package.nix b/pkgs/by-name/pa/pat/package.nix index 6c2b11a29032..9ae09c2ea019 100644 --- a/pkgs/by-name/pa/pat/package.nix +++ b/pkgs/by-name/pa/pat/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "pat"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "la5nta"; repo = "pat"; rev = "v${finalAttrs.version}"; - hash = "sha256-hpbSjxePAXuqQAlNTAfknh+noZgdILtNG57OWVJO02M="; + hash = "sha256-a/tWKo65szgu8zTsy6xVh7DXojxA9X8jUIVHi900iWE="; }; - vendorHash = "sha256-8XPnY99arnDDeGlzPv4sw6pwxXkSsxSzNFtz+IeKeq4="; + vendorHash = "sha256-mneQyYZ7B0euRciFQru6S7F0IKXTxIceiF5JL18W2C8="; ldflags = [ "-s" From f555ddafda99194b033ba4a2b93c3415fef6c53c Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Thu, 12 Mar 2026 20:47:54 -0400 Subject: [PATCH 012/246] backintime: fix missing crontab --- pkgs/by-name/ba/backintime-common/package.nix | 10 ++++++++++ pkgs/by-name/ba/backintime-qt/package.nix | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/by-name/ba/backintime-common/package.nix b/pkgs/by-name/ba/backintime-common/package.nix index bff2db1cff81..dea598c1c77a 100644 --- a/pkgs/by-name/ba/backintime-common/package.nix +++ b/pkgs/by-name/ba/backintime-common/package.nix @@ -10,6 +10,9 @@ openssh, sshfs-fuse, encfs, + which, + ps, + gnugrep, }: let @@ -57,8 +60,15 @@ stdenv.mkDerivation rec { substituteInPlace configure \ --replace-fail "/.." "" \ --replace-fail "share/backintime" "${python'.sitePackages}/backintime" + substituteInPlace "backintime" "backintime-askpass" \ --replace-fail "share" "${python'.sitePackages}" + + substituteInPlace "schedule.py" \ + --replace-fail "'crontab'" "'${cron}/bin/crontab'" \ + --replace-fail "'which'" "'${lib.getExe which}'" \ + --replace-fail "'ps'" "'${lib.getExe ps}'" \ + --replace-fail "'grep'" "'${lib.getExe gnugrep}'" \ ''; dontAddPrefix = true; diff --git a/pkgs/by-name/ba/backintime-qt/package.nix b/pkgs/by-name/ba/backintime-qt/package.nix index f6fda4423672..e0298467f411 100644 --- a/pkgs/by-name/ba/backintime-qt/package.nix +++ b/pkgs/by-name/ba/backintime-qt/package.nix @@ -16,6 +16,7 @@ let ps: with ps; [ pyqt6 backintime-common + keyring packaging ] ); From 6dcb0fc58aa6f62b385a95eb79411043a06829f1 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Thu, 12 Mar 2026 20:52:33 -0400 Subject: [PATCH 013/246] backintime: 1.5.6 -> 1.6.1 --- pkgs/by-name/ba/backintime-common/package.nix | 25 +++++++++++++------ pkgs/by-name/ba/backintime-qt/package.nix | 7 +++++- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ba/backintime-common/package.nix b/pkgs/by-name/ba/backintime-common/package.nix index dea598c1c77a..28139d679359 100644 --- a/pkgs/by-name/ba/backintime-common/package.nix +++ b/pkgs/by-name/ba/backintime-common/package.nix @@ -13,6 +13,8 @@ which, ps, gnugrep, + man, + asciidoctor, }: let @@ -33,22 +35,27 @@ let encfs ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "backintime-common"; - version = "1.5.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; - rev = "v${version}"; - sha256 = "sha256-y9uo/6R9OXK9hqUD0pCLJXF2B80lr2gXf6v8+Ca6u5M="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/33Lx62S/9RcqrfJumE6/o3KnAObBa3DcmuGkcOXIQE="; }; nativeBuildInputs = [ makeWrapper gettext ]; - buildInputs = [ python' ]; + + buildInputs = [ + python' + man + asciidoctor + ]; installFlags = [ "DEST=$(out)" ]; @@ -56,9 +63,10 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs --build updateversion.sh + patchShebangs --build doc/manpages/build_manpages.sh cd common substituteInPlace configure \ - --replace-fail "/.." "" \ + --replace-fail "/../etc" "/etc" \ --replace-fail "share/backintime" "${python'.sitePackages}/backintime" substituteInPlace "backintime" "backintime-askpass" \ @@ -69,6 +77,9 @@ stdenv.mkDerivation rec { --replace-fail "'which'" "'${lib.getExe which}'" \ --replace-fail "'ps'" "'${lib.getExe ps}'" \ --replace-fail "'grep'" "'${lib.getExe gnugrep}'" \ + + substituteInPlace "bitlicense.py" \ + --replace-fail "/usr/share/doc" "$out/share/doc" \ ''; dontAddPrefix = true; @@ -91,4 +102,4 @@ stdenv.mkDerivation rec { done by taking snapshots of a specified set of directories. ''; }; -} +}) diff --git a/pkgs/by-name/ba/backintime-qt/package.nix b/pkgs/by-name/ba/backintime-qt/package.nix index e0298467f411..0e1f484e0ace 100644 --- a/pkgs/by-name/ba/backintime-qt/package.nix +++ b/pkgs/by-name/ba/backintime-qt/package.nix @@ -9,6 +9,8 @@ coreutils, util-linux, qt6, + man, + asciidoctor, }: let @@ -37,6 +39,8 @@ stdenv.mkDerivation { backintime-common qt6.qtbase qt6.qtwayland + man + asciidoctor ]; nativeBuildInputs = backintime-common.nativeBuildInputs or [ ] ++ [ @@ -47,9 +51,10 @@ stdenv.mkDerivation { preConfigure = '' patchShebangs --build updateversion.sh + patchShebangs --build doc/manpages/build_manpages.sh cd qt substituteInPlace qttools_path.py \ - --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' + --replace-fail "Path(__file__).parent.parent" '"${backintime-common}/${python'.sitePackages}/backintime"' ''; preFixup = '' From 9e0c40162ea87227c2122475be9ff74897b748ae Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Thu, 12 Mar 2026 21:30:25 -0400 Subject: [PATCH 014/246] backintime: add gocryptfs, meld/kompare support --- pkgs/by-name/ba/backintime-common/package.nix | 2 ++ pkgs/by-name/ba/backintime-qt/package.nix | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/backintime-common/package.nix b/pkgs/by-name/ba/backintime-common/package.nix index 28139d679359..32fd94112ac7 100644 --- a/pkgs/by-name/ba/backintime-common/package.nix +++ b/pkgs/by-name/ba/backintime-common/package.nix @@ -10,6 +10,7 @@ openssh, sshfs-fuse, encfs, + gocryptfs, which, ps, gnugrep, @@ -33,6 +34,7 @@ let rsync sshfs-fuse encfs + gocryptfs ]; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/ba/backintime-qt/package.nix b/pkgs/by-name/ba/backintime-qt/package.nix index 0e1f484e0ace..2a5f29aae507 100644 --- a/pkgs/by-name/ba/backintime-qt/package.nix +++ b/pkgs/by-name/ba/backintime-qt/package.nix @@ -4,6 +4,10 @@ backintime-common, python3, polkit, + meld ? null, + meldSupport ? true, + kdePackages ? null, + kompareSupport ? false, which, su, coreutils, @@ -22,6 +26,13 @@ let packaging ] ); + diffProgram = + if meldSupport then + "${lib.getBin meld}/bin" + else if kompareSupport then + "${lib.getBin kdePackages.kompare}/bin" + else + ""; in stdenv.mkDerivation { inherit (backintime-common) @@ -59,7 +70,8 @@ stdenv.mkDerivation { preFixup = '' wrapQtApp "$out/bin/backintime-qt" \ - --prefix PATH : "${lib.getBin backintime-common}/bin:$PATH" + --prefix PATH : "${lib.getBin backintime-common}/bin:$PATH" \ + --prefix PATH : "${diffProgram}:$PATH" substituteInPlace "$out/share/polkit-1/actions/net.launchpad.backintime.policy" \ --replace-fail "/usr/bin/backintime-qt" "$out/bin/backintime-qt" From c7672db19cd153f2268d292939248fdae46460e2 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Thu, 12 Mar 2026 22:01:38 -0400 Subject: [PATCH 015/246] backintime: add keyringBackends --- pkgs/by-name/ba/backintime-qt/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/backintime-qt/package.nix b/pkgs/by-name/ba/backintime-qt/package.nix index 2a5f29aae507..52a2ff52452a 100644 --- a/pkgs/by-name/ba/backintime-qt/package.nix +++ b/pkgs/by-name/ba/backintime-qt/package.nix @@ -15,16 +15,26 @@ qt6, man, asciidoctor, + keyringBackends ? + ps: with ps; [ + secretstorage + keyrings-alt + keyring-pass + ], }: let python' = python3.withPackages ( - ps: with ps; [ + ps: + with ps; + [ pyqt6 backintime-common + dbus-python keyring packaging ] + ++ (keyringBackends ps) ); diffProgram = if meldSupport then From 4cbb8f5e1c37d2ee5a20753a100902c43fd29c0f Mon Sep 17 00:00:00 2001 From: Dee Anzorge Date: Sat, 14 Mar 2026 17:45:41 +0100 Subject: [PATCH 016/246] cataclysm-dda: 0.H -> 0.H-2025-07-10-0402 Instead of cherry picking backports ourselves in Nixpkgs, use upstream's branch `0.H-branch`, which is 0.H + relevant backports. Upstream does not seem to do point releases out of the backports branch, but commits in it are tagged by their CI, so that is the tag we are using. Also ignore a warning with darwin/clang, which fails builds of stable and git. Upstream fix is not in their backport branch, and cataclysm-dda-git is currently behind it. See https://github.com/CleverRaven/Cataclysm-DDA/pull/83499. --- pkgs/games/cataclysm-dda/common.nix | 3 +++ pkgs/games/cataclysm-dda/stable.nix | 13 ++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index a970fc7a0fd2..b6aab0214858 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -66,6 +66,9 @@ stdenv.mkDerivation { patchShebangs lang/compile_mo.sh ''; + # remove once on O.I/ahead of upstream commit 15b3cb0 + env.NIX_CFLAGS_COMPILE = optionalString stdenv.hostPlatform.isDarwin "-Wno-missing-noreturn"; + makeFlags = [ "PREFIX=$(out)" "LANGUAGES=all" diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index cd3a9d556ecc..8d73e2d162c6 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -17,22 +17,17 @@ let }; self = common.overrideAttrs (common: rec { - version = "0.H"; + version = "0.H-2025-07-10-0402"; src = fetchFromGitHub { owner = "CleverRaven"; repo = "Cataclysm-DDA"; - tag = "${version}-RELEASE"; - sha256 = "sha256-ZCD5qgqYSX7sS+Tc1oNYq9soYwNUUuWamY2uXfLjGoY="; + # Head of 0.H-branch + tag = "cdda-${version}"; + sha256 = "sha256-r4cl8cij68WmQRfg+DHQIeDBIwhgwSre6kAUYZaCPR8=n"; }; patches = [ - # fix compilation of the vendored flatbuffers under gcc14 - (fetchpatch { - name = "fix-flatbuffers-with-gcc14"; - url = "https://github.com/CleverRaven/Cataclysm-DDA/commit/1400b1018ff37196bd24ba4365bd50beb571ac14.patch"; - hash = "sha256-H0jct6lSQxu48eOZ4f8HICxo89qX49Ksw+Xwwtp7iFM="; - }) # Unconditionally look for translation files in $out/share/locale ./locale-path.patch ]; From ca4595bcfb8f7179cf4e96727af039018b8412b1 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Sun, 22 Mar 2026 01:09:20 +0800 Subject: [PATCH 017/246] ghostty: add missing GStreamer dependencies Ghostty 1.2.0 added the ability to play audio snippets when encountering a bell character (BEL) using GStreamer. Before this commit, however, GStreamer was never listed as a direct dependency, though it was working for the majority of users, as it was still included as a transitive dependency from GTK 4 itself, except for one user who managed to crash Ghostty by trying to play MP3 audio while not having the "good" GStreamer plugins installed *anywhere* within their system, since only base and bad plugins are installed by default with GTK 4, and by extension, Ghostty. See ghostty-org/ghostty#11720 for the initial report. --- pkgs/by-name/gh/ghostty/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index f6760feaf14b..087e4fa8b2c6 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -9,6 +9,7 @@ freetype, glib, glslang, + gst_all_1, gtk4-layer-shell, harfbuzz, libadwaita, @@ -75,6 +76,9 @@ stdenv.mkDerivation (finalAttrs: { libadwaita libx11 gtk4-layer-shell + gst_all_1.gstreamer # Used for playing audio, e.g. audible bells + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-base # OpenGL renderer glslang From c541aa54f2b3152c15dd6b75bcca0856ef37b66b Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sun, 22 Mar 2026 12:33:25 -0400 Subject: [PATCH 018/246] spaghettikart: 0.9.9.1-unstable-2025-12-23 -> 1.0.0 --- pkgs/by-name/sp/spaghettikart/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sp/spaghettikart/package.nix b/pkgs/by-name/sp/spaghettikart/package.nix index b65b5372f7f5..0d8068583ed5 100644 --- a/pkgs/by-name/sp/spaghettikart/package.nix +++ b/pkgs/by-name/sp/spaghettikart/package.nix @@ -124,13 +124,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "spaghettikart"; - version = "0.9.9.1-unstable-2025-12-23"; + version = "1.0.0"; src = fetchFromGitHub { owner = "HarbourMasters"; repo = "SpaghettiKart"; - rev = "b0582b5c32914a815fe6a2ffc41f3eb9c24a3a2b"; - hash = "sha256-TTsW49jo8yNxuL5GFStiQRWOBw/X8Pt2hMKmDZPpEVI="; + tag = finalAttrs.version; + hash = "sha256-XEsOtt2Xg/HyYw07YGXTIBOCtIDbh3hmaBEQpbFVFYc="; fetchSubmodules = true; deepClone = true; postFetch = '' @@ -279,7 +279,6 @@ stdenv.mkDerivation (finalAttrs: { icon = "spaghettikart"; exec = "Spaghettify"; comment = finalAttrs.meta.description; - genericName = "spaghettikart"; desktopName = "spaghettikart"; categories = [ "Game" ]; }) From 8bf1fef23e664fae5e4d535686640e00fd8c41c9 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Sun, 22 Mar 2026 14:39:12 -0700 Subject: [PATCH 019/246] brickstore: 2024.12.3 -> 2026.3.2 --- pkgs/by-name/br/brickstore/package.nix | 27 +++++++------------ pkgs/by-name/br/brickstore/qcoro-cmake.patch | 20 -------------- .../br/brickstore/qjsonvalue-include.patch | 12 --------- 3 files changed, 9 insertions(+), 50 deletions(-) delete mode 100644 pkgs/by-name/br/brickstore/qcoro-cmake.patch delete mode 100644 pkgs/by-name/br/brickstore/qjsonvalue-include.patch diff --git a/pkgs/by-name/br/brickstore/package.nix b/pkgs/by-name/br/brickstore/package.nix index f3d36b7f2b54..356f8e607eb4 100644 --- a/pkgs/by-name/br/brickstore/package.nix +++ b/pkgs/by-name/br/brickstore/package.nix @@ -2,7 +2,7 @@ lib, stdenv, qt6, - libsForQt5, + qt6Packages, fetchFromGitHub, gst_all_1, cmake, @@ -11,18 +11,15 @@ ninja, pkg-config, }: -let - inherit (libsForQt5) qcoro; -in stdenv.mkDerivation (finalAttrs: { pname = "brickstore"; - version = "2024.12.3"; + version = "2026.3.2"; src = fetchFromGitHub { owner = "rgriebl"; repo = "brickstore"; tag = "v${finalAttrs.version}"; - hash = "sha256-4sxPplZ1t8sSfwTCeeBtfU4U0gcE9FROt6dKvkfyO6Q="; + hash = "sha256-UIVzvzsterKkL8/JPx5S0wly6mLxflAqX0gMFX3rOes="; fetchSubmodules = true; }; @@ -31,7 +28,6 @@ stdenv.mkDerivation (finalAttrs: { libglvnd ninja pkg-config - qcoro qt6.qtdoc qt6.qtdeclarative qt6.qtimageformats @@ -42,20 +38,15 @@ stdenv.mkDerivation (finalAttrs: { qt6.qttools qt6.qtwayland qt6.wrapQtAppsHook + qt6Packages.qcoro onetbb ]; - patches = [ - ./qcoro-cmake.patch # Don't have CMake fetch qcoro from github, get it from nixpkgs - ./qjsonvalue-include.patch # Add a required '#include ' - ]; - - # Since we get qcoro from nixpkgs instead, change the CMake file to reflect the right directory - preConfigure = '' - substituteInPlace cmake/BuildQCoro.cmake \ - --replace-fail \ - 'add_subdirectory(''${qcoro_SOURCE_DIR} ''${qcoro_BINARY_DIR} EXCLUDE_FROM_ALL)' \ - 'add_subdirectory(${qcoro.src} ${qcoro}bin/qcoro)' + # Use nix-provided qcoro instead of fetching from GitHub + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'include(BuildQCoro)' \ + 'find_package(QCoro6 CONFIG REQUIRED COMPONENTS Core Network Qml)' ''; qtWrapperArgs = [ diff --git a/pkgs/by-name/br/brickstore/qcoro-cmake.patch b/pkgs/by-name/br/brickstore/qcoro-cmake.patch deleted file mode 100644 index 824129b5cf48..000000000000 --- a/pkgs/by-name/br/brickstore/qcoro-cmake.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/BuildQCoro.cmake b/cmake/BuildQCoro.cmake -index 941e813..41c88c6 100644 ---- a/cmake/BuildQCoro.cmake -+++ b/cmake/BuildQCoro.cmake -@@ -14,14 +14,6 @@ if (BACKEND_ONLY) - set(QCORO_WITH_QML OFF) - endif() - --FetchContent_Declare( -- qcoro -- GIT_REPOSITORY https://github.com/danvratil/qcoro.git -- GIT_TAG v${QCORO_VERSION} -- SOURCE_SUBDIR "NeedManualAddSubDir" # make it possible to add_subdirectory below --) -- --FetchContent_MakeAvailable(qcoro) - - set(mll ${CMAKE_MESSAGE_LOG_LEVEL}) - if (NOT VERBOSE_FETCH) - diff --git a/pkgs/by-name/br/brickstore/qjsonvalue-include.patch b/pkgs/by-name/br/brickstore/qjsonvalue-include.patch deleted file mode 100644 index 27ac28a2769e..000000000000 --- a/pkgs/by-name/br/brickstore/qjsonvalue-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/bricklink/order.cpp b/src/bricklink/order.cpp -index 14426e5b..59856f0c 100755 ---- a/src/bricklink/order.cpp -+++ b/src/bricklink/order.cpp -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #include "bricklink/core.h" - #include "bricklink/io.h" From c12a6136480073f65281ab6cf5f7733f16d2a302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9zar=20Augusto?= <32869222+cizordj@users.noreply.github.com> Date: Mon, 23 Mar 2026 21:12:31 -0300 Subject: [PATCH 020/246] sonarlint-ls: 4.8.0.77946 -> 4.15.0.78211 The version reported by `sonarlint-ls -V` was always `4.15-SNAPSHOT` instead of the actual release version. SonarSource injects the real version through a private CI action that is not reproducible from source, so the fix is to overwrite `slls-version.txt` directly before Maven packages it into the JAR. --- pkgs/by-name/so/sonarlint-ls/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index 11897f28aaec..39ea7036576b 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/pkgs/by-name/so/sonarlint-ls/package.nix @@ -16,17 +16,17 @@ maven.buildMavenPackage rec { pname = "sonarlint-ls"; - version = "4.8.0.77946"; + version = "4.15.0.78211"; src = fetchFromGitHub { owner = "SonarSource"; repo = "sonarlint-language-server"; rev = version; - hash = "sha256-kwgkRCVcEFGv18zVK9y0JhIx6Cb6XBrnwGbzf2uDdZE="; + hash = "sha256-0EFztL1hF1JaYc+6OUvmcPF9x5yA10Sy62f/Drmj4MU="; }; mvnJdk = jdk17; - mvnHash = "sha256-KyA2/ABdT35DqzEhE5P+aSGJfu60o6T4+ofQNiQTPFg="; + mvnHash = "sha256-YG2eQnSCwg24DEp2CJ6awozTVcz8XBUmSSEb65UD7Rw="; # Disables failing tests which either need network access or are flaky. mvnParameters = lib.escapeShellArgs [ @@ -40,6 +40,10 @@ maven.buildMavenPackage rec { !OpenNotebooksCacheTests" ]; + preBuild = '' + echo -n "${version}" > src/main/resources/slls-version.txt + ''; + installPhase = '' runHook preInstall From 88afa3aa957762e43f88607f1434bb63778f59c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Mar 2026 16:21:03 +0000 Subject: [PATCH 021/246] althttpd: 0-unstable-2026-01-27 -> 0-unstable-2026-03-20 --- pkgs/by-name/al/althttpd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/althttpd/package.nix b/pkgs/by-name/al/althttpd/package.nix index 4f15ecb9466a..d9302fb2669a 100644 --- a/pkgs/by-name/al/althttpd/package.nix +++ b/pkgs/by-name/al/althttpd/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation { pname = "althttpd"; - version = "0-unstable-2026-01-27"; + version = "0-unstable-2026-03-20"; src = fetchfossil { url = "https://sqlite.org/althttpd/"; - rev = "7758535a137da507"; - hash = "sha256-9yszcoYpbM9/KDn7zpWgDINZF6azkQVxwlOw7BvRo+4="; + rev = "a8fac0faaab1f43f"; + hash = "sha256-Z4kZgCvqY7Kroc6A98s5UH4N8CEUzF+xmdXDRw2Lxtw="; }; buildInputs = [ openssl ]; From 20a971a14bfe7c480652695c1a6a96914114e488 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Thu, 5 Mar 2026 15:30:15 +0000 Subject: [PATCH 022/246] firefly-iii: 6.4.22 -> 6.5.9 --- pkgs/by-name/fi/firefly-iii/package.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index b1a0cbb09faa..66caf3c1f060 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -5,44 +5,47 @@ nodejs, fetchNpmDeps, buildPackages, - php84, + php85, nixosTests, nix-update-script, dataDir ? "/var/lib/firefly-iii", }: +let + php = php85; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii"; - version = "6.4.22"; + version = "6.5.9"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; tag = "v${finalAttrs.version}"; - hash = "sha256-i20D0/z6GA7pZYrWvRJ8tUlptNI5Cl/e9UY0hKg9SP8="; + hash = "sha256-8Orha6/cLjE9J01m77LwpvXlYrOmb/28TzxQ/RJdvDQ="; }; - buildInputs = [ php84 ]; + buildInputs = [ php ]; nativeBuildInputs = [ nodejs nodejs.python buildPackages.npmHooks.npmConfigHook - php84.packages.composer - php84.composerHooks2.composerInstallHook + php.packages.composer + php.composerHooks2.composerInstallHook ]; - composerVendor = php84.mkComposerVendor { + composerVendor = php.mkComposerVendor { inherit (finalAttrs) pname src version; composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-m+esW/yQs/GSwnw2iqVfSMXCf6/5M4634GUbt4Nnvbg="; + vendorHash = "sha256-9TTlMVlW7aXckIgpB5M0IxcLDtHqMboQgP00pmfK1zg="; }; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-pu8dxL0NRB1cyqlQEf2zT2wdVp2fbe+Vp85qMs7f6s0="; + hash = "sha256-UyViUi/bIXK2aIzRgYe3oTyIMBRHpKYHIIEb6Qq1Jkk="; }; preInstall = '' @@ -51,7 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { - phpPackage = php84; + phpPackage = php; tests = nixosTests.firefly-iii; updateScript = nix-update-script { extraArgs = [ From ec47a8468b4edb9c41161dad85749fdbe8ff6e54 Mon Sep 17 00:00:00 2001 From: Silvio Ankermann Date: Fri, 27 Mar 2026 11:43:14 +0100 Subject: [PATCH 023/246] ruqola: 2.6.1 -> 2.7.0 --- pkgs/by-name/ru/ruqola/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ru/ruqola/package.nix b/pkgs/by-name/ru/ruqola/package.nix index 01df74ca627e..542108baacc5 100644 --- a/pkgs/by-name/ru/ruqola/package.nix +++ b/pkgs/by-name/ru/ruqola/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ruqola"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = "ruqola"; tag = "v${finalAttrs.version}"; - hash = "sha256-z/JyIXZKXdOc92Ebq1Jcnhx/6EL7rkcdnxN2BsQn5Cw="; + hash = "sha256-ndb20iKNaWwK5yR3mlDoBYEPj2QLHOlQVBejGKs/FMw="; }; nativeBuildInputs = [ @@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtbase qt6.qtmultimedia qt6.qtnetworkauth + qt6.qtspeech qt6.qtwebsockets ]; From 0313663608a0f1d42b14307da4d4a674ff01d3e2 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Thu, 5 Mar 2026 12:15:38 +0100 Subject: [PATCH 024/246] teleport_18: 18.7.0 -> 18.7.2 Changelogs: https://github.com/gravitational/teleport/releases/v18.7.1 https://github.com/gravitational/teleport/releases/tag/v18.7.2 Diff: https://github.com/gravitational/teleport/compare/v18.7.0...v18.7.2 --- pkgs/by-name/te/teleport_18/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix index a2d8fee6a708..7dfa795d9410 100644 --- a/pkgs/by-name/te/teleport_18/package.nix +++ b/pkgs/by-name/te/teleport_18/package.nix @@ -7,10 +7,10 @@ }: buildTeleport { - version = "18.7.0"; - hash = "sha256-1AzIZ2jbYncpUStIrKgP6jhkJ42HDoXfhEv5hJdyDnA="; - vendorHash = "sha256-p600z/Fm3y5KG8fDItIc/Xq4O0/DWHjcmrh5qJmCy1I="; - pnpmHash = "sha256-/sLG0yfMIguj+yzr3bDj1AoPvDEva6ETjyKcqm4Fvks="; + version = "18.7.2"; + hash = "sha256-1ANYBYNhTzSA3zhgUgKks73piHdw+4iXGFmGUWHTYpE="; + vendorHash = "sha256-0HxDrsWWRjuaVGtbX7xwCMsj2dYRJr3wmpf8qInlyBE="; + pnpmHash = "sha256-XJ2SLCMoFFeoBQ3YKIlq4APNOhSS8ipTNQufQ1nkYqs="; cargoHash = "sha256-SfVoh4HnHSOz1haPPV7a/RyA6LFjLRe78Mn2fVdVyEA="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_99; From d8c13af4fa6d675d5076bb58933878762cead2a5 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Wed, 11 Mar 2026 23:48:49 +0100 Subject: [PATCH 025/246] teleport_17: 17.7.19 -> 17.7.20 Changelog: https://github.com/gravitational/teleport/releases/tag/v17.7.20 Diff: https://github.com/gravitational/teleport/compare/v17.7.19...v17.7.20 --- pkgs/by-name/te/teleport_17/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix index 16967f5c6fc6..30337639cff0 100644 --- a/pkgs/by-name/te/teleport_17/package.nix +++ b/pkgs/by-name/te/teleport_17/package.nix @@ -7,11 +7,11 @@ }: buildTeleport { - version = "17.7.19"; - hash = "sha256-2bQEW3HllZvMofumLSgvZvWqrlRV6fK9uB3QTJD6x3w="; - vendorHash = "sha256-GUnX3TnHjZyqNsIDIy5Du6jRURWnYBsNb2zWEGl1tzQ="; + version = "17.7.20"; + hash = "sha256-zxP7vhDyxypotG58wzwlCx8JMoRSYC0adMe+zKfrOek="; + vendorHash = "sha256-uwSCPu3z9LCvN/vKJg/Q9rgk6wnjh4P4tq4a5suPNrg="; cargoHash = "sha256-opLo7UmZzxrVxYZOwn4v4G5lhHFp5GrdOZe7uIb97q0="; - pnpmHash = "sha256-mcv9Paybeu9RnNfzj1v0043UX2WhfgMpmWjVxQX7Fzc="; + pnpmHash = "sha256-quHu43JccCpguSeHkGnpqL81oDN4p5WtAt/sOgMCCec="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; inherit buildGoModule withRdpClient extPatches; From 53d0f0af89c3cf43137cb033ee9ba7cd27833f7f Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Sun, 22 Mar 2026 21:49:16 +0000 Subject: [PATCH 026/246] maintainers: add tbutter --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ad86c2b1db6..16032d74aaea 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -26584,6 +26584,12 @@ githubId = 156964; name = "Thomas Boerger"; }; + tbutter = { + email = "tbutter@gmail.com"; + github = "tbutter"; + githubId = 1336537; + name = "Thomas Butter"; + }; tc-kaluza = { github = "tc-kaluza"; githubId = 101565936; From 3dc2b39395409ec58f33f25b855c9692ca5fb883 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Apr 2026 03:03:20 +0000 Subject: [PATCH 027/246] gitea-mcp-server: 1.0.1 -> 1.1.0 --- pkgs/by-name/gi/gitea-mcp-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitea-mcp-server/package.nix b/pkgs/by-name/gi/gitea-mcp-server/package.nix index 5a1d597045e6..832169f03f63 100644 --- a/pkgs/by-name/gi/gitea-mcp-server/package.nix +++ b/pkgs/by-name/gi/gitea-mcp-server/package.nix @@ -6,17 +6,17 @@ buildGo126Module (finalAttrs: { pname = "gitea-mcp-server"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "gitea-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-B7uB69YsQd8EeENrezFK7kFXha21XValjEAYRjeYreo="; + hash = "sha256-weJcl9Vp7mhPiaui7VGETs5t4trUDTegDoUR8gRTGIs="; }; - vendorHash = "sha256-xfhvbTcniRnkv81MIEnoy36up8O2IZ1WUrhYJrhtZ3k="; + vendorHash = "sha256-35zVDzivvO3tSi1RYvXJoLvrlvnp3JCzwC5FqDEj91M="; subPackages = [ "." ]; From 5adbf16109990c8441d86a8c7fe65432aec42799 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 5 Apr 2026 22:49:42 -0700 Subject: [PATCH 028/246] tests/installer: increase disk size Latest tests with cryptsetup were throwing with ENOSPC during the installation. --- nixos/tests/installer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 892c066c568b..dc29ebb863e1 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -661,7 +661,7 @@ let let commonConfig = { # builds stuff in the VM, needs more juice - virtualisation.diskSize = 8 * 1024; + virtualisation.diskSize = 12 * 1024; virtualisation.cores = 8; virtualisation.memorySize = 2048; @@ -698,7 +698,7 @@ let # Use a small /dev/vdb as the root disk for the # installer. This ensures the target disk (/dev/vda) is # the same during and after installation. - virtualisation.emptyDiskImages = [ 512 ]; + virtualisation.emptyDiskImages = [ 1024 ]; virtualisation.rootDevice = "/dev/vdb"; nix.package = selectNixPackage pkgs; From 3404e2f651cb0d3ece411823dcec0509bc87f919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Apr 2026 11:29:50 -0700 Subject: [PATCH 029/246] python3Packages.ua-parser: 1.0.1 -> 1.0.2 Diff: https://github.com/ua-parser/uap-python/compare/1.0.1...1.0.2 Changelog: https://github.com/ua-parser/uap-python/releases/tag/1.0.2 --- pkgs/development/python-modules/ua-parser/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index 2fe36aa84e7a..7faa54029e9a 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -6,14 +6,13 @@ pyyaml, pytestCheckHook, setuptools, - setuptools-scm, ua-parser-builtins, ua-parser-rs, }: buildPythonPackage rec { pname = "ua-parser"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { @@ -21,13 +20,12 @@ buildPythonPackage rec { repo = "uap-python"; tag = version; fetchSubmodules = true; - hash = "sha256-l8EBQq5Hqw/Vx4zvWy2QQ1m7mrAiqYNK2x3yUmJj8Xw="; + hash = "sha256-KKQlM1AonRqanhWlWIqPMoD+AzDCdwAzBsAbhqpZ4cs="; }; build-system = [ pyyaml setuptools - setuptools-scm ]; dependencies = [ From 9c2c5601e4f428ebb4fafb538b16e06739f51e0a Mon Sep 17 00:00:00 2001 From: Gin Sanches Date: Mon, 6 Apr 2026 22:51:54 +0200 Subject: [PATCH 030/246] ovito: add wrapGAppsHook3 to nativeBuildInputs --- pkgs/by-name/ov/ovito/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ov/ovito/package.nix b/pkgs/by-name/ov/ovito/package.nix index e64ad9d32100..601a1b90ce0b 100644 --- a/pkgs/by-name/ov/ovito/package.nix +++ b/pkgs/by-name/ov/ovito/package.nix @@ -18,6 +18,7 @@ imagemagick, copyDesktopItems, nix-update-script, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -40,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake qt6Packages.wrapQtAppsHook + wrapGAppsHook3 imagemagick copyDesktopItems ]; From 1e50738ad31484af01cf19167ff713898477312d Mon Sep 17 00:00:00 2001 From: Gin Sanches Date: Wed, 8 Apr 2026 10:41:07 +0200 Subject: [PATCH 031/246] ovito: add gappsWrapperArgs to qtWrapperArgs --- pkgs/by-name/ov/ovito/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ov/ovito/package.nix b/pkgs/by-name/ov/ovito/package.nix index 601a1b90ce0b..1c210c7ac243 100644 --- a/pkgs/by-name/ov/ovito/package.nix +++ b/pkgs/by-name/ov/ovito/package.nix @@ -64,6 +64,12 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.qtwayland ]; + dontWrapGApps = true; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + # manually create a desktop file desktopItems = [ (makeDesktopItem { From 8b73b657168bf02fb48302348a6c8da2b596fe65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 12:29:51 +0000 Subject: [PATCH 032/246] ustreamer: 6.40 -> 6.55 --- pkgs/by-name/us/ustreamer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/us/ustreamer/package.nix b/pkgs/by-name/us/ustreamer/package.nix index cad1b45a1505..50c350b1ff47 100644 --- a/pkgs/by-name/us/ustreamer/package.nix +++ b/pkgs/by-name/us/ustreamer/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ustreamer"; - version = "6.40"; + version = "6.55"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; tag = "v${finalAttrs.version}"; - hash = "sha256-jKltFQsx8Q9+TMTOg1p6nljII72CLEg6VYe60/KojUY="; + hash = "sha256-xL35xlgKEpgiD3m6xoEs+CBmEx0Fpwo43EbzqCqDgvc="; }; buildInputs = [ From 607f3efcccc763423a4b953dedeea077dbf8470c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 9 Apr 2026 10:28:06 -0700 Subject: [PATCH 033/246] python3Packages.eth-typing: 5.2.1 -> 6.0.0 --- pkgs/development/python-modules/eth-typing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 0760c299b336..008a107ffc20 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "5.2.1"; + version = "6.0.0"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-typing"; tag = "v${version}"; - hash = "sha256-w/xYqDmtlNs9dk4lTX0zxjdlUc7l7vi8ZnSE62W0m8o="; + hash = "sha256-bdZrrglsJGNsqD6ShsqPO6ljViZr9Ms9A8Km45pnEYA="; }; build-system = [ setuptools ]; From 08fc507e5b7d2d82e8be1df69ca743c830c4990f Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 9 Apr 2026 10:42:15 -0700 Subject: [PATCH 034/246] fq: 0.16.0 -> 0.17.0 --- pkgs/by-name/fq/fq/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fq/fq/package.nix b/pkgs/by-name/fq/fq/package.nix index cb842850bd83..b4fd41668921 100644 --- a/pkgs/by-name/fq/fq/package.nix +++ b/pkgs/by-name/fq/fq/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "fq"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${finalAttrs.version}"; - hash = "sha256-b28zncqz0B1YIXHCjklAkVbIdXxC36bqIwJ4VrrCe18="; + hash = "sha256-rGuUvuq9hZrqt3Uy1s1he8O+c+iF83RU6PsUlatrPcQ="; }; - vendorHash = "sha256-bF3N+cPJAxAEFmr2Gl3xdKLtv7yLkxze19NgDFWaBn8="; + vendorHash = "sha256-Iga9g9VMTxtdselFn+8udjtInXWW9sNUfSzIc7OgvbY="; ldflags = [ "-s" From 1e011d3876aa267177f91ec889860e04cee02510 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 9 Apr 2026 10:42:17 -0700 Subject: [PATCH 035/246] trealla: 2.90.7 -> 2.92.19 --- 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 a7e16632c392..c3667820f8c3 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.90.7"; + version = "2.92.19"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-0ud5GHkldJ7/86bmeXV1SdShXKLjUIu7oOxZBbB+068="; + hash = "sha256-XqpLEJ/jmAzw+m2LEhP+oNCNGVRLkDCgNuYkEeZgf8Q="; }; postPatch = '' From febd1171639db8300057c802ef68ec9acbd70cc9 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 9 Apr 2026 10:42:18 -0700 Subject: [PATCH 036/246] python3Packages.ping3: 5.1.5 -> 5.1.6 --- pkgs/development/python-modules/ping3/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ping3/default.nix b/pkgs/development/python-modules/ping3/default.nix index aa89ebbc24b2..7098deb96e69 100644 --- a/pkgs/development/python-modules/ping3/default.nix +++ b/pkgs/development/python-modules/ping3/default.nix @@ -1,18 +1,20 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, }: buildPythonPackage rec { pname = "ping3"; - version = "5.1.5"; + version = "5.1.6"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-bJm8hE4Lfbxcl2XotTAUDa8czSESyZ2wGreYMb2Agc0="; + src = fetchFromGitHub { + owner = "kyan001"; + repo = "ping3"; + tag = "v${version}"; + hash = "sha256-9HWqJK8cxVKetrhcivI0p63I99XqkBVgZa6aR4Hablc="; }; build-system = [ setuptools ]; From 77df1099bfb7721fd705cbbba9ecb05b0a2a7145 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 9 Apr 2026 10:42:20 -0700 Subject: [PATCH 037/246] nuxmv: 2.0.0 -> 2.1.0 --- pkgs/by-name/nu/nuxmv/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/nu/nuxmv/package.nix b/pkgs/by-name/nu/nuxmv/package.nix index ae61e27a36ee..5896cbb0edf8 100644 --- a/pkgs/by-name/nu/nuxmv/package.nix +++ b/pkgs/by-name/nu/nuxmv/package.nix @@ -8,17 +8,17 @@ stdenv.mkDerivation rec { pname = "nuxmv"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-${ - if stdenv.hostPlatform.isDarwin then "macosx64" else "linux64" - }.tar.gz"; + url = "https://nuxmv.fbk.eu/downloads/nuXmv-${version}-${ + if stdenv.hostPlatform.isDarwin then "macos-universal" else "linux64" + }.tar.xz"; sha256 = if stdenv.hostPlatform.isDarwin then - "sha256-48I+FhJUUam1nMCMMM47CwGO82BYsNz0eHDHXBfqO2E=" + "sha256-3AoXEPCunzbhYjjUCzXc9m+CPTVwE70udMCfbpucbdU=" else - "sha256-Gf+QgAjTrysZj7qTtt1wcQPganDtO0YtRY4ykhLPzVo="; + "sha256-x9/sQ3SbyyMMhX7+gQmbldhouU79n4G8zr5UKjBqfIM="; }; nativeBuildInputs = [ makeWrapper ]; @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" + "aarch64-darwin" ]; }; } From 267c387c53ac1340ab5a1ba45c2b69c1062c1c5c Mon Sep 17 00:00:00 2001 From: Adam Thompson-Sharpe Date: Wed, 18 Mar 2026 19:52:48 -0400 Subject: [PATCH 038/246] opentxl: pass proper make variables for cross-compilation Provides the correct information about binutils to use for compilation. Without this, builds will fail when the C compiler has a target prefix. --- pkgs/by-name/op/opentxl/fix-cross.patch | 166 ++++++++++++++++++++++++ pkgs/by-name/op/opentxl/package.nix | 34 +++-- 2 files changed, 189 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/op/opentxl/fix-cross.patch diff --git a/pkgs/by-name/op/opentxl/fix-cross.patch b/pkgs/by-name/op/opentxl/fix-cross.patch new file mode 100644 index 000000000000..3cc318cf134d --- /dev/null +++ b/pkgs/by-name/op/opentxl/fix-cross.patch @@ -0,0 +1,166 @@ +diff --git a/Makefile b/Makefile +index 1374808..2de353f 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,9 +13,10 @@ + # most optimizing C compilers to generate incorrect code for it, or at + # the very least to slow it down severely, at higher levels of optimization. + +-CC = gcc -w -Wno-error=int-conversion +-CFLAGS = -c -O -fno-inline -I . ++CC = gcc ++CFLAGS = -w -Wno-error=int-conversion -c -O -fno-inline -I . + LD = gcc ++STRIP = strip + LDFLAGS = + LDLIBS = -lm + RLFLAGS = -r +@@ -52,12 +53,14 @@ else ifeq ($(OS), CYGWIN) + + else ifeq ($(OS), MSYS) + MESSAGE = "Making TXL on Msys / MinGW using gcc and BSD signal handling" ++ CFLAGS := $(CFLAGS) -DWIN + LDFLAGS := $(LDFLAGS) -Wl,--stack,0x2000000 + EXE = .exe + SIGTYPE = BSD + + else ifeq ($(OS), MINGW64) + MESSAGE = "Making TXL on Msys / MinGW using gcc and BSD signal handling" ++ CFLAGS := $(CFLAGS) -DWIN + LDFLAGS := $(LDFLAGS) -Wl,--stack,0x2000000 + EXE = .exe + SIGTYPE = BSD +@@ -89,18 +92,18 @@ alltxls : thetxl thetxldb thetxlpf thetxlvm thetxlcvt thetxlapr + thetxl : bin objs objs/main.o objs/txl.o objs/xform.o objs/parse.o objs/loadstor.o ${OBJS} ${TLOBJS} + ${CC} ${LDFLAGS} -o bin/txl objs/main.o objs/txl.o objs/xform.o objs/parse.o objs/loadstor.o \ + ${OBJS} ${TLOBJS} ${LDLIBS} +- strip bin/txl${EXE} ++ $(STRIP) bin/txl${EXE} + cp scripts/unix/* bin/ + + thetxldb : bin objs objs/main.o objs/txl.o objs/xformdb.o objs/parse.o objs/loadstor.o ${OBJS} ${TLOBJS} + ${CC} ${LDFLAGS} -o bin/txldb objs/main.o objs/txl.o objs/xformdb.o objs/parse.o objs/loadstor.o \ + ${OBJS} ${TLOBJS} ${LDLIBS} +- strip bin/txldb${EXE} ++ $(STRIP) bin/txldb${EXE} + + thetxlpf : lib objs objs/main.o objs/txl.o objs/xformpf.o objs/parsepf.o objs/loadstor.o ${OBJS} ${TLOBJS} + ${CC} ${LDFLAGS} -o lib/txlpf.x objs/main.o objs/txl.o objs/xformpf.o objs/parsepf.o objs/loadstor.o \ + ${OBJS} ${TLOBJS} ${LDLIBS} +- strip lib/txlpf.x ++ $(STRIP) lib/txlpf.x + + thetxlvm : lib objs objs/main.o objs/txlsa.o objs/xform.o objs/loadsa.o objs/parsa.o ${COMMONOBJS} ${TLOBJS} + ${LD} ${RLFLAGS} -o lib/txlvm.o objs/txlsa.o objs/xform.o objs/loadsa.o objs/parsa.o \ +@@ -109,11 +112,11 @@ thetxlvm : lib objs objs/main.o objs/txlsa.o objs/xform.o objs/loadsa.o objs/par + + thetxlcvt : lib objs objs/main.o objs/txlcvt.o + ${CC} ${LDFLAGS} -o lib/txlcvt.x objs/main.o objs/txlcvt.o ${TLOBJS} ${LDLIBS} +- strip lib/txlcvt.x ++ $(STRIP) lib/txlcvt.x + + thetxlapr : lib objs objs/main.o objs/txlapr.o + ${CC} ${LDFLAGS} -o lib/txlapr.x objs/main.o objs/txlapr.o ${TLOBJS} ${LDLIBS} +- strip lib/txlapr.x ++ $(STRIP) lib/txlapr.x + + objs/main.o : tpluslib/TL.h UNIX main.c + ${CC} $(CFLAGS) -D${SIGTYPE} main.c; mv main.o objs/main.o +@@ -216,4 +219,3 @@ clean : + rm -f bin/txl* objs/*.o + rm -rf opentxl opentxl-* opentxl*.tar.gz + cd test; make clean; cd .. +- +diff --git a/scripts/unix/txl2c b/scripts/unix/txl2c +index 7429daf..ebf56c5 100755 +--- a/scripts/unix/txl2c ++++ b/scripts/unix/txl2c +@@ -19,15 +19,7 @@ then + exit 99 + fi + +-# Localization +-CC="gcc" +- +-case `uname -s` in +- CYGWIN*|MSYS*|MINGW64*) +- CC="$CC -Wl,--stack,0x20000000";; +- *) +- ;; +-esac ++BUILD_TXLLIB="${BUILD_TXLLIB:-$TXLLIB}" + + # Decode TXL program name and options + TXLPROG="" +@@ -90,7 +82,7 @@ then + fi + + # Convert TXLVM byte code to initialized C byte array +-$TXLLIB/txlcvt.x $TXLNAME.ctxl ++$BUILD_TXLLIB/txlcvt.x $TXLNAME.ctxl + + # Clean up + /bin/rm -f $TXLNAME.ctxl Txl/$TXLNAME.ctxl txl/$TXLNAME.ctxl 2> /dev/null +diff --git a/scripts/unix/txlc b/scripts/unix/txlc +index 4f49f49..201037e 100755 +--- a/scripts/unix/txlc ++++ b/scripts/unix/txlc +@@ -20,9 +20,12 @@ then + fi + + # Localization +-CC="gcc" ++CC="${CC:-cc}" ++BUILD_TXLLIB="${BUILD_TXLLIB:-$TXLLIB}" ++TARGET_TXLLIB="${TARGET_TXLLIB:-$TXLLIB}" ++OS="${OS:-$(uname -s)}" + +-case `uname -s` in ++case "$OS" in + CYGWIN*|MSYS*|MINGW64*) + CC="$CC -Wl,--stack,0x20000000";; + *) +@@ -90,10 +93,10 @@ then + fi + + # Convert TXLVM byte code to initialized C byte array +-$TXLLIB/txlcvt.x $TXLNAME.ctxl ++$BUILD_TXLLIB/txlcvt.x $TXLNAME.ctxl + + # Compile and link with TXLVM +-$CC -O -w -o $TXLNAME.x $TXLLIB/txlmain.o $TXLLIB/txlvm.o ${TXLNAME}_TXL.c -lm ++$CC -O -w -o $TXLNAME.x $TARGET_TXLLIB/txlmain.o $TARGET_TXLLIB/txlvm.o ${TXLNAME}_TXL.c -lm + + # Clean up + /bin/rm -f $TXLNAME.ctxl Txl/$TXLNAME.ctxl txl/$TXLNAME.ctxl ${TXLNAME}_TXL.* 2> /dev/null +diff --git a/scripts/unix/txlp b/scripts/unix/txlp +index e39af87..cbb53ac 100755 +--- a/scripts/unix/txlp ++++ b/scripts/unix/txlp +@@ -19,6 +19,8 @@ then + exit 99 + fi + ++BUILD_TXLLIB="${BUILD_TXLLIB:-$TXLLIB}" ++ + # Decode TXL program name and options + TXLFILES="" + TXLOPTIONS="" +@@ -43,7 +45,7 @@ done + # Run the TXL command, using txlpf + if [ "$1" != "" ] + then +-if ! $TXLLIB/txlpf.x $* > /dev/null 2> /tmp/txlp$$ ++if ! $BUILD_TXLLIB/txlpf.x $* > /dev/null 2> /tmp/txlp$$ + then + echo "txlp: TXL program failed" 2>&1 + cat /tmp/txlp$$ 2>&1 +@@ -54,7 +56,7 @@ then + fi + + # Analyze the results +-$TXLLIB/txlapr.x $PROFOPTIONS ++$BUILD_TXLLIB/txlapr.x $PROFOPTIONS + + # Clean up + /bin/rm -f /tmp/txlp$$ diff --git a/pkgs/by-name/op/opentxl/package.nix b/pkgs/by-name/op/opentxl/package.nix index ae5d1c644e84..e26fb2167e8a 100644 --- a/pkgs/by-name/op/opentxl/package.nix +++ b/pkgs/by-name/op/opentxl/package.nix @@ -5,6 +5,18 @@ fetchurl, nix-update-script, }: +let + osOption = + platform: + if platform.isDarwin then + "Darwin" + else if platform.isCygwin then + "CYGWIN" + else if platform.isWindows then + "MSYS" + else + "Linux"; +in stdenv.mkDerivation (finalAttrs: { pname = "opentxl"; version = "11.3.7"; @@ -19,6 +31,10 @@ stdenv.mkDerivation (finalAttrs: { # Using -std=gnu89 to prevent errors that occur with default args env.NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-int-conversion"; + patches = [ + ./fix-cross.patch + ]; + postPatch = '' # Replace hardcoded FHS paths in various files find . -type f -exec sed -i \ @@ -27,18 +43,15 @@ stdenv.mkDerivation (finalAttrs: { -e "s#/usr/local/bin#$out/bin#g" \ -e "s#/usr/local/lib/txl#$out/lib#g" \ {} + - - # Replace hardcoded gcc references - substituteInPlace scripts/unix/{txlc,txl2c} \ - --replace-fail gcc '${stdenv.cc}/bin/cc' ''; - preBuild = '' - makeFlagsArray+=( - CC="$CC" - LD="$CC" - ) - ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "LD=${stdenv.cc.targetPrefix}cc" + "STRIP=${stdenv.cc.targetPrefix}strip" + "EXE=${stdenv.hostPlatform.extensions.executable}" + "OS=${osOption stdenv.hostPlatform}" + ]; checkFlags = [ "-C test" ]; @@ -58,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Open-source compiler for the Txl language"; mainProgram = "txl"; - platforms = lib.platforms.unix; homepage = "https://github.com/CordyJ/OpenTxl"; downloadPage = "https://github.com/CordyJ/OpenTxl/releases"; changelog = "https://github.com/CordyJ/OpenTxl/releases/tag/v${finalAttrs.version}"; From f56d8ab9f1086b3ee5f2f404e8c53b804195d02c Mon Sep 17 00:00:00 2001 From: Adam Thompson-Sharpe Date: Thu, 9 Apr 2026 15:32:27 -0400 Subject: [PATCH 039/246] opentxl: include runtimeShellPackage in buildInputs Required for patchShebangs to find the right shell for runtime scripts. --- pkgs/by-name/op/opentxl/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/op/opentxl/package.nix b/pkgs/by-name/op/opentxl/package.nix index e26fb2167e8a..084179a97734 100644 --- a/pkgs/by-name/op/opentxl/package.nix +++ b/pkgs/by-name/op/opentxl/package.nix @@ -4,6 +4,7 @@ callPackage, fetchurl, nix-update-script, + runtimeShellPackage, }: let osOption = @@ -20,6 +21,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "opentxl"; version = "11.3.7"; + strictDeps = true; # The code generation part of the upstream build system relies on an x86-only binary, # so the generated code is fetched from the GitHub release instead @@ -28,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-qIvxQqo1yCVJImjUvNNinzhoywVgaq9s0E+Ab+QStc0="; }; + # Required for patchShebangs to find the right shell for runtime scripts. + # Optional check is to make sure that it is not added on platforms + # that can't run a POSIX shell (e.g. MinGW) + buildInputs = lib.optional (lib.meta.availableOn stdenv.hostPlatform runtimeShellPackage) runtimeShellPackage; + # Using -std=gnu89 to prevent errors that occur with default args env.NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-int-conversion"; From 1b769bd0d31d248a0406a1fe5f40b4efef948fbd Mon Sep 17 00:00:00 2001 From: Adam Thompson-Sharpe Date: Tue, 7 Apr 2026 09:57:01 -0400 Subject: [PATCH 040/246] opentxl-unwrapped: rename from opentxl --- pkgs/by-name/op/{opentxl => opentxl-unwrapped}/factorial-test.nix | 0 pkgs/by-name/op/{opentxl => opentxl-unwrapped}/factorial.txl | 0 pkgs/by-name/op/{opentxl => opentxl-unwrapped}/fix-cross.patch | 0 pkgs/by-name/op/{opentxl => opentxl-unwrapped}/package.nix | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename pkgs/by-name/op/{opentxl => opentxl-unwrapped}/factorial-test.nix (100%) rename pkgs/by-name/op/{opentxl => opentxl-unwrapped}/factorial.txl (100%) rename pkgs/by-name/op/{opentxl => opentxl-unwrapped}/fix-cross.patch (100%) rename pkgs/by-name/op/{opentxl => opentxl-unwrapped}/package.nix (100%) diff --git a/pkgs/by-name/op/opentxl/factorial-test.nix b/pkgs/by-name/op/opentxl-unwrapped/factorial-test.nix similarity index 100% rename from pkgs/by-name/op/opentxl/factorial-test.nix rename to pkgs/by-name/op/opentxl-unwrapped/factorial-test.nix diff --git a/pkgs/by-name/op/opentxl/factorial.txl b/pkgs/by-name/op/opentxl-unwrapped/factorial.txl similarity index 100% rename from pkgs/by-name/op/opentxl/factorial.txl rename to pkgs/by-name/op/opentxl-unwrapped/factorial.txl diff --git a/pkgs/by-name/op/opentxl/fix-cross.patch b/pkgs/by-name/op/opentxl-unwrapped/fix-cross.patch similarity index 100% rename from pkgs/by-name/op/opentxl/fix-cross.patch rename to pkgs/by-name/op/opentxl-unwrapped/fix-cross.patch diff --git a/pkgs/by-name/op/opentxl/package.nix b/pkgs/by-name/op/opentxl-unwrapped/package.nix similarity index 100% rename from pkgs/by-name/op/opentxl/package.nix rename to pkgs/by-name/op/opentxl-unwrapped/package.nix From 6b57a9f2ffe11d18aece218cd04e772713757f06 Mon Sep 17 00:00:00 2001 From: Adam Thompson-Sharpe Date: Thu, 19 Mar 2026 22:37:32 -0400 Subject: [PATCH 041/246] opentxl: init wrapper --- pkgs/by-name/op/opentxl-unwrapped/package.nix | 7 +- pkgs/by-name/op/opentxl/package.nix | 69 +++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/op/opentxl/package.nix diff --git a/pkgs/by-name/op/opentxl-unwrapped/package.nix b/pkgs/by-name/op/opentxl-unwrapped/package.nix index 084179a97734..7524f904c7ca 100644 --- a/pkgs/by-name/op/opentxl-unwrapped/package.nix +++ b/pkgs/by-name/op/opentxl-unwrapped/package.nix @@ -72,8 +72,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests.factorial = callPackage ./factorial-test.nix { opentxl = finalAttrs.finalPackage; }; - passthru.updateScript = nix-update-script { }; + passthru = { + inherit osOption; + tests.factorial = callPackage ./factorial-test.nix { opentxl = finalAttrs.finalPackage; }; + updateScript = nix-update-script { }; + }; meta = { description = "Open-source compiler for the Txl language"; diff --git a/pkgs/by-name/op/opentxl/package.nix b/pkgs/by-name/op/opentxl/package.nix new file mode 100644 index 000000000000..ab1b5896ba1c --- /dev/null +++ b/pkgs/by-name/op/opentxl/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + makeWrapper, + opentxl-unwrapped, + targetPackages, +}: +let + inherit (targetPackages.stdenv.cc) targetPrefix; + + crossCompiling = stdenv.hostPlatform != stdenv.targetPlatform; + targetOpentxl = if !crossCompiling then opentxl-unwrapped else targetPackages.opentxl-unwrapped; +in +stdenv.mkDerivation (finalAttrs: { + pname = "${targetPrefix}opentxl-wrapper"; + inherit (opentxl-unwrapped) version; + preferLocalBuild = true; + strictDeps = true; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + # Wrap compiler + makeWrapper ${opentxl-unwrapped}/bin/txlc \ + $out/bin/${targetPrefix}txlc \ + --set TXLLIB ${opentxl-unwrapped}/lib \ + --set BUILD_TXLLIB ${opentxl-unwrapped}/lib \ + --set TARGET_TXLLIB ${targetOpentxl}/lib \ + --set CC ${targetPackages.stdenv.cc}/bin/${targetPrefix}cc \ + --set OS ${opentxl-unwrapped.osOption stdenv.targetPlatform} + ${ + # For convenience, if there is a target prefix, create a symlink named txlc + lib.optionalString (targetPrefix != "") '' + ln -s $out/bin/${targetPrefix}txlc $out/bin/txlc + '' + } + + # Wrap other scripts + for name in txl2c txlp; do + makeWrapper "${opentxl-unwrapped}/bin/$name" \ + "$out/bin/$name" \ + --set-default TXLLIB ${opentxl-unwrapped}/lib + done + + # Link to binaries that don't need wrapping + for name in txl txldb; do + ln -s "${opentxl-unwrapped}/bin/$name" "$out/bin/$name" + done + + runHook postInstall + ''; + + passthru = { + unwrapped = opentxl-unwrapped; + inherit (opentxl-unwrapped.passthru) tests; + }; + + meta = opentxl-unwrapped.meta // { + platforms = lib.platforms.unix; + }; +}) From 330f974c4cd825511bae44c8c4efff256a8b5769 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Fri, 10 Apr 2026 03:54:09 -0700 Subject: [PATCH 042/246] dmitry: 1.3a-unstable-2020-06-22 -> 1.3a-unstable-2026-03-26 --- .../implicit-function-declaration.patch | 28 ------------------- pkgs/by-name/dm/dmitry/package.nix | 10 ++----- 2 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 pkgs/by-name/dm/dmitry/implicit-function-declaration.patch diff --git a/pkgs/by-name/dm/dmitry/implicit-function-declaration.patch b/pkgs/by-name/dm/dmitry/implicit-function-declaration.patch deleted file mode 100644 index 608f90ccbc4d..000000000000 --- a/pkgs/by-name/dm/dmitry/implicit-function-declaration.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- - src/dmitry.c | 1 + - src/file.c | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/src/dmitry.c b/src/dmitry.c -index d47f231..567482d 100644 ---- a/src/dmitry.c -+++ b/src/dmitry.c -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/file.c b/src/file.c -index f4ad48b..3714786 100644 ---- a/src/file.c -+++ b/src/file.c -@@ -1,4 +1,6 @@ - #include "includes/file.h" -+#include -+#include - int file_prep() - { - outputfile[strlen(outputfile)] = '\0'; diff --git a/pkgs/by-name/dm/dmitry/package.nix b/pkgs/by-name/dm/dmitry/package.nix index 29c61a5d78a4..9faca894acb1 100644 --- a/pkgs/by-name/dm/dmitry/package.nix +++ b/pkgs/by-name/dm/dmitry/package.nix @@ -7,21 +7,17 @@ stdenv.mkDerivation { pname = "dmitry"; - version = "1.3a-unstable-2020-06-22"; + version = "1.3a-unstable-2026-03-26"; src = fetchFromGitHub { owner = "jaygreig86"; repo = "dmitry"; - rev = "f3ae08d4242e3e178271c827b86ff0d655972280"; - hash = "sha256-cYFeBM8xFMaLXYk6Rg+5JvfbbIJI9F3mefzCX3+XbB0="; + rev = "f2b8961dabbd55486a5649a9803446b860ad28e7"; + hash = "sha256-ZEfRaJ4ds1yWxN9VTFoBiUI5ZzK//aD7o9ry6vmA1YM="; }; - patches = [ ./implicit-function-declaration.patch ]; - nativeBuildInputs = [ autoreconfHook ]; - env.NIX_CFLAGS_COMPILE = toString [ "-fcommon" ]; - meta = { description = "Deepmagic Information Gathering Tool"; mainProgram = "dmitry"; From 44bd0f5ce4980dcced82e853126598506bc48612 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Fri, 10 Apr 2026 15:56:31 +0300 Subject: [PATCH 043/246] mpv-unwrapped: set `dontVersionCheck = true;` for darwin --- pkgs/by-name/mp/mpv-unwrapped/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/mp/mpv-unwrapped/package.nix b/pkgs/by-name/mp/mpv-unwrapped/package.nix index 5ffd823e81db..85293e0b650d 100644 --- a/pkgs/by-name/mp/mpv-unwrapped/package.nix +++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix @@ -287,6 +287,10 @@ stdenv.mkDerivation (finalAttrs: { ]; doInstallCheck = true; + # On macOS, mpv --version initializes the full Cocoa app framework and + # connects to the window server, which hangs in a headless build environment + dontVersionCheck = stdenv.hostPlatform.isDarwin; + passthru = { inherit # The wrapper consults luaEnv and lua.version From f343eb5592b3bb64c6c7a39a78413328d7799e16 Mon Sep 17 00:00:00 2001 From: Fazzi Date: Fri, 10 Apr 2026 21:11:07 +0100 Subject: [PATCH 044/246] sgdboop: add updateScript --- pkgs/by-name/sg/sgdboop/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sg/sgdboop/package.nix b/pkgs/by-name/sg/sgdboop/package.nix index bdec0922001c..67b0956e985a 100644 --- a/pkgs/by-name/sg/sgdboop/package.nix +++ b/pkgs/by-name/sg/sgdboop/package.nix @@ -5,6 +5,7 @@ curl, pkg-config, wrapGAppsHook3, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "sgdboop"; @@ -48,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: { curl ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Applying custom artwork to Steam, using SteamGridDB"; homepage = "https://github.com/SteamGridDB/SGDBoop/"; From e769d423947cd1ba62de2b12bd31b6d32452306a Mon Sep 17 00:00:00 2001 From: Fazzi Date: Fri, 10 Apr 2026 21:12:42 +0100 Subject: [PATCH 045/246] sgdboop: 1.3.1 -> 1.3.2 --- .../sg/sgdboop/hide_desktop_entry.patch | 22 ------------- pkgs/by-name/sg/sgdboop/package.nix | 12 ++----- .../sg/sgdboop/remove-unused-arg.patch | 31 ------------------- 3 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 pkgs/by-name/sg/sgdboop/hide_desktop_entry.patch delete mode 100644 pkgs/by-name/sg/sgdboop/remove-unused-arg.patch diff --git a/pkgs/by-name/sg/sgdboop/hide_desktop_entry.patch b/pkgs/by-name/sg/sgdboop/hide_desktop_entry.patch deleted file mode 100644 index 422c82fc4f29..000000000000 --- a/pkgs/by-name/sg/sgdboop/hide_desktop_entry.patch +++ /dev/null @@ -1,22 +0,0 @@ -From a4ca664abfac0b7efa7dbc48c6438bc1a5333962 Mon Sep 17 00:00:00 2001 -From: Fazzi -Date: Sat, 24 May 2025 20:55:50 +0100 -Subject: [PATCH] desktopFile: hide entry from app launchers - ---- - linux-release/com.steamgriddb.SGDBoop.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux-release/com.steamgriddb.SGDBoop.desktop b/linux-release/com.steamgriddb.SGDBoop.desktop -index 9c84cdb..9899682 100644 ---- a/linux-release/com.steamgriddb.SGDBoop.desktop -+++ b/linux-release/com.steamgriddb.SGDBoop.desktop -@@ -4,7 +4,7 @@ Comment=Apply Steam assets from SteamGridDB - Exec=SGDBoop %U - Terminal=false - Type=Application --NoDisplay=false -+NoDisplay=true - Icon=com.steamgriddb.SGDBoop - MimeType=x-scheme-handler/sgdb - Categories=Utility diff --git a/pkgs/by-name/sg/sgdboop/package.nix b/pkgs/by-name/sg/sgdboop/package.nix index 67b0956e985a..c6530e63ab2e 100644 --- a/pkgs/by-name/sg/sgdboop/package.nix +++ b/pkgs/by-name/sg/sgdboop/package.nix @@ -9,23 +9,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sgdboop"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "SteamGridDB"; repo = "SGDBoop"; tag = "v${finalAttrs.version}"; - hash = "sha256-FpVQQo2N/qV+cFhYZ1FVm+xlPHSVMH4L+irnQEMlUQs="; + hash = "sha256-/pXZMq80fb7Z+619ACnu/ZYWpouh59PIiruWY7l2cnQ="; }; - patches = [ - # Hide the app from app launchers, as it is not meant to be run directly - # Remove when https://github.com/SteamGridDB/SGDBoop/pull/112 is merged - ./hide_desktop_entry.patch - # remove unused arg to fix build - ./remove-unused-arg.patch - ]; - makeFlags = [ # The flatpak install just copies things to /app - otherwise wants to do things with XDG "FLATPAK_ID=fake" diff --git a/pkgs/by-name/sg/sgdboop/remove-unused-arg.patch b/pkgs/by-name/sg/sgdboop/remove-unused-arg.patch deleted file mode 100644 index feea11499c22..000000000000 --- a/pkgs/by-name/sg/sgdboop/remove-unused-arg.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 74bea8b264fa5d7ded02db66e2500ba9d72b58cf Mon Sep 17 00:00:00 2001 -From: Fazzi -Date: Wed, 31 Dec 2025 20:57:45 +0000 -Subject: [PATCH] remove unused arg - ---- - sgdboop.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sgdboop.c b/sgdboop.c -index f0d95c0..7e860f3 100644 ---- a/sgdboop.c -+++ b/sgdboop.c -@@ -1,4 +1,4 @@ --#include -+#include - #include - #include - #include -@@ -1276,7 +1276,7 @@ int main(int argc, char** argv) - struct nonSteamApp* apps = getNonSteamApps(); - struct nonSteamApp* appsMods = NULL; - if (includeMods) { -- appsMods = getMods(includeMods); -+ appsMods = getMods(); - } - - // Exit with an error if nothing found --- -2.51.2 - From 9589ac660e97e82e974433e1d4c65868931a5bde Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Sun, 12 Apr 2026 14:27:54 -0400 Subject: [PATCH 046/246] navidrome: 0.61.1 -> 0.61.2 changelog: https://github.com/navidrome/navidrome/releases/tag/v0.61.2 --- pkgs/by-name/na/navidrome/package.nix | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix index c8267ea640d0..242bd807785c 100644 --- a/pkgs/by-name/na/navidrome/package.nix +++ b/pkgs/by-name/na/navidrome/package.nix @@ -20,37 +20,23 @@ buildGoModule (finalAttrs: { pname = "navidrome"; - version = "0.61.1"; + version = "0.61.2"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${finalAttrs.version}"; - hash = "sha256-BRMJCBQl38AqsCI2UYQ9X36U57pg9uuiHsx8sHpVBKE="; + hash = "sha256-epSgGiDdfNRUaQtWoOd4ADKtF7Ptt3p9UOqsWBzZg7I="; }; - patches = [ - # https://github.com/navidrome/navidrome/pull/5276 (waiting on release) - (fetchpatch { - name = "regenerate-package-lock-json"; - url = "https://github.com/navidrome/navidrome/compare/v0.61.1...33a05ef662760fd9feb0a3ae43c7fe149eda610b.patch"; - hash = "sha256-IQ0wJ7vsSaLjBZS/fKIApNM8UV8oj6L2taCQIPhHvwg="; - }) - ]; - - vendorHash = "sha256-iVXJPP41rIpC6Tu1P/jWcePYCQ2Z9lEoTOrDLN26kTU="; + vendorHash = "sha256-RmmZudmWBxiw+c9g8KFEX+ALFD0xP/SBsYc6b6RWWO8="; npmRoot = "ui"; npmDeps = fetchNpmDeps { - inherit (finalAttrs) src patches; - # Remove after https://github.com/navidrome/navidrome/pull/5276 is released - # patches are applied after we run npmDeps without inheriting patches here - # so we have to get out of the sourceRoot to apply it then get back in to it - prePatch = "cd .."; - postPatch = "cd ui"; + inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/ui"; - hash = "sha256-iXey2XmDwsTR1/bIrBLzm6uvVGzPgQFcDLUtNy8robI="; + hash = "sha256-7hy2vLCEicKzjORpJZ0mrRS8PT3GsJ8DWdvj/7SrB70="; }; nativeBuildInputs = [ From 145ee344dfb5291d06eefe81af24fc7e91141f02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Apr 2026 06:07:44 +0000 Subject: [PATCH 047/246] orchard: 0.52.0 -> 0.54.0 --- pkgs/by-name/or/orchard/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 06b802336b53..8fdbd0c12a3e 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.52.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "orchard"; rev = version; - hash = "sha256-0TkgPmQq7PGelIvpAuDkwjhNOQlGpvVDNn6uT8UkFKw="; + hash = "sha256-Kf8RGYxgnXX9iEbZ9B0aRKUDQ5PgfyBfVk/C62zSrMU="; # 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; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-3NW62OgZ19uUajNqoKxOBxYLCP+V78Mw7La8+GGeAPY="; + vendorHash = "sha256-yFqYNfBHvUiBQ6OZlNq4aUBg48g8VnuIBYEAKKrb6Y4="; nativeBuildInputs = [ installShellFiles ]; From 046be2151563e9f89294e31eb7bec1857b523fca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Apr 2026 12:29:14 +0000 Subject: [PATCH 048/246] atftp: 0.8.0 -> 0.8.1 --- pkgs/by-name/at/atftp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/atftp/package.nix b/pkgs/by-name/at/atftp/package.nix index ad83c6487259..6204948caa8a 100644 --- a/pkgs/by-name/at/atftp/package.nix +++ b/pkgs/by-name/at/atftp/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "atftp"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "mirror://sourceforge/atftp/atftp-${finalAttrs.version}.tar.gz"; - hash = "sha256-3yqgicdnD56rQOVZjl0stqWC3FGCkm6lC01pDk438xY="; + hash = "sha256-lsvb0vFmFcicnbNr6bMG3hdtmhwD3LjLd3Ylv+BovCs="; }; # fix test script From 34109687c785cda76d0dd7b21987fd6fbca5bcd5 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 13 Apr 2026 19:00:10 -0700 Subject: [PATCH 049/246] lib/systems: fix incorrect CPU compatibility claims in isCompatible Fix several incorrect backward-compatibility claims in the isCompatible relation that do not reflect actual hardware/spec capabilities. - armv6m: Reverse direction. ARMv6-M (Cortex-M0) is Thumb-only and cannot run full ARMv6 ARM-state code; armv6m code runs on armv6l. https://developer.arm.com/documentation/ddi0432/latest/programmers-model/instruction-set-summary - armv7m: ARMv7-M (Cortex-M3/M4) is Thumb-2 only, cannot run ARM-state armv7l code. armv7a/armv7r (which have ARM-state) can run armv7m code. https://developer.arm.com/documentation/ddi0403/d/Application-Level-Architecture/The-ARMv7-M-Instruction-Set/About-the-instruction-set - armv8m: Remove armv8m->armv8a. ARMv8-M is Thumb-only M-profile with incompatible system registers and exception model. - aarch64<->armv8a: Remove bidirectional equivalence. AArch32 cannot execute A64 instructions. Keep one-directional aarch64->armv8a only. https://developer.arm.com/documentation/dui0801/b/BABBDFIH - armv8r: Remove armv8r->armv8a (and by extension armv8r->aarch64). ARMv8-R is a different profile with MPU (not MMU), a different exception model, and profile-specific instructions. - riscv32->riscv64: Remove. RV64 has no standard RV32 compat mode; identical encodings behave differently at XLEN=32 vs XLEN=64. https://docs.riscv.org/reference/isa/unpriv/rv64.html - wasm32->wasm64: Remove. Separate spec targets with different address types (i32 vs i64); a wasm64 runtime does not accept wasm32 modules. https://github.com/WebAssembly/spec/blob/wasm-3.0/proposals/memory64/Overview.md --- lib/systems/parse.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index cc787df92085..fd3df842c974 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -449,19 +449,17 @@ rec { (b == armv5tel && isCompatible a armv6l) # ARMv6 - (b == armv6l && isCompatible a armv6m) - (b == armv6m && isCompatible a armv7l) + (b == armv6m && isCompatible a armv6l) + (b == armv6l && isCompatible a armv7l) # ARMv7 (b == armv7l && isCompatible a armv7a) (b == armv7l && isCompatible a armv7r) - (b == armv7l && isCompatible a armv7m) + (b == armv7m && isCompatible a armv7a) + (b == armv7m && isCompatible a armv7r) # ARMv8 - (b == aarch64 && a == armv8a) (b == armv8a && isCompatible a aarch64) - (b == armv8r && isCompatible a armv8a) - (b == armv8m && isCompatible a armv8a) # PowerPC (b == powerpc && isCompatible a powerpc64) @@ -471,15 +469,9 @@ rec { (b == mips && isCompatible a mips64) (b == mipsel && isCompatible a mips64el) - # RISCV - (b == riscv32 && isCompatible a riscv64) - # SPARC (b == sparc && isCompatible a sparc64) - # WASM - (b == wasm32 && isCompatible a wasm64) - # identity (b == a) ]; From e6022dd46b65bf5f609f288305cd98963c4eddc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20L=C3=B3pez?= Date: Tue, 14 Apr 2026 12:11:40 +0200 Subject: [PATCH 050/246] sail: 0.5.3 -> 0.6.0 --- pkgs/by-name/sa/sail/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/sail/package.nix b/pkgs/by-name/sa/sail/package.nix index 7802eee190d1..c6ea659cfde6 100644 --- a/pkgs/by-name/sa/sail/package.nix +++ b/pkgs/by-name/sa/sail/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sail"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "lakehq"; repo = "sail"; tag = "v${finalAttrs.version}"; - hash = "sha256-PPtA/I2M99wiO7XRsR5UfPejjDXk/6sag5lhqwCctqo="; + hash = "sha256-ISTZwWDQ5DjNa5TC77Xea3zuhp2sSnp/NwD3ytYbjLc="; }; - cargoHash = "sha256-/NnaXzXvTT7ZRGGLjDpKFjcX65rz++MrWZYYO3JvBUU="; + cargoHash = "sha256-njc4c/xN9uWvNgOvswx1fwwynFrM9eHw4LUOFVYJ4ls="; cargoBuildFlags = [ "-p" From 4dd2966bb9f7644b23dc26a980fc3a1bbc532dd0 Mon Sep 17 00:00:00 2001 From: Pui Yong Qing Date: Tue, 14 Apr 2026 22:50:52 +0800 Subject: [PATCH 051/246] duplicati: 2.2.0.3 -> 2.3.0.0 --- pkgs/by-name/du/duplicati/deps.json | 1375 ++++++++++--------------- pkgs/by-name/du/duplicati/package.nix | 20 +- 2 files changed, 571 insertions(+), 824 deletions(-) diff --git a/pkgs/by-name/du/duplicati/deps.json b/pkgs/by-name/du/duplicati/deps.json index 8fbcac2f99dc..c5372b0c5fb1 100644 --- a/pkgs/by-name/du/duplicati/deps.json +++ b/pkgs/by-name/du/duplicati/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Aliyun.OSS.SDK.NetCore", - "version": "2.13.0", - "hash": "sha256-typ494jdjFk4+7NZTQdBLUCsEeDNwmYWooCn5a/WSgQ=" + "version": "2.14.1", + "hash": "sha256-B5d9M29mh81hoLk6mx3ysTISbDlJExPMoK7ldgVC35o=" }, { "pname": "AlphaVSS", @@ -21,8 +21,8 @@ }, { "pname": "Avalonia", - "version": "11.3.2", - "hash": "sha256-eDptsmrO7QxIvHm5kCs9ZE/N1tAuIBvaJMKiAcsu9yk=" + "version": "11.3.3", + "hash": "sha256-UvENUQgoTUikjIMTL+oI93FNwr1gZfoGVtZdYzBzdts=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -36,118 +36,133 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.3.2", - "hash": "sha256-Lr943SkpYMZz3+TPA7vc/mtbQH0r/eLewZFNGNf3i2M=" + "version": "11.3.3", + "hash": "sha256-zg35D8NygrU8mCAsLLoPmrzXZcV31NuHNtTaiZZhOxc=" }, { "pname": "Avalonia.Desktop", - "version": "11.3.2", - "hash": "sha256-A3LV30ekjXWdo/pRldL4S68AAA6BTuLU8ZGCinkNrvk=" + "version": "11.3.3", + "hash": "sha256-/jYjxA5vJqU5IpJkgnlathprzdHB/ihdL35ZZBRESeU=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.3.2", - "hash": "sha256-fMXY9p16o/wpUXFjRngf96gVwSlX/WCY0fn3nE/TmIY=" + "version": "11.3.3", + "hash": "sha256-rHBFnhZ+gAqPqqDfZxBxUr3wXIpgOc9hInwzDOgdk5E=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.3.2", - "hash": "sha256-Mxvpd5JKmIpjQCZmuiSb6IkKfwQhA3o712Ubdx0gP28=" + "version": "11.3.3", + "hash": "sha256-kUSE90HoJz9NsYCphLUQgNkxb3xHhFIlqXa6lzuGi4c=" }, { "pname": "Avalonia.Native", - "version": "11.3.2", - "hash": "sha256-HLVKaAVIRnm77lk7LJfrbiEmGWVIim7XMMoZAyGVUFA=" + "version": "11.3.3", + "hash": "sha256-QmvN5gUsgjk7ViacdXOwHULHid0TfAKJGW3cf9A8bwQ=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.3.2", - "hash": "sha256-NIkrj4pMvxVvznexzEXmNI8KXWLSXmVbHHWpwz9h3M8=" + "version": "11.3.3", + "hash": "sha256-gHZA53IyRAdeIg7yRIN6Pzh0AbOGd5B9mckEWsPuK7A=" }, { "pname": "Avalonia.Skia", - "version": "11.3.2", - "hash": "sha256-cBJo/tTewA2/LSygJ5aAyPPr11KpLPwS1I6kQxDMy24=" + "version": "11.3.3", + "hash": "sha256-pUMqXnupxztsAP/n4U2pSgTga89gy7CBLg39y2j0EjA=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.3.2", - "hash": "sha256-wwMxvJCMdRqnNYmsvzE+122D02HszLsfazPyik1yrBI=" + "version": "11.3.3", + "hash": "sha256-tWNl3jvESx96lTd6i0lxo6Y8/Y6cS5ZQrPovIolNfAE=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.3.2", - "hash": "sha256-c8QtpXv+B1CTkW9ovxOZwjRZAkD4KZzIvhIhI5WJXdo=" + "version": "11.3.3", + "hash": "sha256-nUfIEeJZgiLuy681S16Qncri6fvCGF7tYk4dSf3JY4s=" }, { "pname": "Avalonia.Win32", - "version": "11.3.2", - "hash": "sha256-FNs+O2knXcmUpfDjd/9JcNmpzEi8g3UQ3pQHItnN2U8=" + "version": "11.3.3", + "hash": "sha256-jlQXEdbZjfRsu2MjYzHGUAyn+uvdACXCvm63HjUKqfQ=" }, { "pname": "Avalonia.X11", - "version": "11.3.2", - "hash": "sha256-OCH5bwJ7Zje0/L7qtDcFa+yje/uwm2pYNE169J866/I=" + "version": "11.3.3", + "hash": "sha256-7A+uzB7g21P+RnKO4bKOJVY35qPz5Xna8n8VGG7RoMw=" }, { "pname": "AWSSDK.Core", - "version": "3.7.107.3", - "hash": "sha256-33huW/t/v8bhl90ow+3d1du5FRB+YWST/x1WrZ0vz4I=" + "version": "4.0.0.21", + "hash": "sha256-BGEZpLIiZYe64uiULb/+VoD94DBVDDIRuoKjHCiEekQ=" }, { "pname": "AWSSDK.Core", - "version": "3.7.400.45", - "hash": "sha256-DFNhchRpjNtLOKVpb34MlY0TDFgr653p9PZetBD40GE=" + "version": "4.0.3.17", + "hash": "sha256-cZKbx9QBDzhmdBz00agtlX8p6R3wUHrsF4UFV52JWLs=" + }, + { + "pname": "AWSSDK.Core", + "version": "4.0.3.3", + "hash": "sha256-R0+MXSzeuC8BonHwnZTUiYy7/d2d4O+GutJIOScpJEY=" }, { "pname": "AWSSDK.IdentityManagement", - "version": "3.7.402.39", - "hash": "sha256-swy1r4LkFTHOxPX8pcHqCiQCABptk7MiEjZSQs0Kycg=" + "version": "4.0.2.6", + "hash": "sha256-eauE658ihHIF6NP9p0Mb+4Myo8qH95FrMNbeFieQjNo=" }, { "pname": "AWSSDK.S3", - "version": "3.7.405.9", - "hash": "sha256-HjY4+G4/TShMMXwSSbymr5PwKOFOVSCDrOqBKpnh4Dk=" + "version": "4.0.6.4", + "hash": "sha256-Dr6R1X+S1swIiWRFzf+cnXHcXYI5Si9JuWtCM6Qp9VM=" }, { "pname": "AWSSDK.SecretsManager", - "version": "3.7.102.54", - "hash": "sha256-/zo535C9+P22uoeocoZN1pZxSjBJ+iImDRc4veeJ17k=" + "version": "4.0.0.1", + "hash": "sha256-SRoqmhxe1zbFqfjyppLcstS7rdD0ryb+745f9bC+JAE=" + }, + { + "pname": "AWSSDK.SecretsManager", + "version": "4.0.4.9", + "hash": "sha256-BuUzmYRyavpA8LTK8D2y6G8bOwP1h/rjAEuaCqw+cgM=" }, { "pname": "AWSSDK.SecretsManager.Caching", - "version": "1.0.6", - "hash": "sha256-xEHrVhjhNhLXgmee0loykELwisnrhAUv3WTJczcR8IU=" + "version": "2.0.0", + "hash": "sha256-seyWi9XyRefeldHLUYnX6+AACAwSHq6Yn6Da6ks210A=" }, { "pname": "Azure.Core", "version": "1.44.1", "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk=" }, + { + "pname": "Azure.Core", + "version": "1.46.2", + "hash": "sha256-vgSB95UVbZm+7a5h6WT82RysuWhBIhicM47b73DOjS4=" + }, + { + "pname": "Azure.Core", + "version": "1.49.0", + "hash": "sha256-ZLd8vl1QNHWYMOAx/ciDUNNfMGu2DFIfw37+FwiGI/4=" + }, { "pname": "Azure.Identity", - "version": "1.13.0", - "hash": "sha256-BXru3jP4oQchrBF/c3WDekZeRJlUxenBwVZ5YsifseI=" + "version": "1.17.0", + "hash": "sha256-ewFwqmJ6XKezk2f0xwX2CRKpeBfHFaLg+XbrPJxhc0Q=" }, { "pname": "Azure.Security.KeyVault.Secrets", - "version": "4.7.0", - "hash": "sha256-SNW1F7WLG+3h6fSXvWLI5sQhSFDXonVwI2qKlx6jsz0=" + "version": "4.8.0", + "hash": "sha256-/hM35v8wgHTTmT1H9bPokfScfpwVE5lVBHNVgYGqZcQ=" }, { "pname": "Azure.Storage.Blobs", - "version": "12.23.0", - "hash": "sha256-SMSelOQaPwRTv4qrgM1oIW0122KaMt4nBhHW1EzQg7Q=" + "version": "12.24.1", + "hash": "sha256-k9NgUaowtxiYMAY7OQj0wlbA9HrHa6jWvddsAzf9gXk=" }, { "pname": "Azure.Storage.Common", - "version": "12.22.0", - "hash": "sha256-mgE5u4uqEN/qxSE2K6d/nr3uIW9ZBXFkBKBUKWJwzwM=" - }, - { - "pname": "BouncyCastle.Cryptography", - "version": "2.5.1", - "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c=" + "version": "12.23.0", + "hash": "sha256-DAMzFlls76hH5jtXtU89SvbQWhhELaQq+PfG4SK7W+Q=" }, { "pname": "BouncyCastle.Cryptography", @@ -164,11 +179,31 @@ "version": "8.2.1", "hash": "sha256-ChyHHq/WCSXB3mCfwOnOS9Y0qQriAs48dhHTcUlM0wc=" }, + { + "pname": "coverlet.collector", + "version": "6.0.4", + "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0=" + }, { "pname": "DnsClient", "version": "1.8.0", "hash": "sha256-Xc8BOCI9M8gSM5raVnPezA4yeO1eoyxXPPn9jh5/RaY=" }, + { + "pname": "Docker.DotNet", + "version": "3.125.15", + "hash": "sha256-cjSYLFkOj0BNB2ebfIl+DLQbKS9e8l1kc9heG2xiLlk=" + }, + { + "pname": "Docker.DotNet", + "version": "3.125.5", + "hash": "sha256-A438eutk27tUqo3JF9uX166oqwZ15CpiFmgG3pvWMtQ=" + }, + { + "pname": "Docker.DotNet.X509", + "version": "3.125.15", + "hash": "sha256-3SfUvCT56iO72ahUtnmEVcBMy5pCQuctOnRyWeV7+5E=" + }, { "pname": "Duplicati.StreamUtil", "version": "1.0.5", @@ -176,18 +211,28 @@ }, { "pname": "FluentFTP", - "version": "52.0.0", - "hash": "sha256-RMnyFsB7vaeqgXEYnBRo7JAZlNMvE1heuU56zAiXuVk=" + "version": "52.1.0", + "hash": "sha256-JO8EVxemaN9LnD55KOCBypsRpnpQzhcpKEgGcJu3XGg=" + }, + { + "pname": "Glob", + "version": "1.1.3", + "hash": "sha256-sxnlp0d63OtpBWZAIUaiD2T8mpoOYmGZsHOeovk/x2E=" }, { "pname": "Google.Api.CommonProtos", - "version": "2.15.0", - "hash": "sha256-wOwLvQg5K1ni8n1mnPIWJ/peNe7slmyEMIrMXpMssTk=" + "version": "2.17.0", + "hash": "sha256-OwmbvR8rhoER0zlESUkNhfeRRHNUr7oZZtFhU2oY1q8=" }, { "pname": "Google.Api.Gax", - "version": "4.8.0", - "hash": "sha256-rf4lcppf6fqGSiWEaF2qyUs+ixwfvdFaCA8oJGvQg0A=" + "version": "4.11.0", + "hash": "sha256-fhfSfQhWgQ9ekWXHUyV2FUl4F1t+QbawrtMuTN1wxTI=" + }, + { + "pname": "Google.Api.Gax.Grpc", + "version": "4.11.0", + "hash": "sha256-n2WTG4oHMJ4lZLQU7MXsLfb//MIBPj9EF9E38A2PHTM=" }, { "pname": "Google.Api.Gax.Grpc", @@ -199,16 +244,106 @@ "version": "1.67.0", "hash": "sha256-lPOFFIxWjXhyuC9SX+eXAC0RwTMGftJyHOUIaB8FZlk=" }, + { + "pname": "Google.Apis", + "version": "1.68.0", + "hash": "sha256-KUFT+rWxzeWVMWc34cqrFs1N/FxvG15vWqZruwWXHX4=" + }, + { + "pname": "Google.Apis", + "version": "1.69.0", + "hash": "sha256-/9JN0CZIFZnmGS69ki38RlNzQiwp4yO0MFDeRk1slsg=" + }, + { + "pname": "Google.Apis", + "version": "1.70.0", + "hash": "sha256-pa/BLxHH0pMKmrfEX54/qQRovdf1/Fs97hdg5tLSJ9c=" + }, + { + "pname": "Google.Apis.Admin.Directory.directory_v1", + "version": "1.68.0.3428", + "hash": "sha256-1n3/yna7J1PZvMCjhRqJ1GPLzn0xPM5b/y5ewxPGOnE=" + }, { "pname": "Google.Apis.Auth", "version": "1.67.0", "hash": "sha256-94oqqO/ANVpmnfNxBNzub8MRAfW2mO5lMCdGRFeRtGs=" }, + { + "pname": "Google.Apis.Auth", + "version": "1.68.0", + "hash": "sha256-pptb3sxuFZMREdgGDJzdOSfn84XF5PMzzXwe+w7N+kQ=" + }, + { + "pname": "Google.Apis.Auth", + "version": "1.69.0", + "hash": "sha256-T6n3hc+KpgHNqQQeJLOmgHQWkjBvnhIob5giHabREV8=" + }, + { + "pname": "Google.Apis.Auth", + "version": "1.70.0", + "hash": "sha256-khwUg91urKIN8w8OsemVT2YaQcprsFYwCBoP4A0gaNg=" + }, + { + "pname": "Google.Apis.Calendar.v3", + "version": "1.68.0.3430", + "hash": "sha256-Rv73SHF0Ii5Xt5kPm5xLJnNSDIFZZ7Ex+jILAnyCeG0=" + }, { "pname": "Google.Apis.Core", "version": "1.67.0", "hash": "sha256-Ton1HRZ9C0yhT2g6+4Iv4EGEyVuYbAtRd1s8hunyVns=" }, + { + "pname": "Google.Apis.Core", + "version": "1.68.0", + "hash": "sha256-eoGiEopf3PfqAJYxBqomtV6f2mMBeXyjyXlXOAqbsis=" + }, + { + "pname": "Google.Apis.Core", + "version": "1.69.0", + "hash": "sha256-IW1AOY8o6hHkrc/tINsS/VCOUrOSoXb6OCSEF6gamkc=" + }, + { + "pname": "Google.Apis.Core", + "version": "1.70.0", + "hash": "sha256-Q+qXXU5yB3I1iJIWguORmyPBEtCryL79xT6HG7cp9Ag=" + }, + { + "pname": "Google.Apis.Drive.v3", + "version": "1.68.0.3428", + "hash": "sha256-qixUOjNFVtxRjXhh9GhoJB7eJ2c8Oc+dT1LgbthuEzU=" + }, + { + "pname": "Google.Apis.Gmail.v1", + "version": "1.68.0.3427", + "hash": "sha256-PnMR9/GCUXaDSjwXXTk5t+NgKiA1Ni0NA/EOmsAXVEE=" + }, + { + "pname": "Google.Apis.Groupssettings.v1", + "version": "1.68.0.2366", + "hash": "sha256-IDjHaiQoMT402SMC6seZWdKBVFyZiPvs6v/MtfRsAiA=" + }, + { + "pname": "Google.Apis.HangoutsChat.v1", + "version": "1.68.0.3393", + "hash": "sha256-y1dwRSm/CyYKqUcfmHs+eJusZvp0g685nGhZmoBI+ck=" + }, + { + "pname": "Google.Apis.Keep.v1", + "version": "1.69.0.3729", + "hash": "sha256-Qc/ofGOLzuWKjDvE6/Ks6W6N3Qir4F7bcf4Ch2HNbe8=" + }, + { + "pname": "Google.Apis.PeopleService.v1", + "version": "1.69.0.3785", + "hash": "sha256-xAWSXZXwY1kXM6A/azoZ3Exxe1Ka9b9yIPLdYxHl4lQ=" + }, + { + "pname": "Google.Apis.Tasks.v1", + "version": "1.68.0.3435", + "hash": "sha256-gOmrPAX9WCllceAcUjdGJwtzil6M+Qr/Ni/2Sk3wmtQ=" + }, { "pname": "Google.Cloud.Iam.V1", "version": "3.2.0", @@ -221,33 +356,38 @@ }, { "pname": "Google.Cloud.SecretManager.V1", - "version": "2.5.0", - "hash": "sha256-Rce3zJJgQAQc0uioGPW5Dso89giSPoWD7rEedwvR9+Q=" + "version": "2.6.0", + "hash": "sha256-tYmiyUZ2vqjUIMjNILoc+Rx73xdOuCTHjcE/ZMDNw4g=" }, { "pname": "Google.Protobuf", - "version": "3.25.0", - "hash": "sha256-/jIVe+EHFCMhRrrr2xvH08pil/R1dUYFZMOzNFDW35M=" + "version": "3.31.1", + "hash": "sha256-UEcn4H8F+zK0AjSmz1aTyyMksLxJOGNf2IROtF+DydA=" }, { "pname": "Grpc.Auth", - "version": "2.60.0", - "hash": "sha256-Dh3YdI4oEeU56yrdw7M2TTrFQhV/esQ9xR7B8meEjV4=" + "version": "2.71.0", + "hash": "sha256-rAPPqUeRlWuoMGhdwCrLd1UlIFfSnGP1qhg1yDG3d9c=" }, { "pname": "Grpc.Core.Api", - "version": "2.60.0", - "hash": "sha256-FbYBWvkigIa6QeX1xFj2KdUejrZJuiGS1QRxtuLcM5o=" + "version": "2.71.0", + "hash": "sha256-OEA0FHDwIlegydD1+Ml5erYx4qTQnkL6NCpxq3r2InM=" }, { "pname": "Grpc.Net.Client", - "version": "2.60.0", - "hash": "sha256-ERK7ywlKRlkKW6gNSCG9YSbuYw6TKl/JL1pSGUPYjRk=" + "version": "2.71.0", + "hash": "sha256-qswuDuRoMSkXlVOIex9KTfTagRhzfoIBCV5GO7RddoA=" }, { "pname": "Grpc.Net.Common", - "version": "2.60.0", - "hash": "sha256-mP2z7akNUrKbkd0L8sIuHsaEdu79vdVv7eVQp1RsNzY=" + "version": "2.71.0", + "hash": "sha256-TEPDYKHR6b9iJtmEULjWtJZLBPIw2RO6/6HSNV1SMNI=" + }, + { + "pname": "Handlebars.Net", + "version": "2.1.6", + "hash": "sha256-NHYBsscfLmPXH9uU2dKM+NWGmVuWXtXx94D8FuvLgkA=" }, { "pname": "HarfBuzzSharp", @@ -276,8 +416,13 @@ }, { "pname": "jose-jwt", - "version": "5.0.0", - "hash": "sha256-6KWfdHo1gDa2WNkb3zZp9AP9DmtUcPhxInA3dYzkUd0=" + "version": "5.2.0", + "hash": "sha256-19gVfzYRhc9NmfQWNldcuVy5L/F3mdmS+jo/5FEh2hA=" + }, + { + "pname": "JsonSignature", + "version": "1.0.0", + "hash": "sha256-b9NpuWrZoIA3sYEd0anMS9WU0woZdgOvLsR1Ih9qhy4=" }, { "pname": "MailKit", @@ -291,8 +436,8 @@ }, { "pname": "Meziantou.Framework.Win32.CredentialManager", - "version": "1.7.0", - "hash": "sha256-877bxeMROoJLxM5moeXkKqSdQDxQT1tE2tn6NAvN4Ic=" + "version": "1.7.4", + "hash": "sha256-KtCrBmzvJmDLn3ZD0yTzojeaX8oMjSduhELUVZzliw4=" }, { "pname": "MicroCom.Runtime", @@ -306,93 +451,78 @@ }, { "pname": "Microsoft.AspNetCore.Authentication.JwtBearer", - "version": "8.0.3", - "hash": "sha256-Q3m4kta05geZb53vFa3pDaY4KdPl60smeRaAUMBPwRU=" + "version": "10.0.0", + "hash": "sha256-VJREi/phDmn2toJiTvyFbUO0qXG/Ef4QtbeVHLNJNw0=" }, { "pname": "Microsoft.AspNetCore.HostFiltering", - "version": "2.2.0", - "hash": "sha256-g3Tm1j/54w/CiZlOHm7Lo0prDzWEoGd+94kTAdd8ixs=" - }, - { - "pname": "Microsoft.AspNetCore.Hosting.Abstractions", - "version": "2.2.0", - "hash": "sha256-GzqYrTqCCVy41AOfmgIRY1kkqxekn5T0gFC7tUMxcxA=" - }, - { - "pname": "Microsoft.AspNetCore.Hosting.Server.Abstractions", - "version": "2.2.0", - "hash": "sha256-8PnZFCkMwAeEHySmmjJOnQvOyx2199PesYHBnfka51s=" - }, - { - "pname": "Microsoft.AspNetCore.Http", - "version": "2.2.0", - "hash": "sha256-+ARZomTXSD1m/PR3TWwifXb67cQtoqDVWEqfoq5Tmbk=" - }, - { - "pname": "Microsoft.AspNetCore.Http.Abstractions", - "version": "2.2.0", - "hash": "sha256-y3j3Wo9Xl7kUdGkfnUc8Wexwbc2/vgxy7c3fJk1lSI8=" - }, - { - "pname": "Microsoft.AspNetCore.Http.Extensions", - "version": "2.2.0", - "hash": "sha256-1rXxGQnkNR+SiNMtDShYoQVGOZbvu4P4ZtWj5Wq4D4U=" - }, - { - "pname": "Microsoft.AspNetCore.Http.Features", - "version": "2.2.0", - "hash": "sha256-odvntHm669YtViNG5fJIxU4B+akA2SL8//DvYCLCNHc=" - }, - { - "pname": "Microsoft.AspNetCore.WebUtilities", - "version": "2.2.0", - "hash": "sha256-UdfOwSWqOUXdb0mGrSMx6Z+d536/P+v5clSRZyN5QTM=" + "version": "2.3.0", + "hash": "sha256-WLsann5Ip5/yPRJsmcQnMGameVmv3AzeNH51UOXD0CY=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "6.0.0", "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "8.0.0", + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" + }, { "pname": "Microsoft.CodeCoverage", "version": "17.14.1", "hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs=" }, { - "pname": "Microsoft.CSharp", - "version": "4.7.0", - "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" + "pname": "Microsoft.Data.Sqlite", + "version": "9.0.4", + "hash": "sha256-OpXP5kIG1F82oYxvc+CkW0a27kU31+ZjvrIyZeCi3d8=" + }, + { + "pname": "Microsoft.Data.Sqlite.Core", + "version": "9.0.4", + "hash": "sha256-OJs5gZSKnmDabm6UehVhzYFtsgEmScyNrzbQ+ojiRoI=" }, { "pname": "Microsoft.Extensions.ApiDescription.Server", - "version": "6.0.5", - "hash": "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4=" + "version": "10.0.0", + "hash": "sha256-fgJ4g1gRX2W+TmNWxboxATYnZQxAGIpvl0EZD3BMVM0=" }, { "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "7.0.0", - "hash": "sha256-amTyuT7kg8aSeurpC9cnxN5YnlNixoFZMuls0vgkacM=" + "version": "10.0.0", + "hash": "sha256-IciARPnXx/S6HZc4t2ED06UyUwfZI9LKSzwKSGdpsfI=" }, { "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "9.0.4", - "hash": "sha256-/VJBbIJzRXjzQ07s4Bicb+WNV0ZAC+/naG2nLVxFvjU=" + "version": "8.0.0", + "hash": "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI=" }, { "pname": "Microsoft.Extensions.Caching.Memory", - "version": "7.0.0", - "hash": "sha256-riW2ljjCXv5T9RjCnmdOH6wMKhFCfA1bLV7iHMwzuCY=" + "version": "10.0.0", + "hash": "sha256-AMgDSm1k6q0s17spGtyR5q8nAqUFDOxl/Fe38f9M+d4=" }, { "pname": "Microsoft.Extensions.Caching.Memory", - "version": "9.0.4", - "hash": "sha256-5uynkW+dK61Zp1+vs5uW6mwpnkZl7mH/bGSQoGjJH2c=" + "version": "8.0.1", + "hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps=" }, { "pname": "Microsoft.Extensions.Configuration", - "version": "8.0.0", - "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" + "version": "10.0.0", + "hash": "sha256-MsLskVPpkCvov5+DWIaALCt1qfRRX4u228eHxvpE0dg=" + }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "2.2.0", + "hash": "sha256-dGJjKmio5BNFdwhK09NxJyCBapwVtO3eWxjLoTMGRQg=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "10.0.0", + "hash": "sha256-GcgrnTAieCV7AVT13zyOjfwwL86e99iiO/MiMOxPGG0=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", @@ -400,14 +530,24 @@ "hash": "sha256-5Jjn+0WZQ6OiN8AkNlGV0XIaw8L+a/wAq9hBD88RZbs=" }, { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "8.0.0", - "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "10.0.0", + "hash": "sha256-YSiWoA3VQR22k6+bSEAUqeG7UDzZlJfHWDTubUO5V8U=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "8.0.0", - "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" + "version": "2.2.0", + "hash": "sha256-cigv0t9SntPWjJyRWMy3Q5KnuF17HoDyeKq26meTHoM=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "10.0.0", + "hash": "sha256-LYm9hVlo/R9c2aAKHsDYJ5vY9U0+3Jvclme3ou3BtvQ=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "2.2.0", + "hash": "sha256-k/3UKceE1hbgv1sfV9H85hzWvMwooE8PcasHvHMhe1M=" }, { "pname": "Microsoft.Extensions.DependencyInjection", @@ -415,9 +555,9 @@ "hash": "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g=" }, { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.0", - "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "10.0.0", + "hash": "sha256-9iodXP39YqgxomnOPOxd/mzbG0JfOSXzFoNU3omT2Ps=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", @@ -444,35 +584,30 @@ "version": "8.0.2", "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "9.0.4", - "hash": "sha256-6WcGpsAYRhrpHloEom0oVP7Ff4Gh/O1XWJETJJ3LvEQ=" - }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "8.0.0", - "hash": "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4=" + "version": "10.0.0", + "hash": "sha256-o7QkCisEcFIh227qBUfWFci2ns4cgEpLqpX7YvHGToQ=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "8.0.0", - "hash": "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY=" - }, - { - "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "2.2.0", - "hash": "sha256-pLAxP15+PncMiRrUT5bBAhWg7lC6/dfQk5TLTpZzA7k=" - }, - { - "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "2.2.0", - "hash": "sha256-YZcyKXL6jOpyGrDbFLu46vncfUw2FuqhclMdbEPuh/U=" + "version": "10.0.0", + "hash": "sha256-cix7QxQ/g3sj6reXu3jn0cRv2RijzceaLLkchEGTt5E=" }, { "pname": "Microsoft.Extensions.Http", - "version": "8.0.0", - "hash": "sha256-UgljypOLld1lL7k7h1noazNzvyEHIJw+r+6uGzucFSY=" + "version": "10.0.0", + "hash": "sha256-gnsO9erEi7xLS3QwYukcrzPDpcUgRkNFnGzPARHVjrs=" + }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "10.0.0", + "hash": "sha256-P+zPAadLL63k/GqK34/qChqQjY9aIRxZfxlB9lqsSrs=" + }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "2.2.0", + "hash": "sha256-lY9axb6/MyPAhE+N8VtfCIpD80AFCtxUnnGxvb2koy8=" }, { "pname": "Microsoft.Extensions.Logging", @@ -480,9 +615,9 @@ "hash": "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8=" }, { - "pname": "Microsoft.Extensions.Logging", - "version": "8.0.0", - "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "10.0.0", + "hash": "sha256-BnhgGZc01HwTSxogavq7Ueq4V7iMA3wPnbfRwQ4RhGk=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", @@ -494,6 +629,11 @@ "version": "6.0.0", "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "6.0.4", + "hash": "sha256-lmupgJs9PNzpMfe1LcxY903S6LwiaR8Zm+dOK7JaTV4=" + }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "7.0.0", @@ -504,20 +644,30 @@ "version": "8.0.0", "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.2", + "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" + }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "8.0.3", "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q=" }, { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "9.0.4", - "hash": "sha256-n0ZRhQ7U/5Kv1hVqUXGoa5gfrhzcy77yFhfonjq6VFc=" + "pname": "Microsoft.Extensions.Logging.Configuration", + "version": "2.2.0", + "hash": "sha256-KeAgb1vzW3HOd1+Bp741nHshe2DVVH2OCEU4suam69o=" }, { - "pname": "Microsoft.Extensions.ObjectPool", + "pname": "Microsoft.Extensions.Logging.Console", "version": "2.2.0", - "hash": "sha256-P+QUM50j/V8f45zrRqat8fz6Gu3lFP+hDjESwTZNOFg=" + "hash": "sha256-7qmSYQZGqjuW1JYLzUQCTjl/Ox6ZLjIBJQswNUNjnLw=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "10.0.0", + "hash": "sha256-j5MOqZSKeUtxxzmZjzZMGy0vELHdvPraqwTQQQNVsYA=" }, { "pname": "Microsoft.Extensions.Options", @@ -531,18 +681,23 @@ }, { "pname": "Microsoft.Extensions.Options", - "version": "8.0.0", - "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" - }, - { - "pname": "Microsoft.Extensions.Options", - "version": "9.0.4", - "hash": "sha256-QyjtRCG+L9eyH/UWHf/S+7/ZiSOmuGNoKGO9nlXmjxI=" + "version": "8.0.2", + "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "8.0.0", - "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" + "version": "10.0.0", + "hash": "sha256-XGAs5DxMvWnmjX8dqRwKY0vsuS40SHvsfJqB1rO4L7k=" + }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "2.2.0", + "hash": "sha256-TZKLbSNM32hTzzDIKlRNcu6V2NhLfXTz+ew7QPvNJXE=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "10.0.0", + "hash": "sha256-Dup08KcptLjlnpN5t5//+p4n8FUTgRAq4n/w1s6us+I=" }, { "pname": "Microsoft.Extensions.Primitives", @@ -559,20 +714,15 @@ "version": "8.0.0", "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "9.0.4", - "hash": "sha256-v/Ygyo1TMTUbnhdQSV2wzD4FOgAEWd1mpESo3kZ557g=" - }, { "pname": "Microsoft.Identity.Client", - "version": "4.65.0", - "hash": "sha256-gkBVLb8acLYexNM4ZzMJ0qfDp2UqjUt0yiu3MfMcWig=" + "version": "4.76.0", + "hash": "sha256-v5/iulShs0yMHvNoRo/pbDVYu3tOl9Y7kovSKJbgQnc=" }, { "pname": "Microsoft.Identity.Client.Extensions.Msal", - "version": "4.65.0", - "hash": "sha256-Xmy/evicLvmbC+6ytxwVE646uVcJB5yMpEK73H5tzD0=" + "version": "4.76.0", + "hash": "sha256-OCt+XN0tt1URnn0Wh7y19YCNo3ViG5th9HAa6GusFeE=" }, { "pname": "Microsoft.IdentityModel.Abstractions", @@ -581,83 +731,58 @@ }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "7.1.2", - "hash": "sha256-QN2btwsc8XnOp8RxwSY4ntzpqFIrWRZg6ZZEGBZ6TQY=" - }, - { - "pname": "Microsoft.IdentityModel.Abstractions", - "version": "7.5.0", - "hash": "sha256-C849ySgag1us+IfgbSsloz6HTKeuEkN14HGFv4OML1o=" + "version": "8.14.0", + "hash": "sha256-bkCuz1Wj56N+LHWLvHKLcCtIRqBK+3k5vD2qfB7xXKk=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "7.5.0", - "hash": "sha256-TbU0dSLxUaTBxd9aLAlG4EeR2lrBE+6RJUlgefbqsQg=" + "version": "8.14.0", + "hash": "sha256-YBXaSWnLgxIQxv+Lwt2aRC20miFguNZbbuTc2Jjq+Ys=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "7.1.2", - "hash": "sha256-6M7Y1u2cBVsO/dP+qrgkMLisXbZgMgyWoRs5Uq/QJ/o=" - }, - { - "pname": "Microsoft.IdentityModel.Logging", - "version": "7.5.0", - "hash": "sha256-RdUbGTvnbB11pmWxEKRaP6uPI2ITEcB/PxqgxHl33uM=" + "version": "8.14.0", + "hash": "sha256-QvCJplLvTGTXZKGbRMccW2hld6oWUhHkneZd+msn9aE=" }, { "pname": "Microsoft.IdentityModel.Protocols", - "version": "7.1.2", - "hash": "sha256-6OXP0vQ6bQ3Xvj3I73eqng6NqqMC4htWKuM8cchZhWI=" + "version": "8.0.1", + "hash": "sha256-v3DIpG6yfIToZBpHOjtQHRo2BhXGDoE70EVs6kBtrRg=" }, { "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect", - "version": "7.1.2", - "hash": "sha256-cAwwCti+/ycdjqNy8PrBNEeuF7u5gYtCX8vBb2qIKRs=" + "version": "8.0.1", + "hash": "sha256-ZHKaZxqESk+OU1SFTFGxvZ71zbdgWqv1L6ET9+fdXX0=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "7.5.0", - "hash": "sha256-AI74ljCROXqXcktxc9T80NpBvwDZeVnRlJz+ofk1RVs=" + "version": "8.0.1", + "hash": "sha256-beVbbVQy874HlXkTKarPTT5/r7XR1NGHA/50ywWp7YA=" + }, + { + "pname": "Microsoft.IdentityModel.Tokens", + "version": "8.14.0", + "hash": "sha256-ALeMe3AjEy4dazHTBeR1JHMtzm+sqS3RbrjQWoNbuno=" }, { "pname": "Microsoft.IO.RecyclableMemoryStream", "version": "3.0.0", "hash": "sha256-WBXkqxC5g4tJ481sa1uft39LqA/5hx5yOfiTfMRMg/4=" }, - { - "pname": "Microsoft.Net.Http.Headers", - "version": "2.2.0", - "hash": "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA=" - }, { "pname": "Microsoft.NET.Test.Sdk", "version": "17.14.1", "hash": "sha256-mZUzDFvFp7x1nKrcnRd0hhbNu5g8EQYt8SKnRgdhT/A=" }, { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.1", - "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "3.1.0", - "hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + "pname": "Microsoft.NETCore.App.Host.win-x64", + "version": "10.0.5", + "hash": "sha256-Rstfo3XefLjeoW5qfVcHsCviFxWvZS+F8McWRUW7WdQ=" }, { "pname": "Microsoft.OpenApi", - "version": "1.2.3", - "hash": "sha256-OafkxXKnDmLZo5tjifjycax0n0F/OnWQTEZCntBMYR0=" + "version": "2.3.0", + "hash": "sha256-nfg+g85wy5q1dnRnCYXrINogyspNNTKr9Jd6bj7tXXM=" }, { "pname": "Microsoft.Testing.Extensions.Telemetry", @@ -700,20 +825,30 @@ "hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs=" }, { - "pname": "Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + "pname": "Microsoft.VisualStudio.Threading", + "version": "16.3.52", + "hash": "sha256-FqNJQb3Wb9J80Im7PrySPSv6zBnD/SVV5hbFpSBiE5E=" + }, + { + "pname": "Microsoft.VisualStudio.Validation", + "version": "15.3.15", + "hash": "sha256-Oak+dVXUSIIHNle8a9OliVq6Qoz5BVmz7JtCFmkWeew=" }, { "pname": "Microsoft.Win32.SystemEvents", - "version": "7.0.0", - "hash": "sha256-i6JojctqrqfJ4Wa+BDtaKZEol26jYq5DTQHar2M9B64=" + "version": "10.0.0", + "hash": "sha256-p0rfcBwM6pkVY+G49ujVcHwwFgrEq46FGPpGFOg0H5w=" }, { "pname": "MimeKit", "version": "4.12.0", "hash": "sha256-4i/RvXyXQsb6LlEs7tZWz5d5ab8mw3R8Wwp7FXSbMaA=" }, + { + "pname": "MimeKit", + "version": "4.15.1", + "hash": "sha256-MI4Wr+JWoxR9wsYhKmW8j1EdJ59W/O4jv5D9Zb8mEUw=" + }, { "pname": "Minio", "version": "6.0.0", @@ -724,6 +859,11 @@ "version": "7.1.0-final.1.21458.1", "hash": "sha256-tm3niOm4OFCe/kL5M5zwCZgfHEaPtmDqsOLN6GExYHs=" }, + { + "pname": "Newtonsoft.Json", + "version": "10.0.2", + "hash": "sha256-3sh8wVDIKnWDkS0l/C5eAvXdXDhjO52u/fu/CsoM6w8=" + }, { "pname": "Newtonsoft.Json", "version": "13.0.1", @@ -736,8 +876,8 @@ }, { "pname": "NGettext", - "version": "0.6.5", - "hash": "sha256-6ekvTFxc+HoNaSpUgY29wioc9MTXNEnmPNvsNJECN28=" + "version": "0.6.7", + "hash": "sha256-fmIODwPZkNJsnoNJG+EL1J5mpbuxYI4BsrgD1B4N2NI=" }, { "pname": "NUnit", @@ -755,194 +895,14 @@ "hash": "sha256-J0tWqpW5lSZjcV1hV2sAuAQwLR1VK37rEmcLzlUGXC8=" }, { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + "pname": "Polly", + "version": "7.1.1", + "hash": "sha256-KsKbbMB84kq2IkOI8PQdl0oIYmVlaN8U/+foHg//yZU=" }, { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" - }, - { - "pname": "runtime.any.System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" - }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" - }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c=" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg=" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" - }, - { - "pname": "runtime.native.System.Net.Http", - "version": "4.3.0", - "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.1", - "hash": "sha256-Mt2QAjNH5nKnwpbyoUe2O+En97CP84EQFoS3CkmYXAM=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8=" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ=" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.1", - "hash": "sha256-J5RHzSIfUs001NsY82+ZXn0ZIqux+aLvY7uDuXjRd8U=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U=" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI=" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU=" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA=" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q=" - }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" - }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" - }, - { - "pname": "SharpAESCrypt", - "version": "2.0.2", - "hash": "sha256-kaZBgat1O2sC3dJeLams0pSACTP5jyI4cVJnq9/4E1c=" + "pname": "Portable.BouncyCastle", + "version": "1.9.0", + "hash": "sha256-GOXM4TdTTodWlGzEfbMForTfTQI/ObJGnFZMSD6X8E4=" }, { "pname": "SharpAESCrypt", @@ -951,8 +911,18 @@ }, { "pname": "SharpCompress", - "version": "0.39.0", - "hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE=" + "version": "0.40.0", + "hash": "sha256-pxz5ef//xOUClwuyflO0eLAfUItFcwfq74Cf0Hj5c1E=" + }, + { + "pname": "SharpZipLib", + "version": "1.3.3", + "hash": "sha256-HWEQTKh9Ktwg/zIl079dAiH+ob2ShWFAqLgG6XgIMr4=" + }, + { + "pname": "SharpZipLib", + "version": "1.4.2", + "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY=" }, { "pname": "SkiaSharp", @@ -981,38 +951,63 @@ }, { "pname": "SMBLibrary", - "version": "1.5.3.5", - "hash": "sha256-kM3grb2Z3D3fq0lxmMMiC79TzW/yMAWlyuoBocDaNn8=" + "version": "1.5.4", + "hash": "sha256-gb/IV3ijoyLVJOwwbJdKgb7h38SknMe3bwIkkcMnXqM=" }, { "pname": "SMBLibrary.Win32", - "version": "1.5.3", - "hash": "sha256-GIqDqHeIcYIafoZDefAEUpe8hR+tF9ZwsdUTEo/BSuU=" + "version": "1.5.4", + "hash": "sha256-470p+EN55r9qF01+Hhlh9Fihdn06DLaGSSY8lfbxrM0=" }, { "pname": "sqlite-net-pcl", "version": "1.7.335", "hash": "sha256-Fgd8RBs2INbjbLj/jquoPNo4a1h5J5fqu0fGd7TIj/I=" }, + { + "pname": "sqlite-net-pcl", + "version": "1.9.172", + "hash": "sha256-0PTcOwm4k8bMeLm5+z0iWjy379KYdQXjqkaBGBR20cc=" + }, + { + "pname": "SQLitePCLRaw.bundle_e_sqlite3", + "version": "2.1.10", + "hash": "sha256-kZIWjH/TVTXRIsHPZSl7zoC4KAMBMWmgFYGLrQ15Occ=" + }, { "pname": "SQLitePCLRaw.bundle_green", - "version": "2.0.3", - "hash": "sha256-czAZUnFLYj/dpGnYktZA3aF3irmSwQWY6rYKFAmMH+Y=" + "version": "2.1.10", + "hash": "sha256-IanG4p+Jb/2TYaxEEdKb/Ecs6TtJaboQYUCyC5sYC/s=" + }, + { + "pname": "SQLitePCLRaw.bundle_green", + "version": "2.1.2", + "hash": "sha256-7858BCblsCoALR11Q7ejjPKHk7johTjWxgndHwUYNws=" }, { "pname": "SQLitePCLRaw.core", - "version": "2.0.3", - "hash": "sha256-I+aR7ORnFEoM+/N5kLJKBj3JYToe+iNs849ev/4w81Q=" + "version": "2.1.10", + "hash": "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8=" }, { "pname": "SQLitePCLRaw.lib.e_sqlite3", - "version": "2.0.3", - "hash": "sha256-3fxPesqzLm9RjK4KBPjYKWNZP+JcqzYnH6JGeVQTG2g=" + "version": "2.1.10", + "hash": "sha256-m2v2RQWol+1MNGZsx+G2N++T9BNtQGLLHXUjcwkdCnc=" }, { - "pname": "SQLitePCLRaw.provider.dynamic_cdecl", - "version": "2.0.3", - "hash": "sha256-/sJ8N05Pzj33oA0CUHr8EctiBQIofe7o/RgWwGPeuZI=" + "pname": "SQLitePCLRaw.provider.e_sqlite3", + "version": "2.1.10", + "hash": "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg=" + }, + { + "pname": "SSH.NET", + "version": "2020.0.2", + "hash": "sha256-VYPoLohzt8yRZyEgO3u2C6fRHpDi8QI1w4f91aQ8uKI=" + }, + { + "pname": "SSH.NET", + "version": "2024.2.0", + "hash": "sha256-CHPPXp1yvSXFCcqGy1foMBkj4twhYukyB5aLFsFTiU4=" }, { "pname": "SSH.NET", @@ -1025,80 +1020,50 @@ "hash": "sha256-uUoFNQkAEG8d16TkEKfiU3hgoIIIE62o9129BzWIbjA=" }, { - "pname": "Stub.System.Data.SQLite.Core.NetStandard", - "version": "1.0.115", - "hash": "sha256-TZEqV45YCSCYQrrPMnu64PI7oT7/2sAQV/BGqeDe9JI=" + "pname": "SshNet.Security.Cryptography", + "version": "1.3.0", + "hash": "sha256-kDpV7/n4plAPh+FqsPbCA/kFHHfmJGsJDTQg2wRLOfk=" }, { "pname": "Swashbuckle.AspNetCore", - "version": "6.5.0", - "hash": "sha256-thAX5M8OihCU5Pmht5FzQPR7K+gbia580KnI8i9kwUw=" + "version": "10.0.1", + "hash": "sha256-Z2PdGCqPnSW0JQOxxOYLAyiDQFfcMw1AUrUBVozb+Ww=" }, { "pname": "Swashbuckle.AspNetCore.Swagger", - "version": "6.5.0", - "hash": "sha256-bKJG6fhLBB5rKoVm0nc4PfecBtDg/r2G1hrZ6Izryug=" + "version": "10.0.1", + "hash": "sha256-TcF+0JBZ2dhTeZv2H5uddxw9mEVmIzWOc21PoVjDUI4=" }, { "pname": "Swashbuckle.AspNetCore.SwaggerGen", - "version": "6.5.0", - "hash": "sha256-A+n8r9bM8UU0ZpzS5pHqa/JOX+cY0jTbfTH7XfwbCUM=" + "version": "10.0.1", + "hash": "sha256-J7G+I0OjaevX9J2SkuQagiL7ajbkx0ylfE2UWshxqZM=" }, { "pname": "Swashbuckle.AspNetCore.SwaggerUI", - "version": "6.5.0", - "hash": "sha256-BxYBRvabFUIRkZ67YbUY6djxbLPtmPlAfREeFNg8HZ4=" - }, - { - "pname": "System.Buffers", - "version": "4.3.0", - "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" - }, - { - "pname": "System.Buffers", - "version": "4.5.0", - "hash": "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs=" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" - }, - { - "pname": "System.Buffers", - "version": "4.6.0", - "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=" + "version": "10.0.1", + "hash": "sha256-+VWj1VKSpMCt6TYuU4NJYebhp4DxQyVJnrqdgX6RJ/k=" }, { "pname": "System.ClientModel", "version": "1.1.0", "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM=" }, + { + "pname": "System.ClientModel", + "version": "1.7.0", + "hash": "sha256-R9tHPr+rDvwaS1RQUHVZHTnmAL9I79OvixuZ2Thp9rw=" + }, + { + "pname": "System.CodeDom", + "version": "10.0.0", + "hash": "sha256-ffMXe35XVE49Gd6bbz2QRmTkCDeTuSnGYfKTZ6/MtS8=" + }, { "pname": "System.CodeDom", "version": "7.0.0", "hash": "sha256-7IPt39cY+0j0ZcRr/J45xPtEjnSXdUJ/5ai3ebaYQiE=" }, - { - "pname": "System.CodeDom", - "version": "8.0.0", - "hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338=" - }, - { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" - }, - { - "pname": "System.Collections.Concurrent", - "version": "4.3.0", - "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" - }, - { - "pname": "System.Collections.Immutable", - "version": "8.0.0", - "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" - }, { "pname": "System.CommandLine", "version": "2.0.0-beta4.22272.1", @@ -1114,75 +1079,20 @@ "version": "4.5.0", "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" }, - { - "pname": "System.Data.SQLite.Core", - "version": "1.0.115", - "hash": "sha256-bIVWw/dMTWwnA04hcRMVI2+ZqNtD75dAwAmTJj7F4iw=" - }, - { - "pname": "System.Data.SQLite.Core.Duplicati.linux.arm64", - "version": "1.0.116", - "hash": "sha256-l9BKsc/FSLNSQ7p3mErC7JG/C4/X0FoHZY8NevrRgc0=" - }, - { - "pname": "System.Data.SQLite.Core.Duplicati.linux.armv7", - "version": "1.0.116", - "hash": "sha256-zEx+seC9IQFmVY1WDRY+pKMJxwo9L5S6qRXtzsIlNAg=" - }, - { - "pname": "System.Data.SQLite.Core.Duplicati.macos.arm64", - "version": "1.0.116.1", - "hash": "sha256-87iRQsEqISQ4udHRQjD9vpAHDNgb5spOuRjtJJU004E=" - }, - { - "pname": "System.Data.SQLite.Core.Duplicati.windows.arm64", - "version": "1.0.116.1", - "hash": "sha256-4nKCyaolulIdZ8RsSK5BZzmWs3T9LuLho5uhBFM2CPM=" - }, - { - "pname": "System.Data.SQLite.Core.MSIL", - "version": "1.0.115", - "hash": "sha256-Or73XS3G+RRMdjRM5mV4lBd4+AemSQZeJykLIUnARoQ=" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.3.0", - "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "5.0.0", - "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "6.0.1", - "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "8.0.0", - "hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "9.0.4", - "hash": "sha256-sV+BfIpSVPDXvaxlhRdHYyu4fwpSFQl4iF9dSirAr04=" - }, { "pname": "System.Diagnostics.EventLog", - "version": "8.0.0", - "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y=" + "version": "10.0.0", + "hash": "sha256-pN3tld926Fp0n5ZNjjzIJviUQrynlOAB0vhc1aoso6E=" }, { - "pname": "System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + "pname": "System.DirectoryServices", + "version": "9.0.7", + "hash": "sha256-xp5ldf1KFEytrvlGKbk3Oe39I1y/nJJdF0dv9tj/iKU=" + }, + { + "pname": "System.Drawing.Common", + "version": "10.0.0", + "hash": "sha256-ZFneSifHbDj3O+IbwHSSs5YpDEunTeu9Hnz9APZKOA8=" }, { "pname": "System.Drawing.Common", @@ -1190,49 +1100,19 @@ "hash": "sha256-t4FBgTMhuOA5FA23fg0WQOGuH0njV7hJXST/Ln/Znks=" }, { - "pname": "System.Formats.Asn1", + "pname": "System.IdentityModel.Tokens.Jwt", "version": "8.0.1", - "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" - }, - { - "pname": "System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" - }, - { - "pname": "System.Globalization.Extensions", - "version": "4.3.0", - "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" + "hash": "sha256-hW4f9zWs0afxPbcMqCA/FAGvBZbBFSkugIOurswomHg=" }, { "pname": "System.IdentityModel.Tokens.Jwt", - "version": "7.5.0", - "hash": "sha256-K3OUOGrTYKJdnRTHERdSZWTxb5QNL4wBKCahcswdKrc=" - }, - { - "pname": "System.IO", - "version": "4.3.0", - "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" + "version": "8.14.0", + "hash": "sha256-huaZiEg+jXsWnVA+kYmMbajYhagqi08mwZ0WhNml7ek=" }, { "pname": "System.IO.FileSystem.AccessControl", - "version": "4.7.0", - "hash": "sha256-8St5apXnq9UofZQu/ysvEGCC16Mjy8SfpNfWVib0FEw=" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + "version": "5.0.0", + "hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc=" }, { "pname": "System.IO.Hashing", @@ -1246,23 +1126,13 @@ }, { "pname": "System.IO.Pipelines", - "version": "8.0.0", - "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + "version": "10.0.0", + "hash": "sha256-0aeIxLFEBn9BoCa93UVNikdlqgPl3B1nmYCLQ9Yu9Ak=" }, { - "pname": "System.IO.Pipelines", - "version": "9.0.2", - "hash": "sha256-uxM7J0Q/dzEsD0NGcVBsOmdHiOEawZ5GNUKBwpdiPyE=" - }, - { - "pname": "System.Linq", - "version": "4.3.0", - "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" - }, - { - "pname": "System.Linq.Async", - "version": "6.0.1", - "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI=" + "pname": "System.Management", + "version": "10.0.0", + "hash": "sha256-Nh3KOlsv6AxGkrWiHhuuTbRuIi2tp13NrbBwgQgKuSg=" }, { "pname": "System.Management", @@ -1270,24 +1140,9 @@ "hash": "sha256-bJ21ILQfbHb8mX2wnVh7WP/Ip7gdVPIw+BamQuifTVY=" }, { - "pname": "System.Management", - "version": "8.0.0", - "hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0=" - }, - { - "pname": "System.Memory", - "version": "4.5.1", - "hash": "sha256-7JhQNSvE6JigM1qmmhzOX3NiZ6ek82R4whQNb+FpBzg=" - }, - { - "pname": "System.Memory", - "version": "4.5.3", - "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" - }, - { - "pname": "System.Memory", - "version": "4.5.5", - "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + "pname": "System.Memory.Data", + "version": "1.0.2", + "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0=" }, { "pname": "System.Memory.Data", @@ -1295,155 +1150,25 @@ "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo=" }, { - "pname": "System.Net.Http", - "version": "4.3.4", - "hash": "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00=" - }, - { - "pname": "System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + "pname": "System.Memory.Data", + "version": "8.0.1", + "hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg=" }, { "pname": "System.Reactive", "version": "6.0.0", "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "1.6.0", - "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "8.0.0", - "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.1", - "hash": "sha256-Lucrfpuhz72Ns+DOS7MjuNT2KWgi+m4bJkg87kqXmfU=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" - }, - { - "pname": "System.Runtime.Numerics", - "version": "4.3.0", - "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" - }, - { - "pname": "System.Security.AccessControl", - "version": "4.7.0", - "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g=" - }, - { - "pname": "System.Security.Cryptography.Algorithms", - "version": "4.3.0", - "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" - }, - { - "pname": "System.Security.Cryptography.Algorithms", - "version": "4.3.1", - "hash": "sha256-QlO/ppRk/OyDYHCimD867RAlKIOakidD0ICNOt63XNQ=" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.3.0", - "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.7.0", - "hash": "sha256-MvVSJhAojDIvrpuyFmcSVRSZPl3dRYOI9hSptbA+6QA=" - }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.3.0", - "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" - }, - { - "pname": "System.Security.Cryptography.Encoding", - "version": "4.3.0", - "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" - }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" - }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "8.0.1", - "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" - }, - { - "pname": "System.Security.Cryptography.Primitives", - "version": "4.3.0", - "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + "version": "10.0.0", + "hash": "sha256-d3sLG+LZ3+N/h/6gdJcVKOgbBO6wYb66NfXalAEDqnE=" }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "4.5.0", "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc=" }, - { - "pname": "System.Security.Cryptography.X509Certificates", - "version": "4.3.0", - "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.7.0", - "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" - }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", @@ -1451,64 +1176,24 @@ }, { "pname": "System.ServiceProcess.ServiceController", - "version": "8.0.0", - "hash": "sha256-mq/Qm8JeMUvitHf32/F8uvw1YJGx4prGnEI/VzdaFAI=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" - }, - { - "pname": "System.Text.Encodings.Web", - "version": "4.5.0", - "hash": "sha256-o+jikyFOG30gX57GoeZztmuJ878INQ5SFMmKovYqLWs=" - }, - { - "pname": "System.Text.Encodings.Web", - "version": "6.0.0", - "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" - }, - { - "pname": "System.Text.Json", - "version": "5.0.2", - "hash": "sha256-3eHI5WsaclD9/iV4clLtSAurQxpcJ/qsZA82lkTjoG0=" - }, - { - "pname": "System.Text.Json", - "version": "6.0.10", - "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" - }, - { - "pname": "System.Threading.Channels", - "version": "8.0.0", - "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + "version": "10.0.0", + "hash": "sha256-94SnWmBG5zcg2JmzFb6H3KKBnyi7OtYhRY7imxju3d8=" }, { "pname": "Tencent.QCloud.Cos.Sdk", "version": "5.4.11", "hash": "sha256-XNaR4em7Ywh+NsjaAilpc5+JkrxiTzvEUG+daiwln64=" }, + { + "pname": "Testcontainers", + "version": "3.4.0", + "hash": "sha256-2f0d9q92qg5bv8wJywg3hppODxNDTxylKqv4jCbr/kk=" + }, + { + "pname": "TestContainers.Container.Abstractions", + "version": "1.5.4", + "hash": "sha256-5rYv675c14DNMne6FUkebyBI+7fWwLCqGs+KQCjbCcI=" + }, { "pname": "Tmds.DBus.Protocol", "version": "0.21.2", @@ -1534,19 +1219,79 @@ "version": "2.14.3623", "hash": "sha256-Rv5/hVXKrSOOCn9aHbaH6TmB9H2Xvq1kyJv5sQRygRo=" }, + { + "pname": "Vanara.Core", + "version": "4.1.2", + "hash": "sha256-nZQ2GV1Uv1hpmjj5MBOhz0A+RULCHyns1xiXaMy2UsY=" + }, + { + "pname": "Vanara.Core", + "version": "5.0.0", + "hash": "sha256-jv9TBQ8KkkrLWPC2F6XwBdrLj5bN1rovLFoIORFAUew=" + }, + { + "pname": "Vanara.PInvoke.Cryptography", + "version": "5.0.0", + "hash": "sha256-lwRGaswib9H6sw6vmF0GEaDl3KqrcikVisjzYvNwbuU=" + }, + { + "pname": "Vanara.PInvoke.Gdi32", + "version": "5.0.0", + "hash": "sha256-iewIEufCyCBKWx4Lpj2m7HwQgOYwP2ZEdt/wtRw4KBM=" + }, + { + "pname": "Vanara.PInvoke.Kernel32", + "version": "5.0.0", + "hash": "sha256-sF4VLD+XvzIpjP5S1GG92SQRzfH20Lum2ljmqQkZWQ4=" + }, + { + "pname": "Vanara.PInvoke.NTDSApi", + "version": "5.0.0", + "hash": "sha256-wB73Dt7fQ1z89jLZ93PP6khwWQYSlPKRN2G8DIQO+sc=" + }, + { + "pname": "Vanara.PInvoke.Security", + "version": "5.0.0", + "hash": "sha256-tkQy3OZ+IW8Qoq1aLbTWFjTts6ZV0sjngtnbBR/6jz0=" + }, + { + "pname": "Vanara.PInvoke.Shared", + "version": "4.1.2", + "hash": "sha256-kmcBNcn98sfWtmLrFcuxiyxa6BJLacl5uNHaRBGmc8k=" + }, + { + "pname": "Vanara.PInvoke.Shared", + "version": "5.0.0", + "hash": "sha256-GmYvYTQspfDPtJOG8d4M6Hy2vHtCc10pVXraSsmy26s=" + }, + { + "pname": "Vanara.PInvoke.User32", + "version": "5.0.0", + "hash": "sha256-HTj/KpzsppERmSewriiSmGPnZXdpOIAcYC6buPTLyyo=" + }, + { + "pname": "Vanara.PInvoke.VssApi", + "version": "5.0.0", + "hash": "sha256-L4xkuHHKP8FPkLs+F00via2mBYHGcqzNG9rpS0VDsk0=" + }, + { + "pname": "Vanara.Security", + "version": "5.0.0", + "hash": "sha256-Zd3s9PVMFOo3QKBWiS1RbrcaNNJEY23wBIndYbXTTyQ=" + }, { "pname": "VaultSharp", - "version": "1.7.0", - "hash": "sha256-AAPo2gZBvcBA98AtfpCR0tZh9oKMOkhX+p2EklEEp/A=" + "version": "1.17.5.1", + "hash": "sha256-PZRMdGfnVzGDErFxTEEIXndErc2FUMmJVEc7gjYjVx4=" }, { "pname": "Websocket.Client", - "version": "5.1.2", - "hash": "sha256-T0uXa9hAr3+9cvpJ/FVwtqNmE7QvSJxXsIoWV624cHs=" + "version": "5.2.0", + "hash": "sha256-5sVfK1iHclxunfm0ioSFFyo5tG8lPfchClBi4YgeJT4=" }, { "pname": "ZstdSharp.Port", - "version": "0.8.4", - "hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo=" + "version": "0.8.5", + "hash": "sha256-+UQFeU64md0LlSf9nMXif6hHnfYEKm+WRyYd0Vo2QvI=" } ] diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix index b5cc06f8ff1b..9c80ce19f120 100644 --- a/pkgs/by-name/du/duplicati/package.nix +++ b/pkgs/by-name/du/duplicati/package.nix @@ -14,9 +14,9 @@ let # for update.sh easy to handle - ngclientVersion = "0.0.192"; - ngclientRev = "5237ca55b42e58896da2919ad8a76c034517e98a"; - ngclientHash = "sha256-06LMFg0kRmG4c5s60/+NU8gugkfgWAyTGoLo0+UHRUI="; + ngclientVersion = "0.0.207"; + ngclientRev = "42d711a541ca1ee2ff43f95cce89e8eeb224afc8"; + ngclientHash = "sha256-VS6kb/2YGn/TBDXt62UifD7BHCWE2xiUkLcGBXzV+ww="; # from Duplicati/Server/webroot/ngclient/package.json ngclient = buildNpmPackage { @@ -30,7 +30,7 @@ let hash = ngclientHash; }; - npmDepsHash = "sha256-i9lW+JDB2TZGfhW1fzrZA36qgkYeMmHbJkeEYxga2ko="; + npmDepsHash = "sha256-wkzSUEqoB013yNbC1sX4qRz8DuGWRB20/M+ue/thbOQ="; nativeBuildInputs = [ bun ]; @@ -58,22 +58,22 @@ let in buildDotnetModule rec { pname = "duplicati"; - version = "2.2.0.3"; + version = "2.3.0.0"; channel = "stable"; - buildDate = "2026-01-06"; + buildDate = "2026-04-14"; src = fetchFromGitHub { owner = "duplicati"; repo = "duplicati"; tag = "v${version}_${channel}_${buildDate}"; - hash = "sha256-p2hl1S/XsKsbAfWBAgvNMl6z5zGm/FBH3EYSqDvkKy8="; + hash = "sha256-X9SaH83p2RJWeJK8MfNwPgI2c3AfBHhbxOaFz4c26qU="; stripRoot = true; }; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_10_0; enableParallelBuilding = false; @@ -111,6 +111,8 @@ buildDotnetModule rec { ]; postPatch = '' + sed -i '/Duplicati.ShellExtension.csproj/d' Duplicati.slnx + rm -rf Duplicati/Server/webroot/ngclient ln -s ${ngclient}/browser Duplicati/Server/webroot/ngclient ''; From bef8e3b8ecb0957038b894f4989db0a11af4f034 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 14 Apr 2026 16:36:34 +0000 Subject: [PATCH 052/246] =?UTF-8?q?prometheus:=203.10.0=20=E2=86=92=203.11?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/pr/prometheus/source.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/prometheus/source.nix b/pkgs/by-name/pr/prometheus/source.nix index 88e1aa736d95..1090548f6e35 100644 --- a/pkgs/by-name/pr/prometheus/source.nix +++ b/pkgs/by-name/pr/prometheus/source.nix @@ -1,6 +1,6 @@ { - version = "3.10.0"; - hash = "sha256-tTxHLngOsJ0STwfnBfuXN7CUaVgtpRGzEiFtXTWVDD4="; - npmDepsHash = "sha256-+nu7qfxlVa8OWARFgQnXj5riTQ0P1sjxbIgYUvJpcHw="; - vendorHash = "sha256-AsVy9RPemaKDuX8is2IXjlzRBsJFJiRfFj18SQl8Oc8="; + version = "3.11.2"; + hash = "sha256-pSps9LKOOgWUA27lkgFOYliI8Skejx895EKwD88ysn8="; + npmDepsHash = "sha256-ZYbyWtqv7SL/SVAOuQmgb7atkrBQDumYB6Wpa39MThw="; + vendorHash = "sha256-wR1b5jV/2B50OeKokv8Ss+tpSXNjJBsLIZrK7gOb168="; } From 45246296a74f430c2b40aa8f8c9bb3c83853b53a Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 14 Apr 2026 11:05:51 -0500 Subject: [PATCH 053/246] go-grip: 0.5.6 -> 0.9.0 --- pkgs/by-name/go/go-grip/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-grip/package.nix b/pkgs/by-name/go/go-grip/package.nix index 05beeb708ec0..b71aafa0fc7e 100644 --- a/pkgs/by-name/go/go-grip/package.nix +++ b/pkgs/by-name/go/go-grip/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "go-grip"; - version = "0.5.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "chrishrb"; repo = "go-grip"; tag = "v${finalAttrs.version}"; - hash = "sha256-c3tl5nALPqIAMSqjbbQDi6mN6M1mKJvzxxDHcj/QyuY="; + hash = "sha256-HwD/pdWEEU+Hoo4HUJeK8y40jp1byNhw/TSpa5SNRak="; }; - vendorHash = "sha256-aU6vo/uqJzctD7Q8HPFzHXVVJwMmlzQXhAA6LSkRAow="; + vendorHash = "sha256-QsLiCsFY6nI85jsEZtAgmObEKpBSZWhzZk+TlukM8JU="; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; From 9972704c55b9c05c93ff56e291849b05df3e3287 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 14 Apr 2026 15:06:02 -0500 Subject: [PATCH 054/246] go-grip: remove broken updateScript The previous gitUpdater path used the generic updater, which only rewrote the source version/hash and did not handle buildGoModule's vendorHash correctly when dependencies changed. Other Go packages are updated successfully by the bot without setting updateScript, which lets it use its normal Go-aware updater path instead. --- pkgs/by-name/go/go-grip/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/go/go-grip/package.nix b/pkgs/by-name/go/go-grip/package.nix index b71aafa0fc7e..32d1738e88f7 100644 --- a/pkgs/by-name/go/go-grip/package.nix +++ b/pkgs/by-name/go/go-grip/package.nix @@ -2,7 +2,6 @@ buildGoModule, fetchFromGitHub, lib, - gitUpdater, }: buildGoModule (finalAttrs: { pname = "go-grip"; @@ -17,8 +16,6 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-QsLiCsFY6nI85jsEZtAgmObEKpBSZWhzZk+TlukM8JU="; - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = { description = "Preview Markdown files locally before committing them"; homepage = "https://github.com/chrishrb/go-grip"; From 733d56adc00a670647ad9f9a9440b4156188a4ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Apr 2026 22:58:50 +0000 Subject: [PATCH 055/246] vault-bin: 1.21.4 -> 2.0.0 --- pkgs/by-name/va/vault-bin/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix index ecc6e94cd55d..5896eaedce6e 100644 --- a/pkgs/by-name/va/vault-bin/package.nix +++ b/pkgs/by-name/va/vault-bin/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.21.4"; + version = "2.0.0"; src = let @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-XkCzjKa3krWg/6mPyl+EDflqRUZ7HrmVa5mzrc0EN6Y="; - aarch64-linux = "sha256-/7Eia9CydYgQY1H1fdYJKq4Q8HDd8ZV5Z/e6x9THOmI="; - i686-linux = "sha256-kv+rqGapWJGB3zUB7ccT+aOaWJK/O32NjTr6QBsvRgc="; - x86_64-darwin = "sha256-5dGAQVPM3kBB2jvsbM8m9DUhZrzeXiDpROL0+SY3VY4="; - aarch64-darwin = "sha256-O2+ZyQV8CPAobutM6bu2UtPaf4TIEu6CnS87ywEupv8="; + x86_64-linux = "sha256-Zp/rbxNa9gDFHclb0Mb2jYfav6jVGfSYvpybEFOaQ+U="; + aarch64-linux = "sha256-qenfLCdDrIsJZMzv2CO3VDcI9TwzRfh/KbFvojFwGhQ="; + i686-linux = "sha256-hGqJUlK92XO3APCUeJTiLnVHNh6r1MfskEbtYMjDg7I="; + x86_64-darwin = "sha256-WJFs/8Lq2VBVMF2wls5EHFfe4ClLJOoxO91+5oGl6Ko="; + aarch64-darwin = "sha256-3wfrn05JeYho9+F6lmgT8cZdlogV+7IhJ/kwj09OeOA="; }; in fetchzip { From 41ac09a77c0a3a1675c9e10508097a7193146354 Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 15 Apr 2026 07:43:15 +0200 Subject: [PATCH 056/246] portfolio: 0.83.0 -> 0.83.1 https://github.com/portfolio-performance/portfolio/releases/tag/0.83.1 --- 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 5b87e9d0fe1f..cb81c9804723 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -35,11 +35,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.83.0"; + version = "0.83.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-C67cbOX4AQyl6rcWo+LVDEVuD+k59pJy9mbytrKt1Ls="; + hash = "sha256-MQ3GA5MV8eWDnu7SWZm9hXbRxWTMO04uNKOQV2x6Yvc="; }; nativeBuildInputs = [ From 42c0ce2a51035e433153b0f51327ef05298018a3 Mon Sep 17 00:00:00 2001 From: kingfirewxm <50804009+kingfirewxm@users.noreply.github.com> Date: Wed, 15 Apr 2026 13:47:01 +0800 Subject: [PATCH 057/246] nixos/sillytavern: respect cfg.package option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The module declares `services.sillytavern.package` via `mkPackageOption` but the implementation hardcodes `pkgs.sillytavern` in three places (the `configFile` default, `ExecStart`, and `BindPaths`) and never reads `cfg.package`. As a result, setting the option has no effect — the service always runs whatever `pkgs.sillytavern` resolves to at module evaluation time. Replace the hardcoded references with `cfg.package` and update the corresponding `defaultText` so the rendered documentation matches. --- nixos/modules/services/web-apps/sillytavern.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/sillytavern.nix b/nixos/modules/services/web-apps/sillytavern.nix index 6182ca7b1985..4108a6eb3ae8 100644 --- a/nixos/modules/services/web-apps/sillytavern.nix +++ b/nixos/modules/services/web-apps/sillytavern.nix @@ -39,8 +39,8 @@ in configFile = lib.mkOption { type = lib.types.path; - default = "${pkgs.sillytavern}/lib/node_modules/sillytavern/config.yaml"; - defaultText = lib.literalExpression "\${pkgs.sillytavern}/lib/node_modules/sillytavern/config.yaml"; + default = "${cfg.package}/lib/node_modules/sillytavern/config.yaml"; + defaultText = lib.literalExpression "\${cfg.package}/lib/node_modules/sillytavern/config.yaml"; description = '' Path to the SillyTavern configuration file. ''; @@ -109,7 +109,7 @@ in in lib.concatStringsSep " " ( [ - "${lib.getExe pkgs.sillytavern}" + "${lib.getExe cfg.package}" ] ++ f cfg.port "port" ++ f cfg.listen "listen" @@ -122,7 +122,7 @@ in Restart = "always"; StateDirectory = "SillyTavern"; BindPaths = [ - "%S/SillyTavern/extensions:${pkgs.sillytavern}/lib/node_modules/sillytavern/public/scripts/extensions/third-party" + "%S/SillyTavern/extensions:${cfg.package}/lib/node_modules/sillytavern/public/scripts/extensions/third-party" ]; # Security hardening From cbd432b6a8ecb73b2f517927f72137f2300457d1 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 15 Apr 2026 15:53:05 +0800 Subject: [PATCH 058/246] cbmc: 6.8.0 -> 6.9.0 --- .../cbmc/0002-Do-not-download-sources-in-cmake.patch | 12 ++++++------ pkgs/by-name/cb/cbmc/package.nix | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/cb/cbmc/0002-Do-not-download-sources-in-cmake.patch b/pkgs/by-name/cb/cbmc/0002-Do-not-download-sources-in-cmake.patch index c45b65e80f6e..9a5c365285df 100644 --- a/pkgs/by-name/cb/cbmc/0002-Do-not-download-sources-in-cmake.patch +++ b/pkgs/by-name/cb/cbmc/0002-Do-not-download-sources-in-cmake.patch @@ -27,12 +27,12 @@ index ab8d111..d7165e2 100644 message(STATUS "Building solvers with cadical") download_project(PROJ cadical -- URL https://github.com/arminbiere/cadical/archive/rel-2.0.0.tar.gz +- URL https://github.com/arminbiere/cadical/archive/rel-3.0.0.tar.gz + SOURCE_DIR @srccadical@ - PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-2.0.0-patch + PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-3.0.0-patch COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/scripts/cadical_CMakeLists.txt CMakeLists.txt COMMAND ./configure -- URL_MD5 9fc2a66196b86adceb822a583318cc35 +- URL_HASH SHA256=282b1c9422fde8631cb721b86450ae94df4e8de0545c17a69a301aaa4bf92fcf ) add_subdirectory(${cadical_SOURCE_DIR} ${cadical_BINARY_DIR}) @@ -40,11 +40,11 @@ index ab8d111..d7165e2 100644 message(STATUS "Building with IPASIR solver linking against: CaDiCaL") download_project(PROJ cadical -- URL https://github.com/arminbiere/cadical/archive/rel-2.0.0.tar.gz +- URL https://github.com/arminbiere/cadical/archive/rel-3.0.0.tar.gz + SOURCE_DIR @srccadical@ - PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-2.0.0-patch + PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-3.0.0-patch COMMAND ./configure -- URL_MD5 9fc2a66196b86adceb822a583318cc35 +- URL_HASH SHA256=282b1c9422fde8631cb721b86450ae94df4e8de0545c17a69a301aaa4bf92fcf ) message(STATUS "Building CaDiCaL") diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix index 77c0d72ce4e7..ca8059681e24 100644 --- a/pkgs/by-name/cb/cbmc/package.nix +++ b/pkgs/by-name/cb/cbmc/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cbmc"; - version = "6.8.0"; + version = "6.9.0"; src = fetchFromGitHub { owner = "diffblue"; repo = "cbmc"; tag = "cbmc-${finalAttrs.version}"; - hash = "sha256-PT6AYiwkplCeyMREZnGZA0BKl4ZESRC02/9ibKg7mYU="; + hash = "sha256-SMJBnzoyTwcwJa9L2X1iX2W4Z/Mwoirf8EXfoyG0dRI="; }; srcglucose = fetchFromGitHub { @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { srccadical = (cadical.override { - version = "2.0.0"; + version = "3.0.0"; }).src; nativeBuildInputs = [ From ccedc7eefb4582ed7640ce75fd1727f8635b2f42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Apr 2026 09:04:43 +0000 Subject: [PATCH 059/246] hcloud: 1.61.0 -> 1.62.2 --- 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 09229927b67f..7ea39cb7ac6a 100644 --- a/pkgs/by-name/hc/hcloud/package.nix +++ b/pkgs/by-name/hc/hcloud/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "hcloud"; - version = "1.61.0"; + version = "1.62.2"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-Gggr/wdPzi1nqCcWzxNYr85oBRGT0rBxV24QXYDHkdc="; + hash = "sha256-OGz/f68DDYJ7s3HFjDdQPtD86929gxRehSPs9cCkPBk="; }; - vendorHash = "sha256-X/qn9mfbSBaMbi4uI7jdL98mQSq0JVfXR3nX156ySBc="; + vendorHash = "sha256-8JvqGCVFE2dSlpMzwYXKMvg3nw/wt8GxL7sM0bS6ZgM="; ldflags = [ "-s" From 6faaf5087c0e52a991002130fbb07f42252393d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Apr 2026 12:41:01 +0000 Subject: [PATCH 060/246] gitea-actions-runner: 0.3.1 -> 0.4.0 --- pkgs/by-name/gi/gitea-actions-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitea-actions-runner/package.nix b/pkgs/by-name/gi/gitea-actions-runner/package.nix index 592b027064ef..b0732b0dbd6b 100644 --- a/pkgs/by-name/gi/gitea-actions-runner/package.nix +++ b/pkgs/by-name/gi/gitea-actions-runner/package.nix @@ -8,17 +8,17 @@ buildGoModule (finalAttrs: { pname = "gitea-actions-runner"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "act_runner"; rev = "v${finalAttrs.version}"; - hash = "sha256-D3/vJUQuNAgUWNyfL9QWmByZ9A/F4+pfA6GR0SDcMpQ="; + hash = "sha256-trKp5tIhvvb6VJ04iIpFD4Q/VK/V1urkbXEpGMwaEsE="; }; - vendorHash = "sha256-XRXoChH2ApQS65xnzeGP4NIUL0RKovLWvVIAnBncT7Y="; + vendorHash = "sha256-dUUe4BbBmRP9MImq/PYTGssv3M2Zn84oCxH5BKf9btg="; ldflags = [ "-s" From 9fd13f18a0e7ff4b61bc882d1f996e105c3b937e Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 15 Apr 2026 16:55:39 +0200 Subject: [PATCH 061/246] azahar: 2125.0.1 -> 2125.1 Signed-off-by: Marcin Serwin --- pkgs/by-name/az/azahar/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index cfb78f9d8cbe..7fb9055926b8 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -61,7 +61,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "azahar"; - version = "2125.0.1"; + version = "2125.1"; src = fetchFromGitHub { owner = "azahar-emu"; @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { echo "${finalAttrs.version}" > "$out/GIT-TAG" git -C "$out" rev-parse HEAD > "$out/GIT-COMMIT" ''; - hash = "sha256-KzM2FWJPxZtkpwvK4DSdfNuxE8yy1OVaioVegQbBSWk="; + hash = "sha256-F5v52axQ4+vH6ZqEEuuMtV5PVahWmnS3PixZHqywhtM="; }; strictDeps = true; @@ -138,14 +138,6 @@ stdenv.mkDerivation (finalAttrs: { (darwinMinVersionHook "13.4") ]; - patches = [ - (fetchpatch { - name = "cmake-Add-option-to-use-system-oaknut.patch"; - url = "https://github.com/azahar-emu/azahar/commit/6201256e15ee4d4fc053933545abf50fc46be178.patch"; - hash = "sha256-03eIubAJ65W9clI9iaLcLNAAMbkX4E507nYNV8DVwZc="; - }) - ]; - postPatch = '' # We already know the submodules are present substituteInPlace CMakeLists.txt \ From 37639b027201d5e456e327fa23314ae332469b21 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 15 Apr 2026 18:00:21 +0200 Subject: [PATCH 062/246] warzone2100: 4.6.3 -> 4.7.0 --- pkgs/by-name/wa/warzone2100/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/warzone2100/package.nix b/pkgs/by-name/wa/warzone2100/package.nix index d71e030ad15a..79c6fbeffa95 100644 --- a/pkgs/by-name/wa/warzone2100/package.nix +++ b/pkgs/by-name/wa/warzone2100/package.nix @@ -50,11 +50,11 @@ in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "4.6.3"; + version = "4.7.0"; src = fetchurl { url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz"; - hash = "sha256-Qx/iQ2z/loeOLtTtxtBzlFOtYpPWQwtYMt6bUi/wsTo="; + hash = "sha256-le5NW4hoDqGxzyMLZ+qEAo4IokWLhGBayff7nrl8Tjc="; }; buildInputs = [ From 0473cbade63851e732cd6f19d231920e54429799 Mon Sep 17 00:00:00 2001 From: Gus <58223632+thegu5@users.noreply.github.com> Date: Wed, 15 Apr 2026 13:03:16 -0400 Subject: [PATCH 063/246] seanime: 3.5.2 -> 3.6.0 --- pkgs/by-name/se/seanime/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/se/seanime/package.nix b/pkgs/by-name/se/seanime/package.nix index 0a20a6f5ba44..7f64469fe647 100644 --- a/pkgs/by-name/se/seanime/package.nix +++ b/pkgs/by-name/se/seanime/package.nix @@ -10,13 +10,13 @@ }: buildGoModule (finalAttrs: { pname = "seanime"; - version = "3.5.2"; + version = "3.6.0"; src = fetchFromGitHub { owner = "5rahim"; repo = "seanime"; tag = "v${finalAttrs.version}"; - hash = "sha256-ejXWQPUROIzu6RlUJIaKaiJfPb59kupQDhqWU83EqP4="; + hash = "sha256-R6WKRuU2kBvw9XD3iAZky1YNKWDv+W7YZAwpprYeWkw="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { npmRoot = "seanime-web"; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/seanime-web"; - hash = "sha256-fWlK2h0RQF9GnEogXW3bwM01RCCDVij/9S2sn2BA3S4="; + hash = "sha256-4ItF0+Bmc+75oeNHjQP4RsbcRWgeG9Wq/27wDiQ4KVM="; }; }; @@ -42,7 +42,7 @@ buildGoModule (finalAttrs: { rm -rf .github ''; - vendorHash = "sha256-TN9shH4B7XVDIa541+7MHTNQs1IKPRJW1dn8tmES5jg="; + vendorHash = "sha256-9RCVIL+h5L20156BuD8GGbC98QUchB8JCWId8b/Sfy8="; subPackages = [ "." ]; From ad367f86c998489236ca302b1644ebcf04586497 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Apr 2026 17:29:23 +0000 Subject: [PATCH 064/246] quarkus: 3.32.4 -> 3.34.3 --- pkgs/by-name/qu/quarkus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index dedf6f18a4c6..a624c8695243 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.32.4"; + version = "3.34.3"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-cfNgh2idBZxO4xKP4gShMHmVOyaX9JxEmwyMp6cXPj8="; + hash = "sha256-JMPETdr/c50EqHTF/PMH5AReMdLP+7HbCz/FhLJiMS0="; }; nativeBuildInputs = [ makeWrapper ]; From 3646c5f4d2a8a41eb8e9795dca2c48dfa16220d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Apr 2026 18:03:42 +0000 Subject: [PATCH 065/246] firecracker: 1.14.2 -> 1.15.1 --- pkgs/by-name/fi/firecracker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix index 3a2c51fadf34..6fe3bd416ac4 100644 --- a/pkgs/by-name/fi/firecracker/package.nix +++ b/pkgs/by-name/fi/firecracker/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "firecracker"; - version = "1.14.2"; + version = "1.15.1"; src = fetchFromGitHub { owner = "firecracker-microvm"; repo = "firecracker"; rev = "v${finalAttrs.version}"; - hash = "sha256-29ZI8RmHH3fz/nUb7EeD51qGUKEKj0UKURxbpmiwwzs="; + hash = "sha256-H3dj11Q0MgLST1TWJ5rmfPePxjXrXOYI2Xf/3uUdICU="; }; - cargoHash = "sha256-GtHIZJMLdMZNCXzVw6w3KjhzlxCJhC9eaKRDeVWwklY="; + cargoHash = "sha256-N2WYnFTlz4NUAU/tjy18SPvxdDVDIIaqgu44e6unOHs="; # For aws-lc-sys@0.22.0: use external bindgen. env.AWS_LC_SYS_EXTERNAL_BINDGEN = "true"; From 3577cbc9e1cea94b5233ed9821946fe112788f7a Mon Sep 17 00:00:00 2001 From: yuannan Date: Wed, 15 Apr 2026 20:32:14 +0100 Subject: [PATCH 066/246] vscode: 1.115 -> 1.116 --- pkgs/applications/editors/vscode/vscode.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 67af88256f06..661e8d968a0c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -35,17 +35,17 @@ let hash = { - x86_64-linux = "sha256-eDSGfF05h5HPTZNeV9l/SBV+9fIV9iVnommM5P/cGgA="; - x86_64-darwin = "sha256-gHNXSWjbS+xqxjNYaoE7WSeo1Vf2+au/x68RVObJtp0="; - aarch64-linux = "sha256-PkZiq6STbt1Rb/g9XKeE3tktcrSRyQn/ah1QQxrOITg="; - aarch64-darwin = "sha256-T7An1+qkBO2QncPvoyymjerwLwti2/MgwmOJJCb2Nhw="; - armv7l-linux = "sha256-+KfjkiqMBGg9x/Qnd4FHiW0kw0dIQ56DSGUm8SBTc8o="; + x86_64-linux = "sha256-zoe2E9xlpAME4QD8IagicbAj71g3cA9XlymQQQMFJLo="; + x86_64-darwin = "sha256-gKpy6+wkcO+znxLdkGMOetpVyhs3SViQyRtCc6yc5XY="; + aarch64-linux = "sha256-KQR6zD+3m+OgeICSs3LkWo7kC2OxqF6Xax8BRTa6QYQ="; + aarch64-darwin = "sha256-VZufcJ/g1LPtlQruUwI8Pe5c8LNiAIUHY5+gNnyaPTQ="; + armv7l-linux = "sha256-0TxKXKQppxcURimXgC40wmqMgiX3DBMJAMc+qjMQCck="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.115.0"; + version = "1.116.0"; # The update server (update.code.visualstudio.com) expects the version path # segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0"). @@ -53,7 +53,7 @@ let downloadVersion = lib.versions.pad 3 version; # This is used for VS Code - Remote SSH test - rev = "41dd792b5e652393e7787322889ed5fdc58bd75b"; + rev = "560a9dba96f961efea7b1612916f89e5d5d4d679"; in buildVscode { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -86,7 +86,7 @@ buildVscode { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-2CQBU7TfYNO4m1Mf6Q0QXFt8C2txJgcN9kd7wX355J4="; + hash = "sha256-HqcaLktkhw3BoEgyFwnMmP7/vuSl1OXZygrQreKeHnM="; }; stdenv = stdenvNoCC; }; @@ -121,6 +121,7 @@ buildVscode { jefflabonte wetrustinprize oenu + yuannan ]; platforms = [ "x86_64-linux" From 138dd5f368423378cc29310d7baac233ea722472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Thu, 9 Apr 2026 23:01:59 +0200 Subject: [PATCH 067/246] firefly-iii-data-importer: 2.2.2 -> 2.2.3 --- pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index 3be09f7ea9c4..349c90c4d6ea 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -16,13 +16,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii-data-importer"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; tag = "v${finalAttrs.version}"; - hash = "sha256-lHofvjw4wK14tferHt59uSIYPVa5KwNQUB+GgmyUoJc="; + hash = "sha256-2/zfxBggXK9mJDpuofQyMZ+WWV0OHyUWTUU+4CRNOUQ="; }; buildInputs = [ php ]; @@ -41,12 +41,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-eiQpGtqjix2HmMU5sarysxm7dGgQx40/kZKPemrHBHU="; + vendorHash = "sha256-0p0xPBX4nKFYlpIvGVZU7ay+btjpxBO2s73wzysSzUU="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-BQglXnIlocZDTtAmSuga5dbB/m8AI5z1F/+VQ1kLzQc="; + hash = "sha256-baPsbZwGu1tx6bMH2tWcZVlkZuIpSflwj9JyX9vQW/U="; }; composerRepository = php.mkComposerRepository { From f7fc4c896a1ea774cc71b86b935486bf7346c18e Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Wed, 15 Apr 2026 21:55:47 +0200 Subject: [PATCH 068/246] slint-viewer: 1.14.1 -> 1.16.0 --- pkgs/by-name/sl/slint-viewer/package.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sl/slint-viewer/package.nix b/pkgs/by-name/sl/slint-viewer/package.nix index 40fb1c66c1ff..88bab1a42643 100644 --- a/pkgs/by-name/sl/slint-viewer/package.nix +++ b/pkgs/by-name/sl/slint-viewer/package.nix @@ -2,29 +2,37 @@ lib, rustPlatform, fetchCrate, - qt6, + + fontconfig, libGL, + pkg-config, + qt6, + nix-update-script, versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "slint-viewer"; - version = "1.14.1"; + version = "1.16.0"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-7NxpnkMAQTBDfcDhdnneFNjB0oE82dDdpfq4vmMqECg="; + hash = "sha256-POkfEU4m54dEgaSSEHLqKozMXqMxqkUoLCevm6SY2IU="; }; - cargoHash = "sha256-RNK3dzXdWRpugC7FwenUF/IsKbD3GxFRLqyLzBf2Wuw="; + cargoHash = "sha256-zjiII898Zpzdr19UHua3yuhRRHCn5yg/PHYpYODh7Pc="; buildInputs = [ qt6.qtbase qt6.qtsvg + fontconfig libGL ]; - nativeBuildInputs = [ qt6.wrapQtAppsHook ]; + nativeBuildInputs = [ + pkg-config + qt6.wrapQtAppsHook + ]; # There are no tests doCheck = false; From 64bafe9a2330e15b7284578b40fc8f0ce1d17ef3 Mon Sep 17 00:00:00 2001 From: Boldi Koller Date: Thu, 16 Apr 2026 15:17:58 +0200 Subject: [PATCH 069/246] dbvisualizer: 25.2.6 -> 25.3.3 --- pkgs/by-name/db/dbvisualizer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dbvisualizer/package.nix b/pkgs/by-name/db/dbvisualizer/package.nix index ffcfa1424829..36cf72b5a7a8 100644 --- a/pkgs/by-name/db/dbvisualizer/package.nix +++ b/pkgs/by-name/db/dbvisualizer/package.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "25.2.6"; + version = "25.3.3"; src = let @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "https://www.dbvis.com/product_download/dbvis-${finalAttrs.version}/media/dbvis_linux_${underscoreVersion}.tar.gz"; - hash = "sha256-yiL0FFkSntwLy/oOkiDQKTvTOUrtbv/9kV+1nLZtMB0="; + hash = "sha256-rvS2NczwmT1+/JIfpLI518I0/2AaIJEQAOwmKUK2FQs="; }; strictDeps = true; From d389a337cba834aa1977e6b5bca8f6cfa8f80e3f Mon Sep 17 00:00:00 2001 From: Boldi Koller Date: Thu, 16 Apr 2026 15:26:36 +0200 Subject: [PATCH 070/246] dbvisualizer: Disable nixpkgs-update --- pkgs/by-name/db/dbvisualizer/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/db/dbvisualizer/package.nix b/pkgs/by-name/db/dbvisualizer/package.nix index 36cf72b5a7a8..c93af60e6840 100644 --- a/pkgs/by-name/db/dbvisualizer/package.nix +++ b/pkgs/by-name/db/dbvisualizer/package.nix @@ -8,6 +8,12 @@ stdenv, }: +# nixpkgs-update: no auto update +# NOTE: Do not update to interim patch versions. The download URL will get shut +# down after a while. Dbvisualizer discontinues download +# URLs for all but the last patch version per minor version. +# Example: v25.3.2 gets shut down after v25.3.3 gets released. + let pname = "dbvisualizer"; in From ac2dd54d4f4e27b07dbe97672ff8adea83c0da96 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Fri, 6 Mar 2026 20:43:40 +0100 Subject: [PATCH 071/246] semtools: 1.2.0 -> 3.0.1 --- pkgs/by-name/se/semtools/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/se/semtools/package.nix b/pkgs/by-name/se/semtools/package.nix index 01d6722dd0da..76b28a1696a0 100644 --- a/pkgs/by-name/se/semtools/package.nix +++ b/pkgs/by-name/se/semtools/package.nix @@ -1,32 +1,37 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, nix-update-script, openssl, pkg-config, + protobuf, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "semtools"; - version = "1.2.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "run-llama"; repo = "semtools"; tag = "v${finalAttrs.version}"; - hash = "sha256-wpOKEESM3uG9m/EqWnF2uXITbrwIhwe2MSA0FN7Fu+w="; + hash = "sha256-8vQJd1/EnskcMNN2cfXOQxHeLPh61dypL51KwCLps8Q="; }; - cargoHash = "sha256-irLhwlNnB3G63WUGV2wo+LQGQgNHYzu/vb/RM/G6Fdc="; + cargoHash = "sha256-spllUpCze3ajNZtWVRr9GZLDj7HMi6UIraeEp9XgfK0="; + + nativeBuildInputs = [ + pkg-config + protobuf + ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - checkFlags = lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ - # https://github.com/run-llama/semtools/issues/17 - "--skip=tests::test_search_result_context_calculation" + checkFlags = [ + # Require network + "--skip=search::tests" + "--skip=workspace::tests::test_workspace_save_and_open" ]; passthru.updateScript = nix-update-script { }; From b37c629e35a7db874d12778e4b367d179dd5b689 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Thu, 16 Apr 2026 18:33:44 +0000 Subject: [PATCH 072/246] avfs: 1.2.0 -> 1.3.0 --- pkgs/by-name/av/avfs/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/av/avfs/package.nix b/pkgs/by-name/av/avfs/package.nix index 26aa23980605..0a01dd6b4f6d 100644 --- a/pkgs/by-name/av/avfs/package.nix +++ b/pkgs/by-name/av/avfs/package.nix @@ -5,14 +5,15 @@ pkg-config, fuse, xz, + zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "avfs"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "mirror://sourceforge/avf/${finalAttrs.version}/avfs-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-olqOxDwe4XJiThpMec5mobkwhBzbVFtyXx7GS8q+iJw="; + sha256 = "sha256-B81p1MDH7QgOgP8EDZgChkBa04pEP9xS3Dle/vEcRLE="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,19 +21,20 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fuse xz + zlib ]; configureFlags = [ "--enable-library" "--enable-fuse" - ]; + ] + ++ lib.optional stdenv.hostPlatform.isDarwin "--with-system-zlib"; meta = { homepage = "https://avf.sourceforge.net/"; 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; + maintainers = with lib.maintainers; [ tbutter ]; }; }) From 4b62eba653ade2747d9a946f3e3bd4c771115bc5 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Thu, 16 Apr 2026 19:28:10 +0000 Subject: [PATCH 073/246] unfs3: 0.10.0 -> 0.11.0 --- pkgs/by-name/un/unfs3/package.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/un/unfs3/package.nix b/pkgs/by-name/un/unfs3/package.nix index 383acc1623c2..1041a64c53fd 100644 --- a/pkgs/by-name/un/unfs3/package.nix +++ b/pkgs/by-name/un/unfs3/package.nix @@ -14,23 +14,15 @@ stdenv.mkDerivation rec { pname = "unfs3"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "unfs3"; repo = "unfs3"; tag = "unfs3-${version}"; - hash = "sha256-5iAriIutBhwyZVS7AG2fnkrHOI7pNAKfYv062Cy0WXw="; + hash = "sha256-0IHpHW9lCPSltfl+VrS25tB9csISvTwCpD1oqwXpBwU="; }; - patches = [ - # Fix implicit declaration warning with GCC 14 - (fetchpatch2 { - url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/152dc14a65a89f253294cc5b4c96cf0d6658711a/main/unfs3/implicit.patch"; - hash = "sha256-zrF87fJhc8mDgIs0vsMoqIHYQPtKWn2XMBSePvHOByA="; - }) - ]; - nativeBuildInputs = [ flex bison @@ -70,16 +62,12 @@ stdenv.mkDerivation rec { server. ''; - # The old http://unfs3.sourceforge.net/ has a - # http-equiv="refresh" pointing here, so we can assume that - # whoever controls the old URL approves of the "unfs3" github - # account. homepage = "https://unfs3.github.io/"; changelog = "https://raw.githubusercontent.com/unfs3/unfs3/unfs3-${version}/NEWS"; mainProgram = "unfsd"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tbutter ]; }; } From 36d29c06b25f4bcf5ff4fa7b956c94cad2f9246b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Apr 2026 19:59:35 +0000 Subject: [PATCH 074/246] hyprwhspr-rs: 0.3.23 -> 0.3.24 --- pkgs/by-name/hy/hyprwhspr-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprwhspr-rs/package.nix b/pkgs/by-name/hy/hyprwhspr-rs/package.nix index bd13c8ab1882..3438e0d923be 100644 --- a/pkgs/by-name/hy/hyprwhspr-rs/package.nix +++ b/pkgs/by-name/hy/hyprwhspr-rs/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprwhspr-rs"; - version = "0.3.23"; + version = "0.3.24"; src = fetchFromGitHub { owner = "better-slop"; repo = "hyprwhspr-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-O4mb7pIdhu6D9zJNm/1MKh3YO7WIGYtHM4IAPRFLDSY="; + hash = "sha256-tnscv2DYRS6BrFgshEg/X37Yh7yIBKAtUkDemg0RqgU="; }; - cargoHash = "sha256-f1aXLMzAzdUhQw6eK0wuWO19HAg2iJgo+Im9Oto+VO4="; + cargoHash = "sha256-C7gn0XJRfYaoswSJcnLNQZvYY7lxLrvKp5fUSIsZ0BY="; nativeBuildInputs = [ pkg-config From 6ab8a02c933f66a2ac1ab283564eaefe7bf01923 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Apr 2026 20:29:04 +0000 Subject: [PATCH 075/246] goperf: 0-unstable-2026-03-11 -> 0-unstable-2026-04-09 --- pkgs/by-name/go/goperf/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/goperf/package.nix b/pkgs/by-name/go/goperf/package.nix index 84626a929f00..0953b98791b9 100644 --- a/pkgs/by-name/go/goperf/package.nix +++ b/pkgs/by-name/go/goperf/package.nix @@ -9,15 +9,15 @@ buildGoModule (finalAttrs: { pname = "goperf"; - version = "0-unstable-2026-03-11"; + version = "0-unstable-2026-04-09"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "16a31bc5fbd0f58f2e8e2a496d8e035bdc4a2e06"; - hash = "sha256-be0vWFJUXTPWKapd+rX3Stnzra9LUGNEw+4P+fWzjyk="; + rev = "8e83ce0f7b1c6c5d6eab4763f10b9322cbe4cecb"; + hash = "sha256-JIR+ytMsZaiQ5w4vTmLG4JHg6tz3/sAs24C3m5//hy4="; }; - vendorHash = "sha256-oBSd0D66BGfanCADtrpyIoUit8c+yHk8Nm6o2GmKoZg="; + vendorHash = "sha256-5WnH49NE1OUaTFuan3DZYhm0uJxIf7i5pgXK1PuqhA0="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf From f7bd3c3c30981ffb8a85d06b92c043082937a213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Thu, 16 Apr 2026 10:48:18 -0700 Subject: [PATCH 076/246] m8c: 1.7.10 -> 2.2.3 --- pkgs/by-name/m8/m8c/package.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/m8/m8c/package.nix b/pkgs/by-name/m8/m8c/package.nix index 88a39657b4e5..27455eecd011 100644 --- a/pkgs/by-name/m8/m8c/package.nix +++ b/pkgs/by-name/m8/m8c/package.nix @@ -3,32 +3,41 @@ fetchFromGitHub, lib, pkg-config, - SDL2, + sdl3, libserialport, + cmake, + copyDesktopItems, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "m8c"; - version = "1.7.10"; + version = "2.2.3"; src = fetchFromGitHub { owner = "laamaa"; repo = "m8c"; rev = "v${finalAttrs.version}"; - hash = "sha256-8QkvvTtFxQmDIqpyhZi/ORcB7YwENu+YafYtCZw0faE="; + hash = "sha256-cr5tat7JOFJ7y7AEinphgV/5T138gV6jidb87GooZ8U="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + copyDesktopItems + ]; buildInputs = [ - SDL2 + sdl3 libserialport ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Cross-platform M8 tracker headless client"; homepage = "https://github.com/laamaa/m8c"; From 2b7c904df686929656b556b47dc7398587fbacf2 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 16 Apr 2026 19:31:24 -0400 Subject: [PATCH 077/246] brave: 1.89.132 -> 1.89.137 https://community.brave.app/t/release-channel-1-89-137/651837 --- 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 ef7912e2e08e..79e393d7f5a4 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.89.132"; + version = "1.89.137"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-mYY8eyMWcwx6RuMNP5ucf6xd1NXfYO4nqXEkiTUtX0o="; + hash = "sha256-JeYoRM6ClQ7iqu+wvwaTUmdDuIS+2AXoTIU+VxAbgRg="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-/SmzRSgmXM567D1YQdD/IfDaIe3RPLtgJMYvcOCwvZo="; + hash = "sha256-BFbx/Ex4HdaFpfY2AKc3yAaMp6PiYwC/kmEIF0WdcwU="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-3f29ehqJNQjYJ+vh15ZI2UJEB1VdBfLL3VWv8CRasCw="; + hash = "sha256-Ffc9se0j9ULZsZQktWzrUgBiLyC5QR1jAPg6IcHoOTI="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-KIod2FbWck1OUATr/vKK+vgwIih3Lha48MAdt5qNIAk="; + hash = "sha256-SOOf35CONFydjSK47xgQLHxX7weQFPl2Fh33H5qeqXo="; }; }; From d848c1fa08de263672aa89809d97dcc26db5ca91 Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Thu, 16 Apr 2026 19:04:29 -0700 Subject: [PATCH 078/246] kanboard: don't hard-code nginx user in service --- nixos/modules/services/web-apps/kanboard.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/kanboard.nix b/nixos/modules/services/web-apps/kanboard.nix index 4f541a712853..8318282ecdd2 100644 --- a/nixos/modules/services/web-apps/kanboard.nix +++ b/nixos/modules/services/web-apps/kanboard.nix @@ -123,7 +123,7 @@ in "pm" = "dynamic"; "php_admin_value[error_log]" = "stderr"; "php_admin_flag[log_errors]" = true; - "listen.owner" = "nginx"; + "listen.owner" = config.services.nginx.user; "catch_workers_output" = true; "pm.max_children" = "32"; "pm.start_servers" = "2"; From 0f8dab97c999bbc2b56abf3463a3cfb63397c3f3 Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Thu, 16 Apr 2026 20:44:39 -0700 Subject: [PATCH 079/246] roundcube: don't hard-code nginx user in service --- nixos/modules/services/mail/roundcube.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 9a6ca6fa9635..c58832daac19 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -256,8 +256,8 @@ in upload_max_filesize = ${cfg.maxAttachmentSize} ''; settings = lib.mapAttrs (name: lib.mkDefault) { - "listen.owner" = "nginx"; - "listen.group" = "nginx"; + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; "listen.mode" = "0660"; "pm" = "dynamic"; "pm.max_children" = 75; From c8d883c148a161014b4ccbd891054114c5a2605a Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Thu, 16 Apr 2026 20:45:22 -0700 Subject: [PATCH 080/246] baikal: don't hard-code nginx user in service --- nixos/modules/services/web-apps/baikal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/baikal.nix b/nixos/modules/services/web-apps/baikal.nix index 1c3f89c510d2..568f250df0df 100644 --- a/nixos/modules/services/web-apps/baikal.nix +++ b/nixos/modules/services/web-apps/baikal.nix @@ -57,8 +57,8 @@ in "BAIKAL_PATH_SPECIFIC" = "/var/lib/baikal/specific/"; }; settings = lib.mapAttrs (name: lib.mkDefault) { - "listen.owner" = "nginx"; - "listen.group" = "nginx"; + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; "listen.mode" = "0600"; "pm" = "dynamic"; "pm.max_children" = 75; From e1ab6b934d6fc441e946e6824adb24d16ae0069f Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Thu, 16 Apr 2026 22:08:34 -0700 Subject: [PATCH 081/246] grocy: don't hard-code nginx user in service --- nixos/modules/services/web-apps/grocy.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix index 8106cc06fd2b..a6860a0902b3 100644 --- a/nixos/modules/services/web-apps/grocy.nix +++ b/nixos/modules/services/web-apps/grocy.nix @@ -44,7 +44,7 @@ in "pm" = "dynamic"; "php_admin_value[error_log]" = "stderr"; "php_admin_flag[log_errors]" = true; - "listen.owner" = "nginx"; + "listen.owner" = config.services.nginx.user; "catch_workers_output" = true; "pm.max_children" = "32"; "pm.start_servers" = "2"; @@ -52,6 +52,20 @@ in "pm.max_spare_servers" = "4"; "pm.max_requests" = "500"; }; + defaultText = lib.literalExpression '' + { + "pm" = "dynamic"; + "php_admin_value[error_log]" = "stderr"; + "php_admin_flag[log_errors]" = true; + "listen.owner" = config.services.nginx.user; + "catch_workers_output" = true; + "pm.max_children" = "32"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "2"; + "pm.max_spare_servers" = "4"; + "pm.max_requests" = "500"; + } + ''; description = '' Options for grocy's PHPFPM pool. From 7028da51c2c10f24cb60dc0c7fa852736be44971 Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Thu, 16 Apr 2026 22:08:45 -0700 Subject: [PATCH 082/246] icingaweb2: don't hard-code nginx user in service --- nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index 597d4951a0db..b7d9dd3dbfe1 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -200,8 +200,8 @@ in date.timezone = "${cfg.timezone}" ''; settings = mapAttrs (name: mkDefault) { - "listen.owner" = "nginx"; - "listen.group" = "nginx"; + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; "listen.mode" = "0600"; "pm" = "dynamic"; "pm.max_children" = 75; From febd95b49f23bfd15ee976ca6f23c560cd35728e Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Thu, 16 Apr 2026 22:09:12 -0700 Subject: [PATCH 083/246] selfoss: don't hard-code nginx user in service --- nixos/modules/services/web-apps/selfoss.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/selfoss.nix b/nixos/modules/services/web-apps/selfoss.nix index f4aa61a4c910..6c1d4a0f46e5 100644 --- a/nixos/modules/services/web-apps/selfoss.nix +++ b/nixos/modules/services/web-apps/selfoss.nix @@ -37,7 +37,8 @@ in user = mkOption { type = types.str; - default = "nginx"; + default = config.services.nginx.user; + defaultText = lib.literalExpression "config.services.nginx.user"; description = '' User account under which both the service and the web-application run. ''; @@ -122,10 +123,10 @@ in config = mkIf cfg.enable { services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { ${poolName} = { - user = "nginx"; + user = config.services.nginx.user; settings = mapAttrs (name: mkDefault) { - "listen.owner" = "nginx"; - "listen.group" = "nginx"; + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; "listen.mode" = "0600"; "pm" = "dynamic"; "pm.max_children" = 75; From 6b6166c53168dcabf80c9ede0c0d0c32893068a1 Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Thu, 16 Apr 2026 22:09:25 -0700 Subject: [PATCH 084/246] tt-rss: don't hard-code nginx user in service --- nixos/modules/services/web-apps/tt-rss.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 607b99537f30..eb33661a8637 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -594,8 +594,8 @@ in inherit (cfg) user; inherit phpPackage; settings = mapAttrs (name: mkDefault) { - "listen.owner" = "nginx"; - "listen.group" = "nginx"; + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; "listen.mode" = "0600"; "pm" = "dynamic"; "pm.max_children" = 75; From f1c7d4b92b48376c0f73b3dd1f31e96b818b2e91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Apr 2026 06:56:43 +0000 Subject: [PATCH 085/246] python3Packages.mkdocstrings: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/mkdocstrings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index a8b7585c2778..b4630e449984 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "mkdocstrings"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "mkdocstrings"; tag = finalAttrs.version; - hash = "sha256-uiw2jNdzmq0kM6GxAzJs8TMTBjuk25kvuIMXxIa28VQ="; + hash = "sha256-FBDzTArJGKoJOmOLiYNTA9kshHWqD7zV1nR3sG4sOMk="; }; postPatch = '' From 603229d1929c76f890be6b4f3735a19c948cfaa7 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Fri, 17 Apr 2026 00:04:59 -0700 Subject: [PATCH 086/246] karlyriceditor: fix build with Qt 6.10 --- pkgs/by-name/ka/karlyriceditor/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/ka/karlyriceditor/package.nix b/pkgs/by-name/ka/karlyriceditor/package.nix index 84cfbc99a28e..10d39c569fe1 100644 --- a/pkgs/by-name/ka/karlyriceditor/package.nix +++ b/pkgs/by-name/ka/karlyriceditor/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, qt6, ffmpeg_4, pkg-config, @@ -18,6 +19,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-eW5sO1gjuwIighnlylJQd9QC+07s1MZX/oPyaHIi/Qs="; }; + patches = [ + # fix build with Qt 6.10, remove after next release + # https://github.com/gyunaev/karlyriceditor/pull/38 + (fetchpatch { + url = "https://github.com/gyunaev/karlyriceditor/commit/1d5e095cc691d4239c919d78209bdd05e57ed2aa.patch"; + hash = "sha256-G93OfcQzgv8PhRQa8aUNsjaIt0GcGQxZGe4Eo0xP7TM="; + }) + ]; + nativeBuildInputs = [ qt6.wrapQtAppsHook qt6.qmake From f7dc9419c432d73e3a9011ffe1731d523ce0a72e Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Fri, 17 Apr 2026 01:22:11 -0700 Subject: [PATCH 087/246] leela-zero: fix build with boost 1.89 --- pkgs/by-name/le/leela-zero/package.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/leela-zero/package.nix b/pkgs/by-name/le/leela-zero/package.nix index e07ae368cd5c..be36176e7b87 100644 --- a/pkgs/by-name/le/leela-zero/package.nix +++ b/pkgs/by-name/le/leela-zero/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchDebianPatch, boost, cmake, libsForQt5, @@ -10,18 +11,28 @@ zlib, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "leela-zero"; version = "0.17-unstable-2023-02-07"; src = fetchFromGitHub { - owner = "gcp"; + owner = "leela-zero"; repo = "leela-zero"; rev = "3ee6d20d0b36ae26120331c610926359cc5837de"; hash = "sha256-JF25y471miw/0b7XXBURzK+4WBwZI5ZUP+36/cZUORo="; fetchSubmodules = true; }; + patches = [ + (fetchDebianPatch { + pname = finalAttrs.pname; + version = "0.17"; + debianRevision = "1.3"; + patch = "boost1.90.patch"; + hash = "sha256-/vnRuRWlZl+pzJvjP6a/A9TaFNuCSkTZkd4h9zvZJis="; + }) + ]; + buildInputs = [ boost opencl-headers @@ -47,4 +58,4 @@ stdenv.mkDerivation { ]; platforms = lib.platforms.linux; }; -} +}) From 1ca1e974ea4ae3b0cc92c9f4d911ee2e8375db47 Mon Sep 17 00:00:00 2001 From: puzzlewolf Date: Fri, 17 Apr 2026 11:27:17 +0200 Subject: [PATCH 088/246] strictdoc: 0.18.1 -> 0.19.0 --- pkgs/by-name/st/strictdoc/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix index fb6036920c6b..ba4e634bc9f0 100644 --- a/pkgs/by-name/st/strictdoc/package.nix +++ b/pkgs/by-name/st/strictdoc/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "strictdoc"; - version = "0.18.1"; + version = "0.19.0"; pyproject = true; src = fetchFromGitHub { owner = "strictdoc-project"; repo = "strictdoc"; tag = finalAttrs.version; - hash = "sha256-pfKEPdEYCW8pMOD5DH9oNVK1ypQKfFMUOXryte+JdCs="; + hash = "sha256-UkXVn1GVWBBhjFaRvkVk+E9mug3i2k7SQk+7JVA8KSo="; }; build-system = [ @@ -31,6 +31,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { jinja2 lark lxml + markdown-it-py openpyxl orjson pandas From c4db38928eb0a5f194f813d38b054ee3e0794699 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Apr 2026 13:13:35 +0000 Subject: [PATCH 089/246] yubihsm-shell: 2.7.2 -> 2.7.3 --- pkgs/by-name/yu/yubihsm-shell/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix index 8412e073e881..578fd54785ce 100644 --- a/pkgs/by-name/yu/yubihsm-shell/package.nix +++ b/pkgs/by-name/yu/yubihsm-shell/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yubihsm-shell"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubihsm-shell"; rev = finalAttrs.version; - hash = "sha256-qWz9fWhwNObvHERvJTWSN3DQsaPNnPEp4SEdYQvFAlY="; + hash = "sha256-0Y2Dj/MAg5Nb6etxF164/7gvytjKYROVIkhqE6Lr2p8="; }; postPatch = '' From b5ee858018cfa1997d15927a6d670b31d68edcb0 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Fri, 17 Apr 2026 15:23:00 +0100 Subject: [PATCH 090/246] umami: refer to prisma, prisma-engines and geocities via finalAttrs --- pkgs/by-name/um/umami/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index 07a259104866..5de7e752d4d0 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -113,8 +113,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { # Allow prisma-cli to find prisma-engines without having to download them # Only needed at build time for `prisma generate`. - env.PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines'}/lib/libquery_engine.node"; - env.PRISMA_SCHEMA_ENGINE_BINARY = "${prisma-engines'}/bin/schema-engine"; + env.PRISMA_QUERY_ENGINE_LIBRARY = "${finalAttrs.passthru.prisma-engines}/lib/libquery_engine.node"; + env.PRISMA_SCHEMA_ENGINE_BINARY = "${finalAttrs.passthru.prisma-engines}/bin/schema-engine"; buildPhase = '' runHook preBuild @@ -146,7 +146,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp -R public $out/public cp -R prisma $out/prisma - ln -s ${geocities} $out/geo + ln -s ${finalAttrs.passthru.geocities} $out/geo mkdir -p $out/bin # Run database migrations before starting umami. @@ -162,7 +162,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ] } \ --chdir $out \ - --run "${lib.getExe prisma'} migrate deploy" \ + --run "${lib.getExe finalAttrs.passthru.prisma} migrate deploy" \ --add-flags "$out/server.js" runHook postInstall From 2cc910e4005c537d1b056435fbbe0222ba05c4bb Mon Sep 17 00:00:00 2001 From: Steve Purcell Date: Fri, 13 Mar 2026 08:16:12 +0000 Subject: [PATCH 091/246] lstk: init at 0.5.7 --- pkgs/by-name/ls/lstk/package.nix | 42 ++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/ls/lstk/package.nix diff --git a/pkgs/by-name/ls/lstk/package.nix b/pkgs/by-name/ls/lstk/package.nix new file mode 100644 index 000000000000..9b5a4c84e820 --- /dev/null +++ b/pkgs/by-name/ls/lstk/package.nix @@ -0,0 +1,42 @@ +{ + fetchFromGitHub, + buildGoModule, + lib, + nix-update-script, +}: +buildGoModule (finalAttrs: { + pname = "lstk"; + version = "0.5.7"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "localstack"; + repo = "lstk"; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-HWkCDnbg/D2zX3rdvmFTdKrx03SO6FaiA/Pzj0f4hlA="; + }; + + vendorHash = "sha256-rEcVtSFnBQ+3bbU5pjbCXEJZo89+lL/1HJG9bCn8OSE="; + + excludedPackages = "test/integration"; + + __darwinAllowLocalNetworking = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command line interface for LocalStack"; + mainProgram = "lstk"; + homepage = "https://github.com/localstack/lstk"; + changelog = "https://github.com/localstack/lstk/releases/tag/v${finalAttrs.version}"; + longDescription = '' + lstk is a command-line interface for LocalStack built in Go with a modern + terminal Ul, and native CLI experience for managing and interacting with + LocalStack deployments. + ''; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ purcell ]; + platforms = lib.platforms.unix; + }; +}) From 6ab1cb2c2f163c581f7715c86f53695f5c1b1256 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Fri, 17 Apr 2026 15:24:31 +0100 Subject: [PATCH 092/246] umami: 3.0.3 -> 3.1.0 --- pkgs/by-name/um/umami/package.nix | 41 ++++++++++++++++++++---------- pkgs/by-name/um/umami/sources.json | 6 ++--- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index 5de7e752d4d0..0f3e55b27ef0 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -3,14 +3,15 @@ stdenvNoCC, fetchFromGitHub, fetchurl, + inter, makeWrapper, nixosTests, nodejs, fetchPnpmDeps, pnpmConfigHook, pnpm, - prisma_6, - prisma-engines_6, + prisma_7, + prisma-engines_7, openssl, rustPlatform, # build variables @@ -41,15 +42,15 @@ let # Pin the specific version of prisma to the one used by upstream # to guarantee compatibility. - prisma-engines' = prisma-engines_6.overrideAttrs (old: rec { - version = "6.19.0"; + prisma-engines' = prisma-engines_7.overrideAttrs (old: rec { + version = "7.6.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; tag = version; - hash = "sha256-icFgoKIrr3fGSVmSczlMJiT5KSb746kVldtrk+Q0wW8="; + hash = "sha256-NMoAaiTa68i51lR6iMCyHyCAsFuuhPx2+tHFSSoqWqA="; }; - cargoHash = "sha256-8sAjYLSmNneQVrNh9iOmk5lVajtiFPWYSC8jfo5CK5U="; + cargoHash = "sha256-uiFvzxwVJXCW9LUDFRC6ZkzSa7LQk+9ZJcaJw8mrBX4="; cargoDeps = rustPlatform.fetchCargoVendor { inherit (old) pname; @@ -58,23 +59,23 @@ let hash = cargoHash; }; }); - prisma' = (prisma_6.override { prisma-engines_6 = prisma-engines'; }).overrideAttrs (old: rec { - version = "6.19.0"; + prisma' = (prisma_7.override { prisma-engines_7 = prisma-engines'; }).overrideAttrs (old: rec { + version = "7.6.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma"; tag = version; - hash = "sha256-lFPAu296cQMDnEcLTReSHuLuOz13kd7n0GV+ifcX+lQ="; + hash = "sha256-BesX2ySfgew6+9Q6fnhZ8gMnnxh4D4fefaA5BhehlHE="; }; pnpmDeps = old.pnpmDeps.override { inherit src version; - hash = "sha256-9v30vhclD+sPcui/VG8dwaC8XGU6QFs/Gu8rjjoQy/w="; + hash = "sha256-ZOpNt+W5b1troicfkCi4wCCDtwhTB4VlPgxYMZetcs0="; }; }); in stdenvNoCC.mkDerivation (finalAttrs: { pname = "umami"; - version = "3.0.3"; + version = "3.1.0"; nativeBuildInputs = [ makeWrapper @@ -87,9 +88,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "umami-software"; repo = "umami"; tag = "v${finalAttrs.version}"; - hash = "sha256-rkOD52suE6bihJqKvMdIvqHRIcWhSxXzUkCfmdNbC40="; + hash = "sha256-EH3ebwTbajcNasn25ets2w068ZmCQRYUY2XON39J5HA="; }; + # Umami uses next/font/google, which tries to download from Google Fonts at build time. + # Replace that code with a copy of the required font(s) from nixpkgs instead. + postPatch = '' + substituteInPlace ./src/app/layout.tsx \ + --replace-fail "import { Inter } from 'next/font/google';" "import localFont from 'next/font/local';" \ + --replace-fail 'const inter = Inter({' "const inter = localFont({ src: './Inter.ttf'," + + cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf + ''; + pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname @@ -97,7 +108,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src ; fetcherVersion = 3; - hash = "sha256-GFN94oySPCZA5K13XR8f/tByuHS571ohlYTFqaVw/Ns="; + hash = "sha256-QNWmCsVFh8xpsO4ZPTaKGszwuRaxTrWLMVh/6VV5oIw="; }; env.CYPRESS_INSTALL_BINARY = "0"; @@ -145,6 +156,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp -R public $out/public cp -R prisma $out/prisma + cp prisma.config.ts $out/prisma.config.ts + substituteInPlace $out/prisma.config.ts \ + --replace-fail "import 'dotenv/config';" "" \ + --replace-fail "from 'prisma/config';" "from '${finalAttrs.passthru.prisma}/lib/prisma/packages/config';" ln -s ${finalAttrs.passthru.geocities} $out/geo diff --git a/pkgs/by-name/um/umami/sources.json b/pkgs/by-name/um/umami/sources.json index 48c653cabebc..30d51dfd4329 100644 --- a/pkgs/by-name/um/umami/sources.json +++ b/pkgs/by-name/um/umami/sources.json @@ -1,7 +1,7 @@ { "geocities": { - "rev": "c311451d8c87eff88329f08a0fae5f84fc0303fe", - "date": "2025-12-11", - "hash": "sha256-tDK2p1VUmVfbzl0EhcGZbWP/1ao/U3f9vcK49f0MErc=" + "rev": "6a3ef689a4673ff2bf292548716e7cc6c5a2c903", + "date": "2026-04-16", + "hash": "sha256-GUUeFU1DKGL+NpzK1oJlsyB/VrFWe6Lj7U7yJXj8mNo=" } } From 45ff8698441f6f1111d539f6ff17f7a30d9c742a Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Fri, 17 Apr 2026 15:25:12 +0100 Subject: [PATCH 093/246] umami: use pnpm build and ignore unneeded steps --- pkgs/by-name/um/umami/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index 0f3e55b27ef0..058505f9846e 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -121,6 +121,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { # Needs to be non-empty during build env.DATABASE_URL = "postgresql://"; + # No DB is available during build + env.SKIP_DB_CHECK = "1"; + + # Geocities is handled manually + env.SKIP_BUILD_GEO = "1"; # Allow prisma-cli to find prisma-engines without having to download them # Only needed at build time for `prisma generate`. @@ -130,10 +135,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - pnpm build-db-client # prisma generate - - pnpm build-tracker - pnpm build-app + pnpm build runHook postBuild ''; @@ -161,8 +163,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { --replace-fail "import 'dotenv/config';" "" \ --replace-fail "from 'prisma/config';" "from '${finalAttrs.passthru.prisma}/lib/prisma/packages/config';" - ln -s ${finalAttrs.passthru.geocities} $out/geo - mkdir -p $out/bin # Run database migrations before starting umami. # Add openssl to PATH since it is required for prisma to make SSL connections. @@ -170,6 +170,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper ${nodejs}/bin/node $out/bin/umami-server \ --set NODE_ENV production \ --set NEXT_TELEMETRY_DISABLED 1 \ + --set GEOLITE_DB_PATH ${lib.escapeShellArg "${finalAttrs.passthru.geocities}/GeoLite2-City.mmdb"} \ --prefix PATH : ${ lib.makeBinPath [ openssl From 5c9b20e2292240da8093f7efdf839432facd854a Mon Sep 17 00:00:00 2001 From: polykernel <81340136+polykernel@users.noreply.github.com> Date: Fri, 17 Apr 2026 11:23:58 -0400 Subject: [PATCH 094/246] privoxy: 4.0.0 -> 4.1.0 Release notes: https://www.privoxy.org/sf-download-mirror/Sources/4.1.0%20%28stable%29/announce.txt --- pkgs/tools/networking/privoxy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 646eef378047..a0e3a713c9ac 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -6,7 +6,7 @@ fetchurl, autoreconfHook, zlib, - pcre, + pcre2, w3m, man, openssl, @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "privoxy"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; - sha256 = "sha256-wI4roASTBwF7+dimPdKg37lqoM3rNK4Ad3bmPrpiom8="; + sha256 = "sha256-I+RoblhIx0y2gMCcKBHwNXc57P5kH5xAcu5COZCSyXs="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ zlib - pcre + pcre2 openssl brotli ]; From 2d91d44b4a617dd4d3f597e6d3d3b3d11c3b4b37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Apr 2026 15:25:49 +0000 Subject: [PATCH 095/246] kine: 0.14.14 -> 0.14.16 --- pkgs/by-name/ki/kine/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix index 5659f404452b..a892398db8e0 100644 --- a/pkgs/by-name/ki/kine/package.nix +++ b/pkgs/by-name/ki/kine/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kine"; - version = "0.14.14"; + version = "0.14.16"; src = fetchFromGitHub { owner = "k3s-io"; repo = "kine"; rev = "v${finalAttrs.version}"; - hash = "sha256-G1GVR0bgcx51HqwsCUqd9H30mWZgLkYYy2PNdmO/oQw="; + hash = "sha256-WLH0aGs8Y8DKbhsjvtnp2sjEDP1F19V/tEtdfT+3FtM="; }; - vendorHash = "sha256-N5FEspfnc6GexPIzN5PbX8/XYD0LXledE+mi9Ni0gTU="; + vendorHash = "sha256-RFqK2k1Gm89Oc3c+LAEE2FyOVIfEYIrEbUXQVHUWbrU="; ldflags = [ "-s" From 6ad089324e931ae78fe4dce48cba05fb08a2d29e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Apr 2026 15:42:12 +0000 Subject: [PATCH 096/246] postman: 11.89.0 -> 11.93.0 --- 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 8f9113f9ef59..9eb88dbafa28 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.89.0"; + version = "11.93.0"; 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-NGiQPg4oVr2zin0NT8/2Y5HTrBZeA7Oboue2zYPHJWc="; - aarch64-linux = "sha256-dGV1JzNsHo8lKZplBX5sp1BRgGovVY+UM+6BumXLK2E="; - x86_64-darwin = "sha256-kpl5x+uCR76dSwG+5xk4aA0lLiKXWOhJTtco2+S5c5g="; - x86_64-linux = "sha256-9hRBh1zUIL5JctHhdtAeWgR8/QqftRNqAGghI7BgdsI="; + aarch64-darwin = "sha256-P7MF0Hg1n/0Wsdg9YEJTHRy8NGjDkDrCCFMbu3uovho="; + aarch64-linux = "sha256-OOJAdywyGZaFMpi/IKub53NfJ2IEu3E+bkmYeDT/xjc="; + x86_64-darwin = "sha256-xBY8Nqtax8e/5k/pAOCRSdHiOETR1RS1A/anVwhWipw="; + x86_64-linux = "sha256-hsW/2Fs1uY+iUl9hzzr5lcVxoydSZn3p/B0AsqXwlww="; }; }; From deb52d935dbe038489fcb494c080c916cd5ba34d Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 17 Apr 2026 18:34:25 +0200 Subject: [PATCH 097/246] acpica-tools: Add changelog link Signed-off-by: Felix Singer --- pkgs/by-name/ac/acpica-tools/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix index 4f3420a991d8..3c7deac347fa 100644 --- a/pkgs/by-name/ac/acpica-tools/package.nix +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.acpica.org/"; description = "ACPICA Tools"; + changelog = "https://github.com/acpica/acpica/releases/tag/${finalAttrs.version}"; license = with lib.licenses; [ iasl gpl2Only From d9cc39ff09ce4770f9731ee3aabbf6b022a9a76b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Apr 2026 18:27:44 +0000 Subject: [PATCH 098/246] python3Packages.lupa: 2.7 -> 2.8 --- pkgs/development/python-modules/lupa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index 0a0b6c217452..172b5e128c0f 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -8,12 +8,12 @@ buildPythonPackage (finalAttrs: { pname = "lupa"; - version = "2.7"; + version = "2.8"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-c6ZM5dyM2Vt1ozDBUT5G4JjUD87tP+pRbAn2WV6t6Ik="; + hash = "sha256-2AImQbnsjs8sXsvp9H5acOC4fEta6SG5LLAqY44KzQg="; }; build-system = [ From 9b7de03a78363e04baa1be68b9b87e2e0895c559 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Apr 2026 21:39:23 +0000 Subject: [PATCH 099/246] iroh-relay: 0.96.0 -> 0.98.0 --- pkgs/tools/networking/iroh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/iroh/default.nix b/pkgs/tools/networking/iroh/default.nix index 86d3af8ead0e..748d54e1e0de 100644 --- a/pkgs/tools/networking/iroh/default.nix +++ b/pkgs/tools/networking/iroh/default.nix @@ -12,16 +12,16 @@ let }: rustPlatform.buildRustPackage rec { pname = name; - version = "0.96.0"; + version = "0.98.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = "iroh"; rev = "v${version}"; - hash = "sha256-J7FiKIBFUnTUJJwzwzfyk7+CK0UKlAPNFjVDDGlHMqM="; + hash = "sha256-s6+XobcFGw7JquIuUQinmHggxmxQ1iKMpDVe49LpSbI="; }; - cargoHash = "sha256-W8PVysQffGuxBIDpcZ77ujOQ5KBED6svwEXPeZpQmTc="; + cargoHash = "sha256-GoBG4bI5hufklEC3uoVFE+NURTEHhb4ZtXFYd9nsCls="; buildFeatures = cargoFeatures; cargoBuildFlags = [ From f2c79d678ae6f050c822ea8a98dbdc48d98dd416 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Apr 2026 22:51:40 +0000 Subject: [PATCH 100/246] python3Packages.nox: 2026.02.09 -> 2026.04.10 --- pkgs/development/python-modules/nox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index 706868312c06..acdd8ef3d6bc 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "nox"; - version = "2026.02.09"; + version = "2026.04.10"; pyproject = true; disabled = pythonOlder "3.12"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "wntrblm"; repo = "nox"; tag = version; - hash = "sha256-RaB0q9gCoYqKAI8IzNh5qUd0SrzsPeOa3C6IGxpcbwE="; + hash = "sha256-ArSA9I86hTKM+fkTdzOeheYVxpdjweMs2I0mUwR14sQ="; }; build-system = [ hatchling ]; From 589a9e6a0815a6cce04eb5e9637003ff9dd7bb22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Apr 2026 23:31:38 +0000 Subject: [PATCH 101/246] werf: 2.63.1 -> 2.65.4 --- pkgs/by-name/we/werf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index e148cf3b09ce..a535a5dc06d0 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "werf"; - version = "2.63.1"; + version = "2.65.4"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; tag = "v${finalAttrs.version}"; - hash = "sha256-xK86VoY+TQvUdPEchkuJZ9oxwQOSgIr8dkuFQGsgCqY="; + hash = "sha256-rokgq74XSOVgA6n0aKgW3X/I+T8hfEnDazbJsxRiJdc="; }; proxyVendor = true; - vendorHash = "sha256-7IJq7xOF2ELJu8n1f2xXOIxOybKaN+FpuU7r4KGsfX0="; + vendorHash = "sha256-hWivVUSsEWtXmxckiw4E+f7W/5Agy4fYkKEq0YTIuSk="; nativeBuildInputs = [ installShellFiles ]; buildInputs = From 916588917d62ec23e63a250dca931401d8a3e0f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 00:39:45 +0000 Subject: [PATCH 102/246] tea: 0.13.0 -> 0.14.0 --- pkgs/by-name/te/tea/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tea/package.nix b/pkgs/by-name/te/tea/package.nix index a1aa18abc48d..b965c9b30100 100644 --- a/pkgs/by-name/te/tea/package.nix +++ b/pkgs/by-name/te/tea/package.nix @@ -9,17 +9,17 @@ buildGoModule (finalAttrs: { pname = "tea"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "tea"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-fycLPF7JBkc9Cjw9mU4cikP9dJzXLa4WAkbZ/+aG6Yw="; + sha256 = "sha256-FLaOhU9oDZhpRJnWrXgIV3Cup6L9i5JHP5xWiu9aZkI="; }; - vendorHash = "sha256-tPlpNfBTcfBJGI0PFD2B1J1nH3wQwJ8uqGcje7wzKTo="; + vendorHash = "sha256-7FLDDJB5ms9miAaxQJ26MCBfRxQZN/RlXyMJweTk7SE="; ldflags = [ "-s" From eed6d71f194a1738fc145f1b651cbaa24023bdbd Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Sat, 18 Apr 2026 08:49:45 +0800 Subject: [PATCH 103/246] canfigger: update license --- pkgs/by-name/ca/canfigger/package.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/by-name/ca/canfigger/package.nix b/pkgs/by-name/ca/canfigger/package.nix index d297e907d70f..f7f6ad629a23 100644 --- a/pkgs/by-name/ca/canfigger/package.nix +++ b/pkgs/by-name/ca/canfigger/package.nix @@ -22,16 +22,11 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - # canfigger has asan and ubsan enabled by default, disable it here - mesonFlags = [ - "-Dcanfigger:b_sanitize=none" - ]; - meta = { description = "Lightweight library designed to parse configuration files"; homepage = "https://github.com/andy5995/canfigger"; changelog = "https://github.com/andy5995/canfigger/blob/${finalAttrs.src.rev}/ChangeLog.txt"; - license = lib.licenses.gpl3Only; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ iynaix ]; mainProgram = "canfigger"; platforms = lib.platforms.all; From ad0434b7c683b3a01619ac80652b14616213262c Mon Sep 17 00:00:00 2001 From: zspher <66728045+zspher@users.noreply.github.com> Date: Fri, 17 Apr 2026 21:27:57 -0600 Subject: [PATCH 104/246] vicinae: 0.20.12 -> 0.20.13 --- 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 6b39cc7c4298..83e1a5c23b1a 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.20.12"; + version = "0.20.13"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-esnDXLMXJz+Nw4VF8Dk/FX4M+eVNe3vJSq06IoJ/NwA="; + hash = "sha256-zRoOKeQ4ne7o7mILwb+5PKE75FhoqkG/HizWs7bKrDo="; }; apiDeps = fetchNpmDeps { From 065c5280d70a737fbb9c25ada606431229555fc6 Mon Sep 17 00:00:00 2001 From: Nikita Pedorich Date: Thu, 9 Apr 2026 20:23:41 +0900 Subject: [PATCH 105/246] dashy-ui: 3.1.1-unstable-2025-09-12 -> 3.3.0 --- pkgs/by-name/da/dashy-ui/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix index 7ff42949d6d0..be6ac75dc161 100644 --- a/pkgs/by-name/da/dashy-ui/package.nix +++ b/pkgs/by-name/da/dashy-ui/package.nix @@ -12,24 +12,26 @@ nodejs_20, nodejs-slim_20, remarshal_0_17, + nix-update-script, settings ? { }, }: stdenv.mkDerivation (finalAttrs: { pname = "dashy-ui"; - version = "3.1.1-unstable-2025-09-12"; + version = "3.3.0"; src = fetchFromGitHub { owner = "lissy93"; repo = "dashy"; - rev = "e70ade555fdccf4e723a90f8a2d46fcf83645c4f"; - hash = "sha256-edsGHc6Hi306aq+TA2g5FL/ZYNfExbcgHS5PWF9O0+0="; + tag = finalAttrs.version; + hash = "sha256-Xc6zwnR0J+0DuTKNW3eHyJRvUgJgEeL3jA26wzNTMN0="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-r36w3Cz/V7E/xPYYpvfQsdk2QXfCVDYE9OxiFNyKP2s="; + hash = "sha256-EMns5J8rM4qOfrACoX6lttOXh/RUtZjaKtd+BpsS6Xs="; }; - passthru.tests = { - dashy = nixosTests.dashy; + passthru = { + tests.dashy = nixosTests.dashy; + updateScript = nix-update-script { }; }; # - If no settings are passed, use the default config provided by upstream From fb9121285dca92ad6cabbe80dd7a59b0b4fa34fe Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Fri, 17 Apr 2026 23:48:37 -0400 Subject: [PATCH 106/246] docuseal: 2.3.4 -> 2.4.4 --- pkgs/by-name/do/docuseal/Gemfile | 5 +- pkgs/by-name/do/docuseal/Gemfile.lock | 312 +++++++-------- pkgs/by-name/do/docuseal/gemset.nix | 376 ++++++++---------- pkgs/by-name/do/docuseal/package.nix | 12 +- .../ruby-modules/gem-config/default.nix | 5 +- 5 files changed, 308 insertions(+), 402 deletions(-) diff --git a/pkgs/by-name/do/docuseal/Gemfile b/pkgs/by-name/do/docuseal/Gemfile index 1a44d72dd7dd..f1c15e33d37d 100644 --- a/pkgs/by-name/do/docuseal/Gemfile +++ b/pkgs/by-name/do/docuseal/Gemfile @@ -3,6 +3,7 @@ source 'https://rubygems.org' +gem 'addressable' gem 'arabic-letter-connector', require: false gem 'aws-sdk-s3', require: false gem 'aws-sdk-secretsmanager', require: false @@ -27,12 +28,10 @@ gem 'oj' gem 'onnxruntime', require: false gem 'pagy' gem 'pg', require: false -gem 'premailer-rails' gem 'pretender' gem 'puma', require: false gem 'rack' gem 'rails' -gem 'rails_autolink' gem 'rails-i18n' gem 'rotp' gem 'rouge', require: false @@ -43,7 +42,7 @@ gem 'shakapacker' gem 'sidekiq' gem 'sqlite3', require: false gem 'strip_attributes' -gem 'trilogy', github: 'trilogy-libraries/trilogy', glob: 'contrib/ruby/*.gemspec', require: false +gem 'trilogy', require: false gem 'turbo-rails' gem 'twitter_cldr', require: false gem 'tzinfo-data' diff --git a/pkgs/by-name/do/docuseal/Gemfile.lock b/pkgs/by-name/do/docuseal/Gemfile.lock index ac3adcc8fda0..a52dd3b0b983 100644 --- a/pkgs/by-name/do/docuseal/Gemfile.lock +++ b/pkgs/by-name/do/docuseal/Gemfile.lock @@ -1,39 +1,31 @@ -GIT - remote: https://github.com/trilogy-libraries/trilogy.git - revision: 3963d490459df7a2b5bedb42424c3285f25eab22 - glob: contrib/ruby/*.gemspec - specs: - trilogy (2.10.0) - bigdecimal - GEM remote: https://rubygems.org/ specs: - action_text-trix (2.1.16) + action_text-trix (2.1.18) railties - actioncable (8.1.2) - actionpack (= 8.1.2) - activesupport (= 8.1.2) + actioncable (8.1.3) + actionpack (= 8.1.3) + activesupport (= 8.1.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.1.2) - actionpack (= 8.1.2) - activejob (= 8.1.2) - activerecord (= 8.1.2) - activestorage (= 8.1.2) - activesupport (= 8.1.2) + actionmailbox (8.1.3) + actionpack (= 8.1.3) + activejob (= 8.1.3) + activerecord (= 8.1.3) + activestorage (= 8.1.3) + activesupport (= 8.1.3) mail (>= 2.8.0) - actionmailer (8.1.2) - actionpack (= 8.1.2) - actionview (= 8.1.2) - activejob (= 8.1.2) - activesupport (= 8.1.2) + actionmailer (8.1.3) + actionpack (= 8.1.3) + actionview (= 8.1.3) + activejob (= 8.1.3) + activesupport (= 8.1.3) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.1.2) - actionview (= 8.1.2) - activesupport (= 8.1.2) + actionpack (8.1.3) + actionview (= 8.1.3) + activesupport (= 8.1.3) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -41,36 +33,36 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.1.2) + actiontext (8.1.3) action_text-trix (~> 2.1.15) - actionpack (= 8.1.2) - activerecord (= 8.1.2) - activestorage (= 8.1.2) - activesupport (= 8.1.2) + actionpack (= 8.1.3) + activerecord (= 8.1.3) + activestorage (= 8.1.3) + activesupport (= 8.1.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.1.2) - activesupport (= 8.1.2) + actionview (8.1.3) + activesupport (= 8.1.3) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (8.1.2) - activesupport (= 8.1.2) + activejob (8.1.3) + activesupport (= 8.1.3) globalid (>= 0.3.6) - activemodel (8.1.2) - activesupport (= 8.1.2) - activerecord (8.1.2) - activemodel (= 8.1.2) - activesupport (= 8.1.2) + activemodel (8.1.3) + activesupport (= 8.1.3) + activerecord (8.1.3) + activemodel (= 8.1.3) + activesupport (= 8.1.3) timeout (>= 0.4.0) - activestorage (8.1.2) - actionpack (= 8.1.2) - activejob (= 8.1.2) - activerecord (= 8.1.2) - activesupport (= 8.1.2) + activestorage (8.1.3) + actionpack (= 8.1.3) + activejob (= 8.1.3) + activerecord (= 8.1.3) + activesupport (= 8.1.3) marcel (~> 1.0) - activesupport (8.1.2) + activesupport (8.1.3) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -83,16 +75,16 @@ GEM securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) uri (>= 0.13.1) - addressable (2.8.8) + addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) - annotaterb (4.20.0) + annotaterb (4.22.0) activerecord (>= 6.0.0) activesupport (>= 6.0.0) arabic-letter-connector (0.1.1) ast (2.4.3) aws-eventstream (1.4.0) - aws-partitions (1.1209.0) - aws-sdk-core (3.241.4) + aws-partitions (1.1233.0) + aws-sdk-core (3.244.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -100,15 +92,15 @@ GEM bigdecimal jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.121.0) - aws-sdk-core (~> 3, >= 3.241.4) + aws-sdk-kms (1.123.0) + aws-sdk-core (~> 3, >= 3.244.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.212.0) - aws-sdk-core (~> 3, >= 3.241.4) + aws-sdk-s3 (1.218.0) + aws-sdk-core (~> 3, >= 3.244.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-secretsmanager (1.128.0) - aws-sdk-core (~> 3, >= 3.241.4) + aws-sdk-secretsmanager (1.129.0) + aws-sdk-core (~> 3, >= 3.244.0) aws-sigv4 (~> 1.5) aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) @@ -116,7 +108,7 @@ GEM cgi rexml base64 (0.3.0) - bcrypt (3.1.21) + bcrypt (3.1.22) better_html (2.2.0) actionview (>= 7.0) activesupport (>= 7.0) @@ -124,11 +116,11 @@ GEM erubi (~> 1.4) parser (>= 2.4) smart_properties - bigdecimal (4.0.1) + bigdecimal (4.1.0) bindex (0.8.1) - bootsnap (1.21.1) + bootsnap (1.23.0) msgpack (~> 1.2) - brakeman (7.1.2) + brakeman (8.0.4) racc builder (3.3.0) bullet (8.1.0) @@ -158,8 +150,6 @@ GEM bigdecimal rexml crass (1.0.6) - css_parser (1.21.1) - addressable csv (3.3.5) csv-safe (3.3.1) csv (~> 3.0) @@ -171,16 +161,16 @@ GEM irb (~> 1.10) reline (>= 0.3.8) declarative (0.0.20) - devise (4.9.4) + devise (5.0.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0) + railties (>= 7.0) responders warden (~> 1.2.3) - devise-two-factor (6.3.1) - activesupport (>= 7.0, < 8.2) - devise (>= 4.0, < 5.0) - railties (>= 7.0, < 8.2) + devise-two-factor (6.4.0) + activesupport (>= 7.2, < 8.2) + devise (>= 4.0, < 6.0) + railties (>= 7.2, < 8.2) rotp (~> 6.0) diff-lcs (1.6.2) digest-crc (0.7.0) @@ -189,7 +179,7 @@ GEM dotenv (3.2.0) drb (2.2.3) email_typo (0.2.3) - erb (6.0.1) + erb (6.0.2) erb_lint (0.9.0) activesupport better_html (>= 2.0.1) @@ -203,7 +193,7 @@ GEM factory_bot_rails (6.5.1) factory_bot (~> 6.5) railties (>= 6.1.0) - faker (3.6.0) + faker (3.6.1) i18n (>= 1.8.11, < 2) faraday (2.14.1) faraday-net_http (>= 2.0, < 3.5) @@ -213,16 +203,16 @@ GEM faraday (>= 1, < 3) faraday-net_http (3.4.2) net-http (~> 0.5) - ferrum (0.17.1) + ferrum (0.17.2) addressable (~> 2.5) base64 (~> 0.2) concurrent-ruby (~> 1.1) webrick (~> 1.7) websocket-driver (~> 0.7) - ffi (1.17.3) - ffi (1.17.3-aarch64-linux-musl) - ffi (1.17.3-arm64-darwin) - ffi (1.17.3-x86_64-linux-musl) + ffi (1.17.4) + ffi (1.17.4-aarch64-linux-musl) + ffi (1.17.4-arm64-darwin) + ffi (1.17.4-x86_64-linux-musl) foreman (0.90.0) thor (~> 1.4) geom2d (0.4.1) @@ -238,7 +228,7 @@ GEM retriable (~> 3.1) google-apis-iamcredentials_v1 (0.26.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.59.0) + google-apis-storage_v1 (0.61.0) google-apis-core (>= 0.15.0, < 2.a) google-cloud-core (1.8.0) google-cloud-env (>= 1.0, < 3.a) @@ -246,8 +236,8 @@ GEM google-cloud-env (2.3.1) base64 (~> 0.2) faraday (>= 1.0, < 3.a) - google-cloud-errors (1.5.0) - google-cloud-storage (1.58.0) + google-cloud-errors (1.6.0) + google-cloud-storage (1.59.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-core (>= 0.18, < 2) @@ -257,7 +247,7 @@ GEM googleauth (~> 1.9) mini_mime (~> 1.0) google-logging-utils (0.2.0) - googleauth (1.16.1) + googleauth (1.16.2) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.2) google-logging-utils (~> 0.1) @@ -266,24 +256,24 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) hashdiff (1.2.1) - hexapdf (1.5.0) + hexapdf (1.6.0) cmdparse (~> 3.0, >= 3.0.3) geom2d (~> 0.4, >= 0.4.1) openssl (>= 2.2.1) strscan (>= 3.1.2) - htmlentities (4.4.2) i18n (1.14.8) concurrent-ruby (~> 1.0) image_processing (1.14.0) mini_magick (>= 4.9.5, < 6) ruby-vips (>= 2.0.17, < 3) io-console (0.8.2) - irb (1.16.0) + irb (1.17.0) pp (>= 0.6.0) + prism (>= 1.3.0) rdoc (>= 4.0.0) reline (>= 0.4.2) jmespath (1.6.2) - json (2.18.1) + json (2.19.3) jwt (3.1.2) base64 language_server-protocol (3.17.0.5) @@ -305,7 +295,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.25.0) + loofah (2.25.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.9.0) @@ -321,13 +311,14 @@ GEM logger mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (6.0.1) + minitest (6.0.3) + drb (~> 2.0) prism (~> 1.5) msgpack (1.8.0) multi_json (1.19.1) net-http (0.9.1) uri (>= 0.11.1) - net-imap (0.6.2) + net-imap (0.6.3) date net-protocol net-pop (0.1.2) @@ -337,17 +328,17 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.5) - nokogiri (1.19.0) + nokogiri (1.19.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.19.0-aarch64-linux-musl) + nokogiri (1.19.2-aarch64-linux-musl) racc (~> 1.4) - nokogiri (1.19.0-arm64-darwin) + nokogiri (1.19.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.19.0-x86_64-linux-musl) + nokogiri (1.19.2-x86_64-linux-musl) racc (~> 1.4) - numo-narray-alt (0.9.13) - oj (3.16.13) + numo-narray-alt (0.10.3) + oj (3.16.16) bigdecimal (>= 3.0) ostruct (>= 0.2) onnxruntime (0.10.1) @@ -358,16 +349,17 @@ GEM ffi onnxruntime (0.10.1-x86_64-linux) ffi - openssl (4.0.0) + openssl (4.0.1) orm_adapter (0.5.0) os (1.1.4) ostruct (0.6.3) package_json (0.2.0) - pagy (43.2.8) + pagy (43.4.4) json + uri yaml - parallel (1.27.0) - parser (3.3.10.1) + parallel (1.28.0) + parser (3.3.11.1) ast (~> 2.4.1) racc pg (1.6.3) @@ -376,18 +368,10 @@ GEM pg (1.6.3-x86_64-linux-musl) pp (0.6.3) prettyprint - premailer (1.27.0) - addressable - css_parser (>= 1.19.0) - htmlentities (>= 4.0.0) - premailer-rails (1.12.0) - actionmailer (>= 3) - net-smtp - premailer (~> 1.7, >= 1.7.9) - pretender (0.6.0) - actionpack (>= 7.1) + pretender (1.0.0) + actionpack (>= 7.2) prettyprint (0.2.0) - prism (1.8.0) + prism (1.9.0) pry (0.16.0) coderay (~> 1.1) method_source (~> 1.0) @@ -397,51 +381,47 @@ GEM psych (5.3.1) date stringio - public_suffix (7.0.2) + public_suffix (7.0.5) puma (7.2.0) nio4r (~> 2.0) racc (1.8.1) - rack (3.2.4) + rack (3.2.6) rack-proxy (0.7.7) rack - rack-session (2.1.1) + rack-session (2.1.2) base64 (>= 0.1.0) rack (>= 3.0.0) rack-test (2.2.0) rack (>= 1.3) rackup (2.3.1) rack (>= 3) - rails (8.1.2) - actioncable (= 8.1.2) - actionmailbox (= 8.1.2) - actionmailer (= 8.1.2) - actionpack (= 8.1.2) - actiontext (= 8.1.2) - actionview (= 8.1.2) - activejob (= 8.1.2) - activemodel (= 8.1.2) - activerecord (= 8.1.2) - activestorage (= 8.1.2) - activesupport (= 8.1.2) + rails (8.1.3) + actioncable (= 8.1.3) + actionmailbox (= 8.1.3) + actionmailer (= 8.1.3) + actionpack (= 8.1.3) + actiontext (= 8.1.3) + actionview (= 8.1.3) + activejob (= 8.1.3) + activemodel (= 8.1.3) + activerecord (= 8.1.3) + activestorage (= 8.1.3) + activesupport (= 8.1.3) bundler (>= 1.15.0) - railties (= 8.1.2) + railties (= 8.1.3) rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.2) - loofah (~> 2.21) + rails-html-sanitizer (1.7.0) + loofah (~> 2.25) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) rails-i18n (8.1.0) i18n (>= 0.7, < 2) railties (>= 8.0.0, < 9) - rails_autolink (1.1.8) - actionview (> 3.1) - activesupport (> 3.1) - railties (> 3.1) - railties (8.1.2) - actionpack (= 8.1.2) - activesupport (= 8.1.2) + railties (8.1.3) + actionpack (= 8.1.3) + activesupport (= 8.1.3) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -450,11 +430,11 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.3.1) - rdoc (7.1.0) + rdoc (7.2.0) erb psych (>= 4.0.0) tsort - redis-client (0.26.4) + redis-client (0.28.0) connection_pool regexp_parser (2.11.3) reline (0.6.3) @@ -468,7 +448,7 @@ GEM responders (3.2.0) actionpack (>= 7.0) railties (>= 7.0) - retriable (3.1.2) + retriable (3.4.1) rexml (3.4.4) rotp (6.3.0) rouge (4.7.0) @@ -481,19 +461,19 @@ GEM rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.7) + rspec-mocks (3.13.8) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (8.0.2) + rspec-rails (8.0.4) actionpack (>= 7.2) activesupport (>= 7.2) railties (>= 7.2) - rspec-core (~> 3.13) - rspec-expectations (~> 3.13) - rspec-mocks (~> 3.13) - rspec-support (~> 3.13) - rspec-support (3.13.6) - rubocop (1.82.1) + rspec-core (>= 3.13.0, < 5.0.0) + rspec-expectations (>= 3.13.0, < 5.0.0) + rspec-mocks (>= 3.13.0, < 5.0.0) + rspec-support (>= 3.13.0, < 5.0.0) + rspec-support (3.13.7) + rubocop (1.86.0) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -501,10 +481,10 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.48.0, < 2.0) + rubocop-ast (>= 1.49.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.49.0) + rubocop-ast (1.49.1) parser (>= 3.3.7.2) prism (~> 1.7) rubocop-performance (1.26.1) @@ -529,14 +509,14 @@ GEM rubyzip (>= 3.2.2) rubyzip (3.2.2) securerandom (0.4.1) - semantic_range (3.1.0) - shakapacker (9.5.0) + semantic_range (3.1.1) + shakapacker (9.7.0) activesupport (>= 5.2) package_json rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - sidekiq (8.1.0) + sidekiq (8.1.2) connection_pool (>= 3.0.0) json (>= 2.16.0) logger (>= 1.7.0) @@ -554,20 +534,22 @@ GEM simplecov-html (0.13.2) simplecov_json_formatter (0.1.4) smart_properties (1.17.0) - sqlite3 (2.9.0) + sqlite3 (2.9.2) mini_portile2 (~> 2.8.0) - sqlite3 (2.9.0-aarch64-linux-musl) - sqlite3 (2.9.0-arm64-darwin) - sqlite3 (2.9.0-x86_64-linux-musl) + sqlite3 (2.9.2-aarch64-linux-musl) + sqlite3 (2.9.2-arm64-darwin) + sqlite3 (2.9.2-x86_64-linux-musl) stringio (3.2.0) strip_attributes (2.0.1) activemodel (>= 3.0, < 9.0) - strscan (3.1.7) + strscan (3.1.8) thor (1.5.0) - timeout (0.6.0) + timeout (0.6.1) trailblazer-option (0.1.2) + trilogy (2.12.2) + bigdecimal tsort (0.2.0) - turbo-rails (2.0.21) + turbo-rails (2.0.23) actionpack (>= 7.1.0) railties (>= 7.1.0) twitter_cldr (6.14.0) @@ -577,7 +559,7 @@ GEM tzinfo tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2025.3) + tzinfo-data (1.2026.1) tzinfo (>= 1.0.0) uber (0.1.0) unicode-display_width (3.2.0) @@ -588,12 +570,11 @@ GEM useragent (0.16.11) warden (1.2.9) rack (>= 2.0.9) - web-console (4.2.1) - actionview (>= 6.0.0) - activemodel (>= 6.0.0) + web-console (4.3.0) + actionview (>= 8.0.0) bindex (>= 0.4.0) - railties (>= 6.0.0) - webmock (3.26.1) + railties (>= 8.0.0) + webmock (3.26.2) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -605,7 +586,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yaml (0.4.0) - zeitwerk (2.7.4) + zeitwerk (2.7.5) PLATFORMS aarch64-linux-musl @@ -614,6 +595,7 @@ PLATFORMS x86_64-linux-musl DEPENDENCIES + addressable annotaterb arabic-letter-connector aws-sdk-s3 @@ -650,14 +632,12 @@ DEPENDENCIES onnxruntime pagy pg - premailer-rails pretender pry-rails puma rack rails rails-i18n - rails_autolink rotp rouge rqrcode @@ -673,7 +653,7 @@ DEPENDENCIES simplecov sqlite3 strip_attributes - trilogy! + trilogy turbo-rails twitter_cldr tzinfo-data @@ -681,4 +661,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.6.9 + 2.7.2 diff --git a/pkgs/by-name/do/docuseal/gemset.nix b/pkgs/by-name/do/docuseal/gemset.nix index 5d953be5684d..cd083904d9c0 100644 --- a/pkgs/by-name/do/docuseal/gemset.nix +++ b/pkgs/by-name/do/docuseal/gemset.nix @@ -5,10 +5,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12isf17cd4xyx5vg97nzxsi92703yh40fxyns6gl9f11331a4ign"; + sha256 = "0hinzgbjfwgdjm3dz9mz218sy764gbacv0z2ic4ms57lpzw87nrz"; type = "gem"; }; - version = "2.1.16"; + version = "2.1.18"; }; actioncable = { dependencies = [ @@ -22,10 +22,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0s8rp5zpcxqkpj610whkrnjhwk119f5xn7b9bkydx76a9k1yycfw"; + sha256 = "1w40bbkjd0lds57bfr24hbj9qfkwj9v33x6457g24sjfwispzg75"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; actionmailbox = { dependencies = [ @@ -40,10 +40,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16w8h4awh3k1v6b2anix20qjdij5zby7am379y4mlp8fk2qjz2q5"; + sha256 = "0ndf98dpzmz8xs6m253zpwnhyfrvxdkfyvssxps0vrx0x9sa8zfz"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; actionmailer = { dependencies = [ @@ -61,10 +61,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sbmj65nzqzjh9ji94p91mkpjlhf3jkcbzd7ia8gwfv51w3d5hgl"; + sha256 = "13a4329lgrda8s9mqrfbaakvc90i6ak82rfpljmd0w5vj54747w3"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; actionpack = { dependencies = [ @@ -86,10 +86,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08w49zj1skvviyakjy2cazfklkgx2dsnfzxb9fmaznphl53l3myf"; + sha256 = "18r93ii2ayw8n60qsx259dy8nwgbfxf3ndncla0xbia79np8r6dg"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; actiontext = { dependencies = [ @@ -105,10 +105,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b9dilsjx9saqqz7dwj0fqfbacdyar5f4g4wfxqdj6cw5ai7vx8b"; + sha256 = "1ln7mwflqf7nsgkj9lm1p7bmc6h8yqaa47q1cdj9xsp102f034fj"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; actionview = { dependencies = [ @@ -126,10 +126,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nrf7qn2p6r645427whfh071az6bv8728bf2rrr9n74ii0jmnic0"; + sha256 = "0pgxl9p2q2zbwb6626yw7rgpbmv2bvxykq2w1h83inrygy6chiqk"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; activejob = { dependencies = [ @@ -143,10 +143,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09gq0bivkb9qfmg69k1jqbsbs1vb2ps1jn1p6saqa0di2cvsp3ch"; + sha256 = "1lz8bxb6pcf9yvxwyj6355aws3ylxi5rwc577ly4q858d9vb2jd1"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; activemodel = { dependencies = [ "activesupport" ]; @@ -157,10 +157,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gpkph1mq78yg1cl0vkc8js0gh3vjxjf9drqk0zyv2p63k0mh4z2"; + sha256 = "06c23jww82grgvxw19g4bi9c957aj5hh24wzyyw4jdpg9jz5rh4h"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; activerecord = { dependencies = [ @@ -175,10 +175,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0i6c9g3q0lx4bca5gvz0p8p6ibhwn176zzhih0hgll6cvz5f1yxc"; + sha256 = "1avhmih54xqyj14zrv6ciw2ndpb11bmkwq0fcwm0mfk64ixvw0w0"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; activestorage = { dependencies = [ @@ -192,10 +192,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xms9z8asdpqw5ybl6n4bk1iys4l7y0iyi2rdbifxjlr766a8qwa"; + sha256 = "0k9q8sdlf576r8rp2hgdxy5lpr8f157bpq8mfsk52f8l169wwr05"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; activesupport = { dependencies = [ @@ -220,10 +220,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bpxnr83z1x78h3jxvmga7vrmzmc8b4fic49h9jhzm6hriw2b148"; + sha256 = "03m2vjhq3nmc8c3hpivxhvkjd8igg16nmv0p2fgdsgacppgy1991"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -235,10 +235,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mxhjgihzsx45l9wh2n0ywl9w0c6k70igm5r0d63dxkcagwvh4vw"; + sha256 = "1by7h2lwziiblizpd5yx87jsq8ppdhzvwf08ga34wzqgcv1nmpvz"; type = "gem"; }; - version = "2.8.8"; + version = "2.9.0"; }; annotaterb = { dependencies = [ @@ -249,10 +249,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xwbz5zk37f7p3g6ypxzamisay06hidjmdsrvhxw4q0xin4jw6w7"; + sha256 = "11h2lz0fyj1hh37x1lwvxr0svaisnkjs2g81hap84nwdykjl1z36"; type = "gem"; }; - version = "4.20.0"; + version = "4.22.0"; }; arabic-letter-connector = { groups = [ "default" ]; @@ -293,10 +293,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1099j8l3k40n7drhlxc4m7m32p79xy5zgy4jrcgf5ngxblq2w2n6"; + sha256 = "1hhkcawvn8fr5ys7xy4bhk4glcqyyibwkd3y75cidc9d123393cj"; type = "gem"; }; - version = "1.1209.0"; + version = "1.1233.0"; }; aws-sdk-core = { dependencies = [ @@ -312,10 +312,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zg44q9bykznxdp4l130qkvmhx4n3hhalh3cgc781aafqalcnb54"; + sha256 = "1shqk9frm15g1ygiy33krwj34jrphfjc6w63bglxwnqcic3qqi9y"; type = "gem"; }; - version = "3.241.4"; + version = "3.244.0"; }; aws-sdk-kms = { dependencies = [ @@ -326,10 +326,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1q015l5gm3f230jz9l6si9s3hlw7ra76q8biqvxlwxdmnk7w2qym"; + sha256 = "080zh4g1lcjl0bz2l0gjm8vmpd60cvi0p658bh235ypqh9zg61fl"; type = "gem"; }; - version = "1.121.0"; + version = "1.123.0"; }; aws-sdk-s3 = { dependencies = [ @@ -341,10 +341,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06bw769knngyhgrfw8j8mbl637ms9z00a3l4g7f1hj4iwvpc93hy"; + sha256 = "134qr73ri1j52y42xib0fpyscd5miwc37zx1ikxavwh747rsawjn"; type = "gem"; }; - version = "1.212.0"; + version = "1.218.0"; }; aws-sdk-secretsmanager = { dependencies = [ @@ -355,10 +355,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16ib5p04fk66qr2vfps0qr340ld5xb5dsypbdii9f40n6hfxwb6n"; + sha256 = "0m69f1jghxlixd4b5wb2dsp38dly7nxm5si1klnajv89m23mqi00"; type = "gem"; }; - version = "1.128.0"; + version = "1.129.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -404,10 +404,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1krd99p9828n07rcjjms56jaqv7v6s9pn7y6bppcfhhaflyn2r2r"; + sha256 = "0clhya4p8lhjj7hp31inp321wgzb0b5wbwppmya5sw1dikl7400z"; type = "gem"; }; - version = "3.1.21"; + version = "3.1.22"; }; better_html = { dependencies = [ @@ -439,10 +439,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19y406nx17arzsbc515mjmr6k5p59afprspa1k423yd9cp8d61wb"; + sha256 = "1bkcvp4aavdxh1pmgg65sypyjx5l0w5ffylfsk65di1xm9kpgh3d"; type = "gem"; }; - version = "4.0.1"; + version = "4.1.0"; }; bindex = { groups = [ @@ -463,10 +463,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1i64vd32pacs1sspz4isgdyfg35gh4s7scrwc935i8rdfgzaqwwk"; + sha256 = "057jsch213i42qgdsz2vg1b190n2xvvbi3hgprc8nmaqim2ly9f1"; type = "gem"; }; - version = "1.21.1"; + version = "1.23.0"; }; brakeman = { dependencies = [ "racc" ]; @@ -474,10 +474,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1kkds9q66jryhlyqzwhp4kh8hcb39i05v2r4f8xd3rx221vr413b"; + sha256 = "0vyg9l6xivamb49r4kzkcw12r9x943kv79wsvwslhm1qjvx23ybv"; type = "gem"; }; - version = "7.1.2"; + version = "8.0.4"; }; builder = { groups = [ @@ -677,17 +677,6 @@ }; version = "1.0.6"; }; - css_parser = { - dependencies = [ "addressable" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1izp5vna86s7xivqzml4nviy01bv76arrd5is8wkncwp1by3zzbc"; - type = "gem"; - }; - version = "1.21.1"; - }; csv = { groups = [ "default" ]; platforms = [ ]; @@ -776,10 +765,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1y57fpcvy1kjd4nb7zk7mvzq62wqcpfynrgblj558k3hbvz4404j"; + sha256 = "0ilmy9wgy57nj3zgal4j4vqx15sc7if7yavvah8wwjnw3h2nbh64"; type = "gem"; }; - version = "4.9.4"; + version = "5.0.3"; }; devise-two-factor = { dependencies = [ @@ -792,10 +781,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mzrx8z03vrbfl13dz3kp33as50jd8ad7b39s4k4l3j9k522c2mc"; + sha256 = "1d5day3h573faxsy24h9pbidjm04hs4ql8qxi1wdmrwsbcxs5qq9"; type = "gem"; }; - version = "6.3.1"; + version = "6.4.0"; }; diff-lcs = { groups = [ @@ -879,10 +868,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rcpq49pyaiclpjp3c3qjl25r95hqvin2q2dczaynaj7qncxvv18"; + sha256 = "0ar4nmvk1sk7drjigqyh9nnps3mxg625b8chfk42557p8i6jdrlz"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.2"; }; erb_lint = { dependencies = [ @@ -960,10 +949,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jj6via2mqccr8vngy10qkm60bc6py86cnf5ykzvn2cd3kwhps2c"; + sha256 = "1pncl49j3sn6ka53dbf1sw8n0mqlnzh2afwi7ql2dd163lyd44y5"; type = "gem"; }; - version = "3.6.0"; + version = "3.6.1"; }; faraday = { dependencies = [ @@ -1017,20 +1006,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rybr2bd1da7n7m3c7m9jaxlalcz71s697ax7fhyb4y51w993mai"; + sha256 = "1vp62wy85hr5fa0d29y3wh3zaj10sszj3pl19mps84dja2l4099c"; type = "gem"; }; - version = "0.17.1"; + version = "0.17.2"; }; ffi = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k1xaqw2jk13q3ss7cnyvkp8fzp75dk4kazysrxgfd1rpgvkk7qf"; + sha256 = "1kqasqvy8d7r09ri4n6bkdwbk63j7afd9ilsw34nzlgh0qp69ldw"; type = "gem"; }; - version = "1.17.3"; + version = "1.17.4"; }; foreman = { dependencies = [ "thor" ]; @@ -1103,10 +1092,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0f7mikkwfa3hzv4xpbkcr0766v2r34q6rdg5j8k3i3hw2fznw5xa"; + sha256 = "1s42r7hmf2wl8l0wdc7z07qvmgbdilwjb58q7i9h2slfnncyac5k"; type = "gem"; }; - version = "0.59.0"; + version = "0.61.0"; }; google-cloud-core = { dependencies = [ @@ -1141,10 +1130,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jvv9w8s4dqc4ncfa6c6qpdypz2wj8dmgpjd44jq2qhhij5y4sxm"; + sha256 = "18fh8xvflhhksibcn1v4gnrn6d3xs284ng1fsfwh9b86sxnlga0x"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; google-cloud-storage = { dependencies = [ @@ -1161,10 +1150,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zfzix33r060ch1ms2g7m7zzjhgrp43d67fy3sg1dbvmkixc1v8v"; + sha256 = "1fc6n7227l3b0b14c0gbfqjibn3zw1mivfvrnb66apbp3mkabjdq"; type = "gem"; }; - version = "1.58.0"; + version = "1.59.0"; }; google-logging-utils = { groups = [ "default" ]; @@ -1190,10 +1179,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "173h8r5dzhn4dvq2idx59jaybkhd02dr7333qshc3n2mkp76nxrn"; + sha256 = "0f56614nd955cxwy98c2d1zk4zg263r1iafd90czg2p3w819a00m"; type = "gem"; }; - version = "1.16.1"; + version = "1.16.2"; }; hashdiff = { groups = [ @@ -1219,20 +1208,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0f14iqfk5f9xiir82b50hpyc1ms1m7n5wpywbyvahnggjk41daq5"; + sha256 = "10i5826zgvk04jsn6yg7w72s1l5xghrapm6anay4g8w8l32jzqvq"; type = "gem"; }; - version = "1.5.0"; - }; - htmlentities = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hy5jvzd4wagk0k0yq7bjm6fa7ba7vjggzjfpri95jifkzvbvbxv"; - type = "gem"; - }; - version = "4.4.2"; + version = "1.6.0"; }; i18n = { dependencies = [ "concurrent-ruby" ]; @@ -1280,6 +1259,7 @@ irb = { dependencies = [ "pp" + "prism" "rdoc" "reline" ]; @@ -1291,10 +1271,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01h8bdksg0cr8bw5dhlhr29ix33rp822jmshy6rdqz4lmk4mdgia"; + sha256 = "1bishrxfn2anwlagw8rzly7i2yicjnr947f48nh638yqjgdlv30n"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; jmespath = { groups = [ "default" ]; @@ -1315,10 +1295,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11prr7nrxh1y4rfsqa51gy4ixx63r18cz9mdnmk0938va1ajf4gy"; + sha256 = "0il6qxkxqql7n7sgrws5bi5a36v51dswqcxb6j6gm8aj62shp6r8"; type = "gem"; }; - version = "2.18.1"; + version = "2.19.3"; }; jwt = { dependencies = [ "base64" ]; @@ -1450,10 +1430,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rk0n13c9nmk8di2x5gqk5r04vf8bkp7ff6z0b44wsmc7fndfpnz"; + sha256 = "011fdngxzr1p9dq2hxqz7qq1glj2g44xnhaadjqlf48cplywfdnl"; type = "gem"; }; - version = "2.25.0"; + version = "2.25.1"; }; mail = { dependencies = [ @@ -1552,7 +1532,10 @@ version = "2.8.9"; }; minitest = { - dependencies = [ "prism" ]; + dependencies = [ + "drb" + "prism" + ]; groups = [ "default" "development" @@ -1561,10 +1544,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fslin1vyh60snwygx8jnaj4kwhk83f3m0v2j2b7bsg2917wfm3q"; + sha256 = "048ls6kn009jkwj1rvka2b5vnwq73b0krjz740j6j03cwcfqmb48"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.3"; }; msgpack = { groups = [ "default" ]; @@ -1609,10 +1592,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1imc50a9ic3ynsl3k0japhmb0ggrgp2c186cfqbcclv892nsrjh8"; + sha256 = "1bgjhb65r1bl52wdym6wpbb0r3j7va8s44grggp0jvarfvw7bawv"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; net-pop = { dependencies = [ "net-protocol" ]; @@ -1679,20 +1662,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15anyh2ir3kdji93kw770xxwm5rspn9rzx9b9zh1h9gnclcd4173"; + sha256 = "0mhp90nf3g3yy5vgjnwd34czi6rbi0p7057vgngfmmdkknsxiz9q"; type = "gem"; }; - version = "1.19.0"; + version = "1.19.2"; }; numo-narray-alt = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1q9vi03hrxgaq21w0g7babhn9drxpzf9flmvsck9j7rakakqcvnc"; + sha256 = "1vh20lxy5gsdr4an994s0d4h1d5bfbhmlr63gw15n3ghcf31mc07"; type = "gem"; }; - version = "0.9.13"; + version = "0.10.3"; }; oj = { dependencies = [ @@ -1703,10 +1686,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00q33rm7lpfc319pf6him05ak76gfy7i04iiddrz317q7swbq55i"; + sha256 = "0g817hjx1rh4zhvcpb9m6lr6l8yyq3n8vnjm9x1rc5wr51hv6d9n"; type = "gem"; }; - version = "3.16.13"; + version = "3.16.16"; }; onnxruntime = { dependencies = [ "ffi" ]; @@ -1724,10 +1707,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14gfk3j88gcfk2mzp4ingm7y1pq2nbnsgzkfvflwksfljgni2mqq"; + sha256 = "0zazkk5q3p2ldd23ka04wypsz2g8gqwwainf3d58j0kvdc9p8yg2"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; orm_adapter = { groups = [ "default" ]; @@ -1772,16 +1755,17 @@ pagy = { dependencies = [ "json" + "uri" "yaml" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qkmmx83pggimiryyjacgiq72qw98db84s5vc4rqk9x9yinkff1x"; + sha256 = "1xmywpn5zj99708zhmxx2xf76fnwwffrxa3648igvaqai8r5f6ml"; type = "gem"; }; - version = "43.2.8"; + version = "43.4.4"; }; parallel = { groups = [ @@ -1792,10 +1776,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa"; + sha256 = "0w697335hi5dk5ay9kyn53399sy87y8v0y6ij93m5wmshhadxrik"; type = "gem"; }; - version = "1.27.0"; + version = "1.28.0"; }; parser = { dependencies = [ @@ -1810,10 +1794,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1256ws3w3gnfqj7r3yz2i9y1y7k38fhjphxpybkyb4fds8jsgxh6"; + sha256 = "0m2xqvn1la62hji1mn04y59giikww95p2hs0r4y2rrz3mdxcwyni"; type = "gem"; }; - version = "3.3.10.1"; + version = "3.3.11.1"; }; pg = { groups = [ "default" ]; @@ -1840,46 +1824,16 @@ }; version = "0.6.3"; }; - premailer = { - dependencies = [ - "addressable" - "css_parser" - "htmlentities" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ryivdnij1990hcqqmq4s0x1vjvfl0awjc9b91f8af17v2639qhg"; - type = "gem"; - }; - version = "1.27.0"; - }; - premailer-rails = { - dependencies = [ - "actionmailer" - "net-smtp" - "premailer" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0004f73kgrglida336fqkgx906m6n05nnfc17mypzg5rc78iaf61"; - type = "gem"; - }; - version = "1.12.0"; - }; pretender = { dependencies = [ "actionpack" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gd6zmdgb48n63459g09xvfk279l6lsa4xyhnlj59p6h5ps8slnl"; + sha256 = "0a0n8imhm4m3y3ql8l4ncx3k8krlx5sz4wy4s99dp09jillg953x"; type = "gem"; }; - version = "0.6.0"; + version = "1.0.0"; }; prettyprint = { groups = [ @@ -1904,10 +1858,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0m0jkk1y537xc2rw5fg7sid5fnd4a9mw2gphqmiflc2mxwb3lic4"; + sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.0"; }; pry = { dependencies = [ @@ -1969,10 +1923,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mx84s7gn3xabb320hw8060v7amg6gmcyyhfzp0kawafiq60j54i"; + sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs"; type = "gem"; }; - version = "7.0.2"; + version = "7.0.5"; }; puma = { dependencies = [ "nio4r" ]; @@ -2008,10 +1962,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xmnrk076sqymilydqgyzhkma3hgqhcv8xhy7ks479l2a3vvcx2x"; + sha256 = "1hhjy9gcp52dzij05gmidqac8g28ski5xm67prwmdqmjfcgqxmsy"; type = "gem"; }; - version = "3.2.4"; + version = "3.2.6"; }; rack-proxy = { dependencies = [ "rack" ]; @@ -2037,10 +1991,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sg4laz2qmllxh1c5sqlj9n1r7scdn08p3m4b0zmhjvyx9yw0v8b"; + sha256 = "1s7zcxlmg88a6dam4aqbgk9xkpy6dkdfqmmcszkkliy3q3w38m2r"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; rack-test = { dependencies = [ "rack" ]; @@ -2091,10 +2045,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15bxpa0acs5qc9ls4y1i21cp6wimkn5swn81kxmp1a6z4cdhcsah"; + sha256 = "1lww7i686rm9s50d34hb596y2kfl46dida2kjy8gr64c6jjpn0bd"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; rails-dom-testing = { dependencies = [ @@ -2128,10 +2082,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0q55i6mpad20m2x1lg5pkqfpbmmapk0sjsrvr1sqgnj2hb5f5z1m"; + sha256 = "128y5g3fyi8fds41jasrr4va1jrs7hcamzklk1523k7rxb64bc98"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.0"; }; rails-i18n = { dependencies = [ @@ -2147,21 +2101,6 @@ }; version = "8.1.0"; }; - rails_autolink = { - dependencies = [ - "actionview" - "activesupport" - "railties" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fpwkc20bi7aynfgp2bqhvb7x6vsdiai4prflcsr9sicbwp9vjzv"; - type = "gem"; - }; - version = "1.1.8"; - }; railties = { dependencies = [ "actionpack" @@ -2181,10 +2120,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mc0kz2vhld3gn5m91ddy98qfnrbk765aznh8vy6hxjgdgkyr28j"; + sha256 = "08nyhsigcvjpj9i3r0s73yi8zm16sxmr2x7xgxlaq2jjrghb0gli"; type = "gem"; }; - version = "8.1.2"; + version = "8.1.3"; }; rainbow = { groups = [ @@ -2228,10 +2167,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qvky4s2fx5xbaz1brxanalqbcky3c7xbqd6dicpih860zgrjj29"; + sha256 = "14iiyb4yi1chdzrynrk74xbhmikml3ixgdayjma3p700singfl46"; type = "gem"; }; - version = "7.1.0"; + version = "7.2.0"; }; redis-client = { dependencies = [ "connection_pool" ]; @@ -2239,10 +2178,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "083i9ig39bc249mv24nsb2jlfwcdgmp9kbpy5ph569nsypphpmrs"; + sha256 = "0jw2xjzz24dwn85y8v1jf1vzzpsnypsvs06f1qfa91w7rpwr5248"; type = "gem"; }; - version = "0.26.4"; + version = "0.28.0"; }; regexp_parser = { groups = [ @@ -2318,10 +2257,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; + sha256 = "1g634lvyriq8pk87fn0dnz2ib9mma98ks7y0b30j28a9gm5i2gzv"; type = "gem"; }; - version = "3.1.2"; + version = "3.4.1"; }; rexml = { groups = [ @@ -2427,10 +2366,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "071bqrk2rblk3zq3jk1xxx0dr92y0szi5pxdm8waimxici706y89"; + sha256 = "0iqxmw0knjiz5nf6pgr8ihs6cjzh89f0ppj3fqiz8cvms79x6sh8"; type = "gem"; }; - version = "3.13.7"; + version = "3.13.8"; }; rspec-rails = { dependencies = [ @@ -2449,10 +2388,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1kis8dfxlvi6gdzrv9nsn3ckw0c2z7armhni917qs1jx7yjkjc8i"; + sha256 = "1pr29snnnlgkqv80vbi4795l6rxq3l47x5rl7lyni4h8zj95c8q6"; type = "gem"; }; - version = "8.0.2"; + version = "8.0.4"; }; rspec-support = { groups = [ @@ -2463,10 +2402,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1cmgz34hwj5s3jwxhyl8mszs24nci12ffbrmr5jb1si74iqf739f"; + sha256 = "0z64h5rznm2zv21vjdjshz4v0h7bxvg02yc6g7yzxakj11byah06"; type = "gem"; }; - version = "3.13.6"; + version = "3.13.7"; }; rubocop = { dependencies = [ @@ -2488,10 +2427,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wz2np5ck54vpwcz18y9x7w80c308wza7gmfcykysq59ajkadw89"; + sha256 = "11nicljvmns665vryhfdrpssnk5dn1mxdap7ynprpgkfw5piiwag"; type = "gem"; }; - version = "1.82.1"; + version = "1.86.0"; }; rubocop-ast = { dependencies = [ @@ -2506,10 +2445,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zbikzd6237fvlzjfxdlhwi2vbmavg1cc81y6cyr581365nnghs9"; + sha256 = "0dahfpnzz63hyqxa03x8rypnrxzwyvh4i5a8ri34bzpnf3pg64j4"; type = "gem"; }; - version = "1.49.0"; + version = "1.49.1"; }; rubocop-performance = { dependencies = [ @@ -2637,10 +2576,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "189l1ajvpy8znkmbalrpc3fpg0b8gy1j3m4m5q282prf1zj1xh4z"; + sha256 = "1af49rikvc0m4mf6asjyb601195hgvgx8ycmwwrvmizhdqck70sh"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.1"; }; shakapacker = { dependencies = [ @@ -2654,10 +2593,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a1r7zf15bxjdwmavjl363fqgv9gpd6mpc41d0fn8lhc468r4n3b"; + sha256 = "0kxji9yj8vga2qbgg8x1m3j74w8n21rqqz60f33q9kwzaabby9j1"; type = "gem"; }; - version = "9.5.0"; + version = "9.7.0"; }; sidekiq = { dependencies = [ @@ -2671,10 +2610,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1r6ik93p4dbjjdwa8w7qn4rgn9rn4y2xbswp3q9b3mz4x6p5xpkb"; + sha256 = "1szw72f2k9vyyi81c9rv1rj91s849j6jxwvvsxsxdnmi5gr6c4ja"; type = "gem"; }; - version = "8.1.0"; + version = "8.1.2"; }; signet = { dependencies = [ @@ -2758,10 +2697,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v19bypbf46ms3gvk47hi4smcf6pm0gc8daa786mapzc685w1sgc"; + sha256 = "1cbkgb5s3qsfjgnp75habwxsi97711jg90yh52ihcssbf58430c6"; type = "gem"; }; - version = "2.9.0"; + version = "2.9.2"; }; stringio = { groups = [ @@ -2793,10 +2732,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "131cnwbs375r349yzsdyw7a9djxjfmymn8kk96s51sm3jhmlcxjz"; + sha256 = "17k75zrwf4ag9yl9wjjkcb90zrm4r5jigdzv3zr5jm9239hxpqma"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.8"; }; thor = { groups = [ @@ -2820,10 +2759,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bz11pq7n1g51f50jqmgyf5b1v64p1pfqmy5l21y6vpr37b2lwkd"; + sha256 = "1jxcji88mh6xsqz0mfzwnxczpg7cyniph7wpavnavfz7lxl77xbq"; type = "gem"; }; - version = "0.6.0"; + version = "0.6.1"; }; trailblazer-option = { groups = [ "default" ]; @@ -2840,13 +2779,11 @@ groups = [ "default" ]; platforms = [ ]; source = { - fetchSubmodules = false; - rev = "3963d490459df7a2b5bedb42424c3285f25eab22"; - sha256 = "155ghsvf9kcsp6wpvhb15yzkhvq8k6lykip3f2npiasgyz10b3c5"; - type = "git"; - url = "https://github.com/trilogy-libraries/trilogy.git"; + remotes = [ "https://rubygems.org" ]; + sha256 = "0m5d1v0gsdh8m24bxc8hw7gypf9l56zkdy1lfaca7a9ix12n463m"; + type = "gem"; }; - version = "2.10.0"; + version = "2.12.2"; }; tsort = { groups = [ @@ -2871,10 +2808,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ivb45cpj3v9ky0nr34vwfa0x8i90ycbxmyr0wd8q7fikyi0w1q2"; + sha256 = "0priz7ww23h2j9j5zicc4np3rr357n01xw8zymn0bzxg79rr03gf"; type = "gem"; }; - version = "2.0.21"; + version = "2.0.23"; }; twitter_cldr = { dependencies = [ @@ -2913,10 +2850,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qlm97fqcwhvfa7jg2gnq8la3mnk617b5bwsc460mi75wpqy4imm"; + sha256 = "1z896q8kzig9x6g3bcp38apns05y36jhf4j7ml7wzqjsmqcnb8sf"; type = "gem"; }; - version = "1.2025.3"; + version = "1.2026.1"; }; uber = { groups = [ "default" ]; @@ -3013,7 +2950,6 @@ web-console = { dependencies = [ "actionview" - "activemodel" "bindex" "railties" ]; @@ -3021,10 +2957,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "087y4byl2s3fg0nfhix4s0r25cv1wk7d2j8n5324waza21xg7g77"; + sha256 = "193ddancfznc34qp2bqz5mkv906v4aka6njv2lzhkhnz3hq72fz1"; type = "gem"; }; - version = "4.2.1"; + version = "4.3.0"; }; webmock = { dependencies = [ @@ -3036,10 +2972,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mqw7ca931zmqgad0fq4gw7z3gwb0pwx9cmd1b12ga4hgjsnysag"; + sha256 = "142cbab47mjxmg8gc89d94sd3h7an9ligh38r9n88wb3xbr5cibp"; type = "gem"; }; - version = "3.26.1"; + version = "3.26.2"; }; webrick = { groups = [ @@ -3117,9 +3053,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12zcvhzfnlghzw03czy2ifdlyfpq0kcbqcmxqakfkbxxavrr1vrb"; + sha256 = "1pbkiwwla5gldgb3saamn91058nl1sq1344l5k36xsh9ih995nnq"; type = "gem"; }; - version = "2.7.4"; + version = "2.7.5"; }; } diff --git a/pkgs/by-name/do/docuseal/package.nix b/pkgs/by-name/do/docuseal/package.nix index 9c8cdf964329..abb8db12fb46 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.3.4"; + version = "2.4.4"; bundler = bundler.override { ruby = ruby_3_4; }; @@ -24,17 +24,11 @@ stdenv.mkDerivation (finalAttrs: { owner = "docusealco"; repo = "docuseal"; tag = finalAttrs.version; - hash = "sha256-JKV0xAtEbGETprC5zYEcmCVcUFrW4h/+lbYayzWefKs="; + hash = "sha256-GjWR0jxVRTs5KNbFDEcgCbG/HTJlJGYpbKf8+0YBSmk="; # https://github.com/docusealco/docuseal/issues/505#issuecomment-3153802333 postFetch = "rm $out/db/schema.rb"; }; - patches = [ - # Drop setxid calls in non-root mode (fails under strict seccomp). - # https://github.com/docusealco/docuseal/pull/593 - ./only-switch-uid-when-root.patch - ]; - rubyEnv = bundlerEnv { name = "docuseal-gems"; ruby = ruby_3_4; @@ -52,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-AvdaSIXO31t15wWysTvFISqmKCAi1Q8CJgO0J2DqM6M="; + hash = "sha256-62nI/QUzlpI1VyZ6PWPz2kSp4S2GUIQDaf4jUwzyj24="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index e509560fddee..3cf941cdca06 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -1130,10 +1130,7 @@ in }; trilogy = attrs: { - postInstall = '' - installPath=$(cat "$out/nix-support/gem-meta/install-path") - ln -s contrib/ruby/trilogy.gemspec "$installPath/trilogy.gemspec" - ''; + buildInputs = [ openssl ]; }; typhoeus = attrs: { From c9cf1d2cd5ae2a9f5f2510efbff1cfeef4c436ef Mon Sep 17 00:00:00 2001 From: kyehn Date: Sat, 18 Apr 2026 12:33:49 +0800 Subject: [PATCH 107/246] interstellar: 0.11.1 -> 0.11.2 --- .../in/interstellar/emoji_builder.patch | 82 ++++++++ pkgs/by-name/in/interstellar/git-hashes.json | 1 + pkgs/by-name/in/interstellar/package.nix | 42 ++-- .../by-name/in/interstellar/pubspec.lock.json | 183 +++++++++++++----- 4 files changed, 245 insertions(+), 63 deletions(-) create mode 100644 pkgs/by-name/in/interstellar/emoji_builder.patch diff --git a/pkgs/by-name/in/interstellar/emoji_builder.patch b/pkgs/by-name/in/interstellar/emoji_builder.patch new file mode 100644 index 000000000000..e5645839f60c --- /dev/null +++ b/pkgs/by-name/in/interstellar/emoji_builder.patch @@ -0,0 +1,82 @@ +--- a/lib/src/widgets/emoji_picker/emoji_builder.dart ++++ b/lib/src/widgets/emoji_picker/emoji_builder.dart +@@ -1,7 +1,7 @@ + import 'dart:convert'; ++import 'dart:io'; + + import 'package:build/build.dart'; +-import 'package:http/http.dart' as http; + import 'package:interstellar/src/utils/trie.dart'; + + Builder emojiBuilder(BuilderOptions options) => +@@ -29,15 +29,9 @@ + }; + + Future _generateContent() async { +- final dataResponse = await http.get( +- Uri.parse('$_sourcePrefix/compact.raw.json'), +- ); +- final dataJson = jsonDecode(dataResponse.body); ++ final dataJson = jsonDecode(await File('@compact.raw.json@').readAsString()) as List; + +- final messagesResponse = await http.get( +- Uri.parse('$_sourcePrefix/messages.raw.json'), +- ); +- final messagesJson = jsonDecode(messagesResponse.body); ++ final messagesJson = jsonDecode(await File('@messages.raw.json@').readAsString()) as Map; + + final s = StringBuffer() + ..write(''' +@@ -53,8 +47,9 @@ + + final emojiGroups = []; + +- for (var i = 0; i < (messagesJson['groups'] as List).length; i++) { +- final group = messagesJson['groups'][i]; ++ final groups = messagesJson['groups'] as List; ++ for (var i = 0; i < groups.length; i++) { ++ final group = groups[i] as Map; + + assert(group['order'] == i, 'Emoji group order value should match index'); + +@@ -61,4 +56,4 @@ +- emojiGroups.add(group['message']); ++ emojiGroups.add(group['message'] as String); + } + + s +@@ -72,7 +67,8 @@ + + { + var i = 0; +- for (final emoji in dataJson) { ++ for (final emojiItem in dataJson) { ++ final emoji = emojiItem as Map; + if (emoji['group'] == null || emoji['order'] == null) continue; + + assert(emoji['order'] == i + 1, 'Emoji order value should match index'); +@@ -84,9 +80,9 @@ + : emoji['emoticon']), + ]; + +- trie.addChild(Trie.normalizeTerm(emoji['label']), {i}); ++ trie.addChild(Trie.normalizeTerm(emoji['label'] as String), {i}); + for (final tag in tags) { +- trie.addChild(Trie.normalizeTerm(tag), {i}); ++ trie.addChild(Trie.normalizeTerm(tag as String), {i}); + } + + s +@@ -93,9 +89,9 @@ + ..write('const Emoji("') +- ..write(emoji['unicode']) ++ ..write(emoji['unicode'] as String) + ..write('","') +- ..write(emoji['label']) ++ ..write(emoji['label'] as String) + ..write('",') +- ..write(emoji['group']) ++ ..write(emoji['group'].toString()) + ..write('),\n'); + + i++; diff --git a/pkgs/by-name/in/interstellar/git-hashes.json b/pkgs/by-name/in/interstellar/git-hashes.json index 2aa5054878ae..fa2ad4a29e94 100644 --- a/pkgs/by-name/in/interstellar/git-hashes.json +++ b/pkgs/by-name/in/interstellar/git-hashes.json @@ -1,3 +1,4 @@ { + "flutter_web_auth_2": "sha256-x3SVeFIYS+UtyNKr4ohq4dvktCgS6nECGrb2vMg9aZc=", "webcrypto": "sha256-HX8CcCRbDlVMLMbKGnqKlrkMT9XITLbQE/2OW9zO72w=" } diff --git a/pkgs/by-name/in/interstellar/package.nix b/pkgs/by-name/in/interstellar/package.nix index 1eb70a7f857a..fbdcd5bcd769 100644 --- a/pkgs/by-name/in/interstellar/package.nix +++ b/pkgs/by-name/in/interstellar/package.nix @@ -1,7 +1,8 @@ { lib, - flutter338, + flutter341, fetchFromGitHub, + fetchurl, imagemagick, alsa-lib, libass, @@ -13,25 +14,42 @@ dart, }: -let +flutter341.buildFlutterApplication (finalAttrs: { pname = "interstellar"; - - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "interstellar-app"; repo = "interstellar"; - tag = "v${version}"; - hash = "sha256-ZhZBy/KECz/Gs3RSuuXmTtI5pKPBMFQNG/kS8JvEaFc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-WprvuIN7yS5yLR4eUF/M9yG25ZU1Sf1I1myujclF4oM="; }; -in -flutter338.buildFlutterApplication { - inherit pname version src; pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = lib.importJSON ./git-hashes.json; + patches = [ ./emoji_builder.patch ]; + + postPatch = '' + substituteInPlace lib/src/widgets/emoji_picker/emoji_builder.dart \ + --replace-fail "@compact.raw.json@" "${ + fetchurl { + url = "https://raw.githubusercontent.com/milesj/emojibase/a5fc630a91ca42cddf3f4a66492965600fd3bce8/packages/data/en/compact.raw.json"; + hash = "sha256-OivCYjiBEooRx3zni9jAr3lR0rzpoa3HX2l/a0UwDpE="; + } + }" \ + --replace-fail "@messages.raw.json@" "${ + fetchurl { + url = "https://raw.githubusercontent.com/milesj/emojibase/a5fc630a91ca42cddf3f4a66492965600fd3bce8/packages/data/en/messages.raw.json"; + hash = "sha256-ZQWXZJ5jXxDNQHaOAsxApAt6oanvaEwZ6VXbDA0YeMs="; + } + }" + substituteInPlace lib/src/controller/database/database.dart \ + --replace-fail "const Color.from(alpha: 1, red: 1, green: 1, blue: 1).value32bit" "0xFFFFFFFF" \ + --replace-fail "const Color.from(alpha: 1, red: 0, green: 0, blue: 0).value32bit" "0xFF000000" + ''; + nativeBuildInputs = [ imagemagick ]; buildInputs = [ @@ -54,14 +72,14 @@ flutter338.buildFlutterApplication { ''; extraWrapProgramArgs = '' - --prefix LD_LIBRARY_PATH : $out/app/${pname}/lib + --prefix LD_LIBRARY_PATH : $out/app/${finalAttrs.pname}/lib ''; passthru = { pubspecSource = runCommand "pubspec.lock.json" { - inherit src; + inherit (finalAttrs) src; nativeBuildInputs = [ yq-go ]; } '' @@ -96,4 +114,4 @@ flutter338.buildFlutterApplication { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ JollyDevelopment ]; }; -} +}) diff --git a/pkgs/by-name/in/interstellar/pubspec.lock.json b/pkgs/by-name/in/interstellar/pubspec.lock.json index d1914455de24..dd9676c3b25b 100644 --- a/pkgs/by-name/in/interstellar/pubspec.lock.json +++ b/pkgs/by-name/in/interstellar/pubspec.lock.json @@ -4,21 +4,31 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a", + "sha256": "5b7468c326d2f8a4f630056404ca0d291ade42918f4a3c6233618e724f39da8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "88.0.0" + "version": "92.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f", + "sha256": "70e4b1ef8003c64793a9e268a551a82869a8a96f39deb73dea28084b0e8bf75e", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.1" + "version": "9.0.0" + }, + "ansicolor": { + "dependency": "transitive", + "description": { + "name": "ansicolor", + "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" }, "any_link_preview": { "dependency": "direct main", @@ -60,15 +70,25 @@ "source": "hosted", "version": "2.13.0" }, - "blurhash_ffi": { + "auto_route": { "dependency": "direct main", "description": { - "name": "blurhash_ffi", - "sha256": "9811937f2e568aedb5630c9d901323c236414e3e882050fdf25bc42f7431d7bb", + "name": "auto_route", + "sha256": "e9acfeb3df33d188fce4ad0239ef4238f333b7aa4d95ec52af3c2b9360dcd969", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.7" + "version": "11.1.0" + }, + "auto_route_generator": { + "dependency": "direct main", + "description": { + "name": "auto_route_generator", + "sha256": "04300eaf5821962aae8b5cd94f67013fd2fd326dc3be212d3ec1ae7470f09834", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.4.0" }, "boolean_selector": { "dependency": "transitive", @@ -81,14 +101,14 @@ "version": "2.1.2" }, "build": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "build", - "sha256": "5b887c55a0f734b433b3b2d89f9cd1f99eb636b17e268a5b4259258bc916504b", + "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.0.4" }, "build_config": { "dependency": "transitive", @@ -111,14 +131,14 @@ "version": "4.0.4" }, "build_runner": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "build_runner", - "sha256": "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b", + "sha256": "b4d854962a32fd9f8efc0b76f98214790b833af8b2e9b2df6bfc927c0415a072", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.8.0" + "version": "2.10.5" }, "built_collection": { "dependency": "transitive", @@ -264,11 +284,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697", + "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" }, "db_viewer": { "dependency": "transitive", @@ -294,11 +314,11 @@ "dependency": "direct main", "description": { "name": "drift", - "sha256": "540cf382a3bfa99b76e51514db5b0ebcd81ce3679b7c1c9cb9478ff3735e47a1", + "sha256": "5ea2f718558c0b31d4b8c36a3d8e5b7016f1265f46ceb5a5920e16117f0c0d6a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.28.2" + "version": "2.30.1" }, "drift_db_viewer": { "dependency": "direct main", @@ -311,14 +331,14 @@ "version": "2.1.0" }, "drift_dev": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "drift_dev", - "sha256": "4db0eeedc7e8bed117a9f22d867ab7a3a294300fed5c269aac90d0b3545967ca", + "sha256": "892dfb5d69d9e604bdcd102a9376de8b41768cf7be93fd26b63cfc4d8f91ad5f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.28.3" + "version": "2.30.1" }, "drift_flutter": { "dependency": "direct main", @@ -486,6 +506,16 @@ "source": "sdk", "version": "0.0.0" }, + "flutter_blurhash": { + "dependency": "direct main", + "description": { + "name": "flutter_blurhash", + "sha256": "e97b9aff13b9930bbaa74d0d899fec76e3f320aba3190322dcc5d32104e3d25d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.1" + }, "flutter_colorpicker": { "dependency": "direct main", "description": { @@ -497,7 +527,7 @@ "version": "1.1.0" }, "flutter_launcher_icons": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "flutter_launcher_icons", "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7", @@ -506,16 +536,6 @@ "source": "hosted", "version": "0.14.4" }, - "flutter_lints": { - "dependency": "direct dev", - "description": { - "name": "flutter_lints", - "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.0" - }, "flutter_local_notifications": { "dependency": "direct main", "description": { @@ -618,6 +638,27 @@ "source": "sdk", "version": "0.0.0" }, + "flutter_web_auth_2": { + "dependency": "direct main", + "description": { + "path": "flutter_web_auth_2", + "ref": "b1af971b79160979320a4865e238dcaacf69b624", + "resolved-ref": "b1af971b79160979320a4865e238dcaacf69b624", + "url": "https://github.com/interstellar-app/flutter_web_auth_2.git" + }, + "source": "git", + "version": "5.0.1" + }, + "flutter_web_auth_2_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_web_auth_2_platform_interface", + "sha256": "ba0fbba55bffb47242025f96852ad1ffba34bc451568f56ef36e613612baffab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, "flutter_web_plugins": { "dependency": "transitive", "description": "flutter", @@ -625,14 +666,14 @@ "version": "0.0.0" }, "freezed": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "freezed", - "sha256": "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77", + "sha256": "03dd9b7423ff0e31b7e01b2204593e5e1ac5ee553b6ea9d8184dff4a26b9fb07", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.3" + "version": "3.2.4" }, "freezed_annotation": { "dependency": "direct main", @@ -674,6 +715,16 @@ "source": "hosted", "version": "2.3.2" }, + "hotreloader": { + "dependency": "transitive", + "description": { + "name": "hotreloader", + "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, "html": { "dependency": "transitive", "description": { @@ -865,14 +916,14 @@ "version": "4.9.0" }, "json_serializable": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "json_serializable", - "sha256": "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe", + "sha256": "5b89c1e32ae3840bb20a1b3434e3a590173ad3cb605896fb0f60487ce2f8104e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.11.1" + "version": "6.11.4" }, "leak_tracker": { "dependency": "transitive", @@ -904,15 +955,15 @@ "source": "hosted", "version": "3.0.2" }, - "lints": { + "lean_builder": { "dependency": "transitive", "description": { - "name": "lints", - "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0", + "name": "lean_builder", + "sha256": "4f3d70c34c52cc5034e8cc6f53d35aa3a32fb373b78fb4c29cf45cd1dcf06942", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.0" + "version": "0.1.5" }, "logger": { "dependency": "direct main", @@ -1514,21 +1565,21 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "ccf30b0c9fbcd79d8b6f5bfac23199fb354938436f62475e14aea0f29ee0f800", + "sha256": "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.1" + "version": "4.2.0" }, "source_helper": { "dependency": "transitive", "description": { "name": "source_helper", - "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723", + "sha256": "4a85e90b50694e652075cbe4575665539d253e6ec10e46e76b45368ab5e3caae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.8" + "version": "1.3.10" }, "source_span": { "dependency": "transitive", @@ -1574,11 +1625,11 @@ "dependency": "transitive", "description": { "name": "sqlparser", - "sha256": "57090342af1ce32bb499aa641f4ecdd2d6231b9403cea537ac059e803cc20d67", + "sha256": "f52f5d5649dcc13ed198c4176ddef74bf6851c30f4f31603f1b37788695b93e2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.41.2" + "version": "0.43.0" }, "stack_trace": { "dependency": "transitive", @@ -1870,6 +1921,16 @@ "source": "hosted", "version": "2.2.0" }, + "very_good_analysis": { + "dependency": "direct main", + "description": { + "name": "very_good_analysis", + "sha256": "96245839dbcc45dfab1af5fa551603b5c7a282028a64746c19c547d21a7f1e3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.0" + }, "visibility_detector": { "dependency": "direct main", "description": { @@ -1914,11 +1975,11 @@ "dependency": "transitive", "description": { "name": "watcher", - "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c", + "sha256": "f52385d4f73589977c80797e60fe51014f7f2b957b5e9a62c3f6ada439889249", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.2.0" }, "web": { "dependency": "transitive", @@ -2031,6 +2092,16 @@ "source": "hosted", "version": "0.5.1" }, + "window_to_front": { + "dependency": "transitive", + "description": { + "name": "window_to_front", + "sha256": "7aef379752b7190c10479e12b5fd7c0b9d92adc96817d9e96c59937929512aee", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, "xdg_directories": { "dependency": "transitive", "description": { @@ -2051,6 +2122,16 @@ "source": "hosted", "version": "6.6.1" }, + "xxh3": { + "dependency": "transitive", + "description": { + "name": "xxh3", + "sha256": "399a0438f5d426785723c99da6b16e136f4953fb1e9db0bf270bd41dd4619916", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, "yaml": { "dependency": "transitive", "description": { @@ -2074,6 +2155,6 @@ }, "sdks": { "dart": ">=3.9.0 <4.0.0", - "flutter": "3.38.5" + "flutter": "3.38.9" } } From b444839fe6ba32936752b6b0f503c92520e07d0c Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 18 Apr 2026 16:57:12 +1000 Subject: [PATCH 108/246] python3Packages.memray: support darwin --- pkgs/development/python-modules/memray/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/memray/default.nix b/pkgs/development/python-modules/memray/default.nix index 776a22e81d1d..74d6c9404381 100644 --- a/pkgs/development/python-modules/memray/default.nix +++ b/pkgs/development/python-modules/memray/default.nix @@ -16,6 +16,7 @@ pythonOlder, rich, setuptools, + stdenv, textual, }: @@ -36,13 +37,17 @@ buildPythonPackage (finalAttrs: { setuptools ]; + __darwinAllowLocalNetworking = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cython - pkgs.elfutils # for `-ldebuginfod` pkgs.libunwind pkgs.lz4 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + pkgs.elfutils # for `-ldebuginfod` ]; dependencies = [ @@ -87,7 +92,7 @@ buildPythonPackage (finalAttrs: { changelog = "https://github.com/bloomberg/memray/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "memray"; }; }) From 34db1a242a619144db21f3e13d648cab3e6bf1f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 07:20:09 +0000 Subject: [PATCH 109/246] flexget: 3.19.10 -> 3.19.12 --- pkgs/by-name/fl/flexget/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index 14f922dc3216..0920e715eb15 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "flexget"; - version = "3.19.10"; + version = "3.19.12"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${finalAttrs.version}"; - hash = "sha256-G0Scv6XHjpxp5V0Ep+4itu+SmO/8jhR6LHvG/9scIPY="; + hash = "sha256-BSXIC85iRVtSx1TB8yB2EassXfnlEqDpTX17+c1VauQ="; }; pythonRelaxDeps = true; From e54dbca00ae6bd24857c7fa623cc7ce14b130b3f Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 18 Apr 2026 09:29:30 +0200 Subject: [PATCH 110/246] odamex: 12.1.0 -> 12.2.0 Changelog: https://github.com/odamex/odamex/releases/tag/12.2.0 --- pkgs/by-name/od/odamex/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/od/odamex/package.nix b/pkgs/by-name/od/odamex/package.nix index e0e69caf7afd..b98c575dda8f 100644 --- a/pkgs/by-name/od/odamex/package.nix +++ b/pkgs/by-name/od/odamex/package.nix @@ -5,7 +5,7 @@ cmake, copyDesktopItems, - deutex, + python3, makeDesktopItem, makeWrapper, pkg-config, @@ -18,7 +18,7 @@ cpptrace, curl, expat, - fltk, + fltk_1_4, libdwarf, libselinux, libsepol, @@ -43,20 +43,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "odamex"; - version = "12.1.0"; + version = "12.2.0"; src = fetchFromGitHub { owner = "odamex"; repo = "odamex"; tag = finalAttrs.version; - hash = "sha256-kLI1gdGH5NXJ8YI1tR0N5W6yvGZ+7302z0QLl2j+b0k="; + hash = "sha256-cRQtY4C0gjzheE4cG8aPjzAoPf/Hm05a6tidsbce7uM="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake copyDesktopItems - deutex + python3 makeWrapper pkg-config ] @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { cpptrace curl expat - fltk + fltk_1_4 libdwarf libsysprof-capture pcre2 @@ -191,7 +191,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/odamex/odamex/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; maintainers = with lib.maintainers; [ eljamm ]; mainProgram = "odalaunch"; }; From 1b82b11be59ddb45b8e2974267cb1947a6c73e0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 08:56:37 +0000 Subject: [PATCH 111/246] langgraph-cli: 0.4.21 -> 0.4.23 --- 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 d34e924c73bc..ec6d7e36e977 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -26,14 +26,14 @@ buildPythonPackage (finalAttrs: { pname = "langgraph-cli"; - version = "0.4.21"; + version = "0.4.23"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "cli==${finalAttrs.version}"; - hash = "sha256-PwVJzg+LQ6gScd/lewBqN66rzADnucMeIA/4gmP4xPw="; + hash = "sha256-nF6w1SUEFECSv87TbvNpNGiv1wFbKsDlUy8MprTdG70="; }; sourceRoot = "${finalAttrs.src.name}/libs/cli"; From 632c8f566b4bcc8a3aa7d558287666e3e24c2a61 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Apr 2026 11:09:01 +0200 Subject: [PATCH 112/246] python3Packages.iocx: init at 0.6.0 IOC extraction engine for PE binaries and text https://github.com/iocx-dev/iocx --- .../python-modules/iocx/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/iocx/default.nix diff --git a/pkgs/development/python-modules/iocx/default.nix b/pkgs/development/python-modules/iocx/default.nix new file mode 100644 index 000000000000..2f19b87cde71 --- /dev/null +++ b/pkgs/development/python-modules/iocx/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pefile, + pytestCheckHook, + python-magic, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "iocx"; + version = "0.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "iocx-dev"; + repo = "iocx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-WdUHqQXq/qJyqZ5O9+E777+fQaQowvftDtQ0mj67FHw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pefile + python-magic + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "iocx" ]; + + preCheck = '' + export PATH="$PATH:$out/bin"; + ''; + + disabledTests = [ + # Test requires go to be available + "test_cli_with_real_go_binary" + ]; + + meta = { + description = "IOC extraction engine for PE binaries and text"; + homepage = "https://github.com/iocx-dev/iocx"; + changelog = "https://github.com/iocx-dev/iocx/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19766c3d076b..e5872c423aaf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7633,6 +7633,8 @@ self: super: with self; { ioctl-opt = callPackage ../development/python-modules/ioctl-opt { }; + iocx = callPackage ../development/python-modules/iocx { }; + iodata = callPackage ../development/python-modules/iodata { }; iometer = callPackage ../development/python-modules/iometer { }; From 310ce64b523477df72e0845dc6b99a302480337b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Apr 2026 11:22:21 +0200 Subject: [PATCH 113/246] python3Packages.nox: modernize --- pkgs/development/python-modules/nox/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index acdd8ef3d6bc..e9325dc9fa87 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system hatchling, @@ -27,17 +26,15 @@ virtualenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nox"; version = "2026.04.10"; pyproject = true; - disabled = pythonOlder "3.12"; - src = fetchFromGitHub { owner = "wntrblm"; repo = "nox"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ArSA9I86hTKM+fkTdzOeheYVxpdjweMs2I0mUwR14sQ="; }; @@ -65,7 +62,7 @@ buildPythonPackage rec { pytestCheckHook writableTmpDirAsHomeHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); pythonImportsCheck = [ "nox" ]; @@ -86,11 +83,11 @@ buildPythonPackage rec { meta = { description = "Flexible test automation for Python"; homepage = "https://nox.thea.codes/"; - changelog = "https://github.com/wntrblm/nox/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/wntrblm/nox/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ doronbehar fab ]; }; -} +}) From c0ef42d851646d01b6fc66c50c26a68321479b5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 09:33:42 +0000 Subject: [PATCH 114/246] tpnote: 1.25.20 -> 1.26.0 --- pkgs/by-name/tp/tpnote/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 953f7740c787..4fbf6c1e2cdf 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tpnote"; - version = "1.25.20"; + version = "1.26.0"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; tag = "v${finalAttrs.version}"; - hash = "sha256-GsdK3giYfFjiXphWMUXQ7s84j5BStA/HDiRzCLbN1DI="; + hash = "sha256-JjX/cD2VMpS0114Yu+3ZTqPFxv1Pl7cJH6JeURpv7MA="; }; - cargoHash = "sha256-Ke8JtCOaTLe7RQPrOFSs1nHSkkQqAiqnbA1wHzv6DU4="; + cargoHash = "sha256-n3v0ObH4W6H9nRgCSJprVHW1CRgZ9A+padNqJuQLFoE="; nativeBuildInputs = [ cmake From f2530d3e397e5aa1bc8a92f10048581adad07ed5 Mon Sep 17 00:00:00 2001 From: onatustun Date: Sat, 18 Apr 2026 11:23:41 +0100 Subject: [PATCH 115/246] hyprmon: 0.0.14 -> 0.0.15 --- pkgs/by-name/hy/hyprmon/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprmon/package.nix b/pkgs/by-name/hy/hyprmon/package.nix index 4c388e5a239d..2c327def665d 100644 --- a/pkgs/by-name/hy/hyprmon/package.nix +++ b/pkgs/by-name/hy/hyprmon/package.nix @@ -3,16 +3,15 @@ buildGo126Module, fetchFromGitHub, }: - buildGo126Module (finalAttrs: { pname = "hyprmon"; - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { owner = "erans"; repo = "hyprmon"; rev = "v${finalAttrs.version}"; - hash = "sha256-ObOvC2cIoLTBaGmpTAkm2y4vzqg61z+JZotEnmef1eE="; + hash = "sha256-dcjEnxSQwXUPJ44gj7pVPQtZUkBXbqLvQgmhYvANz8o="; }; vendorHash = "sha256-n4RZxpsrlSUD3B/GLVoM2CPckvDkbyaMyg6h4QNbuH0="; From 7f7a4e3f402723e19a33e428f6e45bb252803933 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 11:05:28 +0000 Subject: [PATCH 116/246] sipvicious: 0.3.5 -> 0.3.7 --- pkgs/by-name/si/sipvicious/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sipvicious/package.nix b/pkgs/by-name/si/sipvicious/package.nix index 0371690eb668..9be9e0a2d240 100644 --- a/pkgs/by-name/si/sipvicious/package.nix +++ b/pkgs/by-name/si/sipvicious/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "sipvicious"; - version = "0.3.5"; + version = "0.3.7"; pyproject = true; src = fetchFromGitHub { owner = "EnableSecurity"; repo = "sipvicious"; tag = "v${finalAttrs.version}"; - hash = "sha256-jH5/rNGFbiPdSX52UuJCAq5M7Kco7tCAhtcCyZl5wEc="; + hash = "sha256-OQq1PP0qoETu+0qs2vhkgVU5FVZA5wnWMKU+lKJrvv4="; }; build-system = [ From 4c4a4ee68ffd416592e73908ed9323ae091e38da Mon Sep 17 00:00:00 2001 From: Stephane Date: Fri, 17 Apr 2026 17:38:21 +0200 Subject: [PATCH 117/246] ollama: 0.20.7 -> 0.21.0 --- pkgs/by-name/ol/ollama/package.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index a610262ce240..1a90cdcd1b46 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -7,6 +7,7 @@ stdenv, addDriverRunpath, nix-update-script, + coreutils, cmake, gitMinimal, @@ -94,7 +95,7 @@ let cudaToolkit = buildEnv { # ollama hardcodes the major version in the Makefile to support different variants. - # - https://github.com/ollama/ollama/blob/v0.20.6/CMakePresets.json#L21-L47 + # - https://github.com/ollama/ollama/blob/v0.21.0/CMakePresets.json#L21-L47 name = "cuda-merged-${cudaMajorVersion}"; paths = map lib.getLib cudaLibs ++ [ (lib.getOutput "static" cudaPackages.cuda_cudart) @@ -140,13 +141,13 @@ let in goBuild (finalAttrs: { pname = "ollama"; - version = "0.20.7"; + version = "0.21.0"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-a08TZMzoRg1YzqIU6l1Z8JOBh6VSK5lhfA8ggoMl/ss="; + hash = "sha256-DtrYopNtndQXq9Xjriw5Bqell9A8RHPOvgDF8BlKtdU="; }; vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos="; @@ -187,9 +188,17 @@ goBuild (finalAttrs: { ++ lib.optionals enableVulkan vulkanLibs; # replace inaccurate version number with actual release version + # and replace core utils tools from their FHS location to nix store postPatch = '' substituteInPlace version/version.go \ --replace-fail 0.0.0 '${finalAttrs.version}' + substituteInPlace cmd/launch/openclaw_test.go \ + --replace-fail '/bin/mkdir' '${coreutils}/bin/mkdir' \ + --replace-fail '/bin/cat' '${coreutils}/bin/cat' + substituteInPlace cmd/launch/hermes_test.go \ + --replace-fail '/bin/mkdir' '${coreutils}/bin/mkdir' \ + --replace-fail '/bin/cat' '${coreutils}/bin/cat' \ + --replace-fail '/bin/chmod' '${coreutils}/bin/chmod' rm -r app '' # disable tests that fail in sandbox due to Metal init failure @@ -232,7 +241,7 @@ goBuild (finalAttrs: { ''; # ollama looks for acceleration libs in ../lib/ollama/ (now also for CPU-only with arch specific optimizations) - # https://github.com/ollama/ollama/blob/v0.20.5/docs/development.md#library-detection + # https://github.com/ollama/ollama/blob/v0.21.0/docs/development.md#library-detection postInstall = '' mkdir -p $out/lib cp -r build/lib/ollama $out/lib/ @@ -263,8 +272,6 @@ goBuild (finalAttrs: { skippedTests = [ "TestPushHandler/unauthorized_push" # Writes to $HOME, see https://github.com/ollama/ollama/pull/12307#pullrequestreview-3249128660 "TestPiRun_InstallAndWebSearchLifecycle" # Requires network access to install npm packages - "TestOpenclawRun_ChannelSetupHappensBeforeGatewayRestart" # /bin/mkdir and /bin/cat are unavailable on NixOS - "TestOpenclawChannelSetupPreflight" # /bin/mkdir and /bin/cat are unavailable on NixOS ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; From b73a70dedc4c66b8582c9486868c32e37bdb414d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 14:07:53 +0000 Subject: [PATCH 118/246] python3Packages.hepunits: 2.4.4 -> 2.4.5 --- pkgs/development/python-modules/hepunits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hepunits/default.nix b/pkgs/development/python-modules/hepunits/default.nix index 4be20fde7345..d27fccf13926 100644 --- a/pkgs/development/python-modules/hepunits/default.nix +++ b/pkgs/development/python-modules/hepunits/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "hepunits"; - version = "2.4.4"; + version = "2.4.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-GEbnKfo+T7Nr/1me17i9LNxKvcApBoMPt1wgX9VJBes="; + hash = "sha256-iPpXyfNUWdam7iYYunPCFUxImjLiHVJbZ9qAYqIkLls="; }; nativeBuildInputs = [ From 47d93cf7087c0d07eb5fcce993687f4bad69a71b Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 16 Apr 2026 16:05:22 +0200 Subject: [PATCH 119/246] python3Packages.dj-rest-auth: remove unneeded postPatch --- pkgs/development/python-modules/dj-rest-auth/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 64a110368d99..789f2f0dc140 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -27,11 +27,6 @@ buildPythonPackage (finalAttrs: { hash = "sha256-eUcve2KPcLjKKWU7AxQEZ0mokP185E43Xjm4b+4hQzA="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "==" ">=" - ''; - build-system = [ setuptools ]; buildInputs = [ django ]; @@ -49,6 +44,7 @@ buildPythonPackage (finalAttrs: { }; nativeCheckInputs = [ + pytest-django djangorestframework-simplejwt pytestCheckHook pytest-django From cd8f3c05dc59df2c987c45a04b3e84f042ff2885 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 16 Apr 2026 15:03:36 +0200 Subject: [PATCH 120/246] python3Packages.django-celery-beat: 2.8.1 -> 2.9.0 Diff: https://github.com/celery/django-celery-beat/compare/v2.8.1...v2.9.0 Changelog: https://github.com/celery/django-celery-beat/releases/tag/v2.9.0 --- .../django-celery-beat/default.nix | 54 +++++++++++++++---- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix index 4109ba3d3c8a..e274817a24bb 100644 --- a/pkgs/development/python-modules/django-celery-beat/default.nix +++ b/pkgs/development/python-modules/django-celery-beat/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, # build-system setuptools, @@ -20,18 +21,54 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-celery-beat"; - version = "2.8.1"; + version = "2.9.0"; pyproject = true; src = fetchFromGitHub { owner = "celery"; repo = "django-celery-beat"; - tag = "v${version}"; - hash = "sha256-pakOpch5r2ug0UDSqEU34qr4Tz1/mkuFiHW+IOUuGcc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-UGKMSXB+Hg865sAk5ePc/noO3eNTr7b3pp7tvNvn1T8="; }; + # https://github.com/celery/django-celery-beat/pull/1009 + patches = [ + (fetchpatch { + url = "https://github.com/celery/django-celery-beat/commit/dc11bdfa06858409da01f2d407bb68486870a559.patch"; + hash = "sha256-aK8u2CfmNYFwE9CQvKjnwywVcw8MQfXvev7JYU9kz4E="; + }) + (fetchpatch { + url = "https://github.com/celery/django-celery-beat/commit/ddcbe8bf2c970a82e87f50c0e9c232b0ae951a85.patch"; + hash = "sha256-uw3l6CA0lnbF1HnNeSgZ91l1ujkB4V3831Yj+L4i+L0="; + }) + (fetchpatch { + url = "https://github.com/celery/django-celery-beat/commit/088355dc6531bfffc19272c9de55f4d18606634e.patch"; + hash = "sha256-6pamaLcHbNUGJMw6nCWeY/C1O58choDbJ1j/4SqDPx4="; + }) + (fetchpatch { + url = "https://github.com/celery/django-celery-beat/commit/273e2f23edee26404a1691320a69dee280f9639b.patch"; + hash = "sha256-8wZrDi9GDIF+w5ZZDssJGLG3UyE45xqld95nnG3SV0A="; + }) + (fetchpatch { + url = "https://github.com/celery/django-celery-beat/commit/69f4a231f30df9ff028f8fc0f67cb115e5d53246.patch"; + hash = "sha256-74p2XxB9ssWpVokY8XVUjkyyE4+/2lijDYZcZSu9ms0="; + }) + (fetchpatch { + url = "https://github.com/celery/django-celery-beat/commit/4b8246a44a69e79d7648a9f4658abd8b7937b2b8.patch"; + hash = "sha256-c1ZJHgnxvOoEWAc9oRkcCLRG7sLLsSER/Dq0H8TIOYU="; + }) + (fetchpatch { + url = "https://github.com/celery/django-celery-beat/commit/17dd67625f99a0e6dbe7fb779f61f336e7af1730.patch"; + hash = "sha256-w+MynocR80jUARgvuk5cUIdzmdAYGglvrNXph/8XdBE="; + }) + (fetchpatch { + url = "https://github.com/celery/django-celery-beat/commit/03018882f088be83e1c78b4ca657b960b3080081.patch"; + hash = "sha256-YE121p2aGqoj9mRFSQu+oi+8xaz0QE+CsJHdBB7xwUM="; + }) + ]; + pythonRelaxDeps = [ "django" ]; build-system = [ setuptools ]; @@ -56,18 +93,13 @@ buildPythonPackage rec { "t/unit/test_schedulers.py" ]; - disabledTests = [ - # AssertionError: 'At 02:00, only on Monday UTC' != 'At 02:00 AM, only on Monday UTC' - "test_long_name" - ]; - pythonImportsCheck = [ "django_celery_beat" ]; meta = { description = "Celery Periodic Tasks backed by the Django ORM"; homepage = "https://github.com/celery/django-celery-beat"; - changelog = "https://github.com/celery/django-celery-beat/releases/tag/${src.tag}"; + changelog = "https://github.com/celery/django-celery-beat/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ onny ]; }; -} +}) From 6e1ada0d38e079d62cc6a221f61275c9583fa082 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 16 Apr 2026 14:42:41 +0200 Subject: [PATCH 121/246] python3Packages.translate-toolkit: add all optional-dependencies --- .../translate-toolkit/default.nix | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix index f88bfc6a603c..28e64d4cb293 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -9,25 +9,26 @@ # dependencies lxml, unicode-segmentation-rs, - urllib3, # optional-dependencies - tomlkit, - - # tests - aeidon, charset-normalizer, - cheroot, fluent-syntax, - gettext, + vobject, iniparse, + rapidfuzz, mistletoe, phply, pyparsing, - pytestCheckHook, + pyenchant, + aeidon, + tomlkit, ruamel-yaml, - syrupy, - vobject, + + # tests + pytestCheckHook, + addBinToPathHook, + pytest-xdist, + gettext, }: buildPythonPackage (finalAttrs: { @@ -47,36 +48,40 @@ buildPythonPackage (finalAttrs: { dependencies = [ lxml unicode-segmentation-rs - urllib3 ]; optional-dependencies = { + chardet = [ charset-normalizer ]; + fluent = [ fluent-syntax ]; + ical = [ vobject ]; + ini = [ iniparse ]; + levenshtein = [ rapidfuzz ]; + markdown = [ mistletoe ]; + php = [ phply ]; + rc = [ pyparsing ]; + spellcheck = [ pyenchant ]; + subtitles = [ aeidon ]; toml = [ tomlkit ]; + yaml = [ ruamel-yaml ]; }; nativeCheckInputs = [ - aeidon - charset-normalizer - cheroot - fluent-syntax - gettext - iniparse - mistletoe - phply - pyparsing pytestCheckHook - ruamel-yaml - syrupy - tomlkit - vobject - ]; + addBinToPathHook + pytest-xdist + gettext + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; disabledTests = [ # Probably breaks because of nix sandbox "test_timezones" + ]; - # Requires network - "test_xliff_conformance" + disabledTestPaths = [ + # Require pytest-snapshot but there are no snapshots checked in + "tests/translate/tools/test_pocount.py" + "tests/translate/tools/test_junitmsgfmt.py" ]; pythonImportsCheck = [ "translate" ]; From 1264073efd44d22faa6c347fe0fdae897d68c28b Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 16 Apr 2026 16:46:42 +0200 Subject: [PATCH 122/246] python3Packages.celery: skip failing test --- pkgs/development/python-modules/celery/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index bb9aae785f0e..c6f6f4e7ff0e 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -194,6 +194,9 @@ buildPythonPackage (finalAttrs: { "test_regression_worker_startup_info" "test_check_privileges" + # FileNotFoundError: [Errno 2] No such file or directory: 'test.db' + "test_forget" + # Flaky: Unclosed temporary file handle under heavy load (as in nixpkgs-review) "test_check_privileges_without_c_force_root_and_no_group_entry" ] From 97279180b81902169c18a9e4ac31e227fd5ac61b Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 16 Apr 2026 14:53:08 +0200 Subject: [PATCH 123/246] python3Packages.altcha: 1.0.0 -> 2.0.0 --- pkgs/development/python-modules/altcha/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/altcha/default.nix b/pkgs/development/python-modules/altcha/default.nix index e8f05bd7c524..bb8b45651ccb 100644 --- a/pkgs/development/python-modules/altcha/default.nix +++ b/pkgs/development/python-modules/altcha/default.nix @@ -6,16 +6,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "altcha"; - version = "1.0.0"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "altcha-org"; repo = "altcha-lib-py"; - tag = "v${version}"; - hash = "sha256-N30luHhGFkd+XvVKhVnR6degEf0Nm/K/GEaqoEEuZMU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-k5vy6lalC3idiquXbDCwF+mObzja/QC3PRBGQJMZ6fA="; }; build-system = [ setuptools ]; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ erictapen ]; }; -} +}) From 652e7b6f2194b58f75e278fb46779287dd75b57d Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 16 Apr 2026 14:53:27 +0200 Subject: [PATCH 124/246] weblate: 5.16.2 -> 5.17 Changelog: https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.17 --- pkgs/by-name/we/weblate/package.nix | 69 ++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 7f15172322a6..eeeaf2c02ea2 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -31,11 +31,13 @@ let python = python3.override { + self = python; packageOverrides = _final: prev: { - django = prev.django_5; + django = prev.django_6; + pygobject = prev.pygobject3; }; }; - python3Packages = python3.pkgs; + python3Packages = python.pkgs; GI_TYPELIB_PATH = lib.makeSearchPathOutput "out" "lib/girepository-1.0" [ pango @@ -48,7 +50,7 @@ let in python3Packages.buildPythonApplication (finalAttrs: { pname = "weblate"; - version = "5.16.2"; + version = "5.17"; pyproject = true; outputs = [ @@ -60,7 +62,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "WeblateOrg"; repo = "weblate"; tag = "weblate-${finalAttrs.version}"; - hash = "sha256-er3KtCAFtHh3UtM58Kni/PTBfXpWW/GOarRGJeAanL8="; + hash = "sha256-+czdS1cICvm8esXxJG9BjzPTJExajxvDoRVH7f+t6lY="; }; postPatch = '' @@ -92,15 +94,14 @@ python3Packages.buildPythonApplication (finalAttrs: { ''; pythonRelaxDeps = [ + "requests" + "pygobject" "certifi" - "crispy-bootstrap5" - "dateparser" ]; dependencies = with python3Packages; [ - aeidon ahocorasick-rs altcha (toPythonModule (borgbackup.override { python3 = python; })) @@ -108,7 +109,6 @@ python3Packages.buildPythonApplication (finalAttrs: { certifi charset-normalizer confusable-homoglyphs - crispy-bootstrap3 crispy-bootstrap5 cryptography cssselect @@ -134,23 +134,20 @@ python3Packages.buildPythonApplication (finalAttrs: { drf-standardized-errors fedora-messaging filelock - fluent-syntax gitpython hiredis html2text - iniparse jsonschema lxml mistletoe nh3 openpyxl packaging - phply pillow pyaskalono pycairo pygments - pygobject3 + pygobject pyicumessageformat pyparsing python-dateutil @@ -178,7 +175,15 @@ python3Packages.buildPythonApplication (finalAttrs: { ++ celery.optional-dependencies.redis ++ drf-spectacular.optional-dependencies.sidecar ++ drf-standardized-errors.optional-dependencies.openapi + ++ translate-toolkit.optional-dependencies.chardet + ++ translate-toolkit.optional-dependencies.fluent + ++ translate-toolkit.optional-dependencies.ini + ++ translate-toolkit.optional-dependencies.markdown ++ translate-toolkit.optional-dependencies.toml + ++ translate-toolkit.optional-dependencies.php + ++ translate-toolkit.optional-dependencies.rc + ++ translate-toolkit.optional-dependencies.subtitles + ++ translate-toolkit.optional-dependencies.yaml ++ urllib3.optional-dependencies.brotli ++ urllib3.optional-dependencies.zstd; @@ -197,12 +202,12 @@ python3Packages.buildPythonApplication (finalAttrs: { ]; ldap = [ django-auth-ldap ]; # mercurial = [ mercurial ]; - mysql = [ mysqlclient ]; openai = [ openai ]; postgres = [ psycopg ]; saml = [ python3-saml ]; - # saml2idp = [ djangosaml2idp ]; - # wlhosted = [ wlhosted ]; + # saml2idp = [ djangosaml2idp2 ]; + sphinx = [ sphinx ]; + # wllegal = [ wllegal ]; wsgi = [ granian ]; # zxcvbn = [ django-zxcvbn-password-validator ]; }; @@ -243,7 +248,7 @@ python3Packages.buildPythonApplication (finalAttrs: { openssh ] ++ social-auth-core.optional-dependencies.saml - ++ (lib.concatLists (builtins.attrValues finalAttrs.passthru.optional-dependencies)); + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; env = { CI_DATABASE = "postgresql"; @@ -277,6 +282,38 @@ python3Packages.buildPythonApplication (finalAttrs: { "test_ocr_backend" ]; + disabledTestPaths = [ + # Probably network access? + "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_component_scopes" + "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_connection_error" + "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_invalid_response" + "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_project_scopes" + "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_site_wide_scope" + "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_translation_added" + "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_announcement" + "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_bulk_changes" + "weblate/addons/tests.py::WebhooksAddonTest::test_announcement" + "weblate/addons/tests.py::WebhooksAddonTest::test_bulk_changes" + "weblate/addons/tests.py::WebhooksAddonTest::test_category_in_payload" + "weblate/addons/tests.py::WebhooksAddonTest::test_component_scopes" + "weblate/addons/tests.py::WebhooksAddonTest::test_connection_error" + "weblate/addons/tests.py::WebhooksAddonTest::test_invalid_response" + "weblate/addons/tests.py::WebhooksAddonTest::test_project_scopes" + "weblate/addons/tests.py::WebhooksAddonTest::test_site_wide_scope" + "weblate/addons/tests.py::WebhooksAddonTest::test_translation_added" + "weblate/addons/tests.py::WebhooksAddonTest::test_webhook_signature" + "weblate/addons/tests.py::WebhooksAddonTest::test_webhook_signature_prefix" + + # Tries to resolve DNS + "weblate/api/tests.py::ProjectAPITest::test_install_machinery" + + # djangosaml2idp2 is not packaged yet + "weblate/utils/tests/test_djangosaml2idp.py" + + # Don't understand why + "weblate/trans/tests/test_alert.py::WebsiteAlertSettingTest::test_website_alerts_enabled" + ]; + passthru = { inherit python; # We need to expose this so weblate can work outside of calling its bin output From a337fba0337b82313641e416dd08a2d9cc89ac45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 14:29:26 +0000 Subject: [PATCH 125/246] python3Packages.serialx: 1.2.1 -> 1.2.3 --- pkgs/development/python-modules/serialx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/serialx/default.nix b/pkgs/development/python-modules/serialx/default.nix index a0523badbaa1..f06d9064ab79 100644 --- a/pkgs/development/python-modules/serialx/default.nix +++ b/pkgs/development/python-modules/serialx/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "serialx"; - version = "1.2.1"; + version = "1.2.3"; pyproject = true; src = fetchFromGitHub { owner = "puddly"; repo = "serialx"; tag = "v${finalAttrs.version}"; - hash = "sha256-7EtFGjcy9RWnbwRM6ptbBpeZDUw3ud4JvfMkuDru6i0="; + hash = "sha256-FroHqWuNGna5FxP4PXZzhADaNNRQnVjG9S5JJq4CVkQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 154a7450a924810ae0310a6f8eababe1f6aa886e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 Apr 2026 23:36:20 +0800 Subject: [PATCH 126/246] =?UTF-8?q?webkitgtk=5F6=5F0:=202.52.2=20=E2=86=92?= =?UTF-8?q?=202.52.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2026/04/16/webkitgtk2.52.3-released.html https://github.com/WebKit/WebKit/compare/webkitgtk-2.52.2...webkitgtk-2.52.3 --- pkgs/development/libraries/webkitgtk/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 50cbdebc87d0..e0bc6063b033 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -85,7 +85,7 @@ in # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.52.2"; + version = "2.52.3"; name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}"; outputs = [ @@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-Bd4rRIdLotraV1X4mM+1N4PDFz+RtGNo+i3MxYSXKrs="; + hash = "sha256-Wz4NF05j3MKISLEZTg50SNWUjDwkJ+zZMcLFvlJhrrs="; }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ @@ -117,13 +117,6 @@ clangStdenv.mkDerivation (finalAttrs: { hash = "sha256-MgaSpXq9l6KCLQdQyel6bQFHG53l3GY277WePpYXdjA="; name = "fix_ftbfs_riscv64.patch"; }) - - # Fix FTBFS on platforms that don't use Skia - # https://bugs.webkit.org/show_bug.cgi?id=312160 - (fetchpatch { - url = "https://github.com/WebKit/WebKit/commit/36df921c686c07f2b20e3eed20afad5471b96897.patch"; - hash = "sha256-iYOs1V/p02XHtytw+r1+TyW08pk6PgUH76U1fXG8w34="; - }) ]; nativeBuildInputs = [ From e81bdfea984f4e4d305ef22e5e3a684455ca9261 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 15:38:43 +0000 Subject: [PATCH 127/246] systemdgenie: 0.99.0-unstable-2026-03-07 -> 0.99.0-unstable-2026-04-16 --- pkgs/by-name/sy/systemdgenie/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/systemdgenie/package.nix b/pkgs/by-name/sy/systemdgenie/package.nix index df077c5bb03b..92ff0ee58a2a 100644 --- a/pkgs/by-name/sy/systemdgenie/package.nix +++ b/pkgs/by-name/sy/systemdgenie/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation { pname = "systemdgenie"; - version = "0.99.0-unstable-2026-03-07"; + version = "0.99.0-unstable-2026-04-16"; src = fetchFromGitLab { domain = "invent.kde.org"; repo = "SystemdGenie"; owner = "system"; - rev = "1905e25d93a2c5e9851fc9516f0f61dce1ac2812"; - hash = "sha256-kkqJS1mqLgUlzW35SWQKTHJEcXz4SK0fL8rauwjFBd0="; + rev = "283973fcde1eeb457cd082af8004e099aa8b3b86"; + hash = "sha256-QRbATmdJ78N2mGyt4XCVzQ3nKk0FlnTuYkoi3/XC9DY="; }; strictDeps = true; From 11d6f4f0fc43930f0d6a4549b63e0cb73df8cd62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 17:32:34 +0000 Subject: [PATCH 128/246] victorialogs: 1.49.0 -> 1.50.0 --- pkgs/by-name/vi/victorialogs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix index 2be5a759e54a..38882d5b46b1 100644 --- a/pkgs/by-name/vi/victorialogs/package.nix +++ b/pkgs/by-name/vi/victorialogs/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaLogs"; - version = "1.49.0"; + version = "1.50.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaLogs"; tag = "v${finalAttrs.version}"; - hash = "sha256-7qpI9EjHh5XddXXx4QuGt+h5Rwcj6Me+mpZDbnCGbio="; + hash = "sha256-hlRHTTwGPXAMVscIeHxac7KCNWEdBy7WS/KbxwMTl7w="; }; vendorHash = null; From 1bf8828bc7d52d27c6e1da89903f7d7db77a49b8 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Sat, 18 Apr 2026 13:44:54 -0400 Subject: [PATCH 129/246] binaryen: patch lld.py to match '64' on basename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit scripts/test/lld.py adds --enable-memory64 --bigint when '64' appears anywhere in the input path. The full Nix build directory is included, and its nonce digits can contain '64' — non-deterministically triggering the memory64 flags on unrelated tests (e.g. lld/duplicate_imports.wat) and causing output mismatches. Match on basename instead. --- pkgs/development/compilers/binaryen/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index d521ff984c1c..c6c86cecc7a8 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -41,6 +41,12 @@ stdenv.mkDerivation rec { sed -i '/gtest/d' third_party/CMakeLists.txt rmdir test/spec/testsuite ln -s ${testsuite} test/spec/testsuite + # scripts/test/lld.py checks `'64' in input_path` to enable the + # memory64/bigint flags; the full Nix build path leaks digits that + # can accidentally contain "64", wrongly triggering those flags for + # non-memory64 tests (e.g. duplicate_imports.wat). Match on basename. + substituteInPlace scripts/test/lld.py \ + --replace-fail "'64' in input_path" "'64' in os.path.basename(input_path)" else cmakeFlagsArray=($cmakeFlagsArray -DBUILD_TESTS=0) fi From 6a5e79dd7438ce5700d8543fcf19b5a6047c9d7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 17:55:06 +0000 Subject: [PATCH 130/246] zarf: 0.73.1 -> 0.75.0 --- pkgs/by-name/za/zarf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/za/zarf/package.nix b/pkgs/by-name/za/zarf/package.nix index 427ce1f41f95..920f3935b2c7 100644 --- a/pkgs/by-name/za/zarf/package.nix +++ b/pkgs/by-name/za/zarf/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "zarf"; - version = "0.73.1"; + version = "0.75.0"; src = fetchFromGitHub { owner = "zarf-dev"; repo = "zarf"; tag = "v${finalAttrs.version}"; - hash = "sha256-vXvq4uzDzv9xCxIwv8GMaIfNUe0Df8qtEs9ZjCqtmBA="; + hash = "sha256-gQWEKLtNvb61UddbVj7SbwOXHYQxzE2ve5xuuxv3dC8="; }; - vendorHash = "sha256-xjX96ZCRhLCtLffu1YHvhh4c79y9ZGp8jURNf00rM28="; + vendorHash = "sha256-djU3gNWDQtzCR0U+DNrcENQktrozjEN8/lDs53LeeGQ="; proxyVendor = true; nativeBuildInputs = [ From bb5f61972f61ecf586b82ba5720b72dc5d8b7dac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Mar 2026 12:28:32 +0000 Subject: [PATCH 131/246] pdfium-binaries-v8: 7734 -> 7749 --- pkgs/by-name/pd/pdfium-binaries/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix index 5724474f7891..316f8410f10d 100644 --- a/pkgs/by-name/pd/pdfium-binaries/package.nix +++ b/pkgs/by-name/pd/pdfium-binaries/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdfium-binaries"; - version = "7734"; + version = "7749"; src = let @@ -27,17 +27,17 @@ stdenv.mkDerivation (finalAttrs: { hash = if withV8 then selectSystem { - x86_64-linux = "sha256-ovbxiOwsmBUddbuTreVvhJeHMYd4dKu+rACDELsRC90="; - aarch64-linux = "sha256-wMddHbzxCs21dzZhLjpLEviplFOzHukrRRbCPMOTrDs="; - x86_64-darwin = "sha256-+UsFsft9WKd0LrDKbdxuKlHxNsfhzOIWvm8Br0MlNgc="; - aarch64-darwin = "sha256-MDE27+uIhqkSe76xtx/sHt++OQtXXAueq10KrwYVJ8Q="; + x86_64-linux = "sha256-I3JTNnqXpDHwl+sOS/AlPj4znG2OFIqRxtJNhXD+w6I="; + aarch64-linux = "sha256-PBkwxcjsqeEElNC+V74h4P1e508IB/zXjGoQuwK6Krk="; + x86_64-darwin = "sha256-aumdSND6Lefr6GgmWBSX4pQhZj8jJIABi6VJSqKNin8="; + aarch64-darwin = "sha256-DpoPHGaFkjfOa3tXItYLeJpTLfRXOrjlN/+eyPEcgOQ="; } else selectSystem { - x86_64-linux = "sha256-us1UjIhdsRTSGJOkasLdMyIRKdHXKr21hY2+NOIKVH4="; - aarch64-linux = "sha256-wHZVPH/c+jsxcClWznox/wnlKlTyUeKqdQxujdD67XU="; - x86_64-darwin = "sha256-+Umu2SsuO9lJGngkBVyuAvg4wu9d/OCsSabQ7F4U55U="; - aarch64-darwin = "sha256-pHEK9QC2DMZoRnTGc6NfVjCxaZYmCsh3RqHdSCdZ0Cs="; + x86_64-linux = "sha256-0VaBPO4angdRqerquTjqizZWvGxrRP8k7DZXLw8Yqaw="; + aarch64-linux = "sha256-h7JJxmCg9GIaVMajNZb+AeClIeX8w9XWM2RYqGhPoUY="; + x86_64-darwin = "sha256-1Or4cuxvx13Z70kIj7Q1DM1hg/bW5SPAGEDEtnBU6YI="; + aarch64-darwin = "sha256-rJqrpCo+5bzqyUsRubGOsBZ8orV1dSuXfjADFJmxBOw="; }; stripRoot = false; }; From b3d29677f094427bb929ad895828eea5c64dfef7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 18:12:51 +0000 Subject: [PATCH 132/246] mirrord: 3.201.0 -> 3.203.1 --- 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 d672715115f8..58ce253f0c5f 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.201.0", + "version": "3.203.1", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.201.0/mirrord_linux_x86_64", - "hash": "sha256-R5wiIpOA/9mkYjDmAYKOfDjpffV1Wm/GOLfzyi8dNVE=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.203.1/mirrord_linux_x86_64", + "hash": "sha256-R4ub6Lh33YNzCa1t6aBTzGf/9EaK2wfTWBk4oal4CuI=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.201.0/mirrord_linux_aarch64", - "hash": "sha256-U8DTLhl/LfC7xf9yx4iHQx0WF1xI/d36ikiqWX+pFkk=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.203.1/mirrord_linux_aarch64", + "hash": "sha256-2H8O3xL50c31fyVMI5wi6eC3RsZCKV1o4rL4C6e3SoY=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.201.0/mirrord_mac_universal", - "hash": "sha256-n98D4F6XamC1BkB8VDGW/xEgVlejW/HLhcxrk+pkAHQ=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.203.1/mirrord_mac_universal", + "hash": "sha256-uI3Zgc42d4shPKiy0lVcS7NmYE6W10zMrRuG08JaSAw=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.201.0/mirrord_mac_universal", - "hash": "sha256-n98D4F6XamC1BkB8VDGW/xEgVlejW/HLhcxrk+pkAHQ=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.203.1/mirrord_mac_universal", + "hash": "sha256-uI3Zgc42d4shPKiy0lVcS7NmYE6W10zMrRuG08JaSAw=" } } } From 12e3dde80d2f86ffdcd8a3ae26f9b59b14747e78 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Sat, 18 Apr 2026 11:35:05 -0700 Subject: [PATCH 133/246] zgv: fix build with gcc15; migrate to by-name --- .../zg}/zgv/add-include.patch | 0 .../default.nix => by-name/zg/zgv/package.nix} | 16 +++++++++++++--- .../graphics => by-name/zg}/zgv/switch.patch | 0 pkgs/top-level/all-packages.nix | 8 -------- 4 files changed, 13 insertions(+), 11 deletions(-) rename pkgs/{applications/graphics => by-name/zg}/zgv/add-include.patch (100%) rename pkgs/{applications/graphics/zgv/default.nix => by-name/zg/zgv/package.nix} (79%) rename pkgs/{applications/graphics => by-name/zg}/zgv/switch.patch (100%) diff --git a/pkgs/applications/graphics/zgv/add-include.patch b/pkgs/by-name/zg/zgv/add-include.patch similarity index 100% rename from pkgs/applications/graphics/zgv/add-include.patch rename to pkgs/by-name/zg/zgv/add-include.patch diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/by-name/zg/zgv/package.nix similarity index 79% rename from pkgs/applications/graphics/zgv/default.nix rename to pkgs/by-name/zg/zgv/package.nix index f0d662e0d4a7..bc55d389deb1 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/by-name/zg/zgv/package.nix @@ -4,13 +4,20 @@ fetchurl, fetchpatch, pkg-config, - SDL, + SDL_sixel, SDL_image, libjpeg, libpng, libtiff, }: +let + # Enable terminal display. Note that it requires sixel graphics compatible + # terminals like mlterm or xterm -ti 340 + SDL_image_sixel = SDL_image.override { + SDL = SDL_sixel; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "zgv"; version = "5.9"; @@ -21,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - SDL - SDL_image + SDL_sixel + SDL_image_sixel libjpeg libpng libtiff @@ -30,6 +37,9 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; + # gcc15 + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + makeFlags = [ "BACKEND=SDL" ]; diff --git a/pkgs/applications/graphics/zgv/switch.patch b/pkgs/by-name/zg/zgv/switch.patch similarity index 100% rename from pkgs/applications/graphics/zgv/switch.patch rename to pkgs/by-name/zg/zgv/switch.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c6306892b86..4d1c9996c9a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11026,14 +11026,6 @@ with pkgs; zed-editor-fhs = zed-editor.fhs; - zgv = callPackage ../applications/graphics/zgv { - # Enable the below line for terminal display. Note - # that it requires sixel graphics compatible terminals like mlterm - # or xterm -ti 340 - SDL = SDL_sixel; - SDL_image = SDL_image.override { SDL = SDL_sixel; }; - }; - zynaddsubfx-fltk = zynaddsubfx.override { guiModule = "fltk"; }; From bba180b8ecd20c07e03439bd3fce4fb88313ace1 Mon Sep 17 00:00:00 2001 From: squat Date: Fri, 17 Apr 2026 16:11:08 +0200 Subject: [PATCH 134/246] python3Packages.pydantic-monty: init at 0.0.13 This commit introduces a new Python package: [pydantic-monty](https://github.com/pydantic/monty), "a minimal, secure Python interpreter written in Rust for use by AI." It's an optional dependency of [fastmcp](https://github.com/PrefectHQ/fastmcp), which I'd like to add to the package. Signed-off-by: squat --- .../python-modules/pydantic-monty/default.nix | 77 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/development/python-modules/pydantic-monty/default.nix diff --git a/pkgs/development/python-modules/pydantic-monty/default.nix b/pkgs/development/python-modules/pydantic-monty/default.nix new file mode 100644 index 000000000000..35bbba47ee76 --- /dev/null +++ b/pkgs/development/python-modules/pydantic-monty/default.nix @@ -0,0 +1,77 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + rustPlatform, + + anyio, + dirty-equals, + inline-snapshot, + pytest-examples, + pytest-pretty, + typing-extensions, +}: + +buildPythonPackage (finalAttrs: { + pname = "pydantic-monty"; + version = "0.0.13"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "monty"; + tag = "v${finalAttrs.version}"; + hash = "sha256-0g0/NuwTuUfHVHE8YcVjUeZpSa+ANPWIXllu+qRXjZE="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname src version; + hash = "sha256-LkTEMhz0MG6RfqejOQMdB2BZU6oxT3ZAo/N0oVlswsQ="; + }; + + dependencies = [ typing-extensions ]; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + maturinBuildFlags = [ + "-m" + "crates/monty-python/Cargo.toml" + ]; + + pytestFlags = [ + "--config-file" + "crates/monty-python/pyproject.toml" + ]; + + disabledTests = [ + # These tests fails because they expect to have multiple cores + # to produce a predicted speedup measurement, which we cannot + # achieve in the sandbox. + "test_parallel_exec" + ]; + + nativeCheckInputs = [ + anyio + dirty-equals + inline-snapshot + pytest-examples + pytest-pretty + pytestCheckHook + ]; + + pythonImportsCheck = [ "pydantic_monty" ]; + + meta = { + description = "Minimal, secure Python interpreter written in Rust for use by AI"; + homepage = "https://github.com/pydantic/monty"; + changelog = "https://github.com/pydantic/monty/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ squat ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19766c3d076b..f2819c9e039a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13580,6 +13580,8 @@ self: super: with self; { pydantic-graph = callPackage ../development/python-modules/pydantic-graph { }; + pydantic-monty = callPackage ../development/python-modules/pydantic-monty { }; + pydantic-scim = callPackage ../development/python-modules/pydantic-scim { }; pydantic-settings = callPackage ../development/python-modules/pydantic-settings { }; From 71600138d1df554c4f22f126db68464acb24b0c3 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Sat, 18 Apr 2026 12:25:03 -0700 Subject: [PATCH 135/246] x2x: unstable-2023-04-30 -> 1.30-unstable-2025-02-17 --- pkgs/by-name/x2/x2x/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/x2/x2x/package.nix b/pkgs/by-name/x2/x2x/package.nix index 51466f358818..6c276de0158c 100644 --- a/pkgs/by-name/x2/x2x/package.nix +++ b/pkgs/by-name/x2/x2x/package.nix @@ -12,19 +12,20 @@ stdenv.mkDerivation { pname = "x2x"; - version = "unstable-2023-04-30"; + version = "1.30-unstable-2025-02-17"; src = fetchFromGitHub { owner = "dottedmag"; repo = "x2x"; - rev = "53692798fa0e991e0dd67cdf8e8126158d543d08"; - hash = "sha256-FUl2z/Yz9uZlUu79LHdsXZ6hAwSlqwFV35N+GYDNvlQ="; + rev = "08842516fa443a2cf799c6372f83466062f612c9"; + hash = "sha256-0ZVpG4ZrygrFZ0mVmNLWWdyqM43LtQPGwvZZPC92zuY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libx11 libxtst From 887e700c916f264660967004aed8a4a1f36120ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 18 Apr 2026 16:32:20 -0300 Subject: [PATCH 136/246] sfwbar: fix SVG icon rendering via wrapGAppsHook3 Add `wrapGAppsHook3` to `nativeBuildInputs` to ensure `sfwbar` can successfully locate the `gdk-pixbuf` loaders required to render SVG symbolic icons in default GTK widgets (such as the battery, bluez, and volume modules). The inclusion of this hook automatically generates a unified `loaders.cache` and wraps the resulting binary with the correct `GDK_PIXBUF_MODULE_FILE` environment variable. Furthermore, it automatically handles the population of `XDG_DATA_DIRS`, rendering the previous manual `wrapProgram` execution in `postFixup` redundant. --- pkgs/by-name/sf/sfwbar/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sf/sfwbar/package.nix b/pkgs/by-name/sf/sfwbar/package.nix index aeeff1bdccf9..e4c511ce9424 100644 --- a/pkgs/by-name/sf/sfwbar/package.nix +++ b/pkgs/by-name/sf/sfwbar/package.nix @@ -16,6 +16,7 @@ makeWrapper, docutils, wayland-scanner, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -47,13 +48,9 @@ stdenv.mkDerivation (finalAttrs: { pkg-config makeWrapper wayland-scanner + wrapGAppsHook3 ]; - postFixup = '' - wrapProgram $out/bin/sfwbar \ - --suffix XDG_DATA_DIRS : $out/share - ''; - meta = { homepage = "https://github.com/LBCrion/sfwbar"; description = "Flexible taskbar application for wayland compositors, designed with a stacking layout in mind"; From f43a91afeadbd32ec50c85fd18923abec7efac2d Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Sat, 18 Apr 2026 12:47:30 -0700 Subject: [PATCH 137/246] xbindkeys-config: drop --- .../by-name/xb/xbindkeys-config/.editorconfig | 2 - pkgs/by-name/xb/xbindkeys-config/package.nix | 54 --------- .../xbindkeys-config-patch1.patch | 108 ------------------ .../xb/xbindkeys-config/xbindkeys-config.1 | 21 ---- pkgs/top-level/aliases.nix | 1 + 5 files changed, 1 insertion(+), 185 deletions(-) delete mode 100644 pkgs/by-name/xb/xbindkeys-config/.editorconfig delete mode 100644 pkgs/by-name/xb/xbindkeys-config/package.nix delete mode 100644 pkgs/by-name/xb/xbindkeys-config/xbindkeys-config-patch1.patch delete mode 100644 pkgs/by-name/xb/xbindkeys-config/xbindkeys-config.1 diff --git a/pkgs/by-name/xb/xbindkeys-config/.editorconfig b/pkgs/by-name/xb/xbindkeys-config/.editorconfig deleted file mode 100644 index 40706d3ac28e..000000000000 --- a/pkgs/by-name/xb/xbindkeys-config/.editorconfig +++ /dev/null @@ -1,2 +0,0 @@ -[xbindkeys-config.1] -trim_trailing_whitespace = unset diff --git a/pkgs/by-name/xb/xbindkeys-config/package.nix b/pkgs/by-name/xb/xbindkeys-config/package.nix deleted file mode 100644 index 41df8a5d8561..000000000000 --- a/pkgs/by-name/xb/xbindkeys-config/package.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - gtk2, - pkg-config, - procps, - makeWrapper, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xbindkeys-config"; - version = "0.1.3"; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - buildInputs = [ gtk2 ]; - - src = fetchurl { - url = "mirror://debian/pool/main/x/xbindkeys-config/xbindkeys-config_${finalAttrs.version}.orig.tar.gz"; - sha256 = "1rs3li2hyig6cdzvgqlbz0vw6x7rmgr59qd6m0cvrai8xhqqykda"; - }; - - hardeningDisable = [ "format" ]; - - meta = { - homepage = "https://packages.debian.org/source/xbindkeys-config"; - description = "Graphical interface for configuring xbindkeys"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ benley ]; - platforms = with lib.platforms; linux; - mainProgram = "xbindkeys-config"; - }; - - patches = [ ./xbindkeys-config-patch1.patch ]; - - # killall is dangerous on non-gnu platforms. Use pkill instead. - postPatch = '' - substituteInPlace middle.c --replace "killall" "pkill -x" - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - gzip -c ${./xbindkeys-config.1} > $out/share/man/man1/xbindkeys-config.1.gz - cp xbindkeys_config $out/bin/xbindkeys-config - wrapProgram $out/bin/xbindkeys-config --prefix PATH ":" "${procps}/bin" - ''; -}) diff --git a/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config-patch1.patch b/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config-patch1.patch deleted file mode 100644 index d4620b5d9071..000000000000 --- a/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config-patch1.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- - Makefile | 6 +++--- - menu.c | 11 ++++++++--- - middle.c | 9 +++++++-- - xbindkeys_config.c | 3 ++- - 4 files changed, 20 insertions(+), 9 deletions(-) - -diff --git a/Makefile b/Makefile -index 602875c..28e46cd 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,9 +1,9 @@ - # makefile crée par Laurent VUIBERT - --CC= gcc -O3 -Wall -+CC= gcc $(CFLAGS) - STD= _GNU_SOURCE --GTK= `gtk-config --cflags --libs` --GTK2= `gtk-config --cflags` -+GTK= `pkg-config --cflags --libs gtk+-2.0` -+GTK2= `pkg-config --cflags gtk+-2.0` - OBJS= xbindkeys_config.o menu.o middle.o speedc.o - NOM= xbindkeys_config - -diff --git a/menu.c b/menu.c -index ed3e7ec..f11526d 100644 ---- a/menu.c -+++ b/menu.c -@@ -283,6 +283,8 @@ void menu_manual (GtkMenuItem *menuitem, gpointer user_data) - GtkWidget *window; - GtkWidget *text; - GtkWidget *vbox; -+ GtkTextBuffer *textbuffer; -+ GtkTextIter iter; - - window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_window_set_title(GTK_WINDOW(window), -@@ -293,10 +295,13 @@ void menu_manual (GtkMenuItem *menuitem, gpointer user_data) - text = gtk_label_new("\nManual\n"); - gtk_box_pack_start(GTK_BOX(vbox), text, FALSE, FALSE, 0); - -- text = gtk_text_new(NULL,NULL); -+/* BDD - FIXME */ -+/* text = gtk_text_new(NULL,NULL); */ -+ text = gtk_text_view_new(); -+ textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); -+ gtk_text_buffer_get_iter_at_offset (textbuffer, &iter, 0); - -- -- gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL, -+ gtk_text_buffer_insert (textbuffer, &iter, - MANUAL_TEXT, sizeof(MANUAL_TEXT)-1); - gtk_box_pack_start(GTK_BOX(vbox), text, TRUE, TRUE, 0); - gtk_widget_set_usize(text,300,250); -diff --git a/middle.c b/middle.c -index daa61aa..605ab10 100644 ---- a/middle.c -+++ b/middle.c -@@ -551,6 +551,8 @@ void view_generated_file() - GtkWidget *window; - GtkWidget *text; - GtkWidget *src; -+ GtkTextBuffer *textbuffer; -+ GtkTextIter iter; - char line [1024]; - - unlink(TEMP_FILE); -@@ -561,11 +563,13 @@ void view_generated_file() - gtk_window_set_title(GTK_WINDOW(window), "Generated File"); - src = gtk_scrolled_window_new ( NULL, NULL ); - gtk_widget_set_usize(src,500,400); -- text = gtk_text_new (NULL, NULL); -+ text = gtk_text_view_new (); -+ textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); -+ gtk_text_buffer_get_iter_at_offset (textbuffer, &iter, 0); - gtk_container_add (GTK_CONTAINER(src), text); - - while (fgets (line, sizeof(line), f)) -- gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL, -+ gtk_text_buffer_insert (textbuffer, &iter, - line, strlen(line)); - - gtk_container_add(GTK_CONTAINER(window),src); -@@ -610,6 +614,7 @@ void save_file(char file_out[]) - fprintf(f, "# m:xxx + c:xxx \n"); - fprintf(f, "# Shift+... \n\n\n\n\n"); - -+ - if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Flag_NumLock))) - fprintf(f,"keystate_numlock = enable\n"); - else -diff --git a/xbindkeys_config.c b/xbindkeys_config.c -index 75bad30..3c02a2b 100644 ---- a/xbindkeys_config.c -+++ b/xbindkeys_config.c -@@ -95,7 +95,8 @@ int main (int argc, char *argv[]) - accel_group = gtk_accel_group_new(); - menu=xbindkeys_config_menu(accel_group); - gtk_box_pack_start(GTK_BOX(vbox),menu,FALSE,FALSE,0); -- gtk_accel_group_attach(accel_group, GTK_OBJECT(window)); -+/* BDD - FIXME - Don't need this? */ -+/* gtk_accel_group_attach(accel_group, GTK_OBJECT(window)); */ - - middle= xbindkeys_config_middle(); - gtk_box_pack_start(GTK_BOX(vbox),middle,TRUE,TRUE,0); --- -2.1.3 - diff --git a/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config.1 b/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config.1 deleted file mode 100644 index e3f8de1a8046..000000000000 --- a/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config.1 +++ /dev/null @@ -1,21 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.27. -.TH XBINDKEYS_CONFIG "1" "April 2002" "xbindkeys-config" "User Commands" -.SH NAME -xbindkeys-config \- GTK+ configuration tool for xbindkeys -.SH "SYNOPSIS" -xbindkeys-config -[\-\-file|\-f file] -[\-\-help|\-h] -[\-\-show|\-s] -.TP -\fB\-h\fR, \fB\-\-help\fR -This Help -.TP -\fB\-f\fR, \fB\-\-file\fR -Use an alternative rc file -.TP -\fB\-s\fR, \fB\-\-show\fR -show only the rc file -.SH AUTHOR -This manual page was written by Joerg Jaspert , -for the Debian GNU/Linux system (but may be used by others). diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 76007cb15d3c..66deca90d9ef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2117,6 +2117,7 @@ mapAliases { wxGTK33 = wxwidgets_3_3; # Added 2025-07-20 wxSVG = warnAlias "'wxSVG' has been renamed to 'wxsvg'" wxsvg; Xaw3d = warnAlias "'Xaw3d' has been renamed to 'libxaw3d'" libxaw3d; # Added 2026-02-12 + xbindkeys-config = throw "'xbindkeys-config' has been removed as it is broken and unmaintained upstream"; # Added 2026-04-18 xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28 xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12 xcb-util-cursor = libxcb-cursor; # Added 2026-02-04 From e390b6c148abde9014a92d8da245efc956c3cfbc Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sat, 18 Apr 2026 21:56:47 +0200 Subject: [PATCH 138/246] opencryptoki: 3.25.0 -> 3.26.0-unstable-2026-04-09 diff: https://github.com/opencryptoki/opencryptoki/compare/v3.25.0...ed378f463ef73364c89feb0fc923f4dc867332a3 fixes: CVE-2026-40253 --- pkgs/by-name/op/opencryptoki/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencryptoki/package.nix b/pkgs/by-name/op/opencryptoki/package.nix index fec8f764047c..6d4ca5a70087 100644 --- a/pkgs/by-name/op/opencryptoki/package.nix +++ b/pkgs/by-name/op/opencryptoki/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "opencryptoki"; - version = "3.25.0"; + version = "3.26.0-unstable-2026-04-09"; src = fetchFromGitHub { owner = "opencryptoki"; repo = "opencryptoki"; - tag = "v${finalAttrs.version}"; - hash = "sha256-JIDy5LY2rJqMM1uWDWn6Q62kJ+7pYU4G7zptkbyvf9Q="; + rev = "ed378f463ef73364c89feb0fc923f4dc867332a3"; + hash = "sha256-1DxlsjPoK3kIQkfguhOlzP2d7dneYRz/Qwp4cH30AhU="; }; nativeBuildInputs = [ From 94883689aa9b371264c555f3ea8979a7100fe309 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 19:59:21 +0000 Subject: [PATCH 139/246] mpich: 5.0.0 -> 5.0.1 --- pkgs/development/libraries/mpich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 9809da4aa0fb..ae7ca1448294 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -46,11 +46,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - hash = "sha256-6TUOMiJCg+lTEfIhNPNsmOPNHGZdF/riCmzJLtPP/hE="; + hash = "sha256-jBgyoT3azwcWhQafX639Hyh3op4aYoZSiSxlIRsfMyc="; }; patches = [ From 76e6acc5f10dfd3800a74113ae7518136323084d Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sat, 18 Apr 2026 22:07:57 +0200 Subject: [PATCH 140/246] siyuan: 3.6.3 -> 3.6.4 changelog: https://github.com/siyuan-note/siyuan/releases/tag/v3.6.4 diff: https://github.com/siyuan-note/siyuan/compare/v3.6.3...v3.6.4 fixes: CVE-2026-40318 --- pkgs/by-name/si/siyuan/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index feb88419c6e3..8ed473dbd84b 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -36,20 +36,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; tag = "v${finalAttrs.version}"; - hash = "sha256-zVBsnVqm38mEROtRChiNh9bJ/e8BP09CSxVS1wHVYZQ="; + hash = "sha256-dfM8mlZrfq8tqxwVL+TLGT26wLOzVJmw561eicFx2VY="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-nbHBBRSoFOm8/NJ+8ZsOJbHcTZ+Le0RCAbF1AKaPIbs="; + vendorHash = "sha256-TixhAJwIHQwCrA2kdpAN2vK6UeSzLMGfX85j2KtlPfQ="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_9; fetcherVersion = 3; - hash = "sha256-TrdP871uy1Ie4MQiqC1/RaseU42FosOO7m4k+UVXGHc="; + hash = "sha256-jvTDT0Uze+E3hQ9wU3RqKQ7RI9+OLQlewGd+kSHuZ34="; }; sourceRoot = "${finalAttrs.src.name}/app"; From ca2c6b2cf0adf26b8b13d99b375befc06b715db3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 20:51:15 +0000 Subject: [PATCH 141/246] saga: 9.11.4 -> 9.12.2 --- 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 ac6986725984..af721759e4e7 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.11.4"; + version = "9.12.2"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz"; - hash = "sha256-lnpHbcqLsD2C9RcRWt0aACro7dadq8wlaMPyrryNLsM="; + hash = "sha256-1q7/dBhmXSaj0bEGU8EAOJesR2sfnQPVK6DVL9TD3V0="; }; sourceRoot = "saga-${finalAttrs.version}/saga-gis"; From 52f9ed1028ea83bd8006b8c61df8ab6ea6e72dc5 Mon Sep 17 00:00:00 2001 From: mhem Date: Sat, 18 Apr 2026 23:25:43 +0200 Subject: [PATCH 142/246] jarl: 0.4.0 -> 0.5.0 --- pkgs/by-name/ja/jarl/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ja/jarl/package.nix b/pkgs/by-name/ja/jarl/package.nix index 918c701766c5..d5ea61807399 100644 --- a/pkgs/by-name/ja/jarl/package.nix +++ b/pkgs/by-name/ja/jarl/package.nix @@ -2,19 +2,20 @@ lib, rustPlatform, fetchFromGitHub, + git, versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "jarl"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "etiennebacher"; repo = "jarl"; tag = finalAttrs.version; - hash = "sha256-96ekjR0lcNhcmkEILYZd/QpeJl1pXJ2OBP4WyJ3AX90="; + hash = "sha256-MFP1xMNnJ9mfHuUu6hqE9B7nRgI2HfXBpblo3sFnAwo="; }; postPatch = '' @@ -24,7 +25,10 @@ rustPlatform.buildRustPackage (finalAttrs: { '(?:/nix)?/(?:build)/(?:nix[\-0-9]+/)?' ''; - cargoHash = "sha256-FfoYed147pR8fa2176vvFJmAiXMTGE/UVtT57rKuj9s="; + cargoHash = "sha256-Rhv9Wku/bRl28nrXYof+6VAgl2K4ysILRQa1v19r0pU="; + + # integrations test require git at build time (jarl >= 0.5.0) + nativeBuildInputs = [ git ]; # Don't run integration_tests for jarl-lsp, because it doesn't see # the CARGO_BIN_EXE_jarl env var even if exported in preCheck From f423bdd8d3768de255354f887ba41e416cd280e9 Mon Sep 17 00:00:00 2001 From: emily-lavender Date: Sat, 18 Apr 2026 14:53:18 -0700 Subject: [PATCH 143/246] deps-fnl: 0.2.5 -> 0.2.6 --- pkgs/by-name/de/deps-fnl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/deps-fnl/package.nix b/pkgs/by-name/de/deps-fnl/package.nix index 3bb25de12b6a..82aeae7a2a6a 100644 --- a/pkgs/by-name/de/deps-fnl/package.nix +++ b/pkgs/by-name/de/deps-fnl/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "deps.fnl"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitLab { owner = "andreyorst"; repo = "deps.fnl"; tag = version; - hash = "sha256-gUqi0g7myWTbjILN4RQqbeeaSYcg0oVJYNO0Gv9XzNY="; + hash = "sha256-FrFeRbfK4sHd3pjiVDMrE8IpDKptZuwkTLMQ9hppVRY="; }; dontBuild = true; From 370452b08b79910b4fb02c7db9fd374e0a358c21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 22:12:18 +0000 Subject: [PATCH 144/246] ostree: 2025.7 -> 2026.1 --- pkgs/by-name/os/ostree/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index f23dabf20bea..7ea3dd668d4d 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ostree"; - version = "2025.7"; + version = "2026.1"; outputs = [ "out" @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${finalAttrs.version}/libostree-${finalAttrs.version}.tar.xz"; - hash = "sha256-r40IC5WF5/0fq6jwIpZ+HCaK5i4g7PMu57NkweMHVws="; + hash = "sha256-jnfChd1vpexfsGMTA5CXe+cn/hEQczXth3ikA4UGnpU="; }; patches = [ From eec6ee817b0d3a49d30c696e956686ae17f38ad4 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 17 Apr 2026 20:18:27 +0200 Subject: [PATCH 145/246] qbz: 1.2.4 -> 1.2.7 For whatever reason the default cargo tauri install phase builds the Debian package and the application binary is pulled out from there. With version 1.2.7 it's also required to sign the Debian package if it's built and not specified otherwise. So, while updating to 1.2.7, also add `--no-sign` since this is not targeting Debian and this is less effort than creating a customized install phase. Signed-off-by: Felix Singer --- pkgs/by-name/qb/qbz/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/qb/qbz/package.nix b/pkgs/by-name/qb/qbz/package.nix index 9cf729e63add..cc3d071a2a1e 100644 --- a/pkgs/by-name/qb/qbz/package.nix +++ b/pkgs/by-name/qb/qbz/package.nix @@ -22,23 +22,25 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "qbz"; - version = "1.2.4"; + version = "1.2.7"; src = fetchFromGitHub { owner = "vicrodh"; repo = "qbz"; tag = "v${finalAttrs.version}"; - hash = "sha256-3MPWLovWRmSrSfaR5ciZR2+4S7QzPYYVdVKP+mczhis="; + hash = "sha256-/7gYjCfMJ1TmjogGQWkRDgDaUZ8o03hVNxZ21w4xniU="; }; - cargoHash = "sha256-jc/OZi93S0Hu3ywuwNgekyezJ1qCvxWpE60mTu0Y8jU="; + cargoHash = "sha256-Xk1v5QosIgzowLpo5L0qaSNFKqoL+kfQeA6KCIImK8M="; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; + tauriBuildFlags = [ "--no-sign" ]; + npmDeps = fetchNpmDeps { name = "qbz-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-JN3lQyEX1n5G1OcWuRNZl/KSfL7JEfsc4opeh4F/iAY="; + hash = "sha256-xBad4Ms5dlE0jHZ5iKLS2dEujgIZahfNfcknJH9qoXM="; }; env.LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; From 4d31c3a58d303a91c5285ae1c9ae95d2869e2ed9 Mon Sep 17 00:00:00 2001 From: Shaun Ren Date: Sat, 18 Apr 2026 18:21:52 -0400 Subject: [PATCH 146/246] tinyauth: 5.0.6 -> 5.0.7 --- pkgs/by-name/ti/tinyauth/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ti/tinyauth/package.nix b/pkgs/by-name/ti/tinyauth/package.nix index 25da0d6f6354..b70cf0f74a1c 100644 --- a/pkgs/by-name/ti/tinyauth/package.nix +++ b/pkgs/by-name/ti/tinyauth/package.nix @@ -2,7 +2,6 @@ lib, buildGoModule, fetchFromGitHub, - git, stdenvNoCC, bun, nixosTests, @@ -11,17 +10,16 @@ buildGoModule (finalAttrs: { pname = "tinyauth"; - version = "5.0.6"; + version = "5.0.7"; src = fetchFromGitHub { owner = "steveiliop56"; repo = "tinyauth"; tag = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-V75kjO34b1DBBI5aJMfn9finHSbVbWqQ34CH68gzrig="; + hash = "sha256-VeII5jSNUJpGZgqons1o1fp6KXxDOBhSMciSqtQfaC4="; }; - vendorHash = "sha256-iyduJgKt9OAkOY6J8J1GztCkYEssr/TcB43L6/Qdzmc="; + vendorHash = "sha256-XP+kVfcDKWAvBdrvGjiTdWh7jNe6qiDsgVjPrFFPoDU="; subPackages = [ "cmd/tinyauth" ]; @@ -37,10 +35,6 @@ buildGoModule (finalAttrs: { cp -r ${finalAttrs.frontend}/dist internal/assets/dist ''; - postPatch = '' - ${lib.getExe git} apply --directory paerser/ patches/nested_maps.diff - ''; - frontend = stdenvNoCC.mkDerivation { pname = "tinyauth-frontend"; inherit (finalAttrs) version src; @@ -83,7 +77,7 @@ buildGoModule (finalAttrs: { ''; outputHashMode = "recursive"; - outputHash = "sha256-pd5v5lD8Lyhf21OQvzjDTh63EcAe7E1OAoQuFGhAOX8="; + outputHash = "sha256-FRACDa1akm+JnYIRwNXRcomzDIMCIAlJDbjMyS77sNA="; }; passthru = { From acc5ae74745868427a2e74f53d1c0b6236aa04a9 Mon Sep 17 00:00:00 2001 From: Liam Murphy Date: Tue, 14 Apr 2026 08:50:53 +1000 Subject: [PATCH 147/246] gfan: disable hardening, enable tests `libcxxhardeningfast` was causing some of Sage's tests to fail on Darwin. I disabled it, and then enabled gfan's tests so that failures like this will be attributed to gfan itself in future. --- pkgs/by-name/gf/gfan/package.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gf/gfan/package.nix b/pkgs/by-name/gf/gfan/package.nix index 9c1d1864dc48..9ca8ed038811 100644 --- a/pkgs/by-name/gf/gfan/package.nix +++ b/pkgs/by-name/gf/gfan/package.nix @@ -35,7 +35,14 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - postPatch = lib.optionalString stdenv.cc.isClang '' + # This test assumes that our implementation of sort behaves identically to the + # one used during development, which is not necessarily the case; update the + # expected result to be sorted using our copy of sort. + postPatch = '' + sort testsuite/0008PolynomialSetUnion/output -o testsuite/0008PolynomialSetUnion/output + sort testsuite/0008PolynomialSetUnion/outputNew -o testsuite/0008PolynomialSetUnion/outputNew + '' + + lib.optionalString stdenv.cc.isClang '' substituteInPlace Makefile --replace "-fno-guess-branch-probability" "" for f in $(find -name "*.h" -or -name "*.cpp"); do @@ -53,6 +60,15 @@ stdenv.mkDerivation (finalAttrs: { mpir cddlib ]; + hardeningDisable = [ "libcxxhardeningfast" ]; + + doCheck = true; + # The test runner still exits successfully when there are failed tests, so check + # stdout to see if anything failed. + checkPhase = '' + make check | tee "$TMPDIR/test.log" + ! grep -q "Failed tests:" "$TMPDIR/test.log" + ''; meta = { description = "Software package for computing Gröbner fans and tropical varieties"; From dbc7c14bb37632faedd2cab2d0a44f099577c443 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Apr 2026 23:40:38 +0000 Subject: [PATCH 148/246] yo: 7.0.0 -> 7.0.1 --- pkgs/by-name/yo/yo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yo/yo/package.nix b/pkgs/by-name/yo/yo/package.nix index f8dd66a02a15..22fc4f11cc2c 100644 --- a/pkgs/by-name/yo/yo/package.nix +++ b/pkgs/by-name/yo/yo/package.nix @@ -8,16 +8,16 @@ buildNpmPackage (finalAttrs: { pname = "yo"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "yeoman"; repo = "yo"; tag = "v${finalAttrs.version}"; - hash = "sha256-tTT+KjJ8Fol2IjPzuWpkd3SymODe8Jmge9sreSxBU5M="; + hash = "sha256-Xj8rz7YQMbCW2Dzyojiz0r6fgEkNG8D7xsf3KqE2tX4="; }; - npmDepsHash = "sha256-bBGGZ5O4Nkw+nMZ5VAz7wjm8tIrCCvtv6TaXTwUCLPk="; + npmDepsHash = "sha256-sBQLgiVEIrgKDgFdDfFqm8kRyiiPw2tOpHhA7ah5UVw="; dontNpmBuild = true; From ee3587ebb50812223f199c122fb37db17dcb4c4a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 18:44:54 -0500 Subject: [PATCH 149/246] yabai: 7.1.18 -> 7.1.19 Changelog: https://github.com/asmvik/yabai/blob/v7.1.19/CHANGELOG.md --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 5cced3bfb69c..ca0a284b1193 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.18"; + version = "7.1.19"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/asmvik/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-DAMSbAO+Azb+3yyJidBHnB9JWALiW/rUItzBStzK6SU="; + hash = "sha256-IzVVJRKK2jV8ZwPLAyDR7EPU0QEh/g+LfHyjnYpC6KU="; }; "x86_64-darwin" = fetchFromGitHub { owner = "asmvik"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-go3CsFxJCHpEJ8EGv9B5pXt/1AifGLM8S5TIXkhKgDc="; + hash = "sha256-WNyd/GNS4+Ut0C+cvL0+WmdXr/4dgySJIyTIUpaBjUU="; }; }; From 15e2deb9ed1d27d020f0388830187797cd97799c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 00:47:42 +0000 Subject: [PATCH 150/246] beszel: 0.18.6 -> 0.18.7 --- pkgs/by-name/be/beszel/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix index fbbace20a7f3..0fc4f4a10241 100644 --- a/pkgs/by-name/be/beszel/package.nix +++ b/pkgs/by-name/be/beszel/package.nix @@ -8,13 +8,13 @@ }: buildGo126Module (finalAttrs: { pname = "beszel"; - version = "0.18.6"; + version = "0.18.7"; src = fetchFromGitHub { owner = "henrygd"; repo = "beszel"; tag = "v${finalAttrs.version}"; - hash = "sha256-CRO0Y3o3hwdE55D027fo0tvt9o7vsA1ooEBFlXuw2So="; + hash = "sha256-pVZ1ru9++BypZ3EwoE8clqJowXj1/CMiJxKaC+UY9VE="; }; webui = buildNpmPackage { @@ -48,10 +48,10 @@ buildGo126Module (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/internal/site"; - npmDepsHash = "sha256-509/n5OH4z6LZH+jlmDLl2DlqKrD7M5ajtalmF/4n1o="; + npmDepsHash = "sha256-mYAD8FrQwa+F/VgGxFpe8vqucfZaM0PmY+gJJqw1IKk="; }; - vendorHash = "sha256-g+UmoxBoCL3oGXNTY67Wz7y6FC/nkcS8020jhTq4JQE="; + vendorHash = "sha256-TVpZbK9V9/GqpVFcjF7QGD5XJJHzRgjVXZOImHQTR1k="; tags = [ "testing" ]; From 8614382655d0519e2b577e9e2054a452d6348685 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 01:15:51 +0000 Subject: [PATCH 151/246] termscp: 0.19.1 -> 1.0.0 --- pkgs/by-name/te/termscp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/termscp/package.nix b/pkgs/by-name/te/termscp/package.nix index f82092e3c5fc..9eb8c2f1927c 100644 --- a/pkgs/by-name/te/termscp/package.nix +++ b/pkgs/by-name/te/termscp/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "termscp"; - version = "0.19.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "veeso"; repo = "termscp"; tag = "v${finalAttrs.version}"; - hash = "sha256-/smeK7qCw1EgADc7bgC1xUep3hPj7gOddanbaTjbGgs="; + hash = "sha256-WsTvKQg6TULOlKOAYhdE1wEyAegFKEZFN83QBSX0WdY="; }; - cargoHash = "sha256-zVkShePjUzagP8MAG5oq6hqm+lHxH++ufXkmetN+jvA="; + cargoHash = "sha256-Z39YCN2x7FM/rkcQ/DFnx5iLho0bWD/zaUxhAlN2T1k="; nativeBuildInputs = [ pkg-config From 41aa6e713c83a56e06078d06551e46c258497923 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 01:34:57 +0000 Subject: [PATCH 152/246] limine-full: 11.3.1 -> 11.4.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 9b0236119a3b..b24e31ee9e4a 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 = "11.3.1"; + version = "11.4.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://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-7vst33RyAn6q0tJNLvmrEigVFM+exUaj46dZ3y2GVOc="; + hash = "sha256-2ZEZgQPznh7BvE5OLxno/4aH49tzME3ffuOENKQ8IaA="; }; enableParallelBuilding = true; From 017cc27f4bcb88a6aeb26d02c83e93557e86c13d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 01:36:04 +0000 Subject: [PATCH 153/246] s7: 11.8-unstable-2026-04-08 -> 11.8-unstable-2026-04-17 --- pkgs/by-name/s7/s7/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 49b82b18eb30..151cadf6d03c 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.8-unstable-2026-04-08"; + version = "11.8-unstable-2026-04-17"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "efc7d6d94f538fa38c0dc51b967fb561bca63bbb"; - hash = "sha256-MUP68vOhX+u4Smihe5bMIM5Kf6QCa1TMvKavaUIpX3o="; + rev = "57121b5633e0b276c8f13f5abb3cde0db1229d69"; + hash = "sha256-dbc2H5HML4q3UI9QixykvXlg7SGudMC4Grf9ASsCcG0="; }; buildInputs = From b1d8fb01d513e8eb393b5d19ca3487b8e3ca4e83 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 20:39:52 -0500 Subject: [PATCH 154/246] sketchybar-app-font: 2.0.58 -> 2.0.60 --- pkgs/by-name/sk/sketchybar-app-font/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index 046c55b5c71c..4f593faa9c08 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -10,13 +10,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "2.0.58"; + version = "2.0.60"; src = fetchFromGitHub { owner = "kvndrsslr"; repo = "sketchybar-app-font"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q140vSaHkyddxUQut/r8LGuBvTel6kpcpZwqWRP0h8s="; + hash = "sha256-6fi3v+h3i5J1j4xDP1QUlGfrY8o9kiXtMCWmYZ9zgng="; }; pnpmDeps = fetchPnpmDeps { From 1a3b22261d3f51ba611d209dd1642b8735af403e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 20:44:01 -0500 Subject: [PATCH 155/246] yabai: 7.1.19 -> 7.1.20 Changelog: https://github.com/asmvik/yabai/blob/v7.1.20/CHANGELOG.md --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index ca0a284b1193..7055943dedda 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.19"; + version = "7.1.20"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/asmvik/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-IzVVJRKK2jV8ZwPLAyDR7EPU0QEh/g+LfHyjnYpC6KU="; + hash = "sha256-lJZerEV1Qg0nZhOFWtJG1c2RZhcert5SBjlKRAxqDPQ="; }; "x86_64-darwin" = fetchFromGitHub { owner = "asmvik"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-WNyd/GNS4+Ut0C+cvL0+WmdXr/4dgySJIyTIUpaBjUU="; + hash = "sha256-g1LnrpX+t3yubX6CIRUxQ1vTp2vr242uvhj5empZoHI="; }; }; From bf224aefe90eb756196562e13adaf9898b3b9631 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 2 Apr 2026 19:08:52 -0400 Subject: [PATCH 156/246] llvm: fix version >=20 on armv6l We were removing a test that failed on armv6l. In LLVM 20, this test was moved to a different directory, causing the build to fail. It is not clear if the test still needs to be removed after this reorganization, and I don't have hardware that can do a native armv6l build of LLVM. --- .../compilers/llvm/common/llvm/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index dc105d0e51f1..d5dcd4d58cce 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -351,10 +351,13 @@ stdenv.mkDerivation ( rm test/tools/llvm-objcopy/MachO/universal-object.test '' + - # Seems to require certain floating point hardware (NEON?) - optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' - rm test/ExecutionEngine/frem.ll - '' + # Seems to require certain floating point hardware (NEON?). Tests were + # reorganized in LLVM 20. + optionalString + (stdenv.hostPlatform.system == "armv6l-linux" && lib.versionOlder release_version "20") + '' + rm test/ExecutionEngine/frem.ll + '' + # 1. TODO: Why does this test fail on FreeBSD? # It seems to reference /usr/local/lib/libfile.a, which is clearly a problem. From 8a140b583d0b0df5778f26c7ac13421509046692 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 02:26:40 +0000 Subject: [PATCH 157/246] twinejs: 2.11.1 -> 2.12.0 --- pkgs/by-name/tw/twinejs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tw/twinejs/package.nix b/pkgs/by-name/tw/twinejs/package.nix index fb0a3fdb9461..5f5a5d138e74 100644 --- a/pkgs/by-name/tw/twinejs/package.nix +++ b/pkgs/by-name/tw/twinejs/package.nix @@ -14,16 +14,16 @@ buildNpmPackage (finalAttrs: { pname = "twine"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "klembot"; repo = "twinejs"; tag = finalAttrs.version; - hash = "sha256-+y25XxTRxmCKjNL74Wb3hgAkw8yQNznYNzTuDL3uIvg="; + hash = "sha256-3/0pEzN90ZAeAoN7i+f604DvJl4VaQWkoOia1r5yQZY="; }; - npmDepsHash = "sha256-9gMdbFibt6RwMxEsBAQE7nM0rfE7PqgUxTs87+g0Ok8="; + npmDepsHash = "sha256-k2OHeLcGcVCurTSefEqtqwUzolZ72rKA4WRFJifUPyY="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"; From 63ca6ee74c743933a9cab1c6e053e6de0ed8c62e Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 18 Apr 2026 22:49:21 -0400 Subject: [PATCH 158/246] ci/OWNERS: add figsoda as an owner of nvim-treesitter --- ci/OWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/OWNERS b/ci/OWNERS index b8fc4ecf920c..027559c13299 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -376,6 +376,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # VimPlugins /pkgs/applications/editors/vim/plugins @NixOS/neovim +## nvim-treesitter +/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @figsoda +/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter @figsoda # VsCode Extensions /pkgs/applications/editors/vscode/extensions From 521aca79b337535d9cb32a55df6d0ccf36733f4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 02:50:55 +0000 Subject: [PATCH 159/246] python3Packages.utitools: 0.4.0 -> 0.5.0 --- pkgs/development/python-modules/utitools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/utitools/default.nix b/pkgs/development/python-modules/utitools/default.nix index 0a1b48894f28..77586f27fb29 100644 --- a/pkgs/development/python-modules/utitools/default.nix +++ b/pkgs/development/python-modules/utitools/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "utitools"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "RhetTbull"; repo = "utitools"; tag = "v${finalAttrs.version}"; - hash = "sha256-oI+a+sc9+qi7aFP0dLINAQekib/9pZm10A5jhVIHWvo="; + hash = "sha256-mx9vcMCeDTJyWJKm0Ci9IEAPCNfx9NvPGC8cuNYnH1M="; }; build-system = [ flit-core ]; From 8ee30ab891fc61a84fa07804a222ead1a8b7fb33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 03:37:45 +0000 Subject: [PATCH 160/246] cosmic-ext-applet-caffeine: 0-unstable-2026-01-11 -> 0-unstable-2026-04-18 --- pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix index 2aafef8ee74a..299d3a72123a 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-caffeine"; - version = "0-unstable-2026-01-11"; + version = "0-unstable-2026-04-18"; src = fetchFromGitHub { owner = "tropicbliss"; repo = "cosmic-ext-applet-caffeine"; - rev = "f101f568c5e6bd5c1acbd1f32a09026898cd5a4c"; - hash = "sha256-tnuNOuTUdwGnS3mIHs5K4ByA6C9uymDTqYDwevJVNFw="; + rev = "96f7be5de71a460b9c26ec024bb8089208ad991f"; + hash = "sha256-wdsm6snDY61+sJfzKkLDGVbAm5mC0lWDCTlDdImTwO8="; }; cargoHash = "sha256-9EUrO8JNU0FPrqT6WDE+jfVgQSgODK8rbNZLgUb26EQ="; From cc0bea1d36488c4e6b17a5f9290edbafe6a0d1ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 03:58:02 +0000 Subject: [PATCH 161/246] cloudflare-cli: 5.1.2 -> 5.1.4 --- pkgs/by-name/cl/cloudflare-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloudflare-cli/package.nix b/pkgs/by-name/cl/cloudflare-cli/package.nix index a95c112f3c95..eb8643a3399e 100644 --- a/pkgs/by-name/cl/cloudflare-cli/package.nix +++ b/pkgs/by-name/cl/cloudflare-cli/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cloudflare-cli"; - version = "5.1.2"; + version = "5.1.4"; src = fetchFromGitHub { owner = "danielpigott"; repo = "cloudflare-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-KDL9UGsBVH+BxeMwpcwqH0P0Y8QbFMSqNT5FrTZxDog="; + hash = "sha256-UGXouKsFA4GCFgjsf5smQ1xsibPFiBqkdsqNDLAy2GM="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-30zvP1sYENfTh8o/RiSrYPZR3to3GF2m036q/+mrcSU="; + hash = "sha256-2NgmL04czIj/uj/KzdEDc4PdzUVVRty3MSZ9IwqRMOk="; }; nativeBuildInputs = [ From 004e3403088f1efb18fec65df314af2a97e14276 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 04:10:02 +0000 Subject: [PATCH 162/246] webdav: 5.11.5 -> 5.11.6 --- pkgs/by-name/we/webdav/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index cda2eadfd9db..b8da03e924a4 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "webdav"; - version = "5.11.5"; + version = "5.11.6"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; tag = "v${finalAttrs.version}"; - hash = "sha256-Al1rl6Ez36I3qE++1ZOvTgey9lfHp0SVzK6KJQSPBYc="; + hash = "sha256-iTBh6cH7is7UnbbXhn+z/Tnvq5//Jdt1OlPHNfICVUw="; }; - vendorHash = "sha256-JctG+gkZtjlSX616Rv3rC7RU9YBNWp9LsD5Ut8qn1tY="; + vendorHash = "sha256-L98EShwiysMYXhI6aQut5bfMr76CwY1U06iOgG+jtCY="; __darwinAllowLocalNetworking = true; From 84722287720290b616244af08983c64bfa319d28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 04:16:21 +0000 Subject: [PATCH 163/246] terraform-providers.gitlabhq_gitlab: 18.10.0 -> 18.11.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 e354cf6f8514..1f1948306cd3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -436,13 +436,13 @@ "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA=" }, "gitlabhq_gitlab": { - "hash": "sha256-BDgNtPtK43O9PlQVmGqWj3Vtv18p9KlIfl+zky1pYlw=", + "hash": "sha256-0zU1HXGs+4qJ/IYePgX3uE7/i7vV85nXD1jiwKasgxA=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v18.10.0", + "rev": "v18.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-3A8nlFIdxUVUUnW8D//7FR3/ic3iAPiH1xRIMC1IUhY=" + "vendorHash": "sha256-a82yKFb82R6mlts5X2igussJTBldNAtwaz35QIe/hSk=" }, "go-gandi_gandi": { "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=", From 38704fd7ae43a26a42045efef42a210585bb503d Mon Sep 17 00:00:00 2001 From: ccicnce113424 Date: Sat, 11 Apr 2026 10:44:20 +0800 Subject: [PATCH 164/246] hmcl: add libxkbcommon and jdk 25, don't use system glfw by default LWJGL uses its own glfw fork, and Minecraft 26.1 will crash if you use the system one. For those who prefer to use Wayland, you can add `-DMC_DEBUG_ENABLED` and `-DMC_DEBUG_PREFER_WAYLAND` on JVM arguments to enable Wayland support, and LWJGL requires libxkbcommon to work on Wayland. For those who still need system glfw, you can enable it in the advanced settings of HMCL. --- pkgs/by-name/hm/hmcl/package.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 1192c1935d42..b1fbd152a13c 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -10,7 +10,7 @@ copyDesktopItems, desktopToDarwinBundle, jdk, - jdk17, + jdk25, hmclJdk ? jdk.override { # Required by jar file enableJavaFX = true; @@ -21,13 +21,14 @@ }, minecraftJdks ? [ hmclJdk - jdk17 + jdk25 ], libxxf86vm, libxtst, libxrandr, libxext, libxcursor, + libxkbcommon, libx11, xrandr, glib, @@ -152,6 +153,7 @@ stdenv.mkDerivation (finalAttrs: { libxxf86vm libxext libxcursor + libxkbcommon libxrandr libxtst libpulseaudio @@ -192,7 +194,6 @@ stdenv.mkDerivation (finalAttrs: { lib.makeBinPath (minecraftJdks ++ lib.optional stdenv.hostPlatform.isLinux xrandr) }" \ --run 'cd $HOME' \ - ${lib.optionalString stdenv.hostPlatform.isLinux ''--prefix JAVA_TOOL_OPTIONS " " "-Dorg.lwjgl.glfw.libname=${lib.getLib glfw3'}/lib/libglfw.so"''} \ ''${gappsWrapperArgs[@]} ''; @@ -212,6 +213,15 @@ stdenv.mkDerivation (finalAttrs: { Hello Minecraft! Launcher (HMCL) is a free, open-source, and cross-platform Minecraft launcher. It provides comprehensive support for managing multiple game versions and mod loaders, including Forge, NeoForge, Fabric, Quilt, LiteLoader, and OptiFine. + + Starting with Minecraft 26.1, Wayland support can be enabled + by adding the JDK arguments -DMC_DEBUG_ENABLED and + -DMC_DEBUG_PREFER_WAYLAND. If needed, configure them in + HMCL -> Advanced Settings -> JVM Options -> JVM Arguments. + + Users who are still on an older version and want to use Wayland should + enable HMCL -> Advanced Settings -> Workaround -> Use System GLFW. + Otherwise, keep it disabled. ''; maintainers = with lib.maintainers; [ daru-san From ef4ec75a15edf67ad9464e8f26051b4ebde0daef Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 24 Nov 2020 22:21:47 +0700 Subject: [PATCH 165/246] gforth: fix cross-compilation Co-authored-by: Artturin --- pkgs/by-name/gf/gforth/package.nix | 44 ++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix index 4ff19e15c911..bed387a3214a 100644 --- a/pkgs/by-name/gf/gforth/package.nix +++ b/pkgs/by-name/gf/gforth/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - callPackage, + buildPackages, autoreconfHook, gitUpdater, texinfo, @@ -11,8 +11,8 @@ }: let - swig = callPackage ./swig.nix { }; - bootForth = callPackage ./boot-forth.nix { }; + swig = buildPackages.callPackage ./swig.nix { }; + bootForth = buildPackages.callPackage ./boot-forth.nix { }; lispDir = "${placeholder "out"}/share/emacs/site-lisp"; in stdenv.mkDerivation (finalAttrs: { @@ -32,9 +32,14 @@ stdenv.mkDerivation (finalAttrs: { writableTmpDirAsHomeHook autoreconfHook texinfo - bootForth swig - ]; + ] + ++ ( + if (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) then + [ buildPackages.gforth ] + else + [ bootForth ] + ); buildInputs = [ libffi @@ -47,12 +52,41 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "--build=x86_64-apple-darwin" + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + # Tries to run ./engine/gforth-ll + "--without-check" + # Use build-platform CC for helper programs that must run during build + "HOSTCC=${buildPackages.stdenv.cc}/bin/cc" + # Tell gforth's libcc where to find the cross compiler + "CROSS_PREFIX=${stdenv.hostPlatform.config}-" + ]; + + env = lib.optionalAttrs (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) { + # Tell gforth's libcc to prefix compiler commands with the cross-compilation target + CROSS_PREFIX = "${stdenv.hostPlatform.config}-"; + }; + + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "DITCENGINE=${buildPackages.gforth}/bin/gforth-ditc" + "GFORTH=${buildPackages.gforth}/bin/gforth" + "ENGINE=${buildPackages.gforth}/bin/gforth" # for ./preforth ]; preConfigure = '' mkdir -p ${lispDir} ''; + postConfigure = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # Put the project-local (cross-aware) libtool first in PATH + mkdir -p .cross-bin + ln -sf "$PWD/libtool" .cross-bin/libtool + ln -sf "$PWD/libtool" ".cross-bin/${stdenv.hostPlatform.config}-libtool" + export PATH="$PWD/.cross-bin:$PATH" + # Remove 'check' from the default 'all' target (can't run cross binaries) + sed -i 's/^\(all:.*\) check/\1/' Makefile + ''; + passthru.updateScript = gitUpdater { }; meta = { From 0baecb75a110fc52f126b21fc5ef0c1694e2e0ff Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Sun, 19 Apr 2026 13:44:24 +0800 Subject: [PATCH 166/246] hyprlock: 0.9.4 -> 0.9.5 Changelog: https://github.com/hyprwm/hyprlock/releases/tag/v0.9.5 Diff: https://github.com/hyprwm/hyprlock/compare/v0.9.4...v0.9.5 --- pkgs/by-name/hy/hyprlock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 6cc042a5c152..ffe0dcaf6d75 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -28,13 +28,13 @@ gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; rev = "v${finalAttrs.version}"; - hash = "sha256-/r7jqBLcm3NSkqVYk8AE8b/qWKo8AKgzX3y2yLZeGvg="; + hash = "sha256-VFlM1cN4jmUAbfmZbeg7vL+AN9miXEUqqpk5EkHNq2c="; }; nativeBuildInputs = [ From 8a3e020943e0411a15a269d4368ae8b35b1532b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 07:25:30 +0000 Subject: [PATCH 167/246] slint-lsp: 1.15.1 -> 1.16.0 --- pkgs/by-name/sl/slint-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix index 66d90684952c..ab92351ab10e 100644 --- a/pkgs/by-name/sl/slint-lsp/package.nix +++ b/pkgs/by-name/sl/slint-lsp/package.nix @@ -18,14 +18,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "slint-lsp"; - version = "1.15.1"; + version = "1.16.0"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-WaxvwKtRwUjO0SqODDYXrtU5C10htuXBuTnolYUwl0w="; + hash = "sha256-2VO0gVqPPJjPlLxEtYL27YcC2YaStNbI3osU8k3ZYT4="; }; - cargoHash = "sha256-Wat4jcvqHz+hL49UAs5wOGZvRiIdIlOvUndginz2okc="; + cargoHash = "sha256-H58mVzgWh2KW+v1h8tyFQYYZVM2iE0MBlPr6CzDc5aU="; rpathLibs = [ fontconfig From cf5396021ffaa2b1f69e63d3001ad2c0ecf5cb39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 07:28:58 +0000 Subject: [PATCH 168/246] lazydocker: 0.25.0 -> 0.25.2 --- pkgs/by-name/la/lazydocker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazydocker/package.nix b/pkgs/by-name/la/lazydocker/package.nix index 430c35e411e2..99171a46f077 100644 --- a/pkgs/by-name/la/lazydocker/package.nix +++ b/pkgs/by-name/la/lazydocker/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "lazydocker"; - version = "0.25.0"; + version = "0.25.2"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ZZl0gt0gNjEI3JC96Xc29SZAyKh15jCuGHyEanIwNwY="; + sha256 = "sha256-MHSZ0O8LPx1SOhrUK0sh73jDvDvu31Qsw+yjsTMQN/Y="; }; vendorHash = null; From 7da52f27b7319664c1fc218b4dc172635338671a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 08:11:51 +0000 Subject: [PATCH 169/246] python3Packages.niquests: 3.18.5 -> 3.18.6 --- pkgs/development/python-modules/niquests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix index bec4c7a7dc7a..a8c3805f49ee 100644 --- a/pkgs/development/python-modules/niquests/default.nix +++ b/pkgs/development/python-modules/niquests/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "niquests"; - version = "3.18.5"; + version = "3.18.6"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "niquests"; tag = "v${version}"; - hash = "sha256-1fljGr5b3OYtcaGg/Qq2W78FWORB1lXRtqaBlxTGTDI="; + hash = "sha256-hJD5hI/qvYo31eu05fhDZhgRNTbbGJnFE293HM+TuIA="; }; build-system = [ hatchling ]; From 55e4ebc1caebd9aef373cbd396027ff48ffddb13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 08:14:33 +0000 Subject: [PATCH 170/246] cannelloni: 2.0.0 -> 2.0.1 --- pkgs/by-name/ca/cannelloni/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cannelloni/package.nix b/pkgs/by-name/ca/cannelloni/package.nix index 2d52d39f4831..beb9eca9c14d 100644 --- a/pkgs/by-name/ca/cannelloni/package.nix +++ b/pkgs/by-name/ca/cannelloni/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "cannelloni"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "mguentner"; repo = "cannelloni"; tag = "v${finalAttrs.version}"; - hash = "sha256-b3pBC2XFK+pyONvnkPw/0YUXAG2cRD1OaN7k2ONzFV8="; + hash = "sha256-lHZmsgtIL7edODXV8lWfVwMhnS40n9wD8iVyAzJycbA="; }; nativeBuildInputs = [ From 70a747a8abe9684c42ecdd5ff54b53bd53b4c65a Mon Sep 17 00:00:00 2001 From: Pascal Dietrich Date: Sun, 19 Apr 2026 11:16:48 +0200 Subject: [PATCH 171/246] rgx: 0.10.2 -> 0.12.0 --- pkgs/by-name/rg/rgx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rg/rgx/package.nix b/pkgs/by-name/rg/rgx/package.nix index d5c0a4692d81..4f62aa8ac97b 100644 --- a/pkgs/by-name/rg/rgx/package.nix +++ b/pkgs/by-name/rg/rgx/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rgx"; - version = "0.10.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "brevity1swos"; repo = "rgx"; tag = "v${finalAttrs.version}"; - hash = "sha256-lZA8Tfyneg8cnBeCf0abgPr9232a1OGBfOJEBnU2l+s="; + hash = "sha256-JLFJGMwKQqkrVwck6gd79AzSVL0fRHJ8jo73+EEdYlA="; }; - cargoHash = "sha256-DOIQaqoUkR1KpQURC89PRds0wJkroSYufbKz62rjSB4="; + cargoHash = "sha256-D609cDiJ+L/iGtC9dKwU5dgz4+X3//6qiFjWixBBqhg="; buildInputs = [ pcre2 ]; From 7da10ecc5dd852a1e25b2552238b0c7cf733d25b Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 19 Apr 2026 12:04:32 +0200 Subject: [PATCH 172/246] canaille: 0.2.4 -> 0.2.7 Changelog: https://gitlab.com/yaal/canaille/-/blob/0.2.7/CHANGES.rst --- pkgs/by-name/ca/canaille/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/canaille/package.nix b/pkgs/by-name/ca/canaille/package.nix index f3f04e511d0b..691f2b09065e 100644 --- a/pkgs/by-name/ca/canaille/package.nix +++ b/pkgs/by-name/ca/canaille/package.nix @@ -12,14 +12,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "canaille"; - version = "0.2.4"; + version = "0.2.7"; pyproject = true; src = fetchFromGitLab { owner = "yaal"; repo = "canaille"; tag = version; - hash = "sha256-iCiQvB+wYpm/Cns63kjo2wVGnSbcQHWo3UJvi0xJf50="; + hash = "sha256-hreEjMrD6mRapgrSDPRWcmqfLxfsOpK7dC8lHJkAY7Y="; }; build-system = with python.pkgs; [ @@ -107,7 +107,10 @@ python.pkgs.buildPythonApplication rec { scim2-client scim2-models ]; - ldap = [ python-ldap ]; + ldap = [ + ldappool + python-ldap + ]; sentry = [ sentry-sdk ]; postgresql = [ flask-alembic From a1e64ff70e2835323d217283e4d63d8a534690cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 10:18:22 +0000 Subject: [PATCH 173/246] sampo: 0.17.3 -> 0.17.4 --- pkgs/by-name/sa/sampo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/sampo/package.nix b/pkgs/by-name/sa/sampo/package.nix index aaa697d14708..37e2834096c2 100644 --- a/pkgs/by-name/sa/sampo/package.nix +++ b/pkgs/by-name/sa/sampo/package.nix @@ -9,20 +9,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sampo"; - version = "0.17.3"; + version = "0.17.4"; src = fetchFromGitHub { owner = "bruits"; repo = "sampo"; tag = "sampo-v${finalAttrs.version}"; - hash = "sha256-g/cl24IUTQ2Tqxfzfsx3yxCgsbiFOUWKy1JisUhQ3wg="; + hash = "sha256-P+CekuDM3u+iG2HmCNWxZoTCaKtAUMnrNre4zeGNPrQ="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-wd76EJeKrUH/h6Net3vwROw83sXjAPXX0N1ckYDMulc="; + cargoHash = "sha256-udMpH0LWNqPTORSb1/c686stgvti5shx/O9rcH7YZNs="; cargoBuildFlags = [ "-p" From bb8e1c54e9b912154d7dc2fbb17f0e2c82f90f27 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 9 Nov 2025 22:17:25 +0100 Subject: [PATCH 174/246] lib.licenses: add compound licenses --- ci/OWNERS | 2 +- lib/default.nix | 2 +- lib/licenses/default.nix | 7 ++ lib/licenses/helpers.nix | 152 +++++++++++++++++++++++++++++ lib/{ => licenses}/licenses.nix | 1 + lib/licenses/operators.nix | 110 +++++++++++++++++++++ pkgs/stdenv/generic/check-meta.nix | 6 +- 7 files changed, 277 insertions(+), 3 deletions(-) create mode 100644 lib/licenses/default.nix create mode 100644 lib/licenses/helpers.nix rename lib/{ => licenses}/licenses.nix (99%) create mode 100644 lib/licenses/operators.nix diff --git a/ci/OWNERS b/ci/OWNERS index b8fc4ecf920c..1b4b3e68ef9b 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -268,7 +268,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/applications/editors/jetbrains @leona-ya @theCapypara # Licenses -/lib/licenses.nix @alyssais @emilazy @jopejoe1 +/lib/licenses @alyssais @emilazy @jopejoe1 # Qt /pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel diff --git a/lib/default.nix b/lib/default.nix index 15949d1cdf36..751738a98965 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -73,7 +73,7 @@ let types = callLibs ./types.nix; # constants - licenses = callLibs ./licenses.nix; + licenses = callLibs ./licenses; sourceTypes = callLibs ./source-types.nix; systems = callLibs ./systems; diff --git a/lib/licenses/default.nix b/lib/licenses/default.nix new file mode 100644 index 000000000000..7e260e98833f --- /dev/null +++ b/lib/licenses/default.nix @@ -0,0 +1,7 @@ +{ lib }: +let + licenses = import ./licenses.nix { inherit lib; }; + operators = import ./operators.nix; + helpers = import ./helpers.nix { inherit lib; }; +in +licenses // operators // helpers diff --git a/lib/licenses/helpers.nix b/lib/licenses/helpers.nix new file mode 100644 index 000000000000..b234515284f8 --- /dev/null +++ b/lib/licenses/helpers.nix @@ -0,0 +1,152 @@ +{ lib }: +rec { + /** + Evaluate a license expression for a given predicate. + + # Example + + ```nix + evaluateProperty (x: x.free) true (with lib.licenses; AND [ ncsa (WITH asl20 llvm-exception) ]) + ``` + # Type + + ``` + evaluateProperty :: Function -> Bool -> AttrSet -> Bool + ``` + + # Arguments + + - [predicate] checks for each license included in the license expression + - [permissive] whether to apply checks permissive or reciprocal + - [license] license expression to check + */ + evaluateProperty = + predicate: permissive: license: + let + OR = if permissive then lib.any else lib.all; + AND = if permissive then lib.all else lib.any; + in + if license.licenseType == "simple" then + predicate license + else if license.licenseType == "compound" then + if license.operator == "OR" then + OR (x: evaluateProperty predicate permissive x) license.licenses + else if license.operator == "AND" then + AND (x: evaluateProperty predicate permissive x) license.licenses + else + throw "Unknown license operator" + else if license.licenseType == "exception" then + AND (x: evaluateProperty predicate permissive x) [ + license.license + license.exception + ] + else if license.licenseType == "plus" then + evaluateProperty predicate permissive license.license + else + throw "Unknown license type or legacy license"; + + /** + Check whether a license expression is free. + + # Example + + ```nix + isFree (with lib.licenses; (AND [ ncsa (WITH asl20 llvm-exception) ])) + => true + ``` + + # Type + + ``` + isFree :: AttrSet -> Bool + ``` + + # Arguments + + - [license] License expression to check if free + */ + isFree = evaluateProperty (x: x.free) true; + + /** + Check whether a license expression is redistributable. + + # Example + + ```nix + isRedistributable (with lib.licenses; (AND [ ncsa (WITH asl20 llvm-exception) ])) + => true + ``` + + # Type + + ``` + isRedistributable :: AttrSet -> Bool + ``` + + # Arguments + + - [license] License expression to check if redistributable + */ + isRedistributable = evaluateProperty (x: x.redistributable) true; + + /** + Check whether any of the given licenses is required in the license expression. + + # Example + + ```nix + containsLicenses [ lib.licenses.asl20 ] (with lib.licenses; (AND [ ncsa (WITH asl20 llvm-exception) ])) + => true + ``` + + # Type + + ``` + containsLicenses :: List -> AttrSet -> Bool + ``` + + # Arguments + + - [licenses] List of licenses to look + - [license] License expression to check + */ + containsLicenses = licenses: evaluateProperty (x: lib.lists.elem x licenses) false; + + /** + Convert a license expression to an SPDX license expression string. + + # Example + + ```nix + toSPDX (with lib.licenses; AND [ ncsa (WITH asl20 llvm-exception) ]) + => "NCSA AND (Apache-2.0 WITH LLVM-exception)" + ``` + + # Type + + ``` + toSPDX :: AttrSet -> String + ``` + + # Arguments + + - [license] License expression which to convert to spdx expression + */ + toSPDX = + license: + let + mkBracket = + x: + if x.licenseType == "compound" || x.licenseType == "exception" then "(${toSPDX x})" else toSPDX x; + in + if license.licenseType == "simple" then + license.spdxId or "LicenseRef-nixos-${license.shortName}" + else if license.licenseType == "compound" then + lib.concatMapStringsSep " ${license.operator} " (x: mkBracket x) license.licenses + else if license.licenseType == "exception" then + "${mkBracket license.license} ${license.operator} ${mkBracket license.exception}" + else if license.licenseType == "plus" then + "${mkBracket license.license}${license.operator}" + else + throw "Unknown license type"; +} diff --git a/lib/licenses.nix b/lib/licenses/licenses.nix similarity index 99% rename from lib/licenses.nix rename to lib/licenses/licenses.nix index 416891232e84..56f29b690495 100644 --- a/lib/licenses.nix +++ b/lib/licenses/licenses.nix @@ -21,6 +21,7 @@ let deprecated redistributable ; + licenseType = "simple"; } // optionalAttrs (attrs ? spdxId) { inherit spdxId; diff --git a/lib/licenses/operators.nix b/lib/licenses/operators.nix new file mode 100644 index 000000000000..c7dab4a1469a --- /dev/null +++ b/lib/licenses/operators.nix @@ -0,0 +1,110 @@ +{ + /** + This should be used when there is a choice of which license expression to use. + This is a disjunctive binary "OR" operator. + + # Example + + ```nix + OR [ lib.licenses.mit lib.licenses.asl20 ] + => { licenseType = "compound"; operator = "OR"; licenses = [ lib.licenses.mit lib.licenses.asl20 ] }; + ``` + + # Type + + ``` + OR :: List -> AttrSet + ``` + + # Arguments + + - [licenses] Possible licenses to choose from + */ + OR = licenses: { + licenseType = "compound"; + operator = "OR"; + inherit licenses; + }; + + /** + Create a compound licenses where the user needs to follow both licenses, + eqivialent of spdx `and` modifier. + + # Example + + ```nix + AND [ lib.licenses.mit lib.licenses.asl20 ] + => { licenseType = "compound"; operator = "AND"; licenses = [ lib.licenses.mit lib.licenses.asl20 ] }; + ``` + + # Type + + ``` + AND :: List -> AttrSet + ``` + + # Arguments + + - [licenses] Licenses required to use + */ + AND = licenses: { + licenseType = "compound"; + operator = "AND"; + inherit licenses; + }; + + /** + Create a licenses exception where a license has a license exception, + eqivialent of spdx `with` modifier. + + # Example + + ```nix + WITH lib.licenses.lgpl21Only lib.licenses.ocamlLgplLinkingException + => { licenseType = "exception"; operator = "WITH"; license = lib.licenses.lgpl21Only; exception = lib.licenses.ocamlLgplLinkingException; }; + ``` + + # Type + + ``` + WITH :: AttrSet -> AttrSet -> AttrSet + ``` + + # Arguments + + - [license] License to which the exception applies + - [exception] Exception to apply + */ + WITH = license: exception: { + licenseType = "compound"; + operator = "WITH"; + inherit license exception; + }; + + /** + Create a licenses which can be upgraded to any later version of itself, + eqivialent of spdx `+` modifier + + # Example + + ```nix + PLUS lib.licenses.lgpl21Only + => { licenseType = "plus"; operator = "+"; license = lib.licenses.lgpl21Only; }; + ``` + + # Type + + ``` + PLUS :: AttrSet -> AttrSet + ``` + + # Arguments + + - [license] License to wich apply an exception + */ + PLUS = license: { + licenseType = "plus"; + operator = "+"; + inherit license; + }; +} diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index fbf72005f92d..6c3a49c4957c 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -90,6 +90,8 @@ let && ( if isList attrs.meta.license then any (l: elem l list) attrs.meta.license + else if attrs.meta.license ? "type" then + lib.licenses.containsLicenses list attrs.meta.license else elem attrs.meta.license list ); @@ -103,7 +105,9 @@ let isUnfree = licenses: - if isAttrs licenses then + if isAttrs licenses && licenses ? "type" then + !(lib.licenses.isFree licenses) + else if isAttrs licenses then !(licenses.free or true) # TODO: Returning false in the case of a string is a bug that should be fixed. # In a previous implementation of this function the function body From dbdb37908f5393fb4dc5ebcae799f86f72b0f27c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 22 Jan 2026 20:36:13 +0100 Subject: [PATCH 175/246] lib/tests: add tests for lib.licenses --- lib/licenses/operators.nix | 6 +-- lib/tests/misc.nix | 99 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 3 deletions(-) diff --git a/lib/licenses/operators.nix b/lib/licenses/operators.nix index c7dab4a1469a..db7cc25d37c6 100644 --- a/lib/licenses/operators.nix +++ b/lib/licenses/operators.nix @@ -76,7 +76,7 @@ - [exception] Exception to apply */ WITH = license: exception: { - licenseType = "compound"; + licenseType = "exception"; operator = "WITH"; inherit license exception; }; @@ -88,8 +88,8 @@ # Example ```nix - PLUS lib.licenses.lgpl21Only - => { licenseType = "plus"; operator = "+"; license = lib.licenses.lgpl21Only; }; + PLUS lib.licenses.eupl11 + => { licenseType = "plus"; operator = "+"; license = lib.licenses.eupl11; }; ``` # Type diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index da0979756720..916994152754 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -5012,4 +5012,103 @@ runTests { testReplaceElemAtOutOfRange = testingThrow (lib.replaceElemAt [ 1 2 3 ] 5 "a"); testReplaceElemAtNegative = testingThrow (lib.replaceElemAt [ 1 2 3 ] (-1) "a"); + + testIsFree = { + expr = lib.licenses.isFree ( + lib.licenses.AND [ + (lib.licenses.mit) + (lib.licenses.OR [ + lib.licenses.free + lib.licenses.unfree + ]) + (lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception) + (lib.licenses.PLUS lib.licenses.eupl11) + ] + ); + expected = true; + }; + + testIsUnfree = { + expr = lib.licenses.isFree ( + lib.licenses.AND [ + (lib.licenses.mit) + (lib.licenses.OR [ lib.licenses.unfree ]) + (lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception) + (lib.licenses.PLUS lib.licenses.eupl11) + ] + ); + expected = false; + }; + + testIsRedistributable = { + expr = lib.licenses.isRedistributable ( + lib.licenses.AND [ + (lib.licenses.mit) + (lib.licenses.OR [ + lib.licenses.free + lib.licenses.unfree + ]) + (lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception) + (lib.licenses.PLUS lib.licenses.eupl11) + ] + ); + expected = true; + }; + + testIsUnredistributable = { + expr = lib.licenses.isRedistributable ( + lib.licenses.AND [ + (lib.licenses.mit) + (lib.licenses.OR [ lib.licenses.unfree ]) + (lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception) + (lib.licenses.PLUS lib.licenses.eupl11) + ] + ); + expected = false; + }; + + testContainsLicenses = { + expr = lib.licenses.containsLicenses [ lib.licenses.mit ] ( + lib.licenses.AND [ + (lib.licenses.mit) + (lib.licenses.OR [ + lib.licenses.free + lib.licenses.unfree + ]) + (lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception) + (lib.licenses.PLUS lib.licenses.eupl11) + ] + ); + expected = true; + }; + + testToSPDX = { + expr = lib.licenses.toSPDX ( + lib.licenses.AND [ + (lib.licenses.mit) + (lib.licenses.OR [ + lib.licenses.free + lib.licenses.unfree + ]) + (lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception) + (lib.licenses.PLUS lib.licenses.eupl11) + ] + ); + expected = "MIT AND (LicenseRef-nixos-free OR LicenseRef-nixos-unfree) AND (Apache-2.0 WITH LLVM-exception) AND EUPL-1.1+"; + }; + + testEvaluateProperty = { + expr = lib.licenses.evaluateProperty (x: x.deprecated) true ( + lib.licenses.AND [ + (lib.licenses.mit) + (lib.licenses.OR [ + lib.licenses.free + lib.licenses.unfree + ]) + (lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception) + (lib.licenses.PLUS lib.licenses.eupl11) + ] + ); + expected = false; + }; } From f32b0250a690c5aceb0fbe033c896a1a1bc7ca70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 10:23:51 +0000 Subject: [PATCH 176/246] linuxKernel.kernels.linux_zen: 6.19.11 -> 6.19.12 --- 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 ff52460e235e..e0a48a836268 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -18,7 +18,7 @@ in buildLinux ( args // rec { - version = "6.19.11"; + version = "6.19.12"; pname = "linux-zen"; modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; isZen = true; @@ -27,7 +27,7 @@ buildLinux ( owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "15ja0f4dvlnvibajvyfvv1x2w5spy0dfyfzrzz3hp3dm0k87cfi4"; + sha256 = "062qr3j5c3v4khv20q7g8lmrrvvg8708wwy02z3vygany43k3rgb"; }; # This is based on the following source: From baf97485d9bfd2255839b5b7d67ca2ce69979383 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 9 Nov 2025 22:44:56 +0100 Subject: [PATCH 177/246] llvm: make use of compound licenses --- .../compilers/llvm/common/common-let.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix index 84fd098ff3fa..d8b636feac5d 100644 --- a/pkgs/development/compilers/llvm/common/common-let.nix +++ b/pkgs/development/compilers/llvm/common/common-let.nix @@ -12,19 +12,19 @@ rec { llvm_meta = { license = with lib.licenses; - [ ncsa ] - ++ - # Contributions after June 1st, 2024 are only licensed under asl20 and - # llvm-exception: https://github.com/llvm/llvm-project/pull/92394 - lib.optionals (lib.versionAtLeast release_version "19") [ - asl20 - llvm-exception - ]; + # Contributions after June 1st, 2024 are only licensed under asl20 and + # llvm-exception: https://github.com/llvm/llvm-project/pull/92394 + if lib.versionAtLeast release_version "19" then + AND [ + ncsa + (WITH asl20 llvm-exception) + ] + else + ncsa; teams = [ lib.teams.llvm lib.teams.security-review ]; - # See llvm/cmake/config-ix.cmake. platforms = lib.platforms.aarch64 From 3bb920fac878cb23555a8eb79fbc40fbcf93a2f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 10:31:41 +0000 Subject: [PATCH 178/246] python3Packages.photutils: 2.3.0 -> 3.0.0 --- pkgs/development/python-modules/photutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index f440f0b626c6..cac5da8657e8 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "photutils"; - version = "2.3.0"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "astropy"; repo = "photutils"; tag = version; - hash = "sha256-VPiirM1eaIRnb0ED6ZyIgu1BLI3TKVtqCf7bDawC/kA="; + hash = "sha256-jfmC3pAQa/PrdEUa7QSYGW5zWzX43ghYCpmgRYup/Ks="; }; build-system = [ From c0b1550760f07c15589f22b7eacdd4a1763434fe Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sun, 19 Apr 2026 12:33:22 +0200 Subject: [PATCH 179/246] uutils-coreutils: symlink multicall aliases to fix closure size Upstream commit fb76aba95b35 changed the default LN from `ln -sf` to `ln -f`, so each utility alias is now a hardlink to the 14 MiB multicall binary. NAR serialization does not preserve hardlinks, so every alias is stored and downloaded as a full copy, taking the closure from ~61 MiB to ~1.5 GiB. https://github.com/uutils/coreutils/commit/fb76aba95b35bf12b0175d67e4b10b2f9910c5df --- pkgs/by-name/uu/uutils-coreutils/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 3a77aad6cd87..7d41c40b9c72 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -86,6 +86,10 @@ stdenv.mkDerivation (finalAttrs: { env = { CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + # Upstream uses hardlinks for the multicall aliases by default, but NAR + # serialization does not preserve hardlinks, exploding the closure to + # ~100 copies of the 14 MiB binary. + LN = "ln -sf"; } // lib.optionalAttrs selinuxSupport { SELINUX_INCLUDE_DIR = "${lib.getInclude libselinux}/include"; From bf9fbbc7154dc080245a54756a281b639940a703 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 19 Apr 2026 12:48:38 +0200 Subject: [PATCH 180/246] rcu: Drop OPNA2608 from meta.maintainers My support period expired, so I can't continue updating & maintaining new versions of this software. --- pkgs/by-name/rc/rcu/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 7ada33d6bec9..701f9c6c7129 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -187,7 +187,6 @@ python3Packages.buildPythonApplication rec { homepage = "http://www.davisr.me/projects/rcu/"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ - OPNA2608 m0streng0 ]; hydraPlatforms = [ ]; # requireFile used as src From 89ad9afe537050399845361a9da96b2b8b93021a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 10:54:11 +0000 Subject: [PATCH 181/246] typora: 1.13.2 -> 1.13.4 --- pkgs/by-name/ty/typora/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix index ac2fb3873462..b86c2fc588ea 100644 --- a/pkgs/by-name/ty/typora/package.nix +++ b/pkgs/by-name/ty/typora/package.nix @@ -20,7 +20,7 @@ let pname = "typora"; - version = "1.13.2"; + version = "1.13.4"; passthru = { sources = { @@ -29,21 +29,21 @@ let "https://download.typora.io/linux/typora_${version}_amd64.deb" "https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb" ]; - hash = "sha256-oMb57//kg8TldZpWD0kaNYhveDe9MXHu9IMeuIvGcq4="; + hash = "sha256-aEgp0j6HGZePKwc21LvMpmXk7S5cgcUttpxl3fQw9ak="; }; aarch64-linux = fetchurl { urls = [ "https://download.typora.io/linux/typora_${version}_arm64.deb" "https://downloads.typoraio.cn/linux/typora_${version}_arm64.deb" ]; - hash = "sha256-fa/jvmhQ/tx3JWCDwNxRW+WTXnLYD+WrJoGJmes0JKs="; + hash = "sha256-hvEsnkjbEhZVOIGKGh9RloUBicKpSMzzBGMFtc+3EAk="; }; aarch64-darwin = fetchurl { urls = [ "https://download.typora.io/mac/Typora-${version}.dmg" "https://downloads.typoraio.cn/mac/Typora-${version}.dmg" ]; - hash = "sha256-3wPZAuU2EE62M0F3TQw6aX5cHdeUmJuASWnlbMVmgss="; + hash = "sha256-3IyOFTLDkd43Tij1B1Tw0epZ8HwMiNMJHQJAGHCcP84="; }; }; updateScript = ./update.sh; From 17fa4476062f8abf712c27590679a76c24952b21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 10:55:45 +0000 Subject: [PATCH 182/246] duckdb: 1.5.1 -> 1.5.2 --- pkgs/by-name/du/duckdb/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/du/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json index 14c629fe5313..6b16dcfd94a2 100644 --- a/pkgs/by-name/du/duckdb/versions.json +++ b/pkgs/by-name/du/duckdb/versions.json @@ -1,6 +1,6 @@ { - "version": "1.5.1", - "rev": "7dbb2e646fea939a89f10a55aa98c474cbb0c098", - "hash": "sha256-FygBpfhvezvUbI969Dta+vZOPt6BnSW2d5gO4I4oB2A=", - "python_hash": "sha256-ZB+Zcxg5VjBzfTkQk7TxoP9pw+hvOXpB2qqnqqmjhxM=" + "version": "1.5.2", + "rev": "8a5851971fae891f292c2714d86046ee018e9737", + "hash": "sha256-FWoVF7s/n28NN1HtnO0Cr3YyoIDgJcWBtBiO7vWiSOU=", + "python_hash": "sha256-B14dXW5pPnToiKbSD9ACzNksIhBG+ui1P9l67Qyke8o=" } From efda700bc26762b26938131f22de70aa2938a0b4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 19 Apr 2026 14:29:12 +0300 Subject: [PATCH 183/246] texpresso: set strictDeps and split to buildInputs Should have been done correctly in the init commit of it (#299168). --- pkgs/by-name/te/texpresso/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/te/texpresso/package.nix b/pkgs/by-name/te/texpresso/package.nix index ddda76c43b6d..6ee830876cdd 100644 --- a/pkgs/by-name/te/texpresso/package.nix +++ b/pkgs/by-name/te/texpresso/package.nix @@ -33,8 +33,13 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "LDCC=g++" "LDCC=${stdenv.cc.targetPrefix}c++" ''; + strictDeps = true; + nativeBuildInputs = [ makeWrapper + ]; + + buildInputs = [ mupdf SDL2 re2c From cab006059b55c82dd5ca7434dd005669db171a4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 11:36:18 +0000 Subject: [PATCH 184/246] python3Packages.actron-neo-api: 0.5.1 -> 0.5.4 --- pkgs/development/python-modules/actron-neo-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/actron-neo-api/default.nix b/pkgs/development/python-modules/actron-neo-api/default.nix index 2fced01e209c..7c82d159a8fd 100644 --- a/pkgs/development/python-modules/actron-neo-api/default.nix +++ b/pkgs/development/python-modules/actron-neo-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "actron-neo-api"; - version = "0.5.1"; + version = "0.5.4"; pyproject = true; src = fetchFromGitHub { owner = "kclif9"; repo = "actronneoapi"; tag = "v${version}"; - hash = "sha256-TEKRQQbmcDjHuZOte4fqZqLkw4Eo8FUgoyui3Mg8CqA="; + hash = "sha256-XyX9o1fIyY5TZqLzK1a+KLkLDVEorw2illg+lHutLtc="; }; build-system = [ From c6609fee1bbcd9e76485d1da0d8039646c741c9b Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sun, 19 Apr 2026 13:55:06 +0200 Subject: [PATCH 185/246] neovim-unwrapped: keep test-only lua modules out of runtime closure Since #509368 flipped doCheck to true, busted/coxpcall/penlight/etc. are added to neovimLuaEnv, which sits in buildInputs and has its lib path baked into bin/nvim. busted's wrapper references luarocks_bootstrap, whose own wrapper carries cmake/zip/unzip on PATH, so cmake (61M) ends up in neovim's runtime closure. Split the lua package set: neovimLuaEnv (runtime, in buildInputs) gets only lpeg/luabitop/mpack; the check-only modules go into neovimLuaEnvOnBuild (LUA_PRG, build-time only). Add the build env to disallowedRequisites so this can't regress. Closure: 192M -> 94M. --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 51 ++++++++++++-------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 1990d31ae0d8..693d34d9d909 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -64,26 +64,29 @@ stdenv.mkDerivation ( })) else luapkgs.lpeg; - requiredLuaPkgs = + runtimeLuaPkgs = ps: [ + (nvim-lpeg-dylib ps) + ps.luabitop + ps.mpack + ]; + checkLuaPkgs = ps: - ( - with ps; - [ - (nvim-lpeg-dylib ps) - luabitop - mpack - ] - ++ lib.optionals finalAttrs.finalPackage.doCheck [ - luv - coxpcall - busted - luafilesystem - penlight - inspect - ] - ); - neovimLuaEnv = lua.withPackages requiredLuaPkgs; - neovimLuaEnvOnBuild = lua.luaOnBuild.withPackages requiredLuaPkgs; + runtimeLuaPkgs ps + ++ (with ps; [ + luv + coxpcall + busted + luafilesystem + penlight + inspect + ]); + # neovimLuaEnv ends up in buildInputs and its lib path is baked into the + # nvim binary, so it must only contain runtime modules; otherwise + # busted -> luarocks -> cmake leak into the runtime closure. + neovimLuaEnv = lua.withPackages runtimeLuaPkgs; + neovimLuaEnvOnBuild = lua.luaOnBuild.withPackages ( + if finalAttrs.finalPackage.doCheck then checkLuaPkgs else runtimeLuaPkgs + ); codegenLua = if lua.luaOnBuild.pkgs.isLuaJIT then let @@ -207,7 +210,15 @@ stdenv.mkDerivation ( -e "s|\$ Date: Sun, 19 Apr 2026 14:06:20 +0200 Subject: [PATCH 186/246] python3Packages.utitools: fix changelog --- pkgs/development/python-modules/utitools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/utitools/default.nix b/pkgs/development/python-modules/utitools/default.nix index 77586f27fb29..f003e336e480 100644 --- a/pkgs/development/python-modules/utitools/default.nix +++ b/pkgs/development/python-modules/utitools/default.nix @@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Utilities for working with Uniform Type Identifiers"; homepage = "https://github.com/RhetTbull/utitools"; - changelog = "https://github.com/RhetTbull/osxphotos/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + changelog = "https://github.com/RhetTbull/utitools/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; From 063cd2c310560289a068f07df532d92e807c3472 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 12:22:40 +0000 Subject: [PATCH 187/246] distgen: 2.2 -> 2.3 --- pkgs/by-name/di/distgen/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/distgen/package.nix b/pkgs/by-name/di/distgen/package.nix index 58378a3f3da5..90d85f3f986d 100644 --- a/pkgs/by-name/di/distgen/package.nix +++ b/pkgs/by-name/di/distgen/package.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "distgen"; - version = "2.2"; + version = "2.3"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-w+/aiLv5NCQFD0ItlC+Wy9BuvA/ndDQcLf6Iyb9trF4="; + hash = "sha256-EDRCGf4laHZs//E3w5FxlkuTfbVLxnaGmQF/xjwaKDQ="; }; build-system = with python3.pkgs; [ From 00a0c18b115b86efefcbd77487601c709b0f2466 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 12:31:53 +0000 Subject: [PATCH 188/246] zkar: 1.5.1 -> 1.6.0 --- pkgs/by-name/zk/zkar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zk/zkar/package.nix b/pkgs/by-name/zk/zkar/package.nix index 3f3958b25c16..eea73a032e64 100644 --- a/pkgs/by-name/zk/zkar/package.nix +++ b/pkgs/by-name/zk/zkar/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "zkar"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "phith0n"; repo = "zkar"; tag = "v${finalAttrs.version}"; - hash = "sha256-xnj3GOZoLPE/kyGgi5i2o61P7Snt0L0JRGHLGNQDLRI="; + hash = "sha256-7vpcfmUu/dmQILpO/WRtM92UrUMrZHBNWIM9CoH81as="; }; vendorHash = "sha256-Eyi22d6RkIsg6S5pHXOqn6kULQ/mLeoaxSxxJJkMgIQ="; From 7d834b6fe543583513e9cd5f39d05f872d3161ee Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 19 Apr 2026 15:43:38 +0300 Subject: [PATCH 189/246] python3.pkgs.plopp: 26.3.1 -> 26.4.0 Diff: https://github.com/scipp/plopp/compare/26.3.1...26.4.0 --- pkgs/development/python-modules/plopp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plopp/default.nix b/pkgs/development/python-modules/plopp/default.nix index c9d83bceb510..63d7d9d2abc7 100644 --- a/pkgs/development/python-modules/plopp/default.nix +++ b/pkgs/development/python-modules/plopp/default.nix @@ -36,14 +36,14 @@ buildPythonPackage (finalAttrs: { pname = "plopp"; - version = "26.3.1"; + version = "26.4.0"; pyproject = true; src = fetchFromGitHub { owner = "scipp"; repo = "plopp"; tag = finalAttrs.version; - hash = "sha256-A8F2Gd0HmHRlusScFoFulsFaqaXA/HxmtT8ODdRLA+U="; + hash = "sha256-qjuhM0/qrGIZw00DOnaGODGHqzGn4r3gIAguJS5OPZ8="; }; build-system = [ From 852d868fe65d8cdda0d004e4cc48fda7a69658c8 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 19 Apr 2026 14:43:00 +0200 Subject: [PATCH 190/246] coreboot-utils: mark nvramtool x86 only accessors/cmos-hw-unix.c is only implemented for x86, else there is a stub, but that fails to compile. Fixes: https://github.com/NixOS/nixpkgs/issues/488459 --- pkgs/tools/misc/coreboot-utils/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index e1fa3c2b1b1d..0c0969c71f1e 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -110,6 +110,10 @@ let pname = "nvramtool"; meta.description = "Read and write coreboot parameters and display information from the coreboot table in CMOS/NVRAM"; meta.mainProgram = "nvramtool"; + meta.platforms = [ + "x86_64-linux" + "i686-linux" + ]; }; superiotool = generic { pname = "superiotool"; From d6db6d5512ef36f11e74bb78991a087ebf5a54f9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 19 Apr 2026 15:50:35 +0300 Subject: [PATCH 191/246] python314Packages.plopp: improve comment of disabledTests --- pkgs/development/python-modules/plopp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/plopp/default.nix b/pkgs/development/python-modules/plopp/default.nix index 63d7d9d2abc7..e9f0eff94a96 100644 --- a/pkgs/development/python-modules/plopp/default.nix +++ b/pkgs/development/python-modules/plopp/default.nix @@ -75,7 +75,7 @@ buildPythonPackage (finalAttrs: { ]; disabledTests = lib.optionals (pythonAtLeast "3.14") [ - # RuntimeError: There is no current event loop in thread 'MainThread' + # https://github.com/scipp/plopp/issues/508 "test_move_cut" "test_value_cuts" ]; From 7ccf0f93e59c6ccffd9c3743b93c99118c7241c9 Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Sun, 19 Apr 2026 14:57:13 +0200 Subject: [PATCH 192/246] okapi-ed: add nadir-ishiguro to maintainers --- pkgs/by-name/ok/okapi-ed/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ok/okapi-ed/package.nix b/pkgs/by-name/ok/okapi-ed/package.nix index 2c0b9fbdc1f5..1148d36991b6 100644 --- a/pkgs/by-name/ok/okapi-ed/package.nix +++ b/pkgs/by-name/ok/okapi-ed/package.nix @@ -37,6 +37,9 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.asl20; mainProgram = "okapi"; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ toelke ]; + maintainers = with lib.maintainers; [ + toelke + nadir-ishiguro + ]; }; }) From c1f8fc71c5eaa3bd0a0dc2c62fbbe5464e43c0a0 Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Sun, 19 Apr 2026 14:57:31 +0200 Subject: [PATCH 193/246] okapi-ed: add nix-update-script passthru, changelog --- pkgs/by-name/ok/okapi-ed/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ok/okapi-ed/package.nix b/pkgs/by-name/ok/okapi-ed/package.nix index 1148d36991b6..9c34d48ebbb7 100644 --- a/pkgs/by-name/ok/okapi-ed/package.nix +++ b/pkgs/by-name/ok/okapi-ed/package.nix @@ -5,6 +5,7 @@ ripgrep, rustPlatform, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; @@ -31,9 +32,12 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Find lines across files by regex and edit them all at once with your $EDITOR"; homepage = "https://github.com/nk9/okapi"; + changelog = "https://github.com/nk9/okapi/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; mainProgram = "okapi"; platforms = lib.platforms.unix; From 005dd766197bc2ad50f1f5119c6e0f50a7d4628f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 14:07:59 +0000 Subject: [PATCH 194/246] terraform-providers.aliyun_alicloud: 1.275.0 -> 1.276.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 1f1948306cd3..7560ecc05933 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-qjtyg+b3CfF24us0Fqw1KqKEbuoqL4eLe4QCuIAp4SE=" }, "aliyun_alicloud": { - "hash": "sha256-xdWoc0unJDM7WL3t1AoDBzwPgByij9g9hEoNSOxJtxs=", + "hash": "sha256-pOoFxaAB1x2G89AsnCK7D2q6hTgfMiwE+zfdKZh3bgE=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.275.0", + "rev": "v1.276.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Kk0YeStlev8AurZasORMe/42Rd3ZPFoFMat/rMpZFbE=" + "vendorHash": "sha256-Y/r9gdvPhN27nve+IZyqypZkvCXHE7Ox31JLDQd9l4k=" }, "aminueza_minio": { "hash": "sha256-rAdHPVw/G5uO/67yLOohHvO3/KxjyQkIpagKPd0vMOQ=", From fbe7adab164fbf9b89d1bac4c4484c3257a0840f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 19 Apr 2026 09:10:28 -0500 Subject: [PATCH 195/246] yabai: 7.1.20 -> 7.1.21 Changelog: https://github.com/asmvik/yabai/blob/v7.1.21/CHANGELOG.md --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 7055943dedda..81114c4e2523 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.20"; + version = "7.1.21"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/asmvik/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-lJZerEV1Qg0nZhOFWtJG1c2RZhcert5SBjlKRAxqDPQ="; + hash = "sha256-VEvuF1NkAeR1AlBdSwW0xFHLh73cwNVBE+5xyAGJcH0="; }; "x86_64-darwin" = fetchFromGitHub { owner = "asmvik"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-g1LnrpX+t3yubX6CIRUxQ1vTp2vr242uvhj5empZoHI="; + hash = "sha256-I1A9L5zXIg4qVAM84DjdF2zGjSSPiJtw2K6D+iKVDLs="; }; }; From d9b3863b3d5e02c8b3f31be589d461e25796b6d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 14:24:43 +0000 Subject: [PATCH 196/246] python3Packages.aioamazondevices: 13.4.2 -> 13.4.3 --- 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 6ad913beca89..5072a31cd6cb 100644 --- a/pkgs/development/python-modules/aioamazondevices/default.nix +++ b/pkgs/development/python-modules/aioamazondevices/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "aioamazondevices"; - version = "13.4.2"; + version = "13.4.3"; pyproject = true; src = fetchFromGitHub { owner = "chemelli74"; repo = "aioamazondevices"; tag = "v${version}"; - hash = "sha256-df5f6meoMvrvS1d0U9M1XRXYC6t4e0AEmxfHOGD58CM="; + hash = "sha256-AH5edWwVEMo/TpnVbcOEC/oYI4DOQ5nqFfoFKeoI3Ok="; }; build-system = [ poetry-core ]; From a8eca96edb54dde86c6a23116a505773b86b1bc6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 19 Apr 2026 14:31:18 +0300 Subject: [PATCH 197/246] texpresso: small semantic changes --- pkgs/by-name/te/texpresso/package.nix | 48 ++++++++++++++++----------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/te/texpresso/package.nix b/pkgs/by-name/te/texpresso/package.nix index 6ee830876cdd..5427a98ddd5b 100644 --- a/pkgs/by-name/te/texpresso/package.nix +++ b/pkgs/by-name/te/texpresso/package.nix @@ -1,19 +1,25 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, + + # nativeBuildInputs makeWrapper, - writeScript, - mupdf, - SDL2, - re2c, + + # buildInputs freetype, - jbig2dec, - harfbuzz, - openjpeg, gumbo, + harfbuzz, + jbig2dec, libjpeg, + mupdf, + openjpeg, + re2c, + SDL2, + + # passthru callPackage, + writeScript, }: stdenv.mkDerivation (finalAttrs: { @@ -40,28 +46,30 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - mupdf - SDL2 - re2c freetype - jbig2dec - harfbuzz - openjpeg gumbo + harfbuzz + jbig2dec libjpeg + mupdf + openjpeg + re2c + SDL2 ]; - buildFlags = [ "texpresso" ]; + buildFlags = [ + "texpresso" + ]; - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.hostPlatform.isDarwin [ + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-function-declaration" - ] - ); + ]; + }; installPhase = '' runHook preInstall - install -Dm0755 -t "$out/bin/" "build/texpresso" + install -D -t "$out/bin/" "build/texpresso" runHook postInstall ''; From 75ec8afea2e1e8d0317c36f540c2d555851a41a7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 12 Apr 2026 12:22:48 +0300 Subject: [PATCH 198/246] texpresso: 0.1 -> 0.1-unstable-2026-04-02 The main improvement of this update, is this: https://github.com/let-def/texpresso/pull/102 Which allows us to avoid maintaining yet another derivation. --- pkgs/by-name/te/texpresso/package.nix | 50 ++++++++++---------------- pkgs/by-name/te/texpresso/tectonic.nix | 42 ---------------------- 2 files changed, 19 insertions(+), 73 deletions(-) delete mode 100644 pkgs/by-name/te/texpresso/tectonic.nix diff --git a/pkgs/by-name/te/texpresso/package.nix b/pkgs/by-name/te/texpresso/package.nix index 5427a98ddd5b..894dc5ea9b51 100644 --- a/pkgs/by-name/te/texpresso/package.nix +++ b/pkgs/by-name/te/texpresso/package.nix @@ -5,60 +5,65 @@ # nativeBuildInputs makeWrapper, + pkg-config, + writeShellScriptBin, # buildInputs + fontconfig, freetype, - gumbo, harfbuzz, + icu, jbig2dec, libjpeg, mupdf, - openjpeg, - re2c, SDL2, - - # passthru - callPackage, - writeScript, }: stdenv.mkDerivation (finalAttrs: { pname = "texpresso"; - version = "0.1"; + version = "0.1-unstable-2026-04-02"; src = fetchFromGitHub { owner = "let-def"; repo = "texpresso"; - tag = "v${finalAttrs.version}"; - hash = "sha256-d+wNQIysn3hdTQnHN9MJbFOIhJQ0ml6PoeuwsryntTI="; + rev = "96f008c94ece067fac8e896d0ab1808c948a4dd3"; + hash = "sha256-ew7n3Sp4uYLv5jijRW2rRM9s63TQCeFgKXmmBXdYjx4="; }; postPatch = '' substituteInPlace Makefile \ --replace-fail "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" \ --replace-fail "LDCC=g++" "LDCC=${stdenv.cc.targetPrefix}c++" + substituteInPlace src/engine/Makefile \ + --replace-fail "_CC?=gcc" "_CC?=${stdenv.cc.targetPrefix}cc" \ + --replace-fail "_LD?=g++" "_LD?=${stdenv.cc.targetPrefix}c++" \ + --replace-fail "_CXX?=g++" "_CXX?=${stdenv.cc.targetPrefix}c++" ''; strictDeps = true; nativeBuildInputs = [ makeWrapper + pkg-config + # Especially for Darwin builds, we pretend we are Linux to avoid upstream's + # makefiles from using brew. + (writeShellScriptBin "uname" "echo Linux") ]; buildInputs = [ + fontconfig freetype - gumbo harfbuzz + icu jbig2dec libjpeg mupdf - openjpeg - re2c SDL2 ]; buildFlags = [ "texpresso" + "texpresso-xetex" ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { @@ -70,27 +75,10 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall install -D -t "$out/bin/" "build/texpresso" + install -D -t "$out/bin/" "build/texpresso-xetex" runHook postInstall ''; - # needs to have texpresso-tonic on its path - postInstall = '' - wrapProgram $out/bin/texpresso \ - --prefix PATH : ${lib.makeBinPath [ finalAttrs.finalPackage.passthru.tectonic ]} - ''; - - passthru = { - tectonic = callPackage ./tectonic.nix { }; - updateScript = writeScript "update-texpresso" '' - #!/usr/bin/env nix-shell - #!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 texpresso - nix-update --version=branch=$tectonic_version texpresso.tectonic - ''; - }; - meta = { inherit (finalAttrs.src.meta) homepage; description = "Live rendering and error reporting for LaTeX"; diff --git a/pkgs/by-name/te/texpresso/tectonic.nix b/pkgs/by-name/te/texpresso/tectonic.nix deleted file mode 100644 index fe04d15191d7..000000000000 --- a/pkgs/by-name/te/texpresso/tectonic.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - tectonic-unwrapped, - fetchFromGitHub, - rustPlatform, -}: - -tectonic-unwrapped.overrideAttrs ( - finalAttrs: prevAttrs: { - pname = "texpresso-tonic"; - version = "0.15.0-unstable-2024-04-19"; - src = fetchFromGitHub { - owner = "let-def"; - repo = "tectonic"; - rev = "b38cb3b2529bba947d520ac29fbb7873409bd270"; - hash = "sha256-ap7fEPHsASAphIQkjcvk1CC7egTdxaUh7IpSS5os4W8="; - fetchSubmodules = true; - }; - - cargoHash = "sha256-mqhbIv5r/5EDRDfP2BymXv9se2NCKxzRGqNqwqbD9A0="; - # rebuild cargoDeps by hand because `.overrideAttrs cargoHash` - # does not reconstruct cargoDeps (a known limitation): - cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = finalAttrs.cargoHash; - patches = finalAttrs.cargoPatches; - }; - # binary has a different name, bundled tests won't work - doCheck = false; - postInstall = '' - ${prevAttrs.postInstall or ""} - - # Remove the broken `nextonic` symlink - # It points to `tectonic`, which doesn't exist because the exe is - # renamed to texpresso-tonic - rm $out/bin/nextonic - ''; - meta = prevAttrs.meta // { - mainProgram = "texpresso-tonic"; - }; - } -) From a7fb6b70b317289a50cce780fe35e918d6bbdb83 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 19 Apr 2026 14:49:01 +0300 Subject: [PATCH 199/246] tectonic-unwrapped: install desktop files with 644 permissions --- pkgs/by-name/te/tectonic-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix index ab4800a389fd..bce4aa2d1d38 100644 --- a/pkgs/by-name/te/tectonic-unwrapped/package.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -79,8 +79,8 @@ buildRustPackage (finalAttrs: { + lib.optionalString clangStdenv.hostPlatform.isLinux '' substituteInPlace dist/appimage/tectonic.desktop \ --replace Exec=tectonic Exec=$out/bin/tectonic - install -D dist/appimage/tectonic.desktop -t $out/share/applications/ - install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ + install -Dm644 dist/appimage/tectonic.desktop -t $out/share/applications/ + install -Dm644 dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ ''; doCheck = true; From 33d317fc74424eacddfebc7905ed483ce74f1833 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 19 Apr 2026 14:49:28 +0300 Subject: [PATCH 200/246] tectonic-unwrapped: substitute Exec line with --replace-fail --- pkgs/by-name/te/tectonic-unwrapped/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix index bce4aa2d1d38..7b8be90f7423 100644 --- a/pkgs/by-name/te/tectonic-unwrapped/package.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -78,7 +78,7 @@ buildRustPackage (finalAttrs: { '' + lib.optionalString clangStdenv.hostPlatform.isLinux '' substituteInPlace dist/appimage/tectonic.desktop \ - --replace Exec=tectonic Exec=$out/bin/tectonic + --replace-fail Exec=tectonic Exec=$out/bin/tectonic install -Dm644 dist/appimage/tectonic.desktop -t $out/share/applications/ install -Dm644 dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ ''; From a4bcccc9c1dd2e1c684c830ebdb3182e177175f9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 13 Apr 2026 11:02:02 +0300 Subject: [PATCH 201/246] tectonic-unwrapped: reorder expression arguments --- pkgs/by-name/te/tectonic-unwrapped/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix index 7b8be90f7423..325744cdf537 100644 --- a/pkgs/by-name/te/tectonic-unwrapped/package.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -10,13 +10,17 @@ lib, clangStdenv, fetchFromGitHub, + fetchpatch2, rustPlatform, + + # nativeBuildInputs + pkg-config, + + # buildInputs fontconfig, harfbuzzFull, openssl, - pkg-config, icu, - fetchpatch2, }: let @@ -61,7 +65,9 @@ buildRustPackage (finalAttrs: { cargoHash = "sha256-OMa89riyopKMQf9E9Fr7Qs4hFfEfjnDFzaSWFtkYUXE="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; buildFeatures = [ "external-harfbuzz" ]; From a3d70cceac7181a6314b04a330448b2455652a3b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 13 Apr 2026 11:04:28 +0300 Subject: [PATCH 202/246] tectonic-unwrapped: share passthru.tests with wrapped tectonic --- pkgs/by-name/te/tectonic-unwrapped/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix index 325744cdf537..649ded603f4d 100644 --- a/pkgs/by-name/te/tectonic-unwrapped/package.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -21,6 +21,9 @@ harfbuzzFull, openssl, icu, + + # passthru.tests + tectonic, }: let @@ -91,6 +94,10 @@ buildRustPackage (finalAttrs: { doCheck = true; + passthru = { + inherit (tectonic.passthru) tests; + }; + meta = { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; homepage = "https://tectonic-typesetting.github.io/"; From 9ee6e26cb952a007e2506530e243a86062af1e36 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 19 Apr 2026 14:59:05 +0300 Subject: [PATCH 203/246] tectonic-unwrapped: enable strictDeps and __structuredAttrs --- pkgs/by-name/te/tectonic-unwrapped/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix index 649ded603f4d..0e30d7c02156 100644 --- a/pkgs/by-name/te/tectonic-unwrapped/package.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -98,6 +98,9 @@ buildRustPackage (finalAttrs: { inherit (tectonic.passthru) tests; }; + strictDeps = true; + __structuredAttrs = true; + meta = { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; homepage = "https://tectonic-typesetting.github.io/"; From 664ea371bb2a86d6153094e3988c793dba919f97 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 12 Apr 2026 09:42:33 +0300 Subject: [PATCH 204/246] tectonic{-unwrapped,}: 0.15.0 -> 0.16.8 Diff: https://github.com/tectonic-typesetting/tectonic/compare/tectonic@0.15.0...tectonic@0.16.8 Changelog: https://github.com/tectonic-typesetting/tectonic/blob/tectonic@0.16.8/CHANGELOG.md Other note: The hard-coded bundle URL is now written into the unwrapped derivation, and the comment of it was expanded and should explain why this was done. Due to this change, overriding tectonic to use a different default bundle will require either wrapping only `tectonic` to use a different `--bundle` command line argument, or rebuilding the unwrapped derivation with a different `env.TECTONIC_BUNDLE_LOCKED`. --- .../by-name/te/tectonic-unwrapped/package.nix | 79 ++++++++++--------- ...0.15-fix-dangerous_implicit_autorefs.patch | 13 --- pkgs/by-name/te/tectonic/package.nix | 9 --- pkgs/by-name/te/tectonic/tests.nix | 2 +- 4 files changed, 44 insertions(+), 59 deletions(-) delete mode 100644 pkgs/by-name/te/tectonic-unwrapped/tectonic-0.15-fix-dangerous_implicit_autorefs.patch diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix index 0e30d7c02156..9fff6c7debb9 100644 --- a/pkgs/by-name/te/tectonic-unwrapped/package.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -8,9 +8,8 @@ { lib, - clangStdenv, + stdenv, fetchFromGitHub, - fetchpatch2, rustPlatform, # nativeBuildInputs @@ -26,47 +25,18 @@ tectonic, }: -let - - buildRustPackage = rustPlatform.buildRustPackage.override { - # use clang to work around build failure with GCC 14 - # see: https://github.com/tectonic-typesetting/tectonic/issues/1263 - stdenv = clangStdenv; - }; - -in - -buildRustPackage (finalAttrs: { +rustPlatform.buildRustPackage (finalAttrs: { pname = "tectonic"; - version = "0.15.0"; + version = "0.16.8"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${finalAttrs.version}"; - sha256 = "sha256-dZnUu0g86WJIIvwMgdmwb6oYqItxoYrGQTFNX7I61Bs="; + sha256 = "sha256-drQ8hCe5vJHewUTFJTfVOotFvuUX19dHQLu2nVIWKbQ="; }; - patches = [ - (fetchpatch2 { - # https://github.com/tectonic-typesetting/tectonic/pull/1155 - name = "1155-fix-endless-reruns-when-generating-bbl"; - url = "https://github.com/tectonic-typesetting/tectonic/commit/fbb145cd079497b8c88197276f92cb89685b4d54.patch"; - hash = "sha256-6FW5MFkOWnqzYX8Eg5DfmLaEhVWKYVZwodE4SGXHKV0="; - }) - ./tectonic-0.15-fix-dangerous_implicit_autorefs.patch - ]; - - cargoPatches = [ - (fetchpatch2 { - # cherry-picked from https://github.com/tectonic-typesetting/tectonic/pull/1202 - name = "1202-fix-build-with-rust-1_80-and-icu-75"; - url = "https://github.com/tectonic-typesetting/tectonic/compare/19654bf152d602995da970f6164713953cffc2e6...6b49ca8db40aaca29cb375ce75add3e575558375.patch?full_index=1"; - hash = "sha256-CgQBCFvfYKKXELnR9fMDqmdq97n514CzGJ7EBGpghJc="; - }) - ]; - - cargoHash = "sha256-OMa89riyopKMQf9E9Fr7Qs4hFfEfjnDFzaSWFtkYUXE="; + cargoHash = "sha256-Hh2w8c/K+AXdX4p620fqVUttQPY33eVIAf0/VIFhHiY="; nativeBuildInputs = [ pkg-config @@ -81,17 +51,54 @@ buildRustPackage (finalAttrs: { openssl ]; + # By default, tectonic looks up the latest bundle by opening this URL: + # + # https://relay.fullyjustified.net/default_bundle_v${FORMAT_VERSION}.tar + # + # Where FORMAT_VERSION is defined here: + # + # https://github.com/tectonic-typesetting/tectonic/blob/master/crates/engine_xetex/xetex/xetex_bindings.h + # + # When we updated the package, this URL redirects to the following: + # + # https://data1.fullyjustified.net/tlextras-2022.0r0.tar + # + # The environment variable set below, sets the URL that will be used during + # runtime by default. We chose to hard-code a URL to a specific version of + # the web bundle, so that upstream won't update the `default_bundle` without + # us noticing, and break compatibility with our biber-for-tectonic package. + # + # This is in principle the right thing to do, ever since the 0.16.0 release. + # As opposed to what we had with version 0.15.0, we choose to not hard-code a + # --web-bundle (or --bundle) argument in the wrapper of the + # `tectonic-wrapped` package, as it is not compatible with nextonic, and + # `tectonic -X` commands of versions 0.16.0+ -- These commands require the + # `--bundle` argument to appear after the subcommand. + # + # Lastly, we might in the future need to update the bundle URL below if + # upstream will upload a new bundle. However, upstream hasn't updated a new + # bundle for a long time, see: + # + # https://github.com/tectonic-typesetting/tectonic/issues/1269 + # + env.TECTONIC_BUNDLE_LOCKED = "https://data1.fullyjustified.net/tlextras-2022.0r0.tar"; + postInstall = '' # Makes it possible to automatically use the V2 CLI API ln -s $out/bin/tectonic $out/bin/nextonic '' - + lib.optionalString clangStdenv.hostPlatform.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace dist/appimage/tectonic.desktop \ --replace-fail Exec=tectonic Exec=$out/bin/tectonic install -Dm644 dist/appimage/tectonic.desktop -t $out/share/applications/ install -Dm644 dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ ''; + checkFlags = [ + # Test fails due to tectonic bundle missing and can't be downloaded in the + # sandbox + "--skip=tests::no_segfault_after_failed_compilation" + ]; doCheck = true; passthru = { diff --git a/pkgs/by-name/te/tectonic-unwrapped/tectonic-0.15-fix-dangerous_implicit_autorefs.patch b/pkgs/by-name/te/tectonic-unwrapped/tectonic-0.15-fix-dangerous_implicit_autorefs.patch deleted file mode 100644 index 883c38486a71..000000000000 --- a/pkgs/by-name/te/tectonic-unwrapped/tectonic-0.15-fix-dangerous_implicit_autorefs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/crates/engine_bibtex/src/xbuf.rs b/crates/engine_bibtex/src/xbuf.rs -index 8f3949e7..c216eb4d 100644 ---- a/crates/engine_bibtex/src/xbuf.rs -+++ b/crates/engine_bibtex/src/xbuf.rs -@@ -52,7 +52,7 @@ pub unsafe fn xrealloc_zeroed( - old: *mut [T], - new_len: usize, - ) -> Option<&'static mut [T]> { -- let old_len = (*old).len(); -+ let old_len = (&(*old)).len(); - let new_size = new_len * mem::size_of::(); - // SAFETY: realloc can be called with any size, even 0, that will just deallocate and return null - let ptr = unsafe { xrealloc(old.cast(), new_size) }.cast::(); diff --git a/pkgs/by-name/te/tectonic/package.nix b/pkgs/by-name/te/tectonic/package.nix index 0f36036bfcfb..947bed1eeacf 100644 --- a/pkgs/by-name/te/tectonic/package.nix +++ b/pkgs/by-name/te/tectonic/package.nix @@ -1,7 +1,6 @@ { lib, symlinkJoin, - tectonic, tectonic-unwrapped, biber-for-tectonic, makeBinaryWrapper, @@ -19,13 +18,6 @@ symlinkJoin { unwrapped = tectonic-unwrapped; biber = biber-for-tectonic; tests = callPackage ./tests.nix { }; - - # The version locked tectonic web bundle, redirected from: - # https://relay.fullyjustified.net/default_bundle_v33.tar - # To check for updates, see: - # https://github.com/tectonic-typesetting/tectonic/blob/master/crates/bundles/src/lib.rs - # ... and look up `get_fallback_bundle_url`. - bundleUrl = "https://data1.fullyjustified.net/tlextras-2022.0r0.tar"; }; # Replace the unwrapped tectonic with the one wrapping it with biber @@ -48,7 +40,6 @@ symlinkJoin { + '' makeWrapper ${lib.getBin tectonic-unwrapped}/bin/tectonic $out/bin/tectonic \ --prefix PATH : "${lib.getBin biber-for-tectonic}/bin" \ - --add-flags "--web-bundle ${tectonic.passthru.bundleUrl}" \ --inherit-argv0 ## make sure binary name e.g. `nextonic` is passed along ln -s $out/bin/tectonic $out/bin/nextonic ''; diff --git a/pkgs/by-name/te/tectonic/tests.nix b/pkgs/by-name/te/tectonic/tests.nix index 04c91a1235c3..cb95d18de6ff 100644 --- a/pkgs/by-name/te/tectonic/tests.nix +++ b/pkgs/by-name/te/tectonic/tests.nix @@ -94,7 +94,7 @@ lib.mapAttrs networkRequiringTestPkg { workspace = '' tectonic -X new - cat Tectonic.toml | grep "${tectonic.bundleUrl}" + cat Tectonic.toml | grep "${tectonic.unwrapped.TECTONIC_BUNDLE_LOCKED}" ''; /** From 8dfa4f62c4a520a6c052de52164b1adc35b8c949 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 14 Apr 2026 12:53:45 +0300 Subject: [PATCH 205/246] tectonic-unwrapped: fix a substantial upstream bug --- pkgs/by-name/te/tectonic-unwrapped/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix index 9fff6c7debb9..ffb55ef972de 100644 --- a/pkgs/by-name/te/tectonic-unwrapped/package.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -10,6 +10,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, rustPlatform, # nativeBuildInputs @@ -36,6 +37,15 @@ rustPlatform.buildRustPackage (finalAttrs: { sha256 = "sha256-drQ8hCe5vJHewUTFJTfVOotFvuUX19dHQLu2nVIWKbQ="; }; + patches = [ + # Fixes a substantial MacOS arm64 bug, see: + # https://github.com/tectonic-typesetting/tectonic/pull/1346 + (fetchpatch2 { + url = "https://github.com/tectonic-typesetting/tectonic/commit/5d95f47720e6518daa7164b097f207b772d565ac.patch"; + hash = "sha256-GQPRwP9vljDIzs1uEBlnCdAGcvG/mLpw0WtM5wqobWg="; + }) + ]; + cargoHash = "sha256-Hh2w8c/K+AXdX4p620fqVUttQPY33eVIAf0/VIFhHiY="; nativeBuildInputs = [ From 818bce69d9c751a06a2f9ea45814fd6a3f737fb8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 17 Apr 2026 15:16:38 +0300 Subject: [PATCH 206/246] tectonic-unwrapped: 0.16.8 -> 0.16.9 Diff: https://github.com/tectonic-typesetting/tectonic/compare/tectonic@0.16.8...tectonic@0.16.9 Changelog: https://github.com/tectonic-typesetting/tectonic/blob/tectonic@0.16.9/CHANGELOG.md --- pkgs/by-name/te/tectonic-unwrapped/package.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix index ffb55ef972de..a325bfbd6f79 100644 --- a/pkgs/by-name/te/tectonic-unwrapped/package.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -10,7 +10,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, rustPlatform, # nativeBuildInputs @@ -28,25 +27,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tectonic"; - version = "0.16.8"; + version = "0.16.9"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${finalAttrs.version}"; - sha256 = "sha256-drQ8hCe5vJHewUTFJTfVOotFvuUX19dHQLu2nVIWKbQ="; + sha256 = "sha256-5yphhmrrfgFwQ952eWpToyGfIJVJfV6y5w0BgznSOe0="; }; - patches = [ - # Fixes a substantial MacOS arm64 bug, see: - # https://github.com/tectonic-typesetting/tectonic/pull/1346 - (fetchpatch2 { - url = "https://github.com/tectonic-typesetting/tectonic/commit/5d95f47720e6518daa7164b097f207b772d565ac.patch"; - hash = "sha256-GQPRwP9vljDIzs1uEBlnCdAGcvG/mLpw0WtM5wqobWg="; - }) - ]; - - cargoHash = "sha256-Hh2w8c/K+AXdX4p620fqVUttQPY33eVIAf0/VIFhHiY="; + cargoHash = "sha256-22Hy51zCzY2DRytcYHgwkI9+e/g52o1jy4eosvEm3KY="; nativeBuildInputs = [ pkg-config From a88b601ea35f3509ef1508e727be2892b42674de Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 17 Apr 2026 15:44:37 +0300 Subject: [PATCH 207/246] tectonic-unwrapped: skip failing test on Darwin --- pkgs/by-name/te/tectonic-unwrapped/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix index a325bfbd6f79..27270b54c86b 100644 --- a/pkgs/by-name/te/tectonic-unwrapped/package.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -98,6 +98,11 @@ rustPlatform.buildRustPackage (finalAttrs: { # Test fails due to tectonic bundle missing and can't be downloaded in the # sandbox "--skip=tests::no_segfault_after_failed_compilation" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Test Panics only on Darwin, see: + # https://github.com/tectonic-typesetting/tectonic/issues/1352 + "--skip=v2_watch_succeeds" ]; doCheck = true; From d14de0aa5aff87476b1aa585f8f53b633c83325e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 17:11:39 -0500 Subject: [PATCH 208/246] nixpkgs-plugin-update: support tagged plugin metadata Teach the updater to preserve tagged plugin metadata without changing the default target-selection policy yet. This stores explicit versions and optional source tags on Plugin objects, parses tagged plugin state without assuming unstable versions, and renders tag fetchers back into Nix when a plugin was selected from a tag. --- .../src/nixpkgs_plugin_update/__init__.py | 99 +++++++++++++------ 1 file changed, 70 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py index 154c0190455f..4e798498c132 100644 --- a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py +++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py @@ -38,6 +38,8 @@ GIT_TAGS_PREFIX = "refs/tags/" VERSION_DATE_PATTERN = re.compile(r"(\d{4}-\d{2}-\d{2})$") VERSION_TAG_PATTERN = re.compile(r"^(.+?)-unstable-") +NON_RELEASE_TAG_PREFIXES = ("pre-",) +RELEASE_VERSION_PATTERN = re.compile(r"^[^\d]*(\d[\w.@-]*)$") LOG_LEVELS = { logging.getLevelName(level): level @@ -197,9 +199,12 @@ class Repo: return loaded["sha256"] def as_nix(self, plugin: "Plugin") -> str: + ref_attr = ( + f'tag = "{plugin.tag}";' if plugin.tag is not None else f'rev = "{plugin.commit}";' + ) return f"""fetchgit {{ url = "{self.uri}"; - rev = "{plugin.commit}"; + {ref_attr} hash = "{plugin.to_sri_hash()}"; }}""" @@ -295,8 +300,6 @@ class RepoGitHub(Repo): ) return super().get_latest_tag() - # FIXME: This fetches all tags. We need to find a way to check if a tag exists in - # an ancestor of the default branch. query = """ query GetLatestVersionInfo($owner: String!, $name: String!) { repository(owner: $owner, name: $name) { @@ -432,10 +435,14 @@ class RepoGitHub(Repo): else: submodule_attr = "" + ref_attr = ( + f'tag = "{plugin.tag}";' if plugin.tag is not None else f'rev = "{plugin.commit}";' + ) + return f"""fetchFromGitHub {{ owner = "{self.owner}"; repo = "{self.repo}"; - rev = "{plugin.commit}"; + {ref_attr} hash = "{plugin.to_sri_hash()}";{submodule_attr} }}""" @@ -484,8 +491,10 @@ class Plugin: commit: str has_submodules: bool sha256: str + version: str date: datetime | None = None last_tag: str | None = None + tag: str | None = None @property def normalized_name(self) -> str: @@ -508,28 +517,11 @@ class Plugin: result = subprocess.check_output(cmd, stderr=subprocess.DEVNULL) return result.decode("utf-8").strip() - @property - def version(self) -> str: - assert self.date is not None - date_str = self.date.strftime("%Y-%m-%d") - - tag_part = "0" - if self.last_tag: - tag = ( - self.last_tag[1:] - if self.last_tag.startswith(("v", "V")) - else self.last_tag - ) - if tag and tag[0].isdigit(): - tag_part = tag - - return f"{tag_part}-unstable-{date_str}" - @staticmethod def parse_version_string(version_str: str) -> tuple[datetime, str | None]: date_match = VERSION_DATE_PATTERN.search(version_str) if not date_match: - raise ValueError(f"Cannot parse date from version: {version_str}") + raise ValueError(f"Cannot parse unstable version: {version_str}") date = datetime.fromisoformat(date_match.group(1)) tag_match = VERSION_TAG_PATTERN.search(version_str) @@ -545,6 +537,31 @@ class Plugin: return copy +def normalize_release_version(tag: str) -> str | None: + normalized_tag = tag.strip() + lowered_tag = normalized_tag.lower() + if any(lowered_tag.startswith(prefix) for prefix in NON_RELEASE_TAG_PREFIXES): + return None + + match = RELEASE_VERSION_PATTERN.match(normalized_tag) + if match is not None: + return match.group(1) + + return None + + +def make_unstable_version(date: datetime, last_tag: str | None) -> str: + date_str = date.strftime("%Y-%m-%d") + + tag_part = "0" + if last_tag: + normalized_tag = normalize_release_version(last_tag) + if normalized_tag is not None: + tag_part = normalized_tag + + return f"{tag_part}-unstable-{date_str}" + + def load_plugins_from_csv( config: FetchConfig, input_file: Path, @@ -672,8 +689,12 @@ class Editor: for name, attr in data.items(): checksum = attr["checksum"] version_str = attr["version"] + source_tag = checksum.get("tag") - date, last_tag = Plugin.parse_version_string(version_str) + if source_tag is not None: + date, last_tag = None, None + else: + date, last_tag = Plugin.parse_version_string(version_str) pdesc = PluginDesc.load_from_string(config, f"{attr['homePage']} as {name}") p = Plugin( @@ -681,8 +702,10 @@ class Editor: checksum["rev"], checksum["submodules"], checksum["sha256"], + version_str, date, last_tag=last_tag, + tag=source_tag, ) plugins.append((pdesc, p)) @@ -790,7 +813,6 @@ class Editor: # Track version changes for commit message generation updated_plugins = [] current_plugin_map = {p.normalized_name: p for _, p in current_plugins} - for _, new_plugin in plugins: old_plugin = current_plugin_map.get(new_plugin.normalized_name) if old_plugin and old_plugin.version != new_plugin.version: @@ -989,8 +1011,7 @@ def prefetch_plugin( p: PluginDesc, cache: "Cache | None" = None, ) -> tuple[Plugin, Repo | None]: - commit = None - log.info(f"Fetching last commit for plugin {p.name} from {p.repo.uri}@{p.branch}") + log.info(f"Fetching source for plugin {p.name} from {p.repo.uri}@{p.branch}") commit, date = p.repo.latest_commit() latest_tag = p.repo.get_latest_tag() @@ -999,20 +1020,37 @@ def prefetch_plugin( else: log.debug("No tags found for %s, will use '0' prefix", p.name) + version = make_unstable_version(date, latest_tag) + source_tag = None + cached_plugin = cache[commit] if cache else None if cached_plugin is not None: log.debug(f"Cache hit for {p.name}!") cached_plugin.name = p.name + cached_plugin.commit = commit + cached_plugin.version = version cached_plugin.date = date cached_plugin.last_tag = latest_tag + cached_plugin.tag = source_tag return cached_plugin, p.repo.redirect has_submodules = p.repo.has_submodules() log.debug(f"prefetch {p.name}") - sha256 = p.repo.prefetch(commit) + sha256 = ( + p.repo.prefetch(f"{GIT_TAGS_PREFIX}{source_tag}") if source_tag else p.repo.prefetch(commit) + ) return ( - Plugin(p.name, commit, has_submodules, sha256, date=date, last_tag=latest_tag), + Plugin( + p.name, + commit, + has_submodules, + sha256, + version, + date=date, + last_tag=latest_tag, + tag=source_tag, + ), p.repo.redirect, ) @@ -1101,7 +1139,9 @@ class Cache: attr["commit"], attr["has_submodules"], attr["sha256"], + attr.get("version", ""), last_tag=attr.get("last_tag"), + tag=attr.get("tag"), ) downloads[attr["commit"]] = p return downloads @@ -1125,7 +1165,8 @@ class Cache: def prefetch( - pluginDesc: PluginDesc, cache: Cache + pluginDesc: PluginDesc, + cache: Cache, ) -> tuple[PluginDesc, Exception | Plugin, Repo | None]: try: plugin, redirect = prefetch_plugin(pluginDesc, cache) From ef2ef8eb64c9ace5f97319abb73d37197a08c030 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 17:12:29 -0500 Subject: [PATCH 209/246] nixpkgs-plugin-update: default to release tags when appropriate Switch the updater from always following HEAD to selecting release tags when a plugin spec is in auto mode and a usable release tag exists. Explicit branches remain commit-tracked. Auto-selected release tags still fall back to unstable commit versions when no usable release exists or when the current git-tracked plugin is newer than the latest tagged release. --- .../src/nixpkgs_plugin_update/__init__.py | 149 +++++++++++++++--- 1 file changed, 123 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py index 4e798498c132..1960572334bb 100644 --- a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py +++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py @@ -35,6 +35,7 @@ ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # " ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # " GIT_TAGS_PREFIX = "refs/tags/" +AUTO_BRANCH = "" VERSION_DATE_PATTERN = re.compile(r"(\d{4}-\d{2}-\d{2})$") VERSION_TAG_PATTERN = re.compile(r"^(.+?)-unstable-") @@ -97,6 +98,33 @@ def make_request(url: str, token=None) -> urllib.request.Request: Redirects = dict["PluginDesc", "Repo"] +def select_latest_tag( + tags: list[str], + normalize: Callable[[str], str | None] | None = None, +) -> str | None: + best_version: tuple[str, Any] | None = None + best_text: tuple[str, str] | None = None + + for tag in tags: + candidate = tag if normalize is None else normalize(tag) + if candidate is None: + continue + + try: + version = parse_version(candidate) + if best_version is None or version > best_version[1]: + best_version = (tag, version) + except InvalidVersion: + if best_text is None or candidate > best_text[1]: + best_text = (tag, candidate) + + if best_version is not None: + return best_version[0] + if best_text is not None: + return best_text[0] + return None + + class Repo: def __init__(self, uri: str, branch: str) -> None: self.uri = uri @@ -127,11 +155,17 @@ class Repo: @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def latest_commit(self) -> tuple[str, datetime]: log.debug("Latest commit") - loaded = self._prefetch(None) + loaded = self._prefetch(None, fetch_submodules=False) updated = datetime.strptime(loaded["date"], "%Y-%m-%dT%H:%M:%S%z") return loaded["rev"], updated + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) + def resolve_ref(self, ref: str) -> tuple[str, datetime]: + loaded = self._prefetch(ref, fetch_submodules=False) + updated = datetime.strptime(loaded["date"], "%Y-%m-%dT%H:%M:%S%z") + return loaded["rev"], updated + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def get_latest_tag(self) -> str | None: try: @@ -157,21 +191,10 @@ class Repo: if not tags: return None - valid_versions = [] - invalid_tags = [] - - for tag in tags: - try: - version = parse_version(tag) - valid_versions.append((tag, version)) - except InvalidVersion: - invalid_tags.append(tag) - - if valid_versions: - latest_tag = max(valid_versions, key=lambda x: x[1])[0] - elif invalid_tags: - latest_tag = max(invalid_tags) - else: + latest_tag = select_latest_tag(tags, normalize_release_version) + if latest_tag is None: + latest_tag = select_latest_tag(tags) + if latest_tag is None: log.debug("No tags found for %s", self.uri) return None @@ -184,8 +207,11 @@ class Repo: log.warning("Unexpected error fetching tags for %s: %s", self.uri, e) return None - def _prefetch(self, ref: str | None): - cmd = ["nix-prefetch-git", "--quiet", "--fetch-submodules", self.uri] + def _prefetch(self, ref: str | None, fetch_submodules: bool = True): + cmd = ["nix-prefetch-git", "--quiet"] + if fetch_submodules: + cmd.append("--fetch-submodules") + cmd.append(self.uri) if ref is not None: cmd.append(ref) log.debug(cmd) @@ -266,6 +292,20 @@ class RepoGitHub(Repo): updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ") return Path(str(url.path)).name, updated + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) + def resolve_ref(self, ref: str) -> tuple[str, datetime]: + if ref == self.branch: + return self.latest_commit() + self._check_ref_redirect(ref) + return super().resolve_ref(ref) + + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) + def _check_ref_redirect(self, ref: str) -> None: + ref_url = self.url(f"tree/{urllib.parse.quote(ref, safe='')}") + ref_req = make_request(ref_url, self.token) + with urllib.request.urlopen(ref_req, timeout=10) as req: + self._check_for_redirect(ref_url, req) + def _execute_graphql(self, query: str, variables: dict) -> dict: graphql_url = "https://api.github.com/graphql" @@ -412,7 +452,7 @@ class RepoGitHub(Repo): urlsplit(response_url).path.strip("/").split("/")[:2] ) - new_repo = RepoGitHub(owner=new_owner, repo=new_name, branch=self.branch) + new_repo = RepoGitHub(owner=new_owner, repo=new_name, branch=self._branch) self.redirect = new_repo def prefetch(self, commit: str) -> str: @@ -472,7 +512,7 @@ class PluginDesc: @staticmethod def load_from_string(config: FetchConfig, line: str) -> "PluginDesc": - branch = "HEAD" + branch = AUTO_BRANCH alias = None uri = line if " as " in uri: @@ -562,6 +602,50 @@ def make_unstable_version(date: datetime, last_tag: str | None) -> str: return f"{tag_part}-unstable-{date_str}" +def get_commit_target( + repo: Repo, + branch: str, + latest_tag: str | None, +) -> tuple[str, datetime, str, str | None]: + if branch == "HEAD": + commit, date = repo.latest_commit() + else: + commit, date = repo.resolve_ref(branch) + + return commit, date, make_unstable_version(date, latest_tag), None + + +def select_plugin_target( + plugin_desc: PluginDesc, + current_plugin: Plugin | None, + latest_tag: str | None, +) -> tuple[str, datetime, str, str | None]: + branch = plugin_desc.branch + + if branch != AUTO_BRANCH: + return get_commit_target(plugin_desc.repo, branch, latest_tag) + + release_version = ( + normalize_release_version(latest_tag) if latest_tag is not None else None + ) + if release_version is None: + return get_commit_target(plugin_desc.repo, "HEAD", latest_tag) + + release_commit, release_date = plugin_desc.repo.resolve_ref( + f"{GIT_TAGS_PREFIX}{latest_tag}" + ) + + if current_plugin is not None: + if ( + current_plugin.date is not None + and current_plugin.tag is None + and current_plugin.date.date() > release_date.date() + ): + return get_commit_target(plugin_desc.repo, "HEAD", latest_tag) + + return release_commit, release_date, release_version, latest_tag + + def load_plugins_from_csv( config: FetchConfig, input_file: Path, @@ -768,7 +852,14 @@ class Editor: cache: Cache = Cache( [plugin for _description, plugin in current_plugins], self.cache_file ) - _prefetch = functools.partial(prefetch, cache=cache) + current_plugin_map = { + plugin.normalized_name: plugin for _description, plugin in current_plugins + } + _prefetch = functools.partial( + prefetch, + cache=cache, + current_plugins=current_plugin_map, + ) to_update_for_filter = [x.replace(".", "-") for x in to_update] plugins_to_update = ( @@ -812,7 +903,6 @@ class Editor: # Track version changes for commit message generation updated_plugins = [] - current_plugin_map = {p.normalized_name: p for _, p in current_plugins} for _, new_plugin in plugins: old_plugin = current_plugin_map.get(new_plugin.normalized_name) if old_plugin and old_plugin.version != new_plugin.version: @@ -1010,9 +1100,9 @@ class CleanEnvironment(object): def prefetch_plugin( p: PluginDesc, cache: "Cache | None" = None, + current_plugin: Plugin | None = None, ) -> tuple[Plugin, Repo | None]: log.info(f"Fetching source for plugin {p.name} from {p.repo.uri}@{p.branch}") - commit, date = p.repo.latest_commit() latest_tag = p.repo.get_latest_tag() if latest_tag: @@ -1020,8 +1110,11 @@ def prefetch_plugin( else: log.debug("No tags found for %s, will use '0' prefix", p.name) - version = make_unstable_version(date, latest_tag) - source_tag = None + commit, date, version, source_tag = select_plugin_target( + p, + current_plugin, + latest_tag, + ) cached_plugin = cache[commit] if cache else None if cached_plugin is not None: @@ -1167,9 +1260,13 @@ class Cache: def prefetch( pluginDesc: PluginDesc, cache: Cache, + current_plugins: dict[str, Plugin] | None = None, ) -> tuple[PluginDesc, Exception | Plugin, Repo | None]: try: - plugin, redirect = prefetch_plugin(pluginDesc, cache) + current_plugin = None + if current_plugins is not None: + current_plugin = current_plugins.get(pluginDesc.name.replace(".", "-")) + plugin, redirect = prefetch_plugin(pluginDesc, cache, current_plugin) cache[plugin.commit] = plugin return (pluginDesc, plugin, redirect) except Exception as e: From 65c0f7732127acaed9cc24258af6db5957ca59ac Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 17:13:14 -0500 Subject: [PATCH 210/246] nixpkgs-plugin-update: prefer recent GitHub release tags Use GitHub's recent-tag GraphQL query as an ordered source of candidate tags and pick the first acceptable release tag from that list. This keeps the generic git fallback unchanged while avoiding the older "largest version wins" behavior on repositories whose newest maintained release has a lower semantic version than an older historical tag. --- .../src/nixpkgs_plugin_update/__init__.py | 94 ++++--------------- 1 file changed, 16 insertions(+), 78 deletions(-) diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py index 1960572334bb..5ad07803567d 100644 --- a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py +++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py @@ -125,6 +125,14 @@ def select_latest_tag( return None +def first_release_tag(tags: list[str]) -> str | None: + for tag in tags: + if normalize_release_version(tag) is not None: + return tag + + return None + + class Repo: def __init__(self, uri: str, branch: str) -> None: self.uri = uri @@ -318,17 +326,6 @@ class RepoGitHub(Repo): with urllib.request.urlopen(req, timeout=10) as response: return json.load(response) - def _extract_commit_date(self, target: dict) -> datetime | None: - commit_date_str = None - if "committedDate" in target: - commit_date_str = target["committedDate"] - elif "target" in target and "committedDate" in target["target"]: - commit_date_str = target["target"]["committedDate"] - - if commit_date_str: - return datetime.fromisoformat(commit_date_str.replace("Z", "+00:00")) - return None - @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def get_latest_tag(self) -> str | None: try: @@ -341,23 +338,11 @@ class RepoGitHub(Repo): return super().get_latest_tag() query = """ - query GetLatestVersionInfo($owner: String!, $name: String!) { + query GetRecentTags($owner: String!, $name: String!) { repository(owner: $owner, name: $name) { - refs(refPrefix: "refs/tags/", first: 5, orderBy: {field: TAG_COMMIT_DATE, direction: DESC}) { + refs(refPrefix: "refs/tags/", first: 20, orderBy: {field: TAG_COMMIT_DATE, direction: DESC}) { nodes { name - target { - ... on Commit { - committedDate - } - ... on Tag { - target { - ... on Commit { - committedDate - } - } - } - } } } } @@ -377,64 +362,17 @@ class RepoGitHub(Repo): ) return None - if "data" not in data or not data["data"]: - log.warning( - "No data in GraphQL response for %s/%s", self.owner, self.repo - ) - return None - - repo = data["data"]["repository"] + repo = data.get("data", {}).get("repository") if not repo: - log.debug( - "Repository %s/%s not found or inaccessible", self.owner, self.repo - ) return None - valid_versions = [] - invalid_tags = [] - for ref_node in repo["refs"]["nodes"]: - tag_name = ref_node["name"] - commit_date = self._extract_commit_date(ref_node["target"]) - if not commit_date: - continue - - try: - version = parse_version(tag_name) - valid_versions.append((tag_name, version, commit_date)) - except InvalidVersion: - invalid_tags.append((tag_name, None, commit_date)) - - def get_version(tag_tuple): - _, version, _ = tag_tuple - return version - - def get_date(tag_tuple): - _, _, date = tag_tuple - return date or datetime.min - - def get_max_versions(versions, sort_key): - return max(versions, key=sort_key, default=(None, None, None)) - - max_valid_tag, _, max_valid_date = get_max_versions( - valid_versions, get_version - ) - max_invalid_tag, _, max_invalid_date = get_max_versions( - invalid_tags, get_date - ) - if max_valid_tag and max_invalid_tag: - return ( - max_invalid_tag - if (max_invalid_date or datetime.min) - > (max_valid_date or datetime.min) - else max_valid_tag - ) - elif max_valid_tag: - return max_valid_tag - elif max_invalid_tag: - return max_invalid_tag - else: + recent_tags = [node["name"] for node in repo["refs"]["nodes"]] + if not recent_tags: return None + latest_tag = first_release_tag(recent_tags) + return latest_tag if latest_tag is not None else recent_tags[0] + except Exception as e: log.warning( "Error fetching version info for %s/%s: %s", From 9326dae295b2a9c51786385116c524858899cd57 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 17:13:38 -0500 Subject: [PATCH 211/246] nixpkgs-plugin-update: fall back to GitHub tag feeds When GraphQL is unavailable, use GitHub's tag feed as a cheap ordered source of recent tags before falling back to git ls-remote. This preserves the recent-tag selection policy for unauthenticated and rate-limited runs without cloning repositories or adding another expensive API path. --- .../src/nixpkgs_plugin_update/__init__.py | 71 ++++++++++++++++--- 1 file changed, 62 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py index 5ad07803567d..6c5922e9a107 100644 --- a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py +++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py @@ -326,16 +326,51 @@ class RepoGitHub(Repo): with urllib.request.urlopen(req, timeout=10) as response: return json.load(response) + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) + def _get_recent_tags_from_atom(self) -> list[str]: + tags_url = self.url("tags.atom") + tags_req = make_request(tags_url, self.token) + with urllib.request.urlopen(tags_req, timeout=10) as response: + xml = response.read() + + root = ET.fromstring(xml) + tags = [] + for entry in root.findall(ATOM_ENTRY): + link = entry.find(ATOM_LINK) + if link is None: + continue + + href = link.get("href") + if not href: + continue + + tag_name = Path(urlparse(href).path).name + if tag_name: + tags.append(tag_name) + + return tags + + def _get_latest_tag_from_fallbacks(self) -> str | None: + try: + recent_tags = self._get_recent_tags_from_atom() + if recent_tags: + latest_tag = first_release_tag(recent_tags) + return latest_tag if latest_tag is not None else recent_tags[0] + except (urllib.error.URLError, ET.ParseError) as e: + log.warning( + "Failed to fetch GitHub tag feed for %s/%s: %s", + self.owner, + self.repo, + e, + ) + + return super().get_latest_tag() + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def get_latest_tag(self) -> str | None: try: if not self.token or self.token == "": - log.info( - "No GitHub token available for %s/%s, using git ls-remote fallback", - self.owner, - self.repo, - ) - return super().get_latest_tag() + return self._get_latest_tag_from_fallbacks() query = """ query GetRecentTags($owner: String!, $name: String!) { @@ -354,17 +389,28 @@ class RepoGitHub(Repo): ) if "errors" in data: + if any( + error.get("code") == "graphql_rate_limit" + or error.get("type") == "RATE_LIMIT" + for error in data["errors"] + ): + log.warning( + "GitHub GraphQL rate limit hit for %s/%s, falling back to tag feeds", + self.owner, + self.repo, + ) + return self._get_latest_tag_from_fallbacks() log.warning( "GraphQL errors for %s/%s: %s", self.owner, self.repo, data["errors"], ) - return None + return self._get_latest_tag_from_fallbacks() repo = data.get("data", {}).get("repository") if not repo: - return None + return self._get_latest_tag_from_fallbacks() recent_tags = [node["name"] for node in repo["refs"]["nodes"]] if not recent_tags: @@ -373,6 +419,13 @@ class RepoGitHub(Repo): latest_tag = first_release_tag(recent_tags) return latest_tag if latest_tag is not None else recent_tags[0] + except urllib.error.HTTPError as e: + if e.code in (401, 403): + raise RuntimeError( + "GitHub GraphQL auth failed for " + f"{self.owner}/{self.repo} ({e.code}); refresh GITHUB_TOKEN" + ) from e + raise except Exception as e: log.warning( "Error fetching version info for %s/%s: %s", @@ -381,7 +434,7 @@ class RepoGitHub(Repo): e, exc_info=True, ) - return None + return self._get_latest_tag_from_fallbacks() def _check_for_redirect(self, url: str, req: http.client.HTTPResponse): response_url = req.geturl() From fe52f190b94195b1c04729f62bd158251d54a26d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 17:13:51 -0500 Subject: [PATCH 212/246] vim/kakoune updaters: preserve src.tag metadata Keep fetcher tag metadata when reading current plugin state from Nix. The updater needs to know whether a plugin was fetched by tag or by commit. Without carrying src.tag through, tagged sources are read back as if rev were always the canonical source identifier, which breaks tag-aware comparisons and cache behavior later in the update flow. --- pkgs/applications/editors/kakoune/plugins/update.py | 1 + pkgs/applications/editors/vim/plugins/utils/get-plugins.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index 169304c9aa4e..1aea9baa2906 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -40,6 +40,7 @@ let submodules = value.src.fetchSubmodules or false; sha256 = value.src.outputHash; rev = value.src.rev; + tag = value.src.tag or null; }} else null; diff --git a/pkgs/applications/editors/vim/plugins/utils/get-plugins.nix b/pkgs/applications/editors/vim/plugins/utils/get-plugins.nix index 4c874e98cda4..3b8e346bb5f0 100644 --- a/pkgs/applications/editors/vim/plugins/utils/get-plugins.nix +++ b/pkgs/applications/editors/vim/plugins/utils/get-plugins.nix @@ -23,6 +23,7 @@ let submodules = value.src.fetchSubmodules or false; sha256 = value.src.outputHash; inherit (value.src) rev; + tag = value.src.tag or null; } else null; From d29c1dced165189053e618cdd8f363a961f74a47 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 17:13:56 -0500 Subject: [PATCH 213/246] vimPlugins.nvim-treesitter updater: compare tag-aware refs Compare the current source ref using src.tag when present and fall back to src.rev otherwise. nvim-treesitter can now be represented by either a tag or a commit depending on how the updater selected its target. Comparing only rev makes the special-case skip logic treat equivalent tagged sources as mismatches. --- pkgs/applications/editors/vim/plugins/utils/update.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/utils/update.py b/pkgs/applications/editors/vim/plugins/utils/update.py index 3590a0f1c3cd..5dd551b4f0cf 100755 --- a/pkgs/applications/editors/vim/plugins/utils/update.py +++ b/pkgs/applications/editors/vim/plugins/utils/update.py @@ -50,9 +50,9 @@ class VimEditor(nixpkgs_plugin_update.Editor): self, plugins: List[Tuple[PluginDesc, nixpkgs_plugin_update.Plugin]], outfile: str ): log.info("Generating nix code") - log.debug("Loading nvim-treesitter revision from nix...") - nvim_treesitter_rev = nixpkgs_plugin_update.run_nix_expr( - "(import { }).vimPlugins.nvim-treesitter.src.rev", + log.debug("Loading nvim-treesitter source reference from nix...") + nvim_treesitter_ref = nixpkgs_plugin_update.run_nix_expr( + "(let src = (import { }).vimPlugins.nvim-treesitter.src; in if src.tag != null then src.tag else src.rev)", self.nixpkgs, timeout=10, ) @@ -93,10 +93,7 @@ class VimEditor(nixpkgs_plugin_update.Editor): for pdesc, plugin in plugins: content = self.plugin2nix(pdesc, plugin, _isNeovimPlugin(plugin)) f.write(content) - if ( - plugin.name == "nvim-treesitter" - and plugin.commit != nvim_treesitter_rev - ): + if plugin.name == "nvim-treesitter" and (plugin.tag or plugin.commit) != nvim_treesitter_ref: self.nvim_treesitter_updated = True f.write("}\n") print(f"updated {outfile}") From 9615c1e0b6cad33752f9153a378349402c3bfffc Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 17:14:01 -0500 Subject: [PATCH 214/246] vimPlugins: remove explicit git pinning of plugins Let the updater choose between release-tag tracking and commit tracking based on the repository state instead of forcing a large set of plugins to stay on HEAD. This keeps plugins without usable releases on unstable versions while allowing plugins that do publish releases to follow those releases without carrying an explicit pin in vim-plugin-names. --- .../editors/vim/plugins/vim-plugin-names | 1551 ++++++++--------- 1 file changed, 775 insertions(+), 776 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ffee13523d9a..92a88315a710 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1,31 +1,31 @@ repo,branch,alias https://github.com/euclidianAce/BetterLua.vim/,, https://github.com/vim-scripts/BufOnly.vim/,, -https://github.com/jackMort/ChatGPT.nvim/,HEAD, +https://github.com/jackMort/ChatGPT.nvim/,, https://github.com/chrisbra/CheckAttach/,, https://github.com/vim-scripts/Colour-Sampler-Pack/,, -https://github.com/CopilotC-Nvim/CopilotChat.nvim/,HEAD, +https://github.com/CopilotC-Nvim/CopilotChat.nvim/,, https://github.com/whonore/Coqtail/,, https://github.com/vim-scripts/DoxygenToolkit.vim/,, https://github.com/numToStr/FTerm.nvim/,, https://github.com/antoinemadec/FixCursorHold.nvim/,, -https://github.com/Aaronik/GPTModels.nvim/,HEAD, +https://github.com/Aaronik/GPTModels.nvim/,, https://github.com/vim-scripts/Improved-AnsiEsc/,, -https://github.com/ionide/Ionide-vim/,HEAD, +https://github.com/ionide/Ionide-vim/,, https://github.com/martinda/Jenkinsfile-vim-syntax/,, https://github.com/vigoux/LanguageTool.nvim/,, https://github.com/LazyVim/LazyVim/,, https://github.com/Yggdroot/LeaderF/,, -https://github.com/goropikari/LibDeflate.nvim/,HEAD, -https://github.com/molleweide/LuaSnip-snippets.nvim/,HEAD, +https://github.com/goropikari/LibDeflate.nvim/,, +https://github.com/molleweide/LuaSnip-snippets.nvim/,, https://github.com/Valloric/MatchTagAlways/,, https://github.com/numToStr/Navigator.nvim/,, https://github.com/lanx-x/NeoSolarized/,, -https://github.com/GCBallesteros/NotebookNavigator.nvim/,HEAD, +https://github.com/GCBallesteros/NotebookNavigator.nvim/,, https://github.com/chrisbra/NrrwRgn/,, -https://github.com/Eutrius/Otree.nvim/,HEAD, +https://github.com/Eutrius/Otree.nvim/,, https://github.com/vim-scripts/PreserveNoEOL/,, -https://github.com/henriklovhaug/Preview.nvim/,HEAD, +https://github.com/henriklovhaug/Preview.nvim/,, https://github.com/yssl/QFEnter/,, https://github.com/chrisbra/Recover.vim/,, https://github.com/vim-scripts/Rename/,, @@ -37,206 +37,206 @@ https://github.com/tmhedberg/SimpylFold/,, https://github.com/vim-scripts/SmartCase/,, https://github.com/jaredgorski/SpaceCamp/,, https://github.com/chrisbra/SudoEdit.vim/,, -https://github.com/vim-scripts/VimCompletesMe/,HEAD, +https://github.com/vim-scripts/VimCompletesMe/,, https://github.com/hsitz/VimOrganizer/,, https://github.com/VundleVim/Vundle.vim/,, https://github.com/esneider/YUNOcommit.vim/,, -https://github.com/svban/YankAssassin.vim/,HEAD, +https://github.com/svban/YankAssassin.vim/,, https://github.com/vim-scripts/YankRing.vim/,, https://github.com/ycm-core/YouCompleteMe/,, https://github.com/vim-scripts/a.vim/,, -https://github.com/Alligator/accent.vim/,HEAD, +https://github.com/Alligator/accent.vim/,, https://github.com/mileszs/ack.vim/,, https://github.com/eikenb/acp/,, https://github.com/aznhe21/actions-preview.nvim/,, -https://github.com/mrtnvgr/actions.nvim/,HEAD, -https://github.com/aaronhallaert/advanced-git-search.nvim/,HEAD, -https://github.com/Mofiqul/adwaita.nvim/,HEAD, +https://github.com/mrtnvgr/actions.nvim/,, +https://github.com/aaronhallaert/advanced-git-search.nvim/,, +https://github.com/Mofiqul/adwaita.nvim/,, https://github.com/stevearc/aerial.nvim/,, https://github.com/Numkil/ag.nvim/,, https://github.com/derekelkins/agda-vim/,, -https://github.com/emmanueltouzery/agitator.nvim/,HEAD, -https://github.com/aduros/ai.vim/,HEAD, -https://github.com/joshuavial/aider.nvim/,HEAD, -https://github.com/dchinmay2/alabaster.nvim/,HEAD, +https://github.com/emmanueltouzery/agitator.nvim/,, +https://github.com/aduros/ai.vim/,, +https://github.com/joshuavial/aider.nvim/,, +https://github.com/dchinmay2/alabaster.nvim/,, https://github.com/slashmili/alchemist.vim/,, https://github.com/dense-analysis/ale/,, https://github.com/vim-scripts/align/,, -https://github.com/Vonr/align.nvim/,HEAD, -https://github.com/goolord/alpha-nvim/,HEAD, -https://github.com/sourcegraph/amp.nvim/,HEAD, -https://github.com/anuvyklack/animation.nvim/,HEAD, +https://github.com/Vonr/align.nvim/,, +https://github.com/goolord/alpha-nvim/,, +https://github.com/sourcegraph/amp.nvim/,, +https://github.com/anuvyklack/animation.nvim/,, https://github.com/Olical/aniseed/,, https://github.com/pearofducks/ansible-vim/,, https://github.com/ckarnell/antonys-macro-repeater/,, https://github.com/solarnz/arcanist.vim/,, https://github.com/vim-scripts/argtextobj.vim/,, https://github.com/otavioschwanck/arrow.nvim/,, -https://github.com/arsham/arshlib.nvim/,HEAD, -https://github.com/comfysage/artio.nvim/,HEAD, -https://github.com/AstroNvim/astrocore/,HEAD, -https://github.com/AstroNvim/astrolsp/,HEAD, +https://github.com/arsham/arshlib.nvim/,, +https://github.com/comfysage/artio.nvim/,, +https://github.com/AstroNvim/astrocore/,, +https://github.com/AstroNvim/astrolsp/,, https://github.com/AstroNvim/astrotheme/,, -https://github.com/AstroNvim/astroui/,HEAD, +https://github.com/AstroNvim/astroui/,, https://github.com/prabirshrestha/async.vim/,, -https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD, -https://github.com/prabirshrestha/asyncomplete-file.vim/,HEAD, +https://github.com/prabirshrestha/asyncomplete-buffer.vim/,, +https://github.com/prabirshrestha/asyncomplete-file.vim/,, https://github.com/prabirshrestha/asyncomplete-lsp.vim/,, -https://github.com/prabirshrestha/asyncomplete-omni.vim/,HEAD, -https://github.com/prabirshrestha/asyncomplete-tags.vim/,HEAD, -https://github.com/prabirshrestha/asyncomplete-ultisnips.vim/,HEAD, +https://github.com/prabirshrestha/asyncomplete-omni.vim/,, +https://github.com/prabirshrestha/asyncomplete-tags.vim/,, +https://github.com/prabirshrestha/asyncomplete-ultisnips.vim/,, https://github.com/prabirshrestha/asyncomplete.vim/,, https://github.com/skywind3000/asyncrun.vim/,, https://github.com/skywind3000/asynctasks.vim/,, https://github.com/vmchale/ats-vim/,, https://github.com/augmentcode/augment.vim/,prerelease, https://github.com/ray-x/aurora/,, -https://github.com/Jay-Madden/auto-fix-return.nvim/,HEAD, +https://github.com/Jay-Madden/auto-fix-return.nvim/,, https://github.com/hotwatermorning/auto-git-diff/,, -https://github.com/asiryk/auto-hlsearch.nvim/,HEAD, +https://github.com/asiryk/auto-hlsearch.nvim/,, https://github.com/jiangmiao/auto-pairs/,, -https://github.com/okuuva/auto-save.nvim/,HEAD, +https://github.com/okuuva/auto-save.nvim/,, https://github.com/rmagatti/auto-session/,, -https://github.com/m4xshen/autoclose.nvim/,HEAD, +https://github.com/m4xshen/autoclose.nvim/,, https://github.com/gaoDean/autolist.nvim/,, https://github.com/vim-scripts/autoload_cscope.vim/,, -https://github.com/nullishamy/autosave.nvim/,HEAD, -https://github.com/ActivityWatch/aw-watcher-vim/,HEAD, -https://github.com/lowitea/aw-watcher.nvim/,HEAD, +https://github.com/nullishamy/autosave.nvim/,, +https://github.com/ActivityWatch/aw-watcher-vim/,, +https://github.com/lowitea/aw-watcher.nvim/,, https://github.com/rafi/awesome-vim-colorschemes/,, https://github.com/AhmedAbdulrahman/aylin.vim/,, https://github.com/ayu-theme/ayu-vim/,, -https://github.com/taybart/b64.nvim/,HEAD, -https://github.com/m00qek/baleia.nvim/,HEAD, +https://github.com/taybart/b64.nvim/,, +https://github.com/m00qek/baleia.nvim/,, https://github.com/ribru17/bamboo.nvim/,, https://github.com/romgrk/barbar.nvim/,, https://github.com/utilyre/barbecue.nvim/,, https://github.com/RRethy/base16-nvim/,, https://github.com/chriskempson/base16-vim/,, -https://github.com/nvchad/base46/,HEAD, -https://github.com/jamespwilliams/bat.vim/,HEAD, +https://github.com/nvchad/base46/,, +https://github.com/jamespwilliams/bat.vim/,, https://github.com/vim-scripts/bats.vim/,, https://github.com/rbgrouleff/bclose.vim/,, -https://github.com/sontungexpt/better-diagnostic-virtual-text/,HEAD, +https://github.com/sontungexpt/better-diagnostic-virtual-text/,, https://github.com/max397574/better-escape.nvim/,, https://github.com/LunarVim/bigfile.nvim/,, -https://github.com/openembedded/bitbake/,HEAD, -https://github.com/FabijanZulj/blame.nvim/,HEAD, -https://github.com/APZelos/blamer.nvim/,HEAD, -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/GaetanLepage/blink-cmp-nixpkgs-maintainers/,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, -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/openembedded/bitbake/,, +https://github.com/FabijanZulj/blame.nvim/,, +https://github.com/z4p5a9/blamer.nvim/,, +https://github.com/Kaiser-Yang/blink-cmp-avante/,, +https://github.com/disrupted/blink-cmp-conventional-commits/,, +https://github.com/giuxtaposition/blink-cmp-copilot/,, +https://github.com/Kaiser-Yang/blink-cmp-dictionary/,, +https://github.com/bydlw98/blink-cmp-env/,, +https://github.com/Kaiser-Yang/blink-cmp-git/,, +https://github.com/erooke/blink-cmp-latex/,, +https://github.com/GaetanLepage/blink-cmp-nixpkgs-maintainers/,, +https://github.com/alexandre-abrioux/blink-cmp-npm.nvim/,, +https://github.com/ribru17/blink-cmp-spell/,, +https://github.com/mgalliou/blink-cmp-tmux/,, +https://github.com/archie-judd/blink-cmp-words/,, +https://github.com/marcoSven/blink-cmp-yanky/,, +https://github.com/fang2hou/blink-copilot/,, +https://github.com/moyiz/blink-emoji.nvim/,, +https://github.com/MahanRahmati/blink-nerdfont.nvim/,, +https://github.com/mikavilpas/blink-ripgrep.nvim/,, +https://github.com/Saghen/blink.compat/,, +https://github.com/Saghen/blink.indent/,, +https://github.com/dundalek/bloat.nvim/,, +https://github.com/HampusHauffman/block.nvim/,, https://github.com/uloco/bluloco.nvim/,, https://github.com/rockerBOO/boo-colorscheme-nvim/,, -https://github.com/nat-418/boole.nvim/,HEAD, +https://github.com/nat-418/boole.nvim/,, https://github.com/turbio/bracey.vim/,, https://github.com/fruit-in/brainfuck-vim/,, https://github.com/famiu/bufdelete.nvim/,, https://github.com/jlanzarotta/bufexplorer/,, -https://github.com/AndrewRadev/bufferize.vim/,HEAD, +https://github.com/AndrewRadev/bufferize.vim/,, https://github.com/akinsho/bufferline.nvim/,, -https://github.com/kwkarlwang/bufjump.nvim/,HEAD, -https://github.com/kwkarlwang/bufresize.nvim/,HEAD, +https://github.com/kwkarlwang/bufjump.nvim/,, +https://github.com/kwkarlwang/bufresize.nvim/,, https://github.com/bullets-vim/bullets.vim/,, https://github.com/itchyny/calendar.vim/,, https://github.com/bkad/camelcasemotion/,, https://github.com/catppuccin/nvim/,,catppuccin-nvim -https://github.com/catppuccin/vim/,HEAD,catppuccin-vim +https://github.com/catppuccin/vim/,,catppuccin-vim https://github.com/tyru/caw.vim/,, -https://github.com/uga-rosa/ccc.nvim/,HEAD, -https://github.com/Eandrju/cellular-automaton.nvim/,HEAD, -https://github.com/ms-jpq/chadtree/,HEAD, +https://github.com/uga-rosa/ccc.nvim/,, +https://github.com/Eandrju/cellular-automaton.nvim/,, +https://github.com/ms-jpq/chadtree/,, https://github.com/vim-scripts/changeColorScheme.vim/,, https://github.com/sudormrfbin/cheatsheet.nvim/,, -https://github.com/bngarren/checkmate.nvim/,HEAD, +https://github.com/bngarren/checkmate.nvim/,, https://github.com/yunlingz/ci_dark/,, -https://github.com/declancm/cinnamon.nvim/,HEAD, +https://github.com/declancm/cinnamon.nvim/,, https://github.com/projekt0n/circles.nvim/,, https://github.com/zootedb0t/citruszest.nvim/,, https://github.com/xavierd/clang_complete/,, -https://git.sr.ht/~p00f/clangd_extensions.nvim,HEAD, -https://github.com/greggh/claude-code.nvim/,HEAD, -https://github.com/pittcat/claude-fzf-history.nvim/,HEAD, -https://github.com/pittcat/claude-fzf.nvim/,HEAD, -https://github.com/coder/claudecode.nvim/,HEAD, +https://git.sr.ht/~p00f/clangd_extensions.nvim,, +https://github.com/greggh/claude-code.nvim/,, +https://github.com/pittcat/claude-fzf-history.nvim/,, +https://github.com/pittcat/claude-fzf.nvim/,, +https://github.com/coder/claudecode.nvim/,, https://github.com/rhysd/clever-f.vim/,, https://github.com/bbchung/clighter8/,, https://github.com/ekickx/clipboard-image.nvim/,, -https://github.com/laytan/cloak.nvim/,HEAD, -https://github.com/asheq/close-buffers.vim/,HEAD, +https://github.com/laytan/cloak.nvim/,, +https://github.com/asheq/close-buffers.vim/,, https://github.com/Civitasv/cmake-tools.nvim/,, https://github.com/winston0410/cmd-parser.nvim/,, -https://github.com/vim-scripts/cmdalias.vim/,HEAD, -https://github.com/tzachar/cmp-ai/,HEAD, -https://codeberg.org/FelipeLema/cmp-async-path/,HEAD, -https://github.com/crispgm/cmp-beancount/,HEAD, +https://github.com/vim-scripts/cmdalias.vim/,, +https://github.com/tzachar/cmp-ai/,, +https://codeberg.org/FelipeLema/cmp-async-path/,, +https://github.com/crispgm/cmp-beancount/,, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, -https://github.com/vappolinario/cmp-clippy/,HEAD, +https://github.com/vappolinario/cmp-clippy/,, https://github.com/hrsh7th/cmp-cmdline/,, -https://github.com/dmitmel/cmp-cmdline-history/,HEAD, +https://github.com/dmitmel/cmp-cmdline-history/,, https://github.com/PaterJason/cmp-conjure/,, -https://github.com/davidsierradz/cmp-conventionalcommits/,HEAD, -https://github.com/hrsh7th/cmp-copilot/,HEAD, -https://github.com/delphinus/cmp-ctags/,HEAD, -https://github.com/rcarriga/cmp-dap/,HEAD, -https://github.com/uga-rosa/cmp-dictionary/,HEAD, -https://github.com/dmitmel/cmp-digraphs/,HEAD, -https://github.com/SergioRibera/cmp-dotenv/,HEAD, +https://github.com/davidsierradz/cmp-conventionalcommits/,, +https://github.com/hrsh7th/cmp-copilot/,, +https://github.com/delphinus/cmp-ctags/,, +https://github.com/rcarriga/cmp-dap/,, +https://github.com/uga-rosa/cmp-dictionary/,, +https://github.com/dmitmel/cmp-digraphs/,, +https://github.com/SergioRibera/cmp-dotenv/,, https://github.com/hrsh7th/cmp-emoji/,, -https://github.com/mtoohey31/cmp-fish/,HEAD, -https://github.com/tzachar/cmp-fuzzy-buffer/,HEAD, -https://github.com/tzachar/cmp-fuzzy-path/,HEAD, -https://github.com/petertriho/cmp-git/,HEAD, -https://github.com/max397574/cmp-greek/,HEAD, +https://github.com/mtoohey31/cmp-fish/,, +https://github.com/tzachar/cmp-fuzzy-buffer/,, +https://github.com/tzachar/cmp-fuzzy-path/,, +https://github.com/petertriho/cmp-git/,, +https://github.com/max397574/cmp-greek/,, https://github.com/kdheepak/cmp-latex-symbols/,, -https://github.com/octaltree/cmp-look/,HEAD, -https://github.com/notomo/cmp-neosnippet/,HEAD, -https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/,HEAD, -https://github.com/David-Kunz/cmp-npm/,HEAD, +https://github.com/octaltree/cmp-look/,, +https://github.com/notomo/cmp-neosnippet/,, +https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/,, +https://github.com/David-Kunz/cmp-npm/,, https://github.com/hrsh7th/cmp-nvim-lsp/,, https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/,, -https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/,HEAD, +https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/,, https://github.com/hrsh7th/cmp-nvim-lua/,, -https://github.com/quangnguyen30192/cmp-nvim-tags/,HEAD, +https://github.com/quangnguyen30192/cmp-nvim-tags/,, https://github.com/quangnguyen30192/cmp-nvim-ultisnips/,, https://github.com/hrsh7th/cmp-omni/,, https://github.com/jmbuhr/cmp-pandoc-references/,, -https://github.com/aspeddro/cmp-pandoc.nvim/,HEAD, +https://github.com/aspeddro/cmp-pandoc.nvim/,, https://github.com/hrsh7th/cmp-path/,, -https://github.com/lukas-reineke/cmp-rg/,HEAD, -https://github.com/dcampos/cmp-snippy/,HEAD, +https://github.com/lukas-reineke/cmp-rg/,, +https://github.com/dcampos/cmp-snippy/,, https://github.com/f3fora/cmp-spell/,, -https://github.com/nzlov/cmp-tabby/,HEAD, +https://github.com/nzlov/cmp-tabby/,, https://github.com/tzachar/cmp-tabnine/,, https://github.com/andersevenrud/cmp-tmux/,, https://github.com/ray-x/cmp-treesitter/,, https://github.com/lukas-reineke/cmp-under-comparator/,, -https://github.com/dmitmel/cmp-vim-lsp/,HEAD, -https://github.com/micangl/cmp-vimtex/,HEAD, -https://github.com/pontusk/cmp-vimwiki-tags/,HEAD, +https://github.com/dmitmel/cmp-vim-lsp/,, +https://github.com/micangl/cmp-vimtex/,, +https://github.com/pontusk/cmp-vimwiki-tags/,, https://github.com/hrsh7th/cmp-vsnip/,, -https://github.com/tamago324/cmp-zsh/,HEAD, +https://github.com/tamago324/cmp-zsh/,, https://github.com/saadparwaiz1/cmp_luasnip/,, -https://github.com/chrisgrieser/cmp_yanky/,HEAD, +https://github.com/chrisgrieser/cmp_yanky/,, https://github.com/lalitmee/cobalt2.nvim/,, https://github.com/vn-ki/coc-clap/,, https://github.com/neoclide/coc-denite/,, @@ -246,95 +246,95 @@ https://github.com/neoclide/coc-neco/,, https://github.com/coc-extensions/coc-svelte/,, https://github.com/iamcco/coc-tailwindcss/,, https://github.com/neoclide/coc.nvim/,release, -https://github.com/manicmaniac/coconut.vim/,HEAD, -https://github.com/ravitemer/codecompanion-history.nvim/,HEAD, -https://github.com/franco-ruggeri/codecompanion-lualine.nvim/,HEAD, -https://github.com/franco-ruggeri/codecompanion-spinner.nvim/,HEAD, -https://github.com/olimorris/codecompanion.nvim/,HEAD, -https://github.com/mrjones2014/codesettings.nvim/,HEAD, -https://github.com/gorbit99/codewindow.nvim/,HEAD, +https://github.com/manicmaniac/coconut.vim/,, +https://github.com/ravitemer/codecompanion-history.nvim/,, +https://github.com/franco-ruggeri/codecompanion-lualine.nvim/,, +https://github.com/franco-ruggeri/codecompanion-spinner.nvim/,, +https://github.com/olimorris/codecompanion.nvim/,, +https://github.com/mrjones2014/codesettings.nvim/,, +https://github.com/gorbit99/codewindow.nvim/,, https://github.com/metakirby5/codi.vim/,, -https://github.com/archseer/colibri.vim/,HEAD, +https://github.com/archseer/colibri.vim/,, https://github.com/tjdevries/colorbuddy.nvim/,, -https://github.com/xzbdmw/colorful-menu.nvim/,HEAD, -https://github.com/nvim-zh/colorful-winsep.nvim/,HEAD, +https://github.com/xzbdmw/colorful-menu.nvim/,, +https://github.com/nvim-zh/colorful-winsep.nvim/,, https://github.com/lilydjwg/colorizer/,, -https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD, -https://github.com/mluders/comfy-line-numbers.nvim/,HEAD, +https://github.com/Domeee/com.cloudedmountain.ide.neovim/,, +https://github.com/mluders/comfy-line-numbers.nvim/,, https://github.com/wincent/command-t/,, -https://github.com/saifulapm/commasemi.nvim/,HEAD, -https://github.com/LudoPinelli/comment-box.nvim/,HEAD, +https://github.com/saifulapm/commasemi.nvim/,, +https://github.com/LudoPinelli/comment-box.nvim/,, https://github.com/numtostr/comment.nvim/,, https://github.com/rhysd/committia.vim/,, -https://github.com/xeluxee/competitest.nvim/,HEAD, -https://github.com/krady21/compiler-explorer.nvim/,HEAD, -https://github.com/Zeioth/compiler.nvim/,HEAD, +https://github.com/xeluxee/competitest.nvim/,, +https://github.com/krady21/compiler-explorer.nvim/,, +https://github.com/Zeioth/compiler.nvim/,, https://github.com/steelsojka/completion-buffers/,, https://github.com/nvim-lua/completion-nvim/,, https://github.com/aca/completion-tabnine/,, https://github.com/chikatoike/concealedyank.vim/,, https://github.com/rhysd/conflict-marker.vim/,, -https://github.com/stevearc/conform.nvim/,HEAD, +https://github.com/stevearc/conform.nvim/,, https://github.com/Olical/conjure/,, -https://github.com/niklasdewally/conjure.nvim/,HEAD, +https://github.com/niklasdewally/conjure.nvim/,, https://github.com/wellle/context.vim/,, https://github.com/Shougo/context_filetype.vim/,, -https://github.com/banjo/contextfiles.nvim/,HEAD, -https://github.com/zbirenbaum/copilot-cmp/,HEAD, -https://github.com/copilotlsp-nvim/copilot-lsp/,HEAD, -https://github.com/AndreM222/copilot-lualine/,HEAD, -https://github.com/zbirenbaum/copilot.lua/,HEAD, +https://github.com/banjo/contextfiles.nvim/,, +https://github.com/zbirenbaum/copilot-cmp/,, +https://github.com/copilotlsp-nvim/copilot-lsp/,, +https://github.com/AndreM222/copilot-lualine/,, +https://github.com/zbirenbaum/copilot.lua/,, https://github.com/github/copilot.vim/,, -https://github.com/tomtomjhj/coq-lsp.nvim/,HEAD, -https://github.com/ms-jpq/coq.artifacts/,HEAD, -https://github.com/ms-jpq/coq.thirdparty/,HEAD, +https://github.com/tomtomjhj/coq-lsp.nvim/,, +https://github.com/ms-jpq/coq.artifacts/,, +https://github.com/ms-jpq/coq.thirdparty/,, https://github.com/jvoorhis/coq.vim/,, https://github.com/ms-jpq/coq_nvim/,, -https://github.com/agda/cornelis/,HEAD, +https://github.com/agda/cornelis/,, https://github.com/lfilho/cosco.vim/,, https://github.com/nixprime/cpsm/,, https://github.com/saecki/crates.nvim/,, https://github.com/godlygeek/csapprox/,, -https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/,HEAD, -https://github.com/davidmh/cspell.nvim/,HEAD, +https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/,, +https://github.com/davidmh/cspell.nvim/,, https://github.com/chrisbra/csv.vim/,, -https://github.com/hat0uma/csvview.nvim/,HEAD, +https://github.com/hat0uma/csvview.nvim/,, https://github.com/JazzCore/ctrlp-cmatcher/,, https://github.com/FelikZ/ctrlp-py-matcher/,, https://github.com/amiorin/ctrlp-z/,, https://github.com/ctrlpvim/ctrlp.vim/,, -https://github.com/gbprod/cutlass.nvim/,HEAD, +https://github.com/gbprod/cutlass.nvim/,, https://github.com/scottmckendry/cyberdream.nvim/,, https://github.com/ghillb/cybu.nvim/,, -https://github.com/terrastruct/d2-vim/,HEAD, -https://github.com/JachymPutta/dailies.nvim/,HEAD, -https://github.com/Koalhack/darcubox-nvim/,HEAD, -https://github.com/ptdewey/darkearth-nvim/,HEAD, +https://github.com/terrastruct/d2-vim/,, +https://github.com/JachymPutta/dailies.nvim/,, +https://github.com/Koalhack/darcubox-nvim/,, +https://github.com/ptdewey/darkearth-nvim/,, https://github.com/dart-lang/dart-vim-plugin/,, -https://github.com/iofq/dart.nvim/,HEAD, -https://github.com/joseotaviorf/dash.vim/,HEAD, +https://github.com/iofq/dart.nvim/,, +https://github.com/joseotaviorf/dash.vim/,, https://github.com/nvimdev/dashboard-nvim/,, -https://github.com/Shougo/ddc-filter-matcher_head/,HEAD, -https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD, -https://github.com/tani/ddc-fuzzy/,HEAD, -https://github.com/Shougo/ddc-source-around/,HEAD, -https://github.com/LumaKernel/ddc-source-file/,HEAD, -https://github.com/Shougo/ddc-source-lsp/,HEAD, -https://github.com/Shougo/ddc-ui-native/,HEAD, -https://github.com/Shougo/ddc-ui-pum/,HEAD, -https://github.com/Shougo/ddc.vim/,HEAD, -https://github.com/MironPascalCaseFan/debugmaster.nvim/,HEAD, -https://github.com/andrewferrier/debugprint.nvim/,HEAD, +https://github.com/Shougo/ddc-filter-matcher_head/,, +https://github.com/Shougo/ddc-filter-sorter_rank/,, +https://github.com/tani/ddc-fuzzy/,, +https://github.com/Shougo/ddc-source-around/,, +https://github.com/LumaKernel/ddc-source-file/,, +https://github.com/Shougo/ddc-source-lsp/,, +https://github.com/Shougo/ddc-ui-native/,, +https://github.com/Shougo/ddc-ui-pum/,, +https://github.com/Shougo/ddc.vim/,, +https://github.com/MironPascalCaseFan/debugmaster.nvim/,, +https://github.com/andrewferrier/debugprint.nvim/,, https://github.com/Verf/deepwhite.nvim/,, https://github.com/kristijanhusak/defx-git/,, https://github.com/kristijanhusak/defx-icons/,, https://github.com/Shougo/defx.nvim/,, https://github.com/Raimondi/delimitMate/,, -https://github.com/mawkler/demicolon.nvim/,HEAD, +https://github.com/mawkler/demicolon.nvim/,, https://github.com/neoclide/denite-extra/,, https://github.com/neoclide/denite-git/,, https://github.com/Shougo/denite.nvim/,, -https://github.com/vim-denops/denops.vim/,HEAD, +https://github.com/vim-denops/denops.vim/,, https://github.com/Shougo/deol.nvim/,, https://github.com/deoplete-plugins/deoplete-clang/,, https://github.com/deoplete-plugins/deoplete-dictionary/,, @@ -354,260 +354,259 @@ https://github.com/carlitux/deoplete-ternjs/,, https://github.com/lighttiger2505/deoplete-vim-lsp/,, https://github.com/deoplete-plugins/deoplete-zsh/,, https://github.com/Shougo/deoplete.nvim/,, -https://github.com/maskudo/devdocs.nvim/,HEAD, +https://github.com/maskudo/devdocs.nvim/,, https://github.com/rhysd/devdocs.vim/,, -https://github.com/mahyarmirrashed/devexcuses.nvim/,HEAD, +https://github.com/mahyarmirrashed/devexcuses.nvim/,, https://github.com/vmchale/dhall-vim/,, -https://github.com/dgagn/diagflow.nvim/,HEAD, +https://github.com/dgagn/diagflow.nvim/,, https://github.com/onsails/diaglist.nvim/,, https://github.com/nvim-lua/diagnostic-nvim/,, -https://github.com/3rd/diagram.nvim/,HEAD, -https://github.com/monaqa/dial.nvim/,HEAD, -https://github.com/barrettruth/diffs.nvim/,HEAD, +https://github.com/3rd/diagram.nvim/,, +https://github.com/monaqa/dial.nvim/,, +https://github.com/barrettruth/diffs.nvim/,, https://github.com/sindrets/diffview.nvim/,, -https://github.com/elihunter173/dirbuf.nvim/,HEAD, +https://github.com/elihunter173/dirbuf.nvim/,, https://github.com/direnv/direnv.vim/,, -https://github.com/chipsenkbeil/distant.nvim/,HEAD, +https://github.com/chipsenkbeil/distant.nvim/,, https://github.com/doki-theme/doki-theme-vim/,, https://github.com/NTBBloodbath/doom-one.nvim/,, -https://github.com/MoaidHathot/dotnet.nvim/,HEAD, +https://github.com/MoaidHathot/dotnet.nvim/,, https://github.com/dracula/vim/,,dracula-vim -https://github.com/Mofiqul/dracula.nvim/,HEAD, +https://github.com/Mofiqul/dracula.nvim/,, https://github.com/stevearc/dressing.nvim/,, -https://github.com/Bekaboo/dropbar.nvim/,HEAD, -https://github.com/tamton-aquib/duck.nvim/,HEAD, -https://github.com/earthly/earthly.vim/,HEAD, -https://github.com/GustavEikaas/easy-dotnet.nvim/,HEAD, -https://github.com/JellyApple102/easyread.nvim/,HEAD, +https://github.com/Bekaboo/dropbar.nvim/,, +https://github.com/tamton-aquib/duck.nvim/,, +https://github.com/earthly/earthly.vim/,, +https://github.com/GustavEikaas/easy-dotnet.nvim/,, +https://github.com/JellyApple102/easyread.nvim/,, https://github.com/Shougo/echodoc.vim/,, -https://github.com/ph1losof/ecolog.nvim/,HEAD, +https://github.com/ph1losof/ecolog.nvim/,, https://github.com/sainnhe/edge/,, https://github.com/geldata/edgedb-vim/,, -https://github.com/folke/edgy.nvim/,HEAD, +https://github.com/folke/edgy.nvim/,, https://github.com/editorconfig/editorconfig-vim/,, https://github.com/gpanders/editorconfig.nvim/,, https://github.com/creativenull/efmls-configs-nvim/,, -https://github.com/elixir-tools/elixir-tools.nvim/,HEAD, +https://github.com/elixir-tools/elixir-tools.nvim/,, https://github.com/elmcast/elm-vim/,, https://github.com/dmix/elvish.vim/,, https://github.com/embark-theme/vim/,,embark-vim https://github.com/mattn/emmet-vim/,, https://github.com/vim-scripts/emodeline/,, -https://github.com/ovk/endec.nvim/,HEAD, +https://github.com/ovk/endec.nvim/,, https://github.com/vim-scripts/errormarker.vim/,, https://github.com/hachy/eva01.vim/,, https://github.com/sainnhe/everforest/,, -https://codeberg.org/evergarden/nvim,HEAD,evergarden-nvim -https://github.com/google/executor.nvim/,HEAD, -https://github.com/jinh0/eyeliner.nvim/,HEAD, +https://codeberg.org/evergarden/nvim,,evergarden-nvim +https://github.com/google/executor.nvim/,, +https://github.com/jinh0/eyeliner.nvim/,, https://github.com/fenetikm/falcon/,, -https://github.com/mahyarmirrashed/famous-quotes.nvim/,HEAD, +https://github.com/mahyarmirrashed/famous-quotes.nvim/,, https://github.com/brooth/far.vim/,, -https://github.com/Chaitanyabsprip/fastaction.nvim/,HEAD, -https://github.com/pteroctopus/faster.nvim/,HEAD, +https://github.com/Chaitanyabsprip/fastaction.nvim/,, +https://github.com/pteroctopus/faster.nvim/,, https://github.com/konfekt/fastfold/,, -https://github.com/madskjeldgaard/faust-nvim/,HEAD, +https://github.com/madskjeldgaard/faust-nvim/,, https://github.com/lilydjwg/fcitx.vim/,fcitx5, https://github.com/micampe/fennel.vim/,, https://github.com/wincent/ferret/,, https://github.com/bogado/file-line/,, https://github.com/lewis6991/fileline.nvim/,, -https://github.com/VonHeikemen/fine-cmdline.nvim/,HEAD, -https://github.com/glacambre/firenvim/,HEAD, +https://github.com/VonHeikemen/fine-cmdline.nvim/,, +https://github.com/glacambre/firenvim/,, https://github.com/andviro/flake8-vim/,, -https://github.com/folke/flash.nvim/,HEAD, -https://github.com/willothy/flatten.nvim/,HEAD, +https://github.com/folke/flash.nvim/,, +https://github.com/willothy/flatten.nvim/,, https://github.com/felipeagc/fleet-theme-nvim/,, -https://github.com/ggandor/flit.nvim/,HEAD, +https://github.com/ggandor/flit.nvim/,, https://github.com/ncm2/float-preview.nvim/,, -https://github.com/nvzone/floaterm/,HEAD, -https://github.com/liangxianzhe/floating-input.nvim/,HEAD, +https://github.com/nvzone/floaterm/,, +https://github.com/liangxianzhe/floating-input.nvim/,, https://github.com/floobits/floobits-neovim/,, -https://github.com/0xstepit/flow.nvim/,HEAD, -https://github.com/projectfluent/fluent.vim/,HEAD, -https://github.com/maxmx03/fluoromachine.nvim/,HEAD, -https://github.com/nvim-flutter/flutter-tools.nvim/,HEAD, -https://github.com/nvim-focus/focus.nvim/,HEAD, -https://github.com/anuvyklack/fold-preview.nvim/,HEAD, -https://github.com/jghauser/follow-md-links.nvim/,HEAD, +https://github.com/0xstepit/flow.nvim/,, +https://github.com/projectfluent/fluent.vim/,, +https://github.com/maxmx03/fluoromachine.nvim/,, +https://github.com/nvim-flutter/flutter-tools.nvim/,, +https://github.com/nvim-focus/focus.nvim/,, +https://github.com/anuvyklack/fold-preview.nvim/,, +https://github.com/jghauser/follow-md-links.nvim/,, https://github.com/mhartington/formatter.nvim/,, https://github.com/megaannum/forms/,, -https://github.com/rubiin/fortune.nvim/,HEAD, -https://github.com/charm-and-friends/freeze.nvim/,HEAD, +https://github.com/rubiin/fortune.nvim/,, +https://github.com/charm-and-friends/freeze.nvim/,, https://github.com/rafamadriz/friendly-snippets/,, -https://github.com/SuperBo/fugit2.nvim/,HEAD, +https://github.com/SuperBo/fugit2.nvim/,, https://github.com/shumphrey/fugitive-gitlab.vim/,, https://github.com/BeneCollyridam/futhark-vim/,, -https://github.com/tzachar/fuzzy.nvim/,HEAD, +https://github.com/tzachar/fuzzy.nvim/,, https://github.com/rktjmp/fwatch.nvim/,, https://github.com/A7Lavinraj/fyler.nvim/,stable, https://github.com/stsewd/fzf-checkout.vim/,, -https://github.com/monkoose/fzf-hoogle.vim/,HEAD, +https://github.com/monkoose/fzf-hoogle.vim/,, https://github.com/gfanto/fzf-lsp.nvim/,, https://github.com/junegunn/fzf.vim/,, https://github.com/NTBBloodbath/galaxyline.nvim/,, -https://github.com/Zeioth/garbage-day.nvim/,HEAD, +https://github.com/Zeioth/garbage-day.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/Teatek/gdscript-extended-lsp.nvim/,, +https://github.com/David-Kunz/gen.nvim/,, https://github.com/jsfaint/gen_tags.vim/,, https://github.com/gentoo/gentoo-syntax/,, https://github.com/ldelossa/gh.nvim/,, https://github.com/ndmitchell/ghcid/,, https://github.com/eagletmt/ghcmod-vim/,, https://github.com/f-person/git-blame.nvim/,, -https://github.com/akinsho/git-conflict.nvim/,HEAD, -https://github.com/juansalvatore/git-dashboard-nvim/,HEAD, +https://github.com/akinsho/git-conflict.nvim/,, +https://github.com/juansalvatore/git-dashboard-nvim/,, https://github.com/moyiz/git-dev.nvim/,, https://github.com/rhysd/git-messenger.vim/,, -https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD, -https://github.com/polarmutex/git-worktree.nvim/,HEAD, -https://github.com/projekt0n/github-nvim-theme/,HEAD, -https://github.com/wintermute-cell/gitignore.nvim/,HEAD, +https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,, +https://github.com/polarmutex/git-worktree.nvim/,, +https://github.com/projekt0n/github-nvim-theme/,, +https://github.com/wintermute-cell/gitignore.nvim/,, https://github.com/vim-scripts/gitignore.vim/,, -https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim,HEAD, -https://github.com/LionyxML/gitlineage.nvim/,HEAD, +https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim,, +https://github.com/LionyxML/gitlineage.nvim/,, https://github.com/ruifm/gitlinker.nvim/,, https://github.com/trevorhauter/gitportal.nvim/,, https://github.com/gregsexton/gitv/,, -https://github.com/DNLHC/glance.nvim/,HEAD, +https://github.com/DNLHC/glance.nvim/,, https://github.com/ellisonleao/glow.nvim/,, -https://github.com/ray-x/go.nvim/,HEAD, -https://github.com/dchinmay2/godbolt.nvim/,HEAD, +https://github.com/ray-x/go.nvim/,, +https://github.com/dchinmay2/godbolt.nvim/,, https://github.com/roman/golden-ratio/,, https://github.com/buoto/gotests-vim/,, https://github.com/rmagatti/goto-preview/,, https://github.com/junegunn/goyo.vim/,, -https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD, +https://github.com/brymer-meneses/grammar-guard.nvim/,, https://github.com/liuchengxu/graphviz.vim/,, -https://github.com/cbochs/grapple.nvim/,HEAD, +https://github.com/cbochs/grapple.nvim/,, https://github.com/blazkowolf/gruber-darker.nvim/,, https://github.com/morhetz/gruvbox/,, -https://github.com/Xoconoch/gruvbox-alabaster.nvim/,HEAD, -https://github.com/luisiacc/gruvbox-baby/,HEAD, +https://github.com/Xoconoch/gruvbox-alabaster.nvim/,, +https://github.com/luisiacc/gruvbox-baby/,, https://github.com/gruvbox-community/gruvbox/,,gruvbox-community https://github.com/eddyekofo94/gruvbox-flat.nvim/,, https://github.com/sainnhe/gruvbox-material/,, -https://github.com/f4z3r/gruvbox-material.nvim/,HEAD, +https://github.com/f4z3r/gruvbox-material.nvim/,, https://github.com/ellisonleao/gruvbox.nvim/,, -https://github.com/nvimdev/guard-collection/,HEAD, -https://github.com/nvimdev/guard.nvim/,HEAD, -https://github.com/nmac427/guess-indent.nvim/,HEAD, -https://github.com/ray-x/guihua.lua/,HEAD, +https://github.com/nvimdev/guard-collection/,, +https://github.com/nvimdev/guard.nvim/,, +https://github.com/nmac427/guess-indent.nvim/,, +https://github.com/ray-x/guihua.lua/,, https://github.com/sjl/gundo.vim/,, https://github.com/junegunn/gv.vim/,, -https://github.com/chrishrb/gx.nvim/,HEAD, -https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD, -https://github.com/m4xshen/hardtime.nvim/,HEAD, -https://git.sr.ht/~sircmpwn/hare.vim,HEAD, -https://github.com/ThePrimeagen/harpoon/,master, +https://github.com/chrishrb/gx.nvim/,, +https://github.com/TheSnakeWitcher/hardhat.nvim/,, +https://github.com/m4xshen/hardtime.nvim/,, +https://git.sr.ht/~sircmpwn/hare.vim,, +https://github.com/ThePrimeagen/harpoon/,, https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2 -https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD, -https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD, +https://github.com/kiyoon/haskell-scope-highlighting.nvim/,, +https://github.com/mrcjkb/haskell-snippets.nvim/,, https://github.com/neovimhaskell/haskell-vim/,, -https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, +https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,, https://github.com/travitch/hasksyn/,, -https://github.com/StackInTheWild/headhunter.nvim/,HEAD, -https://github.com/lukas-reineke/headlines.nvim/,HEAD, +https://github.com/StackInTheWild/headhunter.nvim/,, +https://github.com/lukas-reineke/headlines.nvim/,, https://github.com/rebelot/heirline.nvim/,, -https://github.com/qvalentin/helm-ls.nvim/,HEAD, -https://github.com/OXY2DEV/helpview.nvim/,HEAD, -https://github.com/RaafatTurki/hex.nvim/,HEAD, +https://github.com/qvalentin/helm-ls.nvim/,, +https://github.com/OXY2DEV/helpview.nvim/,, +https://github.com/RaafatTurki/hex.nvim/,, https://github.com/Yggdroot/hiPairs/,, -https://github.com/tzachar/highlight-undo.nvim/,HEAD, +https://github.com/tzachar/highlight-undo.nvim/,, https://github.com/pimalaya/himalaya-vim/,, -https://github.com/m-demare/hlargs.nvim/,HEAD, -https://github.com/shellRaining/hlchunk.nvim/,HEAD, +https://github.com/m-demare/hlargs.nvim/,, +https://github.com/shellRaining/hlchunk.nvim/,, https://github.com/mpickering/hlint-refactor-vim/,, https://github.com/calops/hmts.nvim/,, https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, https://github.com/smoka7/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, -https://github.com/TheBlob42/houdini.nvim/,HEAD, -https://github.com/lewis6991/hover.nvim/,HEAD, -https://github.com/othree/html5.vim/,HEAD, -https://github.com/julienvincent/hunk.nvim/,HEAD, -https://github.com/jellydn/hurl.nvim/,HEAD, -https://github.com/nvimtools/hydra.nvim/,HEAD, +https://github.com/TheBlob42/houdini.nvim/,, +https://github.com/lewis6991/hover.nvim/,, +https://github.com/othree/html5.vim/,, +https://github.com/julienvincent/hunk.nvim/,, +https://github.com/jellydn/hurl.nvim/,, +https://github.com/nvimtools/hydra.nvim/,, https://github.com/mboughaba/i3config.vim/,, https://github.com/cocopon/iceberg.vim/,, https://github.com/idris-hackers/idris-vim/,, https://github.com/idris-community/idris2-nvim/,, https://github.com/edwinb/idris2-vim/,, -https://github.com/keaising/im-select.nvim/,HEAD, -https://github.com/HakonHarnes/img-clip.nvim/,HEAD, +https://github.com/keaising/im-select.nvim/,, +https://github.com/HakonHarnes/img-clip.nvim/,, https://github.com/lewis6991/impatient.nvim/,, -https://github.com/backdround/improved-search.nvim/,HEAD, -https://github.com/smjonas/inc-rename.nvim/,HEAD, -https://github.com/b0o/incline.nvim/,HEAD, +https://github.com/backdround/improved-search.nvim/,, +https://github.com/smjonas/inc-rename.nvim/,, +https://github.com/b0o/incline.nvim/,, https://github.com/nishigori/increment-activator/,, https://github.com/haya14busa/incsearch-easymotion.vim/,, https://github.com/haya14busa/incsearch.vim/,, https://github.com/lukas-reineke/indent-blankline.nvim/,, https://github.com/Darazaki/indent-o-matic/,, -https://github.com/arsham/indent-tools.nvim/,HEAD, +https://github.com/arsham/indent-tools.nvim/,, https://github.com/Yggdroot/indentLine/,, https://github.com/ciaranm/inkpot/,, -https://github.com/jbyuki/instant.nvim/,HEAD, -https://github.com/pta2002/intellitab.nvim/,HEAD, +https://github.com/jbyuki/instant.nvim/,, +https://github.com/pta2002/intellitab.nvim/,, https://github.com/parsonsmatt/intero-neovim/,, https://github.com/keith/investigate.vim/,, https://github.com/neutaaaaan/iosvkem/,, -https://github.com/ajbucci/ipynb.nvim/,HEAD, +https://github.com/ajbucci/ipynb.nvim/,, https://github.com/twerth/ir_black/,, -https://github.com/Vigemus/iron.nvim/,HEAD, +https://github.com/Vigemus/iron.nvim/,, https://github.com/haya14busa/is.vim/,, -https://github.com/mizlan/iswap.nvim/,HEAD, +https://github.com/mizlan/iswap.nvim/,, https://github.com/vim-scripts/jdaddy.vim/,, -https://github.com/mahyarmirrashed/jdd.nvim/,HEAD, +https://github.com/mahyarmirrashed/jdd.nvim/,, https://github.com/davidhalter/jedi-vim/,, https://github.com/metalelf0/jellybeans-nvim/,, https://github.com/nanotech/jellybeans.vim/,, -https://github.com/HiPhish/jinja.vim/,HEAD, -https://github.com/NicolasGB/jj.nvim/,HEAD, +https://github.com/HiPhish/jinja.vim/,, +https://github.com/NicolasGB/jj.nvim/,, https://github.com/vito-c/jq.vim/,, https://github.com/neoclide/jsonc.vim/,, -https://git.myzel394.app/Myzel394/jsonfly.nvim,HEAD, -https://github.com/julelang/jule.nvim/,HEAD, -https://github.com/julelang/jule.nvim/,HEAD, +https://git.myzel394.app/Myzel394/jsonfly.nvim,, +https://github.com/julelang/jule.nvim/,, https://github.com/JuliaEditorSupport/julia-vim/,, -https://github.com/GCBallesteros/jupytext.nvim/,HEAD, -https://github.com/thesimonho/kanagawa-paper.nvim/,HEAD, +https://github.com/GCBallesteros/jupytext.nvim/,, +https://github.com/thesimonho/kanagawa-paper.nvim/,, https://github.com/rebelot/kanagawa.nvim/,, -https://github.com/webhooked/kanso.nvim/,HEAD, -https://github.com/imsnif/kdl.vim/,HEAD, -https://github.com/anuvyklack/keymap-layer.nvim/,HEAD, -https://github.com/mikesmithgh/kitty-scrollback.nvim/,HEAD, -https://github.com/serenevoid/kiwi.nvim/,HEAD, +https://github.com/webhooked/kanso.nvim/,, +https://github.com/imsnif/kdl.vim/,, +https://github.com/anuvyklack/keymap-layer.nvim/,, +https://github.com/mikesmithgh/kitty-scrollback.nvim/,, +https://github.com/serenevoid/kiwi.nvim/,, https://github.com/kmonad/kmonad-vim/,, -https://github.com/frabjous/knap/,HEAD, -https://github.com/oskarnurm/koda.nvim/,HEAD, +https://github.com/frabjous/knap/,, +https://github.com/oskarnurm/koda.nvim/,, https://github.com/b3nj5m1n/kommentary/,, https://github.com/udalov/kotlin-vim/,, -https://github.com/mistweaverco/kulala.nvim/,HEAD, -https://github.com/slugbyte/lackluster.nvim/,HEAD, +https://github.com/mistweaverco/kulala.nvim/,, +https://github.com/slugbyte/lackluster.nvim/,, https://github.com/qnighy/lalrpop.vim/,, -https://github.com/Wansmer/langmapper.nvim/,HEAD, +https://github.com/Wansmer/langmapper.nvim/,, https://github.com/sk1418/last256/,, https://github.com/latex-box-team/latex-box/,, -https://github.com/dundalek/lazy-lsp.nvim/,HEAD, -https://github.com/folke/lazy.nvim/,HEAD, +https://github.com/dundalek/lazy-lsp.nvim/,, +https://github.com/folke/lazy.nvim/,, https://github.com/folke/lazydev.nvim/,, -https://github.com/crnvl96/lazydocker.nvim/,HEAD, +https://github.com/crnvl96/lazydocker.nvim/,, https://github.com/kdheepak/lazygit.nvim/,, -https://github.com/swaits/lazyjj.nvim/,HEAD, +https://github.com/swaits/lazyjj.nvim/,, https://github.com/Julian/lean.nvim/,, https://github.com/leanprover/lean.vim/,, -https://github.com/ggandor/leap-ast.nvim/,HEAD, -https://codeberg.org/andyg/leap.nvim/,HEAD, -https://github.com/kawre/leetcode.nvim/,HEAD, -https://github.com/mrjones2014/legendary.nvim/,HEAD, +https://github.com/ggandor/leap-ast.nvim/,, +https://codeberg.org/andyg/leap.nvim/,, +https://github.com/kawre/leetcode.nvim/,, +https://github.com/mrjones2014/legendary.nvim/,, https://github.com/camspiers/lens.vim/,, -https://github.com/oribarilan/lensline.nvim/,HEAD, +https://github.com/oribarilan/lensline.nvim/,, https://github.com/thirtythreeforty/lessspace.vim/,, https://github.com/cohama/lexima.vim/,, -https://github.com/lmburns/lf.nvim/,HEAD, +https://github.com/lmburns/lf.nvim/,, https://github.com/ptzz/lf.vim/,, https://github.com/LucHermitte/lh-brackets/,, https://github.com/LucHermitte/lh-vim-lib/,, @@ -617,9 +616,9 @@ https://github.com/shinchu/lightline-gruvbox.vim/,, https://github.com/spywhere/lightline-lsp/,, https://github.com/itchyny/lightline.vim/,, https://github.com/ggandor/lightspeed.nvim/,, -https://github.com/markgandolfo/lightswitch.nvim/,HEAD, +https://github.com/markgandolfo/lightswitch.nvim/,, https://github.com/junegunn/limelight.vim/,, -https://github.com/AndrewRadev/linediff.vim/,HEAD, +https://github.com/AndrewRadev/linediff.vim/,, https://github.com/lf-lang/lingua-franca.vim/,, https://github.com/tamago324/lir.nvim/,, https://github.com/kkharji/lispdocs.nvim/,, @@ -627,125 +626,125 @@ https://github.com/ldelossa/litee-calltree.nvim/,, https://github.com/ldelossa/litee-filetree.nvim/,, https://github.com/ldelossa/litee-symboltree.nvim/,, https://github.com/ldelossa/litee.nvim/,, -https://github.com/smjonas/live-command.nvim/,HEAD, -https://github.com/brianhuster/live-preview.nvim/,HEAD, -https://github.com/saecki/live-rename.nvim/,HEAD, -https://github.com/azratul/live-share.nvim/,HEAD, -https://github.com/ggml-org/llama.vim/,HEAD, -https://github.com/huggingface/llm.nvim/,HEAD, +https://github.com/smjonas/live-command.nvim/,, +https://github.com/brianhuster/live-preview.nvim/,, +https://github.com/saecki/live-rename.nvim/,, +https://github.com/azratul/live-share.nvim/,, +https://github.com/ggml-org/llama.vim/,, +https://github.com/huggingface/llm.nvim/,, https://github.com/folke/lsp-colors.nvim/,, -https://github.com/joechrisellis/lsp-format-modifications.nvim/,HEAD, -https://github.com/lukas-reineke/lsp-format.nvim/,HEAD, -https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD, +https://github.com/joechrisellis/lsp-format-modifications.nvim/,, +https://github.com/lukas-reineke/lsp-format.nvim/,, +https://github.com/lvimuser/lsp-inlayhints.nvim/,, https://github.com/Issafalcon/lsp-overloads.nvim/,main, https://github.com/ahmedkhalf/lsp-rooter.nvim/,, https://github.com/nvim-lua/lsp-status.nvim/,, -https://github.com/VonHeikemen/lsp-zero.nvim/,v3.x, +https://github.com/VonHeikemen/lsp-zero.nvim/,, https://github.com/nvim-lua/lsp_extensions.nvim/,, -https://git.sr.ht/~whynothugo/lsp_lines.nvim,HEAD, +https://git.sr.ht/~whynothugo/lsp_lines.nvim,, https://github.com/ray-x/lsp_signature.nvim/,, https://github.com/lspcontainers/lspcontainers.nvim/,, -https://github.com/deathbeam/lspecho.nvim/,HEAD, +https://github.com/deathbeam/lspecho.nvim/,, https://github.com/onsails/lspkind.nvim/,, https://github.com/nvimdev/lspsaga.nvim/,, -https://github.com/barreiroleo/ltex_extra.nvim/,HEAD, -https://github.com/nvim-java/lua-async/,HEAD, +https://github.com/barreiroleo/ltex_extra.nvim/,, +https://github.com/nvim-java/lua-async/,, https://github.com/arkav/lualine-lsp-progress/,, -https://github.com/evesdropper/luasnip-latex-snippets.nvim/,HEAD, +https://github.com/evesdropper/luasnip-latex-snippets.nvim/,, https://github.com/alvarosevilla95/luatab.nvim/,, -https://github.com/lopi-py/luau-lsp.nvim/,HEAD, +https://github.com/lopi-py/luau-lsp.nvim/,, https://github.com/mkasa/lushtags/,, -https://github.com/Bilal2453/luvit-meta/,HEAD, -https://github.com/dccsillag/magma-nvim/,HEAD, -https://github.com/forest-nvim/maple.nvim/,HEAD, -https://github.com/winston0410/mark-radar.nvim/,HEAD, -https://github.com/OXY2DEV/markdoc.nvim/,HEAD, +https://github.com/Bilal2453/luvit-meta/,, +https://github.com/dccsillag/magma-nvim/,, +https://github.com/forest-nvim/maple.nvim/,, +https://github.com/winston0410/mark-radar.nvim/,, +https://github.com/OXY2DEV/markdoc.nvim/,, https://github.com/iamcco/markdown-preview.nvim/,, -https://github.com/tadmccorkle/markdown.nvim/,HEAD, -https://github.com/David-Kunz/markid/,HEAD, +https://github.com/tadmccorkle/markdown.nvim/,, +https://github.com/David-Kunz/markid/,, https://github.com/chentoast/marks.nvim/,, -https://github.com/OXY2DEV/markview.nvim/,HEAD, -https://github.com/mason-org/mason-lspconfig.nvim/,HEAD, -https://github.com/jay-babu/mason-null-ls.nvim/,HEAD, -https://github.com/jay-babu/mason-nvim-dap.nvim/,HEAD, -https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD, -https://github.com/mason-org/mason.nvim/,HEAD, +https://github.com/OXY2DEV/markview.nvim/,, +https://github.com/mason-org/mason-lspconfig.nvim/,, +https://github.com/jay-babu/mason-null-ls.nvim/,, +https://github.com/jay-babu/mason-nvim-dap.nvim/,, +https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,, +https://github.com/mason-org/mason.nvim/,, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, -https://github.com/kaicataldo/material.vim/,HEAD, +https://github.com/kaicataldo/material.vim/,, https://github.com/mattn/calendar-vim/,,mattn-calendar-vim https://github.com/vim-scripts/mayansmoke/,, -https://github.com/ravitemer/mcphub.nvim/,HEAD, -https://github.com/chikamichi/mediawiki.vim/,HEAD, +https://github.com/ravitemer/mcphub.nvim/,, +https://github.com/chikamichi/mediawiki.vim/,, https://github.com/savq/melange-nvim/,, -https://github.com/mellow-theme/mellow.nvim/,HEAD, -https://github.com/lsig/messenger.nvim/,HEAD, +https://github.com/mellow-theme/mellow.nvim/,, +https://github.com/lsig/messenger.nvim/,, https://github.com/xero/miasma.nvim/,, https://github.com/dasupradyumna/midnight.nvim/,, -https://github.com/hadronized/mind.nvim/,HEAD, -https://github.com/nvim-mini/mini-git/,HEAD, -https://github.com/nvim-mini/mini.ai/,HEAD, -https://github.com/nvim-mini/mini.align/,HEAD, -https://github.com/nvim-mini/mini.animate/,HEAD, -https://github.com/nvim-mini/mini.base16/,HEAD, -https://github.com/nvim-mini/mini.basics/,HEAD, -https://github.com/nvim-mini/mini.bracketed/,HEAD, -https://github.com/nvim-mini/mini.bufremove/,HEAD, -https://github.com/nvim-mini/mini.clue/,HEAD, -https://github.com/nvim-mini/mini.cmdline/,HEAD, -https://github.com/nvim-mini/mini.colors/,HEAD, -https://github.com/nvim-mini/mini.comment/,HEAD, -https://github.com/nvim-mini/mini.completion/,HEAD, -https://github.com/nvim-mini/mini.cursorword/,HEAD, -https://github.com/nvim-mini/mini.deps/,HEAD, -https://github.com/nvim-mini/mini.diff/,HEAD, -https://github.com/nvim-mini/mini.doc/,HEAD, -https://github.com/nvim-mini/mini.extra/,HEAD, -https://github.com/nvim-mini/mini.files/,HEAD, -https://github.com/nvim-mini/mini.fuzzy/,HEAD, -https://github.com/nvim-mini/mini.hipatterns/,HEAD, -https://github.com/nvim-mini/mini.hues/,HEAD, -https://github.com/nvim-mini/mini.icons/,HEAD, -https://github.com/nvim-mini/mini.indentscope/,HEAD, -https://github.com/nvim-mini/mini.jump/,HEAD, -https://github.com/nvim-mini/mini.jump2d/,HEAD, -https://github.com/nvim-mini/mini.keymap/,HEAD, -https://github.com/nvim-mini/mini.map/,HEAD, -https://github.com/nvim-mini/mini.misc/,HEAD, -https://github.com/nvim-mini/mini.move/,HEAD, -https://github.com/nvim-mini/mini.notify/,HEAD, +https://github.com/hadronized/mind.nvim/,, +https://github.com/nvim-mini/mini-git/,, +https://github.com/nvim-mini/mini.ai/,, +https://github.com/nvim-mini/mini.align/,, +https://github.com/nvim-mini/mini.animate/,, +https://github.com/nvim-mini/mini.base16/,, +https://github.com/nvim-mini/mini.basics/,, +https://github.com/nvim-mini/mini.bracketed/,, +https://github.com/nvim-mini/mini.bufremove/,, +https://github.com/nvim-mini/mini.clue/,, +https://github.com/nvim-mini/mini.cmdline/,, +https://github.com/nvim-mini/mini.colors/,, +https://github.com/nvim-mini/mini.comment/,, +https://github.com/nvim-mini/mini.completion/,, +https://github.com/nvim-mini/mini.cursorword/,, +https://github.com/nvim-mini/mini.deps/,, +https://github.com/nvim-mini/mini.diff/,, +https://github.com/nvim-mini/mini.doc/,, +https://github.com/nvim-mini/mini.extra/,, +https://github.com/nvim-mini/mini.files/,, +https://github.com/nvim-mini/mini.fuzzy/,, +https://github.com/nvim-mini/mini.hipatterns/,, +https://github.com/nvim-mini/mini.hues/,, +https://github.com/nvim-mini/mini.icons/,, +https://github.com/nvim-mini/mini.indentscope/,, +https://github.com/nvim-mini/mini.jump/,, +https://github.com/nvim-mini/mini.jump2d/,, +https://github.com/nvim-mini/mini.keymap/,, +https://github.com/nvim-mini/mini.map/,, +https://github.com/nvim-mini/mini.misc/,, +https://github.com/nvim-mini/mini.move/,, +https://github.com/nvim-mini/mini.notify/,, https://github.com/nvim-mini/mini.nvim/,, -https://github.com/nvim-mini/mini.operators/,HEAD, -https://github.com/nvim-mini/mini.pairs/,HEAD, -https://github.com/nvim-mini/mini.pick/,HEAD, -https://github.com/nvim-mini/mini.sessions/,HEAD, -https://github.com/nvim-mini/mini.snippets/,HEAD, -https://github.com/nvim-mini/mini.splitjoin/,HEAD, -https://github.com/nvim-mini/mini.starter/,HEAD, -https://github.com/nvim-mini/mini.statusline/,HEAD, -https://github.com/nvim-mini/mini.surround/,HEAD, -https://github.com/nvim-mini/mini.tabline/,HEAD, -https://github.com/nvim-mini/mini.trailspace/,HEAD, -https://github.com/nvim-mini/mini.visits/,HEAD, +https://github.com/nvim-mini/mini.operators/,, +https://github.com/nvim-mini/mini.pairs/,, +https://github.com/nvim-mini/mini.pick/,, +https://github.com/nvim-mini/mini.sessions/,, +https://github.com/nvim-mini/mini.snippets/,, +https://github.com/nvim-mini/mini.splitjoin/,, +https://github.com/nvim-mini/mini.starter/,, +https://github.com/nvim-mini/mini.statusline/,, +https://github.com/nvim-mini/mini.surround/,, +https://github.com/nvim-mini/mini.tabline/,, +https://github.com/nvim-mini/mini.trailspace/,, +https://github.com/nvim-mini/mini.visits/,, https://github.com/wfxr/minimap.vim/,, -https://github.com/milanglacier/minuet-ai.nvim/,HEAD, -https://github.com/jghauser/mkdir.nvim/,main, -https://github.com/jakewvincent/mkdnflow.nvim/,HEAD, +https://github.com/milanglacier/minuet-ai.nvim/,, +https://github.com/jghauser/mkdir.nvim/,, +https://github.com/jakewvincent/mkdnflow.nvim/,, https://github.com/SidOfc/mkdx/,, -https://github.com/gsuuon/model.nvim/,HEAD, -https://github.com/mawkler/modicator.nvim/,HEAD, -https://github.com/miikanissi/modus-themes.nvim/,HEAD, +https://github.com/gsuuon/model.nvim/,, +https://github.com/mawkler/modicator.nvim/,, +https://github.com/miikanissi/modus-themes.nvim/,, https://github.com/tomasr/molokai/,, -https://github.com/benlubas/molten-nvim/,HEAD, -https://github.com/jackplus-xyz/monaspace.nvim/,HEAD, -https://github.com/loctvl842/monokai-pro.nvim/,HEAD, +https://github.com/benlubas/molten-nvim/,, +https://github.com/jackplus-xyz/monaspace.nvim/,, +https://github.com/loctvl842/monokai-pro.nvim/,, https://github.com/shaunsingh/moonlight.nvim/,, -https://github.com/leafo/moonscript-vim/,HEAD, +https://github.com/leafo/moonscript-vim/,, https://github.com/yegappan/mru/,, -https://github.com/jake-stewart/multicursor.nvim/,HEAD, -https://github.com/smoka7/multicursors.nvim/,HEAD, -https://github.com/AckslD/muren.nvim/,HEAD, -https://github.com/jbyuki/nabla.nvim/,HEAD, +https://github.com/jake-stewart/multicursor.nvim/,, +https://github.com/smoka7/multicursors.nvim/,, +https://github.com/AckslD/muren.nvim/,, +https://github.com/jbyuki/nabla.nvim/,, https://github.com/ncm2/ncm2/,, https://github.com/ncm2/ncm2-bufword/,, https://github.com/ncm2/ncm2-cssomni/,, @@ -766,239 +765,239 @@ https://github.com/eagletmt/neco-ghc/,, https://github.com/ujihisa/neco-look/,, https://github.com/Shougo/neco-syntax/,, https://github.com/Shougo/neco-vim/,, -https://github.com/nvim-neo-tree/neo-tree.nvim/,HEAD, +https://github.com/nvim-neo-tree/neo-tree.nvim/,, https://github.com/Shougo/neocomplete.vim/,, -https://github.com/folke/neoconf.nvim/,HEAD, -https://github.com/IogaMaster/neocord/,main, +https://github.com/folke/neoconf.nvim/,, +https://github.com/IogaMaster/neocord/,, https://github.com/KeitaNakamura/neodark.vim/,, -https://github.com/folke/neodev.nvim/,HEAD, +https://github.com/folke/neodev.nvim/,, https://github.com/sbdchd/neoformat/,, -https://github.com/danymat/neogen/,HEAD, +https://github.com/danymat/neogen/,, https://github.com/NeogitOrg/neogit/,, https://github.com/Shougo/neoinclude.vim/,, https://github.com/neomake/neomake/,, -https://github.com/casedami/neomodern.nvim/,HEAD, +https://github.com/casedami/neomodern.nvim/,, https://github.com/Shougo/neomru.vim/,, -https://github.com/neomutt/neomutt.vim/,HEAD, +https://github.com/neomutt/neomutt.vim/,, https://github.com/rafamadriz/neon/,, -https://github.com/ii14/neorepl.nvim/,HEAD, -https://github.com/nvim-neorg/neorg-telescope/,HEAD, +https://github.com/ii14/neorepl.nvim/,, +https://github.com/nvim-neorg/neorg-telescope/,, https://github.com/karb94/neoscroll.nvim/,, https://github.com/Shougo/neosnippet-snippets/,, https://github.com/Shougo/neosnippet.vim/,, https://github.com/kassio/neoterm/,, -https://github.com/rcasia/neotest-bash/,HEAD, -https://github.com/orjangj/neotest-ctest/,HEAD, -https://github.com/sidlatau/neotest-dart/,HEAD, -https://github.com/MarkEmmons/neotest-deno/,HEAD, -https://github.com/Issafalcon/neotest-dotnet/,HEAD, -https://github.com/jfpedroza/neotest-elixir/,HEAD, -https://github.com/llllvvuu/neotest-foundry/,HEAD, -https://github.com/nvim-neotest/neotest-go/,HEAD, -https://github.com/fredrikaverpil/neotest-golang/,HEAD, -https://github.com/weilbith/neotest-gradle/,HEAD, -https://github.com/alfaix/neotest-gtest/,HEAD, -https://github.com/MrcJkb/neotest-haskell/,HEAD, -https://github.com/rcasia/neotest-java/,HEAD, -https://github.com/nvim-neotest/neotest-jest/,HEAD, -https://github.com/zidhuss/neotest-minitest/,HEAD, -https://github.com/adrigzr/neotest-mocha/,HEAD, -https://github.com/theutz/neotest-pest/,HEAD, -https://github.com/olimorris/neotest-phpunit/,HEAD, -https://github.com/thenbe/neotest-playwright/,HEAD, -https://github.com/nvim-neotest/neotest-plenary/,HEAD, -https://github.com/nvim-neotest/neotest-python/,HEAD, -https://github.com/olimorris/neotest-rspec/,HEAD, -https://github.com/rouge8/neotest-rust/,HEAD, -https://github.com/stevanmilic/neotest-scala/,HEAD, -https://github.com/shunsambongi/neotest-testthat/,HEAD, -https://github.com/marilari88/neotest-vitest/,HEAD, -https://github.com/lawrence-laz/neotest-zig/,HEAD, +https://github.com/rcasia/neotest-bash/,, +https://github.com/orjangj/neotest-ctest/,, +https://github.com/sidlatau/neotest-dart/,, +https://github.com/MarkEmmons/neotest-deno/,, +https://github.com/Issafalcon/neotest-dotnet/,, +https://github.com/jfpedroza/neotest-elixir/,, +https://github.com/llllvvuu/neotest-foundry/,, +https://github.com/nvim-neotest/neotest-go/,, +https://github.com/fredrikaverpil/neotest-golang/,, +https://github.com/weilbith/neotest-gradle/,, +https://github.com/alfaix/neotest-gtest/,, +https://github.com/MrcJkb/neotest-haskell/,, +https://github.com/rcasia/neotest-java/,, +https://github.com/nvim-neotest/neotest-jest/,, +https://github.com/zidhuss/neotest-minitest/,, +https://github.com/adrigzr/neotest-mocha/,, +https://github.com/theutz/neotest-pest/,, +https://github.com/olimorris/neotest-phpunit/,, +https://github.com/thenbe/neotest-playwright/,, +https://github.com/nvim-neotest/neotest-plenary/,, +https://github.com/nvim-neotest/neotest-python/,, +https://github.com/olimorris/neotest-rspec/,, +https://github.com/rouge8/neotest-rust/,, +https://github.com/stevanmilic/neotest-scala/,, +https://github.com/shunsambongi/neotest-testthat/,, +https://github.com/marilari88/neotest-vitest/,, +https://github.com/lawrence-laz/neotest-zig/,, https://github.com/Shatur/neovim-ayu/,, https://github.com/cloudhead/neovim-fuzzy/,, https://github.com/jeffkreeftmeijer/neovim-sensible/,, -https://github.com/saxon1964/neovim-tips/,HEAD, -https://github.com/trunk-io/neovim-trunk/,HEAD, +https://github.com/saxon1964/neovim-tips/,, +https://github.com/trunk-io/neovim-trunk/,, https://github.com/Shougo/neoyank.vim/,, https://github.com/preservim/nerdcommenter/,, https://github.com/preservim/nerdtree/,, https://github.com/Xuyuanp/nerdtree-git-plugin/,, -https://github.com/2KAbhishek/nerdy.nvim/,HEAD, -https://github.com/miversen33/netman.nvim/,HEAD, -https://github.com/prichrd/netrw.nvim/,HEAD, +https://github.com/2KAbhishek/nerdy.nvim/,, +https://github.com/miversen33/netman.nvim/,, +https://github.com/prichrd/netrw.nvim/,, https://github.com/fiatjaf/neuron.vim/,, https://github.com/Olical/nfnl/,main, -https://github.com/joeveiga/ng.nvim/,HEAD, +https://github.com/joeveiga/ng.nvim/,, https://github.com/chr4/nginx.vim/,, -https://codeberg.org/koibtw/nidhogg.nvim,HEAD, +https://codeberg.org/koibtw/nidhogg.nvim,, https://github.com/oxfist/night-owl.nvim/,, https://github.com/bluz71/vim-nightfly-colors/,,nightfly https://github.com/EdenEast/nightfox.nvim/,, https://github.com/Alexis12119/nightly.nvim/,, https://github.com/zah/nim.vim/,, -https://github.com/figsoda/nix-develop.nvim/,HEAD, -https://github.com/tamago324/nlsp-settings.nvim/,main, +https://github.com/figsoda/nix-develop.nvim/,, +https://github.com/tamago324/nlsp-settings.nvim/,, https://github.com/mcchrish/nnn.vim/,, https://github.com/aktersnurra/no-clown-fiesta.nvim/,, -https://github.com/shortcuts/no-neck-pain.nvim/,HEAD, +https://github.com/shortcuts/no-neck-pain.nvim/,, https://github.com/kartikp10/noctis.nvim/,, -https://github.com/folke/noice.nvim/,HEAD, -https://github.com/nvimtools/none-ls.nvim/,HEAD, +https://github.com/folke/noice.nvim/,, +https://github.com/nvimtools/none-ls.nvim/,, https://github.com/nordtheme/vim/,,nord-vim https://github.com/shaunsingh/nord.nvim/,, https://github.com/andersevenrud/nordic.nvim/,, -https://github.com/vigoux/notifier.nvim/,HEAD, +https://github.com/vigoux/notifier.nvim/,, https://github.com/jlesquembre/nterm.nvim/,, https://github.com/jose-elias-alvarez/null-ls.nvim/,, https://github.com/nacro90/numb.nvim/,, -https://github.com/nvchad/nvchad/,HEAD, -https://github.com/nvchad/ui/,HEAD,nvchad-ui +https://github.com/nvchad/nvchad/,, +https://github.com/nvchad/ui/,,nvchad-ui https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,, -https://github.com/AckslD/nvim-FeMaco.lua/,HEAD, +https://github.com/AckslD/nvim-FeMaco.lua/,, https://github.com/nathanmsmith/nvim-ale-diagnostic/,, -https://github.com/mfussenegger/nvim-ansible/,HEAD, +https://github.com/mfussenegger/nvim-ansible/,, https://github.com/windwp/nvim-autopairs/,, -https://github.com/Canop/nvim-bacon/,HEAD, -https://github.com/code-biscuits/nvim-biscuits/,HEAD, +https://github.com/Canop/nvim-bacon/,, +https://github.com/code-biscuits/nvim-biscuits/,, https://github.com/kevinhwang91/nvim-bqf/,, https://github.com/ojroques/nvim-bufdel/,, https://github.com/roxma/nvim-cm-racer/,, https://github.com/weilbith/nvim-code-action-menu/,, -https://github.com/willothy/nvim-cokeline/,HEAD, +https://github.com/willothy/nvim-cokeline/,, https://github.com/catgoose/nvim-colorizer.lua/,, https://github.com/terrortylor/nvim-comment/,, https://github.com/roxma/nvim-completion-manager/,, https://github.com/klen/nvim-config-local/,, -https://github.com/andythigpen/nvim-coverage/,HEAD, +https://github.com/andythigpen/nvim-coverage/,, https://github.com/ya2s/nvim-cursorline/,, https://codeberg.org/mfussenegger/nvim-dap/,, -https://github.com/jedrzejboczar/nvim-dap-cortex-debug/,HEAD, -https://github.com/docker/nvim-dap-docker/,HEAD, -https://github.com/leoluz/nvim-dap-go/,HEAD, -https://github.com/julianolf/nvim-dap-lldb/,HEAD, -https://codeberg.org/mfussenegger/nvim-dap-python/,HEAD, -https://github.com/rinx/nvim-dap-rego/,HEAD, -https://github.com/jonboh/nvim-dap-rr/,HEAD, -https://github.com/suketa/nvim-dap-ruby/,HEAD, +https://github.com/jedrzejboczar/nvim-dap-cortex-debug/,, +https://github.com/docker/nvim-dap-docker/,, +https://github.com/leoluz/nvim-dap-go/,, +https://github.com/julianolf/nvim-dap-lldb/,, +https://codeberg.org/mfussenegger/nvim-dap-python/,, +https://github.com/rinx/nvim-dap-rego/,, +https://github.com/jonboh/nvim-dap-rr/,, +https://github.com/suketa/nvim-dap-ruby/,, https://github.com/rcarriga/nvim-dap-ui/,, -https://github.com/igorlfs/nvim-dap-view/,HEAD, +https://github.com/igorlfs/nvim-dap-view/,, https://github.com/theHamsta/nvim-dap-virtual-text/,, -https://github.com/mxsdev/nvim-dap-vscode-js/,HEAD, -https://github.com/amrbashir/nvim-docs-view/,HEAD, -https://github.com/chrisgrieser/nvim-early-retirement/,HEAD, +https://github.com/mxsdev/nvim-dap-vscode-js/,, +https://github.com/amrbashir/nvim-docs-view/,, +https://github.com/chrisgrieser/nvim-early-retirement/,, https://github.com/allendang/nvim-expand-expr/,, https://github.com/vijaymarupudi/nvim-fzf/,, https://github.com/vijaymarupudi/nvim-fzf-commands/,, https://github.com/sakhnik/nvim-gdb/,, -https://github.com/chrisgrieser/nvim-genghis/,HEAD, -https://github.com/booperlv/nvim-gomove/,HEAD, -https://github.com/brenoprata10/nvim-highlight-colors/,HEAD, +https://github.com/chrisgrieser/nvim-genghis/,, +https://github.com/booperlv/nvim-gomove/,, +https://github.com/brenoprata10/nvim-highlight-colors/,, https://github.com/Iron-E/nvim-highlite/,, https://github.com/kevinhwang91/nvim-hlslens/,, https://github.com/neovimhaskell/nvim-hs.vim/,, -https://github.com/idanarye/nvim-impairative/,HEAD, -https://github.com/nvim-java/nvim-java/,HEAD, -https://github.com/nvim-java/nvim-java-core/,HEAD, -https://github.com/nvim-java/nvim-java-dap/,HEAD, -https://github.com/nvim-java/nvim-java-refactor/,HEAD, -https://github.com/nvim-java/nvim-java-test/,HEAD, +https://github.com/idanarye/nvim-impairative/,, +https://github.com/nvim-java/nvim-java/,, +https://github.com/nvim-java/nvim-java-core/,, +https://github.com/nvim-java/nvim-java-dap/,, +https://github.com/nvim-java/nvim-java-refactor/,, +https://github.com/nvim-java/nvim-java-test/,, https://codeberg.org/mfussenegger/nvim-jdtls/,, https://github.com/gennaro-tedesco/nvim-jqx/,, -https://gitlab.com/usmcamp0811/nvim-julia-autotest,HEAD, -https://github.com/yorickpeterse/nvim-jump/,HEAD, -https://github.com/anasinnyk/nvim-k8s-crd/,HEAD, -https://github.com/ethanholz/nvim-lastplace/,HEAD, +https://gitlab.com/usmcamp0811/nvim-julia-autotest,, +https://github.com/yorickpeterse/nvim-jump/,, +https://github.com/anasinnyk/nvim-k8s-crd/,, +https://github.com/ethanholz/nvim-lastplace/,, https://github.com/kosayoda/nvim-lightbulb/,, https://github.com/josa42/nvim-lightline-lsp/,, -https://github.com/martineausimon/nvim-lilypond-suite/,HEAD, +https://github.com/martineausimon/nvim-lilypond-suite/,, https://codeberg.org/mfussenegger/nvim-lint/,, -https://github.com/antosha417/nvim-lsp-file-operations/,HEAD, -https://github.com/mrded/nvim-lsp-notify/,HEAD, +https://github.com/antosha417/nvim-lsp-file-operations/,, +https://github.com/mrded/nvim-lsp-notify/,, https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,, https://github.com/neovim/nvim-lspconfig/,, https://github.com/RishabhRD/nvim-lsputils/,, -https://github.com/sam4llis/nvim-lua-gf/,HEAD, -https://github.com/bfredl/nvim-luadev/,HEAD, +https://github.com/sam4llis/nvim-lua-gf/,, +https://github.com/bfredl/nvim-luadev/,, https://github.com/rafcamlet/nvim-luapad/,, https://github.com/scalameta/nvim-metals/,, https://github.com/gpanders/nvim-moonwalk/,, https://github.com/SmiteshP/nvim-navbuddy/,, -https://github.com/smiteshp/nvim-navic/,HEAD, +https://github.com/smiteshp/nvim-navic/,, https://github.com/AckslD/nvim-neoclip.lua/,, -https://github.com/ghostbuster91/nvim-next/,HEAD, +https://github.com/ghostbuster91/nvim-next/,, https://github.com/ya2s/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, -https://github.com/LhKipp/nvim-nu/,HEAD, -https://github.com/sitiom/nvim-numbertoggle/,HEAD, -https://github.com/chrisgrieser/nvim-origami/,HEAD, +https://github.com/LhKipp/nvim-nu/,, +https://github.com/sitiom/nvim-numbertoggle/,, +https://github.com/chrisgrieser/nvim-origami/,, https://github.com/ojroques/nvim-osc52/,, https://github.com/julienvincent/nvim-paredit/,, -https://github.com/gpanders/nvim-parinfer/,HEAD, +https://github.com/gpanders/nvim-parinfer/,, https://github.com/gennaro-tedesco/nvim-peekup/,, -https://github.com/yorickpeterse/nvim-pqf/,HEAD, -https://github.com/jamestthompson3/nvim-remote-containers/,HEAD, -https://github.com/olrtg/nvim-rename-state/,HEAD, -https://github.com/duane9/nvim-rg/,HEAD, +https://github.com/yorickpeterse/nvim-pqf/,, +https://github.com/jamestthompson3/nvim-remote-containers/,, +https://github.com/olrtg/nvim-rename-state/,, +https://github.com/duane9/nvim-rg/,, https://github.com/chrisgrieser/nvim-rip-substitute/,, -https://github.com/chrisgrieser/nvim-scissors/,HEAD, -https://github.com/petertriho/nvim-scrollbar/,HEAD, +https://github.com/chrisgrieser/nvim-scissors/,, +https://github.com/petertriho/nvim-scrollbar/,, https://github.com/dstein64/nvim-scrollview/,, -https://github.com/s1n7ax/nvim-search-and-replace/,HEAD, -https://github.com/michaelrommel/nvim-silicon/,HEAD, +https://github.com/s1n7ax/nvim-search-and-replace/,, +https://github.com/michaelrommel/nvim-silicon/,, https://github.com/garymjr/nvim-snippets/,, -https://github.com/dcampos/nvim-snippy/,HEAD, +https://github.com/dcampos/nvim-snippy/,, https://github.com/ishan9299/nvim-solarized-lua/,, -https://github.com/prismatic-koi/nvim-sops/,HEAD, -https://github.com/chrisgrieser/nvim-spider/,HEAD, +https://github.com/prismatic-koi/nvim-sops/,, +https://github.com/chrisgrieser/nvim-spider/,, https://github.com/kylechui/nvim-surround/,main, -https://github.com/svermeulen/nvim-teal-maker/,HEAD, +https://github.com/svermeulen/nvim-teal-maker/,, https://github.com/norcalli/nvim-terminal.lua/,, https://github.com/klen/nvim-test/,, -https://github.com/chrisgrieser/nvim-tinygit/,HEAD, +https://github.com/chrisgrieser/nvim-tinygit/,, https://github.com/nvim-tree/nvim-tree.lua/,, https://github.com/nvim-treesitter/nvim-treesitter/,, https://github.com/nvim-treesitter/nvim-treesitter-context/,, -https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, -https://github.com/nvim-treesitter/nvim-treesitter-locals/,HEAD, -https://github.com/theHamsta/nvim-treesitter-pairs/,HEAD, +https://github.com/RRethy/nvim-treesitter-endwise/,, +https://github.com/nvim-treesitter/nvim-treesitter-locals/,, +https://github.com/theHamsta/nvim-treesitter-pairs/,, https://github.com/eddiebergman/nvim-treesitter-pyfold/,, https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, -https://github.com/PaterJason/nvim-treesitter-sexp/,HEAD, +https://github.com/PaterJason/nvim-treesitter-sexp/,, https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,main, https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,master,nvim-treesitter-textobjects-legacy -https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD, -https://github.com/AckslD/nvim-trevJ.lua/,HEAD, +https://github.com/RRethy/nvim-treesitter-textsubjects/,, +https://github.com/AckslD/nvim-trevJ.lua/,, https://github.com/windwp/nvim-ts-autotag/,, https://github.com/joosepalviste/nvim-ts-context-commentstring/,, -https://github.com/kevinhwang91/nvim-ufo/,HEAD, -https://github.com/samjwill/nvim-unception/,HEAD, -https://github.com/apyra/nvim-unity/,HEAD, -https://github.com/chrisgrieser/nvim-various-textobjs/,HEAD, -https://github.com/yioneko/nvim-vtsls/,HEAD, +https://github.com/kevinhwang91/nvim-ufo/,, +https://github.com/samjwill/nvim-unception/,, +https://github.com/apyra/nvim-unity/,, +https://github.com/chrisgrieser/nvim-various-textobjs/,, +https://github.com/yioneko/nvim-vtsls/,, https://github.com/AckslD/nvim-whichkey-setup.lua/,, -https://github.com/s1n7ax/nvim-window-picker/,HEAD, +https://github.com/s1n7ax/nvim-window-picker/,, https://github.com/roxma/nvim-yarp/,, https://github.com/andersevenrud/nvim_context_vt/,, https://github.com/neovim/nvimdev.nvim/,, -https://github.com/zbirenbaum/nvterm/,HEAD, -https://github.com/nvzone/menu/,HEAD,nvzone-menu -https://github.com/nvzone/minty/,HEAD,nvzone-minty -https://github.com/nvzone/typr/,HEAD,nvzone-typr -https://github.com/nvzone/volt/,HEAD,nvzone-volt -https://github.com/obsidian-nvim/obsidian.nvim/,HEAD, -https://github.com/tarides/ocaml.nvim/,HEAD, +https://github.com/zbirenbaum/nvterm/,, +https://github.com/nvzone/menu/,,nvzone-menu +https://github.com/nvzone/minty/,,nvzone-minty +https://github.com/nvzone/typr/,,nvzone-typr +https://github.com/nvzone/volt/,,nvzone-volt +https://github.com/obsidian-nvim/obsidian.nvim/,, +https://github.com/tarides/ocaml.nvim/,, https://github.com/nvimdev/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, -https://github.com/refractalize/oil-git-status.nvim/,HEAD, -https://github.com/benomahony/oil-git.nvim/,HEAD, -https://github.com/JezerM/oil-lsp-diagnostics.nvim/,HEAD, -https://github.com/eero-lehtinen/oklch-color-picker.nvim/,HEAD, -https://github.com/nomnivore/ollama.nvim/,HEAD, +https://github.com/refractalize/oil-git-status.nvim/,, +https://github.com/benomahony/oil-git.nvim/,, +https://github.com/JezerM/oil-lsp-diagnostics.nvim/,, +https://github.com/eero-lehtinen/oklch-color-picker.nvim/,, +https://github.com/nomnivore/ollama.nvim/,, https://github.com/yonlu/omni.vim/,, -https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD, +https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,, https://github.com/Th3Whit3Wolf/one-nvim/,, -https://github.com/jbyuki/one-small-step-for-vimkind/,HEAD, +https://github.com/jbyuki/one-small-step-for-vimkind/,, https://github.com/navarasu/onedark.nvim/,, https://github.com/joshdick/onedark.vim/,, https://github.com/LunarVim/onedarker.nvim/,, @@ -1007,73 +1006,73 @@ https://github.com/sonph/onehalf/,, https://github.com/rmehri01/onenord.nvim/,main, https://github.com/tyru/open-browser-github.vim/,, https://github.com/tyru/open-browser.vim/,, -https://github.com/nickjvandyke/opencode.nvim/,HEAD, +https://github.com/nickjvandyke/opencode.nvim/,, https://github.com/Almo7aya/openingh.nvim/,, -https://github.com/salkin-mada/openscad.nvim/,HEAD, -https://github.com/bitbloxhub/org-notebook.nvim/,HEAD, -https://github.com/chipsenkbeil/org-roam.nvim/,HEAD, -https://github.com/rgroli/other.nvim/,HEAD, +https://github.com/salkin-mada/openscad.nvim/,, +https://github.com/bitbloxhub/org-notebook.nvim/,, +https://github.com/chipsenkbeil/org-roam.nvim/,, +https://github.com/rgroli/other.nvim/,, https://github.com/jmbuhr/otter.nvim/,, -https://github.com/hedyhli/outline.nvim/,HEAD, -https://github.com/stevearc/overseer.nvim/,HEAD, -https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD, +https://github.com/hedyhli/outline.nvim/,, +https://github.com/stevearc/overseer.nvim/,, +https://github.com/nyoom-engineering/oxocarbon.nvim/,, https://github.com/vuki656/package-info.nvim/,, https://github.com/wbthomason/packer.nvim/,, https://github.com/drewtempelmeyer/palenight.vim/,, https://github.com/JoosepAlviste/palenightfall.nvim/,, -https://github.com/roobert/palette.nvim/,HEAD, +https://github.com/roobert/palette.nvim/,, https://github.com/NLKNguyen/papercolor-theme/,, -https://github.com/pappasam/papercolor-theme-slim/,HEAD, +https://github.com/pappasam/papercolor-theme-slim/,, https://github.com/dundalek/parpar.nvim/,, -https://github.com/frankroeder/parrot.nvim/,HEAD, -https://github.com/OXY2DEV/patterns.nvim/,HEAD, -https://github.com/lewis6991/pckr.nvim/,HEAD, +https://github.com/frankroeder/parrot.nvim/,, +https://github.com/OXY2DEV/patterns.nvim/,, +https://github.com/lewis6991/pckr.nvim/,, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, -https://github.com/toppair/peek.nvim/,HEAD, -https://github.com/t-troebst/perfanno.nvim/,HEAD, -https://github.com/olimorris/persisted.nvim/,HEAD, +https://github.com/toppair/peek.nvim/,, +https://github.com/t-troebst/perfanno.nvim/,, +https://github.com/olimorris/persisted.nvim/,, https://github.com/folke/persistence.nvim/,, https://github.com/Weissle/persistent-breakpoints.nvim/,, -https://github.com/pest-parser/pest.vim/,HEAD, +https://github.com/pest-parser/pest.vim/,, https://github.com/lifepillar/pgsql.vim/,, https://github.com/phha/zenburn.nvim/,,phha-zenburn -https://github.com/pablopunk/pi.nvim/,HEAD, +https://github.com/pablopunk/pi.nvim/,, https://github.com/motus/pig.vim/,, -https://github.com/weirongxu/plantuml-previewer.vim/,HEAD, +https://github.com/weirongxu/plantuml-previewer.vim/,, https://github.com/aklt/plantuml-syntax/,, -https://github.com/goropikari/plantuml.nvim/,HEAD, -https://github.com/olivercederborg/poimandres.nvim/,HEAD, -https://github.com/epwalsh/pomo.nvim/,HEAD, +https://github.com/goropikari/plantuml.nvim/,, +https://github.com/olivercederborg/poimandres.nvim/,, +https://github.com/epwalsh/pomo.nvim/,, https://github.com/dleonard0/pony-vim-syntax/,, https://github.com/RishabhRD/popfix/,, https://github.com/nvim-lua/popup.nvim/,, -https://github.com/tris203/precognition.nvim/,HEAD, +https://github.com/tris203/precognition.nvim/,, https://github.com/andweeb/presence.nvim/,, https://github.com/sotte/presenting.vim/,, -https://github.com/ewilazarus/preto/,HEAD, -https://github.com/anuvyklack/pretty-fold.nvim/,HEAD, +https://github.com/ewilazarus/preto/,, +https://github.com/anuvyklack/pretty-fold.nvim/,, https://github.com/vim-scripts/prev_indent/,, https://github.com/DrKJeff16/project.nvim/,, -https://github.com/GnikDroy/projections.nvim/,HEAD, -https://github.com/kevinhwang91/promise-async/,HEAD, +https://github.com/GnikDroy/projections.nvim/,, +https://github.com/kevinhwang91/promise-async/,, https://github.com/frigoeu/psc-ide-vim/,, -https://github.com/Shougo/pum.vim/,HEAD, +https://github.com/Shougo/pum.vim/,, https://github.com/purescript-contrib/purescript-vim/,, https://github.com/python-mode/python-mode/,, https://github.com/vim-python/python-syntax/,, https://github.com/AlphaTechnolog/pywal.nvim/,, -https://github.com/marcelbeumer/qfctl.nvim/,HEAD, -https://github.com/codethread/qmk.nvim/,HEAD, +https://github.com/marcelbeumer/qfctl.nvim/,, +https://github.com/codethread/qmk.nvim/,, https://github.com/quarto-dev/quarto-nvim/,, https://github.com/unblevable/quick-scope/,, -https://github.com/stevearc/quicker.nvim/,HEAD, +https://github.com/stevearc/quicker.nvim/,, https://github.com/stefandtw/quickfix-reflector.vim/,, https://github.com/dannyob/quickfixstatus/,, -https://github.com/jbyuki/quickmath.nvim/,HEAD, +https://github.com/jbyuki/quickmath.nvim/,, https://github.com/luochen1990/rainbow/,, -https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD, -https://github.com/mechatroner/rainbow_csv/,HEAD, +https://gitlab.com/HiPhish/rainbow-delimiters.nvim,, +https://github.com/mechatroner/rainbow_csv/,, https://github.com/kien/rainbow_parentheses.vim/,, https://github.com/vim-scripts/random.vim/,, https://github.com/winston0410/range-highlight.nvim/,, @@ -1082,41 +1081,41 @@ https://github.com/rafaqz/ranger.vim/,, https://github.com/vim-scripts/rcshell.vim/,, https://github.com/ryvnf/readline.vim/,, https://github.com/theprimeagen/refactoring.nvim/,, -https://github.com/mawkler/refjump.nvim/,HEAD, +https://github.com/mawkler/refjump.nvim/,, https://github.com/tversteeg/registers.nvim/,, https://github.com/vladdoster/remember.nvim/,, -https://github.com/amitds1997/remote-nvim.nvim/,HEAD, -https://github.com/nosduco/remote-sshfs.nvim/,HEAD, +https://github.com/amitds1997/remote-nvim.nvim/,, +https://github.com/nosduco/remote-sshfs.nvim/,, https://github.com/filipdutescu/renamer.nvim/,, https://github.com/MeanderingProgrammer/render-markdown.nvim/,, -https://github.com/gabrielpoca/replacer.nvim/,HEAD, -https://github.com/9seconds/repolink.nvim/,HEAD, -https://github.com/stevearc/resession.nvim/,HEAD, -https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim +https://github.com/gabrielpoca/replacer.nvim/,, +https://github.com/9seconds/repolink.nvim/,, +https://github.com/stevearc/resession.nvim/,, +https://github.com/vim-scripts/restore_view.vim/,,restore-view-vim https://github.com/gu-fan/riv.vim/,, https://github.com/kevinhwang91/rnvimr/,, https://github.com/mfukar/robotframework-vim/,, https://github.com/ron-rs/ron.vim/,, https://github.com/rose-pine/neovim/,main,rose-pine -https://github.com/seblyng/roslyn.nvim/,HEAD, +https://github.com/seblyng/roslyn.nvim/,, https://github.com/keith/rspec.vim/,, https://github.com/ccarpita/rtorrent-syntax-file/,, -https://github.com/TheLazyCat00/runner-nvim/,HEAD, +https://github.com/TheLazyCat00/runner-nvim/,, https://github.com/simrat39/rust-tools.nvim/,, https://github.com/rust-lang/rust.vim/,, -https://github.com/tris203/rzls.nvim/,HEAD, +https://github.com/tris203/rzls.nvim/,, https://github.com/hauleth/sad.vim/,, https://github.com/vmware-archive/salt-vim/,, -https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim -https://github.com/lewis6991/satellite.nvim/,HEAD, -https://github.com/cenk1cenk2/schema-companion.nvim/,HEAD, -https://github.com/davidgranstrom/scnvim/,HEAD, -https://github.com/tiagovla/scope.nvim/,HEAD, -https://github.com/Root-lee/screensaver.nvim/,HEAD, -https://github.com/0xJohnnyboy/scretch.nvim/,HEAD, +https://github.com/samodostal/image.nvim/,,samodostal-image-nvim +https://github.com/lewis6991/satellite.nvim/,, +https://github.com/cenk1cenk2/schema-companion.nvim/,, +https://github.com/davidgranstrom/scnvim/,, +https://github.com/tiagovla/scope.nvim/,, +https://github.com/Root-lee/screensaver.nvim/,, +https://github.com/0xJohnnyboy/scretch.nvim/,, https://github.com/Xuyuanp/scrollbar.nvim/,, https://github.com/cakebaker/scss-syntax.vim/,, -https://github.com/mahyarmirrashed/search-and-replace.nvim/,HEAD, +https://github.com/mahyarmirrashed/search-and-replace.nvim/,, https://github.com/VonHeikemen/searchbox.nvim/,, https://github.com/RobertAudi/securemodelines/,, https://github.com/megaannum/self/,, @@ -1124,198 +1123,198 @@ https://github.com/jaxbot/semantic-highlight.vim/,, https://github.com/numirias/semshi/,, https://github.com/junegunn/seoul256.vim/,, https://github.com/osyo-manga/shabadou.vim/,, -https://github.com/nvzone/showkeys/,HEAD, -https://github.com/folke/sidekick.nvim/,HEAD, +https://github.com/nvzone/showkeys/,, +https://github.com/folke/sidekick.nvim/,, https://github.com/AndrewRadev/sideways.vim/,, https://github.com/skim-rs/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, https://github.com/kovisoft/slimv/,, -https://github.com/danielfalk/smart-open.nvim/,0.2.x, +https://github.com/danielfalk/smart-open.nvim/,, https://github.com/mrjones2014/smart-splits.nvim/,, https://github.com/m4xshen/smartcolumn.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, https://github.com/ibhagwan/smartyank.nvim/,, -https://github.com/sphamba/smear-cursor.nvim/,HEAD, -https://github.com/folke/snacks.nvim/,HEAD, +https://github.com/sphamba/smear-cursor.nvim/,, +https://github.com/folke/snacks.nvim/,, https://github.com/camspiers/snap/,, -https://github.com/leath-dub/snipe.nvim/,HEAD, +https://github.com/leath-dub/snipe.nvim/,, https://github.com/norcalli/snippets.nvim/,, -https://github.com/craftzdog/solarized-osaka.nvim/,HEAD, -https://github.com/shaunsingh/solarized.nvim/,HEAD, -https://gitlab.com/schrieveslaach/sonarlint.nvim,HEAD, -https://github.com/iamkarasik/sonarqube.nvim/,HEAD, +https://github.com/craftzdog/solarized-osaka.nvim/,, +https://github.com/shaunsingh/solarized.nvim/,, +https://gitlab.com/schrieveslaach/sonarlint.nvim,, +https://github.com/iamkarasik/sonarqube.nvim/,, https://github.com/sainnhe/sonokai/,, -https://github.com/sQVe/sort.nvim/,HEAD, +https://github.com/sQVe/sort.nvim/,, https://github.com/chikatoike/sourcemap.vim/,, https://github.com/liuchengxu/space-vim/,, -https://github.com/FireIsGood/spaceman.nvim/,HEAD, -https://github.com/cxwx/specs.nvim/,HEAD, -https://github.com/lewis6991/spellsitter.nvim/,HEAD, -https://github.com/ravibrock/spellwarn.nvim/,HEAD, +https://github.com/FireIsGood/spaceman.nvim/,, +https://github.com/cxwx/specs.nvim/,, +https://github.com/lewis6991/spellsitter.nvim/,, +https://github.com/ravibrock/spellwarn.nvim/,, https://github.com/stsewd/sphinx.nvim/,, https://github.com/sjl/splice.vim/,, https://github.com/vimlab/split-term.vim/,, https://github.com/AndrewRadev/splitjoin.vim/,, -https://github.com/JavaHello/spring-boot.nvim/,HEAD, +https://github.com/JavaHello/spring-boot.nvim/,, https://github.com/kkharji/sqlite.lua/,, https://github.com/srcery-colors/srcery-vim/,, https://github.com/chr4/sslsecure.vim/,, -https://github.com/cshuaimin/ssr.nvim/,HEAD, +https://github.com/cshuaimin/ssr.nvim/,, https://github.com/luukvbaal/stabilize.nvim/,, -https://github.com/tamton-aquib/staline.nvim/,main, +https://github.com/tamton-aquib/staline.nvim/,, https://github.com/eigenfoo/stan-vim/,, -https://github.com/josegamez82/starrynight/,HEAD, +https://github.com/josegamez82/starrynight/,, https://github.com/darfink/starsearch.vim/,, -https://github.com/max397574/startup.nvim/,HEAD, +https://github.com/max397574/startup.nvim/,, https://github.com/luukvbaal/statuscol.nvim/,, -https://github.com/arnamak/stay-centered.nvim/,HEAD, -https://github.com/duqcyxwd/stringbreaker.nvim/,HEAD, +https://github.com/arnamak/stay-centered.nvim/,, +https://github.com/duqcyxwd/stringbreaker.nvim/,, https://github.com/folke/styler.nvim/,, -https://github.com/teto/stylish.nvim/,HEAD, -https://github.com/gbprod/substitute.nvim/,HEAD, -https://github.com/kvrohit/substrata.nvim/,HEAD, -https://github.com/supermaven-inc/supermaven-nvim/,HEAD, +https://github.com/teto/stylish.nvim/,, +https://github.com/gbprod/substitute.nvim/,, +https://github.com/kvrohit/substrata.nvim/,, +https://github.com/supermaven-inc/supermaven-nvim/,, https://github.com/ervandew/supertab/,, https://github.com/ur4ltz/surround.nvim/,, https://github.com/peterbjorgensen/sved/,, https://github.com/jamespeapen/swayconfig.vim/,, https://github.com/keith/swift.vim/,, https://github.com/AndrewRadev/switch.vim/,, -https://github.com/neovim-idea/switcher-nvim/,HEAD, -https://github.com/Wansmer/symbol-usage.nvim/,HEAD, +https://github.com/neovim-idea/switcher-nvim/,, +https://github.com/Wansmer/symbol-usage.nvim/,, https://github.com/simrat39/symbols-outline.nvim/,, https://github.com/vim-syntastic/syntastic/,, -https://github.com/nanozuki/tabby.nvim/,HEAD, +https://github.com/nanozuki/tabby.nvim/,, https://github.com/kdheepak/tabline.nvim/,, https://github.com/vim-scripts/tabmerge/,, https://github.com/codota/tabnine-vim/,, https://github.com/gcmt/taboo.vim/,, -https://github.com/abecodes/tabout.nvim/,HEAD, +https://github.com/abecodes/tabout.nvim/,, https://github.com/Shougo/tabpagebuffer.vim/,, https://github.com/godlygeek/tabular/,, https://github.com/AndrewRadev/tagalong.vim/,, https://github.com/preservim/tagbar/,, https://github.com/vim-scripts/taglist.vim/,, -https://github.com/luckasRanarison/tailwind-tools.nvim/,HEAD, -https://github.com/themaxmarchuk/tailwindcss-colors.nvim/,HEAD, -https://github.com/fredehoey/tardis.nvim/,HEAD, +https://github.com/luckasRanarison/tailwind-tools.nvim/,, +https://github.com/themaxmarchuk/tailwindcss-colors.nvim/,, +https://github.com/fredehoey/tardis.nvim/,, https://github.com/wellle/targets.vim/,, https://github.com/tbabej/taskwiki/,, https://github.com/tomtom/tcomment_vim/,, https://github.com/nvim-telekasten/telekasten.nvim/,, -https://github.com/ray-x/telescope-ast-grep.nvim/,HEAD, +https://github.com/ray-x/telescope-ast-grep.nvim/,, https://github.com/GustavoKatel/telescope-asynctasks.nvim/,, https://github.com/nvim-telescope/telescope-cheat.nvim/,, https://github.com/fannheyward/telescope-coc.nvim/,, https://github.com/nvim-telescope/telescope-dap.nvim/,, -https://github.com/xiyaowong/telescope-emoji.nvim/,HEAD, +https://github.com/xiyaowong/telescope-emoji.nvim/,, https://github.com/nvim-telescope/telescope-file-browser.nvim/,, https://github.com/nvim-telescope/telescope-frecency.nvim/,, https://github.com/nvim-telescope/telescope-fzf-native.nvim/,, https://github.com/nvim-telescope/telescope-fzf-writer.nvim/,, https://github.com/nvim-telescope/telescope-fzy-native.nvim/,, -https://github.com/Snikimonkd/telescope-git-conflicts.nvim/,HEAD, +https://github.com/Snikimonkd/telescope-git-conflicts.nvim/,, https://github.com/nvim-telescope/telescope-github.nvim/,, -https://github.com/alduraibi/telescope-glyph.nvim/,HEAD, -https://github.com/jmacadie/telescope-hierarchy.nvim/,HEAD, -https://github.com/nvim-telescope/telescope-live-grep-args.nvim/,HEAD, +https://github.com/alduraibi/telescope-glyph.nvim/,, +https://github.com/jmacadie/telescope-hierarchy.nvim/,, +https://github.com/nvim-telescope/telescope-live-grep-args.nvim/,, https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,, -https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD, +https://github.com/nvim-telescope/telescope-media-files.nvim/,, https://github.com/nvim-telescope/telescope-project.nvim/,, -https://github.com/Marskey/telescope-sg/,HEAD, -https://github.com/nvim-telescope/telescope-smart-history.nvim/,HEAD, +https://github.com/Marskey/telescope-sg/,, +https://github.com/nvim-telescope/telescope-smart-history.nvim/,, https://github.com/nvim-telescope/telescope-symbols.nvim/,, https://github.com/nvim-telescope/telescope-ui-select.nvim/,, https://github.com/fhill2/telescope-ultisnips.nvim/,, -https://github.com/debugloop/telescope-undo.nvim/,HEAD, +https://github.com/debugloop/telescope-undo.nvim/,, https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,, https://github.com/nvim-telescope/telescope-z.nvim/,, -https://github.com/natecraddock/telescope-zf-native.nvim/,HEAD, +https://github.com/natecraddock/telescope-zf-native.nvim/,, https://github.com/jvgrootveld/telescope-zoxide/,, -https://github.com/luc-tielen/telescope_hoogle/,HEAD, -https://github.com/joerdav/templ.vim/,HEAD, -https://github.com/axelvc/template-string.nvim/,HEAD, +https://github.com/luc-tielen/telescope_hoogle/,, +https://github.com/joerdav/templ.vim/,, +https://github.com/axelvc/template-string.nvim/,, https://github.com/jacoborus/tender.vim/,, -https://github.com/chomosuke/term-edit.nvim/,HEAD, -https://github.com/rebelot/terminal.nvim/,HEAD, +https://github.com/chomosuke/term-edit.nvim/,, +https://github.com/rebelot/terminal.nvim/,, https://github.com/wincent/terminus/,, https://github.com/oberblastmeister/termwrapper.nvim/,, https://github.com/ternjs/tern_for_vim/,, https://github.com/KeitaNakamura/tex-conceal.vim/,, -https://github.com/let-def/texpresso.vim/,HEAD, -https://github.com/johmsalas/text-case.nvim/,HEAD, -https://github.com/jsongerber/thanks.nvim/,HEAD, -https://github.com/vhsconnect/themed-tabs.nvim/,HEAD, -https://github.com/zaldih/themery.nvim/,HEAD, +https://github.com/let-def/texpresso.vim/,, +https://github.com/johmsalas/text-case.nvim/,, +https://github.com/jsongerber/thanks.nvim/,, +https://github.com/vhsconnect/themed-tabs.nvim/,, +https://github.com/zaldih/themery.nvim/,, https://github.com/ron89/thesaurus_query.vim/,, https://github.com/itchyny/thumbnail.vim/,, -https://github.com/nvzone/timerly/,HEAD, +https://github.com/nvzone/timerly/,, https://github.com/vim-scripts/timestamp.vim/,, -https://github.com/levouh/tint.nvim/,HEAD, -https://github.com/tinted-theming/tinted-nvim/,HEAD, -https://github.com/tinted-theming/tinted-vim/,HEAD, -https://github.com/rachartier/tiny-cmdline.nvim/,HEAD, -https://github.com/rachartier/tiny-devicons-auto-colors.nvim/,HEAD, -https://github.com/rachartier/tiny-glimmer.nvim/,HEAD, -https://github.com/rachartier/tiny-inline-diagnostic.nvim/,HEAD, +https://github.com/levouh/tint.nvim/,, +https://github.com/tinted-theming/tinted-nvim/,, +https://github.com/tinted-theming/tinted-vim/,, +https://github.com/rachartier/tiny-cmdline.nvim/,, +https://github.com/rachartier/tiny-devicons-auto-colors.nvim/,, +https://github.com/rachartier/tiny-glimmer.nvim/,, +https://github.com/rachartier/tiny-inline-diagnostic.nvim/,, https://github.com/tomtom/tinykeymap_vim/,,tinykeymap https://github.com/tomtom/tlib_vim/,, https://github.com/wellle/tmux-complete.vim/,, -https://github.com/aserowy/tmux.nvim/,HEAD, +https://github.com/aserowy/tmux.nvim/,, https://github.com/edkolev/tmuxline.vim/,, https://github.com/folke/todo-comments.nvim/,, https://github.com/freitass/todo.txt-vim/,, https://github.com/akinsho/toggleterm.nvim/,, -https://github.com/tiagovla/tokyodark.nvim/,HEAD, +https://github.com/tiagovla/tokyodark.nvim/,, https://github.com/folke/tokyonight.nvim/,, https://github.com/markonm/traces.vim/,, -https://github.com/LeonHeidelbach/trailblazer.nvim/,HEAD, +https://github.com/LeonHeidelbach/trailblazer.nvim/,, https://github.com/tjdevries/train.nvim/,, -https://github.com/xiyaowong/transparent.nvim/,HEAD, -https://github.com/MeanderingProgrammer/treesitter-modules.nvim/,HEAD, -https://github.com/Wansmer/treesj/,main, -https://github.com/aaronik/treewalker.nvim/,HEAD, +https://github.com/xiyaowong/transparent.nvim/,, +https://github.com/MeanderingProgrammer/treesitter-modules.nvim/,, +https://github.com/Wansmer/treesj/,, +https://github.com/aaronik/treewalker.nvim/,, https://github.com/tremor-rs/tremor-vim/,, https://github.com/cappyzawa/trim.nvim/,, -https://github.com/simonmclean/triptych.nvim/,HEAD, +https://github.com/simonmclean/triptych.nvim/,, https://github.com/folke/trouble.nvim/,, https://github.com/Pocco81/true-zen.nvim/,, -https://github.com/tesaguri/trust.vim/,HEAD, -https://github.com/tronikelis/ts-autotag.nvim/,HEAD, -https://github.com/folke/ts-comments.nvim/,HEAD, -https://github.com/dmmulroy/tsc.nvim/,HEAD, +https://github.com/tesaguri/trust.vim/,, +https://github.com/tronikelis/ts-autotag.nvim/,, +https://github.com/folke/ts-comments.nvim/,, +https://github.com/dmmulroy/tsc.nvim/,, https://github.com/jgdavey/tslime.vim/,, -https://github.com/mtrajano/tssorter.nvim/,HEAD, +https://github.com/mtrajano/tssorter.nvim/,, https://github.com/Quramy/tsuquyomi/,, -https://github.com/jrop/tuis.nvim/,HEAD, -https://github.com/alexpasmantier/tv.nvim/,HEAD, +https://github.com/jrop/tuis.nvim/,, +https://github.com/alexpasmantier/tv.nvim/,, https://github.com/folke/twilight.nvim/,, https://github.com/pmizio/typescript-tools.nvim/,, https://github.com/leafgarland/typescript-vim/,, https://github.com/jose-elias-alvarez/typescript.nvim/,, -https://github.com/MrPicklePinosaur/typst-conceal.vim/,HEAD, -https://github.com/chomosuke/typst-preview.nvim/,HEAD, -https://github.com/kaarmu/typst.vim/,HEAD, -https://github.com/J0schu/typstwatch.nvim/,HEAD, -https://github.com/altermo/ultimate-autopair.nvim/,HEAD, +https://github.com/MrPicklePinosaur/typst-conceal.vim/,, +https://github.com/chomosuke/typst-preview.nvim/,, +https://github.com/kaarmu/typst.vim/,, +https://github.com/J0schu/typstwatch.nvim/,, +https://github.com/altermo/ultimate-autopair.nvim/,, https://github.com/SirVer/ultisnips/,, -https://github.com/madmaxieee/unclash.nvim/,HEAD, +https://github.com/madmaxieee/unclash.nvim/,, https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, -https://github.com/axkirillov/unified.nvim/,HEAD, -https://github.com/afreakk/unimpaired-which-key.nvim/,HEAD, -https://github.com/tummetott/unimpaired.nvim/,HEAD, +https://github.com/axkirillov/unified.nvim/,, +https://github.com/afreakk/unimpaired-which-key.nvim/,, +https://github.com/tummetott/unimpaired.nvim/,, https://github.com/unisonweb/unison/,, https://github.com/Shougo/unite.vim/,, -https://github.com/sontungexpt/url-open/,HEAD, +https://github.com/sontungexpt/url-open/,, https://github.com/axieax/urlview.nvim/,, https://github.com/vim-scripts/utl.vim/,, -https://github.com/benomahony/uv.nvim/,HEAD, +https://github.com/benomahony/uv.nvim/,, https://github.com/KabbAmine/vCoolor.vim/,, https://github.com/junegunn/vader.vim/,, -https://github.com/vague-theme/vague.nvim/,HEAD, +https://github.com/vague-theme/vague.nvim/,, https://github.com/jbyuki/venn.nvim/,, -https://github.com/linux-cultist/venv-selector.nvim/,HEAD, +https://github.com/linux-cultist/venv-selector.nvim/,, https://github.com/vhda/verilog_systemverilog.vim/,, https://github.com/vifm/vifm.vim/,, https://github.com/Konfekt/vim-CtrlXA/,, @@ -1346,21 +1345,21 @@ https://github.com/MarcWeber/vim-addon-toggle-buffer/,, https://github.com/MarcWeber/vim-addon-xdebug/,, https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters https://github.com/junegunn/vim-after-object/,, -https://github.com/danilo-augusto/vim-afterglow/,HEAD, -https://github.com/msuperdock/vim-agda/,HEAD, +https://github.com/danilo-augusto/vim-afterglow/,, +https://github.com/msuperdock/vim-agda/,, https://github.com/vim-airline/vim-airline/,, https://github.com/enricobacis/vim-airline-clock/,, https://github.com/vim-airline/vim-airline-themes/,, https://github.com/Konfekt/vim-alias/,, https://github.com/hsanson/vim-android/,, -https://github.com/b4winckler/vim-angry/,HEAD, +https://github.com/b4winckler/vim-angry/,, https://github.com/osyo-manga/vim-anzu/,, -https://github.com/tpope/vim-apathy/,HEAD, +https://github.com/tpope/vim-apathy/,, https://github.com/ThePrimeagen/vim-apm/,, https://github.com/PeterRincker/vim-argumentative/,, https://github.com/FooSoft/vim-argwrap/,, https://github.com/haya14busa/vim-asterisk/,, -https://github.com/wuelnerdotexe/vim-astro/,HEAD, +https://github.com/wuelnerdotexe/vim-astro/,, https://github.com/hura/vim-asymptote/,, https://github.com/907th/vim-auto-save/,, https://github.com/vim-autoformat/vim-autoformat/,, @@ -1369,9 +1368,9 @@ https://github.com/jenterkin/vim-autosource/,, https://github.com/gioele/vim-autoswap/,, https://github.com/bazelbuild/vim-bazel/,, https://github.com/moll/vim-bbye/,, -https://github.com/ThePrimeagen/vim-be-good/,HEAD, +https://github.com/ThePrimeagen/vim-be-good/,, https://github.com/nathangrigg/vim-beancount/,, -https://github.com/sheoak/vim-bepoptimist/,HEAD, +https://github.com/sheoak/vim-bepoptimist/,, https://github.com/ntpeters/vim-better-whitespace/,, https://github.com/MattesGroeger/vim-bookmarks/,, https://github.com/gyim/vim-boxdraw/,, @@ -1379,17 +1378,17 @@ https://github.com/ConradIrwin/vim-bracketed-paste/,, https://github.com/mtikekar/vim-bsv/,, https://github.com/jeetsukumaran/vim-buffergator/,, https://github.com/bling/vim-bufferline/,, -https://github.com/bagrat/vim-buffet/,HEAD, +https://github.com/bagrat/vim-buffet/,, https://github.com/qpkorr/vim-bufkill/,, -https://github.com/ap/vim-buftabline/,HEAD, -https://github.com/isobit/vim-caddyfile/,HEAD, +https://github.com/ap/vim-buftabline/,, +https://github.com/isobit/vim-caddyfile/,, https://github.com/tpope/vim-capslock/,, https://github.com/kristijanhusak/vim-carbon-now-sh/,, https://github.com/m-pilia/vim-ccls/,, -https://github.com/tpope/vim-characterize/,HEAD, +https://github.com/tpope/vim-characterize/,, https://github.com/t9md/vim-choosewin/,, https://github.com/rhysd/vim-clang-format/,, -https://github.com/tpope/vim-classpath/,HEAD, +https://github.com/tpope/vim-classpath/,, https://github.com/guns/vim-clojure-highlight/,, https://github.com/guns/vim-clojure-static/,, https://github.com/rstacruz/vim-closer/,, @@ -1399,7 +1398,7 @@ https://github.com/tomasiser/vim-code-dark/,, https://github.com/google/vim-codefmt/,, https://github.com/kchmck/vim-coffee-script/,, https://github.com/kalbasit/vim-colemak/,, -https://github.com/owickstrom/vim-colors-paramount/,HEAD, +https://github.com/owickstrom/vim-colors-paramount/,, https://github.com/altercation/vim-colors-solarized/,, https://github.com/flazz/vim-colorschemes/,, https://github.com/jonbri/vim-colorstepper/,, @@ -1408,8 +1407,8 @@ https://github.com/luan/vim-concourse/,, https://github.com/romainl/vim-cool/,, https://github.com/octol/vim-cpp-enhanced-highlight/,, https://github.com/mhinz/vim-crates/,, -https://github.com/vim-crystal/vim-crystal/,HEAD, -https://github.com/rbong/vim-crystalline/,HEAD, +https://github.com/vim-crystal/vim-crystal/,, +https://github.com/rbong/vim-crystalline/,, https://github.com/OrangeT/vim-csharp/,, https://github.com/ap/vim-css-color/,, https://github.com/cue-lang/vim-cue/,, @@ -1421,7 +1420,7 @@ https://github.com/kristijanhusak/vim-dadbod-ui/,, https://github.com/sunaku/vim-dasht/,, https://github.com/ajmwagar/vim-deus/,, https://github.com/ryanoasis/vim-devicons/,, -https://github.com/jeffkreeftmeijer/vim-dim/,HEAD, +https://github.com/jeffkreeftmeijer/vim-dim/,, https://github.com/blueyed/vim-diminactive/,, https://github.com/will133/vim-dirdiff/,, https://github.com/justinmk/vim-dirvish/,, @@ -1439,10 +1438,10 @@ https://github.com/xolox/vim-easytags/,, https://github.com/justincampbell/vim-eighties/,, https://github.com/elixir-editors/vim-elixir/,, https://github.com/andys8/vim-elm-syntax/,, -https://github.com/kentarosasaki/vim-emacs-bindings/,HEAD, +https://github.com/kentarosasaki/vim-emacs-bindings/,, https://github.com/junegunn/vim-emoji/,, https://github.com/tpope/vim-endwise/,, -https://github.com/Olical/vim-enmasse/,HEAD, +https://github.com/Olical/vim-enmasse/,, https://github.com/vim-erlang/vim-erlang-compiler/,, https://github.com/vim-erlang/vim-erlang-omnicomplete/,, https://github.com/vim-erlang/vim-erlang-runtime/,, @@ -1453,7 +1452,7 @@ https://github.com/terryma/vim-expand-region/,, https://github.com/int3/vim-extradite/,, https://github.com/lambdalisue/vim-fern/,, https://github.com/wsdjeg/vim-fetch/,, -https://github.com/fadein/vim-figlet/,HEAD, +https://github.com/fadein/vim-figlet/,, https://github.com/tpope/vim-fireplace/,, https://github.com/dag/vim-fish/,, https://github.com/tpope/vim-flagship/,, @@ -1462,8 +1461,8 @@ https://github.com/dcharbon/vim-flatbuffers/,, https://github.com/voldikss/vim-floaterm/,, https://github.com/rbong/vim-flog/,, https://github.com/thosakwe/vim-flutter/,, -https://github.com/arecarn/vim-fold-cycle/,HEAD, -https://github.com/embear/vim-foldsearch/,HEAD, +https://github.com/arecarn/vim-fold-cycle/,, +https://github.com/embear/vim-foldsearch/,, https://github.com/thinca/vim-ft-diff_fold/,, https://github.com/tommcdo/vim-fubitive/,, https://github.com/tpope/vim-fugitive/,, @@ -1479,17 +1478,17 @@ https://github.com/itchyny/vim-gitbranch/,, https://github.com/airblade/vim-gitgutter/,, https://github.com/junegunn/vim-github-dashboard/,, https://github.com/stykhomyrov/vim-glsl/,, -https://github.com/JafarDakhan/vim-gml/,HEAD, +https://github.com/JafarDakhan/vim-gml/,, https://github.com/jamessan/vim-gnupg/,, https://github.com/fatih/vim-go/,, -https://github.com/habamax/vim-godot/,HEAD, +https://github.com/habamax/vim-godot/,, https://github.com/rhysd/vim-grammarous/,, https://github.com/jparise/vim-graphql/,, https://github.com/mhinz/vim-grepper/,, https://github.com/lifepillar/vim-gruvbox8/,, https://github.com/brennanfee/vim-gui-position/,, https://github.com/ludovicchabant/vim-gutentags/,, -https://github.com/habamax/vim-habamax/,HEAD, +https://github.com/habamax/vim-habamax/,, https://github.com/takac/vim-hardtime/,, https://github.com/chkno/vim-haskell-module-name/,, https://github.com/enomsg/vim-haskellConcealPlus/,, @@ -1507,10 +1506,10 @@ https://github.com/ntk148v/vim-horizon/,, https://github.com/jonsmithers/vim-html-template-literals/,, https://github.com/humanoid-colors/vim-humanoid-colorscheme/,, https://github.com/vim-utils/vim-husk/,, -https://github.com/hylang/vim-hy/,HEAD, +https://github.com/hylang/vim-hy/,, https://github.com/w0ng/vim-hybrid/,, https://github.com/kristijanhusak/vim-hybrid-material/,, -https://github.com/nuchs/vim-hypr-nav/,HEAD, +https://github.com/nuchs/vim-hypr-nav/,, https://github.com/noc7c9/vim-iced-coffee-script/,, https://github.com/RRethy/vim-illuminate/,, https://github.com/preservim/vim-indent-guides/,, @@ -1524,62 +1523,62 @@ https://github.com/mhinz/vim-janah/,, https://github.com/artur-shaik/vim-javacomplete2/,, https://github.com/pangloss/vim-javascript/,, https://github.com/jelera/vim-javascript-syntax/,, -https://github.com/tpope/vim-jdaddy/,HEAD, -https://github.com/tani/vim-jetpack/,HEAD, +https://github.com/tpope/vim-jdaddy/,, +https://github.com/tani/vim-jetpack/,, https://github.com/lepture/vim-jinja/,, -https://github.com/seirl/vim-jinja-languages/,HEAD, -https://github.com/avm99963/vim-jjdescription/,HEAD, +https://github.com/seirl/vim-jinja-languages/,, +https://github.com/avm99963/vim-jjdescription/,, https://github.com/maksimr/vim-jsbeautify/,, https://github.com/heavenshell/vim-jsdoc/,, https://github.com/elzr/vim-json/,, https://github.com/google/vim-jsonnet/,, -https://github.com/mogelbrod/vim-jsonpath/,HEAD, +https://github.com/mogelbrod/vim-jsonpath/,, https://github.com/MaxMEllon/vim-jsx-pretty/,, https://github.com/peitalin/vim-jsx-typescript/,, -https://github.com/mroavi/vim-julia-cell/,HEAD, +https://github.com/mroavi/vim-julia-cell/,, https://github.com/NoahTheDuke/vim-just/,, https://github.com/knubie/vim-kitty-navigator/,, -https://github.com/lark-parser/vim-lark-syntax/,HEAD, +https://github.com/lark-parser/vim-lark-syntax/,, https://github.com/farmergreg/vim-lastplace/,, https://github.com/xuhdev/vim-latex-live-preview/,, https://github.com/ludovicchabant/vim-lawrencium/,, https://github.com/hecal3/vim-leader-guide/,, https://github.com/mk12/vim-lean/,, https://github.com/ledger/vim-ledger/,, -https://github.com/preservim/vim-lexical/,HEAD, +https://github.com/preservim/vim-lexical/,, https://github.com/lfe-support/vim-lfe/,, https://github.com/josa42/vim-lightline-coc/,, https://github.com/tommcdo/vim-lion/,, https://github.com/tpope/vim-liquid/,, -https://github.com/rhysd/vim-llvm/,HEAD, +https://github.com/rhysd/vim-llvm/,, https://github.com/embear/vim-localvimrc/,, https://github.com/andreshazard/vim-logreview/,, https://github.com/mlr-msft/vim-loves-dafny/,, https://github.com/natebosch/vim-lsc/,, https://github.com/prabirshrestha/vim-lsp/,, -https://github.com/rhysd/vim-lsp-ale/,HEAD, +https://github.com/rhysd/vim-lsp-ale/,, https://github.com/jackguo380/vim-lsp-cxx-highlight/,, -https://github.com/mattn/vim-lsp-settings/,HEAD, -https://github.com/thomasfaingnaert/vim-lsp-snippets/,HEAD, -https://github.com/thomasfaingnaert/vim-lsp-ultisnips/,HEAD, +https://github.com/mattn/vim-lsp-settings/,, +https://github.com/thomasfaingnaert/vim-lsp-snippets/,, +https://github.com/thomasfaingnaert/vim-lsp-ultisnips/,, https://github.com/tbastos/vim-lua/,, https://github.com/google/vim-maktaba/,, https://github.com/lambdalisue/vim-manpager/,, https://github.com/Yilin-Yang/vim-markbar/,, https://github.com/preservim/vim-markdown/,, https://github.com/mzlogin/vim-markdown-toc/,, -https://github.com/leafOfTree/vim-matchtag/,HEAD, +https://github.com/leafOfTree/vim-matchtag/,, https://github.com/andymass/vim-matchup/,, -https://github.com/aquach/vim-mediawiki-editor/,HEAD, +https://github.com/aquach/vim-mediawiki-editor/,, https://github.com/samoshkin/vim-mergetool/,, https://github.com/idanarye/vim-merginal/,, https://github.com/david-a-wheeler/vim-metamath/,, https://github.com/xolox/vim-misc/,, -https://github.com/delroth/vim-molokai-delroth/,HEAD, +https://github.com/delroth/vim-molokai-delroth/,, https://github.com/crusoexia/vim-monokai/,, https://github.com/phanviet/vim-monokai-pro/,, -https://github.com/patstockwell/vim-monokai-tasty/,HEAD, -https://github.com/bluz71/vim-moonfly-colors/,HEAD, +https://github.com/patstockwell/vim-monokai-tasty/,, +https://github.com/bluz71/vim-moonfly-colors/,, https://github.com/matze/vim-move/,, https://github.com/lifepillar/vim-mucomplete/,, https://github.com/terryma/vim-multiple-cursors/,, @@ -1589,7 +1588,7 @@ https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/,, https://github.com/jistr/vim-nerdtree-tabs/,, https://github.com/nfnty/vim-nftables/,, https://github.com/kana/vim-niceblock/,, -https://github.com/nickel-lang/vim-nickel/,main, +https://github.com/nickel-lang/vim-nickel/,, https://github.com/tommcdo/vim-ninja-feet/,, https://github.com/LnL7/vim-nix/,, https://github.com/symphorien/vim-nixhash/,, @@ -1600,7 +1599,7 @@ https://github.com/tpope/vim-obsession/,, https://github.com/ocaml/vim-ocaml/,, https://github.com/rakr/vim-one/,, https://github.com/petRUShka/vim-opencl/,, -https://github.com/sirtaj/vim-openscad/,HEAD, +https://github.com/sirtaj/vim-openscad/,, https://github.com/kana/vim-operator-replace/,, https://github.com/rhysd/vim-operator-surround/,, https://github.com/kana/vim-operator-user/,, @@ -1614,24 +1613,24 @@ https://github.com/lambdalisue/vim-pager/,, https://github.com/vim-pandoc/vim-pandoc/,, https://github.com/vim-pandoc/vim-pandoc-after/,, https://github.com/vim-pandoc/vim-pandoc-syntax/,, -https://github.com/yorickpeterse/vim-paper/,HEAD, +https://github.com/yorickpeterse/vim-paper/,, https://github.com/bhurlow/vim-parinfer/,, https://github.com/ku1ik/vim-pasta/,, https://github.com/tpope/vim-pathogen/,, https://github.com/junegunn/vim-peekaboo/,, https://github.com/preservim/vim-pencil/,, -https://github.com/MeF0504/vim-pets/,HEAD, +https://github.com/MeF0504/vim-pets/,, https://github.com/jparise/vim-phabricator/,, https://github.com/justinj/vim-pico8-syntax/,, https://github.com/junegunn/vim-plug/,, https://github.com/powerman/vim-plugin-AnsiEsc/,, -https://github.com/hasundue/vim-pluto/,HEAD, +https://github.com/hasundue/vim-pluto/,, https://github.com/sheerun/vim-polyglot/,, -https://github.com/jmcomets/vim-pony/,HEAD, +https://github.com/jmcomets/vim-pony/,, https://github.com/haya14busa/vim-poweryank/,, https://github.com/prettier/vim-prettier/,, https://github.com/thinca/vim-prettyprint/,, -https://github.com/meain/vim-printer/,HEAD, +https://github.com/meain/vim-printer/,, https://github.com/prisma/vim-prisma/,, https://github.com/tpope/vim-projectionist/,, https://github.com/dhruvasagar/vim-prosession/,, @@ -1640,7 +1639,7 @@ https://github.com/PProvost/vim-ps1/,, https://github.com/digitaltoad/vim-pug/,, https://github.com/rodjek/vim-puppet/,, https://github.com/Vimjas/vim-python-pep8-indent/,, -https://github.com/jeetsukumaran/vim-pythonsense/,HEAD, +https://github.com/jeetsukumaran/vim-pythonsense/,, https://github.com/romainl/vim-qf/,, https://github.com/romainl/vim-qlist/,, https://github.com/peterhoeg/vim-qml/,, @@ -1658,57 +1657,57 @@ https://github.com/tpope/vim-rsi/,, https://github.com/vim-ruby/vim-ruby/,, https://github.com/tpope/vim-salve/,, https://github.com/machakann/vim-sandwich/,, -https://github.com/mhinz/vim-sayonara/,7e774f58c5865d9c10d40396850b35ab95af17c5, +https://github.com/mhinz/vim-sayonara/,, https://github.com/derekwyatt/vim-scala/,, https://github.com/thinca/vim-scouter/,, https://github.com/tpope/vim-scriptease/,, https://github.com/inside/vim-search-pulse/,, https://github.com/tpope/vim-sensible/,, -https://github.com/Konfekt/vim-sentence-chopper/,HEAD, +https://github.com/Konfekt/vim-sentence-chopper/,, https://github.com/guns/vim-sexp/,, https://github.com/tpope/vim-sexp-mappings-for-regular-people/,, https://github.com/itspriddle/vim-shellcheck/,, https://github.com/kshenoy/vim-signature/,, https://github.com/mhinz/vim-signify/,, -https://github.com/sile-typesetter/vim-sile/,HEAD, +https://github.com/sile-typesetter/vim-sile/,, https://github.com/ivalkeen/vim-simpledb/,, https://github.com/junegunn/vim-slash/,, https://github.com/tpope/vim-sleuth/,, https://github.com/jpalardy/vim-slime/,, https://github.com/mzlogin/vim-smali/,, https://github.com/t9md/vim-smalls/,, -https://github.com/Industrial/vim-smartbd/,HEAD, -https://github.com/Industrial/vim-smartbw/,HEAD, +https://github.com/Industrial/vim-smartbd/,, +https://github.com/Industrial/vim-smartbw/,, https://github.com/psliwka/vim-smoothie/,, https://github.com/bohlender/vim-smt2/,, https://github.com/justinmk/vim-sneak/,, https://github.com/garbas/vim-snipmate/,, https://github.com/honza/vim-snippets/,, -https://github.com/lifepillar/vim-solarized8/,HEAD, +https://github.com/lifepillar/vim-solarized8/,, https://github.com/tomlion/vim-solidity/,, https://github.com/christoomey/vim-sort-motion/,, https://github.com/tpope/vim-speeddating/,, https://github.com/kbenzie/vim-spirv/,, -https://github.com/yorokobi/vim-splunk/,HEAD, +https://github.com/yorokobi/vim-splunk/,, https://github.com/mhinz/vim-startify/,, https://github.com/dstein64/vim-startuptime/,, -https://gitlab.com/LittleMorph/vim-ic10,HEAD,vim-stationeers-ic10-syntax +https://gitlab.com/LittleMorph/vim-ic10,,vim-stationeers-ic10-syntax https://github.com/axelf4/vim-strip-trailing-whitespace/,, https://github.com/nbouscal/vim-stylish-haskell/,, https://github.com/alx741/vim-stylishask/,, -https://github.com/lunacookies/vim-substrata/,HEAD, +https://github.com/lunacookies/vim-substrata/,, https://github.com/svermeulen/vim-subversive/,, https://github.com/lambdalisue/vim-suda/,, https://github.com/tpope/vim-surround/,, https://github.com/evanleck/vim-svelte/,, https://github.com/machakann/vim-swap/,, -https://codeberg.org/pbrisbin/vim-syntax-shakespeare,HEAD, -https://github.com/TabbyML/vim-tabby/,HEAD, +https://codeberg.org/pbrisbin/vim-syntax-shakespeare,, +https://github.com/TabbyML/vim-tabby/,, https://github.com/dhruvasagar/vim-table-mode/,, https://github.com/kana/vim-tabpagecd/,, https://github.com/tpope/vim-tbone/,, -https://github.com/teal-language/vim-teal/,HEAD, -https://github.com/erietz/vim-terminator/,HEAD, +https://github.com/teal-language/vim-teal/,, +https://github.com/erietz/vim-terminator/,, https://github.com/hashivim/vim-terraform/,, https://github.com/juliosueiras/vim-terraform-completion/,, https://github.com/vim-test/vim-test/,, @@ -1716,9 +1715,9 @@ https://github.com/glts/vim-textobj-comment/,, https://github.com/kana/vim-textobj-entire/,, https://github.com/kana/vim-textobj-function/,, https://github.com/gibiansky/vim-textobj-haskell/,, -https://github.com/kana/vim-textobj-line/,HEAD, +https://github.com/kana/vim-textobj-line/,, https://github.com/osyo-manga/vim-textobj-multiblock/,, -https://github.com/preservim/vim-textobj-quote/,HEAD, +https://github.com/preservim/vim-textobj-quote/,, https://github.com/kana/vim-textobj-user/,, https://github.com/Julian/vim-textobj-variable-segment/,, https://github.com/thinca/vim-themis/,, @@ -1730,7 +1729,7 @@ https://github.com/milkypostman/vim-togglelist/,, https://github.com/cespare/vim-toml/,, https://github.com/vimpostor/vim-tpipeline/,, https://github.com/bronson/vim-trailing-whitespace/,, -https://github.com/tridactyl/vim-tridactyl/,HEAD, +https://github.com/tridactyl/vim-tridactyl/,, https://github.com/ianks/vim-tsx/,, https://github.com/lumiliet/vim-twig/,, https://github.com/sodapopcan/vim-twiggy/,, @@ -1741,14 +1740,14 @@ https://github.com/hashivim/vim-vagrant/,, https://github.com/tpope/vim-vinegar/,, https://github.com/triglav/vim-visual-increment/,, https://github.com/mg979/vim-visual-multi/,, -https://github.com/bronson/vim-visual-star-search/,HEAD, +https://github.com/bronson/vim-visual-star-search/,, https://github.com/thinca/vim-visualstar/,, -https://github.com/ngemily/vim-vp4/,HEAD, +https://github.com/ngemily/vim-vp4/,, https://github.com/hrsh7th/vim-vsnip/,, https://github.com/hrsh7th/vim-vsnip-integ/,, https://github.com/posva/vim-vue/,, -https://github.com/leafOfTree/vim-vue-plugin/,HEAD, -https://github.com/fcpg/vim-waikiki/,HEAD, +https://github.com/leafOfTree/vim-vue-plugin/,, +https://github.com/fcpg/vim-waikiki/,, https://github.com/wakatime/vim-wakatime/,, https://github.com/osyo-manga/vim-watchdogs/,, https://github.com/jasonccox/vim-wayland-clipboard/,, @@ -1761,10 +1760,10 @@ https://github.com/lyokha/vim-xkbswitch/,, https://github.com/mg979/vim-xtabline/,, https://github.com/stephpy/vim-yaml/,, https://github.com/simonrw/vim-yapf/,, -https://github.com/michal-h21/vim-zettel/,HEAD, -https://github.com/marrub--/vim-zscript/,HEAD, +https://github.com/michal-h21/vim-zettel/,, +https://github.com/marrub--/vim-zscript/,, https://github.com/dag/vim2hs/,, -https://github.com/monkoose/vim9-stargate/,HEAD, +https://github.com/monkoose/vim9-stargate/,, https://github.com/dominikduda/vim_current_word/,, https://github.com/andrep/vimacs/,, https://github.com/TaDaa/vimade/,, @@ -1780,62 +1779,62 @@ https://github.com/puremourning/vimspector/,, https://github.com/lervag/vimtex/,, https://github.com/preservim/vimux/,, https://github.com/vimwiki/vimwiki/,, -https://github.com/lukas-reineke/virt-column.nvim/,HEAD, -https://github.com/jubnzv/virtual-types.nvim/,HEAD, +https://github.com/lukas-reineke/virt-column.nvim/,, +https://github.com/jubnzv/virtual-types.nvim/,, https://github.com/vim-scripts/vis/,, https://github.com/navicore/vissort.vim/,, https://github.com/liuchengxu/vista.vim/,, -https://github.com/mcauley-penney/visual-whitespace.nvim/,HEAD, -https://github.com/jannis-baum/vivify.vim/,HEAD, -https://github.com/EthanJWright/vs-tasks.nvim/,HEAD, +https://github.com/mcauley-penney/visual-whitespace.nvim/,, +https://github.com/jannis-baum/vivify.vim/,, +https://github.com/EthanJWright/vs-tasks.nvim/,, https://github.com/Mofiqul/vscode.nvim/,, https://github.com/dylanaraps/wal.vim/,, https://github.com/mattn/webapi-vim/,, -https://github.com/willothy/wezterm.nvim/,HEAD, -https://github.com/DingDean/wgsl.vim/,HEAD, -https://github.com/AndrewRadev/whatif.vim/,HEAD, +https://github.com/willothy/wezterm.nvim/,, +https://github.com/DingDean/wgsl.vim/,, +https://github.com/AndrewRadev/whatif.vim/,, https://github.com/folke/which-key.nvim/,, -https://github.com/neolooong/whichpy.nvim/,HEAD, -https://github.com/johnfrankmorgan/whitespace.nvim/,HEAD, -https://github.com/lervag/wiki-ft.vim/,HEAD, -https://github.com/lervag/wiki.vim/,HEAD, +https://github.com/neolooong/whichpy.nvim/,, +https://github.com/johnfrankmorgan/whitespace.nvim/,, +https://github.com/lervag/wiki-ft.vim/,, +https://github.com/lervag/wiki.vim/,, https://github.com/gelguy/wilder.nvim/,, -https://github.com/SUSTech-data/wildfire.nvim/,HEAD, +https://github.com/SUSTech-data/wildfire.nvim/,, https://github.com/gcmt/wildfire.vim/,, -https://github.com/fgheng/winbar.nvim/,main, +https://github.com/fgheng/winbar.nvim/,, https://github.com/anuvyklack/windows.nvim/,, -https://github.com/Exafunction/windsurf.vim/,HEAD, +https://github.com/Exafunction/windsurf.vim/,, https://github.com/sindrets/winshift.nvim/,, https://github.com/wannesm/wmgraphviz.vim/,, https://github.com/vim-scripts/wombat256.vim/,, https://github.com/lukaszkorecki/workflowish/,, -https://github.com/natecraddock/workspaces.nvim/,HEAD, -https://github.com/andrewferrier/wrapping.nvim/,HEAD, +https://github.com/natecraddock/workspaces.nvim/,, +https://github.com/andrewferrier/wrapping.nvim/,, https://github.com/tweekmonster/wstrip.vim/,, -https://github.com/piersolenski/wtf.nvim/,HEAD, -https://github.com/kyza0d/xeno.nvim/,HEAD, -https://github.com/Mythos-404/xmake.nvim/,HEAD, +https://github.com/piersolenski/wtf.nvim/,, +https://github.com/kyza0d/xeno.nvim/,, +https://github.com/Mythos-404/xmake.nvim/,, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, -https://github.com/y9san9/y9nika.nvim/,HEAD, -https://github.com/someone-stole-my-name/yaml-companion.nvim/,HEAD, -https://github.com/cwrau/yaml-schema-detect.nvim/,HEAD, -https://github.com/ywpkwon/yank-path.nvim/,HEAD, -https://github.com/gbprod/yanky.nvim/,HEAD, +https://github.com/y9san9/y9nika.nvim/,, +https://github.com/someone-stole-my-name/yaml-companion.nvim/,, +https://github.com/cwrau/yaml-schema-detect.nvim/,, +https://github.com/ywpkwon/yank-path.nvim/,, +https://github.com/gbprod/yanky.nvim/,, https://github.com/HerringtonDarkholme/yats.vim/,, -https://github.com/mikavilpas/yazi.nvim/,HEAD, -https://github.com/lucasew-graveyard/yescapsquit.vim/,HEAD, -https://github.com/elkowar/yuck.vim/,HEAD, +https://github.com/mikavilpas/yazi.nvim/,, +https://github.com/lucasew-graveyard/yescapsquit.vim/,, +https://github.com/elkowar/yuck.vim/,, https://github.com/fsharp/zarchive-vim-fsharp/,, https://github.com/KabbAmine/zeavim.vim/,, -https://github.com/swaits/zellij-nav.nvim/,HEAD, -https://github.com/Lilja/zellij.nvim/,HEAD, +https://github.com/swaits/zellij-nav.nvim/,, +https://github.com/Lilja/zellij.nvim/,, https://github.com/folke/zen-mode.nvim/,, -https://github.com/sand4rt/zen.nvim/,HEAD, -https://github.com/zenbones-theme/zenbones.nvim/,HEAD, +https://github.com/sand4rt/zen.nvim/,, +https://github.com/zenbones-theme/zenbones.nvim/,, https://github.com/jnurmine/zenburn/,, https://github.com/nvimdev/zephyr-nvim/,, -https://github.com/zk-org/zk-nvim/,HEAD, +https://github.com/zk-org/zk-nvim/,, https://github.com/troydm/zoomwintab.vim/,, -https://github.com/jalvesaq/zotcite/,HEAD, +https://github.com/jalvesaq/zotcite/,, https://github.com/nanotee/zoxide.vim/,, From 10573a3579896ecb48766b090af903f94cee0cb0 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 17:15:01 -0500 Subject: [PATCH 215/246] nixpkgs-plugin-update: key cached downloads by repo and ref Namespace cache entries by repository and fetch ref instead of keying them only by commit text. Once tagged fetches are preserved, different repositories can legitimately share the same tag name. Keying the cache by the bare ref lets unrelated plugins collide and reuse the wrong prefetched hash. Use repo URI plus tag/commit so cache hits stay repository-specific. --- .../src/nixpkgs_plugin_update/__init__.py | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py index 6c5922e9a107..bb043fecfc99 100644 --- a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py +++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py @@ -840,9 +840,7 @@ class Editor: current_plugins = self.get_current_plugins(config, self.nixpkgs) current_plugin_specs = self.load_plugin_spec(config, input_file) - cache: Cache = Cache( - [plugin for _description, plugin in current_plugins], self.cache_file - ) + cache: Cache = Cache(current_plugins, self.cache_file) current_plugin_map = { plugin.normalized_name: plugin for _description, plugin in current_plugins } @@ -1107,7 +1105,7 @@ def prefetch_plugin( latest_tag, ) - cached_plugin = cache[commit] if cache else None + cached_plugin = cache[target_cache_key(p.repo.uri, commit, source_tag)] if cache else None if cached_plugin is not None: log.debug(f"Cache hit for {p.name}!") cached_plugin.name = p.name @@ -1200,13 +1198,27 @@ def get_cache_path(cache_file_name: str) -> Path | None: return Path(xdg_cache, cache_file_name) +def plugin_cache_key(repo_uri: str, plugin: "Plugin") -> str: + ref = f"{GIT_TAGS_PREFIX}{plugin.tag}" if plugin.tag is not None else plugin.commit + return f"{repo_uri}@{ref}" + + +def target_cache_key(repo_uri: str, commit: str, source_tag: str | None) -> str: + ref = f"{GIT_TAGS_PREFIX}{source_tag}" if source_tag is not None else commit + return f"{repo_uri}@{ref}" + + class Cache: - def __init__(self, initial_plugins: list[Plugin], cache_file_name: str) -> None: + def __init__( + self, + initial_plugins: list[tuple[PluginDesc, Plugin]], + cache_file_name: str, + ) -> None: self.cache_file = get_cache_path(cache_file_name) downloads = {} - for plugin in initial_plugins: - downloads[plugin.commit] = plugin + for plugin_desc, plugin in initial_plugins: + downloads[plugin_cache_key(plugin_desc.repo.uri, plugin)] = plugin downloads.update(self.load()) self.downloads = downloads @@ -1217,7 +1229,7 @@ class Cache: downloads: dict[str, Plugin] = {} with open(self.cache_file) as f: data = json.load(f) - for attr in data.values(): + for cache_key, attr in data.items(): p = Plugin( attr["name"], attr["commit"], @@ -1227,7 +1239,7 @@ class Cache: last_tag=attr.get("last_tag"), tag=attr.get("tag"), ) - downloads[attr["commit"]] = p + downloads[cache_key] = p return downloads def store(self) -> None: @@ -1237,8 +1249,8 @@ class Cache: os.makedirs(self.cache_file.parent, exist_ok=True) with open(self.cache_file, "w+") as f: data = {} - for name, attr in self.downloads.items(): - data[name] = attr.as_json() + for cache_key, attr in self.downloads.items(): + data[cache_key] = attr.as_json() json.dump(data, f, indent=4, sort_keys=True) def __getitem__(self, key: str) -> Plugin | None: @@ -1258,7 +1270,7 @@ def prefetch( if current_plugins is not None: current_plugin = current_plugins.get(pluginDesc.name.replace(".", "-")) plugin, redirect = prefetch_plugin(pluginDesc, cache, current_plugin) - cache[plugin.commit] = plugin + cache[target_cache_key(pluginDesc.repo.uri, plugin.commit, plugin.tag)] = plugin return (pluginDesc, plugin, redirect) except Exception as e: return (pluginDesc, e, None) From 8f9d7e5e8bbdafe2198774b26524060d45023548 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 17:15:16 -0500 Subject: [PATCH 216/246] nixpkgs-plugin-update: avoid mutating cached plugins on cache hits Cache entries are seeded from current_plugins, so cache hits can return the same Plugin instances that current_plugin_map uses as the baseline state. Updating those objects in place mutates the "old" plugin data during the run. That can hide version changes and breaks alias handling when multiple plugin specs resolve to the same cached source. Return a replaced Plugin instead of mutating the cached instance. --- .../src/nixpkgs_plugin_update/__init__.py | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py index bb043fecfc99..0625a3d5d959 100644 --- a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py +++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py @@ -18,7 +18,7 @@ import traceback import urllib.error import urllib.request import xml.etree.ElementTree as ET -from dataclasses import asdict, dataclass +from dataclasses import asdict, dataclass, replace from datetime import datetime, date from functools import wraps from multiprocessing.dummy import Pool @@ -1108,13 +1108,18 @@ def prefetch_plugin( cached_plugin = cache[target_cache_key(p.repo.uri, commit, source_tag)] if cache else None if cached_plugin is not None: log.debug(f"Cache hit for {p.name}!") - cached_plugin.name = p.name - cached_plugin.commit = commit - cached_plugin.version = version - cached_plugin.date = date - cached_plugin.last_tag = latest_tag - cached_plugin.tag = source_tag - return cached_plugin, p.repo.redirect + return ( + replace( + cached_plugin, + name=p.name, + commit=commit, + version=version, + date=date, + last_tag=latest_tag, + tag=source_tag, + ), + p.repo.redirect, + ) has_submodules = p.repo.has_submodules() log.debug(f"prefetch {p.name}") From c6f6ef1c441a7c0d479f34ab0f33274edc84fc93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 15:06:05 +0000 Subject: [PATCH 217/246] terraform-providers.spacelift-io_spacelift: 1.47.1 -> 1.48.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 1f1948306cd3..a2ff7495b43a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1229,13 +1229,13 @@ "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8=" }, "spacelift-io_spacelift": { - "hash": "sha256-j9D4rUjnBQqobAu5yXo5fCJSwkVSovmrroowBTuLIVQ=", + "hash": "sha256-oS3Ikmi5wUlVbQos16x1BXoqhgOMIGyJcpl7sIXmDtk=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.47.1", + "rev": "v1.48.0", "spdx": "MIT", - "vendorHash": "sha256-Ub0lqMdCu44UX3LkcjErsxfWdL9C6CxhVKPOn1AAdEc=" + "vendorHash": "sha256-/4v25xY/fmfSAEALRbXu/a+x3nC1Ly/IJPOEKmYjgmw=" }, "splunk-terraform_signalfx": { "hash": "sha256-m+qD71tTqQycD+9xju5T83IaYCgJhkfh+byn6yrdfO4=", From 2c3b812b0070f3700520d2631bcd80cc71bb2cfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 15:08:10 +0000 Subject: [PATCH 218/246] python3Packages.tlds: 2026021400 -> 2026041800 --- pkgs/development/python-modules/tlds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix index a297b802a9a1..526311fedecd 100644 --- a/pkgs/development/python-modules/tlds/default.nix +++ b/pkgs/development/python-modules/tlds/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "tlds"; - version = "2026021400"; + version = "2026041800"; pyproject = true; src = fetchFromGitHub { owner = "kichik"; repo = "tlds"; tag = finalAttrs.version; - hash = "sha256-IyIZCBlH918let5qa/fi/SYampE3E+yAVMG17nHF7mk="; + hash = "sha256-HMfAMYVNz/3lwCv5XTn7jSgFQgGX2uymTGxw8JcHeUU="; }; nativeBuildInputs = [ setuptools ]; From 7d7a9f2257de11b158962bd1b23733f385793dbe Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 19 Apr 2026 13:37:39 +0100 Subject: [PATCH 219/246] nixosTests.nixos-test-driver.skip-typecheck: init Simple regression test for https://github.com/NixOS/nixpkgs/pull/511225 --- nixos/tests/all-tests.nix | 1 + .../nixos-test-driver/skip-typecheck.nix | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 nixos/tests/nixos-test-driver/skip-typecheck.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 767da3a67b16..f6093eb7e14a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -152,6 +152,7 @@ in ssh-backdoor = runTestOn [ "x86_64-linux" ] ./nixos-test-driver/ssh-backdoor.nix; console-log = runTest ./nixos-test-driver/console-log.nix; containers = runTest ./nixos-test-driver/containers.nix; + skip-typecheck = runTest ./nixos-test-driver/skip-typecheck.nix; driver-timeout = pkgs.runCommand "ensure-timeout-induced-failure" { diff --git a/nixos/tests/nixos-test-driver/skip-typecheck.nix b/nixos/tests/nixos-test-driver/skip-typecheck.nix new file mode 100644 index 000000000000..b36e4a819693 --- /dev/null +++ b/nixos/tests/nixos-test-driver/skip-typecheck.nix @@ -0,0 +1,21 @@ +/** + nixosTests.simple, but with skipTypeCheck. + This catches regressions in the wiring, e.g. + https://github.com/NixOS/nixpkgs/pull/511225 +*/ +{ + name = "skip-typecheck"; + meta = { + maintainers = [ ]; + }; + + skipTypeCheck = true; + + nodes.machine = { }; + + testScript = '' + start_all() + machine.wait_for_unit("multi-user.target") + machine.shutdown() + ''; +} From 9fd10376129a023101e5b0345375e898617dcbdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 15:56:39 +0000 Subject: [PATCH 220/246] tandoor-recipes: 2.6.6 -> 2.6.9 --- pkgs/by-name/ta/tandoor-recipes/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix index 615c092251d0..c66507a466d2 100644 --- a/pkgs/by-name/ta/tandoor-recipes/common.nix +++ b/pkgs/by-name/ta/tandoor-recipes/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "2.6.6"; + version = "2.6.9"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; tag = version; - hash = "sha256-aRc9fh9O2ZI+9ngKraD3AnkOMPuPVt8evheJ0YvZETE="; + hash = "sha256-g151bUOpAp+7+K92kF+eK5SR2aCHPHdFc3UXqOO4aSw="; }; yarnHash = "sha256-Un5pHocZZrXajY3AGfqV1kjT9twE8B93rwoJMi4CILg="; From 9d5a303cfbebf5931d29d75de01bbfecccf68a0e Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Sun, 19 Apr 2026 11:51:20 -0400 Subject: [PATCH 221/246] nixos/pam: filter include/substack paths from apparmor mr rules --- nixos/modules/security/pam.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 46b9d71ac2ed..41ba7df94be1 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -2636,6 +2636,13 @@ in (lib.concatMap lib.attrValues) (lib.concatMap lib.attrValues) (lib.filter (rule: rule.enable)) + (lib.filter ( + rule: + !builtins.elem rule.control [ + "include" + "substack" + ] + )) (lib.catAttrs "modulePath") (map ( modulePath: From b787ee3d40fba82228e5dc39c145bbb30af999fb Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 14 Apr 2026 10:34:20 -0700 Subject: [PATCH 222/246] lib/modules: reduce allocations in evalModules and mergeModules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - When `evalModules` is called without deprecated `args`/`check` parameters (the common case), avoid `modules ++ []` which copies the entire module list for no reason. - `collectModules` was calling `collectStructuredModules` twice with identical arguments — once for `filterModules` and once for `toGraph`. Share the result via a `let` binding. - Replace `zipAttrsWith (n: v: v)` with `zipAttrs` - Replace `concatMap` with `filter`+`map` in `filterOverrides'` NixOS minimal eval improvement: -5.0% list_concats, -1.2% nrFunctionCalls, -0.7% nrThunks, -1.0% envs, -1.5% list_bytes. --- lib/modules.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 419fc750e8d9..e369d98a6426 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -589,6 +589,8 @@ let in modulesPath: initialModules: args: { modules = filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args); + # Intentionally not shared with `modules` above: this allows `collected` + # to be garbage collected after `filterModules` returns. graph = toGraph modulesPath (collectStructuredModules unknownModule "" initialModules args); }; @@ -783,7 +785,7 @@ let prefix: modules: configs: let # an attrset 'name' => list of submodules that declare ‘name’. - declsByName = zipAttrsWith (n: v: v) ( + declsByName = zipAttrs ( map ( module: let @@ -838,7 +840,7 @@ let ) checkedConfigs ); # extract the definitions for each loc - rawDefinitionsByName = zipAttrsWith (n: v: v) ( + rawDefinitionsByName = zipAttrs ( map ( module: mapAttrs (n: value: { @@ -1439,7 +1441,7 @@ let def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def; in { - values = concatMap (def: if getPrio def == highestPrio then [ (strip def) ] else [ ]) defs; + values = map strip (filter (def: getPrio def == highestPrio) defs); inherit highestPrio; }; From 6ca3d33d7915ff3421db9a52663c4476008614ba Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 19 Apr 2026 17:00:16 +0000 Subject: [PATCH 223/246] python3Packages.mhcflurry: 2.2.0 -> 2.2.1 Diff: https://github.com/openvax/mhcflurry/compare/v2.2.0...v2.2.1 Changelog: https://github.com/openvax/mhcflurry/releases/tag/v2.2.1 --- pkgs/development/python-modules/mhcflurry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix index fb1b06509b2d..033782c5e886 100644 --- a/pkgs/development/python-modules/mhcflurry/default.nix +++ b/pkgs/development/python-modules/mhcflurry/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "mhcflurry"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; src = fetchFromGitHub { owner = "openvax"; repo = "mhcflurry"; tag = "v${finalAttrs.version}"; - hash = "sha256-xtxPQg4Hsu7PzbXdjf0MlEaOYeAZaMG3gSNsa6l9RiM="; + hash = "sha256-Vtlj6aK4o7rjhWeTaso/RBZWZFdoZy54AlTrYWUoGfE="; }; build-system = [ From 0607a2c71be54d0f7db7c7d382127ee996d1b13c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 17:12:10 +0000 Subject: [PATCH 224/246] resterm: 0.26.2 -> 0.28.2 --- pkgs/by-name/re/resterm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix index 4d736bcf4541..e78d6658a9fd 100644 --- a/pkgs/by-name/re/resterm/package.nix +++ b/pkgs/by-name/re/resterm/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "resterm"; - version = "0.26.2"; + version = "0.28.2"; src = fetchFromGitHub { owner = "unkn0wn-root"; repo = "resterm"; tag = "v${finalAttrs.version}"; - hash = "sha256-Addc59NlrD4GMEuir2BKoURDjMcqZYtAq4UPRCxNmCE="; + hash = "sha256-jJGL9oSThbFeO0c89LMFWVEzyrGeIWZDUKYVqOy2hMk="; }; vendorHash = "sha256-AjckKD6NScBa8w9nWMdVExuNadz3vHnK854XXg3nj84="; From 0c4c842ae81ef4aa2a537a9db714d3e511cda95e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Apr 2026 23:42:57 +0000 Subject: [PATCH 225/246] python3Packages.pydo: 0.27.0 -> 0.30.0 --- .../python-modules/pydo/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pydo/default.nix b/pkgs/development/python-modules/pydo/default.nix index 24e51eb5e74d..41f5447d3a56 100644 --- a/pkgs/development/python-modules/pydo/default.nix +++ b/pkgs/development/python-modules/pydo/default.nix @@ -2,27 +2,33 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system poetry-core, + + # dependencies azure-core, azure-identity, isodate, msrest, + + # tests aioresponses, pytest-asyncio, pytestCheckHook, responses, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydo"; - version = "0.27.0"; + version = "0.30.0"; pyproject = true; src = fetchFromGitHub { owner = "digitalocean"; repo = "pydo"; - tag = "v${version}"; - hash = "sha256-2vJ/yOOJuil1oFWIYU2yV29RG/j92kpz0ubmJpyzS4U="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tLw34aQ9gmKSQ/cy3Rz3eKqaw/Kv4lgS1saMYMCHPxo="; }; build-system = [ poetry-core ]; @@ -52,9 +58,9 @@ buildPythonPackage rec { meta = { description = "Official DigitalOcean Client based on the DO OpenAPIv3 specification"; homepage = "https://github.com/digitalocean/pydo"; - changelog = "https://github.com/digitalocean/pydo/releases/tag/v${version}"; + changelog = "https://github.com/digitalocean/pydo/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ethancedwards8 ]; }; -} +}) From a9810905ddb83f8482c7e7c26aaf60ff7194fd3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 17:36:49 +0000 Subject: [PATCH 226/246] plexamp: 4.13.0 -> 4.13.1 --- pkgs/by-name/pl/plexamp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pl/plexamp/package.nix b/pkgs/by-name/pl/plexamp/package.nix index 7f9acac9d661..9d04eb9fc9bc 100644 --- a/pkgs/by-name/pl/plexamp/package.nix +++ b/pkgs/by-name/pl/plexamp/package.nix @@ -7,12 +7,12 @@ let pname = "plexamp"; - version = "4.13.0"; + version = "4.13.1"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha512-3Blgl3t21hH6lgDe5u3vy3I/3k9b4VM1CvoZg2oashkGXSDwV8q7MATN9YjsBgWysNXwdm7nQ/yrFQ7DiRfdYg=="; + hash = "sha512-HgF0+ojb0wOWO1DuiifiYMb0kSiRLvvMcteC89zZ4IYOflzOw+vNKoU+eyRo1Yl6irIL/Pg32eK4xRn5wyB46g=="; }; appimageContents = appimageTools.extractType2 { @@ -38,7 +38,7 @@ appimageTools.wrapType2 { meta = { description = "Beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/82"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/83"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ killercup From ff3a83476cded325d47753ea8bf4bf565310499c Mon Sep 17 00:00:00 2001 From: Maxime Brunet Date: Sun, 14 Dec 2025 14:50:59 -0300 Subject: [PATCH 227/246] caffeine: Build from source --- pkgs/by-name/ca/caffeine/package.nix | 45 +++++++++++++++++++++------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ca/caffeine/package.nix b/pkgs/by-name/ca/caffeine/package.nix index b123b8ba3267..881d85276502 100644 --- a/pkgs/by-name/ca/caffeine/package.nix +++ b/pkgs/by-name/ca/caffeine/package.nix @@ -1,28 +1,52 @@ { lib, - stdenvNoCC, - fetchurl, - undmg, + stdenv, + fetchFromGitHub, + apple-sdk, + darwin, + xcbuildHook, }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "caffeine"; version = "1.1.4"; - src = fetchurl { - url = "https://github.com/IntelliScape/caffeine/releases/download/${finalAttrs.version}/Caffeine.dmg"; - hash = "sha256-GtNMMpmgyGaHPE/rQyw+ERhjda229DxfSBrp1G0G1yM="; + src = fetchFromGitHub { + owner = "IntelliScape"; + repo = "caffeine"; + tag = finalAttrs.version; + hash = "sha256-AmBPY5ZVWBq2ZesNvvJ/Do5XgPjb5R1ESNJm7tx0M6k="; }; - sourceRoot = "."; + # xcbuild routes image.png resources through CopyPNGFile, which requires the + # Apple-only copypng tool that is unavailable in the nixpkgs toolchain. + # Treat these PNGs as generic files so xcbuild copies them directly. + postPatch = '' + substituteInPlace Caffeine.xcodeproj/project.pbxproj \ + --replace-fail \ + "lastKnownFileType = image.png;" \ + "lastKnownFileType = file;" + ''; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ + xcbuildHook + darwin.autoSignDarwinBinariesHook + ]; + + buildInputs = [ + apple-sdk + ]; + + xcbuildFlags = [ + "-target Caffeine" + "-configuration Release" + ]; installPhase = '' runHook preInstall mkdir -p $out/Applications - cp -r *.app $out/Applications + cp -r Products/Release/Caffeine.app $out/Applications runHook postInstall ''; @@ -36,6 +60,5 @@ stdenvNoCC.mkDerivation (finalAttrs: { "x86_64-darwin" "aarch64-darwin" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) From 05b6c912919942d38f6a7d115bbd565dbf113b3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 18:55:24 +0000 Subject: [PATCH 228/246] qwen-code: 0.14.3 -> 0.14.5 --- 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 ec0b55b1af68..6829270cafb1 100644 --- a/pkgs/by-name/qw/qwen-code/package.nix +++ b/pkgs/by-name/qw/qwen-code/package.nix @@ -14,17 +14,17 @@ buildNpmPackage (finalAttrs: { pname = "qwen-code"; - version = "0.14.3"; + version = "0.14.5"; src = fetchFromGitHub { owner = "QwenLM"; repo = "qwen-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-RtZlwZev8zv3yMn+cCQpGvyPq/gyA39N4Iq0qFBTERY="; + hash = "sha256-2d+PaHaUdCEYjYkAG33DxX3rMbVpL/CcngczFeOvy8M="; }; npmDepsFetcherVersion = 3; - npmDepsHash = "sha256-mrc46cZJ2hI1VL/PMYsCCkgEGYMHrkhLZs0EfsXRRIw="; + npmDepsHash = "sha256-7o3ap0+eyCxga18V4qoG+a6b2EM45MkMLjXdY8J/eGg="; # npm 11 incompatible with fetchNpmDeps # https://github.com/NixOS/nixpkgs/issues/474535 From d4a59f50b4faa5bed84fcb824071c583aa48c718 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 19:13:57 +0000 Subject: [PATCH 229/246] home-assistant-custom-components.emporia_vue: 0.11.3 -> 0.12.0 --- .../home-assistant/custom-components/emporia_vue/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix index 67a8fcfd161c..d2859e1b8342 100644 --- a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix +++ b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "magico13"; domain = "emporia_vue"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "magico13"; repo = "ha-emporia-vue"; rev = "v${version}"; - hash = "sha256-IONV3jmCyVW2lXjenIicNRaJTsAyzRZ5OVmampqFD7A="; + hash = "sha256-6VeyKmFKbBG6MgQqylkTg1blZJlBKBWYdkUmCYyEV2I="; }; dependencies = [ From dbec80b5844275f4893c2794b2949f77e0c8a39b Mon Sep 17 00:00:00 2001 From: daspk04 Date: Sun, 19 Apr 2026 14:19:34 -0500 Subject: [PATCH 230/246] python3Packages.pdf-oxide: init at 0.3.32 --- pkgs/by-name/pd/pdf-oxide/package.nix | 6 ++- .../python-modules/pdf-oxide/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pdf-oxide/default.nix diff --git a/pkgs/by-name/pd/pdf-oxide/package.nix b/pkgs/by-name/pd/pdf-oxide/package.nix index 93b95c26f6dc..040ddbb1a181 100644 --- a/pkgs/by-name/pd/pdf-oxide/package.nix +++ b/pkgs/by-name/pd/pdf-oxide/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, rustPlatform, nix-update-script, + python3Packages, versionCheckHook, }: @@ -28,7 +29,10 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - passthru.updateScript = nix-update-script { }; + passthru = { + python-bindings = python3Packages.pdf-oxide; + updateScript = nix-update-script { }; + }; meta = { description = "Fastest PDF library for text extraction, image extraction, and markdown conversion"; diff --git a/pkgs/development/python-modules/pdf-oxide/default.nix b/pkgs/development/python-modules/pdf-oxide/default.nix new file mode 100644 index 000000000000..311109fbbe58 --- /dev/null +++ b/pkgs/development/python-modules/pdf-oxide/default.nix @@ -0,0 +1,46 @@ +{ + lib, + pkgs, + fetchFromGitHub, + buildPythonPackage, + + # build-system + rustPlatform, + + # optional-dependencies + onnxruntime, + + # tests + pytestCheckHook, +}: +buildPythonPackage (finalAttrs: { + inherit (pkgs.pdf-oxide) + pname + version + src + cargoDeps + ; + + pyproject = true; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + optional-dependencies = { + ocr = [ onnxruntime ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pdf_oxide" + ]; + + meta = pkgs.pdf-oxide.meta // { + description = "Python bindings for the pdf_oxide library"; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5873e2d0343..84039db6cb07 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12245,6 +12245,8 @@ self: super: with self; { pdbfixer = callPackage ../development/python-modules/pdbfixer { }; + pdf-oxide = callPackage ../development/python-modules/pdf-oxide { }; + pdf2docx = callPackage ../development/python-modules/pdf2docx { }; pdf2image = callPackage ../development/python-modules/pdf2image { }; From b9350f8db83c57b7000a0fc9e7b25d65fc018afc Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Tue, 24 Mar 2026 13:53:40 -0700 Subject: [PATCH 231/246] megacmd: 1.7.0 -> 2.5.2 Signed-off-by: Ulysses Zhan --- pkgs/by-name/me/megacmd/disable-updater.patch | 125 ++++++++++ pkgs/by-name/me/megacmd/fix-darwin.patch | 71 +++--- pkgs/by-name/me/megacmd/fix-ffmpeg.patch | 29 --- pkgs/by-name/me/megacmd/install-path.patch | 21 ++ pkgs/by-name/me/megacmd/no-vcpkg.patch | 40 ++++ pkgs/by-name/me/megacmd/package.nix | 219 ++++++++++++------ 6 files changed, 354 insertions(+), 151 deletions(-) create mode 100644 pkgs/by-name/me/megacmd/disable-updater.patch delete mode 100644 pkgs/by-name/me/megacmd/fix-ffmpeg.patch create mode 100644 pkgs/by-name/me/megacmd/install-path.patch create mode 100644 pkgs/by-name/me/megacmd/no-vcpkg.patch diff --git a/pkgs/by-name/me/megacmd/disable-updater.patch b/pkgs/by-name/me/megacmd/disable-updater.patch new file mode 100644 index 000000000000..b8565ed70d78 --- /dev/null +++ b/pkgs/by-name/me/megacmd/disable-updater.patch @@ -0,0 +1,125 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0daf084d..4ff0a86d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,6 +88,12 @@ endif() + include(megacmd_options) #Load first MEGAcmd's options (that we have prevalescence over SDK (e.g libuv) + include(sdklib_options) #load default sdk's + ++if (WIN32 OR APPLE) ++ option(ENABLE_UPDATER "Enable updater" ON) ++else() ++ option(ENABLE_UPDATER "Enable updater" OFF) ++endif() ++ + if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/sdk/include/mega/config.h) + file(RENAME ${CMAKE_CURRENT_LIST_DIR}/sdk/include/mega/config.h ${CMAKE_CURRENT_LIST_DIR}/sdk/include/mega/config.h_non_cmake_bk) + endif() +@@ -222,6 +228,10 @@ target_compile_definitions(LMegacmdServer + $<$:USE_PCRE> + ) + ++if (ENABLE_UPDATER) ++ target_compile_definitions(LMegacmdServer PUBLIC ENABLE_UPDATER) ++endif() ++ + if (NOT WIN32) + if (ENABLE_ASAN) + add_compile_options("-fsanitize=address" "-fno-omit-frame-pointer" "-fno-common") +@@ -419,7 +429,7 @@ load_megacmdserver_libraries() + + + list(APPEND all_targets mega-exec mega-cmd mega-cmd-server) +-if (APPLE) ++if (APPLE AND ENABLE_UPDATER) + list(APPEND all_targets mega-cmd-updater) + endif() + +diff --git a/src/megacmd.cpp b/src/megacmd.cpp +index 9110ae31..aeb3b1e1 100644 +--- a/src/megacmd.cpp ++++ b/src/megacmd.cpp +@@ -830,7 +830,7 @@ void insertValidParamsPerCommand(set *validParams, string thecommand, se + { + validParams->insert("only-shell"); + } +-#if defined(_WIN32) || defined(__APPLE__) ++#ifdef ENABLE_UPDATER + else if ("update" == thecommand) + { + validOptValues->insert("auto"); +@@ -4211,7 +4211,7 @@ static bool process_line(const std::string_view line) + break; + } + +-#if defined(_WIN32) || defined(__APPLE__) ++#ifdef ENABLE_UPDATER + else if (isBareCommand(l, "update")) //if extra args are received, it'll be processed by executer + { + string confirmationQuery("This might require restarting MEGAcmd. Are you sure to continue"); +@@ -4684,7 +4684,7 @@ void megacmd() + + std::string s; + +-#if defined(_WIN32) || defined(__APPLE__) ++#ifdef ENABLE_UPDATER + ostringstream os; + auto updatMsgOpt = lookForAvailableNewerVersions(api); + //TODO: have this executed in worker thread instead (see MegaCmdExecuter::mayExecutePendingStuffInWorkerThread) +diff --git a/src/megacmdcommonutils.h b/src/megacmdcommonutils.h +index 039d7b81..977dbb67 100644 +--- a/src/megacmdcommonutils.h ++++ b/src/megacmdcommonutils.h +@@ -120,7 +120,7 @@ static std::vector loginInValidCommands { "log", "debug", "speedlim + #elif defined(_WIN32) + , "unicode" + #endif +-#if defined(_WIN32) || defined(__APPLE__) ++#ifdef ENABLE_UPDATER + , "update" + #endif + }; +@@ -144,7 +144,7 @@ static std::vector allValidCommands { "login", "signup", "confirm", + #else + , "permissions" + #endif +-#if defined(_WIN32) || defined(__APPLE__) ++#ifdef ENABLE_UPDATER + , "update" + #endif + #ifdef WITH_FUSE +diff --git a/src/megacmdexecuter.cpp b/src/megacmdexecuter.cpp +index 19f4903b..7712d546 100644 +--- a/src/megacmdexecuter.cpp ++++ b/src/megacmdexecuter.cpp +@@ -2696,7 +2696,7 @@ int MegaCmdExecuter::actUponLogin(SynchronousRequestListener *srl, int timeout) + fetchNodes(api, clientID); + } + +-#if defined(_WIN32) || defined(__APPLE__) ++#ifdef ENABLE_UPDATER + + MegaCmdListener *megaCmdListener = new MegaCmdListener(NULL); + srl->getApi()->getLastAvailableVersion("BdARkQSQ",megaCmdListener); +@@ -5829,7 +5829,7 @@ void MegaCmdExecuter::executecommand(vector words, map *clf + } + } + } +-#if defined(_WIN32) || defined(__APPLE__) ++#ifdef ENABLE_UPDATER + else if (words[0] == "update") + { + string sauto = getOption(cloptions, "auto", ""); +diff --git a/src/megacmdshell/megacmdshell.cpp b/src/megacmdshell/megacmdshell.cpp +index 7723982e..2d077c7c 100644 +--- a/src/megacmdshell/megacmdshell.cpp ++++ b/src/megacmdshell/megacmdshell.cpp +@@ -1289,7 +1289,7 @@ void process_line(const char * line) + doExit = true; + } + } +-#if defined(_WIN32) || defined(__APPLE__) ++#ifdef ENABLE_UPDATER + else if (words[0] == "update") + { + comms->markServerIsUpdating(); diff --git a/pkgs/by-name/me/megacmd/fix-darwin.patch b/pkgs/by-name/me/megacmd/fix-darwin.patch index 7fa87b43163a..1a83e9412dcd 100644 --- a/pkgs/by-name/me/megacmd/fix-darwin.patch +++ b/pkgs/by-name/me/megacmd/fix-darwin.patch @@ -1,49 +1,30 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -25,6 +25,11 @@ AM_CPPFLAGS = \ - - AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/sdk/include - -+if DARWIN -+AM_LIBTOOLFLAGS="--tag=CXX" -+AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx -I$(top_srcdir)/sdk/include/mega/osx -+endif -+ - if WIN32 - AM_CPPFLAGS+=-I$(top_srcdir)/sdk/include/mega/win32 - else +diff --git a/src/megacmdshell/megacmdshellcommunications.cpp b/src/megacmdshell/megacmdshellcommunications.cpp +index bdd683b2..266e17ee 100644 --- a/src/megacmdshell/megacmdshellcommunications.cpp +++ b/src/megacmdshell/megacmdshellcommunications.cpp -@@ -306,10 +306,6 @@ SOCKET MegaCmdShellCommunications::createSocket(int number, bool initializeserve - #endif - const char executable2[] = "./mega-cmd-server"; - #else -- #ifdef __MACH__ -- const char executable[] = "/Applications/MEGAcmd.app/Contents/MacOS/mega-cmd"; -- const char executable2[] = "./mega-cmd"; -- #else - const char executable[] = "mega-cmd-server"; - #ifdef __linux__ - char executable2[PATH_MAX]; -@@ -317,7 +313,6 @@ SOCKET MegaCmdShellCommunications::createSocket(int number, bool initializeserve - #else - const char executable2[] = "./mega-cmd-server"; - #endif -- #endif +@@ -153,12 +153,9 @@ SOCKET MegaCmdShellCommunicationsPosix::createSocket(int number, bool initialize + #ifndef NDEBUG + const char executable[] = "./mega-cmd-server"; + #else +- #ifdef __MACH__ +- const char executable[] = "/Applications/MEGAcmd.app/Contents/MacOS/mega-cmd"; +- const char executable2[] = "./mega-cmd"; +- #else + const char executable[] = "mega-cmd-server"; + char executable2[PATH_MAX]; ++ #ifdef __linux__ + sprintf(executable2, "%s/mega-cmd-server", getCurrentExecPath().c_str()); #endif + #endif +@@ -217,11 +214,7 @@ SOCKET MegaCmdShellCommunicationsPosix::createSocket(int number, bool initialize + { - std::vector argsVector{ ---- a/sdk/Makefile.am -+++ b/sdk/Makefile.am -@@ -27,6 +27,11 @@ AM_CPPFLAGS = \ - - include m4/aminclude.am - -+if DARWIN -+AM_LIBTOOLFLAGS="--tag=CXX" -+AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx -+endif -+ - if WIN32 - AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/win32 - else + cerr << "Unable to connect to " << (number?("response socket N "+std::to_string(number)):"service") << ": error=" << ERRNO << endl; +-#ifdef __linux__ + cerr << "Please ensure mega-cmd-server is running" << endl; +-#else +- cerr << "Please ensure MEGAcmdServer is running" << endl; +-#endif + return INVALID_SOCKET; + } + else diff --git a/pkgs/by-name/me/megacmd/fix-ffmpeg.patch b/pkgs/by-name/me/megacmd/fix-ffmpeg.patch deleted file mode 100644 index 45d6e85b373c..000000000000 --- a/pkgs/by-name/me/megacmd/fix-ffmpeg.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/sdk/src/gfx/freeimage.cpp -+++ b/sdk/src/gfx/freeimage.cpp -@@ -216,11 +216,13 @@ bool GfxProviderFreeImage::readbitmapFreeimage(const LocalPath& imagePath, int s - - #ifdef HAVE_FFMPEG - -+#if LIBAVCODEC_VERSION_MAJOR < 60 - #ifdef AV_CODEC_CAP_TRUNCATED - #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED - #else - #define CAP_TRUNCATED CODEC_CAP_TRUNCATED - #endif -+#endif - - const char *GfxProviderFreeImage::supportedformatsFfmpeg() - { -@@ -323,10 +325,12 @@ bool GfxProviderFreeImage::readbitmapFfmpeg(const LocalPath& imagePath, int size - - // Force seeking to key frames - formatContext->seek2any = false; -+#if LIBAVCODEC_VERSION_MAJOR < 60 - if (decoder->capabilities & CAP_TRUNCATED) - { - codecContext->flags |= CAP_TRUNCATED; - } -+#endif - - AVPixelFormat sourcePixelFormat = static_cast(codecParm->format); - AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format diff --git a/pkgs/by-name/me/megacmd/install-path.patch b/pkgs/by-name/me/megacmd/install-path.patch new file mode 100644 index 000000000000..e68a92d6e207 --- /dev/null +++ b/pkgs/by-name/me/megacmd/install-path.patch @@ -0,0 +1,21 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -135,7 +135,6 @@ if(UNIX AND NOT APPLE) + # Note: using cmake --install --prefix /some/prefix will not set rpath relative to that prefix + # The above can be used for building packages: in which install dir is a path construction folder that will not be there in packages + set(CMAKE_INSTALL_LIBDIR "opt/megacmd/lib") +- set(CMAKE_INSTALL_BINDIR "usr/bin") #override default "bin" + + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + message(STATUS "Overriding default CMAKE_INSTALL_PREFIX to /") +@@ -430,9 +429,9 @@ endif() + if (APPLE) + install(TARGETS ${all_targets} + BUNDLE +- DESTINATION "./" ++ DESTINATION "Applications/" + ) + elseif(NOT WIN32) + set(PERMISSIONS755 + OWNER_READ + OWNER_WRITE diff --git a/pkgs/by-name/me/megacmd/no-vcpkg.patch b/pkgs/by-name/me/megacmd/no-vcpkg.patch new file mode 100644 index 000000000000..1f3a76b27a0b --- /dev/null +++ b/pkgs/by-name/me/megacmd/no-vcpkg.patch @@ -0,0 +1,40 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bb161de8..5fa97e79 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,7 +39,7 @@ execute_process( + ) + endif() + +-if((NOT WIN32 OR BASH_VERSION_RESULT EQUAL 0) AND NOT EXISTS ${VCPKG_ROOT}) ++if(VCPKG_ROOT AND (NOT WIN32 OR BASH_VERSION_RESULT EQUAL 0) AND NOT EXISTS ${VCPKG_ROOT}) + message(STATUS "vcpkg will be cloned into ${VCPKG_ROOT}") + execute_process( + #TODO: have the same for windows ... or at least check if bash is available +@@ -468,17 +468,19 @@ elseif(NOT WIN32) + DESTINATION "etc/sysctl.d" + ) + +- #Install vcpkg dynamic libraries in locations defined by GNUInstallDirs. +- if(CMAKE_BUILD_TYPE STREQUAL "Debug") +- SET(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/") +- else() +- SET(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/") +- endif() +- install(DIRECTORY "${vcpkg_lib_folder}" ++ if(VCPKG_ROOT) ++ #Install vcpkg dynamic libraries in locations defined by GNUInstallDirs. ++ if(CMAKE_BUILD_TYPE STREQUAL "Debug") ++ SET(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/") ++ else() ++ SET(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/") ++ endif() ++ install(DIRECTORY "${vcpkg_lib_folder}" + DESTINATION ${CMAKE_INSTALL_LIBDIR} + FILES_MATCHING + PATTERN "lib*.so*" + PATTERN "*dylib*" #macOS + PATTERN "manual-link" EXCLUDE + PATTERN "pkgconfig" EXCLUDE) ++ endif() + endif() #not WIN32 diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix index cbbdb84569f5..0fd406c6f45a 100644 --- a/pkgs/by-name/me/megacmd/package.nix +++ b/pkgs/by-name/me/megacmd/package.nix @@ -1,106 +1,170 @@ { lib, stdenv, - autoreconfHook, - c-ares, + cmake, cryptopp, curl, fetchFromGitHub, + file, ffmpeg, - gcc-unwrapped, + fuse, icu, libmediainfo, - libraw, libsodium, libuv, libzen, - pcre-cpp, + makeWrapper, + nix-update-script, + pdfium-binaries, pkg-config, readline, sqlite, + versionCheckHook, + writeShellScriptBin, }: -let +stdenv.mkDerivation (finalAttrs: { pname = "megacmd"; - version = "1.7.0"; - srcOptions = - if stdenv.hostPlatform.isLinux then - { - tag = "${version}_Linux"; - hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM="; - } - else - { - tag = "${version}_macOS"; - hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM="; - }; -in -stdenv.mkDerivation { - inherit pname version; + version = "2.5.2"; - src = fetchFromGitHub ( - srcOptions - // { - owner = "meganz"; - repo = "MEGAcmd"; - fetchSubmodules = true; - } - ); + src = fetchFromGitHub { + owner = "meganz"; + repo = "MEGAcmd"; + # The upstream makes a tag for each platform getting a release, + # but the tags all point to the same commit, + # so we just stick to the Linux tag to make the update script easy. + tag = "${finalAttrs.version}_Linux"; + fetchSubmodules = true; + postCheckout = "git -C $out/sdk rev-parse --short HEAD > $out/sdk/.gitrev"; + hash = "sha256-RE4n4igAXhYNshnjjyeb2McmBKt5HY0oZ+U5SMMtQ2I="; + }; - enableParallelBuilding = true; - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ gcc-unwrapped ] # fix: ld: cannot find lib64/libstdc++fs.a - ++ [ - c-ares - cryptopp - curl - ffmpeg - icu - libmediainfo - libraw - libsodium - libuv - libzen - pcre-cpp - readline - sqlite - ]; - - configureFlags = [ - "--disable-examples" - "--with-cares" - "--with-cryptopp" - "--with-curl" - "--with-ffmpeg" - "--with-icu" - "--with-libmediainfo" - "--with-libuv" - "--with-libzen" - "--with-pcre" - "--with-readline" - "--with-sodium" - "--with-termcap" - "--without-freeimage" - ]; - - # On darwin, some macros defined in AssertMacros.h (from apple-sdk) are conflicting. - postConfigure = '' - echo '#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0' >> sdk/include/mega/config.h - ''; + __structuredAttrs = true; patches = [ - ./fix-ffmpeg.patch # https://github.com/meganz/sdk/issues/2635#issuecomment-1495405085 - ./fix-darwin.patch # fix: libtool tag not found; MacFileSystemAccess not declared; server cannot init + # use pkg-config instead of vcpkg + # https://github.com/meganz/MEGAcmd/pull/1067 + ./no-vcpkg.patch + + # use cmake option to enable the updater instead of depending on os + # https://github.com/meganz/MEGAcmd/pull/1117 + ./disable-updater.patch + + # fix install paths (/usr/bin -> /bin on linux, and / -> /Applications on darwin) + ./install-path.patch + + # do not look for the mega-cmd-server executable in /Applications on darwin + # but use the same strategy as on linux + ./fix-darwin.patch ]; + postPatch = '' + # interesting typo (https://github.com/meganz/MEGAcmd/pull/1118, https://github.com/meganz/sdk/pull/2770) + substituteInPlace build/cmake/modules/megacmd_configuration.cmake sdk/cmake/modules/configuration.cmake \ + --replace-fail "check_function_exists(aio_write, HAVE_AIO_RT)" "check_function_exists(aio_write HAVE_AIO_RT)" + + # cryptopp on nixpkgs has libcryptopp.pc, not libcrypto++.pc + # pdfium-binaries{,-v8} in nixpkgs does not provide a pc file but only a cmake file + # libicui18n is needed (https://github.com/meganz/sdk/pull/2769) + substituteInPlace sdk/cmake/modules/sdklib_libraries.cmake \ + --replace-fail "pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcrypto++)" "pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcryptopp)" \ + --replace-fail "pkg_check_modules(pdfium REQUIRED IMPORTED_TARGET pdfium)" "find_package(PDFium)" \ + --replace-fail "target_link_libraries(SDKlib PRIVATE PkgConfig::pdfium)" "target_link_libraries(SDKlib PRIVATE pdfium)" \ + --replace-fail "find_package(ICU COMPONENTS uc data REQUIRED)" "find_package(ICU COMPONENTS i18n uc data REQUIRED)" \ + --replace-fail "target_link_libraries(SDKlib PRIVATE ICU::uc ICU::data)" "target_link_libraries(SDKlib PRIVATE ICU::i18n ICU::uc ICU::data)" + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + cmake + pkg-config + file + makeWrapper + + # https://github.com/meganz/MEGAcmd/blob/2.5.0_Linux/CMakeLists.txt#L4-L10 + (writeShellScriptBin "git" '' + dir="$(pwd)" + while [[ ! -f "$dir/.gitrev" ]]; do + if [[ "$dir" == "/" ]]; then + echo "fatal: not a git repository (or any of the parent directories): .git" >&2 + exit 128 + fi + dir="$(dirname "$dir")" + done + cat "$dir/.gitrev" + '') + ]; + + buildInputs = [ + cryptopp + curl + ffmpeg + fuse + icu + libmediainfo + libsodium + libuv + libzen + pdfium-binaries + readline + sqlite + ]; + + cmakeFlags = [ + (lib.cmakeFeature "VCPKG_ROOT" "") # fallback to pkg-config instead of vcpkg + (lib.cmakeBool "ENABLE_UPDATER" false) + (lib.cmakeBool "USE_FREEIMAGE" false) # freeimage was removed from nixpkgs + (lib.cmakeBool "USE_PCRE" false) # causes link errors and is not needed anyway (use std::regex instead) + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/bin + for bundle in $out/Applications/*.app; do + ln -s "$bundle/Contents/MacOS"/* -t $out/bin + done + + # this command has different names (linux: mega-cmd-server; macos: MEGAcmd; windows: MEGAcmdServer) + # NOTE: official documentation (https://help.mega.io/desktop-app/mega-cmd/cmd) is outdated about this + ln -s $out/bin/MEGAcmd $out/bin/mega-cmd-server + + # these commands are installed on linux but not on macos + install -Dm755 ../src/client/mega-* -t $out/bin + ''; + + preFixup = '' + # use mega-exec from the same package instead of the one from PATH to avoid version mismatch + for f in $out/bin/*; do + if [[ "$(file -b --mime-type "$f")" == text/* ]]; then # shell script + substituteInPlace "$f" --replace-fail mega-exec "exec $out/bin/mega-exec" + elif [[ -f "$f" ]]; then # binary executable and not symlink + wrapProgram "$f" --prefix PATH : $out/bin${ + # there are some rpath problems on darwin that causes the binaries unable to find shared libraries + # there is probably a better way to fix this, but I cannot find it out + # everything in buildInputs is needed + lib.optionalString stdenv.hostPlatform.isDarwin + " --prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}" + } + fi + done + ''; + + # mega-exec wants to connect to megacmd server + __darwinAllowLocalNetworking = finalAttrs.doInstallCheck; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/mega-version"; + versionCheckProgramArg = "-l"; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=(\\d+\\.\\d+\\.\\d+)_Linux" ]; + }; + meta = { description = "MEGA Command Line Interactive and Scriptable Application"; homepage = "https://mega.io/cmd"; + changelog = "https://github.com/meganz/MEGAcmd/blob/${finalAttrs.src.tag}/build/megacmd/megacmd.changes"; license = with lib.licenses; [ bsd2 gpl3Only @@ -110,5 +174,6 @@ stdenv.mkDerivation { lunik1 ulysseszhan ]; + mainProgram = "mega-cmd"; }; -} +}) From 5c839ded98a80ddb2b9fbc5d6c500aebd1738593 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 19:29:22 +0000 Subject: [PATCH 232/246] megabasterd: 8.22 -> 8.23 --- pkgs/by-name/me/megabasterd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/megabasterd/package.nix b/pkgs/by-name/me/megabasterd/package.nix index 573aafed22a6..1a5e37d51fbe 100644 --- a/pkgs/by-name/me/megabasterd/package.nix +++ b/pkgs/by-name/me/megabasterd/package.nix @@ -6,7 +6,7 @@ maven, }: let - version = "8.22"; + version = "8.23"; in maven.buildMavenPackage { pname = "megabasterd"; @@ -16,7 +16,7 @@ maven.buildMavenPackage { owner = "tonikelope"; repo = "megabasterd"; tag = "v${version}"; - hash = "sha256-dkxIbQCnOnZ3tbqijqlRhEtEJ4q1ksot5n0gJ7HvsgI="; + hash = "sha256-FcEG+DvHa+ZcMV2CfKmLzMaXgEXzTW3qmULV4PwHaQ8="; }; mvnHash = "sha256-b7+17CXmBB65fMG472FPjOvr+9nAsUurdBC/7esalCE="; From 0b4a5505c7b6ec110ec7288d7439e62ebd60e180 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Apr 2026 21:49:36 +0200 Subject: [PATCH 233/246] python3Packages.photutils: migrate to finalAttrs --- pkgs/development/python-modules/photutils/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index cac5da8657e8..e0331e247265 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -17,10 +17,9 @@ setuptools, shapely, tqdm, - wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "photutils"; version = "3.0.0"; pyproject = true; @@ -28,14 +27,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astropy"; repo = "photutils"; - tag = version; + tag = finalAttrs.version; hash = "sha256-jfmC3pAQa/PrdEUa7QSYGW5zWzX43ghYCpmgRYup/Ks="; }; build-system = [ setuptools setuptools-scm - wheel ]; nativeBuildInputs = [ @@ -71,8 +69,8 @@ buildPythonPackage rec { meta = { description = "Astropy package for source detection and photometry"; homepage = "https://github.com/astropy/photutils"; - changelog = "https://github.com/astropy/photutils/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/astropy/photutils/blob/${finalAttrs.src.tag}/CHANGES.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 9dbe60f4dce184bb65dcfe18b6771816b4c9f0bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Apr 2026 21:55:37 +0200 Subject: [PATCH 234/246] python3Packages.rns: 1.1.5 -> 1.1.6 Diff: https://github.com/markqvist/Reticulum/compare/1.1.5...1.1.6 Changelog: https://github.com/markqvist/Reticulum/blob/1.1.6/Changelog.md --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index f795814512a7..c39588c5bdf0 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "rns"; - version = "1.1.5"; + version = "1.1.6"; pyproject = true; src = fetchFromGitHub { owner = "markqvist"; repo = "Reticulum"; tag = finalAttrs.version; - hash = "sha256-cgDL27KyDS8wPgyZ1ez6k9DRD2m9cJxms6w76Haalkg="; + hash = "sha256-21ym6R2zPxm8Z4zO6g/ZA4/A4S0SmwhOEqC6B+DTpOI="; }; patches = [ From 083d101b7467408ea025e2406ede831cb109917a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 20:29:45 +0000 Subject: [PATCH 235/246] python3Packages.oelint-data: 1.4.10 -> 1.4.11 --- 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 e59b9589b3e9..ba54ec5d1ec5 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "oelint-data"; - version = "1.4.10"; + version = "1.4.11"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-data"; tag = finalAttrs.version; - hash = "sha256-gV2kfiRMu52NNISaD11U+8o31Ko6tjEK6eNLr39ro1Y="; + hash = "sha256-zd4SmDIHtOKYK19tr/72CIKAfhWtm7957Ax7b2kAXdw="; }; build-system = [ From d32b7fa83806fdef114d4b85f78718a435c3ed60 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 19 Apr 2026 15:31:18 -0500 Subject: [PATCH 236/246] yabai: 7.1.21 -> 7.1.22 Changelog: https://github.com/asmvik/yabai/blob/v7.1.22/CHANGELOG.md --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 81114c4e2523..d487204df8bd 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.21"; + version = "7.1.22"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/asmvik/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-VEvuF1NkAeR1AlBdSwW0xFHLh73cwNVBE+5xyAGJcH0="; + hash = "sha256-a7ieZhQvt7YyLdBNYg0HhSl2BQRG+WdM2DYntNRLgyU="; }; "x86_64-darwin" = fetchFromGitHub { owner = "asmvik"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-I1A9L5zXIg4qVAM84DjdF2zGjSSPiJtw2K6D+iKVDLs="; + hash = "sha256-T3sZhJpoZJKQhZpGDyEhpw+dMXoaFO9PEd0g0jDcihc="; }; }; From 0e71eb9881936f7e70ce41739b9558b71dbb14c1 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 18 Apr 2026 17:15:33 -0500 Subject: [PATCH 237/246] vimPlugins: update on 2026-04-19 --- .../editors/vim/plugins/generated.nix | 1276 ++++++++--------- .../editors/vim/plugins/overrides.nix | 33 +- 2 files changed, 668 insertions(+), 641 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ca846fd65b1c..43c68227e7c7 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -22,11 +22,11 @@ final: prev: { BufOnly-vim = buildVimPlugin { pname = "BufOnly.vim"; - version = "0.1-unstable-2010-10-18"; + version = "0.1"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "BufOnly.vim"; - rev = "43dd92303979bdb234a3cb2f5662847f7a3affe7"; + tag = "0.1"; hash = "sha256-tLE5P3s38cnvVaQAEq9CwAiy70Imqh9oA6rKvjdWd78="; }; meta.homepage = "https://github.com/vim-scripts/BufOnly.vim/"; @@ -61,11 +61,11 @@ final: prev: { Colour-Sampler-Pack = buildVimPlugin { pname = "Colour-Sampler-Pack"; - version = "2012.10.28-unstable-2012-11-30"; + version = "2012.10.28"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "Colour-Sampler-Pack"; - rev = "05cded87b2ef29aaa9e930230bb88e23abff4441"; + tag = "2012.10.28"; hash = "sha256-490Y+f02VD4MhyV7fqqZmoLXXL+m3OTf6kA/p1HIYg8="; }; meta.homepage = "https://github.com/vim-scripts/Colour-Sampler-Pack/"; @@ -74,12 +74,12 @@ final: prev: { CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "4.7.4-unstable-2026-04-15"; + version = "4.7.4-unstable-2026-04-16"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "8b58670b69eb85f764b653081b42c9ed147583a1"; - hash = "sha256-f7A5WJettMJbnwr7URoeQNMQ0ClXe44qT2wt85vkGHQ="; + rev = "5378035c2eb4089de245473dec1768e0986543bd"; + hash = "sha256-dNDBRf/zZ7r4mNVNwST9PCm4QR9AQA/PPIbTXFT+C4k="; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; meta.hydraPlatforms = [ ]; @@ -87,12 +87,12 @@ final: prev: { Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "1.9.0-unstable-2026-04-04"; + version = "1.9.0"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "e509843fcd41e0bf507283a32fa1316b4fcf92e1"; - hash = "sha256-xXhutkemEQ6Qwbpg4buVCTUdVBPejrAPpwmaoBmnswU="; + tag = "v1.9.0"; + hash = "sha256-VKTfLdU7SwQohuTNefuhS5KCPbGLCDsr/mTABq+8hlk="; }; meta.homepage = "https://github.com/whonore/Coqtail/"; meta.hydraPlatforms = [ ]; @@ -100,11 +100,11 @@ final: prev: { DoxygenToolkit-vim = buildVimPlugin { pname = "DoxygenToolkit.vim"; - version = "0.2.13-unstable-2010-11-06"; + version = "0.2.13"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "DoxygenToolkit.vim"; - rev = "afd8663d36d2ec19d26befdb10e89e912d26bbd3"; + tag = "0.2.13"; hash = "sha256-uaA48i+lhwvYP6PGH4lTBaJh0Lnkda+lxNASKUCkSP0="; }; meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/"; @@ -152,11 +152,11 @@ final: prev: { Improved-AnsiEsc = buildVimPlugin { pname = "Improved-AnsiEsc"; - version = "13.2-unstable-2015-08-26"; + version = "13.2@1"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "Improved-AnsiEsc"; - rev = "e1c59a8e9203fab6b9150721f30548916da73351"; + tag = "13.2@1"; hash = "sha256-f2lJfi8yDb8W1NCQMMiaypZjTknkq3R/vr9O8SfRsuo="; }; meta.homepage = "https://github.com/vim-scripts/Improved-AnsiEsc/"; @@ -165,7 +165,7 @@ final: prev: { Ionide-vim = buildVimPlugin { pname = "Ionide-vim"; - version = "0-unstable-2026-04-10"; + version = "43-unstable-2026-04-10"; src = fetchFromGitHub { owner = "ionide"; repo = "Ionide-vim"; @@ -204,11 +204,11 @@ final: prev: { LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "15.15.0-unstable-2026-04-02"; + version = "15.15.0"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "83d90f339defdb109a6ede333865a66ffc7ef6aa"; + tag = "v15.15.0"; hash = "sha256-IANdrxjLdthOPjKuYqkWBDkbqwX0CxOO0heCFNnQFCA="; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; @@ -217,12 +217,12 @@ final: prev: { LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2.00-unstable-2026-04-15"; + version = "2.00"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "9a0eeaf016798b253420a8264668d7a7a2c627e3"; - hash = "sha256-T0p58vd8jeACpe3QIn/XUoz2YRGsEDaLd/k+/ihO9ds="; + tag = "v2.00"; + hash = "sha256-o8f1BrmYgMcYgoTAIZpH/YRnHE7hmWxpS8gRD/dB5rE="; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; meta.hydraPlatforms = [ ]; @@ -334,11 +334,11 @@ final: prev: { PreserveNoEOL = buildVimPlugin { pname = "PreserveNoEOL"; - version = "1.01-unstable-2013-06-14"; + version = "1.01"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "PreserveNoEOL"; - rev = "940e3ce90e54d8680bec1135a21dcfbd6c9bfb62"; + tag = "1.01"; hash = "sha256-7WGs7nPJoRCN/vaeg9SgtJK+ZhQI3AvAytK4L/KVRpw="; }; meta.homepage = "https://github.com/vim-scripts/PreserveNoEOL/"; @@ -386,11 +386,11 @@ final: prev: { Rename = buildVimPlugin { pname = "Rename"; - version = "0.3-unstable-2011-08-31"; + version = "0.3"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "Rename"; - rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34"; + tag = "0.3"; hash = "sha256-2RD+9Wsfwo49yZhLoMhqtj/2VotJrcDYD0gw/8nzNbQ="; }; meta.homepage = "https://github.com/vim-scripts/Rename/"; @@ -399,11 +399,11 @@ final: prev: { ReplaceWithRegister = buildVimPlugin { pname = "ReplaceWithRegister"; - version = "1.42-unstable-2014-10-31"; + version = "1.42"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "ReplaceWithRegister"; - rev = "832efc23111d19591d495dc72286de2fb0b09345"; + tag = "1.42"; hash = "sha256-D2FoV9G5u4MrOJhZmCdZtE+C5ya5pP/DSmUGWVDXYFU="; }; meta.homepage = "https://github.com/vim-scripts/ReplaceWithRegister/"; @@ -412,12 +412,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "0-unstable-2026-04-12"; + version = "0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "b2e84d00db4d5432f471d58898e796b478f075a7"; - hash = "sha256-C0p2Rh+Eqy6UdKgo9zP8g5hSsCtc+gRWZejl7LK7dBs="; + rev = "250aed7415ddd6cb3ea321490c7b35094ed9148d"; + hash = "sha256-UQ+6s4tMJ8z+UJ41ZX1HJTiDsbkYFEUSDb+N8jVBAeY="; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.hydraPlatforms = [ ]; @@ -438,11 +438,11 @@ final: prev: { ShowMultiBase = buildVimPlugin { pname = "ShowMultiBase"; - version = "1.0-unstable-2010-10-18"; + version = "1.0"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "ShowMultiBase"; - rev = "85a39fd12668ce973d3d9282263912b2b8f0d338"; + tag = "1.0"; hash = "sha256-EX39LVrFST7KgiM91Udq1BEBokK7KIj5FPB9qEQZ5UE="; }; meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/"; @@ -464,11 +464,11 @@ final: prev: { SmartCase = buildVimPlugin { pname = "SmartCase"; - version = "1.0.2-unstable-2010-10-18"; + version = "1.0.2"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "SmartCase"; - rev = "e8a737fae8961e45f270f255d43d16c36ac18f27"; + tag = "1.0.2"; hash = "sha256-fPAt51rG7DI2vwtRZr8rWAlDswp6O9m4+ob5N5QpDho="; }; meta.homepage = "https://github.com/vim-scripts/SmartCase/"; @@ -503,11 +503,11 @@ final: prev: { VimCompletesMe = buildVimPlugin { pname = "VimCompletesMe"; - version = "1.2.1-unstable-2015-04-20"; + version = "1.2.1"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "VimCompletesMe"; - rev = "b915ac2c081dd5aec69b561b04a8ac1778d2277c"; + tag = "1.2.1"; hash = "sha256-k2bp13fZvXLy4Lcm6BnfWu10eQuATU0WVPV/6lQOVFU="; }; meta.homepage = "https://github.com/vim-scripts/VimCompletesMe/"; @@ -568,11 +568,11 @@ final: prev: { YankRing-vim = buildVimPlugin { pname = "YankRing.vim"; - version = "19.0-unstable-2015-07-29"; + version = "19.0"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "YankRing.vim"; - rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65"; + tag = "19.0"; hash = "sha256-vEMx9TgjDx8AmjHVOHurW1/zYobyRsQdNTA/rNtFt30="; }; meta.homepage = "https://github.com/vim-scripts/YankRing.vim/"; @@ -595,11 +595,11 @@ final: prev: { a-vim = buildVimPlugin { pname = "a.vim"; - version = "2.18-unstable-2010-11-06"; + version = "2.18"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "a.vim"; - rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; + tag = "2.18"; hash = "sha256-ygmChz7YHn9lRaZiO3NRBMV0/lgNXyGwqj3BVX7awkA="; }; meta.homepage = "https://github.com/vim-scripts/a.vim/"; @@ -699,11 +699,11 @@ final: prev: { aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "3.1.0-unstable-2026-02-25"; + version = "3.1.0"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "645d108a5242ec7b378cbe643eb6d04d4223f034"; + tag = "v3.1.0"; hash = "sha256-ugzNA/+Z2ReIy/8ks9wHEtmpTwpr8qqVR0xemw+GrUc="; fetchSubmodules = true; }; @@ -765,11 +765,11 @@ final: prev: { aider-nvim = buildVimPlugin { pname = "aider.nvim"; - version = "0.7.0-unstable-2025-04-17"; + version = "0.7.0"; src = fetchFromGitHub { owner = "joshuavial"; repo = "aider.nvim"; - rev = "1e5fc680a764d2b93f342005d7e4415fec469088"; + tag = "v0.7.0"; hash = "sha256-JJP1om3cJQC1/0wh2GFQCnMhPBgCKsiLZxc+xiuxjzg="; }; meta.homepage = "https://github.com/joshuavial/aider.nvim/"; @@ -817,11 +817,11 @@ final: prev: { align = buildVimPlugin { pname = "align"; - version = "37-43-unstable-2012-08-08"; + version = "37-43"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "align"; - rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; + tag = "37-43"; hash = "sha256-97V2Q1c3DwNUZVa9RVWIN/N5Cw6Gr622PNBNcUpmiik="; }; meta.homepage = "https://github.com/vim-scripts/align/"; @@ -843,12 +843,12 @@ final: prev: { alpha-nvim = buildVimPlugin { pname = "alpha-nvim"; - version = "0-unstable-2026-04-14"; + version = "0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "7563da4a861ee6b3ed674d0ee5c5c0bd19383a38"; - hash = "sha256-LfGIDjFN8jECnKrnOQQPyOsWMPQaFidfkgjYS93srpA="; + rev = "6c6a89d5b068b5251c8bdf0dd57bb921bcfeeb09"; + hash = "sha256-g0uhWP8OREJifcjLjNAK43lNmtWXVIEUwTORfLuX1RQ="; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; meta.hydraPlatforms = [ ]; @@ -895,12 +895,12 @@ final: prev: { ansible-vim = buildVimPlugin { pname = "ansible-vim"; - version = "4.0-unstable-2026-04-06"; + version = "5.0"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "024274576de77db723eb1f0478da046fc5f1507f"; - hash = "sha256-rMHGsS31CYhCM2Ks+OAWBodFvKEsfQYGybtx98fri84="; + tag = "5.0"; + hash = "sha256-dGlvaxZw2woaau78en3QH//a7JhI+GHTMIzW8uNjtmc="; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; meta.hydraPlatforms = [ ]; @@ -934,11 +934,11 @@ final: prev: { argtextobj-vim = buildVimPlugin { pname = "argtextobj.vim"; - version = "1.1.1-unstable-2010-10-18"; + version = "1.1.1"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "argtextobj.vim"; - rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b"; + tag = "1.1.1"; hash = "sha256-iFga589ovZztvCZ7/zeTshmVyLRXGvGLxMHP2mCBktA="; }; meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; @@ -960,11 +960,11 @@ final: prev: { arshlib-nvim = buildVimPlugin { pname = "arshlib.nvim"; - version = "2.0.1-unstable-2024-05-18"; + version = "2.0.1"; src = fetchFromGitHub { owner = "arsham"; repo = "arshlib.nvim"; - rev = "111fd439268adda206a24b133096893869a50764"; + tag = "v2.0.1"; hash = "sha256-NuRh9VPztFdPdqUX8yuUes084pXkSZStWp6ewUlgqso="; }; meta.homepage = "https://github.com/arsham/arshlib.nvim/"; @@ -973,12 +973,12 @@ final: prev: { artio-nvim = buildVimPlugin { pname = "artio.nvim"; - version = "0-unstable-2026-04-07"; + version = "0-unstable-2026-04-18"; src = fetchFromGitHub { owner = "comfysage"; repo = "artio.nvim"; - rev = "207c1ece931eaf40e310ecb3436312c586c26756"; - hash = "sha256-OGL/ECEgzjUYHaN65HtlnkGzTxbFd9hf5sBr7YMp2Ks="; + rev = "8aedc0cd8f8efd8e6062fc478f0be2b9eb31d40d"; + hash = "sha256-S94KIu2ATE9tprJw83GQj7icrMixPsZ33WjmHm5kf4g="; }; meta.homepage = "https://github.com/comfysage/artio.nvim/"; meta.hydraPlatforms = [ ]; @@ -986,12 +986,12 @@ final: prev: { astrocore = buildVimPlugin { pname = "astrocore"; - version = "3.0.1-unstable-2026-04-13"; + version = "3.0.2"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrocore"; - rev = "a9e8285d30984dfd4edb96c7e772d463c84eba30"; - hash = "sha256-UnFsMf4zfr8kQrL756lAXXmFubCZtY5GLeMW9+If2/o="; + tag = "v3.0.2"; + hash = "sha256-4yf49at22utcEVrLftI8X0iBrcbfVqlZpreXkM0q63E="; }; meta.homepage = "https://github.com/AstroNvim/astrocore/"; meta.hydraPlatforms = [ ]; @@ -999,11 +999,11 @@ final: prev: { astrolsp = buildVimPlugin { pname = "astrolsp"; - version = "4.0.0-unstable-2026-03-30"; + version = "4.0.0"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrolsp"; - rev = "ebc1676127b3bfbd46e3e26589b104853cac3730"; + tag = "v4.0.0"; hash = "sha256-N8uwx9PpGey0itrvq/OKOEwtRxXfto0MQ5Tbb7Bnc8w="; }; meta.homepage = "https://github.com/AstroNvim/astrolsp/"; @@ -1012,12 +1012,12 @@ final: prev: { astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "4.10.1-unstable-2026-02-20"; + version = "4.10.1"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "4ed9d1110e62b8965cd35ba9419237057bb41550"; - hash = "sha256-MdcAj3cyfdnf2uo7AkdZlouNlfCPPQX6B92W1tQOlfE="; + tag = "v4.10.1"; + hash = "sha256-rh/cbZcGhpdaprhEs9Cgi2YYNT3B+L+djwFpCn44qeI="; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; meta.hydraPlatforms = [ ]; @@ -1025,11 +1025,11 @@ final: prev: { astroui = buildVimPlugin { pname = "astroui"; - version = "4.0.0-unstable-2026-03-30"; + version = "4.0.0"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astroui"; - rev = "920dd5df6629a9076a11ea10f0d21f4225203585"; + tag = "v4.0.0"; hash = "sha256-290PxuIz8Pc1UWz6Huy0ZQH1CxGeoqN5x2U+VDCRBJc="; }; meta.homepage = "https://github.com/AstroNvim/astroui/"; @@ -1194,12 +1194,12 @@ final: prev: { aurora = buildVimPlugin { pname = "aurora"; - version = "0.11-unstable-2026-04-09"; + version = "0.11"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "a7b2199d4463e4998dae4f4fcd6f811f4acd7769"; - hash = "sha256-bnWvQ3IKh7xNUbsvLxHk/q7sLwDW0wwUh4YsZVZa5QA="; + tag = "v0.11"; + hash = "sha256-GSelduKp3s2M6litBAbxGBCoGnD4elNyAAXyrOQwCLw="; }; meta.homepage = "https://github.com/ray-x/aurora/"; meta.hydraPlatforms = [ ]; @@ -1207,12 +1207,12 @@ final: prev: { auto-fix-return-nvim = buildVimPlugin { pname = "auto-fix-return.nvim"; - version = "0.4.0-unstable-2026-02-21"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Jay-Madden"; repo = "auto-fix-return.nvim"; - rev = "986e866d4c341b3d95f7794e96f2a6da4319b047"; - hash = "sha256-Ebb1vsNQuofWfxD+zOj1piOITSjXW4DTV0nM+P3cZyA="; + tag = "v0.4.0"; + hash = "sha256-dM9ZWncbVjRNk0VsGhngtPBM0kvSegnh1uXmljwCx8s="; }; meta.homepage = "https://github.com/Jay-Madden/auto-fix-return.nvim/"; meta.hydraPlatforms = [ ]; @@ -1246,12 +1246,12 @@ final: prev: { auto-pairs = buildVimPlugin { pname = "auto-pairs"; - version = "2.0.0-unstable-2019-02-27"; + version = "2.0.0"; src = fetchFromGitHub { owner = "jiangmiao"; repo = "auto-pairs"; - rev = "39f06b873a8449af8ff6a3eee716d3da14d63a76"; - hash = "sha256-zyLwbGp0y5XuLCbA7A3NL9EHh5jf9K7X7XerykoJrsM="; + tag = "v2.0.0"; + hash = "sha256-ASK4CWWIhD1C6dwHFpMrUUXlwGrUyJrZmCIyy3LVuV8="; }; meta.homepage = "https://github.com/jiangmiao/auto-pairs/"; meta.hydraPlatforms = [ ]; @@ -1259,11 +1259,11 @@ final: prev: { auto-save-nvim = buildVimPlugin { pname = "auto-save.nvim"; - version = "1.1.0-unstable-2026-03-30"; + version = "1.2.0"; src = fetchFromGitHub { owner = "okuuva"; repo = "auto-save.nvim"; - rev = "9aabcb8396224dcbf8d51c0c1d620d88a46e89d7"; + tag = "v1.2.0"; hash = "sha256-udN8ETRYKmVEeu+/2J6yZHnnBWtnLV7yKiOY0AvS8rg="; }; meta.homepage = "https://github.com/okuuva/auto-save.nvim/"; @@ -1272,7 +1272,7 @@ final: prev: { auto-session = buildVimPlugin { pname = "auto-session"; - version = "0-unstable-2026-02-15"; + version = "2.5.1-unstable-2026-02-15"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; @@ -1298,12 +1298,12 @@ final: prev: { autolist-nvim = buildVimPlugin { pname = "autolist.nvim"; - version = "3.0.2-unstable-2026-04-04"; + version = "3.0.2"; src = fetchFromGitHub { owner = "gaoDean"; repo = "autolist.nvim"; - rev = "339499695d3be8c44aefef1d2516464758957004"; - hash = "sha256-zjc1RnL26LEPSBw2WNnKK+lOGqvKAuuIfAciIP8dD1U="; + tag = "v3.0.2"; + hash = "sha256-UhiTOxHDt/NpslKbnuUswrK9aQKhm+eynI94tVU9JqA="; }; meta.homepage = "https://github.com/gaoDean/autolist.nvim/"; meta.hydraPlatforms = [ ]; @@ -1311,11 +1311,11 @@ final: prev: { autoload_cscope-vim = buildVimPlugin { pname = "autoload_cscope.vim"; - version = "0.5-unstable-2011-01-28"; + version = "0.5"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "autoload_cscope.vim"; - rev = "26f428f400d96d25a9d633e6314f6e1760923db1"; + tag = "0.5"; hash = "sha256-x8JHwQI/Z5S0IhA1EHFteGDOLTK0f8CCULqGZsk0EJQ="; }; meta.homepage = "https://github.com/vim-scripts/autoload_cscope.vim/"; @@ -1467,12 +1467,12 @@ final: prev: { base16-nvim = buildVimPlugin { pname = "base16-nvim"; - version = "0-unstable-2026-04-14"; + version = "0-unstable-2026-04-19"; src = fetchFromGitHub { owner = "RRethy"; repo = "base16-nvim"; - rev = "4a6ef31745f851e11424a12b63fb3d2a80b2916c"; - hash = "sha256-3foS2WjStIymiS03aUgYrgNl1eB+zg8FZHspOEwPOMk="; + rev = "17781884af64e4205f84dde41d6030a61d0eb0dc"; + hash = "sha256-j/QwImtvOHSLaoYR5nUOncmTFHrhdDPt30y3K8L2UFc="; }; meta.homepage = "https://github.com/RRethy/base16-nvim/"; meta.hydraPlatforms = [ ]; @@ -1519,11 +1519,11 @@ final: prev: { bats-vim = buildVimPlugin { pname = "bats.vim"; - version = "0.1.0-unstable-2013-07-03"; + version = "0.1.0"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "bats.vim"; - rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a"; + tag = "0.1.0"; hash = "sha256-fceXwNwSB2pzVQDMVU1mx1aMRpow22hY5fcVf1yDwxk="; }; meta.homepage = "https://github.com/vim-scripts/bats.vim/"; @@ -1584,11 +1584,11 @@ final: prev: { bitbake = buildVimPlugin { pname = "bitbake"; - version = "2.12.0-unstable-2026-04-08"; + version = "6.0_M3"; src = fetchFromGitHub { owner = "openembedded"; repo = "bitbake"; - rev = "5d722b5d65e4eef7befe6376983385421e993f86"; + tag = "yocto-6.0_M3"; hash = "sha256-nOnNIXRUxsYNaEBhWuzCMTg37C9/S4ekxNbCpvBe+TU="; }; meta.homepage = "https://github.com/openembedded/bitbake/"; @@ -1662,12 +1662,12 @@ final: prev: { blink-cmp-dictionary = buildVimPlugin { pname = "blink-cmp-dictionary"; - version = "3.0.1-unstable-2026-02-26"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Kaiser-Yang"; repo = "blink-cmp-dictionary"; - rev = "35142bba869b869715e91a99d2f46bcf93fca4ae"; - hash = "sha256-idDHERqdqKB8/we00oVEo1sTDqrwPRTsuWmmG0ISeoE="; + tag = "v3.0.1"; + hash = "sha256-z41OnVbJAQe4FMvdazs0Uw8sAOyXEBJcx3IVqjOWGyI="; }; meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-dictionary/"; meta.hydraPlatforms = [ ]; @@ -1727,12 +1727,12 @@ final: prev: { blink-cmp-npm-nvim = buildVimPlugin { pname = "blink-cmp-npm.nvim"; - version = "0.3.0-unstable-2025-05-18"; + version = "0.3.0"; src = fetchFromGitHub { owner = "alexandre-abrioux"; repo = "blink-cmp-npm.nvim"; - rev = "f316507437aa893dbb7aa6709ac9cd68375b3670"; - hash = "sha256-cj1MTP+TmIHMllJEv4XJj4wHjc8nCfMNbEg8YUEqvsQ="; + tag = "v0.3.0"; + hash = "sha256-0j8CljfXsEoZ+FkxB/YrT2YHvg87j1eyuhGgjxh+Dg0="; }; meta.homepage = "https://github.com/alexandre-abrioux/blink-cmp-npm.nvim/"; meta.hydraPlatforms = [ ]; @@ -1766,11 +1766,11 @@ final: prev: { blink-cmp-words = buildVimPlugin { pname = "blink-cmp-words"; - version = "1.0.0-unstable-2025-08-06"; + version = "1.0.0"; src = fetchFromGitHub { owner = "archie-judd"; repo = "blink-cmp-words"; - rev = "d6a56f532a1826b4f3aeed4d5e2fe7b8743a9244"; + tag = "v1.0.0"; hash = "sha256-x4VSBDdcij4BkvIzkFnGVtJvq+ow1rTtZk9MWeTlzpE="; }; meta.homepage = "https://github.com/archie-judd/blink-cmp-words/"; @@ -1831,11 +1831,11 @@ final: prev: { blink-indent = buildVimPlugin { pname = "blink.indent"; - version = "2.1.2-unstable-2026-01-13"; + version = "2.1.2"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.indent"; - rev = "9c80820ca77218a8d28e70075d6f44a1609911fe"; + tag = "v2.1.2"; hash = "sha256-SS66JZFCX8viYxYaObASlwtrG5h7yHbVvRBVXBNXkng="; }; meta.homepage = "https://github.com/Saghen/blink.indent/"; @@ -1857,12 +1857,12 @@ final: prev: { blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; - version = "2.2.5-unstable-2026-04-13"; + version = "2.2.5"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "13b3e890755a1d1e4947d984b129e9defe787366"; - hash = "sha256-+tsUWXKnHkaHyEaB1UHWr3B3LuNdz+iMwha0h0gD58A="; + tag = "v2.2.5"; + hash = "sha256-ZTgRsY4efkihWAdJ6XiIdXipYLDq6DJiA303zXybzw0="; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; meta.hydraPlatforms = [ ]; @@ -1870,11 +1870,11 @@ final: prev: { bloat-nvim = buildVimPlugin { pname = "bloat.nvim"; - version = "2025.04.30-unstable-2025-04-30"; + version = "2025.04.30"; src = fetchFromGitHub { owner = "dundalek"; repo = "bloat.nvim"; - rev = "f90bef655ac40fecbaae53e10db1cf7894d090b1"; + tag = "2025.04.30"; hash = "sha256-MYMLRpF0xFNr4SqJGekxKA+fbhOUlv7LYZOLEwhiBSo="; }; meta.homepage = "https://github.com/dundalek/bloat.nvim/"; @@ -1974,11 +1974,11 @@ final: prev: { bufexplorer = buildVimPlugin { pname = "bufexplorer"; - version = "7.14.0-unstable-2026-03-17"; + version = "7.14.0"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "77d7aa8dd388a777a547410023927c78762c5060"; + tag = "7.14.0"; hash = "sha256-IRmhtjd6oXNwETCF98jIyoZJRbEeXZ8dcw6vH5ywugo="; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; @@ -2000,11 +2000,11 @@ final: prev: { bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "4.9.1-unstable-2025-01-14"; + version = "4.9.1"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3"; + tag = "v4.9.1"; hash = "sha256-ae4MB6+6v3awvfSUWlau9ASJ147ZpwuX1fvJdfMwo1Q="; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; @@ -2078,12 +2078,12 @@ final: prev: { catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2.0.0-unstable-2026-04-06"; + version = "2.0.0"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "426dbebe06b5c69fd846ceb17b42e12f890aedf1"; - hash = "sha256-qs74a/h9nUoI1uZ7Rlh8krgWkTaIh4SaHshhPiDwBis="; + tag = "v2.0.0"; + hash = "sha256-7R4jo4tLHuS34hikP+TeI3TH16qF7CAhhmChhzJ8NtQ="; }; meta.homepage = "https://github.com/catppuccin/nvim/"; meta.hydraPlatforms = [ ]; @@ -2156,12 +2156,12 @@ final: prev: { changeColorScheme-vim = buildVimPlugin { pname = "changeColorScheme.vim"; - version = "0.12-unstable-2010-10-18"; + version = "0.12"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "changeColorScheme.vim"; - rev = "b041d49f828629d72f2232531a230d1ec5de2405"; - hash = "sha256-CUzMEy3DmRow/rMbvdd3dVKUlX6ENRdJE0WkmZ6Gy18="; + tag = "0.12"; + hash = "sha256-8gC+QJRZPktc/o7hBeCFjd4VbAMTPzAnIOl1MXc56Yw="; }; meta.homepage = "https://github.com/vim-scripts/changeColorScheme.vim/"; meta.hydraPlatforms = [ ]; @@ -2182,11 +2182,11 @@ final: prev: { checkmate-nvim = buildVimPlugin { pname = "checkmate.nvim"; - version = "0.12.0-unstable-2025-11-15"; + version = "0.12.0"; src = fetchFromGitHub { owner = "bngarren"; repo = "checkmate.nvim"; - rev = "fc8edd6ecf8e4095ef878780e4bed83cc5c56c14"; + tag = "v0.12.0"; hash = "sha256-stV0WtkTj+7S1aPAbu1unP755xO275Q1D7k/pl+NbHM="; }; meta.homepage = "https://github.com/bngarren/checkmate.nvim/"; @@ -2208,12 +2208,12 @@ final: prev: { cinnamon-nvim = buildVimPlugin { pname = "cinnamon.nvim"; - version = "1.2.5-unstable-2024-08-07"; + version = "1.2.5"; src = fetchFromGitHub { owner = "declancm"; repo = "cinnamon.nvim"; - rev = "450cb3247765fed7871b41ef4ce5fa492d834215"; - hash = "sha256-kccQ4iFMSQ8kvE7hYz90hBrsDLo7VohFj/6lEZZiAO8="; + tag = "v1.2.5"; + hash = "sha256-+nDYk3zkLlj9YkzfK8mbD22iLWaHpzHImxPt3EVfyV0="; }; meta.homepage = "https://github.com/declancm/cinnamon.nvim/"; meta.hydraPlatforms = [ ]; @@ -2221,12 +2221,12 @@ final: prev: { circles-nvim = buildVimPlugin { pname = "circles.nvim"; - version = "2.0.1-unstable-2023-04-08"; + version = "2.0.1"; src = fetchFromGitHub { owner = "projekt0n"; repo = "circles.nvim"; - rev = "01b9ac1dc6c181f6982eddd57deb1fc7f92d7a70"; - hash = "sha256-Ylpwvvac867QyusKlPu0pIhTSEVDzTyRNCnHY5xHXF0="; + tag = "v2.0.1"; + hash = "sha256-vavBQv8UlgwCmVWAibgHQKG3bJ1zlzVMexdHWRMDbe8="; }; meta.homepage = "https://github.com/projekt0n/circles.nvim/"; meta.hydraPlatforms = [ ]; @@ -2234,12 +2234,12 @@ final: prev: { citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "0-unstable-2025-06-16"; + version = "0-unstable-2026-04-16"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "ce6749e4c3a842679cc302ce1c2db76c2d07f700"; - hash = "sha256-cq2tCzG3RB6tRToZSI76fIHJG8oO95uoGVE+c4b5a9U="; + rev = "e6fed9ec3d0ac190b1387379c138ba5e23a1f4f9"; + hash = "sha256-3MEAVKAblGysBhlrCf8j7Pf79tmylkjTnQkg6cvKMjg="; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; meta.hydraPlatforms = [ ]; @@ -2324,7 +2324,7 @@ final: prev: { clever-f-vim = buildVimPlugin { pname = "clever-f.vim"; - version = "0-unstable-2022-10-15"; + version = "1.7-unstable-2022-10-15"; src = fetchFromGitHub { owner = "rhysd"; repo = "clever-f.vim"; @@ -2415,11 +2415,11 @@ final: prev: { cmdalias-vim = buildVimPlugin { pname = "cmdalias.vim"; - version = "3.0-unstable-2010-10-18"; + version = "3.0"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "cmdalias.vim"; - rev = "fd3aea59d57f5fed1b835a0e545540c9781c4bb3"; + tag = "3.0"; hash = "sha256-TMo/b2ESYQ0TxcufmpXjRfwFLPGxi0oAaYHV9lddZPg="; }; meta.homepage = "https://github.com/vim-scripts/cmdalias.vim/"; @@ -2869,11 +2869,11 @@ final: prev: { cmp-pandoc-nvim = buildVimPlugin { pname = "cmp-pandoc.nvim"; - version = "1.1.0-unstable-2023-03-03"; + version = "1.1.0"; src = fetchFromGitHub { owner = "aspeddro"; repo = "cmp-pandoc.nvim"; - rev = "30faa4456a7643c4cb02d8fa18438fd484ed7602"; + tag = "v1.1.0"; hash = "sha256-zkTOczQZQ59QiqiSxya9j8tOw+gtuFd7EK4gz+AAiTo="; }; meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/"; @@ -2908,11 +2908,11 @@ final: prev: { cmp-rg = buildVimPlugin { pname = "cmp-rg"; - version = "1.3.11-unstable-2024-11-12"; + version = "1.3.11"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "cmp-rg"; - rev = "70a43543f61b6083ba9c3b7deb9ccee671410ac6"; + tag = "v1.3.11"; hash = "sha256-IWYyZoXYyddW9wqR50E16IXFQAsFAjf93O/NkVGb9H8="; }; meta.homepage = "https://github.com/lukas-reineke/cmp-rg/"; @@ -2999,11 +2999,11 @@ final: prev: { cmp-under-comparator = buildVimPlugin { pname = "cmp-under-comparator"; - version = "1.0.1-unstable-2021-11-11"; + version = "1.0.1"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "cmp-under-comparator"; - rev = "6857f10272c3cfe930cece2afa2406e1385bfef8"; + tag = "v1.0.1"; hash = "sha256-sPZX+dbGKOUfcjme4qG82impwYZgLbN5eRmblxPtbKI="; }; meta.homepage = "https://github.com/lukas-reineke/cmp-under-comparator/"; @@ -3155,11 +3155,11 @@ final: prev: { coc-lua = buildVimPlugin { pname = "coc-lua"; - version = "2.0.6-unstable-2023-12-08"; + version = "2.0.6"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "ceedce75a82b3a6d33f33df7c079b5f7bd7ed952"; + tag = "v2.0.6"; hash = "sha256-tfZKX/M/L0K84CIgq0g9Xnoy2meuaTd9BET7WzD3/Ms="; }; meta.homepage = "https://github.com/josa42/coc-lua/"; @@ -3181,12 +3181,12 @@ final: prev: { coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "0.0.82-unstable-2026-04-14"; + version = "0.0.82-unstable-2026-04-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "74dbe8d8b5889cbef02c2df44759a60d63507826"; - hash = "sha256-skKuvMdAYm4+RBhFWjuhtFvzFbVP/QsEeRUVedcz6vw="; + rev = "4760873cd36831c555309f884a955ab66717d8c0"; + hash = "sha256-p/xVUvewcB6DhfHeV6tj+RH+ijeFOxA6/qARG0obcrA="; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.hydraPlatforms = [ ]; @@ -3246,11 +3246,11 @@ final: prev: { codecompanion-lualine-nvim = buildVimPlugin { pname = "codecompanion-lualine.nvim"; - version = "0.1.8-unstable-2026-01-20"; + version = "0.1.8"; src = fetchFromGitHub { owner = "franco-ruggeri"; repo = "codecompanion-lualine.nvim"; - rev = "3e06ae6c233628103686de37b7abb363e50868ee"; + tag = "v0.1.8"; hash = "sha256-lIHyiBU3P1hxPY0CGKH1xj6cXCSKJ/2Hmc18gZLIXEU="; }; meta.homepage = "https://github.com/franco-ruggeri/codecompanion-lualine.nvim/"; @@ -3259,12 +3259,12 @@ final: prev: { codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "19.11.0-unstable-2026-04-15"; + version = "19.11.0"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "1d01c5e8befb7f0cd283641289f8e798f8a0a01c"; - hash = "sha256-ZuKm1uEMQ74GfKHwEmVBMllJs3pX+MzBQdxVbwdcXY4="; + tag = "v19.11.0"; + hash = "sha256-z8zcGgq5CBq5OlUZ+GfcvCgVrrFdGUMpJYR0duMigXA="; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.hydraPlatforms = [ ]; @@ -3272,11 +3272,11 @@ final: prev: { codecompanion-spinner-nvim = buildVimPlugin { pname = "codecompanion-spinner.nvim"; - version = "0.2.5-unstable-2026-01-20"; + version = "0.2.5"; src = fetchFromGitHub { owner = "franco-ruggeri"; repo = "codecompanion-spinner.nvim"; - rev = "7797a81141e5de62eecebf2af561698ed58900dc"; + tag = "v0.2.5"; hash = "sha256-QSkiyV70kFkArCnTXYRR+Dt4i5XSq072tYnOnHbKEBc="; }; meta.homepage = "https://github.com/franco-ruggeri/codecompanion-spinner.nvim/"; @@ -3285,12 +3285,12 @@ final: prev: { codesettings-nvim = buildVimPlugin { pname = "codesettings.nvim"; - version = "1.6.7-unstable-2026-04-15"; + version = "1.6.7"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "codesettings.nvim"; - rev = "90be8fe8045441a0bcd5541cdb619125e61e1bba"; - hash = "sha256-2pywFdmNGTHebrrs5aW795jmfHw2vQJsmYAKLAaGCHM="; + tag = "v1.6.7"; + hash = "sha256-7Ujon82GbVqD5K+lattVCYHkkGofvVEjbeqyaUeR2rU="; }; meta.homepage = "https://github.com/mrjones2014/codesettings.nvim/"; meta.hydraPlatforms = [ ]; @@ -3415,12 +3415,12 @@ final: prev: { command-t = buildVimPlugin { pname = "command-t"; - version = "8.1-unstable-2026-04-09"; + version = "8.1"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "63aad032b04dc9d4ad590f0585105e835217f4ec"; - hash = "sha256-bzmw5jFQXOpJ9e2wZ0opBg6UjGv9ygtgdR9EcmPW4po="; + tag = "8.1"; + hash = "sha256-yp3kqhHQMtUFFPfbqgnrmmclx6r39k3ohen4Ys3s3BU="; }; meta.homepage = "https://github.com/wincent/command-t/"; meta.hydraPlatforms = [ ]; @@ -3441,12 +3441,12 @@ final: prev: { comment-box-nvim = buildVimPlugin { pname = "comment-box.nvim"; - version = "1.0.2-unstable-2024-02-03"; + version = "1.0.2"; src = fetchFromGitHub { owner = "LudoPinelli"; repo = "comment-box.nvim"; - rev = "06bb771690bc9df0763d14769b779062d8f12bc5"; - hash = "sha256-fbuN2L8M6AZRvIiKy9ECLgf3Uya6g5znfDaCgVF3XKA="; + tag = "v1.0.2"; + hash = "sha256-2P8Zyd5ucOvihZdjgSmr7YlV0yuCn+LyHkCj9gPx/CY="; }; meta.homepage = "https://github.com/LudoPinelli/comment-box.nvim/"; meta.hydraPlatforms = [ ]; @@ -3598,12 +3598,12 @@ final: prev: { conjure = buildVimPlugin { pname = "conjure"; - version = "4.60.0-unstable-2026-04-10"; + version = "4.60.0"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "f66b3e7f45d325bd556cd785502761e583971920"; - hash = "sha256-Z7c4VFmh/bRHGXOtHlXYaQ2Iyp4PcfWbkcV4LopVz24="; + tag = "v4.60.0"; + hash = "sha256-wz+nHMR6gYXGDxSAZExd7CItONY2MERYzDapNpKFLmc="; }; meta.homepage = "https://github.com/Olical/conjure/"; meta.hydraPlatforms = [ ]; @@ -3689,11 +3689,11 @@ final: prev: { copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2.0.2-unstable-2026-04-11"; + version = "2.0.2"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "ad7e729e9a6348f7da482be0271d452dbc4c8e2c"; + tag = "v2.0.2"; hash = "sha256-9e5nJI+ugkolwdzQ4/KT6Gz1rpSbOSnLfdUWT9LDJg0="; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; @@ -3715,11 +3715,11 @@ final: prev: { copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "1.59.0-unstable-2026-01-09"; + version = "1.59.0"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "a12fd5672110c8aa7e3c8419e28c96943ca179be"; + tag = "v1.59.0"; hash = "sha256-McrihGscbvt2lqHil3NxHUfgx/IAFDf7tdbBkv4vTK4="; }; meta.homepage = "https://github.com/github/copilot.vim/"; @@ -3975,12 +3975,12 @@ final: prev: { cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "5.4.0-unstable-2026-04-11"; + version = "5.4.0"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "39f69ebcd8de69c741bb7a65353aa37dd0680ad1"; - hash = "sha256-2ADg5XUAswPx9LWXgxRngPqfsdqkpbcIjtQscvR6lsc="; + tag = "v5.4.0"; + hash = "sha256-lz9TlZRhJIUnv/4qTT8SoimRiY/vGFlrOKT3xc3FtoQ="; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; meta.hydraPlatforms = [ ]; @@ -4040,11 +4040,11 @@ final: prev: { darkearth-nvim = buildVimPlugin { pname = "darkearth-nvim"; - version = "2.4.2-unstable-2026-04-12"; + version = "2.4.2"; src = fetchFromGitHub { owner = "ptdewey"; repo = "darkearth-nvim"; - rev = "668968e81ce125544a3e25f21419c08bec9a3cc4"; + tag = "v2.4.2"; hash = "sha256-j7pFWOD/pbhjSmSepaWhB94Sawp7uHmkRhZDlo+bzxo="; }; meta.homepage = "https://github.com/ptdewey/darkearth-nvim/"; @@ -4092,12 +4092,12 @@ final: prev: { dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "0-unstable-2026-04-03"; + version = "0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "62a10d9d55132b338dd742afc3c8a2683f3dd426"; - hash = "sha256-gT+RSBQmmJb+Z34qG+ibRuzbKsgpiMzxUv76ItEQIEk="; + rev = "f787e3462c2ee2b6117b17c1aa4ddf66cb6f57fe"; + hash = "sha256-fzk/ThE6F0ssfeXTuVyO6KiMQSZz7YLxXwB4lbDz3CA="; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; meta.hydraPlatforms = [ ]; @@ -4209,12 +4209,12 @@ final: prev: { ddc-vim = buildVimPlugin { pname = "ddc.vim"; - version = "10.3.0-unstable-2026-04-05"; + version = "10.3.0"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc.vim"; - rev = "b1eff146f035a3fb40ad41c7d69c7e09f89ba6b3"; - hash = "sha256-RqngBulmngqQDSAyRR4QOJ0L7d3/Af0sMG1JcmRDsqA="; + tag = "v10.3.0"; + hash = "sha256-vetnDOYWEg+iuMOFL2GYzVfuYgV94Jl8DzBDZxhAFf0="; }; meta.homepage = "https://github.com/Shougo/ddc.vim/"; meta.hydraPlatforms = [ ]; @@ -4235,12 +4235,12 @@ final: prev: { debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "7.1.1-unstable-2026-04-06"; + version = "7.1.1"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "01ff4d03e623243dc9302cdddc14b08bc2fbb7be"; - hash = "sha256-0WzqJp0jqnFXkIE1aR4/TOWlUnxBIL7fVVuUkOXoP44="; + tag = "v7.1.1"; + hash = "sha256-IKIl4Hg/fCwBlm3kc9MC6M7uZYvbRkvRrtHRe5U5/9c="; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; meta.hydraPlatforms = [ ]; @@ -4365,11 +4365,11 @@ final: prev: { denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "8.0.2-unstable-2026-03-22"; + version = "8.0.2"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "1df7a022d6e9cb3f6a3db43235e0f174ccd79e03"; + tag = "v8.0.2"; hash = "sha256-lj8yjZrwE9GfNPDIpH4tCI4TTJHkYRlFFCTdqMqWtZg="; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; @@ -4744,12 +4744,12 @@ final: prev: { diffs-nvim = buildVimPlugin { pname = "diffs.nvim"; - version = "0.3.2-unstable-2026-04-06"; + version = "0.3.2"; src = fetchFromGitHub { owner = "barrettruth"; repo = "diffs.nvim"; - rev = "77a5c7518bab5e396a778b96e46795a7c879131b"; - hash = "sha256-p6OTSFNMdR7WctyNR6ixU6351MB8ZUbs5Lv26vXi3hQ="; + tag = "v0.3.2"; + hash = "sha256-DZpDaQ8nV+i2k969TTo19UnBSaK5jQwzP9c/bCsRFAQ="; }; meta.homepage = "https://github.com/barrettruth/diffs.nvim/"; meta.hydraPlatforms = [ ]; @@ -4874,12 +4874,12 @@ final: prev: { dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "3.1.1-unstable-2025-02-12"; + version = "3.1.1"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "2d7c2db2507fa3c4956142ee607431ddb2828639"; - hash = "sha256-dBz+/gZA6O6fJy/GSgM6ZHGAR3MTGt/W1olzzTYRlgM="; + tag = "v3.1.1"; + hash = "sha256-N4hB5wDgoqXrXxSfzDCrqmdDtdVvq+PtOS7FBPH7qXE="; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; meta.hydraPlatforms = [ ]; @@ -4926,12 +4926,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "0-unstable-2026-04-15"; + version = "0-unstable-2026-04-18"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "008427f3df32f99abaff8803c9e42facc151d501"; - hash = "sha256-vN5hiyRHaFloUCfzOeuV+0x6KE9caCw9en3s+IsGUvc="; + rev = "06cc3c7ffd02ef6c62dffea46d4f6e53f1962ef2"; + hash = "sha256-+f1RvmFUWPpvw6EqOKmS0NBCwRgMX3mzPdF/DFUnEWM="; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.hydraPlatforms = [ ]; @@ -4952,7 +4952,7 @@ final: prev: { echodoc-vim = buildVimPlugin { pname = "echodoc.vim"; - version = "0-unstable-2022-11-27"; + version = "1.2-unstable-2022-11-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; @@ -5057,12 +5057,12 @@ final: prev: { elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "0.18.0-unstable-2025-11-24"; + version = "0.18.0"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "26aba63a5850bec6a2eff97a1aed859f29003ea9"; - hash = "sha256-kxCH+HuE9YwvPRLjw947/6RDMchK2Vfph6baizfmbtM="; + tag = "v0.18.0"; + hash = "sha256-FBhSMEaa/CwBMnuyUr8Q+flRo64onAt9mGYUNtM0mZs="; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -5123,11 +5123,11 @@ final: prev: { emodeline = buildVimPlugin { pname = "emodeline"; - version = "0.1-unstable-2010-10-18"; + version = "0.1"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "emodeline"; - rev = "19550795743876c2256021530209d83592f5924a"; + tag = "0.1"; hash = "sha256-IOeeZW2TbFEMCNxYtZYCGH5eUuRn2CkNZuiZuX4+PnU="; }; meta.homepage = "https://github.com/vim-scripts/emodeline/"; @@ -5149,11 +5149,11 @@ final: prev: { errormarker-vim = buildVimPlugin { pname = "errormarker.vim"; - version = "0.2-unstable-2015-01-26"; + version = "0.2"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "errormarker.vim"; - rev = "eab7ae1d8961d3512703aa9eadefbde5f062a970"; + tag = "0.2"; hash = "sha256-qsPPp3H7o+GtRXha+OoVWkCq795TwnHcyxtkhwwJ0IU="; }; meta.homepage = "https://github.com/vim-scripts/errormarker.vim/"; @@ -5175,12 +5175,12 @@ final: prev: { everforest = buildVimPlugin { pname = "everforest"; - version = "0.3.0-unstable-2026-01-21"; + version = "0.3.0-unstable-2026-04-16"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "b03a03148c8b34c24c96960b93da9c8883d11f54"; - hash = "sha256-9kx/uOWDdBZBffQYN0B0p9r/lLQGuxBr18kDcey+Hqk="; + rev = "aeef62ee97872d2557d25904d160ec93a4a355f8"; + hash = "sha256-fkNyypxo1fm0rkV1CKayLLMHObsjgSI2nndhkpXHlFc="; }; meta.homepage = "https://github.com/sainnhe/everforest/"; meta.hydraPlatforms = [ ]; @@ -5252,7 +5252,7 @@ final: prev: { far-vim = buildVimPlugin { pname = "far.vim"; - version = "0-unstable-2024-05-14"; + version = "1-unstable-2024-05-14"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; @@ -5395,12 +5395,12 @@ final: prev: { firenvim = buildVimPlugin { pname = "firenvim"; - version = "0.2.16-unstable-2025-09-30"; + version = "0.2.16-unstable-2026-04-16"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "a18ef908ac06b52ad9333b70e3e630b0a56ecb3d"; - hash = "sha256-3uzx6zJqvNhyqHTwuE108BztSb7WB/2w5EpzvTyTHyU="; + rev = "b68449b92dfea73a54e4c8f2307fc244a3a574bd"; + hash = "sha256-XjpCYydSFSTw0sDwVHS7paDejaP2JafOWrupuurfFgE="; }; meta.homepage = "https://github.com/glacambre/firenvim/"; meta.hydraPlatforms = [ ]; @@ -5513,11 +5513,11 @@ final: prev: { floobits-neovim = buildVimPlugin { pname = "floobits-neovim"; - version = "3.4.4-unstable-2021-10-18"; + version = "3.4.4"; src = fetchFromGitHub { owner = "floobits"; repo = "floobits-neovim"; - rev = "dbfa051e4f097dfa3f46997a2019556a62861258"; + tag = "3.4.4"; hash = "sha256-la2C56Hi+6L54M1l6aAxfIxRjRkO6jt1w/84bEYJWf8="; }; meta.homepage = "https://github.com/floobits/floobits-neovim/"; @@ -5526,11 +5526,11 @@ final: prev: { flow-nvim = buildVimPlugin { pname = "flow.nvim"; - version = "3.0.0-unstable-2026-03-14"; + version = "3.0.0"; src = fetchFromGitHub { owner = "0xstepit"; repo = "flow.nvim"; - rev = "4863b14263a77f8efb79068f7078b6261c9cbda2"; + tag = "v3.0.0"; hash = "sha256-PH08FeZMvIXcE9/dfYxj4PiKwBzPCXWFAVOLSci0iNk="; }; meta.homepage = "https://github.com/0xstepit/flow.nvim/"; @@ -5565,11 +5565,11 @@ final: prev: { flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2.2.0-unstable-2026-01-14"; + version = "2.2.0"; src = fetchFromGitHub { owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "677cc07c16e8b89999108d2ebeefcfc5f539b73c"; + tag = "v2.2.0"; hash = "sha256-deLOga7lpWbhjDuww0HhKWCvtPA17dgFtF5ZoYCDvLw="; }; meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; @@ -5826,12 +5826,12 @@ final: prev: { garbage-day-nvim = buildVimPlugin { pname = "garbage-day.nvim"; - version = "1.4.0-unstable-2026-02-25"; + version = "1.4.0"; src = fetchFromGitHub { owner = "Zeioth"; repo = "garbage-day.nvim"; - rev = "2fcc56556281de8ee871a5f3beb9db7ab747ef32"; - hash = "sha256-GabA9whTRQpBbQjc5pyGGVnehBG2i+lwiqJLx31tTLE="; + tag = "v1.4.0"; + hash = "sha256-T4zxIGuUzLcMeZvjBOFGh+Ms6fusQWlhlfuXcOA92xA="; }; meta.homepage = "https://github.com/Zeioth/garbage-day.nvim/"; meta.hydraPlatforms = [ ]; @@ -5891,11 +5891,11 @@ final: prev: { gentoo-syntax = buildVimPlugin { pname = "gentoo-syntax"; - version = "16-unstable-2025-06-26"; + version = "16"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "1b3a81ec62e5c843245dc431be0fe072add7eca8"; + tag = "v16"; hash = "sha256-DGsfm52XLPnkWX9yRUkge7sQtfPZ3nxxQPSDArfO1h4="; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; @@ -5956,12 +5956,12 @@ final: prev: { git-conflict-nvim = buildVimPlugin { pname = "git-conflict.nvim"; - version = "2.1.0-unstable-2024-12-27"; + version = "2.1.0"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "a1badcd070d176172940eb55d9d59029dad1c5a6"; - hash = "sha256-CmSgmpg5K3ySXYrDjg8yTAojeLWJdSHP8uNVFyrkNhc="; + tag = "v2.1.0"; + hash = "sha256-1t0kKxTGLuOvuRkoLgkoqMZpF+oKo8+gMsTdgPsSb+8="; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; meta.hydraPlatforms = [ ]; @@ -5969,11 +5969,11 @@ final: prev: { git-dashboard-nvim = buildVimPlugin { pname = "git-dashboard-nvim"; - version = "0.0.8-alpha-unstable-2025-01-02"; + version = "0.0.8-alpha"; src = fetchFromGitHub { owner = "juansalvatore"; repo = "git-dashboard-nvim"; - rev = "c54fa2faf8ebe1c4091cc0c17c840835534943a6"; + tag = "v0.0.8-alpha"; hash = "sha256-PsCaSFQs0N0rnRy4wY9tPJ4c4ILQuiCc8/gmdOkz6yw="; }; meta.homepage = "https://github.com/juansalvatore/git-dashboard-nvim/"; @@ -5982,11 +5982,11 @@ final: prev: { git-dev-nvim = buildVimPlugin { pname = "git-dev.nvim"; - version = "0.11.1-unstable-2026-04-13"; + version = "0.11.1"; src = fetchFromGitHub { owner = "moyiz"; repo = "git-dev.nvim"; - rev = "07aa02443879cd25d7bf3cb617dfb9aeecaf7d0c"; + tag = "v0.11.1"; hash = "sha256-pDz0IRlnnVHQ5G3Ga8I2wF8jDcF3hiyvMo5s5fwcV88="; }; meta.homepage = "https://github.com/moyiz/git-dev.nvim/"; @@ -6008,11 +6008,11 @@ final: prev: { git-prompt-string-lualine-nvim = buildVimPlugin { pname = "git-prompt-string-lualine.nvim"; - version = "1.0.2-unstable-2024-04-22"; + version = "1.0.2"; src = fetchFromGitHub { owner = "mikesmithgh"; repo = "git-prompt-string-lualine.nvim"; - rev = "5426ce15462abe4faf5cd76db7476b2686120fe9"; + tag = "v1.0.2"; hash = "sha256-BM1AEpIcOd5nr4N/ZoxK9NodiUbUuY9hw7n/wRTXzzk="; }; meta.homepage = "https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/"; @@ -6021,11 +6021,11 @@ final: prev: { git-worktree-nvim = buildVimPlugin { pname = "git-worktree.nvim"; - version = "2.1.0-unstable-2025-02-15"; + version = "2.1.0"; src = fetchFromGitHub { owner = "polarmutex"; repo = "git-worktree.nvim"; - rev = "3ad8c17a3d178ac19be925284389c14114638ebb"; + tag = "2.1.0"; hash = "sha256-fnqJqQTNei+8Gk4vZ2hjRj8iHBXTZT15xp9FvhGB+BQ="; }; meta.homepage = "https://github.com/polarmutex/git-worktree.nvim/"; @@ -6060,11 +6060,11 @@ final: prev: { gitignore-vim = buildVimPlugin { pname = "gitignore.vim"; - version = "1.05-unstable-2014-03-16"; + version = "1.05"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "gitignore.vim"; - rev = "3ad6a15768945fd4fc1b013cec5d8c8e62c7bb87"; + tag = "1.05"; hash = "sha256-HVFP7Af4zzZZfAbMP47rjhgtWeAwnooZU2NhPjM04zk="; }; meta.homepage = "https://github.com/vim-scripts/gitignore.vim/"; @@ -6306,12 +6306,12 @@ final: prev: { gruvbox-alabaster-nvim = buildVimPlugin { pname = "gruvbox-alabaster.nvim"; - version = "0.1.3-unstable-2025-12-22"; + version = "0.1.3"; src = fetchFromGitHub { owner = "Xoconoch"; repo = "gruvbox-alabaster.nvim"; - rev = "80d79f9ecc85ef29f5164b51c1e7b0ced09c27d9"; - hash = "sha256-I8SRwTMo6SnNjfofiwk9+PCu1w4GauR+dVpNeTL2/to="; + tag = "0.1.3"; + hash = "sha256-zocBGqqQOBtymRviN1Ptfj6QJ6UI60UqQ11Me4kn/VA="; }; meta.homepage = "https://github.com/Xoconoch/gruvbox-alabaster.nvim/"; meta.hydraPlatforms = [ ]; @@ -6371,12 +6371,12 @@ final: prev: { gruvbox-material-nvim = buildVimPlugin { pname = "gruvbox-material.nvim"; - version = "1.8.1-unstable-2026-04-10"; + version = "1.8.1"; src = fetchFromGitHub { owner = "f4z3r"; repo = "gruvbox-material.nvim"; - rev = "b1e6f194bcec3e839f2ae47d61cb9e08d522734e"; - hash = "sha256-j8qczHmyL64FVSiQyZcxD5CKgbdXlEsoI/8vzzMoFuY="; + tag = "v1.8.1"; + hash = "sha256-nNBV66GHG3Km92aWhFeo3HgjWQNdMQpIl4Kq08rEmPs="; }; meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/"; meta.hydraPlatforms = [ ]; @@ -6410,11 +6410,11 @@ final: prev: { guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2.7.0-unstable-2026-01-31"; + version = "2.7.0"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "addb8d2f40662b8b62d60dd7d18f503beb2332e7"; + tag = "v2.7.0"; hash = "sha256-jd5EBHaTo3yMzv5mR+GC5IGk+QIHt4Xbi8N/URfyczU="; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; @@ -6436,12 +6436,12 @@ final: prev: { guihua-lua = buildVimPlugin { pname = "guihua.lua"; - version = "0.1-unstable-2026-04-01"; + version = "0.1-unstable-2026-04-10"; src = fetchFromGitHub { owner = "ray-x"; repo = "guihua.lua"; - rev = "c4f1b5ee1a66dbcef0b2c5ee26e42b9757684f61"; - hash = "sha256-rl2Tp9ykVwNHldYQIwtIjgWx1RVFeYe4Feyhdf2bK34="; + rev = "d178056728548ed8a99cce94de47b7500bd6889a"; + hash = "sha256-GkSUwoDHFu615eTRaN2hjZJPxWe+77JqO8mEJ2YsIgw="; }; meta.homepage = "https://github.com/ray-x/guihua.lua/"; meta.hydraPlatforms = [ ]; @@ -6618,11 +6618,11 @@ final: prev: { headhunter-nvim = buildVimPlugin { pname = "headhunter.nvim"; - version = "1.3.0-unstable-2025-10-21"; + version = "1.3.0"; src = fetchFromGitHub { owner = "StackInTheWild"; repo = "headhunter.nvim"; - rev = "de8b66662e9c5309b133708d30b08a6d180a7cfd"; + tag = "v1.3.0"; hash = "sha256-//wRcgbj9VhASi379ahD+aWRxwuX4h/4xsDgQln3nHM="; }; meta.homepage = "https://github.com/StackInTheWild/headhunter.nvim/"; @@ -6631,11 +6631,11 @@ final: prev: { headlines-nvim = buildVimPlugin { pname = "headlines.nvim"; - version = "5.0.0-unstable-2024-09-13"; + version = "5.0.0"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "headlines.nvim"; - rev = "bf17c96a836ea27c0a7a2650ba385a7783ed322e"; + tag = "v5.0.0"; hash = "sha256-LWYYVnLZgw6DhO/n0rclQVnon5TvyQVUGb2smaBzcPg="; }; meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/"; @@ -6644,11 +6644,11 @@ final: prev: { heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; - version = "1.0.8-unstable-2025-05-23"; + version = "1.0.8"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "fae936abb5e0345b85c3a03ecf38525b0828b992"; + tag = "v1.0.8"; hash = "sha256-kHoaeULWI+NrLp0am0DSKRKeA1vZIg4pt5NxZuFUDvY="; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; @@ -6775,11 +6775,11 @@ final: prev: { hmts-nvim = buildVimPlugin { pname = "hmts.nvim"; - version = "1.3.0-unstable-2025-06-11"; + version = "1.3.0"; src = fetchFromGitHub { owner = "calops"; repo = "hmts.nvim"; - rev = "a32cd413f7d0a69d7f3d279c631f20cb117c8d30"; + tag = "v1.3.0"; hash = "sha256-j/RFJgCbaH+V2K20RrQbsz0bzpN8Z6YAKzZMABYg/OU="; }; meta.homepage = "https://github.com/calops/hmts.nvim/"; @@ -6827,12 +6827,12 @@ final: prev: { hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2.1.0-unstable-2026-04-08"; + version = "2.1.1"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "445ab013c73f48b75cb634be963da8481a97a056"; - hash = "sha256-xXfmpvCYf8+qCWjW4dTBki9TjFqmzjE0K+CMsG8BdIk="; + tag = "v2.1.1"; + hash = "sha256-hgCEl1D24kHOe3lLlw3rzjEeLLoHsGr3Erm5cv+ISnY="; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; meta.hydraPlatforms = [ ]; @@ -6892,7 +6892,7 @@ final: prev: { hurl-nvim = buildVimPlugin { pname = "hurl.nvim"; - version = "0-unstable-2025-09-16"; + version = "2.2.0-unstable-2025-09-16"; src = fetchFromGitHub { owner = "jellydn"; repo = "hurl.nvim"; @@ -6905,12 +6905,12 @@ final: prev: { hydra-nvim = buildVimPlugin { pname = "hydra.nvim"; - version = "1.0.3-unstable-2025-05-03"; + version = "1.0.3"; src = fetchFromGitHub { owner = "nvimtools"; repo = "hydra.nvim"; - rev = "8c4a9f621ec7cdc30411a1f3b6d5eebb12b469dc"; - hash = "sha256-lYwl4wrVsCq1JVbkDyq1lB1hBGrz+XtQ9DQWIQ6lkyg="; + tag = "v1.0.3"; + hash = "sha256-GwsitCPMLkTJrjdIyrfzt8wqgHY/aJLNiHzdUBIOrY0="; }; meta.homepage = "https://github.com/nvimtools/hydra.nvim/"; meta.hydraPlatforms = [ ]; @@ -7048,12 +7048,12 @@ final: prev: { incline-nvim = buildVimPlugin { pname = "incline.nvim"; - version = "0.1.0-unstable-2025-12-18"; + version = "0.1.0"; src = fetchFromGitHub { owner = "b0o"; repo = "incline.nvim"; - rev = "8b54c59bcb23366645ae10edca6edfb9d3a0853e"; - hash = "sha256-aOkmH3j1F6Hqxb7ug/fxlj/rhCzhzC8gORdJmetjhoQ="; + tag = "v0.1.0"; + hash = "sha256-2qXhaaTpw8HTAGoD+Fe/ZQkDqRHQK0IMANDop+fwAY8="; }; meta.homepage = "https://github.com/b0o/incline.nvim/"; meta.hydraPlatforms = [ ]; @@ -7100,11 +7100,11 @@ final: prev: { indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "3.9.1-unstable-2026-02-17"; + version = "3.9.1"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "d28a3f70721c79e3c5f6693057ae929f3d9c0a03"; + tag = "v3.9.1"; hash = "sha256-Vc79ff416uJFqKH8zlM1y208SxaQGpQPqGVbiz5Vflg="; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; @@ -7126,11 +7126,11 @@ final: prev: { indent-tools-nvim = buildVimPlugin { pname = "indent-tools.nvim"; - version = "0.5.2-unstable-2026-01-23"; + version = "0.5.2"; src = fetchFromGitHub { owner = "arsham"; repo = "indent-tools.nvim"; - rev = "9b6a33be70c72da562c83d1e741ebe1ce6c20a3c"; + tag = "v0.5.2"; hash = "sha256-jJOG6t18egq1uDGegDKvbz9NGmqiuHg7b2EyJZh3TMM="; }; meta.homepage = "https://github.com/arsham/indent-tools.nvim/"; @@ -7295,11 +7295,11 @@ final: prev: { jdaddy-vim = buildVimPlugin { pname = "jdaddy.vim"; - version = "1.0-unstable-2014-02-22"; + version = "1.0"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "jdaddy.vim"; - rev = "3e44c2e6d22e2d6fc94863379b5b4f5424537321"; + tag = "1.0"; hash = "sha256-698DMT3pdIYz0Y3vEg1ohcGvRARwJ9k+xm/o7NwSAbI="; }; meta.homepage = "https://github.com/vim-scripts/jdaddy.vim/"; @@ -7308,11 +7308,11 @@ final: prev: { jdd-nvim = buildVimPlugin { pname = "jdd.nvim"; - version = "0.2.0-unstable-2025-07-04"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mahyarmirrashed"; repo = "jdd.nvim"; - rev = "468bb25402cbdd87b904f5ee4324a659c60c1a79"; + tag = "v0.2.0"; hash = "sha256-8sGu6i1fJNASWYtzqB+OPe3sny2jNmVCI0WPwCl6SnU="; }; meta.homepage = "https://github.com/mahyarmirrashed/jdd.nvim/"; @@ -7348,11 +7348,11 @@ final: prev: { jellybeans-vim = buildVimPlugin { pname = "jellybeans.vim"; - version = "1.7-unstable-2019-06-22"; + version = "1.7"; src = fetchFromGitHub { owner = "nanotech"; repo = "jellybeans.vim"; - rev = "ef83bf4dc8b3eacffc97bf5c96ab2581b415c9fa"; + tag = "v1.7"; hash = "sha256-X+37Mlyt6+ZwfYlt4ZtdHPXDgcKtiXlUoUPZVb58w/8="; }; meta.homepage = "https://github.com/nanotech/jellybeans.vim/"; @@ -7374,11 +7374,11 @@ final: prev: { jj-nvim = buildVimPlugin { pname = "jj.nvim"; - version = "0.5.0-unstable-2026-04-07"; + version = "0.6.0"; src = fetchFromGitHub { owner = "NicolasGB"; repo = "jj.nvim"; - rev = "2dbe2c73c599a29e86e4123b42e430828b1f01d9"; + tag = "v0.6.0"; hash = "sha256-hoU+DenrgxNwvLNmDtIsJ5yB5fhRjDRPOOL8WW9bpZM="; }; meta.homepage = "https://github.com/NicolasGB/jj.nvim/"; @@ -7529,12 +7529,12 @@ final: prev: { kitty-scrollback-nvim = buildVimPlugin { pname = "kitty-scrollback.nvim"; - version = "9.0.1-unstable-2026-03-22"; + version = "9.0.1"; src = fetchFromGitHub { owner = "mikesmithgh"; repo = "kitty-scrollback.nvim"; - rev = "9342a0e0e5556ce0b7f9dc41c4bdd39ae9dc85dd"; - hash = "sha256-c6OgxDZTBeCP3lIgEq1ctLFOzaKC5tZXnd/nUrthEm4="; + tag = "v9.0.1"; + hash = "sha256-QtES9qKa4eVOP0CLr4VkI5lIkoii1mVDHtaegkjN8DU="; }; meta.homepage = "https://github.com/mikesmithgh/kitty-scrollback.nvim/"; meta.hydraPlatforms = [ ]; @@ -7581,12 +7581,12 @@ final: prev: { koda-nvim = buildVimPlugin { pname = "koda.nvim"; - version = "2.10.0-unstable-2026-04-15"; + version = "2.10.1"; src = fetchFromGitHub { owner = "oskarnurm"; repo = "koda.nvim"; - rev = "649b22865bacc481d381237e0a6fb1de6ee055b4"; - hash = "sha256-KSDtodNiup4wzumfJbfcm5LYAqcOW8ZZSbbBHozVJow="; + tag = "v2.10.1"; + hash = "sha256-qUMAudof+WhyBuHJ0O8LcBOPybJAEVXYAmdIcHK2gP4="; }; meta.homepage = "https://github.com/oskarnurm/koda.nvim/"; meta.hydraPlatforms = [ ]; @@ -7620,11 +7620,11 @@ final: prev: { kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "5.3.4-unstable-2026-02-08"; + version = "5.3.4"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "6656c9d332735ca6a27725e0fb45a1715c4372d9"; + tag = "v5.3.4"; hash = "sha256-yA7ooPASC59FuwzB2xZyG6LsXpHHQ+fqtE/4odEjGx4="; fetchSubmodules = true; }; @@ -7712,12 +7712,12 @@ final: prev: { lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "11.17.5-unstable-2025-12-17"; + version = "11.17.5"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "306a05526ada86a7b30af95c5cc81ffba93fef97"; - hash = "sha256-5A4kducPwKb5fKX4oSUFvo898P0dqfsqqLxFaXBsbQY="; + tag = "v11.17.5"; + hash = "sha256-h5404njTAfqMJFQ3MAr2PWSbV81eS4aIs0cxAXkT0EM="; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; meta.hydraPlatforms = [ ]; @@ -7738,11 +7738,11 @@ final: prev: { lazydocker-nvim = buildVimPlugin { pname = "lazydocker.nvim"; - version = "2.3.0-unstable-2025-08-24"; + version = "2.3.0"; src = fetchFromGitHub { owner = "crnvl96"; repo = "lazydocker.nvim"; - rev = "b69ff84a6223de39d34a150b980d3b9ef19549fb"; + tag = "v2.3.0"; hash = "sha256-KMaUWGXRbbx1k1VdOgy+iSCDB20WNIjJETd5XOoVTJU="; }; meta.homepage = "https://github.com/crnvl96/lazydocker.nvim/"; @@ -7777,12 +7777,12 @@ final: prev: { lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025.10.1-unstable-2026-04-15"; + version = "2025.10.1-unstable-2026-04-19"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "6876abd06efb6789081b9f4a3e81503ce07b3c6c"; - hash = "sha256-VKuL3wUQFlD9NRyRmBScQbx2lh/9+EdJsmIyRzMJBkA="; + rev = "1be79c2c60c24bc5e4ac31d4c25bbae533a8bc8f"; + hash = "sha256-UwVXVulNayx9vJijgFQullXM9JUjUCXtNd7EKp1P9u4="; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; meta.hydraPlatforms = [ ]; @@ -7841,12 +7841,12 @@ final: prev: { legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2.13.13-unstable-2025-03-20"; + version = "2.13.13"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "6de819bc285eb8c420e49e82c21d5bb696b5a727"; - hash = "sha256-4UKfVauzOlSEVswdnB08b6CLISzgf/3pQ/hrSbk/6AU="; + tag = "v2.13.13"; + hash = "sha256-C+j5CWSGKgyHzb8R6rJOg2KZ1a6JZsWHuNmNLsv4e44="; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; meta.hydraPlatforms = [ ]; @@ -7867,12 +7867,12 @@ final: prev: { lensline-nvim = buildVimPlugin { pname = "lensline.nvim"; - version = "2.0.0-unstable-2026-01-17"; + version = "2.1.0"; src = fetchFromGitHub { owner = "oribarilan"; repo = "lensline.nvim"; - rev = "bc14529d2d04804d65a73d0fb3bca50132902d3b"; - hash = "sha256-WNtb2m2FXtb8i7l5Vgb+Chg6ZDteLDJUR5QCiFKI6r0="; + tag = "v2.1.0"; + hash = "sha256-U2rZ+Kol2Up1a2kBBFWcIdV5xwl4WwdKe4E8A2EaOG4="; }; meta.homepage = "https://github.com/oribarilan/lensline.nvim/"; meta.hydraPlatforms = [ ]; @@ -7932,11 +7932,11 @@ final: prev: { lh-brackets = buildVimPlugin { pname = "lh-brackets"; - version = "3.6.0-unstable-2024-08-29"; + version = "3.6.0"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "40af9b67424003a03e8384eab81256bfe535db0b"; + tag = "3.6.0"; hash = "sha256-lBR5BU2aJJaI9LlwUDDy0lLKX7D/oUSzLohJmFvdfWk="; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; @@ -8179,12 +8179,12 @@ final: prev: { live-preview-nvim = buildVimPlugin { pname = "live-preview.nvim"; - version = "0.9.6-unstable-2026-03-05"; + version = "0.9.6"; src = fetchFromGitHub { owner = "brianhuster"; repo = "live-preview.nvim"; - rev = "c1fcf75c5f9c9c01dd392852de44204b60f1b5b1"; - hash = "sha256-8R4WNFKMz72MoycBK736A5YC8NH1K8TBea2Px4udGZ8="; + tag = "v0.9.6"; + hash = "sha256-7EKKcpth1/hW4qgeVQm+6RnG6HKb6wnA1VsBSUO0PEI="; }; meta.homepage = "https://github.com/brianhuster/live-preview.nvim/"; meta.hydraPlatforms = [ ]; @@ -8205,11 +8205,11 @@ final: prev: { live-share-nvim = buildVimPlugin { pname = "live-share.nvim"; - version = "2.1.0-unstable-2026-04-14"; + version = "2.1.0"; src = fetchFromGitHub { owner = "azratul"; repo = "live-share.nvim"; - rev = "71360fdcee2e517ac5db92e8260ec3d7e25065dd"; + tag = "v2.1.0"; hash = "sha256-TxjS68iaat+zgpF4L7Wp7y7PgW4mrc6MrvxxQBK3zsk="; }; meta.homepage = "https://github.com/azratul/live-share.nvim/"; @@ -8244,12 +8244,12 @@ final: prev: { lsp-colors-nvim = buildVimPlugin { pname = "lsp-colors.nvim"; - version = "1.0.0-unstable-2023-02-27"; + version = "1.0.0"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-colors.nvim"; - rev = "2bbe7541747fd339bdd8923fc45631a09bb4f1e5"; - hash = "sha256-fPCwzKojUnHjeqsSZu5akO4QMan4ApzGyMWLRsF9um4="; + tag = "v1.0.0"; + hash = "sha256-+qVJb3u3DqFn4p2K74xQPfFzR9/KH4r7oPEndW2wuMQ="; }; meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; meta.hydraPlatforms = [ ]; @@ -8270,12 +8270,12 @@ final: prev: { lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; - version = "2.7.2-unstable-2025-05-08"; + version = "2.7.2"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "42d1d3e407c846d95f84ea3767e72ed6e08f7495"; - hash = "sha256-OnKwqbYzWFrYPQDnj+HV8hd9QQb88XLBmQmMjpp8Fgk="; + tag = "v2.7.2"; + hash = "sha256-x++L67u2mE95Zeh+ZIh6mJa+ZfMm6/5JLtHZmC/EVR4="; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; meta.hydraPlatforms = [ ]; @@ -8335,12 +8335,12 @@ final: prev: { lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "0-unstable-2025-04-10"; + version = "0-unstable-2025-07-08"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "77550f2f6cbf0959ef1583d845661af075f3442b"; - hash = "sha256-XWijTsHqIuT+X8mPrVrogtrNhv1Qnm1pIUG3kskUfjE="; + rev = "d388e2b71834c826e61a3eba48caec53d7602510"; + hash = "sha256-CTLsXtY/89l1zV+Y09mhThx0PEEG5KhoOw1X4f4frtc="; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; meta.hydraPlatforms = [ ]; @@ -8451,12 +8451,12 @@ final: prev: { lua-async = buildVimPlugin { pname = "lua-async"; - version = "1.1.0-unstable-2024-03-31"; + version = "1.1.0"; src = fetchFromGitHub { owner = "nvim-java"; repo = "lua-async"; - rev = "652d94df34e97abe2d4a689edbc4270e7ead1a98"; - hash = "sha256-SB+gmBfF3AKZyktOmPaR9CRyTyCYz2jlrxi+jgBI/Eo="; + tag = "v1.1.0"; + hash = "sha256-RxesT6jAX4H7SrmQPqV0wKs5qCkFMBXzQWDl2ToHqSs="; }; meta.homepage = "https://github.com/nvim-java/lua-async/"; meta.hydraPlatforms = [ ]; @@ -8555,12 +8555,12 @@ final: prev: { maple-nvim = buildVimPlugin { pname = "maple.nvim"; - version = "0.2.0-unstable-2026-02-24"; + version = "0.2.0"; src = fetchFromGitHub { owner = "forest-nvim"; repo = "maple.nvim"; - rev = "eb7ad5a75601336f3ffa8d3ebf76ca6cfda1a076"; - hash = "sha256-/+8vcQq1jsjBZeygKxoAqSYvrZGUQ9o8G3wQWF0t+YA="; + tag = "v0.2.0"; + hash = "sha256-iejN+W0pWyjaS0q+EJKnbvMiIiYHrJ2K1Jl6mLjcWQM="; }; meta.homepage = "https://github.com/forest-nvim/maple.nvim/"; meta.hydraPlatforms = [ ]; @@ -8568,12 +8568,12 @@ final: prev: { mark-radar-nvim = buildVimPlugin { pname = "mark-radar.nvim"; - version = "0-unstable-2026-04-08"; + version = "0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "winston0410"; repo = "mark-radar.nvim"; - rev = "4e1ca9029df6818bba5137135af5386787734e07"; - hash = "sha256-Y6meoBU1OCu28G2n6vVrc2TBTpL2H5dp+qCpx3dB/E8="; + rev = "e0311901367e01382d5251fc0b881c6d4df1ee1a"; + hash = "sha256-1rkEC4+EQSG5wmos2Pvw9GYU7HTiysL85AhBxoyXmKc="; }; meta.homepage = "https://github.com/winston0410/mark-radar.nvim/"; meta.hydraPlatforms = [ ]; @@ -8581,12 +8581,12 @@ final: prev: { markdoc-nvim = buildVimPlugin { pname = "markdoc.nvim"; - version = "1.1.0-unstable-2025-11-14"; + version = "1.1.0"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markdoc.nvim"; - rev = "12607a127ba7c3890c3ab6e7b2a60f65b6d6d3ec"; - hash = "sha256-e9axO9oIrMHzmr4QFfwFI36ksf0NAKH/0WUSSRz1Eb4="; + tag = "v1.1.0"; + hash = "sha256-4n9Btas7GtHMrfNNE2IX2Gm2QOoTE4rHB35w5pAbicQ="; }; meta.homepage = "https://github.com/OXY2DEV/markdoc.nvim/"; meta.hydraPlatforms = [ ]; @@ -8646,12 +8646,12 @@ final: prev: { markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "28.1.0-unstable-2026-04-15"; + version = "28.1.0"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "5a890277ba7edd7823d20f4d0525132d277aea9a"; - hash = "sha256-QdwGRlOcjODbznNCMNIVbVYwhEh1xvfsyHYgOxilEJo="; + tag = "v28.1.0"; + hash = "sha256-O0si5VWfC2ijySL6jgQU2pfUF1M+FjPpCgSis3zPjmM="; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -8699,12 +8699,12 @@ final: prev: { mason-nvim-dap-nvim = buildVimPlugin { pname = "mason-nvim-dap.nvim"; - version = "2.5.2-unstable-2025-10-20"; + version = "2.5.2"; src = fetchFromGitHub { owner = "jay-babu"; repo = "mason-nvim-dap.nvim"; - rev = "9a10e096703966335bd5c46c8c875d5b0690dade"; - hash = "sha256-DtT/FFFJX5PcNJjZUCbWumVROEh+cojlEqB/Hquy9+s="; + tag = "v2.5.2"; + hash = "sha256-y1heAB1HCntH4m5wITMejVQW0XxfmxjE/ZBZHrMNges="; }; meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/"; meta.hydraPlatforms = [ ]; @@ -8764,7 +8764,7 @@ final: prev: { mattn-calendar-vim = buildVimPlugin { pname = "mattn-calendar-vim"; - version = "0-unstable-2026-04-08"; + version = "7ish-unstable-2026-04-08"; src = fetchFromGitHub { owner = "mattn"; repo = "calendar-vim"; @@ -8777,11 +8777,11 @@ final: prev: { mayansmoke = buildVimPlugin { pname = "mayansmoke"; - version = "2.0-unstable-2010-10-18"; + version = "2.0"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "mayansmoke"; - rev = "168883af7aec05f139af251f47eadd5dfb802c9d"; + tag = "2.0"; hash = "sha256-7WaBHHQj7d/y4y3jLbE2HJ3XRXtEzY5wcKdrE4+frPc="; }; meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; @@ -8816,11 +8816,11 @@ final: prev: { melange-nvim = buildVimPlugin { pname = "melange-nvim"; - version = "2025-07-10-unstable-2025-06-16"; + version = "2025-07-10"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce"; + tag = "2025-07-10"; hash = "sha256-4WeIgkbc9RxGB8NqLc/Z12OxtK+v8qbQ03T1pjJ3HAE="; }; meta.homepage = "https://github.com/savq/melange-nvim/"; @@ -9037,12 +9037,12 @@ final: prev: { mini-completion = buildVimPlugin { pname = "mini.completion"; - version = "0.17.0-unstable-2026-04-14"; + version = "0.17.0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.completion"; - rev = "ffbdb06d2fa6a3fcef3891108bb38e33223b27a7"; - hash = "sha256-gDRXFxRy9+5zz2JkgMcPJIZrRrhzEcMwMOkYQ/Y/AY4="; + rev = "e934b46f6471a3bd0cd37fc06d0df198b9711882"; + hash = "sha256-h7IUnYdqjVHldagQXCmC7UI8oO4+2fmtFfdCln1pa6A="; }; meta.homepage = "https://github.com/nvim-mini/mini.completion/"; meta.hydraPlatforms = [ ]; @@ -9115,7 +9115,7 @@ final: prev: { mini-files = buildVimPlugin { pname = "mini.files"; - version = "0-unstable-2026-04-09"; + version = "0.17.0-unstable-2026-04-09"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.files"; @@ -9154,12 +9154,12 @@ final: prev: { mini-hipatterns = buildVimPlugin { pname = "mini.hipatterns"; - version = "0.17.0-unstable-2026-04-03"; + version = "0.17.0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.hipatterns"; - rev = "a3ffba45e4119917b254c372df82e79f7d8c4aad"; - hash = "sha256-mHwVLqyvmt7Cw4qZ+iVHK3ODtsaoZ4XUVcEwiNieTxk="; + rev = "9eff319bbe66adfaf781a0d0e174baa08ba94909"; + hash = "sha256-As3KIoOPhm/KAVOp0Gw1hPIOB7sI47nu2am+4gpPyo4="; }; meta.homepage = "https://github.com/nvim-mini/mini.hipatterns/"; meta.hydraPlatforms = [ ]; @@ -9297,12 +9297,12 @@ final: prev: { mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "0.17.0-unstable-2026-04-14"; + version = "0.17.0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.nvim"; - rev = "27a3e747a4e603b4121f5759e74020430ec7b7d5"; - hash = "sha256-MaMhaF5pbF9ob4qEDz9TXOxjYmjIr/5pmWzluS9B4r0="; + rev = "418ef4930ddabe80f449c6f1323f8b6abb172d1c"; + hash = "sha256-bHEFu4XZI9QHP41h11sSNgRG43PDSkdgTyzmJt64gLk="; }; meta.homepage = "https://github.com/nvim-mini/mini.nvim/"; meta.hydraPlatforms = [ ]; @@ -9349,12 +9349,12 @@ final: prev: { mini-sessions = buildVimPlugin { pname = "mini.sessions"; - version = "0.17.0-unstable-2026-04-03"; + version = "0.17.0-unstable-2026-04-16"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.sessions"; - rev = "2e419949f6846871b3b87bcd7c418b0d1f0ad68a"; - hash = "sha256-PDR6SG8n4x4GBH8swI0xFh4oGSVSWxVm58XOljpakDo="; + rev = "c96a1d1284b37ba2431092981a9d58f8c71a4fc3"; + hash = "sha256-y/aHihPEBQazmeQVj/5kAlbeapBACERk2jUnBQNS3SM="; }; meta.homepage = "https://github.com/nvim-mini/mini.sessions/"; meta.hydraPlatforms = [ ]; @@ -9479,12 +9479,12 @@ final: prev: { minuet-ai-nvim = buildVimPlugin { pname = "minuet-ai.nvim"; - version = "0.8.0-unstable-2026-04-15"; + version = "0.8.0-unstable-2026-04-18"; src = fetchFromGitHub { owner = "milanglacier"; repo = "minuet-ai.nvim"; - rev = "fbd2f59ec334b277ae27c4cd9587533c6e3eafd7"; - hash = "sha256-7GapBurUJ8InGNWsWLozLzcYI9zM+O8wOILNJStmWhg="; + rev = "ee03326381c93f6417fa66aeb2ca85a26c0706e7"; + hash = "sha256-41vUpNnyKdc4MvOyFVSAgR1/EEjHgKNixAWXaLdMbsQ="; }; meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/"; meta.hydraPlatforms = [ ]; @@ -9557,11 +9557,11 @@ final: prev: { modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "1.4.3-unstable-2026-03-22"; + version = "1.4.3"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "17a64464c27c1be605adca13dbe48f2f402fe107"; + tag = "v1.4.3"; hash = "sha256-5w1a8ISBM90bwajkAupBFXoucHat+lQsyD5Rr0e2SKY="; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; @@ -9609,11 +9609,11 @@ final: prev: { monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2.1.1-unstable-2026-02-02"; + version = "2.1.1"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "d8884d4473667c48bd17a68d08383d38839136a3"; + tag = "v2.1.1"; hash = "sha256-G8qGIUD2NivfJw016bKk67VEJzOitUZIk8o8k2WTt5w="; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; @@ -9973,12 +9973,12 @@ final: prev: { neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "3.40.0-unstable-2026-04-11"; + version = "2.71"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "aa3500f7038a32ed4b0b765cd458b9c429062cac"; - hash = "sha256-Na8id36cCmZON9aBzwJaua4NsRaXCfsM0KKi9QZPMnc="; + tag = "v2.71"; + hash = "sha256-w4D+iq1/su5LtCsknvGB6wDlohx2WVm0iRvKagL4H5E="; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; meta.hydraPlatforms = [ ]; @@ -9986,7 +9986,7 @@ final: prev: { neocomplete-vim = buildVimPlugin { pname = "neocomplete.vim"; - version = "0-unstable-2023-05-18"; + version = "2.1-unstable-2023-05-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "neocomplete.vim"; @@ -10038,12 +10038,12 @@ final: prev: { neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "3.0.0-unstable-2024-07-06"; + version = "3.0.0"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "46aa467dca16cf3dfe27098042402066d2ae242d"; - hash = "sha256-hOjzlo/IqmV8tYjGwfmcCPEmHYsWnEIwtHZdhpwA1kM="; + tag = "v3.0.0"; + hash = "sha256-JRipsm9ngXM+f0gnlVvdV2EXkSMKi1o7kJVehzg/0tE="; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; meta.hydraPlatforms = [ ]; @@ -10077,12 +10077,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "3.0.0-unstable-2026-04-08"; + version = "3.0.0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "e06745228600a585b88726fc9fba44a373c15a47"; - hash = "sha256-tBmRZwBoUfJyTcPbqS/Vm7Ww0JE2wLgQ7e6o+1Fxei0="; + rev = "e906fce7e44ae562f06345be99a7db02f8315236"; + hash = "sha256-/uIp7X8drHFQT8DNuiSxFGga71HUY59PCSTguyJvaeo="; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.hydraPlatforms = [ ]; @@ -10116,12 +10116,12 @@ final: prev: { neomodern-nvim = buildVimPlugin { pname = "neomodern.nvim"; - version = "2.0.2-unstable-2026-04-13"; + version = "2.0.2-unstable-2026-04-17"; src = fetchFromGitHub { owner = "casedami"; repo = "neomodern.nvim"; - rev = "5e6ed2cfa6c909acb20ca185276015c112211576"; - hash = "sha256-RS7QuznH23qeoacik6pTxI5fsU2+K7wiuu8oJ07ZocE="; + rev = "d41469578922a23d75a0d9e8deef1e34837230a6"; + hash = "sha256-w/RIZYOTkDoM5gbB2T0GiPlvT1nTrTFOHwSkoo0uJ24="; }; meta.homepage = "https://github.com/casedami/neomodern.nvim/"; meta.hydraPlatforms = [ ]; @@ -10220,7 +10220,7 @@ final: prev: { neosnippet-vim = buildVimPlugin { pname = "neosnippet.vim"; - version = "0-unstable-2023-07-23"; + version = "4.2-unstable-2023-07-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; @@ -10352,11 +10352,11 @@ final: prev: { neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2.8.0-unstable-2026-04-06"; + version = "2.8.0"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "48634bebbfa1fe63ed50f170916112c538d8e70d"; + tag = "v2.8.0"; hash = "sha256-dsiBQi1zKMEwxAX+rcmNszHdKOVVvCeoSW/uMKQVhjE="; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; @@ -10405,12 +10405,12 @@ final: prev: { neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "0.36.3-unstable-2026-04-14"; + version = "0.37.0"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "09e4e3db567d9d9b7772a111014b660d49feda5e"; - hash = "sha256-PXLKB5c6NUMdAXwZ7ITwkwzIJW0nh4w5kit4j4GlZgo="; + tag = "v0.37.0"; + hash = "sha256-PuXYAKkg+KM9dkSk/br7GDjXzmgqhteJepjbt9ZJGO8="; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; meta.hydraPlatforms = [ ]; @@ -10587,11 +10587,11 @@ final: prev: { neotest-zig = buildVimPlugin { pname = "neotest-zig"; - version = "1.4.0-unstable-2025-03-16"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lawrence-laz"; repo = "neotest-zig"; - rev = "de63f3b9a182d374d2e71cf44385326682ec90e7"; + tag = "1.4.0"; hash = "sha256-nW1jkx3kZU5qOqAByaGH45Scku/TYtT1I5UoZ36/WC4="; }; meta.homepage = "https://github.com/lawrence-laz/neotest-zig/"; @@ -10639,12 +10639,12 @@ final: prev: { neovim-tips = buildVimPlugin { pname = "neovim-tips"; - version = "0.8.3-unstable-2026-04-09"; + version = "0.8.4"; src = fetchFromGitHub { owner = "saxon1964"; repo = "neovim-tips"; - rev = "da747d41c6661c8977120a0147bfe5b90b0df7c2"; - hash = "sha256-qnG5v1KKj7SueAFpiUEGflNkBfo3gPF5fDCVmRAb51Y="; + tag = "v0.8.4"; + hash = "sha256-IndNFcMe5iND8XLXv4l+BGA3QXS9SDao6Z8MwwE+qI4="; }; meta.homepage = "https://github.com/saxon1964/neovim-tips/"; meta.hydraPlatforms = [ ]; @@ -10652,11 +10652,11 @@ final: prev: { neovim-trunk = buildVimPlugin { pname = "neovim-trunk"; - version = "0.1.4-unstable-2025-07-23"; + version = "0.1.4"; src = fetchFromGitHub { owner = "trunk-io"; repo = "neovim-trunk"; - rev = "a4521772dd7761f9a504b0e28ef6683bc81c8f53"; + tag = "v0.1.4"; hash = "sha256-6jpKFiSIgr5Y+RnehHpf+lEDqugdjvidw25DozRt024="; }; meta.homepage = "https://github.com/trunk-io/neovim-trunk/"; @@ -10872,7 +10872,7 @@ final: prev: { nim-vim = buildVimPlugin { pname = "nim.vim"; - version = "1.1-unstable-2021-11-11"; + version = "1.1@2-unstable-2021-11-11"; src = fetchFromGitHub { owner = "zah"; repo = "nim.vim"; @@ -10937,12 +10937,12 @@ final: prev: { no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2.5.3-unstable-2026-01-12"; + version = "2.5.3"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "4bc52782524fd50c5658685d584df6fa48fe49f9"; - hash = "sha256-nyWYMl6W9ToAMtMJRiudH1FjsuI+5WPg27RO25gMX6s="; + tag = "v2.5.3"; + hash = "sha256-KNLeeaNxywouey0myeVhqRdMVxxouX/IRGOilYtWQAA="; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; meta.hydraPlatforms = [ ]; @@ -10976,12 +10976,12 @@ final: prev: { none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "0-unstable-2026-04-11"; + version = "0-unstable-2026-04-19"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "899e93f9f10251d7220b188eba1b837c0ba27927"; - hash = "sha256-43aW6ajA73oV3Dpm6QENHEwP0G4oitY14VaKpGiGK1w="; + rev = "e135361b9c11755ef6c48f54a2c970c509b56239"; + hash = "sha256-W4mPpNxLjCBIrjthHi/y8EJ5C/N97Hgf1P+7c19wSWA="; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; meta.hydraPlatforms = [ ]; @@ -11301,11 +11301,11 @@ final: prev: { nvim-config-local = buildVimPlugin { pname = "nvim-config-local"; - version = "3.0.0-unstable-2025-01-21"; + version = "3.0.0"; src = fetchFromGitHub { owner = "klen"; repo = "nvim-config-local"; - rev = "990f3e35e0fba8fb83012d7e85f9a6a77de7f87f"; + tag = "3.0.0"; hash = "sha256-07D1qzMevOzzfN2whZL5DSgrKqOJrnPjZ+9QzpwQ7Cg="; }; meta.homepage = "https://github.com/klen/nvim-config-local/"; @@ -11365,11 +11365,11 @@ final: prev: { nvim-dap-docker = buildVimPlugin { pname = "nvim-dap-docker"; - version = "0.2.0-unstable-2026-04-15"; + version = "0.2.0"; src = fetchFromGitHub { owner = "docker"; repo = "nvim-dap-docker"; - rev = "a7a6d22b786bff09c382d721d2d065fdd64a58ee"; + tag = "v0.2.0"; hash = "sha256-5uHdDTVdfdJk6WLM6gvVDgEndFkP9SmqrqhHzaalH/k="; }; meta.homepage = "https://github.com/docker/nvim-dap-docker/"; @@ -11468,12 +11468,12 @@ final: prev: { nvim-dap-view = buildVimPlugin { pname = "nvim-dap-view"; - version = "1.1.1-unstable-2026-04-13"; + version = "1.1.1"; src = fetchFromGitHub { owner = "igorlfs"; repo = "nvim-dap-view"; - rev = "1dd4ba2307245ca9517a4b9d99f3bf80830e4397"; - hash = "sha256-CUH5x3Fn1PFHTMp39m4sU9jRG+t9zA0nWFfcfJ6tYF8="; + tag = "v1.1.1"; + hash = "sha256-YMAP9csr7SHN2h5yPJ/nx1lezX9DaE0nLjVnr6c7xyw="; }; meta.homepage = "https://github.com/igorlfs/nvim-dap-view/"; meta.hydraPlatforms = [ ]; @@ -11663,11 +11663,11 @@ final: prev: { nvim-impairative = buildVimPlugin { pname = "nvim-impairative"; - version = "0.6.0-unstable-2025-11-30"; + version = "0.6.0"; src = fetchFromGitHub { owner = "idanarye"; repo = "nvim-impairative"; - rev = "71825e2e0ba38b9740b7f6fcaf65c607377aaa3c"; + tag = "v0.6.0"; hash = "sha256-xl33sp/+wjH8Y8Uoa7j7kaQIgcMXUWYlGfCDKkZQNLk="; }; meta.homepage = "https://github.com/idanarye/nvim-impairative/"; @@ -11676,12 +11676,12 @@ final: prev: { nvim-java = buildVimPlugin { pname = "nvim-java"; - version = "4.1.0-unstable-2026-02-05"; + version = "4.1.0"; src = fetchFromGitHub { owner = "nvim-java"; repo = "nvim-java"; - rev = "602a5f7fa92f9c1d425a2159133ff9de86842f0a"; - hash = "sha256-XdkKm3gE2S2yF8AgZPWO97BE/4yZt0M7pWdTjNKpeM4="; + tag = "v4.1.0"; + hash = "sha256-w4BCKMbbFps6YxV3gyo5KGzBRJnU6h1vrUbYRq9cO0A="; }; meta.homepage = "https://github.com/nvim-java/nvim-java/"; meta.hydraPlatforms = [ ]; @@ -11689,11 +11689,11 @@ final: prev: { nvim-java-core = buildVimPlugin { pname = "nvim-java-core"; - version = "2.0.0-unstable-2025-08-06"; + version = "2.0.0"; src = fetchFromGitHub { owner = "nvim-java"; repo = "nvim-java-core"; - rev = "229ebcdfa33c75cf746f97c46c2893b2de3626e5"; + tag = "v2.0.0"; hash = "sha256-cM1+Z89x2IP9CJ5Ow1kQTsp66Ay6JfVE2LcjpAbls/w="; }; meta.homepage = "https://github.com/nvim-java/nvim-java-core/"; @@ -11715,11 +11715,11 @@ final: prev: { nvim-java-refactor = buildVimPlugin { pname = "nvim-java-refactor"; - version = "1.8.0-unstable-2025-01-26"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nvim-java"; repo = "nvim-java-refactor"; - rev = "b51a57d862338999059e1d1717df3bc80a3a15c0"; + tag = "v1.8.0"; hash = "sha256-2jYUDoPX4FvshhzkGcBRYCtiJ6O5vldnZoSR85F7U5E="; }; meta.homepage = "https://github.com/nvim-java/nvim-java-refactor/"; @@ -11728,11 +11728,11 @@ final: prev: { nvim-java-test = buildVimPlugin { pname = "nvim-java-test"; - version = "1.0.1-unstable-2024-07-19"; + version = "1.0.1"; src = fetchFromGitHub { owner = "nvim-java"; repo = "nvim-java-test"; - rev = "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468"; + tag = "v1.0.1"; hash = "sha256-aqFg+m8EMNpQkj5aQPZaW18dtez+AsxARiEiU3ycW6I="; }; meta.homepage = "https://github.com/nvim-java/nvim-java-test/"; @@ -11753,11 +11753,11 @@ final: prev: { nvim-jqx = buildVimPlugin { pname = "nvim-jqx"; - version = "0.1.4-unstable-2024-05-31"; + version = "0.1.4"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-jqx"; - rev = "07393e80fa8097e82f9038fec05e948fe8a60fd1"; + tag = "v0.1.4"; hash = "sha256-2A1O7xSlsmG1LjwfqQxta9pdKlEu7Uj+yAVaVZolX2g="; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; @@ -11856,7 +11856,7 @@ final: prev: { nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "0-unstable-2026-04-09"; + version = "05-unstable-2026-04-09"; src = fetchgit { url = "https://codeberg.org/mfussenegger/nvim-lint/"; rev = "eab58b48eb11d7745c11c505e0f3057165902461"; @@ -11907,12 +11907,12 @@ final: prev: { nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2.8.0-unstable-2026-04-15"; + version = "2.8.0"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d10ce09e42bb0ca8600fd610c3bb58676e61208d"; - hash = "sha256-mRMjZ10LeU9SveHiUazKAXw4pdSrOxz083DeRVht83g="; + tag = "v2.8.0"; + hash = "sha256-boQBpuqeGLQV0Vnx+9zecxPEHRVnJMAWVmSld6msS7E="; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.hydraPlatforms = [ ]; @@ -11959,12 +11959,12 @@ final: prev: { nvim-luapad = buildVimPlugin { pname = "nvim-luapad"; - version = "0.3.2-unstable-2026-03-23"; + version = "0.3.2"; src = fetchFromGitHub { owner = "rafcamlet"; repo = "nvim-luapad"; - rev = "918c60ae919d96df1dc201cbf69eb09090148cdd"; - hash = "sha256-FLeBdX/7cp+cp+W2ouYcG52mE16GBeVT8FNgrFSa4u8="; + tag = "v0.3.2"; + hash = "sha256-zSFPXAvMuq5pL8vx1wAhHZ8h/agcwoUjioH6RIMy/AE="; }; meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; meta.hydraPlatforms = [ ]; @@ -12128,11 +12128,11 @@ final: prev: { nvim-paredit = buildVimPlugin { pname = "nvim-paredit"; - version = "1.2.0-unstable-2025-08-22"; + version = "1.2.0"; src = fetchFromGitHub { owner = "julienvincent"; repo = "nvim-paredit"; - rev = "b6ba636874a3115d944e35746444724240568aca"; + tag = "v1.2.0"; hash = "sha256-nRaS6ViO+fqg6cZiyNZhCrIpFC6Lnn5Rv2WjQTmR2uA="; }; meta.homepage = "https://github.com/julienvincent/nvim-paredit/"; @@ -12154,12 +12154,12 @@ final: prev: { nvim-peekup = buildVimPlugin { pname = "nvim-peekup"; - version = "0.1.1-unstable-2023-02-23"; + version = "0.1.1"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-peekup"; - rev = "82251c54cd60f8504dfd9acd853eae57fe832447"; - hash = "sha256-owZ9Emnh7imH8usPelRXXgEtFY69CxNkUIKM5coBPX4="; + tag = "v0.1.1"; + hash = "sha256-Xl+aLUkAtCMQE/3j7c8jtsdKdl72H0YoEzBZptkbG88="; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; meta.hydraPlatforms = [ ]; @@ -12310,12 +12310,12 @@ final: prev: { nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2.0.0-unstable-2026-04-09"; + version = "2.0.0"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "f8b34f206a14eb00b5723dbc15e9a5911f1210ab"; - hash = "sha256-lUavLo7TzpULg/MdkHlFJDt1NAZWH0/Sx8W1rgS5NsM="; + tag = "v2.0.0"; + hash = "sha256-W0M1YWlQNUmeLxCOvNghY5txLNqNlp01IuSl+fkeA+I="; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; meta.hydraPlatforms = [ ]; @@ -12401,11 +12401,11 @@ final: prev: { nvim-test = buildVimPlugin { pname = "nvim-test"; - version = "1.4.1-unstable-2023-05-02"; + version = "1.4.1"; src = fetchFromGitHub { owner = "klen"; repo = "nvim-test"; - rev = "e06f3d029ee161f3ead6193cf27354d1eb8723c3"; + tag = "1.4.1"; hash = "sha256-mMi07UbMWmC75DFfW1b+sR2uRPxizibFwS2qcN9rpLI="; }; meta.homepage = "https://github.com/klen/nvim-test/"; @@ -12427,12 +12427,12 @@ final: prev: { nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "1.17.0-unstable-2026-04-07"; + version = "1.17.0-unstable-2026-04-16"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "509962f21ab7289d8dcd28568af539be39a8c01e"; - hash = "sha256-EI2oVvj4YmwNf3jjLG8u0bRdj3v4L7ko1noufbf1RyA="; + rev = "d277467fc0d1d0e2bca88165a1de6b526f9f6fe8"; + hash = "sha256-SRDO1680yNSSOYCLSp+TLiwim8NzFGNFyWY6yaaQVZU="; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; meta.hydraPlatforms = [ ]; @@ -12700,11 +12700,11 @@ final: prev: { nvim-window-picker = buildVimPlugin { pname = "nvim-window-picker"; - version = "2.4.0-unstable-2025-02-26"; + version = "2.4.0"; src = fetchFromGitHub { owner = "s1n7ax"; repo = "nvim-window-picker"; - rev = "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec"; + tag = "v2.4.0"; hash = "sha256-ZavIPpQXLSRpJXJVJZp3N6QWHoTKRvVrFAw7jekNmX4="; }; meta.homepage = "https://github.com/s1n7ax/nvim-window-picker/"; @@ -12817,12 +12817,12 @@ final: prev: { obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "3.16.2-unstable-2026-04-14"; + version = "3.16.2-unstable-2026-04-18"; src = fetchFromGitHub { owner = "obsidian-nvim"; repo = "obsidian.nvim"; - rev = "6e558fcdc869efcdd018d58b0a2667ed16b13d27"; - hash = "sha256-18SV5pJDduUCqNN4k7OJTlWN4l9AB3MhhNI3IW4guIc="; + rev = "d6c0e5bc30937df0657c9953d135d0ebb3af7e00"; + hash = "sha256-ZFFtVH/NswfManJ+o5x3oLhy/foQzmVj29O7UEBVkMs="; }; meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/"; meta.hydraPlatforms = [ ]; @@ -12869,12 +12869,12 @@ final: prev: { octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "0-unstable-2026-04-12"; + version = "0-unstable-2026-04-16"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "351b2922642c3ade27c1d13374c685d1d6ab27a9"; - hash = "sha256-eEgJ42u4TGzON3vi+MqDfN6q64Pm0osXnTIfvWvtpJY="; + rev = "65550fa020775fb18e6eacab86b80145560bfd9c"; + hash = "sha256-VUm7BQ5g4VyKWAZTOhxt19JAea+DLrMltt01jbO6LUg="; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.hydraPlatforms = [ ]; @@ -12921,12 +12921,12 @@ final: prev: { oklch-color-picker-nvim = buildVimPlugin { pname = "oklch-color-picker.nvim"; - version = "4.1.1-unstable-2026-04-14"; + version = "4.1.1"; src = fetchFromGitHub { owner = "eero-lehtinen"; repo = "oklch-color-picker.nvim"; - rev = "3f343962643f63d75ae3bcf65669df2930e94411"; - hash = "sha256-stfbbpEbyuD4kSOdxUAq/4bvbg4dWcnnOBYTI2kIJqg="; + tag = "v4.1.1"; + hash = "sha256-zAPPMQyG8ys4ezoMDZYZzbiHc20TZrFjAiIwsIiIQN0="; }; meta.homepage = "https://github.com/eero-lehtinen/oklch-color-picker.nvim/"; meta.hydraPlatforms = [ ]; @@ -13038,7 +13038,7 @@ final: prev: { onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "0-unstable-2026-04-11"; + version = "2.28.0-unstable-2026-04-11"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; @@ -13090,7 +13090,7 @@ final: prev: { open-browser-vim = buildVimPlugin { pname = "open-browser.vim"; - version = "2.0.0-unstable-2022-10-08"; + version = "0.1.2-unstable-2022-10-08"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser.vim"; @@ -13103,12 +13103,12 @@ final: prev: { opencode-nvim = buildVimPlugin { pname = "opencode.nvim"; - version = "0.7.0-unstable-2026-04-13"; + version = "0.7.0"; src = fetchFromGitHub { owner = "nickjvandyke"; repo = "opencode.nvim"; - rev = "4002092d701007acbb5b8fb1a47924ea719241b0"; - hash = "sha256-mCXSkB8yGhEiWDFGupGpLeEtf4zrdmcX8xjPc5x7IDo="; + tag = "v0.7.0"; + hash = "sha256-A9uhcU1Wm4yDnaON8j6KVe7ahdKIkzW3cZwZK93RNew="; }; meta.homepage = "https://github.com/nickjvandyke/opencode.nvim/"; meta.hydraPlatforms = [ ]; @@ -13116,7 +13116,7 @@ final: prev: { openingh-nvim = buildVimPlugin { pname = "openingh.nvim"; - version = "1.013-unstable-2025-05-01"; + version = "1.0.14-unstable-2025-05-01"; src = fetchFromGitHub { owner = "Almo7aya"; repo = "openingh.nvim"; @@ -13181,11 +13181,11 @@ final: prev: { otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2.14.5-unstable-2026-03-27"; + version = "2.14.5"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "a455e68a99d395889ab30a25ac3846a135e93c46"; + tag = "v2.14.5"; hash = "sha256-kTDFzud+Kx3YAI36QhEi+WjVkB6Owao7PdUBX3mLXKw="; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; @@ -13234,12 +13234,12 @@ final: prev: { package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; - version = "2.0-unstable-2025-12-27"; + version = "2.0-unstable-2026-04-16"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "52e407af634cd5d3add0dc916c517865850113a4"; - hash = "sha256-rKBF6gHIVXjDYJ/ogCeyogFovkj2ZsC0z2tavUHUU0k="; + rev = "9725099fb118bab8360e560c1219bff60763b7e1"; + hash = "sha256-KCA7E766yRnV7XMrcwwpe7m1/pgiqecKtCWVtAlfGfU="; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; meta.hydraPlatforms = [ ]; @@ -13638,12 +13638,12 @@ final: prev: { precognition-nvim = buildVimPlugin { pname = "precognition.nvim"; - version = "1.2.0-unstable-2026-01-30"; + version = "1.2.0"; src = fetchFromGitHub { owner = "tris203"; repo = "precognition.nvim"; - rev = "06e4bfa339ddc55a49fd1adcbb403f6e0855c43b"; - hash = "sha256-LudDSj96li+dKgEIOExjPsaQ/Nf+fHqWbvIyG1NBanU="; + tag = "v1.2.0"; + hash = "sha256-AcBZ3by3ONZBDuY2jpfDZSutwotlh+YHA7SgCJEmrzo="; }; meta.homepage = "https://github.com/tris203/precognition.nvim/"; meta.hydraPlatforms = [ ]; @@ -13703,11 +13703,11 @@ final: prev: { prev_indent = buildVimPlugin { pname = "prev_indent"; - version = "0.3-unstable-2014-03-08"; + version = "0.3"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "prev_indent"; - rev = "79e9b1b9a6895bfd15463c45595ca599987a4b23"; + tag = "0.3"; hash = "sha256-Bvp8EJnOazXfCNK8emE7LKUeT3xPNyrIIUgdNh1vuA8="; }; meta.homepage = "https://github.com/vim-scripts/prev_indent/"; @@ -13716,12 +13716,12 @@ final: prev: { project-nvim = buildVimPlugin { pname = "project.nvim"; - version = "3.0.1-1-unstable-2026-04-15"; + version = "3.1.0-1"; src = fetchFromGitHub { owner = "DrKJeff16"; repo = "project.nvim"; - rev = "cae4d20bdb436593125cf5f7c3135e068775e748"; - hash = "sha256-zJZArVScHzRDiuIX+WwoVf4PJKQvkpQ/vJvqyWyUWzg="; + tag = "v3.1.0-1"; + hash = "sha256-i3nGUb/tULq28MmiYk3C4P+FoVFSZaaO5XWx4kuTa0I="; }; meta.homepage = "https://github.com/DrKJeff16/project.nvim/"; meta.hydraPlatforms = [ ]; @@ -13794,12 +13794,12 @@ final: prev: { python-mode = buildVimPlugin { pname = "python-mode"; - version = "0.14.0-unstable-2025-11-14"; + version = "0.14.0-unstable-2026-04-18"; src = fetchFromGitHub { owner = "python-mode"; repo = "python-mode"; - rev = "7dd171f1340ac60dd18efe393014289072cbb814"; - hash = "sha256-nWQHBo2S3stWq6aAey8LOdAV1q04zWJkjrEjzes80KU="; + rev = "96751db34f3862d133679c47d74ad3d5527d365b"; + hash = "sha256-YKIDhYDZ+dD0YU6zf1hJoXGGCNRlw4RmzOC7I/ZF5KU="; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; @@ -13873,11 +13873,11 @@ final: prev: { quick-scope = buildVimPlugin { pname = "quick-scope"; - version = "2.7.1-unstable-2025-06-26"; + version = "2.7.1"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "6cee1d9e0b9ac0fbffeb538d4a5ba9f5628fabbc"; + tag = "v2.7.1"; hash = "sha256-fOS+ia+sZAK5Ctzp0E7dgLSAVgcSZPLtXDsfZrmPaLA="; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; @@ -13951,11 +13951,11 @@ final: prev: { rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "0.12.0-unstable-2026-04-06"; + version = "0.12.0"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "aab6caaffd79b8def22ec4320a5344f7c42f58d2"; - hash = "sha256-aQM0Ay5GZZwcTnZ2PV4iucyBmoik98EAeIPIIJSxuYk="; + tag = "v0.12.0"; + hash = "sha256-mXuANXeUUltbaE7kPi1PeREUXR+I3EdPzLgPw3gfyX8="; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; meta.hydraPlatforms = [ ]; @@ -14041,7 +14041,7 @@ final: prev: { rcshell-vim = buildVimPlugin { pname = "rcshell.vim"; - version = "20091226-unstable-2014-12-29"; + version = "0.2.0-unstable-2014-12-29"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "rcshell.vim"; @@ -14106,11 +14106,11 @@ final: prev: { remember-nvim = buildVimPlugin { pname = "remember.nvim"; - version = "1.5.1-unstable-2026-01-13"; + version = "1.5.1"; src = fetchFromGitHub { owner = "vladdoster"; repo = "remember.nvim"; - rev = "85aff6dc0a5adab088ef6b9210585ded31c32c7b"; + tag = "v1.5.1"; hash = "sha256-kJABTjY6p+wFlNZ9VLmK5LvusHcbD/0aaZP6yOpR1Zc="; }; meta.homepage = "https://github.com/vladdoster/remember.nvim/"; @@ -14119,11 +14119,11 @@ final: prev: { remote-nvim-nvim = buildVimPlugin { pname = "remote-nvim.nvim"; - version = "0.3.12-unstable-2025-08-22"; + version = "0.3.12"; src = fetchFromGitHub { owner = "amitds1997"; repo = "remote-nvim.nvim"; - rev = "9992c2fb8bf4f11aca2c8be8db286b506f92efcb"; + tag = "v0.3.12"; hash = "sha256-weTaxA5M8dpx4sIKKYqHkTy0/ZoINjZ/VqAbs2FYfus="; }; meta.homepage = "https://github.com/amitds1997/remote-nvim.nvim/"; @@ -14145,11 +14145,11 @@ final: prev: { renamer-nvim = buildVimPlugin { pname = "renamer.nvim"; - version = "5.1.0-unstable-2022-08-29"; + version = "5.1.0"; src = fetchFromGitHub { owner = "filipdutescu"; repo = "renamer.nvim"; - rev = "1614d466df53899f11dd5395eaac3c09a275c384"; + tag = "v5.1.0"; hash = "sha256-Nz36OESAcLqaNs4kDOIdrdAFvfiUPzUP8scvJpcPAa4="; }; meta.homepage = "https://github.com/filipdutescu/renamer.nvim/"; @@ -14289,12 +14289,12 @@ final: prev: { roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "0-unstable-2026-04-06"; + version = "0-unstable-2026-04-16"; src = fetchFromGitHub { owner = "seblyng"; repo = "roslyn.nvim"; - rev = "f2ec6ee6384c3b611ddc817b9e78b20cd0334bbb"; - hash = "sha256-0Wpic372trtMO7FUJtcHTcaG4fEGhY7WS6P0+eeosiA="; + rev = "6a5e60a7c25d9ce0835aa9c69379f1c92e0a9d56"; + hash = "sha256-Zoi5RxWJY96C4D3k9iwU2XJb8LKUFCdq5SDHWrfa5vw="; }; meta.homepage = "https://github.com/seblyng/roslyn.nvim/"; meta.hydraPlatforms = [ ]; @@ -14601,12 +14601,12 @@ final: prev: { seoul256-vim = buildVimPlugin { pname = "seoul256.vim"; - version = "0-unstable-2025-07-02"; + version = "0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "d9a91d8d4e153274e1ecc0ceb05c37f0d0de84d7"; - hash = "sha256-bT4KvY4ezaaJyRDAJ4v3cv2twgw/Npb0rSKwsUKPCjk="; + rev = "d8499250154f0b26a398cd76769861afd8fb68fd"; + hash = "sha256-dPwFpT8O91uxnxJ9drKvou+quM4iFqFW9EyeAFdWNoU="; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; meta.hydraPlatforms = [ ]; @@ -14710,8 +14710,8 @@ final: prev: { src = fetchFromGitHub { owner = "danielfalk"; repo = "smart-open.nvim"; - rev = "7763800068bef69334870c10cb595d49ce27580a"; - hash = "sha256-n4v+gbiTOW2r+4zLRGhCY5fmEznW8YEPcEJOniKH6og="; + rev = "1082c18eabd0fb6fcdac4a828b698ccd6e25f291"; + hash = "sha256-Twsq8R2/Q3ffHTE3KTyyR8tln2ksEulo+Q9xY26mYEg="; }; meta.homepage = "https://github.com/danielfalk/smart-open.nvim/"; meta.hydraPlatforms = [ ]; @@ -14719,12 +14719,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2.1.0-unstable-2026-04-14"; + version = "2.1.0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "ba2850ff3d3b09785a7105c69d06a12117d4b97d"; - hash = "sha256-IuJNQT0bN68K5lnw0ixyU/heG8V1+zUwlvm0mNvvHOw="; + rev = "78b9d3bd21fe479690ae5e08a1bf3602698466d8"; + hash = "sha256-J7uzQQQhKa6NyRPJ74D35RAy5Uju2swkZZda7m2GsAU="; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.hydraPlatforms = [ ]; @@ -14900,12 +14900,12 @@ final: prev: { sort-nvim = buildVimPlugin { pname = "sort.nvim"; - version = "2.4.0-unstable-2026-01-28"; + version = "2.4.1"; src = fetchFromGitHub { owner = "sQVe"; repo = "sort.nvim"; - rev = "3365768ad75fb7aa2a74ebaf609b7c802354fd46"; - hash = "sha256-h6m2Zh2u5r9EMRo4CbGCXqC1bG4bUfuCYWZo4T3MEtQ="; + tag = "v2.4.1"; + hash = "sha256-ZCMevcK3lqz8pXsozd4p0bbv1DpASBOtQD0ikDTRZtc="; }; meta.homepage = "https://github.com/sQVe/sort.nvim/"; meta.hydraPlatforms = [ ]; @@ -15070,12 +15070,12 @@ final: prev: { srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2.1.0-unstable-2026-01-22"; + version = "2.1.0-unstable-2026-04-18"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "1fef59020077b4ed1006b4d12975dfd8ef4ee2bc"; - hash = "sha256-oT9YQiJm8KV7roxA534JIoU15FWWd2R59rF+M/AtecQ="; + rev = "ca521d76f968713dabfe29b7f13d57fc257da43e"; + hash = "sha256-3Flf84WAZkzvWNPXKfB/Fruk0EWQrf8JrZGBo4Fqbig="; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; meta.hydraPlatforms = [ ]; @@ -15083,12 +15083,12 @@ final: prev: { sslsecure-vim = buildVimPlugin { pname = "sslsecure.vim"; - version = "1.1.1-unstable-2017-07-27"; + version = "1.1.1"; src = fetchFromGitHub { owner = "chr4"; repo = "sslsecure.vim"; - rev = "a1ddb42bf7ebbe9db48109bb89433492754833cf"; - hash = "sha256-ZHo0lkG0GrmjvCZnu9z/QxREBc9dihjzjJybDK+7WfI="; + tag = "v1.1.1"; + hash = "sha256-6I8AFo6Oj7h1RYBlY6Iu8oLPLt3qPf5tTbsgUnCwIa4="; }; meta.homepage = "https://github.com/chr4/sslsecure.vim/"; meta.hydraPlatforms = [ ]; @@ -15330,11 +15330,11 @@ final: prev: { swayconfig-vim = buildVimPlugin { pname = "swayconfig.vim"; - version = "0.13.0-unstable-2023-08-26"; + version = "0.13.0"; src = fetchFromGitHub { owner = "jamespeapen"; repo = "swayconfig.vim"; - rev = "29a5e74bdd4d2958818e15b2926e408c6cd85c75"; + tag = "0.13.0"; hash = "sha256-/ghp3uLfQbv7sNnSeRk6wkV3XRR/ZsGm+xd8inrOG78="; }; meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; @@ -15370,11 +15370,11 @@ final: prev: { switcher-nvim = buildVimPlugin { pname = "switcher-nvim"; - version = "1.1.4-unstable-2026-02-24"; + version = "1.1.4"; src = fetchFromGitHub { owner = "neovim-idea"; repo = "switcher-nvim"; - rev = "e476066d66781dbf58a5ee989fd5b48a4f611570"; + tag = "v1.1.4"; hash = "sha256-lZvtGgp4Pzl5VWfTqjpvAHXSQ8i781GMupolDpUR3l0="; }; meta.homepage = "https://github.com/neovim-idea/switcher-nvim/"; @@ -15422,11 +15422,11 @@ final: prev: { tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2.8.1-unstable-2026-01-07"; + version = "2.8.1"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "3c130e1fcb598ce39a9c292847e32d7c3987cf11"; + tag = "v2.8.1"; hash = "sha256-YAnw/FpSLqKjvnug4bdvbGHpYWwtDKuh/DmxhK+PSu0="; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; @@ -15527,12 +15527,12 @@ final: prev: { tagalong-vim = buildVimPlugin { pname = "tagalong.vim"; - version = "0.2.2-unstable-2023-09-07"; + version = "0.2.2-unstable-2026-04-17"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "tagalong.vim"; - rev = "5a2bbf2b1d5b657685a49d48d98a4aa921c1fde3"; - hash = "sha256-zTdq7hg+tPTy803o+f3gIzb7TCw4KRgKAaLf7bBC1A4="; + rev = "4710bd92f3fa7fedb60b28d01de1e69200e33a7a"; + hash = "sha256-FiIJL6L3rYmCbvlNQnKnry0443mDzgTI9RxHjR5o2d0="; }; meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; meta.hydraPlatforms = [ ]; @@ -15815,11 +15815,11 @@ final: prev: { telescope-github-nvim = buildVimPlugin { pname = "telescope-github.nvim"; - version = "1.0.2-unstable-2026-01-20"; + version = "1.0.2"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-github.nvim"; - rev = "cdd3ce7d317729709821d33820c619be21b22948"; + tag = "1.0.2"; hash = "sha256-Neojvrrjq6S+s1ZKW389N3SK4NvInkrIUVcDX8Mj7I8="; }; meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; @@ -16219,11 +16219,11 @@ final: prev: { themery-nvim = buildVimPlugin { pname = "themery.nvim"; - version = "2.0.1-unstable-2025-01-01"; + version = "2.0.1"; src = fetchFromGitHub { owner = "zaldih"; repo = "themery.nvim"; - rev = "bfa58f4b279d21cb515b28023e1b68ec908584b2"; + tag = "v2.0.1"; hash = "sha256-1I1fr4Hq6547pyj1yUq9yoYjnc/FO0z+x0lrXkwaLXM="; }; meta.homepage = "https://github.com/zaldih/themery.nvim/"; @@ -16271,11 +16271,11 @@ final: prev: { timestamp-vim = buildVimPlugin { pname = "timestamp.vim"; - version = "1.21-unstable-2010-11-06"; + version = "1.21"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "timestamp.vim"; - rev = "0437f9bddd4e699e8e9de176daacec234d42b56c"; + tag = "1.21"; hash = "sha256-FzEMhfvgIE7tlX1LzRQ7ZuYF9aQK6yoHuqT28+vSerc="; }; meta.homepage = "https://github.com/vim-scripts/timestamp.vim/"; @@ -16297,12 +16297,12 @@ final: prev: { tinted-nvim = buildVimPlugin { pname = "tinted-nvim"; - version = "1.0.0-unstable-2026-04-14"; + version = "1.0.0-unstable-2026-04-19"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "tinted-nvim"; - rev = "5ccd9794d811a5246b34122933e0c41f2de84eaf"; - hash = "sha256-haRkM0LB0JyoEl3IHP0K8a1mTu5vgEX2UH05sWN4wjE="; + rev = "13502cdf2cb854b7bb25473241aeb76458523e6f"; + hash = "sha256-OSbwHoC/5Xieqqm61h4E32NJz+zNWcQBM/qotQgXA6s="; }; meta.homepage = "https://github.com/tinted-theming/tinted-nvim/"; meta.hydraPlatforms = [ ]; @@ -16310,12 +16310,12 @@ final: prev: { tinted-vim = buildVimPlugin { pname = "tinted-vim"; - version = "0-unstable-2026-04-14"; + version = "01-unstable-2026-04-19"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "tinted-vim"; - rev = "72c2a517a2227a0a405f401bb953bada72df5003"; - hash = "sha256-/ibMPlVaGjVGGmtvyirMJRORBEYVV3kYBbiJy3x1b4s="; + rev = "3b6128ba023812420defc3e870714e2131a564dd"; + hash = "sha256-R5VMt5t2lZAwkArkdr6seQc5lL/gmYYeHe/fIfODo0s="; }; meta.homepage = "https://github.com/tinted-theming/tinted-vim/"; meta.hydraPlatforms = [ ]; @@ -16349,12 +16349,12 @@ final: prev: { tiny-glimmer-nvim = buildVimPlugin { pname = "tiny-glimmer.nvim"; - version = "0-unstable-2026-01-19"; + version = "0-unstable-2026-04-16"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-glimmer.nvim"; - rev = "932e6c2cc4a43ce578f007db1f8f61ad6798f938"; - hash = "sha256-Lgdeu3xRXKf7YcuPKPnVvECzQR+RzC0bM+AiilHLLVg="; + rev = "1f1f26d84882b6f216cbeba548f2359c2118a876"; + hash = "sha256-DccGp/CzBxLszWVqfZLl/NRm82FKsLQ8Z7j286PB2i8="; }; meta.homepage = "https://github.com/rachartier/tiny-glimmer.nvim/"; meta.hydraPlatforms = [ ]; @@ -16362,12 +16362,12 @@ final: prev: { tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "0-unstable-2026-04-05"; + version = "0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "57a0eb84b2008c76e77930639890d9874195b1e1"; - hash = "sha256-mJl6yuTH79QsfKRktBGzPOlnL1x3/KoOAWyDGGw/AwM="; + rev = "b3b91e086795c036ecfe70429b72b26bcb302c91"; + hash = "sha256-yYxwyXuOIb+Ac5f8OonwsJny00bqfL7cWDtcjsVtP5o="; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; meta.hydraPlatforms = [ ]; @@ -16440,11 +16440,11 @@ final: prev: { todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "1.5.0-unstable-2025-11-10"; + version = "1.5.0"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "31e3c38ce9b29781e4422fc0322eb0a21f4e8668"; + tag = "v1.5.0"; hash = "sha256-VGeIRfwQsHgSO89Pmn6yIP9na1F6mmYZx0HDLe9IKCQ="; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; @@ -16572,12 +16572,12 @@ final: prev: { treesj = buildVimPlugin { pname = "treesj"; - version = "0-unstable-2026-03-14"; + version = "0-unstable-2026-04-16"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "26bc2a8432ba3ea79ed6aa346fba780a3d372570"; - hash = "sha256-rPr0O30OwF22FNWnWQkJQ5P6fR/esSeanz4c1gPV84c="; + rev = "5fa4e7ba3517f8fe743bb4488f9e9c7ce83330fc"; + hash = "sha256-qtfZ+wc5oWiuomvzD3SWUvYr6/z2wp+kZeMjKELJHog="; }; meta.homepage = "https://github.com/Wansmer/treesj/"; meta.hydraPlatforms = [ ]; @@ -16611,11 +16611,11 @@ final: prev: { trim-nvim = buildVimPlugin { pname = "trim.nvim"; - version = "0.11.0-unstable-2025-12-30"; + version = "0.11.0"; src = fetchFromGitHub { owner = "cappyzawa"; repo = "trim.nvim"; - rev = "765360a6f6ac732f4c78c5c694f4b892a55b53ec"; + tag = "v0.11.0"; hash = "sha256-h4dgbcOY2ji+TeX0jlMohDe2oL5paogl7Tt6lZG9i7M="; }; meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; @@ -16703,11 +16703,11 @@ final: prev: { tsc-nvim = buildVimPlugin { pname = "tsc.nvim"; - version = "2.10.1-unstable-2026-01-14"; + version = "2.10.1"; src = fetchFromGitHub { owner = "dmmulroy"; repo = "tsc.nvim"; - rev = "e083bcf1e54bc3af7df92b33235efb334e8c782c"; + tag = "v2.10.1"; hash = "sha256-W48Jfa750jW3mB7ObDVdZXDaZDfbbA46cgMPNkPR6jg="; }; meta.homepage = "https://github.com/dmmulroy/tsc.nvim/"; @@ -16769,12 +16769,12 @@ final: prev: { tv-nvim = buildVimPlugin { pname = "tv.nvim"; - version = "0-unstable-2026-03-22"; + version = "0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "tv.nvim"; - rev = "c0603ca8f31299c83deaa9a24a63d67116db25cd"; - hash = "sha256-Yp9+SDNhfY416UeOguncGeztWOydgfQOpU4bOxHsMo8="; + rev = "b6611fa96f1b5e7a1f01d31db944b87058f03146"; + hash = "sha256-MTMYohhexSzfV7qVY84JmeyC9JcxoX3FsU2k9NpeEMk="; }; meta.homepage = "https://github.com/alexpasmantier/tv.nvim/"; meta.hydraPlatforms = [ ]; @@ -16899,12 +16899,12 @@ final: prev: { ultisnips = buildVimPlugin { pname = "ultisnips"; - version = "3.2-unstable-2026-04-06"; + version = "3.2-unstable-2026-04-18"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "347567792219f089d9d3091bab49ce94f76fb10f"; - hash = "sha256-Fo/CqDnkM3M/7rx7djDalumfZsLp5L+kI+Pz99YrHy0="; + rev = "724e506c6c852ea9bd60720d878a09a55eb3eb74"; + hash = "sha256-HhTFCWpE5ljk2M4z9/XHBobLMIW6DO9mpVF5BEfY624="; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; meta.hydraPlatforms = [ ]; @@ -16925,7 +16925,7 @@ final: prev: { undotree = buildVimPlugin { pname = "undotree"; - version = "0-unstable-2026-03-08"; + version = "6.1-unstable-2026-03-08"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; @@ -16977,12 +16977,12 @@ final: prev: { unimpaired-which-key-nvim = buildVimPlugin { pname = "unimpaired-which-key.nvim"; - version = "2.0-unstable-2024-08-16"; + version = "2.0"; src = fetchFromGitHub { owner = "afreakk"; repo = "unimpaired-which-key.nvim"; - rev = "c35f413a631e2d2a29778cc390e4d2da28fc2727"; - hash = "sha256-47GUUq+dD2yB4b8gAKI+pZXNugw9D4GKwLklRg7JU4c="; + tag = "v2.0"; + hash = "sha256-a/2B3tbZhfCVtNwg/q2Eral6KWScGxSY9K+yWl/mIaE="; }; meta.homepage = "https://github.com/afreakk/unimpaired-which-key.nvim/"; meta.hydraPlatforms = [ ]; @@ -16990,11 +16990,11 @@ final: prev: { unison = buildVimPlugin { pname = "unison"; - version = "0-unstable-2026-04-14"; + version = "1.2.0"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "6f5937927d0fff6299052fffa22829a11ee80b8d"; + tag = "release/1.2.0"; hash = "sha256-ku6Bxg3jJruYOgrBRUzsankQtNryDmv1nWWjhvdskXs="; }; meta.homepage = "https://github.com/unisonweb/unison/"; @@ -17003,7 +17003,7 @@ final: prev: { unite-vim = buildVimPlugin { pname = "unite.vim"; - version = "0-unstable-2023-05-18"; + version = "6.3-unstable-2023-05-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; @@ -17042,7 +17042,7 @@ final: prev: { utl-vim = buildVimPlugin { pname = "utl.vim"; - version = "2.0-unstable-2010-10-18"; + version = "3.0a-ALPHA-unstable-2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "utl.vim"; @@ -17224,11 +17224,11 @@ final: prev: { vim-SyntaxRange = buildVimPlugin { pname = "vim-SyntaxRange"; - version = "1.04-unstable-2024-11-13"; + version = "1.04"; src = fetchFromGitHub { owner = "inkarkat"; repo = "vim-SyntaxRange"; - rev = "78004d2ec1d68f9d1d8b54c1803a52feb2f938f3"; + tag = "1.04"; hash = "sha256-uicJ4cqoWOrc3dx6DnH/VdRFQXqVmauLyTcgyIrIwJU="; }; meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; @@ -17497,11 +17497,11 @@ final: prev: { vim-advanced-sorters = buildVimPlugin { pname = "vim-advanced-sorters"; - version = "1.31-unstable-2024-11-10"; + version = "1.31"; src = fetchFromGitHub { owner = "inkarkat"; repo = "vim-AdvancedSorters"; - rev = "4975c129954f29c74c4de173530248929e4ecc91"; + tag = "1.31"; hash = "sha256-VhGa3KrOS11I66RtoZyw+x/7yBwUsbYNJbiys/XeISI="; }; meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/"; @@ -18108,7 +18108,7 @@ final: prev: { vim-clojure-static = buildVimPlugin { pname = "vim-clojure-static"; - version = "0-unstable-2017-10-23"; + version = "011-unstable-2017-10-23"; src = fetchFromGitHub { owner = "guns"; repo = "vim-clojure-static"; @@ -18498,11 +18498,11 @@ final: prev: { vim-dim = buildVimPlugin { pname = "vim-dim"; - version = "1.2.0-unstable-2025-11-20"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jeffkreeftmeijer"; repo = "vim-dim"; - rev = "2b560e3810d56546b1ccfcc977eb9890d50fe574"; + tag = "1.2.0"; hash = "sha256-M5tbfC3zZTSC6xYrVBNx3GtLfWn65qhs1+DxykrkGdQ="; }; meta.homepage = "https://github.com/jeffkreeftmeijer/vim-dim/"; @@ -18680,11 +18680,11 @@ final: prev: { vim-easytags = buildVimPlugin { pname = "vim-easytags"; - version = "3.11-unstable-2015-07-01"; + version = "3.11"; src = fetchFromGitHub { owner = "xolox"; repo = "vim-easytags"; - rev = "72a8753b5d0a951e547c51b13633f680a95b5483"; + tag = "3.11"; hash = "sha256-UYTofWq9aLN/oys89tdOC6yn+US3g1jDAga1olxQEEU="; }; meta.homepage = "https://github.com/xolox/vim-easytags/"; @@ -18836,7 +18836,7 @@ final: prev: { vim-eunuch = buildVimPlugin { pname = "vim-eunuch"; - version = "0-unstable-2024-12-29"; + version = "1.3-unstable-2024-12-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; @@ -18901,11 +18901,11 @@ final: prev: { vim-fetch = buildVimPlugin { pname = "vim-fetch"; - version = "3.1.0-unstable-2026-02-14"; + version = "3.1.0"; src = fetchFromGitHub { owner = "wsdjeg"; repo = "vim-fetch"; - rev = "b88bc5c4a8652b73bcdb577e0c90700a5064fd00"; + tag = "v3.1.0"; hash = "sha256-IQ1P0jqRn6qUhdRp2zoLb2Tgd57/wTKq2W43aM+lj+A="; }; meta.homepage = "https://github.com/wsdjeg/vim-fetch/"; @@ -19057,11 +19057,11 @@ final: prev: { vim-ft-diff_fold = buildVimPlugin { pname = "vim-ft-diff_fold"; - version = "0.2.0-unstable-2013-02-10"; + version = "0.2.0"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-ft-diff_fold"; - rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; + tag = "v0.2.0"; hash = "sha256-qjqNarMKuNb6dsXeh/euV2jl7ApLih72o1V9NzsraS4="; }; meta.homepage = "https://github.com/thinca/vim-ft-diff_fold/"; @@ -19187,7 +19187,7 @@ final: prev: { vim-git = buildVimPlugin { pname = "vim-git"; - version = "0-unstable-2024-10-03"; + version = "7.4-unstable-2024-10-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; @@ -19330,7 +19330,7 @@ final: prev: { vim-grepper = buildVimPlugin { pname = "vim-grepper"; - version = "0-unstable-2025-02-18"; + version = "1.4-unstable-2025-02-18"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; @@ -19356,11 +19356,11 @@ final: prev: { vim-gui-position = buildVimPlugin { pname = "vim-gui-position"; - version = "1.0.1-unstable-2019-06-06"; + version = "1.0.1"; src = fetchFromGitHub { owner = "brennanfee"; repo = "vim-gui-position"; - rev = "065d0dcf96c28cfc0003d72c1b3c49203632f62a"; + tag = "v1.0.1"; hash = "sha256-w5LcBaqotGkgQy/f/cs4dkQnLIPQ0fOoXl4n5edMe4Y="; }; meta.homepage = "https://github.com/brennanfee/vim-gui-position/"; @@ -19382,12 +19382,12 @@ final: prev: { vim-habamax = buildVimPlugin { pname = "vim-habamax"; - version = "0-unstable-2026-02-08"; + version = "0-unstable-2026-04-16"; src = fetchFromGitHub { owner = "habamax"; repo = "vim-habamax"; - rev = "4803105d78f54bbc1fe3d7c84c8e0bff9fa042cd"; - hash = "sha256-7BBUeYLgmmmmIrvWdNIkUgxBruGyxMz26lgLpf9KaPE="; + rev = "20f89dedde764c7026254359a3aa0507bb0174f3"; + hash = "sha256-vqrYsCDKz1c0uLsaCcwpG0dS+ipVNRZknsC+3i7kICI="; }; meta.homepage = "https://github.com/habamax/vim-habamax/"; meta.hydraPlatforms = [ ]; @@ -19591,11 +19591,11 @@ final: prev: { vim-humanoid-colorscheme = buildVimPlugin { pname = "vim-humanoid-colorscheme"; - version = "0.2-unstable-2024-11-03"; + version = "0.2"; src = fetchFromGitHub { owner = "humanoid-colors"; repo = "vim-humanoid-colorscheme"; - rev = "f1b442b2e154937e8127bf09376b1665265b9916"; + tag = "0.2"; hash = "sha256-h90J8q8WZDHTZr6MuN9PHzbwbPGK3Bu/ErG0uZDjyX8="; }; meta.homepage = "https://github.com/humanoid-colors/vim-humanoid-colorscheme/"; @@ -19956,11 +19956,11 @@ final: prev: { vim-jsonpath = buildVimPlugin { pname = "vim-jsonpath"; - version = "0.5.2-unstable-2020-06-16"; + version = "0.5.2"; src = fetchFromGitHub { owner = "mogelbrod"; repo = "vim-jsonpath"; - rev = "af9c07b87765fc5aee176a894bc91fb04a5e3c47"; + tag = "v0.5.2"; hash = "sha256-SdE8BKpZ5civFG/ET0+GeHvGc6gK6+dWP55mQrthqVA="; }; meta.homepage = "https://github.com/mogelbrod/vim-jsonpath/"; @@ -20203,11 +20203,11 @@ final: prev: { vim-localvimrc = buildVimPlugin { pname = "vim-localvimrc"; - version = "3.2.0-unstable-2024-10-25"; + version = "3.2.0"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "b249c5a6bf324b0d5e62ccacfffcd36c6a703d84"; + tag = "v3.2.0"; hash = "sha256-7lvW0w3D8cv4xre1aLqN4HTg3BgdDi4silPuV6sv+PQ="; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; @@ -20255,12 +20255,12 @@ final: prev: { vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "0.1.4-unstable-2026-03-30"; + version = "0.1.4-unstable-2026-04-18"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "0c49560e5fbc97876e51bef6b993e48677cc15fc"; - hash = "sha256-JSRwIPCQW7Dq/SAJjnrBXJB2iRiKOqro8CqICDwzh5w="; + rev = "474c656659b5fb51eec6770309e0211c8aa49b5b"; + hash = "sha256-ZMqeuTKyQAknqXA4IvNCzgumcrafu0sLNp3ZFwQ6kj4="; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; meta.hydraPlatforms = [ ]; @@ -20346,7 +20346,7 @@ final: prev: { vim-maktaba = buildVimPlugin { pname = "vim-maktaba"; - version = "1.14.0-unstable-2023-03-21"; + version = "0.15.0-unstable-2023-03-21"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; @@ -20489,11 +20489,11 @@ final: prev: { vim-misc = buildVimPlugin { pname = "vim-misc"; - version = "1.17.6-unstable-2015-05-21"; + version = "1.17.6"; src = fetchFromGitHub { owner = "xolox"; repo = "vim-misc"; - rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b"; + tag = "1.17.6"; hash = "sha256-0XGugINNYH+o8uPePNz28Nojy1dxdVD8RYU53xA6qWU="; }; meta.homepage = "https://github.com/xolox/vim-misc/"; @@ -20671,11 +20671,11 @@ final: prev: { vim-niceblock = buildVimPlugin { pname = "vim-niceblock"; - version = "0.2.0-unstable-2018-09-06"; + version = "0.2.0"; src = fetchFromGitHub { owner = "kana"; repo = "vim-niceblock"; - rev = "9302f527eefc0fde8df983cbb9710ad52c4213b5"; + tag = "0.2.0"; hash = "sha256-4tdDTzAaZTatKrA3UufL3a8fayxDEF18woFKEPTpGbQ="; }; meta.homepage = "https://github.com/kana/vim-niceblock/"; @@ -20827,7 +20827,7 @@ final: prev: { vim-openscad = buildVimPlugin { pname = "vim-openscad"; - version = "0-unstable-2022-07-26"; + version = "0_3-unstable-2022-07-26"; src = fetchFromGitHub { owner = "sirtaj"; repo = "vim-openscad"; @@ -20840,11 +20840,11 @@ final: prev: { vim-operator-replace = buildVimPlugin { pname = "vim-operator-replace"; - version = "0.0.5-unstable-2015-02-24"; + version = "0.0.5"; src = fetchFromGitHub { owner = "kana"; repo = "vim-operator-replace"; - rev = "1345a556a321a092716e149d4765a5e17c0e9f0f"; + tag = "0.0.5"; hash = "sha256-2Gyr95P5bQqy9BC2WiOU6NuXvzuHNdydvH/xH8xdkR0="; }; meta.homepage = "https://github.com/kana/vim-operator-replace/"; @@ -20866,11 +20866,11 @@ final: prev: { vim-operator-user = buildVimPlugin { pname = "vim-operator-user"; - version = "0.1.0-unstable-2015-02-17"; + version = "0.1.0"; src = fetchFromGitHub { owner = "kana"; repo = "vim-operator-user"; - rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa"; + tag = "0.1.0"; hash = "sha256-yykX2bTr77HMqDjFt6VQLI1qNHodxYIom5s8XrN3wps="; }; meta.homepage = "https://github.com/kana/vim-operator-user/"; @@ -21074,11 +21074,11 @@ final: prev: { vim-pencil = buildVimPlugin { pname = "vim-pencil"; - version = "1.6.1-unstable-2023-04-03"; + version = "1.6.1"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-pencil"; - rev = "6d70438a8886eaf933c38a7a43a61adb0a7815ed"; + tag = "1.6.1"; hash = "sha256-CkUROC4vyIdNbRONCgOnuPky8pZXE25KHKU9icCqWKI="; }; meta.homepage = "https://github.com/preservim/vim-pencil/"; @@ -21100,11 +21100,11 @@ final: prev: { vim-phabricator = buildVimPlugin { pname = "vim-phabricator"; - version = "1.2-unstable-2021-11-06"; + version = "1.2"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-phabricator"; - rev = "898c55068a2066973eafe2b2eba09d7c8db5dd98"; + tag = "v1.2"; hash = "sha256-Osm/TPV8zCVKwAaJztZSOSGe1VPFrmTsz6Iq52N077c="; }; meta.homepage = "https://github.com/jparise/vim-phabricator/"; @@ -21204,12 +21204,12 @@ final: prev: { vim-prettier = buildVimPlugin { pname = "vim-prettier"; - version = "1.0.0-unstable-2023-10-10"; + version = "1.0.0"; src = fetchFromGitHub { owner = "prettier"; repo = "vim-prettier"; - rev = "7dbdbb12c50a9f4ba72390cce2846248e4368fd0"; - hash = "sha256-5fQIXYOCdQ4KltY23PFa49H0SwJmMCvE+RxPffAFq8I="; + tag = "1.0.0"; + hash = "sha256-pgSTKOUzmtzjfNeF3mKcNqqcBY44kHfC30xD5HiL9PY="; }; meta.homepage = "https://github.com/prettier/vim-prettier/"; meta.hydraPlatforms = [ ]; @@ -21295,7 +21295,7 @@ final: prev: { vim-ps1 = buildVimPlugin { pname = "vim-ps1"; - version = "2.81-unstable-2024-03-06"; + version = "2.9-unstable-2024-03-06"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; @@ -21542,7 +21542,7 @@ final: prev: { vim-ruby = buildVimPlugin { pname = "vim-ruby"; - version = "0-unstable-2025-04-28"; + version = "20220329-unstable-2025-04-28"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; @@ -21581,12 +21581,12 @@ final: prev: { vim-sayonara = buildVimPlugin { pname = "vim-sayonara"; - version = "0-unstable-2021-08-12"; + version = "0-unstable-2021-09-03"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-sayonara"; - rev = "7e774f58c5865d9c10d40396850b35ab95af17c5"; - hash = "sha256-QDBK6ezXuLpAYh6V1fpwbJkud+t34aPBu/uR4pf8QlQ="; + rev = "75c73f3cf3e96f8c09db5291970243699aadc02c"; + hash = "sha256-R/NrlXJHdo5GrwztPGXogh9tRGA9WTRtwb96JqitDPY="; }; meta.homepage = "https://github.com/mhinz/vim-sayonara/"; meta.hydraPlatforms = [ ]; @@ -21724,7 +21724,7 @@ final: prev: { vim-signify = buildVimPlugin { pname = "vim-signify"; - version = "0-unstable-2026-03-12"; + version = "1.9-unstable-2026-03-12"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; @@ -21880,11 +21880,11 @@ final: prev: { vim-sneak = buildVimPlugin { pname = "vim-sneak"; - version = "1.11.0-unstable-2025-12-05"; + version = "1.11.0"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "feea86adcfbf8e6b5e71fdd5f4f5736fd8819fdb"; + tag = "1.11.0"; hash = "sha256-VkCownDdBKHXaa4KCJ+c0h4SVImmkkC4bbqP0uaQyPQ="; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; @@ -22010,11 +22010,11 @@ final: prev: { vim-startuptime = buildVimPlugin { pname = "vim-startuptime"; - version = "4.6.0-unstable-2026-04-10"; + version = "4.6.0"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "f10474b400c197787a0434548d842a2db583c333"; + tag = "v4.6.0"; hash = "sha256-rfY5lcDI4PwjLEqwmli1iG7ugZuplETmAYBNAoJX0ho="; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; @@ -22087,7 +22087,7 @@ final: prev: { vim-subversive = buildVimPlugin { pname = "vim-subversive"; - version = "1.0-unstable-2024-01-02"; + version = "0.0.0-unstable-2024-01-02"; src = fetchFromGitHub { owner = "svermeulen"; repo = "vim-subversive"; @@ -22164,11 +22164,11 @@ final: prev: { vim-tabby = buildVimPlugin { pname = "vim-tabby"; - version = "2.0.2-unstable-2025-01-13"; + version = "2.0.2"; src = fetchFromGitHub { owner = "TabbyML"; repo = "vim-tabby"; - rev = "5e30c429354b8e0fd5bbc7634be4abac5518bb80"; + tag = "2.0.2"; hash = "sha256-RLPxedKayUQXsC8TSMvq4rM631WbyWkAbUdemwOPQsg="; }; meta.homepage = "https://github.com/TabbyML/vim-tabby/"; @@ -22269,11 +22269,11 @@ final: prev: { vim-test = buildVimPlugin { pname = "vim-test"; - version = "3.1.0-unstable-2026-04-13"; + version = "3.1.0"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "bc0e94059de40641d163516a83c63bc45c716acf"; + tag = "v3.1.0"; hash = "sha256-vPACu8GlWxFITasOyWE9E87qqXLxG5WMn8h2XKNGD0I="; }; meta.homepage = "https://github.com/vim-test/vim-test/"; @@ -22295,11 +22295,11 @@ final: prev: { vim-textobj-entire = buildVimPlugin { pname = "vim-textobj-entire"; - version = "0.0.4-unstable-2018-01-19"; + version = "0.0.4"; src = fetchFromGitHub { owner = "kana"; repo = "vim-textobj-entire"; - rev = "64a856c9dff3425ed8a863b9ec0a21dbaee6fb3a"; + tag = "0.0.4"; hash = "sha256-te7ljHY7lzu+fmbakTkPKxF312+Q0LozTLazxQvSYE8="; }; meta.homepage = "https://github.com/kana/vim-textobj-entire/"; @@ -22308,11 +22308,11 @@ final: prev: { vim-textobj-function = buildVimPlugin { pname = "vim-textobj-function"; - version = "0.4.0-unstable-2014-05-03"; + version = "0.4.0"; src = fetchFromGitHub { owner = "kana"; repo = "vim-textobj-function"; - rev = "adb50f38499b1f558cbd58845e3e91117e4538cf"; + tag = "0.4.0"; hash = "sha256-OuaNgW1dx0PW0eKS4QpdZpeBvZUOMPMuhPCnqAUIlDM="; }; meta.homepage = "https://github.com/kana/vim-textobj-function/"; @@ -22503,12 +22503,12 @@ final: prev: { vim-trailing-whitespace = buildVimPlugin { pname = "vim-trailing-whitespace"; - version = "1.0-unstable-2023-02-28"; + version = "1.0-unstable-2026-04-16"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "5540b3faa2288b226a8d9a4e8244558b12c598aa"; - hash = "sha256-5HGXzRLRXX0Vquoqt1OwDlcc8wuvirVGx8B6kBHP7oU="; + rev = "dc22ff46010e55d2c33edd21cdcd14f99e729b6f"; + hash = "sha256-WAfwgTbz9mgEpI0nMgZTzukdPyyiRehhbtSUClOO4bE="; }; meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; meta.hydraPlatforms = [ ]; @@ -22763,11 +22763,11 @@ final: prev: { vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "12.0.0-unstable-2026-04-13"; + version = "12.0.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "cb7ba055330245b3a9d29f8bb4b82aeb2d52e580"; + tag = "12.0.0"; hash = "sha256-3D+07D3NKndFeTSNMJiG1HJl5Cv5/GjWJUU+6FOSI/k="; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; @@ -23036,7 +23036,7 @@ final: prev: { vimfiler-vim = buildVimPlugin { pname = "vimfiler.vim"; - version = "0-unstable-2024-05-20"; + version = "4.2-unstable-2024-05-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimfiler.vim"; @@ -23075,7 +23075,7 @@ final: prev: { vimproc-vim = buildVimPlugin { pname = "vimproc.vim"; - version = "0-unstable-2024-09-04"; + version = "10.0-unstable-2024-09-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; @@ -23101,7 +23101,7 @@ final: prev: { vimshell-vim = buildVimPlugin { pname = "vimshell.vim"; - version = "0-unstable-2025-07-09"; + version = "9.2-unstable-2025-07-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimshell.vim"; @@ -23128,12 +23128,12 @@ final: prev: { vimtex = buildVimPlugin { pname = "vimtex"; - version = "2.17-unstable-2026-03-30"; + version = "2.17-unstable-2026-04-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "9306903316c3ddd250676b7cf97c84a84c9c8f99"; - hash = "sha256-i4FrJRBT4PSFmEfRxIvilaudpRph7lNe3fr5P+u0/3k="; + rev = "0f42a5130432d4af2e6fd21fb93a76915ff1f090"; + hash = "sha256-dvrSe4dxbGl+rGScQDBK0tQUz4Pr37E3V326XcFGSQg="; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.hydraPlatforms = [ ]; @@ -23167,11 +23167,11 @@ final: prev: { virt-column-nvim = buildVimPlugin { pname = "virt-column.nvim"; - version = "2.0.3-unstable-2024-11-12"; + version = "2.0.3"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "virt-column.nvim"; - rev = "b87e3e0864211a32724a2ebf3be37e24e9e2fa99"; + tag = "v2.0.3"; hash = "sha256-ozrjz34YIlDziuc9KLYM9zikTlg2YKYlIewapzN/nlY="; }; meta.homepage = "https://github.com/lukas-reineke/virt-column.nvim/"; @@ -23193,11 +23193,11 @@ final: prev: { vis = buildVimPlugin { pname = "vis"; - version = "20-unstable-2013-04-26"; + version = "20"; src = fetchFromGitHub { owner = "vim-scripts"; repo = "vis"; - rev = "6a87efbfbd97238716b602c2b53564aa6329b5de"; + tag = "20"; hash = "sha256-scElpk70TYfSfDA4BI73SZyO0RhCEUbEADpYWp9o4a0="; }; meta.homepage = "https://github.com/vim-scripts/vis/"; @@ -23375,11 +23375,11 @@ final: prev: { whitespace-nvim = buildVimPlugin { pname = "whitespace.nvim"; - version = "0.4.2-unstable-2025-03-14"; + version = "0.4.2"; src = fetchFromGitHub { owner = "johnfrankmorgan"; repo = "whitespace.nvim"; - rev = "8bf60b4a6892aa517a78a6014896078ae0c4c642"; + tag = "0.4.2"; hash = "sha256-9Dtf6x2daQ6bP7qq6jKiDY8RpKNG03r1z8AzqM6/Oaw="; }; meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/"; @@ -23505,11 +23505,11 @@ final: prev: { wmgraphviz-vim = buildVimPlugin { pname = "wmgraphviz.vim"; - version = "1.2-unstable-2018-04-26"; + version = "1.2"; src = fetchFromGitHub { owner = "wannesm"; repo = "wmgraphviz.vim"; - rev = "f08ff5becd1e6e81d681ff2926f2cce29f63cb18"; + tag = "v1.2"; hash = "sha256-VGCaaCilZf0YBTVSzXrUm3ql64vmvdS48j3/PBcFq4o="; }; meta.homepage = "https://github.com/wannesm/wmgraphviz.vim/"; @@ -23609,11 +23609,11 @@ final: prev: { xmake-nvim = buildVimPlugin { pname = "xmake.nvim"; - version = "3.1.4-unstable-2026-01-31"; + version = "3.1.4"; src = fetchFromGitHub { owner = "Mythos-404"; repo = "xmake.nvim"; - rev = "32462f8bfbb5022c0772337dbef1efbf8610b392"; + tag = "v3.1.4"; hash = "sha256-A40dFf85PxFCP8hh8PNLVJflBl1LRFo8J1iZbcXxmo0="; }; meta.homepage = "https://github.com/Mythos-404/xmake.nvim/"; @@ -23727,12 +23727,12 @@ final: prev: { yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "13.1.5-unstable-2026-04-13"; + version = "13.1.5-unstable-2026-04-19"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "a4c292e0cb2647773e91ae29eeb87dd26f33c6b9"; - hash = "sha256-lqJDRFa6fLpSuG9bnAENwvOT941g+DlQmx+8xAebtNQ="; + rev = "bb69f7fc634a9566edba5fc0da3a2025d7ffbae0"; + hash = "sha256-WHp/HM4AN2kZiPs7sOIAlBWM1H7KUgFGPEEioWlxFQE="; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.hydraPlatforms = [ ]; @@ -23740,11 +23740,11 @@ final: prev: { yescapsquit-vim = buildVimPlugin { pname = "yescapsquit.vim"; - version = "0.1-unstable-2022-08-31"; + version = "0.1"; src = fetchFromGitHub { owner = "lucasew-graveyard"; repo = "yescapsquit.vim"; - rev = "68290b5869bebe093ccc87ee80d15688ac2b104d"; + tag = "0.1"; hash = "sha256-awtWWuaAoUz3MqgNb608bwFdvZ/jxBx5ijmE8H6uHfM="; }; meta.homepage = "https://github.com/lucasew-graveyard/yescapsquit.vim/"; @@ -23818,11 +23818,11 @@ final: prev: { zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; - version = "1.4.1-unstable-2025-10-28"; + version = "1.4.1"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "8564ce6d29ec7554eb9df578efa882d33b3c23a7"; + tag = "v1.4.1"; hash = "sha256-vRJynz3bnkhfHKya+iEgm4PIEwT2P9kvkskgTt5UUU4="; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; @@ -23831,12 +23831,12 @@ final: prev: { zen-nvim = buildVimPlugin { pname = "zen.nvim"; - version = "0-unstable-2026-04-12"; + version = "0-unstable-2026-04-17"; src = fetchFromGitHub { owner = "sand4rt"; repo = "zen.nvim"; - rev = "a4325a6052718b2ba0c56f24fe40c525c678af26"; - hash = "sha256-x+xQmMuebs0L7czGX+rr09kRFcdmy27h+N/m8/TsO1k="; + rev = "8d77a06063d74393ace9a984f32c4c158dcef6ba"; + hash = "sha256-1zLxgs1EqAoGrjIr26awTFZ+NS06Ph/SDQHczBNCsaA="; }; meta.homepage = "https://github.com/sand4rt/zen.nvim/"; meta.hydraPlatforms = [ ]; @@ -23844,11 +23844,11 @@ final: prev: { zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "4.11.0-unstable-2026-02-11"; + version = "4.11.0"; src = fetchFromGitHub { owner = "zenbones-theme"; repo = "zenbones.nvim"; - rev = "22b7fb75593412e0dc81b4bdefae718e9e84aa82"; + tag = "v4.11.0"; hash = "sha256-2fecMaB/59a/a0tUpDhipyGgwUliNf73SNTKQp3Bhck="; }; meta.homepage = "https://github.com/zenbones-theme/zenbones.nvim/"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 21a1386079c9..b50e26315a48 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1385,6 +1385,8 @@ assertNoAdditions { nvimSkipModules = [ # lua module '.init' not found "fzy.fzy-lua-native" + # Requires removed Neovim internal module vim.treesitter._highlight + "guihua.ts_obsolete.highlight" ]; }; @@ -1832,6 +1834,16 @@ assertNoAdditions { }; }); + live-share-nvim = super.live-share-nvim.overrideAttrs (old: { + nvimSkipModules = (old.nvimSkipModules or [ ]) ++ [ + # These modules unconditionally load OpenSSL via LuaJIT FFI and abort in + # the headless require check on Darwin. + "live-share.host" + "live-share.guest" + "live-share.collab.crypto" + ]; + }); + lsp-format-modifications-nvim = super.lsp-format-modifications-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -3138,14 +3150,29 @@ assertNoAdditions { ]; }; - python-mode = super.python-mode.overrideAttrs { - postPatch = '' + python-mode = super.python-mode.overrideAttrs (old: { + postPatch = (old.postPatch or "") + '' # NOTE: Fix broken symlink - the pytoolconfig directory was moved to src/ # https://github.com/python-mode/python-mode/pull/1189#issuecomment-3109528360 rm -f pymode/libs/pytoolconfig ln -sf ../../submodules/pytoolconfig/src/pytoolconfig pymode/libs/pytoolconfig + + # The current source tarball only ships a subset of the historical + # submodules, so drop the now-dangling vendored linter symlinks. + rm -f \ + pymode/libs/appdirs.py \ + pymode/libs/astroid \ + pymode/libs/mccabe.py \ + pymode/libs/pycodestyle.py \ + pymode/libs/pydocstyle \ + pymode/libs/pyflakes \ + pymode/libs/pylama \ + pymode/libs/pylint \ + pymode/libs/snowballstemmer \ + pymode/libs/toml \ + pymode/autopep8.py ''; - }; + }); pywal-nvim = super.pywal-nvim.overrideAttrs { # Optional feline integration From eb776e66184f6b039b34d79e94080569867ab8c1 Mon Sep 17 00:00:00 2001 From: Noderyos Date: Tue, 24 Mar 2026 21:02:58 +0100 Subject: [PATCH 238/246] libdlcr: init at 0.3.0 a --- pkgs/by-name/li/libdlcr/package.nix | 44 +++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/li/libdlcr/package.nix diff --git a/pkgs/by-name/li/libdlcr/package.nix b/pkgs/by-name/li/libdlcr/package.nix new file mode 100644 index 000000000000..549e16ffbc67 --- /dev/null +++ b/pkgs/by-name/li/libdlcr/package.nix @@ -0,0 +1,44 @@ +{ + stdenv, + lib, + fetchzip, + cmake, + pkg-config, + libusb1, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libdlcr"; + version = "0.3.0"; + + src = fetchzip { + url = "https://dragnlabs.com/host-tools/dlcr_host_v${finalAttrs.version}.zip"; + hash = "sha256-DOoc02woE10tU+8CDaYC0Xezvma06+UbhVuGFEiG67c="; + stripRoot = false; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ libusb1 ]; + + postPatch = '' + # Workaround based on + # https://github.com/NixOS/nixpkgs/issues/144170 + + substituteInPlace libdlcr.pc.in --replace-fail "\''${prefix}/" "" + ''; + + meta = { + description = "Dragon Labs CR-8 Host Driver and Utilities"; + homepage = "https://dragnlabs.com/"; + license = lib.licenses.lgpl3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ noderyos ]; + }; +}) From 4a3e7f8069615e25923ff0c854f5fe50cde4cd17 Mon Sep 17 00:00:00 2001 From: Noderyos Date: Tue, 24 Mar 2026 21:04:33 +0100 Subject: [PATCH 239/246] sdrpp: 1.2.1 -> 1.3.0 --- pkgs/by-name/sd/sdrpp/cmake4.patch | 27 --------------------------- pkgs/by-name/sd/sdrpp/package.nix | 15 ++++++++------- 2 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 pkgs/by-name/sd/sdrpp/cmake4.patch diff --git a/pkgs/by-name/sd/sdrpp/cmake4.patch b/pkgs/by-name/sd/sdrpp/cmake4.patch deleted file mode 100644 index c40373d99f6b..000000000000 --- a/pkgs/by-name/sd/sdrpp/cmake4.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt -index 7fce281d..b709255f 100644 ---- a/core/libcorrect/CMakeLists.txt -+++ b/core/libcorrect/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.13) - project(Correct C) - include(CheckLibraryExists) - include(CheckIncludeFiles) -diff --git a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt -index 1dc1c913..e9924677 100644 ---- a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt -+++ b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required (VERSION 3.2.0) -+cmake_minimum_required (VERSION 3.13) - project (DiscordRPC) - - include(GNUInstallDirs) -@@ -11,4 +11,4 @@ file(GLOB_RECURSE ALL_SOURCE_FILES - - # add subdirs - --add_subdirectory(src) -\ No newline at end of file -+add_subdirectory(src) diff --git a/pkgs/by-name/sd/sdrpp/package.nix b/pkgs/by-name/sd/sdrpp/package.nix index 894654a5cc98..e6789ff39352 100644 --- a/pkgs/by-name/sd/sdrpp/package.nix +++ b/pkgs/by-name/sd/sdrpp/package.nix @@ -19,6 +19,8 @@ audio_source ? true, bladerf_source ? stdenv.hostPlatform.isLinux, libbladeRF, + dragonlabs_source ? true, + libdlcr, file_source ? true, hackrf_source ? true, hackrf, @@ -81,21 +83,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrpp"; - upstreamVersion = "1.2.1"; - version = "${finalAttrs.upstreamVersion}-unstable-2025-10-09"; + upstreamVersion = "1.3.0"; + version = "${finalAttrs.upstreamVersion}-unstable-2026-03-24"; src = fetchFromGitHub { owner = "AlexandreRouma"; repo = "SDRPlusPlus"; - rev = "4658a1ade6707dee6f2ae09ba9eb71097223ea93"; - hash = "sha256-UxYAcqOMPQYdUbL2636LpOGbCaxHjLiJhsH62s+0AZU="; + rev = "a6df4d58e5f6b3045883a70aeb8fb41fd5dbf1d9"; + hash = "sha256-VzeLGQTnRur5vB+M5TovpLhI2QYKvpZjZjthuGyjcm0="; }; patches = [ ./0001-Allow-management-of-resources-and-modules-paths.patch - # CMake 4 dropped support of versions lower than 3.5, - # versions lower than 3.10 are deprecated. - ./cmake4.patch ]; postPatch = '' @@ -122,6 +121,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional airspy_source airspy ++ lib.optional airspyhf_source airspyhf ++ lib.optional bladerf_source libbladeRF + ++ lib.optional dragonlabs_source libdlcr ++ lib.optional hackrf_source hackrf ++ lib.optional limesdr_source limesuite ++ lib.optionals rtl_sdr_source [ @@ -148,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "OPT_BUILD_AIRSPY_SOURCE" airspy_source) (lib.cmakeBool "OPT_BUILD_AUDIO_SOURCE" audio_source) (lib.cmakeBool "OPT_BUILD_BLADERF_SOURCE" bladerf_source) + (lib.cmakeBool "OPT_BUILD_DRAGONLABS_SOURCE" dragonlabs_source) (lib.cmakeBool "OPT_BUILD_FILE_SOURCE" file_source) (lib.cmakeBool "OPT_BUILD_HACKRF_SOURCE" hackrf_source) (lib.cmakeBool "OPT_BUILD_HERMES_SOURCE" hermes_source) From 9757268b41c50b0521ed7b0925fac4f649063de2 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Wed, 15 Apr 2026 21:05:10 +0000 Subject: [PATCH 240/246] algol68g: 3.5.14 -> 3.11.3 --- pkgs/by-name/al/algol68g/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/al/algol68g/package.nix b/pkgs/by-name/al/algol68g/package.nix index c47c233cc77d..533db77f8b4f 100644 --- a/pkgs/by-name/al/algol68g/package.nix +++ b/pkgs/by-name/al/algol68g/package.nix @@ -15,11 +15,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "algol68g"; - version = "3.5.14"; + version = "3.11.3"; src = fetchurl { - url = "https://jmvdveer.home.xs4all.nl/algol68g-${finalAttrs.version}.tar.gz"; - hash = "sha256-uIy8rIhUjohiQJ/K5EprsIISXMAx1w27I3cGo/9H9Wk="; + # Uses archive.org because the original site removes older versions. + url = "https://web.archive.org/web/20260419212716/https://jmvdveer.home.xs4all.nl/algol68g-3.11.3.tar.gz"; + hash = "sha256-P8hKm5lFG3P8+OigX2mFPzL1bN30bblAvijajJzTcxA="; }; outputs = [ @@ -69,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Plus; mainProgram = "a68g"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tbutter ]; platforms = lib.platforms.unix; }; }) From 26fa4d8ae2fd742a39e3217cd80242c46267c476 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 19 Apr 2026 23:33:10 +0200 Subject: [PATCH 241/246] pretix.plugins.dbevent: migrate from dbvat; init at 1.0.0 The old plugin was archived in 2025-11 and this is the replacement. --- .../pr/pretix/plugins/dbevent/package.nix | 41 +++++++++++++++++++ .../pr/pretix/plugins/dbvat/package.nix | 38 ----------------- 2 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 pkgs/by-name/pr/pretix/plugins/dbevent/package.nix delete mode 100644 pkgs/by-name/pr/pretix/plugins/dbvat/package.nix diff --git a/pkgs/by-name/pr/pretix/plugins/dbevent/package.nix b/pkgs/by-name/pr/pretix/plugins/dbevent/package.nix new file mode 100644 index 000000000000..bb7729a6f712 --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugins/dbevent/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pretix-plugin-build, + setuptools, +}: + +buildPythonPackage rec { + pname = "pretix-dbevent"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pretix"; + repo = "pretix-dbevent"; + rev = "v${version}"; + hash = "sha256-1WUTunDeRh0+hPOF/uLcPmRlUlHAOhOqeoYQNYv0ZLI="; + }; + + build-system = [ + pretix-plugin-build + setuptools + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "pretix_dbevent" + ]; + + meta = { + description = "Advertise the DB Event Offers for discounted and sustainable train travel to your attendees"; + homepage = "https://github.com/pretix/pretix-dbevent"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + e1mo + hexa + ]; + }; +} diff --git a/pkgs/by-name/pr/pretix/plugins/dbvat/package.nix b/pkgs/by-name/pr/pretix/plugins/dbvat/package.nix deleted file mode 100644 index e0106872e280..000000000000 --- a/pkgs/by-name/pr/pretix/plugins/dbvat/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pretix-plugin-build, - setuptools, -}: - -buildPythonPackage rec { - pname = "pretix-dbvat"; - version = "1.1.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "pretix"; - repo = "pretix-dbvat"; - rev = "v${version}"; - hash = "sha256-yAKqB0G2WyGqGogAxv8fI34gO6Wl/50sY/5rvWYH4Ho="; - }; - - build-system = [ - pretix-plugin-build - setuptools - ]; - - doCheck = false; # no tests - - pythonImportsCheck = [ - "pretix_dbvat" - ]; - - meta = { - description = "Plugin for using Deutsche Bahn (DB) Event Discount (Veranstaltungsrabatt)"; - homepage = "https://github.com/pretix/pretix-dbvat"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ e1mo ]; - }; -} From eb9391d98ad15947413a457f57ad4754f650b826 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 21:46:13 +0000 Subject: [PATCH 242/246] jsongrep: 0.8.1 -> 0.9.0 --- pkgs/by-name/js/jsongrep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/js/jsongrep/package.nix b/pkgs/by-name/js/jsongrep/package.nix index 3f2b6bd2d40f..fc52618785bb 100644 --- a/pkgs/by-name/js/jsongrep/package.nix +++ b/pkgs/by-name/js/jsongrep/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jsongrep"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "micahkepe"; repo = "jsongrep"; tag = "v${finalAttrs.version}"; - hash = "sha256-A4cBHIRXmjpRSJtUNNPGOfSOFQG4om5QFa9xw4MeYj8="; + hash = "sha256-rDt4jtrC+KuPKdEoReVWW8R9/sKBnalnRuB4bj1tzas="; }; - cargoHash = "sha256-RQLMQ2jEtqh7km4FWhBaWuw9QY4B4O50DbPdBO+hcW4="; + cargoHash = "sha256-VJ8ZB3oVppMRsSvpVOF1SIvOtI0rcS8elJEweoum/lY="; nativeBuildInputs = [ installShellFiles ]; From 462a3be66cb64326fd741443a16ff067155beac4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 21:52:29 +0000 Subject: [PATCH 243/246] terraform-providers.ucloud_ucloud: 1.39.3 -> 1.39.4 --- .../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 1f1948306cd3..018595227b1a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1409,11 +1409,11 @@ "vendorHash": "sha256-OVdhM8Zqnm1J8KducnkNkroBoSLER3fHfZBjyp7kBu8=" }, "ucloud_ucloud": { - "hash": "sha256-lDLYp0ApFCV6XYCxCunkpFwEXpACoChQWLx2bHTjeQs=", + "hash": "sha256-rS9OdlxP9sGUK94hrYbPrNJn5Netov/bToQM6W73+ac=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.39.3", + "rev": "v1.39.4", "spdx": "MPL-2.0", "vendorHash": null }, From 73bd40ea215db3656d8330f9eab1ea93441e9586 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Apr 2026 21:57:43 +0000 Subject: [PATCH 244/246] fairywren: 0-unstable-2026-04-08 -> 0-unstable-2026-04-17 --- pkgs/by-name/fa/fairywren/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/fairywren/package.nix b/pkgs/by-name/fa/fairywren/package.nix index 93e3785de22b..281b44cf8b19 100644 --- a/pkgs/by-name/fa/fairywren/package.nix +++ b/pkgs/by-name/fa/fairywren/package.nix @@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2026-04-08"; + version = "0-unstable-2026-04-17"; src = fetchFromGitLab { owner = "aiyahm"; repo = "FairyWren-Icons"; - rev = "428ee2eef9f607021406376f55bfc6cf4054caf1"; - hash = "sha256-XEuchaxh9h7hNpS2wjmytutcgroohdgsh7f1x5hrDKg="; + rev = "c55f846436b13fcc0c5ee745eead9bf8e3bcb0bf"; + hash = "sha256-ESh/3PNprmD0ecSoH9JVw1r0VsWoQDw4ujpmSaoyhoM="; }; propagatedBuildInputs = [ From ccf5538a87918a8b1e8116eccf4891fc542a35a9 Mon Sep 17 00:00:00 2001 From: Jack Rosenberg Date: Thu, 16 Apr 2026 10:25:51 +0200 Subject: [PATCH 245/246] treewide: migrate to finalAttrs --- .../office/paperwork/openpaperwork-core.nix | 6 +++--- .../office/paperwork/openpaperwork-gtk.nix | 6 +++--- .../office/paperwork/paperwork-backend.nix | 6 +++--- .../office/paperwork/paperwork-shell.nix | 6 +++--- .../window-managers/hyprwm/hyprshade/default.nix | 6 +++--- .../window-managers/i3/balance-workspace.nix | 6 +++--- pkgs/by-name/bo/boxflat/package.nix | 10 +++++----- pkgs/by-name/es/esphome/dashboard.nix | 8 ++++---- pkgs/by-name/ir/irrd/package.nix | 14 +++++++++----- pkgs/by-name/ki/kikit/solidpython/default.nix | 6 +++--- pkgs/by-name/kr/krr/package.nix | 12 ++++++------ pkgs/by-name/ku/kubernetes-validate/unwrapped.nix | 8 ++++---- pkgs/by-name/or/or-tools/pybind11-2.13.6.nix | 8 ++++---- pkgs/by-name/pr/pretalx/plugins/llm.nix | 8 ++++---- pkgs/by-name/pr/pretalx/plugins/zammad.nix | 6 +++--- pkgs/by-name/s-/s-tui/package.nix | 6 +++--- pkgs/by-name/wi/win2xcur/package.nix | 8 ++++---- .../python-modules/adb-enhanced/default.nix | 6 +++--- .../python-modules/affine-gaps/default.nix | 8 ++++---- .../python-modules/aiocomelit/default.nix | 8 ++++---- .../python-modules/aioconsole/default.nix | 8 ++++---- .../python-modules/airpatrol/default.nix | 6 +++--- .../alibabacloud-credentials-api/default.nix | 6 +++--- .../python-modules/android-backup/default.nix | 6 +++--- .../development/python-modules/ariadne/default.nix | 8 ++++---- .../python-modules/astropy-iers-data/default.nix | 8 ++++---- .../python-modules/asyncpraw/default.nix | 6 +++--- .../python-modules/automower-ble/default.nix | 8 ++++---- pkgs/development/python-modules/avion/default.nix | 6 +++--- .../azure-mgmt-imagebuilder/default.nix | 8 ++++---- .../azure-mgmt-managedservices/default.nix | 8 ++++---- .../backports-shutil-which/default.nix | 6 +++--- pkgs/development/python-modules/baron/default.nix | 6 +++--- .../python-modules/beangulp/default.nix | 6 +++--- .../development/python-modules/betamax/default.nix | 8 ++++---- .../development/python-modules/bincopy/default.nix | 6 +++--- .../python-modules/bitbox02/default.nix | 8 ++++---- .../python-modules/bloodhound-py/default.nix | 6 +++--- pkgs/development/python-modules/boto3/default.nix | 8 ++++---- pkgs/development/python-modules/bottle/default.nix | 6 +++--- pkgs/development/python-modules/brunt/default.nix | 6 +++--- .../python-modules/cerberus/default.nix | 8 ++++---- .../development/python-modules/chalice/default.nix | 8 ++++---- .../python-modules/classify-imports/default.nix | 6 +++--- .../python-modules/click-command-tree/default.nix | 6 +++--- .../development/python-modules/cmigemo/default.nix | 6 +++--- .../colcon-coveragepy-result/default.nix | 6 +++--- .../python-modules/conway-polynomials/default.nix | 6 +++--- .../python-modules/copykitten/default.nix | 10 +++++----- .../python-modules/coverage/default.nix | 8 ++++---- .../development/python-modules/cronsim/default.nix | 6 +++--- pkgs/development/python-modules/cymem/default.nix | 8 ++++---- .../dash-core-components/default.nix | 6 +++--- .../python-modules/dbt-core/default.nix | 10 +++++----- .../dbt-semantic-interfaces/default.nix | 8 ++++---- .../python-modules/debianbts/default.nix | 8 ++++---- .../python-modules/dicomweb-client/default.nix | 8 ++++---- .../python-modules/dissect-evidence/default.nix | 8 ++++---- .../python-modules/dissect-volume/default.nix | 8 ++++---- .../python-modules/django-classy-tags/default.nix | 8 ++++---- .../django-elasticsearch-dsl/default.nix | 6 +++--- .../python-modules/dremel3dpy/default.nix | 6 +++--- .../python-modules/ec2-metadata/default.nix | 8 ++++---- pkgs/development/python-modules/ecpy/default.nix | 8 ++++---- .../python-modules/eiswarnung/default.nix | 10 +++++----- pkgs/development/python-modules/eliot/default.nix | 8 ++++---- pkgs/development/python-modules/etcd3/default.nix | 6 +++--- .../development/python-modules/faicons/default.nix | 8 ++++---- .../python-modules/falcon-cors/default.nix | 6 +++--- .../python-modules/fast-histogram/default.nix | 8 ++++---- .../python-modules/fast-simplification/default.nix | 8 ++++---- pkgs/development/python-modules/ffmpy/default.nix | 6 +++--- .../python-modules/flask-mail/default.nix | 8 ++++---- .../python-modules/flask-paginate/default.nix | 8 ++++---- .../python-modules/flatten-json/default.nix | 8 ++++---- .../python-modules/flit-scm/default.nix | 6 +++--- .../python-modules/fontawesomefree/default.nix | 6 +++--- pkgs/development/python-modules/ftfy/default.nix | 8 ++++---- pkgs/development/python-modules/g2pkk/default.nix | 6 +++--- .../python-modules/genzshcomp/default.nix | 6 +++--- .../development/python-modules/getjump/default.nix | 8 ++++---- .../google-cloud-bigquery-datatransfer/default.nix | 8 ++++---- .../google-cloud-websecurityscanner/default.nix | 8 ++++---- .../python-modules/google-nest-sdm/default.nix | 8 ++++---- .../python-modules/great-expectations/default.nix | 8 ++++---- pkgs/development/python-modules/halo/default.nix | 6 +++--- .../hatch-jupyter-builder/default.nix | 8 ++++---- pkgs/development/python-modules/homf/default.nix | 6 +++--- .../python-modules/hopcroftkarp/default.nix | 6 +++--- .../python-modules/hurry-filesize/default.nix | 6 +++--- .../python-modules/hyperion-py/default.nix | 8 ++++---- .../python-modules/igloohome-api/default.nix | 8 ++++---- .../intensity-normalization/default.nix | 8 ++++---- pkgs/development/python-modules/irc/default.nix | 8 ++++---- .../python-modules/jinja2-pluralize/default.nix | 6 +++--- .../python-modules/jsondiff/default.nix | 6 +++--- .../python-modules/jupysql-plugin/default.nix | 8 ++++---- .../python-modules/karton-classifier/default.nix | 8 ++++---- pkgs/development/python-modules/l18n/default.nix | 8 ++++---- .../python-modules/ld2410-ble/default.nix | 8 ++++---- .../python-modules/ledger-bitcoin/default.nix | 6 +++--- .../llama-index-readers-json/default.nix | 6 +++--- .../llm-fragments-symbex/default.nix | 8 ++++---- .../python-modules/llm-hacker-news/default.nix | 8 ++++---- .../llm-sentence-transformers/default.nix | 8 ++++---- .../python-modules/localimport/default.nix | 6 +++--- .../python-modules/lzallright/default.nix | 8 ++++---- .../python-modules/markdownify/default.nix | 8 ++++---- .../python-modules/mdit-py-plugins/default.nix | 8 ++++---- .../development/python-modules/meshcat/default.nix | 6 +++--- .../python-modules/metakernel/default.nix | 8 ++++---- .../python-modules/meteoalertapi/default.nix | 6 +++--- .../mkdocs-section-index/default.nix | 6 +++--- .../development/python-modules/monzopy/default.nix | 8 ++++---- pkgs/development/python-modules/msal/default.nix | 8 ++++---- .../python-modules/multidict/default.nix | 8 ++++---- .../python-modules/musicbrainzngs/default.nix | 6 +++--- .../python-modules/mwparserfromhell/default.nix | 8 ++++---- pkgs/development/python-modules/myjwt/default.nix | 8 ++++---- pkgs/development/python-modules/namex/default.nix | 6 +++--- .../python-modules/netbox-attachments/default.nix | 8 ++++---- .../python-modules/netbox-contract/default.nix | 8 ++++---- .../netbox-napalm-plugin/default.nix | 8 ++++---- .../python-modules/nocasedict/default.nix | 8 ++++---- .../development/python-modules/olefile/default.nix | 6 +++--- pkgs/development/python-modules/omemo/default.nix | 8 ++++---- .../development/python-modules/opendal/default.nix | 8 ++++---- .../python-modules/pdbfixer/default.nix | 8 ++++---- .../python-modules/pdm-pep517/default.nix | 6 +++--- .../pdoc-pyo3-sample-library/default.nix | 8 ++++---- pkgs/development/python-modules/pebble/default.nix | 8 ++++---- .../python-modules/pencompy/default.nix | 6 +++--- pkgs/development/python-modules/pexif/default.nix | 6 +++--- .../python-modules/pillow-jpls/default.nix | 10 +++++----- pkgs/development/python-modules/plac/default.nix | 6 +++--- .../python-modules/plugnplay/default.nix | 6 +++--- .../python-modules/plugp100/default.nix | 6 +++--- .../development/python-modules/plyfile/default.nix | 7 +++---- .../development/python-modules/portend/default.nix | 6 +++--- pkgs/development/python-modules/poyo/default.nix | 6 +++--- .../python-modules/prawcore/default.nix | 8 ++++---- .../python-modules/progressbar/default.nix | 6 +++--- .../python-modules/prometheus-pandas/default.nix | 6 +++--- pkgs/development/python-modules/pvlib/default.nix | 8 ++++---- pkgs/development/python-modules/py-evm/default.nix | 6 +++--- .../python-modules/py-multihash/default.nix | 6 +++--- .../python-modules/py-pdf-parser/default.nix | 8 ++++---- .../python-modules/py-vapid/default.nix | 6 +++--- pkgs/development/python-modules/py3dns/default.nix | 6 +++--- .../python-modules/pyairports/default.nix | 6 +++--- .../python-modules/pybindgen/default.nix | 6 +++--- pkgs/development/python-modules/pyct/default.nix | 8 ++++---- .../python-modules/pyfibaro/default.nix | 8 ++++---- .../python-modules/pyformlang/default.nix | 6 +++--- .../python-modules/pyglossary/default.nix | 6 +++--- .../python-modules/pygtkspellcheck/default.nix | 6 +++--- pkgs/development/python-modules/pyhibp/default.nix | 6 +++--- .../python-modules/pylibconfig2/default.nix | 6 +++--- .../python-modules/pylibrespot-java/default.nix | 8 ++++---- .../python-modules/pylint-venv/default.nix | 8 ++++---- .../python-modules/pylsp-mypy/default.nix | 8 ++++---- .../python-modules/pylyrics/default.nix | 6 +++--- pkgs/development/python-modules/pylzma/default.nix | 6 +++--- .../python-modules/pymetasploit3/default.nix | 6 +++--- .../python-modules/pymorphy2-dicts-ru/default.nix | 6 +++--- pkgs/development/python-modules/pyoprf/default.nix | 6 +++--- pkgs/development/python-modules/pyotp/default.nix | 8 ++++---- pkgs/development/python-modules/pypass/default.nix | 6 +++--- .../python-modules/pyqwikswitch/default.nix | 6 +++--- .../python-modules/pyrainbird/default.nix | 8 ++++---- .../python-modules/pyregion/default.nix | 8 ++++---- .../python-modules/pysensibo/default.nix | 8 ++++---- .../python-modules/pysmarlaapi/default.nix | 8 ++++---- .../python-modules/pysnooper/default.nix | 6 +++--- .../python-modules/pytautulli/default.nix | 10 +++++----- .../python-modules/pytest-base-url/default.nix | 8 ++++---- .../python-modules/pytest-django/default.nix | 8 ++++---- .../python-modules/pytest-expect/default.nix | 6 +++--- .../python-modules/pytest-flakes/default.nix | 6 +++--- .../python-modules/pytest-localserver/default.nix | 8 ++++---- .../python-modules/pytest-metadata/default.nix | 6 +++--- .../python-modules/pytest-raises/default.nix | 6 +++--- .../python-modules/python-docs-theme/default.nix | 8 ++++---- .../python-modules/python3-saml/default.nix | 8 ++++---- .../python-modules/pyupgrade/default.nix | 6 +++--- pkgs/development/python-modules/pyvex/default.nix | 6 +++--- .../python-modules/pyviz-comms/default.nix | 6 +++--- .../development/python-modules/pyws66i/default.nix | 6 +++--- .../python-modules/pyyaml-env-tag/default.nix | 6 +++--- .../python-modules/qrcodegen/default.nix | 6 +++--- pkgs/development/python-modules/quandl/default.nix | 6 +++--- .../python-modules/randomfiletree/default.nix | 6 +++--- .../python-modules/readchar/default.nix | 12 ++++++------ .../python-modules/reedsolo/default.nix | 6 +++--- .../python-modules/reflex-chakra/default.nix | 8 ++++---- .../python-modules/remotezip/default.nix | 6 +++--- .../repl-python-wakatime/default.nix | 8 ++++---- .../robotframework-seleniumlibrary/default.nix | 8 ++++---- .../python-modules/ropgadget/default.nix | 6 +++--- pkgs/development/python-modules/rtfde/default.nix | 8 ++++---- .../python-modules/sense-energy/default.nix | 10 +++++----- .../python-modules/serverfiles/default.nix | 6 +++--- .../python-modules/service-identity/default.nix | 8 ++++---- .../development/python-modules/signify/default.nix | 8 ++++---- .../development/python-modules/slovnet/default.nix | 6 +++--- .../python-modules/snowballstemmer/default.nix | 6 +++--- .../python-modules/snowplow-tracker/default.nix | 8 ++++---- .../python-modules/solo-python/default.nix | 6 +++--- .../spacy-curated-transformers/default.nix | 8 ++++---- .../python-modules/sphinx-inline-tabs/default.nix | 6 +++--- .../sphinx-jupyterbook-latex/default.nix | 8 ++++---- .../sphinxcontrib-jsmath/default.nix | 6 +++--- .../sphinxcontrib-log-cabinet/default.nix | 6 +++--- .../development/python-modules/spython/default.nix | 8 ++++---- .../python-modules/sre-yield/default.nix | 6 +++--- .../python-modules/srptools/default.nix | 8 ++++---- .../python-modules/svgelements/default.nix | 6 +++--- .../python-modules/svgwrite/default.nix | 6 +++--- .../python-modules/systemrdl-compiler/default.nix | 6 +++--- .../python-modules/tcxreader/default.nix | 8 ++++---- .../python-modules/teamcity-messages/default.nix | 8 ++++---- .../python-modules/tellcore-net/default.nix | 8 ++++---- .../development/python-modules/texsoup/default.nix | 6 +++--- .../development/python-modules/textile/default.nix | 8 ++++---- .../python-modules/textual-textarea/default.nix | 8 ++++---- .../python-modules/toptica-lasersdk/default.nix | 6 +++--- .../torch-audiomentations/default.nix | 8 ++++---- .../python-modules/translatepy/default.nix | 6 +++--- .../python-modules/translation-finder/default.nix | 8 ++++---- .../python-modules/tree-sitter-python/default.nix | 6 +++--- pkgs/development/python-modules/treq/default.nix | 6 +++--- .../development/python-modules/trimesh/default.nix | 8 ++++---- pkgs/development/python-modules/tubeup/default.nix | 8 ++++---- pkgs/development/python-modules/twill/default.nix | 8 ++++---- .../python-modules/types-pyyaml/default.nix | 6 +++--- .../python-modules/types-six/default.nix | 6 +++--- pkgs/development/python-modules/unidns/default.nix | 8 ++++---- .../python-modules/venstarcolortouch/default.nix | 6 +++--- .../development/python-modules/videocr/default.nix | 6 +++--- .../python-modules/viv-utils/default.nix | 8 ++++---- .../development/python-modules/warlock/default.nix | 6 +++--- .../python-modules/widlparser/default.nix | 6 +++--- pkgs/development/python-modules/wrapio/default.nix | 8 ++++---- .../python-modules/xarray-dataclass/default.nix | 8 ++++---- pkgs/development/python-modules/xattr/default.nix | 8 ++++---- .../python-modules/xstatic-jquery/default.nix | 6 +++--- pkgs/development/python-modules/yapsy/default.nix | 6 +++--- pkgs/development/python-modules/zfec/default.nix | 6 +++--- pkgs/development/python-modules/zict/default.nix | 6 +++--- .../rocm-modules/rocm-docs-core/default.nix | 6 +++--- pkgs/development/tools/prospector/setoptconf.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 8 ++++---- pkgs/servers/home-assistant/intents.nix | 8 ++++---- .../python-modules/hass-web-proxy-lib/default.nix | 6 +++--- pkgs/servers/mail/mailman/hyperkitty.nix | 6 +++--- pkgs/servers/mail/mailman/mailman-hyperkitty.nix | 6 +++--- pkgs/servers/mail/mailman/package.nix | 6 +++--- pkgs/servers/mail/mailman/postorius.nix | 6 +++--- pkgs/servers/mail/mailman/web.nix | 6 +++--- 259 files changed, 920 insertions(+), 917 deletions(-) diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix index f99b89479d1d..63ec3c32c50c 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -15,12 +15,12 @@ pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openpaperwork-core"; inherit (callPackage ./src.nix { }) version src; pyproject = true; - sourceRoot = "${src.name}/openpaperwork-core"; + sourceRoot = "${finalAttrs.src.name}/openpaperwork-core"; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; @@ -61,4 +61,4 @@ buildPythonPackage rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index 1a0066f79883..160a8dc64919 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -15,12 +15,12 @@ pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openpaperwork-gtk"; inherit (callPackage ./src.nix { }) version src; pyproject = true; - sourceRoot = "${src.name}/openpaperwork-gtk"; + sourceRoot = "${finalAttrs.src.name}/openpaperwork-gtk"; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; @@ -61,4 +61,4 @@ buildPythonPackage rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index 50d610c061a9..1a841285f03d 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -26,12 +26,12 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "paperwork-backend"; inherit (callPackage ./src.nix { }) version src; pyproject = true; - sourceRoot = "${src.name}/paperwork-backend"; + sourceRoot = "${finalAttrs.src.name}/paperwork-backend"; patches = [ # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 @@ -93,4 +93,4 @@ buildPythonPackage rec { symphorien ]; }; -} +}) diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index da03891abc0a..0d3658c32e91 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -19,12 +19,12 @@ pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "paperwork-shell"; inherit (callPackage ./src.nix { }) version src; pyproject = true; - sourceRoot = "${src.name}/paperwork-shell"; + sourceRoot = "${finalAttrs.src.name}/paperwork-shell"; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; @@ -71,4 +71,4 @@ buildPythonPackage rec { symphorien ]; }; -} +}) diff --git a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix index 9e0fbaef56ff..13093dded9ac 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix @@ -9,7 +9,7 @@ makeWrapper, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hyprshade"; version = "4.0.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "loqusion"; repo = "hyprshade"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zK8i2TePJ4cEtGXe/dssHWg+ioCTo1NyqzInQhMaB8w="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ willswats ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix index 9a3ef4a66d6c..d372bb21c9b1 100644 --- a/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -5,13 +5,13 @@ i3ipc, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "i3-balance-workspace"; version = "1.8.6"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ euxane ]; mainProgram = "i3_balance_workspace"; }; -} +}) diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix index a513aa1b5186..67073d2c1d3e 100644 --- a/pkgs/by-name/bo/boxflat/package.nix +++ b/pkgs/by-name/bo/boxflat/package.nix @@ -12,7 +12,7 @@ udevCheckHook, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "boxflat"; version = "1.35.5"; pyproject = true; @@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "Lawstorant"; repo = "boxflat"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-R03mQIsa6T1ApV8SMWvilBfiCGcAWvyZ5hDDgAuGd6s="; }; @@ -66,7 +66,7 @@ python3Packages.buildPythonPackage rec { setup( name='boxflat', packages=['boxflat', 'boxflat.panels', 'boxflat.widgets'], - version='${version}', + version='${finalAttrs.version}', install_requires=install_requires, entry_points={ 'console_scripts': ['boxflat=boxflat.entrypoint:main'] @@ -117,11 +117,11 @@ python3Packages.buildPythonPackage rec { meta = { homepage = "https://github.com/Lawstorant/boxflat"; - changelog = "https://github.com/Lawstorant/boxflat/releases/tag/v${version}"; + changelog = "https://github.com/Lawstorant/boxflat/releases/tag/v${finalAttrs.version}"; description = "Control your Moza gear settings"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ racci ]; platforms = lib.platforms.linux; mainProgram = "boxflat"; }; -} +}) diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index 76c1cd08c2bd..444d9205f16c 100644 --- a/pkgs/by-name/es/esphome/dashboard.nix +++ b/pkgs/by-name/es/esphome/dashboard.nix @@ -11,7 +11,7 @@ }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "esphome-dashboard"; version = "20260210.0"; pyproject = true; @@ -19,12 +19,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "esphome"; repo = "dashboard"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Edd2ZOSBAZSrGVjbncyPhhjFjE0CxBHz16ZHXyzx9LI="; }; npmDeps = fetchNpmDeps { - inherit src; + inherit (finalAttrs) src; hash = "sha256-L6tKhijTFAvQwhBBl5Wk6xzI2dtDI6IYfCkiKX75Pvc="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ hexa ]; }; -} +}) diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix index 0590a268825e..55b5674e1f18 100644 --- a/pkgs/by-name/ir/irrd/package.nix +++ b/pkgs/by-name/ir/irrd/package.nix @@ -50,11 +50,15 @@ let # ariadne 0.29+ is missing 'convert_kwargs_to_snake_case' ariadne = prev.ariadne.overridePythonAttrs (oldAttrs: rec { version = "0.28.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-gW66L7djPo4nHjd/UN18IPYFo956wzSqM+p1AZF/qnw="; - }; + src = + fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-gW66L7djPo4nHjd/UN18IPYFo956wzSqM+p1AZF/qnw="; + } + // { + tag = version; + }; patches = [ ]; doCheck = false; }); diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix index d0e1424b0054..7003d6a590ce 100644 --- a/pkgs/by-name/ki/kikit/solidpython/default.nix +++ b/pkgs/by-name/ki/kikit/solidpython/default.nix @@ -10,7 +10,7 @@ setuptools, euclid3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "solidpython"; version = "1.1.3"; pyproject = true; @@ -54,8 +54,8 @@ buildPythonPackage rec { meta = { description = "Python interface to the OpenSCAD declarative geometry language"; homepage = "https://github.com/SolidCode/SolidPython"; - changelog = "https://github.com/SolidCode/SolidPython/releases/tag/v${version}"; + changelog = "https://github.com/SolidCode/SolidPython/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ jfly ]; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/pkgs/by-name/kr/krr/package.nix b/pkgs/by-name/kr/krr/package.nix index 9afb59ae6f24..22df57c2f39c 100644 --- a/pkgs/by-name/kr/krr/package.nix +++ b/pkgs/by-name/kr/krr/package.nix @@ -6,7 +6,7 @@ krr, }: -python3.pkgs.buildPythonPackage rec { +python3.pkgs.buildPythonPackage (finalAttrs: { pname = "krr"; version = "1.7.1"; pyproject = true; @@ -14,16 +14,16 @@ python3.pkgs.buildPythonPackage rec { src = fetchFromGitHub { owner = "robusta-dev"; repo = "krr"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Bc1Ql3z/UmOXE2RJYC5/sE4a3MFdE06I3HwKY+SdSlk="; }; postPatch = '' substituteInPlace robusta_krr/__init__.py \ - --replace-warn '1.7.0-dev' '${version}' + --replace-warn '1.7.0-dev' '${finalAttrs.version}' substituteInPlace pyproject.toml \ - --replace-warn '1.7.0-dev' '${version}' \ + --replace-warn '1.7.0-dev' '${finalAttrs.version}' \ --replace-fail 'aiostream = "^0.4.5"' 'aiostream = "*"' \ --replace-fail 'kubernetes = "^26.1.0"' 'kubernetes = "*"' \ --replace-fail 'pydantic = "1.10.7"' 'pydantic = "*"' \ @@ -65,9 +65,9 @@ python3.pkgs.buildPythonPackage rec { reduces costs and improves performance. ''; homepage = "https://github.com/robusta-dev/krr"; - changelog = "https://github.com/robusta-dev/krr/releases/tag/v${src.rev}"; + changelog = "https://github.com/robusta-dev/krr/releases/tag/v${finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "krr"; }; -} +}) diff --git a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix index 31b115ed6122..25c30c9c49e1 100644 --- a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix +++ b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix @@ -12,14 +12,14 @@ pytestCheckHook, versionCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kubernetes-validate"; version = "1.35.0"; pyproject = true; src = fetchPypi { pname = "kubernetes_validate"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-UKnkbaLARxwoK7MTjH14XSkjH28be8LmimEatBsigyY="; }; @@ -45,9 +45,9 @@ buildPythonPackage rec { meta = { description = "Module to validate Kubernetes resource definitions against the declared Kubernetes schemas"; homepage = "https://github.com/willthames/kubernetes-validate"; - changelog = "https://github.com/willthames/kubernetes-validate/releases/tag/v${version}"; + changelog = "https://github.com/willthames/kubernetes-validate/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ lykos153 ]; mainProgram = "kubernetes-validate"; }; -} +}) diff --git a/pkgs/by-name/or/or-tools/pybind11-2.13.6.nix b/pkgs/by-name/or/or-tools/pybind11-2.13.6.nix index 0ba3cd381c66..37983b5164b3 100644 --- a/pkgs/by-name/or/or-tools/pybind11-2.13.6.nix +++ b/pkgs/by-name/or/or-tools/pybind11-2.13.6.nix @@ -28,7 +28,7 @@ let }; } ./pybind11-setup-hook.sh; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybind11"; version = "2.13.6"; pyproject = true; @@ -36,7 +36,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pybind"; repo = "pybind11"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SNLdtrOjaC3lGHN9MAqTf51U9EzNKQLyTMNPe0GcdrU="; }; @@ -111,7 +111,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/pybind/pybind11"; - changelog = "https://github.com/pybind/pybind11/blob/${src.rev}/docs/changelog.rst"; + changelog = "https://github.com/pybind/pybind11/blob/${finalAttrs.src.rev}/docs/changelog.rst"; description = "Seamless operability between C++11 and Python"; mainProgram = "pybind11-config"; longDescription = '' @@ -125,4 +125,4 @@ buildPythonPackage rec { dotlambda ]; }; -} +}) diff --git a/pkgs/by-name/pr/pretalx/plugins/llm.nix b/pkgs/by-name/pr/pretalx/plugins/llm.nix index 6720d177821f..0f298709e042 100644 --- a/pkgs/by-name/pr/pretalx/plugins/llm.nix +++ b/pkgs/by-name/pr/pretalx/plugins/llm.nix @@ -10,7 +10,7 @@ umap-learn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pretalx-llm"; version = "0.5.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "why2025-datenzone"; repo = "pretalx-llm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-KnL4X24RESAgO0Oh1k9c+K4zaho6CEFHMQvDeRdLBzs="; }; @@ -43,8 +43,8 @@ buildPythonPackage rec { meta = { description = "LLM support for Pretalx"; homepage = "https://github.com/why2025-datenzone/pretalx-llm"; - changelog = "https://github.com/why2025-datenzone/pretalx-llm/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/why2025-datenzone/pretalx-llm/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hexa ]; }; -} +}) diff --git a/pkgs/by-name/pr/pretalx/plugins/zammad.nix b/pkgs/by-name/pr/pretalx/plugins/zammad.nix index 72f7ff9e6c4c..22e7fa94e9a2 100644 --- a/pkgs/by-name/pr/pretalx/plugins/zammad.nix +++ b/pkgs/by-name/pr/pretalx/plugins/zammad.nix @@ -6,7 +6,7 @@ zammad-py, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pretalx-zammad"; version = "2025.0.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "badbadc0ffee"; repo = "pretalx-zammad"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YIKZO04vaKPGhUrTFiE4F+KjuBrYm0KsxUua5+Hm7gg="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hexa ]; }; -} +}) diff --git a/pkgs/by-name/s-/s-tui/package.nix b/pkgs/by-name/s-/s-tui/package.nix index edec1af068c6..ce24b0863ecb 100644 --- a/pkgs/by-name/s-/s-tui/package.nix +++ b/pkgs/by-name/s-/s-tui/package.nix @@ -9,7 +9,7 @@ stress, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "s-tui"; version = "1.3.0"; format = "setuptools"; @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "amanusk"; repo = "s-tui"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-B5KQz+/RG+IROJah0jq+2e94DtnILwY2aH9qulWzHns="; }; @@ -40,4 +40,4 @@ python3Packages.buildPythonPackage rec { broken = stdenv.hostPlatform.isDarwin; # https://github.com/amanusk/s-tui/issues/49 mainProgram = "s-tui"; }; -} +}) diff --git a/pkgs/by-name/wi/win2xcur/package.nix b/pkgs/by-name/wi/win2xcur/package.nix index 17cc259a6cc9..1a547d9d3609 100644 --- a/pkgs/by-name/wi/win2xcur/package.nix +++ b/pkgs/by-name/wi/win2xcur/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "win2xcur"; version = "0.2.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "quantum5"; repo = "win2xcur"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-uG9yrH1BvdGyFosGBXLNB7lr0w7r89MWhW4gCVS+s1w="; }; @@ -31,8 +31,8 @@ python3Packages.buildPythonPackage rec { meta = { description = "Tools that convert cursors between the Windows (*.cur, *.ani) and Xcursor format"; homepage = "https://github.com/quantum5/win2xcur"; - changelog = "https://github.com/quantum5/win2xcur/releases/tag/v${version}"; + changelog = "https://github.com/quantum5/win2xcur/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ teatwig ]; }; -} +}) diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index f308b2eecee0..0b732f51a227 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -8,7 +8,7 @@ psutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "adb-enhanced"; version = "2.8.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ashishb"; repo = "adb-enhanced"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YuQgz3WeN50hg/IgdoNV61St9gpu6lcgFfKCfI/ENl0="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ vtuan10 ]; mainProgram = "adbe"; }; -} +}) diff --git a/pkgs/development/python-modules/affine-gaps/default.nix b/pkgs/development/python-modules/affine-gaps/default.nix index a71d94b2ac93..055eda7c9d4e 100644 --- a/pkgs/development/python-modules/affine-gaps/default.nix +++ b/pkgs/development/python-modules/affine-gaps/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "affine-gaps"; version = "0.2.4"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gata-bio"; repo = "affine-gaps"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WMH2wUqzA196FSe2TpfslQVW0PGwk7lGMRSKyfCG9rg="; }; @@ -40,10 +40,10 @@ buildPythonPackage rec { enabledTestPaths = [ "test.py" ]; meta = { - changelog = "https://github.com/gata-bio/affine-gaps/releases/tag/${src.tag}"; + changelog = "https://github.com/gata-bio/affine-gaps/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/gata-bio/affine-gaps"; license = lib.licenses.asl20; mainProgram = "affine-gaps"; maintainers = [ lib.maintainers.dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index 15c6e1334c79..cd4edf3efc26 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -11,7 +11,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiocomelit"; version = "2.0.2"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chemelli74"; repo = "aiocomelit"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-k/p6z+flMvmuwwHqPH9Aw/ai761kbT+HQUXVNKeqk0U="; }; @@ -43,8 +43,8 @@ buildPythonPackage rec { meta = { description = "Library to control Comelit Simplehome"; homepage = "https://github.com/chemelli74/aiocomelit"; - changelog = "https://github.com/chemelli74/aiocomelit/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/chemelli74/aiocomelit/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index ad2d5cf3fd52..feb54863d310 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -17,7 +17,7 @@ # However, apython will work fine when using python##.withPackages, # because with python##.withPackages the sys.executable is already # wrapped to be able to find aioconsole and any other packages. -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioconsole"; version = "0.8.2"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vxgmichel"; repo = "aioconsole"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-j4nzt8mvn+AYObh1lvgxS8wWK662KN+OxjJ2b5ZNAcQ="; }; @@ -59,9 +59,9 @@ buildPythonPackage rec { meta = { description = "Asynchronous console and interfaces for asyncio"; - changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${version}"; + changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${finalAttrs.version}"; homepage = "https://github.com/vxgmichel/aioconsole"; license = lib.licenses.gpl3Only; mainProgram = "apython"; }; -} +}) diff --git a/pkgs/development/python-modules/airpatrol/default.nix b/pkgs/development/python-modules/airpatrol/default.nix index f6531bd0d668..9ac2a861c7f0 100644 --- a/pkgs/development/python-modules/airpatrol/default.nix +++ b/pkgs/development/python-modules/airpatrol/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "airpatrol"; version = "0.1.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "antondalgren"; repo = "airpatrol"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KPch1GsJ5my43d9SVpwGA2EmrkmeBGJWAkY51rDofTk="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ jamiemagee ]; }; -} +}) diff --git a/pkgs/development/python-modules/alibabacloud-credentials-api/default.nix b/pkgs/development/python-modules/alibabacloud-credentials-api/default.nix index 6fd939e4592e..dfd6acf241bc 100644 --- a/pkgs/development/python-modules/alibabacloud-credentials-api/default.nix +++ b/pkgs/development/python-modules/alibabacloud-credentials-api/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "alibabacloud-credentials-api"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jDQAONkE8CGNchSo9AiMMZEr/PJ5ryy8fZvkiXqX3S8="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/android-backup/default.nix b/pkgs/development/python-modules/android-backup/default.nix index 5c4d7cf4dc20..26085e21267d 100644 --- a/pkgs/development/python-modules/android-backup/default.nix +++ b/pkgs/development/python-modules/android-backup/default.nix @@ -6,7 +6,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "android-backup"; version = "0.2.0"; format = "setuptools"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bluec0re"; repo = "android-backup-tools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0c436hv64ddqrjs77pa7z6spiv49pjflbmgg31p38haj5mzlrqvw"; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix index db3f0d00c2b4..acec77ed30a0 100644 --- a/pkgs/development/python-modules/ariadne/default.nix +++ b/pkgs/development/python-modules/ariadne/default.nix @@ -16,7 +16,7 @@ werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ariadne"; version = "0.29.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mirumee"; repo = "ariadne"; - tag = version; + tag = finalAttrs.version; hash = "sha256-u6iKgugj30OxIEQ3P0+e05IC/Mh0hvKfTohTc/7pkUk="; }; @@ -81,8 +81,8 @@ buildPythonPackage rec { meta = { description = "Python library for implementing GraphQL servers using schema-first approach"; homepage = "https://ariadnegraphql.org"; - changelog = "https://github.com/mirumee/ariadne/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/mirumee/ariadne/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ samuela ]; }; -} +}) diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix index dadecba12852..59397e348885 100644 --- a/pkgs/development/python-modules/astropy-iers-data/default.nix +++ b/pkgs/development/python-modules/astropy-iers-data/default.nix @@ -6,7 +6,7 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "astropy-iers-data"; version = "0.2026.1.19.0.42.31"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astropy"; repo = "astropy-iers-data"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-psxVL7375xQuo6mqh+5rvv0xEuZNUOtFco1BrPPWLtg="; }; @@ -29,10 +29,10 @@ buildPythonPackage rec { doCheck = false; meta = { - changelog = "https://github.com/astropy/astropy-iers-data/releases/tag/${src.tag}"; + changelog = "https://github.com/astropy/astropy-iers-data/releases/tag/${finalAttrs.src.tag}"; description = "IERS data maintained by @astrofrog and astropy.utils.iers maintainers"; homepage = "https://github.com/astropy/astropy-iers-data"; license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/asyncpraw/default.nix b/pkgs/development/python-modules/asyncpraw/default.nix index 299b4a384752..c707deb59829 100644 --- a/pkgs/development/python-modules/asyncpraw/default.nix +++ b/pkgs/development/python-modules/asyncpraw/default.nix @@ -15,7 +15,7 @@ vcrpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncpraw"; version = "7.8.1-unstable-2025-10-08"; pyproject = true; @@ -65,8 +65,8 @@ buildPythonPackage rec { meta = { description = "Asynchronous Python Reddit API Wrapper"; homepage = "https://asyncpraw.readthedocs.io/"; - changelog = "https://github.com/praw-dev/asyncpraw/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/praw-dev/asyncpraw/blob/${finalAttrs.src.rev}/CHANGES.rst"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.amadejkastelic ]; }; -} +}) diff --git a/pkgs/development/python-modules/automower-ble/default.nix b/pkgs/development/python-modules/automower-ble/default.nix index 311a26f8961a..555f64574762 100644 --- a/pkgs/development/python-modules/automower-ble/default.nix +++ b/pkgs/development/python-modules/automower-ble/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "automower-ble"; version = "0.2.8"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alistair23"; repo = "AutoMower-BLE"; - tag = version; + tag = finalAttrs.version; hash = "sha256-GawjNtk2mEBo9Xe1k1z0tk1RWU0N0JddeC6NZbnLpxc="; }; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Module to connect to Husqvarna Automower Connect"; homepage = "https://github.com/alistair23/AutoMower-BLE"; - changelog = "https://github.com/alistair23/AutoMower-BLE/releases/tag/${src.tag}"; + changelog = "https://github.com/alistair23/AutoMower-BLE/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/avion/default.nix b/pkgs/development/python-modules/avion/default.nix index d536982bd31a..13a670f3d05f 100644 --- a/pkgs/development/python-modules/avion/default.nix +++ b/pkgs/development/python-modules/avion/default.nix @@ -8,13 +8,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "avion"; version = "0.10"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-v/0NwFmxDZ9kEOx5qs5L9sKzOg/kto79syctg0Ah+30="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { license = with lib.licenses; [ gpl3Plus ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index dc7cea2fa282..c36439c3158f 100644 --- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-imagebuilder"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5sLVc6vvJiIvwUSRgD1MsB+G/GEpLUz3xHKetLrkiRw="; }; @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Microsoft Azure Image Builder Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/compute/azure-mgmt-imagebuilder"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-imagebuilder_${version}/sdk/compute/azure-mgmt-imagebuilder/CHANGELOG.md"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-imagebuilder_${finalAttrs.version}/sdk/compute/azure-mgmt-imagebuilder/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix index 4935a2635093..bae0f0078905 100644 --- a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-managedservices"; version = "6.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7AyzhYvPjt9e7g7d7oFWBCTrhDUuDfCC3clOuZut/V4="; extension = "zip"; }; @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Microsoft Azure Managed Services Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/managedservices/azure-mgmt-managedservices"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-managedservices_${version}/sdk/managedservices/azure-mgmt-managedservices/CHANGELOG.md"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-managedservices_${finalAttrs.version}/sdk/managedservices/azure-mgmt-managedservices/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix index d7acb0c644b8..19427375b4c5 100644 --- a/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "backports-shutil-which"; version = "3.5.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "minrk"; repo = "backports.shutil_which"; - tag = version; + tag = finalAttrs.version; hash = "sha256-smvBySS8Ek24y8X9DUGxF4AfJL2ZQ12xeDhEBsZRiP0="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/baron/default.nix b/pkgs/development/python-modules/baron/default.nix index 3cee7e9a6222..64f7af77b4a0 100644 --- a/pkgs/development/python-modules/baron/default.nix +++ b/pkgs/development/python-modules/baron/default.nix @@ -7,13 +7,13 @@ isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "baron"; version = "0.10.1"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "af822ad44d4eb425c8516df4239ac4fdba9fdb398ef77e4924cd7c9b4045bc2f"; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ marius851000 ]; }; -} +}) diff --git a/pkgs/development/python-modules/beangulp/default.nix b/pkgs/development/python-modules/beangulp/default.nix index d051c0bc622b..647f5cb7fb2d 100644 --- a/pkgs/development/python-modules/beangulp/default.nix +++ b/pkgs/development/python-modules/beangulp/default.nix @@ -14,7 +14,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beangulp"; version = "0.2.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "beancount"; repo = "beangulp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-h7xLHwEyS+tOI7v6Erp12VfVnxOf4930++zghhC3in4="; }; @@ -63,4 +63,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ alapshin ]; }; -} +}) diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index bc5c174d5743..32ffcea671dc 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "betamax"; version = "0.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gjFuFnm8aHnjyDMY0Ba1S3ySJf8IxEYt5IE+IgONX5Q="; }; @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { description = "VCR imitation for requests"; homepage = "https://betamax.readthedocs.org/"; - changelog = "https://github.com/betamaxpy/betamax/blob/${version}/HISTORY.rst"; + changelog = "https://github.com/betamaxpy/betamax/blob/${finalAttrs.version}/HISTORY.rst"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix index b73c88694a1c..29c1ff813dd7 100644 --- a/pkgs/development/python-modules/bincopy/default.nix +++ b/pkgs/development/python-modules/bincopy/default.nix @@ -7,13 +7,13 @@ pyelftools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bincopy"; version = "20.1.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2KToy4Ltr7vjZ0FTN9GSbH2MRVYX5DvUsUVlN3K5uWU="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { sbruder ]; }; -} +}) diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index 87963170fd9d..5e66da675895 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -12,13 +12,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bitbox02"; version = "7.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-J9UQXrFaVTcZ+p0+aJIchksAyGGzpkQETZrGhCbxhEc="; }; @@ -42,8 +42,8 @@ buildPythonPackage rec { meta = { description = "Firmware code of the BitBox02 hardware wallet"; homepage = "https://github.com/digitalbitbox/bitbox02-firmware/"; - changelog = "https://github.com/digitalbitbox/bitbox02-firmware/blob/py-bitbox02-${version}/CHANGELOG.md"; + changelog = "https://github.com/digitalbitbox/bitbox02-firmware/blob/py-bitbox02-${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/bloodhound-py/default.nix b/pkgs/development/python-modules/bloodhound-py/default.nix index a7f71a1c241b..0c8229063462 100644 --- a/pkgs/development/python-modules/bloodhound-py/default.nix +++ b/pkgs/development/python-modules/bloodhound-py/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bloodhound-py"; version = "1.9.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "bloodhound"; hash = "sha256-n1+0jv73lrn2FMNhDVUPDJxgUATa2oRO4S5P7/xQyFw="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ exploitoverload ]; }; -} +}) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 72c2266f8927..5bd1742aafb9 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -16,7 +16,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "boto3"; inherit (botocore) version; # N.B: botocore, boto3, awscli needs to be updated in lockstep, bump botocore version for updating these. pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "boto"; repo = "boto3"; - tag = version; + tag = finalAttrs.version; hash = "sha256-fzwVxbn4+5zkcAKQ9+bEbNSdwcPKZqsNIJZPqhV+n8w="; }; @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = { description = "AWS SDK for Python"; homepage = "https://github.com/boto/boto3"; - changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/boto/boto3/blob/${finalAttrs.version}/CHANGELOG.rst"; license = lib.licenses.asl20; longDescription = '' Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for @@ -66,4 +66,4 @@ buildPythonPackage rec { ''; maintainers = with lib.maintainers; [ anthonyroussel ]; }; -} +}) diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 8c7d962139f1..b43a78367db1 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -7,13 +7,13 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bottle"; version = "0.13.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eH54Mn4SsieTjeAiSDM9eIz+RZh+3Kc1+PiOA0csP0c="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ koral ]; }; -} +}) diff --git a/pkgs/development/python-modules/brunt/default.nix b/pkgs/development/python-modules/brunt/default.nix index e6b6a7dca80b..48dd241752dd 100644 --- a/pkgs/development/python-modules/brunt/default.nix +++ b/pkgs/development/python-modules/brunt/default.nix @@ -8,14 +8,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "brunt"; version = "1.2.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "e704627dc7b9c0a50c67ae90f1d320b14f99f2b2fc9bf1ef0461b141dcf1bce9"; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 7d15df6883ca..1d91882337dc 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cerberus"; version = "1.3.8"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyeve"; repo = "cerberus"; - tag = version; + tag = finalAttrs.version; hash = "sha256-C7YZjqQtdkakqHXBU3cFUl/gCFvCl3saP14eqt2fdAM="; }; @@ -36,8 +36,8 @@ buildPythonPackage rec { meta = { description = "Schema and data validation tool for Python dictionaries"; homepage = "http://python-cerberus.org/"; - changelog = "https://github.com/pyeve/cerberus/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/pyeve/cerberus/blob/${finalAttrs.version}/CHANGES.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index a0b91b8a7ec7..9ff94a41d8ef 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -23,7 +23,7 @@ websocket-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "chalice"; version = "1.32.0"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; repo = "chalice"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7qmE78aFfq9XCl2zcx1dAVKZZb96Bu47tSW1Qp2vFl4="; }; @@ -94,8 +94,8 @@ buildPythonPackage rec { description = "Python Serverless Microframework for AWS"; mainProgram = "chalice"; homepage = "https://github.com/aws/chalice"; - changelog = "https://github.com/aws/chalice/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/aws/chalice/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/classify-imports/default.nix b/pkgs/development/python-modules/classify-imports/default.nix index 0ffb5a7a0cf4..daac93e4e8f1 100644 --- a/pkgs/development/python-modules/classify-imports/default.nix +++ b/pkgs/development/python-modules/classify-imports/default.nix @@ -5,7 +5,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "classify-imports"; version = "4.2.0"; format = "setuptools"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asottile"; repo = "classify-imports"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-f5wZfisKz9WGdq6u0rd/zg2CfMwWvQeR8xZQNbD7KfU="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ gador ]; }; -} +}) diff --git a/pkgs/development/python-modules/click-command-tree/default.nix b/pkgs/development/python-modules/click-command-tree/default.nix index b83dcda4f04f..5d7b2cf3da4c 100644 --- a/pkgs/development/python-modules/click-command-tree/default.nix +++ b/pkgs/development/python-modules/click-command-tree/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-command-tree"; version = "1.2.0"; format = "setuptools"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "whwright"; repo = "click-command-tree"; - tag = version; + tag = finalAttrs.version; hash = "sha256-oshAHCGe8p5BQ0W21bXSxrTCEFgIxZ6BmUEiWB1xAoI="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/whwright/click-command-tree"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/cmigemo/default.nix b/pkgs/development/python-modules/cmigemo/default.nix index 3af749df30d9..1e957bce45be 100644 --- a/pkgs/development/python-modules/cmigemo/default.nix +++ b/pkgs/development/python-modules/cmigemo/default.nix @@ -8,13 +8,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cmigemo"; version = "0.1.6"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "09j68kvcskav2cqb7pj12caksmj4wh2lhjp0csq00xpn0wqal4vk"; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ illustris ]; }; -} +}) diff --git a/pkgs/development/python-modules/colcon-coveragepy-result/default.nix b/pkgs/development/python-modules/colcon-coveragepy-result/default.nix index aa6ad8df8908..1955f6dc98ef 100644 --- a/pkgs/development/python-modules/colcon-coveragepy-result/default.nix +++ b/pkgs/development/python-modules/colcon-coveragepy-result/default.nix @@ -11,7 +11,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colcon-coveragepy-result"; version = "0.0.8"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "colcon"; repo = "colcon-coveragepy-result"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+xjrmiWaDPjoRwjgP4Ui6+vuG4Nc4ur8DdC8ddiXAG0="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ guelakais ]; }; -} +}) diff --git a/pkgs/development/python-modules/conway-polynomials/default.nix b/pkgs/development/python-modules/conway-polynomials/default.nix index c57db302ad2d..c7ade3ef9331 100644 --- a/pkgs/development/python-modules/conway-polynomials/default.nix +++ b/pkgs/development/python-modules/conway-polynomials/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "conway-polynomials"; version = "0.10"; pyproject = true; src = fetchPypi { pname = "conway_polynomials"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-T2GfZPgaPrFsTibFooT+7sJ6b0qtZHZD55ryiYAa4PM="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { teams = [ lib.teams.sage ]; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/development/python-modules/copykitten/default.nix b/pkgs/development/python-modules/copykitten/default.nix index d1893e67e969..71696ca005b4 100644 --- a/pkgs/development/python-modules/copykitten/default.nix +++ b/pkgs/development/python-modules/copykitten/default.nix @@ -6,7 +6,7 @@ pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "copykitten"; version = "2.0.0"; pyproject = true; @@ -14,12 +14,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Klavionik"; repo = "copykitten"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hjkRVX2+CuLyQw8/1cHRf84qbxPxAnDxCm5gVwdhecs="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit (finalAttrs) src; hash = "sha256-Ujed/3vckHMkYaQ1Euj+KaPG4yeERS7HBbl5SzvbOWE="; }; @@ -43,9 +43,9 @@ buildPythonPackage rec { meta = { description = "Robust, dependency-free way to use the system clipboard in Python"; homepage = "https://github.com/Klavionik/copykitten"; - changelog = "https://github.com/Klavionik/copykitten/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Klavionik/copykitten/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.samasaur ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 38058b021c92..e78e32b5838e 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coverage"; version = "7.13.5"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coveragepy"; repo = "coveragepy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XsgOBdehJi2fIZdwE60a32+unYLSMK5MGe1nJOfPBEY="; }; @@ -43,10 +43,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/coveragepy/coveragepy/blob/${src.tag}/CHANGES.rst"; + changelog = "https://github.com/coveragepy/coveragepy/blob/${finalAttrs.src.tag}/CHANGES.rst"; description = "Code coverage measurement for Python"; homepage = "https://github.com/coveragepy/coveragepy"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/cronsim/default.nix b/pkgs/development/python-modules/cronsim/default.nix index 73d3f9aec7e9..0aa4bd5d4f49 100644 --- a/pkgs/development/python-modules/cronsim/default.nix +++ b/pkgs/development/python-modules/cronsim/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cronsim"; version = "2.7"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cuu508"; repo = "cronsim"; - tag = version; + tag = finalAttrs.version; hash = "sha256-9TextQcZAX5Ri6cc+Qd4T+u8XjxriqoTsy/9/G8XDAM="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ phaer ]; }; -} +}) diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index 36dc4de9f9b7..bb439d51db2e 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cymem"; version = "2.0.14"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "explosion"; repo = "cymem"; - tag = "release-v${version}"; + tag = "release-v${finalAttrs.version}"; hash = "sha256-pb7AWkCOLfoH2kLNNwIxxHyGsxCpq72Qzid4aCYu9XM="; }; @@ -37,8 +37,8 @@ buildPythonPackage rec { meta = { description = "Cython memory pool for RAII-style memory management"; homepage = "https://github.com/explosion/cymem"; - changelog = "https://github.com/explosion/cymem/releases/tag/release-${src.tag}"; + changelog = "https://github.com/explosion/cymem/releases/tag/release-${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nickcao ]; }; -} +}) diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index 5a0ef31869b9..3af654843852 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -4,14 +4,14 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dash-core-components"; version = "2.0.0"; format = "setuptools"; src = fetchPypi { pname = "dash_core_components"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-xnM4dK+XXlUvlaE5ihbC7n3xTOQ/pguzcYo8bgtj/+4="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.antoinerg ]; }; -} +}) diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index b8beafb2b614..242e1c3033be 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -35,7 +35,7 @@ callPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbt-core"; version = "1.11.2"; pyproject = true; @@ -43,11 +43,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-core"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+7q332Te3R6g8HvT1Gwa7vHo8OBmT0/E/CzunBYIvZk="; }; - sourceRoot = "${src.name}/core"; + sourceRoot = "${finalAttrs.src.name}/core"; pythonRelaxDeps = [ "agate" @@ -121,11 +121,11 @@ buildPythonPackage rec { ]) ''; homepage = "https://github.com/dbt-labs/dbt-core"; - changelog = "https://github.com/dbt-labs/dbt-core/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/dbt-labs/dbt-core/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mausch ]; mainProgram = "dbt"; }; -} +}) diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 4352a2fab9cd..2198c6665e70 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -16,7 +16,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbt-semantic-interfaces"; version = "0.10.5"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-semantic-interfaces"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LA5GvSm8M15NOG6f2f/gXplqburO+SpAzMZr178jx9k="; }; @@ -56,8 +56,8 @@ buildPythonPackage rec { meta = { description = "Shared interfaces used by dbt-core and MetricFlow projects"; homepage = "https://github.com/dbt-labs/dbt-semantic-interfaces"; - changelog = "https://github.com/dbt-labs/dbt-semantic-interfaces/releases/tag/${src.tag}"; + changelog = "https://github.com/dbt-labs/dbt-semantic-interfaces/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pbsds ]; }; -} +}) diff --git a/pkgs/development/python-modules/debianbts/default.nix b/pkgs/development/python-modules/debianbts/default.nix index aaa138def543..1011b24b6854 100644 --- a/pkgs/development/python-modules/debianbts/default.nix +++ b/pkgs/development/python-modules/debianbts/default.nix @@ -7,13 +7,13 @@ distutils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-debianbts"; version = "4.1.1"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "python_debianbts"; hash = "sha256-9EOxjOJBGzcxA3hHFeZwffA09I2te+OHppF7FuFU15M="; }; @@ -39,8 +39,8 @@ buildPythonPackage rec { mainProgram = "debianbts"; homepage = "https://github.com/venthur/python-debianbts"; downloadPage = "https://pypi.org/project/python-debianbts/"; - changelog = "https://github.com/venthur/python-debianbts/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/venthur/python-debianbts/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nicoo ]; }; -} +}) diff --git a/pkgs/development/python-modules/dicomweb-client/default.nix b/pkgs/development/python-modules/dicomweb-client/default.nix index fc9ed97a2582..85b467c426bf 100644 --- a/pkgs/development/python-modules/dicomweb-client/default.nix +++ b/pkgs/development/python-modules/dicomweb-client/default.nix @@ -13,7 +13,7 @@ retrying, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dicomweb-client"; version = "0.60.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ImagingDataCommons"; repo = "dicomweb-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZxeZiCw8I5+Bf266PQ6WQA8mBRC7K3/kZrmuW4l6kQU="; }; @@ -48,9 +48,9 @@ buildPythonPackage rec { meta = { description = "Python client for DICOMweb RESTful services"; homepage = "https://dicomweb-client.readthedocs.io"; - changelog = "https://github.com/ImagingDataCommons/dicomweb-client/releases/tag/${src.tag}"; + changelog = "https://github.com/ImagingDataCommons/dicomweb-client/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; mainProgram = "dicomweb_client"; }; -} +}) diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index 232a30076820..253a991d42cc 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -10,7 +10,7 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dissect-evidence"; version = "3.12"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.evidence"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kSM2fXaK3H6os/RexwOGg2d8UptoAlHnYK7FlMTg2bI="; }; @@ -44,8 +44,8 @@ buildPythonPackage rec { meta = { description = "Dissect module implementing a parsers for various forensic evidence file containers"; homepage = "https://github.com/fox-it/dissect.evidence"; - changelog = "https://github.com/fox-it/dissect.evidence/releases/tag/${src.tag}"; + changelog = "https://github.com/fox-it/dissect.evidence/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index f05990fdc358..223f1024b24e 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dissect-volume"; version = "3.18"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.volume"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2ivRkA4OLFntS2CtnXIr+/sLlcDVpmz6eINbejeH/3s="; }; @@ -61,8 +61,8 @@ buildPythonPackage rec { meta = { description = "Dissect module implementing various utility functions for the other Dissect modules"; homepage = "https://github.com/fox-it/dissect.volume"; - changelog = "https://github.com/fox-it/dissect.volume/releases/tag/${src.tag}"; + changelog = "https://github.com/fox-it/dissect.volume/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/django-classy-tags/default.nix b/pkgs/development/python-modules/django-classy-tags/default.nix index 5e8c86cde5e4..394555df430f 100644 --- a/pkgs/development/python-modules/django-classy-tags/default.nix +++ b/pkgs/development/python-modules/django-classy-tags/default.nix @@ -5,13 +5,13 @@ django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-classy-tags"; version = "4.1.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yNnRqi+m5xxNhm303RHSOmm40lu7dQskkKF7Fhd07lk="; }; @@ -25,8 +25,8 @@ buildPythonPackage rec { meta = { description = "Class based template tags for Django"; homepage = "https://github.com/divio/django-classy-tags"; - changelog = "https://github.com/django-cms/django-classy-tags/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/django-cms/django-classy-tags/blob/${finalAttrs.version}/CHANGELOG.rst"; license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix index 937b70508b80..1d2d744b7567 100644 --- a/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-elasticsearch-dsl"; version = "8.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-es"; repo = "django-elasticsearch-dsl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-GizdFOM4UjI870XdE33D7uXHXkuv/bLYbyi9yyNjti8="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.onny ]; }; -} +}) diff --git a/pkgs/development/python-modules/dremel3dpy/default.nix b/pkgs/development/python-modules/dremel3dpy/default.nix index 6130d151ba1c..81c8ccca8ae7 100644 --- a/pkgs/development/python-modules/dremel3dpy/default.nix +++ b/pkgs/development/python-modules/dremel3dpy/default.nix @@ -13,13 +13,13 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dremel3dpy"; version = "2.1.1"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ioZwvbdPhO2kY10TqGR427mRUJBUZ5bmpiWVOV92OkI="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/ec2-metadata/default.nix b/pkgs/development/python-modules/ec2-metadata/default.nix index d4d050a6b87c..5c38e14b2ee3 100644 --- a/pkgs/development/python-modules/ec2-metadata/default.nix +++ b/pkgs/development/python-modules/ec2-metadata/default.nix @@ -6,14 +6,14 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ec2-metadata"; version = "2.17.0"; pyproject = true; src = fetchPypi { pname = "ec2_metadata"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-rZilr9j09J9ojkiZ3FBSV9oyNzSHYezusPx/x9AMyQ0="; }; @@ -32,9 +32,9 @@ buildPythonPackage rec { meta = { description = "Easy interface to query the EC2 metadata API, with caching"; homepage = "https://pypi.org/project/ec2-metadata/"; - changelog = "https://github.com/adamchainz/ec2-metadata/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/adamchainz/ec2-metadata/blob/${finalAttrs.version}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ _9999years ]; mainProgram = "ec2-metadata"; }; -} +}) diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 5d8c4e7ee25a..b0fa376f5156 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ecpy"; version = "1.2.5"; pyproject = true; src = fetchPypi { pname = "ECPy"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ljXP+5tuz3/X9yrqFmWCmsdKHScgBtAFfUWmIariAig="; }; @@ -26,8 +26,8 @@ buildPythonPackage rec { meta = { description = "Pure Python Elliptic Curve Library"; homepage = "https://github.com/ubinity/ECPy"; - changelog = "https://github.com/cslashm/ECPy/releases/tag/${version}"; + changelog = "https://github.com/cslashm/ECPy/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix index 17bd4da5b040..790f1ce79c63 100644 --- a/pkgs/development/python-modules/eiswarnung/default.nix +++ b/pkgs/development/python-modules/eiswarnung/default.nix @@ -12,7 +12,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eiswarnung"; version = "2.0.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-eiswarnung"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/61qrRfD7/gaEcvFot34HYXOVLWwTDi/fvcgHDTv9u0="; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail '"0.0.0"' '"${version}"' + --replace-fail '"0.0.0"' '"${finalAttrs.version}"' ''; pythonRelaxDeps = [ "pytz" ]; @@ -53,8 +53,8 @@ buildPythonPackage rec { meta = { description = "Module for getting Eiswarning API forecasts"; homepage = "https://github.com/klaasnicolaas/python-eiswarnung"; - changelog = "https://github.com/klaasnicolaas/python-eiswarnung/releases/tag/v${version}"; + changelog = "https://github.com/klaasnicolaas/python-eiswarnung/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 02e9a45fd8fd..5412f8ca4d3e 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -25,7 +25,7 @@ daemontools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eliot"; version = "1.17.5"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "itamarst"; repo = "eliot"; - tag = version; + tag = finalAttrs.version; hash = "sha256-x6zonKL6Ys1fyUjyOgVgucAN64Dt6dCzdBrxRZa+VDQ="; }; @@ -70,8 +70,8 @@ buildPythonPackage rec { meta = { description = "Logging library that tells you why it happened"; homepage = "https://eliot.readthedocs.io"; - changelog = "https://github.com/itamarst/eliot/blob/${version}/docs/source/news.rst"; + changelog = "https://github.com/itamarst/eliot/blob/${finalAttrs.version}/docs/source/news.rst"; mainProgram = "eliot-prettyprint"; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/development/python-modules/etcd3/default.nix b/pkgs/development/python-modules/etcd3/default.nix index 6550edc9473c..b00729197cb4 100644 --- a/pkgs/development/python-modules/etcd3/default.nix +++ b/pkgs/development/python-modules/etcd3/default.nix @@ -14,7 +14,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "etcd3"; version = "0.12.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kragniz"; repo = "python-etcd3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YM72+fkCDYXl6DORJa/O0sqXqHDWQcFLv2ifQ9kEHBo="; }; @@ -64,4 +64,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ moraxyc ]; }; -} +}) diff --git a/pkgs/development/python-modules/faicons/default.nix b/pkgs/development/python-modules/faicons/default.nix index 4f3e42ae7dd1..175b7c9db893 100644 --- a/pkgs/development/python-modules/faicons/default.nix +++ b/pkgs/development/python-modules/faicons/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "faicons"; version = "0.2.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "posit-dev"; repo = "py-faicons"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-okkZ8anirjcZcZeB3XjvNJpiYQEau+o6dmCGqFBD8XY="; }; @@ -32,10 +32,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/posit-dev/py-faicons/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/posit-dev/py-faicons/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Interface to Font-Awesome for use in Shiny"; homepage = "https://github.com/posit-dev/py-faicons"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/falcon-cors/default.nix b/pkgs/development/python-modules/falcon-cors/default.nix index 2c70e18821c8..de2e40304f77 100644 --- a/pkgs/development/python-modules/falcon-cors/default.nix +++ b/pkgs/development/python-modules/falcon-cors/default.nix @@ -6,7 +6,7 @@ falcon, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "falcon-cors"; version = "1.1.7"; format = "setuptools"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lwcolton"; repo = "falcon-cors"; - tag = version; + tag = finalAttrs.version; hash = "sha256-jlEWP7gXbWfdY4coEIM6NWuBf4LOGbUAFMNvqip/FcA="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ onny ]; }; -} +}) diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix index ce455c5980c7..d39e16d97d6b 100644 --- a/pkgs/development/python-modules/fast-histogram/default.nix +++ b/pkgs/development/python-modules/fast-histogram/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fast-histogram"; version = "0.14"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astrofrog"; repo = "fast-histogram"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vIzDDzz6e7PXArHdZdSSgShuTjy3niVdGtXqgmyJl1w="; }; @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = { description = "Fast 1D and 2D histogram functions in Python"; homepage = "https://github.com/astrofrog/fast-histogram"; - changelog = "https://github.com/astrofrog/fast-histogram/blob/v${version}/CHANGES.md"; + changelog = "https://github.com/astrofrog/fast-histogram/blob/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ ifurther ]; }; -} +}) diff --git a/pkgs/development/python-modules/fast-simplification/default.nix b/pkgs/development/python-modules/fast-simplification/default.nix index 93ecaf08697c..48ce92259f7d 100644 --- a/pkgs/development/python-modules/fast-simplification/default.nix +++ b/pkgs/development/python-modules/fast-simplification/default.nix @@ -11,7 +11,7 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fast-simplification"; version = "0.1.13"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyvista"; repo = "fast-simplification"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MgAOGB4wJQ68GyotaxiR9Xdho+TckHKEglQvCE2TWVY="; }; @@ -59,10 +59,10 @@ buildPythonPackage rec { meta = { description = "Fast Quadratic Mesh Simplification"; homepage = "https://github.com/pyvista/fast-simplification"; - changelog = "https://github.com/pyvista/fast-simplification/releases/tag/v${version}"; + changelog = "https://github.com/pyvista/fast-simplification/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ yzx9 ]; }; -} +}) diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index bdb886cec55c..cd947bb44501 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -9,7 +9,7 @@ ffmpeg-headless, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ffmpy"; version = "1.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Ch00k"; repo = "ffmpy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TDE/r6qoWpkIU47+FPLqWgZAJd9FxSbZthhLh9g4evo="; }; @@ -66,4 +66,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ pbsds ]; }; -} +}) diff --git a/pkgs/development/python-modules/flask-mail/default.nix b/pkgs/development/python-modules/flask-mail/default.nix index 9da74f115d46..7e4e3fe8d07b 100644 --- a/pkgs/development/python-modules/flask-mail/default.nix +++ b/pkgs/development/python-modules/flask-mail/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-mail"; version = "0.10.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pallets-eco"; repo = "flask-mail"; - tag = version; + tag = finalAttrs.version; hash = "sha256-G2Z8dj1/IuLsZoNJVrL6LYu0XjTEHtWB9Z058aqG9Ic="; }; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "Flask extension providing simple email sending capabilities"; homepage = "https://github.com/pallets-eco/flask-mail"; - changelog = "https://github.com/pallets-eco/flask-mail/blob/${src.rev}/CHANGES.md"; + changelog = "https://github.com/pallets-eco/flask-mail/blob/${finalAttrs.src.rev}/CHANGES.md"; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index 41045a09f8c1..3a47f3557622 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-paginate"; version = "2024.4.12"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lixxu"; repo = "flask-paginate"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YaAgl+iuoXB0eWVzhmNq2UTOpM/tHfDISIb9CyaXiuA="; }; @@ -32,8 +32,8 @@ buildPythonPackage rec { meta = { description = "Pagination support for Flask"; homepage = "https://github.com/lixxu/flask-paginate"; - changelog = "https://github.com/lixxu/flask-paginate/releases/tag/v${version}"; + changelog = "https://github.com/lixxu/flask-paginate/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/flatten-json/default.nix b/pkgs/development/python-modules/flatten-json/default.nix index 137df96309f9..4a7ab39ef9dd 100644 --- a/pkgs/development/python-modules/flatten-json/default.nix +++ b/pkgs/development/python-modules/flatten-json/default.nix @@ -7,7 +7,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flatten-json"; version = "0.1.13"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amirziai"; repo = "flatten"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ViOLbfJtFWkDQ5cGNYerTk2BqVg5f5B3hZ96t0uvhpk="; }; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Flatten JSON in Python"; homepage = "https://github.com/amirziai/flatten"; - changelog = "https://github.com/amirziai/flatten/releases/tag/v${version}"; + changelog = "https://github.com/amirziai/flatten/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix index fa5247de6baf..988a491b2c77 100644 --- a/pkgs/development/python-modules/flit-scm/default.nix +++ b/pkgs/development/python-modules/flit-scm/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flit-scm"; version = "1.7.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "WillDaSilva"; repo = "flit_scm"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2nx9kWq/2TzauOW+c67g9a3JZ2dhBM4QzKyK/sqWOPo="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ cpcloud ]; }; -} +}) diff --git a/pkgs/development/python-modules/fontawesomefree/default.nix b/pkgs/development/python-modules/fontawesomefree/default.nix index 97b26b9244c3..2706c6ccb297 100644 --- a/pkgs/development/python-modules/fontawesomefree/default.nix +++ b/pkgs/development/python-modules/fontawesomefree/default.nix @@ -4,14 +4,14 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fontawesomefree"; version = "6.6.0"; format = "wheel"; # they only provide a wheel src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; format = "wheel"; dist = "py3"; python = "py3"; @@ -29,4 +29,4 @@ buildPythonPackage rec { ]; maintainers = with lib.maintainers; [ netali ]; }; -} +}) diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 23fd42508c97..766515a2683a 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -14,7 +14,7 @@ versionCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ftfy"; version = "6.3.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rspeer"; repo = "python-ftfy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TmwDJeUDcF+uOB2X5tMmnf9liCI9rP6dYJVmJoaqszo="; }; @@ -47,11 +47,11 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/rspeer/python-ftfy/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/rspeer/python-ftfy/blob/${finalAttrs.src.rev}/CHANGELOG.md"; description = "Given Unicode text, make its representation consistent and possibly less broken"; mainProgram = "ftfy"; homepage = "https://github.com/LuminosoInsight/python-ftfy"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/g2pkk/default.nix b/pkgs/development/python-modules/g2pkk/default.nix index f9e16e9e2a1d..c1b5d2992097 100644 --- a/pkgs/development/python-modules/g2pkk/default.nix +++ b/pkgs/development/python-modules/g2pkk/default.nix @@ -6,13 +6,13 @@ nltk, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "g2pkk"; version = "0.1.2"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YarV1Btn1x3Sm4Vw/JDSyJy3ZJMXAQHZJJJklSG0R+Q="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; teams = [ lib.teams.tts ]; }; -} +}) diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix index cb3520efdd28..3050aa77188b 100644 --- a/pkgs/development/python-modules/genzshcomp/default.nix +++ b/pkgs/development/python-modules/genzshcomp/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "genzshcomp"; version = "0.6.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "b582910d36f9ad0992756d7e9ccbe3e5cf811934b1002b51f25b99d3dda9d573"; }; @@ -23,4 +23,4 @@ buildPythonPackage rec { homepage = "https://bitbucket.org/hhatto/genzshcomp/"; license = lib.licenses.bsd0; }; -} +}) diff --git a/pkgs/development/python-modules/getjump/default.nix b/pkgs/development/python-modules/getjump/default.nix index 8b660ca4caaf..f5bcb0353587 100644 --- a/pkgs/development/python-modules/getjump/default.nix +++ b/pkgs/development/python-modules/getjump/default.nix @@ -10,13 +10,13 @@ uv-dynamic-versioning, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "getjump"; version = "2.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AX8WffzcqBYqo8DzXXbhfqOMd7U5VpWx4MTKhUXLJeQ="; }; @@ -45,9 +45,9 @@ buildPythonPackage rec { meta = { description = "Get and save images from jump web viewer"; homepage = "https://github.com/eggplants/getjump"; - changelog = "https://github.com/eggplants/getjump/releases/tag/v${version}"; + changelog = "https://github.com/eggplants/getjump/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "jget"; }; -} +}) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index cccff98e75b0..be89aa73373d 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -13,14 +13,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-bigquery-datatransfer"; version = "3.21.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_bigquery_datatransfer"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-zVgZBASf80Iv4RPHFa9Oy7E8+/UqU+l63UH6nl6+SHA="; }; @@ -58,8 +58,8 @@ buildPythonPackage rec { meta = { description = "BigQuery Data Transfer API client library"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-bigquery-datatransfer"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-datatransfer-v${version}/packages/google-cloud-bigquery-datatransfer/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-datatransfer-v${finalAttrs.version}/packages/google-cloud-bigquery-datatransfer/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 2f4a547acf5b..667c161ea9f5 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,14 +11,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-websecurityscanner"; version = "1.20.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_websecurityscanner"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-6u7VvENhWk25oIFFyeV/9JRYVUnQSeyc5G3sWR4DBF4="; }; @@ -49,8 +49,8 @@ buildPythonPackage rec { meta = { description = "Google Cloud Web Security Scanner API client library"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-websecurityscanner"; - changelog = "https://github.com/googleapis/google-cloud-python/tree/google-cloud-websecurityscanner-v${version}/packages/google-cloud-websecurityscanner"; + changelog = "https://github.com/googleapis/google-cloud-python/tree/google-cloud-websecurityscanner-v${finalAttrs.version}/packages/google-cloud-websecurityscanner"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 39f0f0314a74..fabddc2270e7 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-nest-sdm"; version = "9.1.2"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "allenporter"; repo = "python-google-nest-sdm"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yElmh+ajNVbjhsnNsUtQ3mJw9fvJtXqgS58iow+Nwi8="; }; @@ -59,9 +59,9 @@ buildPythonPackage rec { meta = { description = "Module for Google Nest Device Access using the Smart Device Management API"; homepage = "https://github.com/allenporter/python-google-nest-sdm"; - changelog = "https://github.com/allenporter/python-google-nest-sdm/releases/tag/${src.tag}"; + changelog = "https://github.com/allenporter/python-google-nest-sdm/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "google_nest"; }; -} +}) diff --git a/pkgs/development/python-modules/great-expectations/default.nix b/pkgs/development/python-modules/great-expectations/default.nix index d525615184bc..18d22d633d39 100644 --- a/pkgs/development/python-modules/great-expectations/default.nix +++ b/pkgs/development/python-modules/great-expectations/default.nix @@ -38,7 +38,7 @@ sqlalchemy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "great-expectations"; version = "1.11.1"; pyproject = true; @@ -46,7 +46,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "great-expectations"; repo = "great_expectations"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8yKuEVupqbwlBGeUDu25pvGltybljkmpbkcbC+G+/VI="; }; @@ -138,8 +138,8 @@ buildPythonPackage rec { broken = true; # 408 tests fail description = "Library for writing unit tests for data validation"; homepage = "https://docs.greatexpectations.io"; - changelog = "https://github.com/great-expectations/great_expectations/releases/tag/${src.tag}"; + changelog = "https://github.com/great-expectations/great_expectations/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; }; -} +}) diff --git a/pkgs/development/python-modules/halo/default.nix b/pkgs/development/python-modules/halo/default.nix index baf4cad0a0c3..094331f54f75 100644 --- a/pkgs/development/python-modules/halo/default.nix +++ b/pkgs/development/python-modules/halo/default.nix @@ -10,14 +10,14 @@ termcolor, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "halo"; version = "0.0.31"; format = "setuptools"; disabled = isPy27; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1mn97h370ggbc9vi6x8r6akd5q8i512y6kid2nvm67g93r9a6rvv"; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ urbas ]; }; -} +}) diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index 89b6d0e6c9ae..cc01c0961dd7 100644 --- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -8,7 +8,7 @@ twine, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hatch-jupyter-builder"; version = "0.9.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyterlab"; repo = "hatch-jupyter-builder"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QDWHVdjtexUNGRL+dVehdBwahSW2HmNkZKkQyuOghyI="; }; @@ -36,11 +36,11 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/jupyterlab/hatch-jupyter-builder/releases/tag/v${version}"; + changelog = "https://github.com/jupyterlab/hatch-jupyter-builder/releases/tag/v${finalAttrs.version}"; description = "Hatch plugin to help build Jupyter packages"; mainProgram = "hatch-jupyter-builder"; homepage = "https://github.com/jupyterlab/hatch-jupyter-builder"; license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/homf/default.nix b/pkgs/development/python-modules/homf/default.nix index c5e4352c9851..2c7817dea835 100644 --- a/pkgs/development/python-modules/homf/default.nix +++ b/pkgs/development/python-modules/homf/default.nix @@ -10,7 +10,7 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "homf"; version = "1.1.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "duckinator"; repo = "homf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fDH6uJ2d/Jsnuudv+Qlv1tr3slxOJWh7b4smGS32n9A="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ nicoo ]; }; -} +}) diff --git a/pkgs/development/python-modules/hopcroftkarp/default.nix b/pkgs/development/python-modules/hopcroftkarp/default.nix index 15827c783486..e7a5efdc5bda 100644 --- a/pkgs/development/python-modules/hopcroftkarp/default.nix +++ b/pkgs/development/python-modules/hopcroftkarp/default.nix @@ -4,13 +4,13 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hopcroftkarp"; version = "1.2.5"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "28a7887db81ad995ccd36a1b5164a4c542b16d2781e8c49334dc9d141968c0e7"; }; @@ -23,4 +23,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/hurry-filesize/default.nix b/pkgs/development/python-modules/hurry-filesize/default.nix index 01466bf92233..a523bb708979 100644 --- a/pkgs/development/python-modules/hurry-filesize/default.nix +++ b/pkgs/development/python-modules/hurry-filesize/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hurry-filesize"; version = "0.9"; pyproject = true; src = fetchPypi { pname = "hurry.filesize"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-9TaDKa2++GrM07yUkFIjQLt5JgRVromxpCwQ9jgBuaY="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.zpl21; maintainers = with lib.maintainers; [ vizid ]; }; -} +}) diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix index a11fb1a9fd0d..ba97e43fc707 100644 --- a/pkgs/development/python-modules/hyperion-py/default.nix +++ b/pkgs/development/python-modules/hyperion-py/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hyperion-py"; version = "0.7.6"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dermotduffy"; repo = "hyperion-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-14taFSrtmgTBiie0eY2fSRkZndJSZ4GJNRx3MonrTzs="; }; @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Python package for Hyperion Ambient Lighting"; homepage = "https://github.com/dermotduffy/hyperion-py"; - changelog = "https://github.com/dermotduffy/hyperion-py/releases/tag/${src.tag}"; + changelog = "https://github.com/dermotduffy/hyperion-py/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/igloohome-api/default.nix b/pkgs/development/python-modules/igloohome-api/default.nix index 18b82b492eae..4e6b5a2c9b32 100644 --- a/pkgs/development/python-modules/igloohome-api/default.nix +++ b/pkgs/development/python-modules/igloohome-api/default.nix @@ -8,7 +8,7 @@ pyjwt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "igloohome-api"; version = "0.1.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "keithle888"; repo = "igloohome-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BLmmypbvYTgQisT0+9Ym1ZTK6asAP2tWXP2DWhKYM7U="; }; @@ -34,10 +34,10 @@ buildPythonPackage rec { doCheck = false; meta = { - changelog = "https://github.com/keithle888/igloohome-api/releases/tag/${src.tag}"; + changelog = "https://github.com/keithle888/igloohome-api/releases/tag/${finalAttrs.src.tag}"; description = "Python package for using igloohome's API"; homepage = "https://github.com/keithle888/igloohome-api"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index dcc802fd5051..7dd8cec9bf90 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -11,14 +11,14 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "intensity-normalization"; version = "3.0.1"; pyproject = true; src = fetchPypi { pname = "intensity_normalization"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-d5f+Ug/ta9RQjk3JwHmVJQr8g93glzf7IcmLxLeA1tQ="; }; @@ -48,9 +48,9 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/jcreinhold/intensity-normalization"; description = "MRI intensity normalization tools"; - changelog = "https://github.com/jcreinhold/intensity-normalization/releases/tag/${version}"; + changelog = "https://github.com/jcreinhold/intensity-normalization/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ bcdarwin ]; license = lib.licenses.asl20; mainProgram = "intensity-normalize"; }; -} +}) diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 048773e6a12a..4143c073e823 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -14,13 +14,13 @@ importlib-resources, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "irc"; version = "20.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jdv9GfcSBM7Ount8cnJLFbP6h7q16B5Fp1vvc2oaPHY="; }; @@ -45,8 +45,8 @@ buildPythonPackage rec { meta = { description = "IRC (Internet Relay Chat) protocol library for Python"; homepage = "https://github.com/jaraco/irc"; - changelog = "https://github.com/jaraco/irc/blob/v${version}/NEWS.rst"; + changelog = "https://github.com/jaraco/irc/blob/v${finalAttrs.version}/NEWS.rst"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/jinja2-pluralize/default.nix b/pkgs/development/python-modules/jinja2-pluralize/default.nix index d0ed378f7b85..18d58b208c7b 100644 --- a/pkgs/development/python-modules/jinja2-pluralize/default.nix +++ b/pkgs/development/python-modules/jinja2-pluralize/default.nix @@ -7,14 +7,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jinja2-pluralize"; version = "0.3.0"; format = "setuptools"; src = fetchPypi { pname = "jinja2_pluralize"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-31wtUBe5tUwKZst5DMqfwIlFg3w9v8MjWJID8f+3PBw="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ dzabraev ]; }; -} +}) diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index 930a6c8783d6..00697c766d0e 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -15,7 +15,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsondiff"; version = "2.2.1"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xlwings"; repo = "jsondiff"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0EnI7f5t7Ftl/8UcsRdA4iVQ78mxvPucCJjFJ8TMwww="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/ZoomerAnalytics/jsondiff"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/jupysql-plugin/default.nix b/pkgs/development/python-modules/jupysql-plugin/default.nix index 710b44df7906..2407eaf7c8cf 100644 --- a/pkgs/development/python-modules/jupysql-plugin/default.nix +++ b/pkgs/development/python-modules/jupysql-plugin/default.nix @@ -9,7 +9,7 @@ ploomber-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupysql-plugin"; version = "0.4.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # using pypi archive which includes pre-built assets src = fetchPypi { pname = "jupysql_plugin"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-cIXheImO4BL00zn101ZDIzKl2qkIDsTNswZOCs54lNY="; }; @@ -39,8 +39,8 @@ buildPythonPackage rec { meta = { description = "Better SQL in Jupyter"; homepage = "https://github.com/ploomber/jupysql-plugin"; - changelog = "https://github.com/ploomber/jupysql-plugin/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/ploomber/jupysql-plugin/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ euxane ]; }; -} +}) diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix index cec07c095ec5..7c1694caca17 100644 --- a/pkgs/development/python-modules/karton-classifier/default.nix +++ b/pkgs/development/python-modules/karton-classifier/default.nix @@ -10,7 +10,7 @@ yara-python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "karton-classifier"; version = "2.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; repo = "karton-classifier"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YqxRiQ/kJheEJpYDqRNu9FydfnNX3OlGjgfX9Hwv+dM="; }; @@ -51,9 +51,9 @@ buildPythonPackage rec { meta = { description = "File type classifier for the Karton framework"; homepage = "https://github.com/CERT-Polska/karton-classifier"; - changelog = "https://github.com/CERT-Polska/karton-classifier/releases/tag/v${version}"; + changelog = "https://github.com/CERT-Polska/karton-classifier/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; mainProgram = "karton-classifier"; }; -} +}) diff --git a/pkgs/development/python-modules/l18n/default.nix b/pkgs/development/python-modules/l18n/default.nix index e91f3e033177..ca26a9a254d9 100644 --- a/pkgs/development/python-modules/l18n/default.nix +++ b/pkgs/development/python-modules/l18n/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "l18n"; version = "2021.3"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GVbokNZz0XE1zCCRMlPBVPa8HAAmbCK31QPMGlpC2Eg="; }; @@ -29,8 +29,8 @@ buildPythonPackage rec { meta = { description = "Locale internationalization package"; homepage = "https://github.com/tkhyn/l18n"; - changelog = "https://github.com/tkhyn/l18n/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/tkhyn/l18n/blob/${finalAttrs.version}/CHANGES.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sephi ]; }; -} +}) diff --git a/pkgs/development/python-modules/ld2410-ble/default.nix b/pkgs/development/python-modules/ld2410-ble/default.nix index 48cec04985e1..ab7a741eeff3 100644 --- a/pkgs/development/python-modules/ld2410-ble/default.nix +++ b/pkgs/development/python-modules/ld2410-ble/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ld2410-ble"; version = "0.2.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "930913"; repo = "ld2410-ble"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wQnE2hNT0UOnPJbHq1eayIO8g0XRZvEH6V19DL6RqoA="; }; @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Library for the LD2410B modules from HiLinks"; homepage = "https://github.com/930913/ld2410-ble"; - changelog = "https://github.com/930913/ld2410-ble/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/930913/ld2410-ble/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/ledger-bitcoin/default.nix b/pkgs/development/python-modules/ledger-bitcoin/default.nix index 5c0d96015904..db4627042816 100644 --- a/pkgs/development/python-modules/ledger-bitcoin/default.nix +++ b/pkgs/development/python-modules/ledger-bitcoin/default.nix @@ -10,13 +10,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ledger-bitcoin"; version = "0.4.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "ledger_bitcoin"; hash = "sha256-IkJFLnjPS1fIuNNQnoMYYP1IUbChv6uV8vXj9H1NFQA="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/LedgerHQ/app-bitcoin-new/tree/develop/bitcoin_client/ledger_bitcoin"; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix index e0dc3078edc3..ade561a75b9e 100644 --- a/pkgs/development/python-modules/llama-index-readers-json/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -6,14 +6,14 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-readers-json"; version = "0.5.0"; pyproject = true; src = fetchPypi { pname = "llama_index_readers_json"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-315Uzbm3CuRJQpAwnrLxQ6zr0e1pCmM3JKMV6KhrEs8="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/llm-fragments-symbex/default.nix b/pkgs/development/python-modules/llm-fragments-symbex/default.nix index c476c6a9ec6e..24b56a91e5c8 100644 --- a/pkgs/development/python-modules/llm-fragments-symbex/default.nix +++ b/pkgs/development/python-modules/llm-fragments-symbex/default.nix @@ -10,7 +10,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llm-fragments-symbex"; version = "0.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = "llm-fragments-symbex"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LECMHv4tGMCY60JU68y2Sfxp97Px7T/RJVhYVDSFCy4="; }; @@ -41,8 +41,8 @@ buildPythonPackage rec { meta = { description = "LLM fragment loader for Python symbols"; homepage = "https://github.com/simonw/llm-fragments-symbex"; - changelog = "https://github.com/simonw/llm-fragments-symbex/releases/tag/${version}/CHANGELOG.md"; + changelog = "https://github.com/simonw/llm-fragments-symbex/releases/tag/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ philiptaron ]; }; -} +}) diff --git a/pkgs/development/python-modules/llm-hacker-news/default.nix b/pkgs/development/python-modules/llm-hacker-news/default.nix index 6c481e0212b6..a7bf68f734a2 100644 --- a/pkgs/development/python-modules/llm-hacker-news/default.nix +++ b/pkgs/development/python-modules/llm-hacker-news/default.nix @@ -7,7 +7,7 @@ llm-hacker-news, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llm-hacker-news"; version = "0.1.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = "llm-hacker-news"; - tag = version; + tag = finalAttrs.version; hash = "sha256-pywx9TAN/mnGR6Vv6YsPhLO4R5Geagw/bcydQjvTH5s="; }; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "LLM plugin for pulling content from Hacker News"; homepage = "https://github.com/simonw/llm-hacker-news"; - changelog = "https://github.com/simonw/llm-hacker-news/releases/tag/${version}/CHANGELOG.md"; + changelog = "https://github.com/simonw/llm-hacker-news/releases/tag/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ philiptaron ]; }; -} +}) diff --git a/pkgs/development/python-modules/llm-sentence-transformers/default.nix b/pkgs/development/python-modules/llm-sentence-transformers/default.nix index db7439998e87..ffab811ef696 100644 --- a/pkgs/development/python-modules/llm-sentence-transformers/default.nix +++ b/pkgs/development/python-modules/llm-sentence-transformers/default.nix @@ -11,7 +11,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llm-sentence-transformers"; version = "0.3.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = "llm-sentence-transformers"; - tag = version; + tag = finalAttrs.version; hash = "sha256-FDDMItKFEYEptiL3EHKgKVxClqRU9RaM3uD3xP0F4OM="; }; @@ -49,8 +49,8 @@ buildPythonPackage rec { meta = { description = "LLM plugin for embeddings using sentence-transformers"; homepage = "https://github.com/simonw/llm-sentence-transformers"; - changelog = "https://github.com/simonw/llm-sentence-transformers/releases/tag/${version}/CHANGELOG.md"; + changelog = "https://github.com/simonw/llm-sentence-transformers/releases/tag/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ philiptaron ]; }; -} +}) diff --git a/pkgs/development/python-modules/localimport/default.nix b/pkgs/development/python-modules/localimport/default.nix index ca6f7e3e0286..548e9b9f7ce3 100644 --- a/pkgs/development/python-modules/localimport/default.nix +++ b/pkgs/development/python-modules/localimport/default.nix @@ -4,13 +4,13 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "localimport"; version = "1.7.6"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8UhaZyGdN/N6UwR7pPYQR2hZCz3TrBxr1KOBJRx28ok="; }; @@ -22,4 +22,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/lzallright/default.nix b/pkgs/development/python-modules/lzallright/default.nix index 7032053694ef..8105eea3964f 100644 --- a/pkgs/development/python-modules/lzallright/default.nix +++ b/pkgs/development/python-modules/lzallright/default.nix @@ -8,19 +8,19 @@ libiconv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lzallright"; version = "0.2.6"; src = fetchFromGitHub { owner = "vlaci"; repo = "lzallright"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-bnGnx+CKcneBWd5tpYWxEPp5f3hvGxM+8QcD2NKX4Tw="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-RxR1EFssGCp7etTdh56LSEfDQsx8uPrQTVqTsDVvkHo="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ vlaci ]; }; -} +}) diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix index 7f2acb1c3bb5..2af5955da653 100644 --- a/pkgs/development/python-modules/markdownify/default.nix +++ b/pkgs/development/python-modules/markdownify/default.nix @@ -9,7 +9,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "markdownify"; version = "1.2.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthewwithanm"; repo = "python-markdownify"; - tag = version; + tag = finalAttrs.version; hash = "sha256-r6nah7QavrMjIHd5hByhy90OoTDb2iIhFZ+YV0h61fU="; }; @@ -38,9 +38,9 @@ buildPythonPackage rec { meta = { description = "HTML to Markdown converter"; homepage = "https://github.com/matthewwithanm/python-markdownify"; - changelog = "https://github.com/matthewwithanm/python-markdownify/releases/tag/${src.tag}"; + changelog = "https://github.com/matthewwithanm/python-markdownify/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ McSinyx ]; mainProgram = "markdownify"; }; -} +}) diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index f77a94c05afe..a8fecfd52e2e 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mdit-py-plugins"; version = "0.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; repo = "mdit-py-plugins"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MQU6u49KsWGaKeWU5v066kZidcfCoubqClxAapAZb9A="; }; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Collection of core plugins for markdown-it-py"; homepage = "https://github.com/executablebooks/mdit-py-plugins"; - changelog = "https://github.com/executablebooks/mdit-py-plugins/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/executablebooks/mdit-py-plugins/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/meshcat/default.nix b/pkgs/development/python-modules/meshcat/default.nix index 1cb7410a039e..201b71c02595 100644 --- a/pkgs/development/python-modules/meshcat/default.nix +++ b/pkgs/development/python-modules/meshcat/default.nix @@ -11,13 +11,13 @@ pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "meshcat"; version = "0.3.2"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LP4XzeT+hdByo94Bip2r9WJvgMJV//LOY7JqSNJIStk="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ wegank ]; }; -} +}) diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index feb40b6ef8f9..d77bc974e3b5 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -9,13 +9,13 @@ pexpect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "metakernel"; version = "0.32.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AxmEtMBinBKchhYtJ72N8mTWmTv5Ya7HMP23H6zv3bw="; }; @@ -36,8 +36,8 @@ buildPythonPackage rec { meta = { description = "Jupyter/IPython Kernel Tools"; homepage = "https://github.com/Calysto/metakernel"; - changelog = "https://github.com/Calysto/metakernel/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Calysto/metakernel/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ thomasjm ]; }; -} +}) diff --git a/pkgs/development/python-modules/meteoalertapi/default.nix b/pkgs/development/python-modules/meteoalertapi/default.nix index 061fc8ca4023..7fb28adb2008 100644 --- a/pkgs/development/python-modules/meteoalertapi/default.nix +++ b/pkgs/development/python-modules/meteoalertapi/default.nix @@ -6,7 +6,7 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "meteoalertapi"; version = "0.3.1"; format = "setuptools"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rolfberkenbosch"; repo = "meteoalert-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Imb4DVcNB3QiVSCLCI+eKpfl73aMn4NIItQVf7p0H+E="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/mkdocs-section-index/default.nix b/pkgs/development/python-modules/mkdocs-section-index/default.nix index ce36197c03b1..c077554302c2 100644 --- a/pkgs/development/python-modules/mkdocs-section-index/default.nix +++ b/pkgs/development/python-modules/mkdocs-section-index/default.nix @@ -11,7 +11,7 @@ mkdocs-material, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-section-index"; version = "0.3.10"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oprypin"; repo = "mkdocs-section-index"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cw/a17xliK68vStC20f+IHI3nQl1/s/lIIj1tyQJti0="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/monzopy/default.nix b/pkgs/development/python-modules/monzopy/default.nix index 494c143a3e6c..5a0163731c51 100644 --- a/pkgs/development/python-modules/monzopy/default.nix +++ b/pkgs/development/python-modules/monzopy/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "monzopy"; version = "1.5.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JakeMartin-ICL"; repo = "monzopy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LMg3hCaNa9LF3pZEQ/uQgt81V6qKmOwZnKHdsI8MHLY="; }; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Module to work with the Monzo API"; homepage = "https://github.com/JakeMartin-ICL/monzopy"; - changelog = "https://github.com/JakeMartin-ICL/monzopy/releases/tag/v${version}"; + changelog = "https://github.com/JakeMartin-ICL/monzopy/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index cdb5e476e79c..f053b318e350 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "msal"; version = "1.34.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-drqDtxbqWm11sCecCsNToOBbggyh9mgsDrf0UZDEPC8="; }; @@ -36,8 +36,8 @@ buildPythonPackage rec { meta = { description = "Library to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect"; homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"; - changelog = "https://github.com/AzureAD/microsoft-authentication-library-for-python/releases/tag/${version}"; + changelog = "https://github.com/AzureAD/microsoft-authentication-library-for-python/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kamadorueda ]; }; -} +}) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 52005f32ac10..19132ab29cd2 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "multidict"; version = "6.7.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "multidict"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HOQRfSxf0+HeXsV4ShwfUDjNVyg2SjNuE157JLRlAL0="; }; @@ -51,10 +51,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "multidict" ]; meta = { - changelog = "https://github.com/aio-libs/multidict/blob/${src.tag}/CHANGES.rst"; + changelog = "https://github.com/aio-libs/multidict/blob/${finalAttrs.src.tag}/CHANGES.rst"; description = "Multidict implementation"; homepage = "https://github.com/aio-libs/multidict/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix index 6b85437a7a1f..bde6bd44e396 100644 --- a/pkgs/development/python-modules/musicbrainzngs/default.nix +++ b/pkgs/development/python-modules/musicbrainzngs/default.nix @@ -5,13 +5,13 @@ pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "musicbrainzngs"; version = "0.7.1"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "09z6k07pxncfgfc8clfmmxl2xqbd7h8x8bjzwr95hc0bzl00275b"; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index c34d10d1a880..79b5fe13dcf3 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mwparserfromhell"; version = "0.7.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "earwig"; repo = "mwparserfromhell"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yPj272bMh/pLapc7lDgP4+AnDBpE2FrDICRUxizIcSA="; }; @@ -36,8 +36,8 @@ buildPythonPackage rec { meta = { description = "Parser for MediaWiki wikicode"; homepage = "https://mwparserfromhell.readthedocs.io/"; - changelog = "https://github.com/earwig/mwparserfromhell/releases/tag/${src.tag}"; + changelog = "https://github.com/earwig/mwparserfromhell/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix index 45f5c4b89b6c..94f9963d2f7b 100644 --- a/pkgs/development/python-modules/myjwt/default.nix +++ b/pkgs/development/python-modules/myjwt/default.nix @@ -17,7 +17,7 @@ requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "myjwt"; version = "2.1.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mBouamama"; repo = "MyJWT"; - tag = version; + tag = finalAttrs.version; hash = "sha256-jqBnxo7Omn5gLMCQ7SNbjo54nyFK7pn94796z2Qc9lg="; }; @@ -59,11 +59,11 @@ buildPythonPackage rec { meta = { description = "CLI tool for testing vulnerabilities of JSON Web Tokens (JWT)"; homepage = "https://github.com/mBouamama/MyJWT"; - changelog = "https://github.com/tyki6/MyJWT/releases/tag/${src.tag}"; + changelog = "https://github.com/tyki6/MyJWT/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "myjwt"; # Build failures broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/development/python-modules/namex/default.nix b/pkgs/development/python-modules/namex/default.nix index 56d369e468d1..9feac77f4690 100644 --- a/pkgs/development/python-modules/namex/default.nix +++ b/pkgs/development/python-modules/namex/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "namex"; version = "0.1.0"; pyproject = true; # Not using fetchFromGitHub because the repo does not have any tag/release src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EX8DzNMCzEjj9cWKKWg49ricg0VauGg6HoXypDCqQwY="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/netbox-attachments/default.nix b/pkgs/development/python-modules/netbox-attachments/default.nix index 78ec7c0b97bd..b78d183341b8 100644 --- a/pkgs/development/python-modules/netbox-attachments/default.nix +++ b/pkgs/development/python-modules/netbox-attachments/default.nix @@ -8,7 +8,7 @@ django, netaddr, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-attachments"; version = "11.0.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Kani999"; repo = "netbox-attachments"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8wZeHLt8Hx8hghsliKtKxCI/2dQh/EQitZ4YXPSj/Qs="; }; @@ -39,9 +39,9 @@ buildPythonPackage rec { meta = { description = "Plugin to manage attachments for any model"; homepage = "https://github.com/Kani999/netbox-attachments"; - changelog = "https://github.com/Kani999/netbox-attachments/releases/tag/${src.tag}"; + changelog = "https://github.com/Kani999/netbox-attachments/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/development/python-modules/netbox-contract/default.nix b/pkgs/development/python-modules/netbox-contract/default.nix index 3622ad49d9f3..701489f505d3 100644 --- a/pkgs/development/python-modules/netbox-contract/default.nix +++ b/pkgs/development/python-modules/netbox-contract/default.nix @@ -9,7 +9,7 @@ netbox, netaddr, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-contract"; version = "2.4.5"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mlebreuil"; repo = "netbox-contract"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+6dw8vPDNItZRfExL0C5ul2XghoToMHotEAH90B3CmE="; }; @@ -45,9 +45,9 @@ buildPythonPackage rec { meta = { description = "Contract plugin for netbox"; homepage = "https://github.com/mlebreuil/netbox-contract"; - changelog = "https://github.com/mlebreuil/netbox-contract/releases/tag/${src.tag}"; + changelog = "https://github.com/mlebreuil/netbox-contract/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix index 64d9456ac9ff..3987de433e91 100644 --- a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix +++ b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix @@ -8,7 +8,7 @@ napalm, django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-napalm-plugin"; version = "0.3.4"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-napalm-plugin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PdX69SS0SAeUuN2zwcv54Ooih1hyR9a19e7sc5tJvuQ="; }; @@ -45,9 +45,9 @@ buildPythonPackage rec { meta = { description = "Netbox plugin for Napalm integration"; homepage = "https://github.com/netbox-community/netbox-napalm-plugin"; - changelog = "https://github.com/netbox-community/netbox-napalm-plugin/releases/tag/${src.tag}"; + changelog = "https://github.com/netbox-community/netbox-napalm-plugin/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 369e27f7442e..7dc6d610832a 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nocasedict"; version = "2.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pywbem"; repo = "nocasedict"; - tag = version; + tag = finalAttrs.version; hash = "sha256-e3APYlmeoby0CGoEh4g6ZK27DwWi4EZdpwsRORxly+w="; }; @@ -31,8 +31,8 @@ buildPythonPackage rec { meta = { description = "Case-insensitive ordered dictionary for Python"; homepage = "https://github.com/pywbem/nocasedict"; - changelog = "https://github.com/pywbem/nocasedict/blob/${src.tag}/docs/changes.rst"; + changelog = "https://github.com/pywbem/nocasedict/blob/${finalAttrs.src.tag}/docs/changes.rst"; license = lib.licenses.lgpl21Plus; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index f756864f5d7e..5c678def78d0 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -5,13 +5,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "olefile"; version = "0.47"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-WZODOBoL89+9kyygymUVrNF07UiHDL9/7hI9aYwZLBw="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/omemo/default.nix b/pkgs/development/python-modules/omemo/default.nix index 56cd2ea8ead6..9ce4c84da61e 100644 --- a/pkgs/development/python-modules/omemo/default.nix +++ b/pkgs/development/python-modules/omemo/default.nix @@ -17,7 +17,7 @@ # passthru omemo, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "omemo"; version = "2.1.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Syndace"; repo = "python-omemo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-h1L/DdzssCwQzQDY32ACNcn/zmDsCz16x74+Qdyv6x4="; }; @@ -72,9 +72,9 @@ buildPythonPackage rec { Multiple backends can be loaded and used at the same time, the library manages their coexistence transparently. ''; homepage = "https://github.com/Syndace/python-omemo"; - changelog = "https://github.com/Syndace/python-omemo/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/Syndace/python-omemo/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; teams = with lib.teams; [ ngi ]; maintainers = with lib.maintainers; [ themadbit ]; }; -} +}) diff --git a/pkgs/development/python-modules/opendal/default.nix b/pkgs/development/python-modules/opendal/default.nix index 81ea8ccc691a..8c1c7ed2428a 100644 --- a/pkgs/development/python-modules/opendal/default.nix +++ b/pkgs/development/python-modules/opendal/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, python-dotenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opendal"; version = "0.46.0"; pyproject = true; @@ -17,11 +17,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "apache"; repo = "opendal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OQGpz6o4R0Yp+1vAgFtik/l7wvHwJNcB1BhZLk+BFPg="; }; - sourceRoot = "${src.name}/bindings/python"; + sourceRoot = "${finalAttrs.src.name}/bindings/python"; postPatch = '' ln -s ${./Cargo.lock} Cargo.lock @@ -54,4 +54,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/pdbfixer/default.nix b/pkgs/development/python-modules/pdbfixer/default.nix index c8efd982b2ce..ffc45fc2f421 100644 --- a/pkgs/development/python-modules/pdbfixer/default.nix +++ b/pkgs/development/python-modules/pdbfixer/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdbfixer"; version = "1.12"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openmm"; repo = "pdbfixer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-X2P5cWmdvAjY9dMFB+R21advkdYizR8PmevMPR0RR0o="; }; @@ -60,9 +60,9 @@ buildPythonPackage rec { meta = { description = "PDBFixer fixes problems in PDB files"; homepage = "https://github.com/openmm/pdbfixer"; - changelog = "https://github.com/openmm/pdbfixer/releases/tag/${src.tag}"; + changelog = "https://github.com/openmm/pdbfixer/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; mainProgram = "pdbfixer"; }; -} +}) diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index f48cfb8489dd..6e52e11dd211 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdm-pep517"; version = "1.1.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-f0kSHnC0Lcopb6yWIhDdLaB6OVdfxWcxN61mFjOyzz8="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ cpcloud ]; }; -} +}) diff --git a/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix b/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix index c563f8990559..50e889cc56bd 100644 --- a/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix +++ b/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix @@ -9,19 +9,19 @@ libiconv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdoc-pyo3-sample-library"; version = "1.0.11"; pyproject = true; src = fetchPypi { pname = "pdoc_pyo3_sample_library"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ZGMo7WgymkSDQu8tc4rTfWNsIWO0AlDPG0OzpKRq3oA="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit (finalAttrs) src; hash = "sha256-XqXkheK8OEzlLEbq09KMRFxrjJBnFaxvj4rIL2gmydA="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.pbsds ]; }; -} +}) diff --git a/pkgs/development/python-modules/pebble/default.nix b/pkgs/development/python-modules/pebble/default.nix index d8e843845df3..c0d07b94c027 100644 --- a/pkgs/development/python-modules/pebble/default.nix +++ b/pkgs/development/python-modules/pebble/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pebble"; version = "5.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "noxdafox"; repo = "pebble"; - tag = version; + tag = finalAttrs.version; hash = "sha256-U6siydeKf/Ekqq2qHZj/ro2VQix2dRaP80d5CPQnRKU="; }; @@ -32,8 +32,8 @@ buildPythonPackage rec { meta = { description = "API to manage threads and processes within an application"; homepage = "https://github.com/noxdafox/pebble"; - changelog = "https://github.com/noxdafox/pebble/releases/tag/${src.tag}"; + changelog = "https://github.com/noxdafox/pebble/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.lgpl3Plus; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/pencompy/default.nix b/pkgs/development/python-modules/pencompy/default.nix index fce768128fb6..a1392e49da42 100644 --- a/pkgs/development/python-modules/pencompy/default.nix +++ b/pkgs/development/python-modules/pencompy/default.nix @@ -4,13 +4,13 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pencompy"; version = "0.0.4"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PjALTsk0Msv3g8M6k0v6ftzDAuFKyIPSpfvT8S3YL48="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pexif/default.nix b/pkgs/development/python-modules/pexif/default.nix index 4d105fbaf76c..7deb1e0c22e7 100644 --- a/pkgs/development/python-modules/pexif/default.nix +++ b/pkgs/development/python-modules/pexif/default.nix @@ -4,13 +4,13 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pexif"; version = "0.15"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "45a3be037c7ba8b64bbfc48f3586402cc17de55bb9d7357ef2bc99954a18da3f"; }; @@ -19,4 +19,4 @@ buildPythonPackage rec { homepage = "http://www.benno.id.au/code/pexif/"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/pillow-jpls/default.nix b/pkgs/development/python-modules/pillow-jpls/default.nix index a4275b3450b3..c7553ab64007 100644 --- a/pkgs/development/python-modules/pillow-jpls/default.nix +++ b/pkgs/development/python-modules/pillow-jpls/default.nix @@ -18,7 +18,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pillow-jpls"; version = "1.3.2"; pyproject = true; @@ -26,11 +26,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "planetmarshall"; repo = "pillow-jpls"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Rc4/S8BrYoLdn7eHDBaoUt1Qy+h0TMAN5ixCAuRmfPU="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; dontUseCmakeConfigure = true; @@ -76,8 +76,8 @@ buildPythonPackage rec { meta = { description = "JPEG-LS plugin for the Python Pillow library"; homepage = "https://github.com/planetmarshall/pillow-jpls"; - changelog = "https://github.com/planetmarshall/pillow-jpls/releases/tag/v${version}"; + changelog = "https://github.com/planetmarshall/pillow-jpls/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bcdarwin ]; }; -} +}) diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 3416748a9582..96209787144f 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -5,7 +5,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plac"; version = "1.4.5"; format = "setuptools"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ialbert"; repo = "plac"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GcPZ9Ufr2NU+95XZRVgB0+cKGAc17kIYxuxYvWiq//4="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.bsdOriginal; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/plugnplay/default.nix b/pkgs/development/python-modules/plugnplay/default.nix index bd909a8357e5..2cc1c6a6c09d 100644 --- a/pkgs/development/python-modules/plugnplay/default.nix +++ b/pkgs/development/python-modules/plugnplay/default.nix @@ -3,13 +3,13 @@ buildPythonPackage, fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plugnplay"; version = "0.5.4"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "877e2d2500a45aaf31e5175f9f46182088d3e2d64c1c6b9ff6c778ae0ee594c8"; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Only; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/plugp100/default.nix b/pkgs/development/python-modules/plugp100/default.nix index 49e19bb6f08d..73c71905654e 100644 --- a/pkgs/development/python-modules/plugp100/default.nix +++ b/pkgs/development/python-modules/plugp100/default.nix @@ -15,7 +15,7 @@ pytest-asyncio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plugp100"; version = "5.1.5"; format = "setuptools"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "petretiandrea"; repo = "plugp100"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-bPjgyScHxiUke/M5S6BOw7df7wbNuSy5ouVIK5guWxw="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ pyle ]; }; -} +}) diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 6711140e148a..bbb85a47c044 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -1,5 +1,4 @@ { - lib, fetchFromGitHub, buildPythonPackage, @@ -13,7 +12,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plyfile"; version = "1.1.3"; pyproject = true; @@ -21,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dranjan"; repo = "python-plyfile"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bSevEk8ZtJybv6FYsUYKdDJJWyPK7Kstc4NNISdHV2o="; }; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/dranjan/python-plyfile"; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 737ac7ff866e..e6a680c11a2e 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -7,13 +7,13 @@ tempora, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "portend"; version = "3.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-qp1Aqx+eFL231AH0IhDfNdAXybl5kbrrGFaM7fuMZIk="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/portend"; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix index 37e1fb3e99c8..dfd6d3fa8213 100644 --- a/pkgs/development/python-modules/poyo/default.nix +++ b/pkgs/development/python-modules/poyo/default.nix @@ -4,13 +4,13 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.5.0"; format = "setuptools"; pname = "poyo"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1pflivs6j22frz0v3dqxnvc8yb8fb52g11lqr88z0i8cg2m5csg2"; }; @@ -19,4 +19,4 @@ buildPythonPackage rec { description = "Lightweight YAML Parser for Python"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 35d5c5df6066..790594cde747 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -13,7 +13,7 @@ testfixtures, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "prawcore"; version = "2.4.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "praw-dev"; repo = "prawcore"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tECZRx6VgyiJDKHvj4Rf1sknFqUhz3sDFEsAMOeB7/g="; }; @@ -49,8 +49,8 @@ buildPythonPackage rec { meta = { description = "Low-level communication layer for PRAW"; homepage = "https://praw.readthedocs.org/"; - changelog = "https://github.com/praw-dev/prawcore/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/praw-dev/prawcore/blob/${finalAttrs.src.tag}/CHANGES.rst"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index 64d275b1ad1a..e2065eb4aab7 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -4,13 +4,13 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "progressbar"; version = "2.5"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "5d81cb529da2e223b53962afd6c8ca0f05c6670e40309a7219eacc36af9b6c63"; }; @@ -23,4 +23,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl3Plus; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/prometheus-pandas/default.nix b/pkgs/development/python-modules/prometheus-pandas/default.nix index 3b4f8549e362..73d8e46b9176 100644 --- a/pkgs/development/python-modules/prometheus-pandas/default.nix +++ b/pkgs/development/python-modules/prometheus-pandas/default.nix @@ -7,13 +7,13 @@ pandas, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "prometheus-pandas"; version = "0.3.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1eaTmNui3cAisKEhBMEpOv+UndJZwb4GGK2M76xiy7k="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { description = "Pandas integration for Prometheus"; maintainers = with lib.maintainers; [ viktornordling ]; }; -} +}) diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 385ea8fa975e..ab989998dc1b 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -18,13 +18,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pvlib"; version = "0.14.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nmpmhlJAzk4xy+nTYKKNbreVO6u2KsQDry+QrtFqRQk="; }; @@ -56,8 +56,8 @@ buildPythonPackage rec { meta = { description = "Simulate the performance of photovoltaic energy systems"; homepage = "https://pvlib-python.readthedocs.io"; - changelog = "https://pvlib-python.readthedocs.io/en/v${version}/whatsnew.html"; + changelog = "https://pvlib-python.readthedocs.io/en/v${finalAttrs.version}/whatsnew.html"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jluttine ]; }; -} +}) diff --git a/pkgs/development/python-modules/py-evm/default.nix b/pkgs/development/python-modules/py-evm/default.nix index 58767884c199..ea9f490bfb62 100644 --- a/pkgs/development/python-modules/py-evm/default.nix +++ b/pkgs/development/python-modules/py-evm/default.nix @@ -25,7 +25,7 @@ pycryptodome, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-evm"; version = "0.12.1-beta.1"; pyproject = true; @@ -36,7 +36,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "py-evm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-n2F0ApdmIED0wrGuNN45lyb7cGu8pRn8mLDehT7Ru9E="; }; @@ -87,4 +87,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ hellwolf ]; }; -} +}) diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix index e0cc18fd9077..2097014e5838 100644 --- a/pkgs/development/python-modules/py-multihash/default.nix +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -12,7 +12,7 @@ varint, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-multihash"; version = "3.0.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "multiformats"; repo = "py-multihash"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hdjJJh77P4dJQAIGTlPGolz1qDumvNOaIMyfxmWMzUk="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ rakesh4g ]; }; -} +}) diff --git a/pkgs/development/python-modules/py-pdf-parser/default.nix b/pkgs/development/python-modules/py-pdf-parser/default.nix index 69d83821ccca..bdbd9f0e1205 100644 --- a/pkgs/development/python-modules/py-pdf-parser/default.nix +++ b/pkgs/development/python-modules/py-pdf-parser/default.nix @@ -8,13 +8,13 @@ wand, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-pdf-parser"; version = "0.13.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dssxWgbMrWFTK4b7oBezF77k9NmUTbdbQED9eyVQGlU="; }; @@ -45,8 +45,8 @@ buildPythonPackage rec { meta = { description = "Tool to help extracting information from structured PDFs"; homepage = "https://github.com/jstockwin/py-pdf-parser"; - changelog = "https://github.com/jstockwin/py-pdf-parser/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jstockwin/py-pdf-parser/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index a52c49987037..594c7019d84d 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -8,14 +8,14 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-vapid"; version = "1.9.4"; pyproject = true; src = fetchPypi { pname = "py_vapid"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-oAQCNWDLxU40/AY4CgWA8E/8x4joT7bRnpM57rZVGig="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.mpl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix index 709ab24f93c2..75fa8b848a56 100644 --- a/pkgs/development/python-modules/py3dns/default.nix +++ b/pkgs/development/python-modules/py3dns/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py3dns"; version = "4.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-mGUugOzsFDxg948OazQWMcqadWDt2N3fyGTAKQJhijk="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://launchpad.net/py3dns"; license = lib.licenses.psfl; }; -} +}) diff --git a/pkgs/development/python-modules/pyairports/default.nix b/pkgs/development/python-modules/pyairports/default.nix index d84e10fb1cba..db55e79325a7 100644 --- a/pkgs/development/python-modules/pyairports/default.nix +++ b/pkgs/development/python-modules/pyairports/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyairports"; version = "2.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PWCnJ/zk2oG5xjk+qK4LM9Z7N+zjRN/8hj90njrWK80="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/ozeliger/pyairports"; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 4a6a5211efda..8eb61661a794 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -7,14 +7,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybindgen"; version = "0.22.1"; format = "setuptools"; src = fetchPypi { pname = "PyBindGen"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-jH8iORpJqEUY9aKtBuOlseg50Q402nYxUZyKKPy6N2Q="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ teto ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index 97beb6234262..da75d6bdad00 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -17,13 +17,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyct"; version = "0.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1OUTss81thZWBa5fzl8qSZhbxnRzxXnehRNLjHHTdKg="; }; @@ -53,8 +53,8 @@ buildPythonPackage rec { description = "ClI for Python common tasks for users"; mainProgram = "pyct"; homepage = "https://github.com/pyviz/pyct"; - changelog = "https://github.com/pyviz-dev/pyct/releases/tag/v${version}"; + changelog = "https://github.com/pyviz-dev/pyct/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix index 280a78610661..32a5ea78f418 100644 --- a/pkgs/development/python-modules/pyfibaro/default.nix +++ b/pkgs/development/python-modules/pyfibaro/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyfibaro"; version = "0.8.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rappenze"; repo = "pyfibaro"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KdlndW066TDxZpkIP0Oa3Lii0mBpwELfHtoGKiwh6GE="; }; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Library to access FIBARO Home center"; homepage = "https://github.com/rappenze/pyfibaro"; - changelog = "https://github.com/rappenze/pyfibaro/releases/tag/${src.tag}"; + changelog = "https://github.com/rappenze/pyfibaro/releases/tag/${finalAttrs.src.tag}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyformlang/default.nix b/pkgs/development/python-modules/pyformlang/default.nix index 16d08585445a..a706658a2b05 100644 --- a/pkgs/development/python-modules/pyformlang/default.nix +++ b/pkgs/development/python-modules/pyformlang/default.nix @@ -10,13 +10,13 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyformlang"; version = "1.0.11"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4pLsi5z6ZMJrWS+vm3z8csT0sOsNUz8EWkYGHnXFzpk="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyglossary/default.nix b/pkgs/development/python-modules/pyglossary/default.nix index 79445bb5caef..ad3d29ccbb3d 100644 --- a/pkgs/development/python-modules/pyglossary/default.nix +++ b/pkgs/development/python-modules/pyglossary/default.nix @@ -26,7 +26,7 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyglossary"; version = "5.3.0"; pyproject = true; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ilius"; repo = "pyglossary"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Gg2D2nWhG8j4+NtzSzgmsdKd5UK8PherM8Hi1b2GAqg="; }; @@ -81,4 +81,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ doronbehar ]; mainProgram = "pyglossary"; }; -} +}) diff --git a/pkgs/development/python-modules/pygtkspellcheck/default.nix b/pkgs/development/python-modules/pygtkspellcheck/default.nix index 2f42289658e5..622bdad731eb 100644 --- a/pkgs/development/python-modules/pygtkspellcheck/default.nix +++ b/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -9,13 +9,13 @@ pygobject3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pygtkspellcheck"; version = "5.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NzaxRXU3BTIcRO9nowEak+Vk+XYw8nBCsTl//e/qg6w="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyhibp/default.nix b/pkgs/development/python-modules/pyhibp/default.nix index 7b60f7b7d6f0..198fc75ee228 100644 --- a/pkgs/development/python-modules/pyhibp/default.nix +++ b/pkgs/development/python-modules/pyhibp/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyhibp"; version = "4.2.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { group = "kitsunix"; owner = "pyHIBP"; repo = "pyHIBP"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2LJA989hpG5X6o+zCTSU0RRd0Z4zd29RAtp/jBW8Clo="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ aleksana ]; }; -} +}) diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/pkgs/development/python-modules/pylibconfig2/default.nix index 2765a890d0ad..988b64430f27 100644 --- a/pkgs/development/python-modules/pylibconfig2/default.nix +++ b/pkgs/development/python-modules/pylibconfig2/default.nix @@ -4,13 +4,13 @@ fetchPypi, pyparsing, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylibconfig2"; version = "0.2.5"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1iwm11v0ghv2pq2cyvly7gdwrhxsx6iwi581fz46l0snhgcd4sqq"; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Pure python library for libconfig syntax"; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/development/python-modules/pylibrespot-java/default.nix b/pkgs/development/python-modules/pylibrespot-java/default.nix index 80c955d3f7da..3afa94fb171d 100644 --- a/pkgs/development/python-modules/pylibrespot-java/default.nix +++ b/pkgs/development/python-modules/pylibrespot-java/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylibrespot-java"; version = "0.1.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "uvjustin"; repo = "pylibrespot-java"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aPmyYsO8yBrlPEQXOGNjZvuO8QZr13SOH09gqjW4WPA="; }; @@ -29,10 +29,10 @@ buildPythonPackage rec { meta = { description = "Simple library to interface with a librespot-java server"; homepage = "https://github.com/uvjustin/pylibrespot-java"; - changelog = "https://github.com/uvjustin/pylibrespot-java/releases/tag/v${version}"; + changelog = "https://github.com/uvjustin/pylibrespot-java/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ hensoko ]; }; -} +}) diff --git a/pkgs/development/python-modules/pylint-venv/default.nix b/pkgs/development/python-modules/pylint-venv/default.nix index 3aeae4509c99..0b6fb96c5225 100644 --- a/pkgs/development/python-modules/pylint-venv/default.nix +++ b/pkgs/development/python-modules/pylint-venv/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylint-venv"; version = "3.0.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jgosmann"; repo = "pylint-venv"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dJWVfltze4zT0CowBZSn3alqR2Y8obKUCmO8Nfw+ahs="; }; @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "Module to make pylint respect virtual environments"; homepage = "https://github.com/jgosmann/pylint-venv/"; - changelog = "https://github.com/jgosmann/pylint-venv/blob/v${version}/CHANGES.md"; + changelog = "https://github.com/jgosmann/pylint-venv/blob/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index 6df0b94614f9..2aa61e09cb20 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -12,7 +12,7 @@ python-lsp-server, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylsp-mypy"; version = "0.7.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-lsp"; repo = "pylsp-mypy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rS0toZaAygNJ3oe3vfP9rKJ1A0avIdp5yjNx7oGOB4o="; }; @@ -43,8 +43,8 @@ buildPythonPackage rec { meta = { description = "Mypy plugin for the Python LSP Server"; homepage = "https://github.com/python-lsp/pylsp-mypy"; - changelog = "https://github.com/python-lsp/pylsp-mypy/releases/tag/${version}"; + changelog = "https://github.com/python-lsp/pylsp-mypy/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ cpcloud ]; }; -} +}) diff --git a/pkgs/development/python-modules/pylyrics/default.nix b/pkgs/development/python-modules/pylyrics/default.nix index 7de80141a227..2b81a2cbc853 100644 --- a/pkgs/development/python-modules/pylyrics/default.nix +++ b/pkgs/development/python-modules/pylyrics/default.nix @@ -6,14 +6,14 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylyrics"; version = "1.1.0"; format = "setuptools"; src = fetchPypi { pname = "PyLyrics"; - inherit version; + inherit (finalAttrs) version; extension = "zip"; hash = "sha256-xfNujvDtO0h6kkLONMGfloTkGKW7/9XTZ9wdFgS0zQs="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/pylzma/default.nix b/pkgs/development/python-modules/pylzma/default.nix index 52cdb76d9ad1..ea51c525b73d 100644 --- a/pkgs/development/python-modules/pylzma/default.nix +++ b/pkgs/development/python-modules/pylzma/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylzma"; version = "0.6.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { # After some discussion, it seemed most reasonable to keep it that way # xz, and uefi-firmware-parser also does this src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OwCniSKNBaBvqZXNK0H/SpZXhKoZSKBthLPKa4cwQfA="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) diff --git a/pkgs/development/python-modules/pymetasploit3/default.nix b/pkgs/development/python-modules/pymetasploit3/default.nix index eb26c25594f3..918f02abf4e8 100644 --- a/pkgs/development/python-modules/pymetasploit3/default.nix +++ b/pkgs/development/python-modules/pymetasploit3/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymetasploit3"; version = "1.0.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-y4YBQo6va+/NEuE+CWeueo0aEIHEnEZYBr1WH90qHxQ="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix index b273ef8eef7e..936238e849db 100644 --- a/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix +++ b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymorphy2-dicts-ru"; version = "2.4.417127.4579844"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eMrQOtymBQIavTh6Oy61FchRuG6UaCoe8jVKLHT8wZY="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyoprf/default.nix b/pkgs/development/python-modules/pyoprf/default.nix index ca3e61692cee..0e2c9abd7a4b 100644 --- a/pkgs/development/python-modules/pyoprf/default.nix +++ b/pkgs/development/python-modules/pyoprf/default.nix @@ -13,7 +13,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyoprf"; pyproject = true; @@ -34,7 +34,7 @@ buildPythonPackage rec { --replace-fail "or ctypes.util.find_library('liboprf-noiseXK')" "" ''; - sourceRoot = "${src.name}/python"; + sourceRoot = "${finalAttrs.src.name}/python"; build-system = [ setuptools ]; @@ -62,4 +62,4 @@ buildPythonPackage rec { teams ; }; -} +}) diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix index c5708525f7fb..b4fd5bc65e60 100644 --- a/pkgs/development/python-modules/pyotp/default.nix +++ b/pkgs/development/python-modules/pyotp/default.nix @@ -5,14 +5,14 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyotp"; version = "2.9.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NGtmQuDb3eO0/1qTC2ZMqCq/oRY1btSMxCx9ZZDTb2M="; }; @@ -21,10 +21,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyotp" ]; meta = { - changelog = "https://github.com/pyauth/pyotp/blob/v${version}/Changes.rst"; + changelog = "https://github.com/pyauth/pyotp/blob/v${finalAttrs.version}/Changes.rst"; description = "Python One Time Password Library"; homepage = "https://github.com/pyauth/pyotp"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 4e952df17c52..0469de579126 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -19,13 +19,13 @@ # Use the `pypass` top-level attribute, if you're interested in the # application -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypass"; version = "0.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+dAQiufpULdU26or4EKDqazQbOZjGRbhI/+ddo+spNo="; }; @@ -82,4 +82,4 @@ buildPythonPackage rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ jluttine ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyqwikswitch/default.nix b/pkgs/development/python-modules/pyqwikswitch/default.nix index 0a22ec145f06..1b67ca3dc217 100644 --- a/pkgs/development/python-modules/pyqwikswitch/default.nix +++ b/pkgs/development/python-modules/pyqwikswitch/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyqwikswitch"; version = "0.94"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IpyWz+3EMr0I+xULBJJhBgdnQHNPJIM1SqKFLpszhQc="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.mit; teams = [ lib.teams.home-assistant ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index addec658197d..570efd84d753 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -22,7 +22,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyrainbird"; version = "6.1.2"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "allenporter"; repo = "pyrainbird"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ac/QzhdfvOpqKi8tjz2Udge2+AIg/yEQBmbYCu0i/0A="; }; @@ -66,8 +66,8 @@ buildPythonPackage rec { meta = { description = "Module to interact with Rainbird controllers"; homepage = "https://github.com/allenporter/pyrainbird"; - changelog = "https://github.com/allenporter/pyrainbird/releases/tag/${version}"; + changelog = "https://github.com/allenporter/pyrainbird/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index 3fb0bc09fef2..4a824b641b66 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -18,7 +18,7 @@ pytest-astropy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyregion"; version = "2.3.0"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astropy"; repo = "pyregion"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mEO2PbUSTVy7Qmm723/lGL6PYQzbRazIPZH51SWebvs="; }; @@ -60,10 +60,10 @@ buildPythonPackage rec { ''; meta = { - changelog = "https://github.com/astropy/pyregion/blob/${src.tag}/CHANGES.rst"; + changelog = "https://github.com/astropy/pyregion/blob/${finalAttrs.src.tag}/CHANGES.rst"; description = "Python parser for ds9 region files"; homepage = "https://github.com/astropy/pyregion"; license = lib.licenses.mit; maintainers = [ lib.maintainers.smaret ]; }; -} +}) diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index c4ffb082a756..eafa097276a6 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -6,13 +6,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysensibo"; version = "1.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Otk5W3VTbOAeZOVnXvW8VSxU1nHa8zUvmvduRTdlwVs="; }; @@ -28,8 +28,8 @@ buildPythonPackage rec { meta = { description = "Module for interacting with Sensibo"; homepage = "https://github.com/andrey-git/pysensibo"; - changelog = "https://github.com/andrey-git/pysensibo/releases/tag/${version}"; + changelog = "https://github.com/andrey-git/pysensibo/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pysmarlaapi/default.nix b/pkgs/development/python-modules/pysmarlaapi/default.nix index d5745c1bb9b7..0dd8b76cdba3 100644 --- a/pkgs/development/python-modules/pysmarlaapi/default.nix +++ b/pkgs/development/python-modules/pysmarlaapi/default.nix @@ -8,7 +8,7 @@ pysignalr, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysmarlaapi"; version = "1.0.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Explicatis-GmbH"; repo = "pysmarlaapi"; - tag = version; + tag = finalAttrs.version; hash = "sha256-teRdxYe9thM22tZ09FHxOxxzy4gcfJBAylgpk34ISTk="; }; @@ -33,10 +33,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pysmarlaapi" ]; meta = { - changelog = "https://github.com/Explicatis-GmbH/pysmarlaapi/releases/tag/${src.tag}"; + changelog = "https://github.com/Explicatis-GmbH/pysmarlaapi/releases/tag/${finalAttrs.src.tag}"; description = "Swing2Sleep Smarla API"; homepage = "https://github.com/Explicatis-GmbH/pysmarlaapi"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix index 2a19af6458d1..a475575ba942 100644 --- a/pkgs/development/python-modules/pysnooper/default.nix +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysnooper"; version = "1.2.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cool-RR"; repo = "PySnooper"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+Cjqi0xkWO4QVAZymmcper4dal9pNWbpPgPY4UzbXfA="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ seqizz ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix index 39de443d3b4b..dfdb75483059 100644 --- a/pkgs/development/python-modules/pytautulli/default.nix +++ b/pkgs/development/python-modules/pytautulli/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytautulli"; version = "23.1.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = "pytautulli"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5wE8FjLFu1oQkVqnWsbp253dsQ1/QGWC6hHSIFwLajY="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { # Upstream is releasing with the help of a CI to PyPI, GitHub releases # are not in their focus substituteInPlace setup.py \ - --replace-fail 'version="main",' 'version="${version}",' + --replace-fail 'version="main",' 'version="${finalAttrs.version}",' # yarl 1.9.4 requires ports to be ints substituteInPlace pytautulli/models/host_configuration.py \ @@ -57,8 +57,8 @@ buildPythonPackage rec { meta = { description = "Python module to get information from Tautulli"; homepage = "https://github.com/ludeeus/pytautulli"; - changelog = "https://github.com/ludeeus/pytautulli/releases/tag/${version}"; + changelog = "https://github.com/ludeeus/pytautulli/releases/tag/${finalAttrs.version}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-base-url/default.nix b/pkgs/development/python-modules/pytest-base-url/default.nix index fa678ef2dc52..3ef4d99cb420 100644 --- a/pkgs/development/python-modules/pytest-base-url/default.nix +++ b/pkgs/development/python-modules/pytest-base-url/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-base-url"; version = "2.1.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-base-url"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3P3Uk3QoznAtNODLjXFbeNn3AOfp9owWU2jqkxTEAa4="; }; @@ -52,8 +52,8 @@ buildPythonPackage rec { meta = { description = "Pytest plugin for URL based tests"; homepage = "https://github.com/pytest-dev/pytest-base-url"; - changelog = "https://github.com/pytest-dev/pytest-base-url/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/pytest-dev/pytest-base-url/blob/${finalAttrs.src.rev}/CHANGES.rst"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ sephi ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 964f73614da4..cc41563099e5 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,14 +10,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-django"; version = "4.11.1"; pyproject = true; src = fetchPypi { pname = "pytest_django"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-qUkUGh7hA8sOeiDxRR01X4P15KXQe91Nz90f0P8ieZE="; }; @@ -47,10 +47,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = { - changelog = "https://github.com/pytest-dev/pytest-django/blob/v${version}/docs/changelog.rst"; + changelog = "https://github.com/pytest-dev/pytest-django/blob/v${finalAttrs.version}/docs/changelog.rst"; description = "Pytest plugin for testing of Django applications"; homepage = "https://pytest-django.readthedocs.org/en/latest/"; license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-expect/default.nix b/pkgs/development/python-modules/pytest-expect/default.nix index 0a8211cdb2dd..a21c970a3eca 100644 --- a/pkgs/development/python-modules/pytest-expect/default.nix +++ b/pkgs/development/python-modules/pytest-expect/default.nix @@ -7,13 +7,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-expect"; version = "1.1.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "36b4462704450798197d090809a05f4e13649d9cba9acdc557ce9517da1fd847"; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/gsnedders/pytest-expect"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index 4329d5a45df9..49bc9fd62ef2 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -6,7 +6,7 @@ pyflakes, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { # upstream has abandoned project in favor of pytest-flake8 # retaining package to not break other packages pname = "pytest-flakes"; @@ -14,7 +14,7 @@ buildPythonPackage rec { format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "953134e97215ae31f6879fbd7368c18d43f709dc2fab5b7777db2bb2bac3a924"; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/pytest-flakes"; description = "Pytest plugin to check source code with pyflakes"; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 6ec6681962df..f00b6a996d55 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -7,14 +7,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-localserver"; version = "0.10.0"; pyproject = true; src = fetchPypi { pname = "pytest_localserver"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-JgcZfzkJEqslUl0SmsQ8PIdQSSVzaLP+CbXNA9zFJq8="; }; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Plugin for the pytest testing framework to test server connections locally"; homepage = "https://github.com/pytest-dev/pytest-localserver"; - changelog = "https://github.com/pytest-dev/pytest-localserver/blob/v${version}/CHANGES"; + changelog = "https://github.com/pytest-dev/pytest-localserver/blob/v${finalAttrs.version}/CHANGES"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ siriobalmelli ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index a7ba0b98b07c..114c81cbca43 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -8,14 +8,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-metadata"; version = "3.1.1"; pyproject = true; src = fetchPypi { pname = "pytest_metadata"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-0qKbA1X7wD8WiqltQf+IsaO0SjsCrL5JGAHJigSAF8g="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ mpoquet ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-raises/default.nix b/pkgs/development/python-modules/pytest-raises/default.nix index 5f0ed6eecc31..ec0a2adf5dfb 100644 --- a/pkgs/development/python-modules/pytest-raises/default.nix +++ b/pkgs/development/python-modules/pytest-raises/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-raises"; version = "0.11"; format = "setuptools"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Lemmons"; repo = "pytest-raises"; - tag = version; + tag = finalAttrs.version; hash = "sha256-wmtWPWwe1sFbWSYxs5ZXDUZM1qvjRGMudWdjQeskaz0="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index aa382404f39d..35b5965ddf7c 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -7,7 +7,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-docs-theme"; version = "2025.12"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python"; repo = "python-docs-theme"; - tag = version; + tag = finalAttrs.version; hash = "sha256-isKfYgakIsPdMSATx9tjjb+U8oERN560NkBDkbt9AeM="; }; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Sphinx theme for CPython project"; homepage = "https://github.com/python/python-docs-theme"; - changelog = "https://github.com/python/python-docs-theme/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/python/python-docs-theme/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.psfl; maintainers = with lib.maintainers; [ kaction ]; }; -} +}) diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix index ee5183dbe8a4..da83c7856060 100644 --- a/pkgs/development/python-modules/python3-saml/default.nix +++ b/pkgs/development/python-modules/python3-saml/default.nix @@ -11,7 +11,7 @@ xmlsec, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python3-saml"; version = "1.16.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "onelogin"; repo = "python3-saml"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KyDGmqhg/c29FaXPKK8rWKSBP6BOCpKKpOujCavXUcc="; }; @@ -62,8 +62,8 @@ buildPythonPackage rec { meta = { description = "OneLogin's SAML Python Toolkit"; homepage = "https://github.com/onelogin/python3-saml"; - changelog = "https://github.com/SAML-Toolkits/python3-saml/blob/v${version}/changelog.md"; + changelog = "https://github.com/SAML-Toolkits/python3-saml/blob/v${finalAttrs.version}/changelog.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ zhaofengli ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index b655596b1450..b1e4744e31f0 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -7,7 +7,7 @@ tokenize-rt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyupgrade"; version = "3.21.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asottile"; repo = "pyupgrade"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-u4iudzPhVuAOS9cL3z6FCVpWKJZHg7UGpe9aHnN7Byc="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ lovesegfault ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index e707085be503..6593f4c8cafa 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -10,13 +10,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyvex"; version = "9.2.154"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-a3ei2w66v18QKAofpPvDUoM42zHRHPrNQic+FE+rLKY="; }; @@ -64,4 +64,4 @@ buildPythonPackage rec { ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index 068022c598fb..5359a74a4397 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -9,14 +9,14 @@ panel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyviz-comms"; version = "3.0.6"; pyproject = true; src = fetchPypi { pname = "pyviz_comms"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-c9ZrYgOQ2XlZssTYosB3jUH+IFgb5HF/AeRrj66MVpU="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyws66i/default.nix b/pkgs/development/python-modules/pyws66i/default.nix index f0a1cdab0636..2eaaa3f91df7 100644 --- a/pkgs/development/python-modules/pyws66i/default.nix +++ b/pkgs/development/python-modules/pyws66i/default.nix @@ -7,7 +7,7 @@ standard-telnetlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyws66i"; version = "1.1"; format = "setuptools"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ssaenger"; repo = "pyws66i"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-NTL2+xLqSNsz4YdUTwr0nFjhm1NNgB8qDnWSoE2sizY="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyyaml-env-tag/default.nix b/pkgs/development/python-modules/pyyaml-env-tag/default.nix index 9e15b47621c0..508058f4ee86 100644 --- a/pkgs/development/python-modules/pyyaml-env-tag/default.nix +++ b/pkgs/development/python-modules/pyyaml-env-tag/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyyaml-env-tag"; version = "1.1"; pyproject = true; src = fetchPypi { pname = "pyyaml_env_tag"; - inherit version; + inherit (finalAttrs) version; sha256 = "sha256-LrOLdaLSHuBHXW2X7BnGMoen4UAjHkIUlp0OrJI81/8="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/qrcodegen/default.nix b/pkgs/development/python-modules/qrcodegen/default.nix index d7059a568dec..06d256d5d9e3 100644 --- a/pkgs/development/python-modules/qrcodegen/default.nix +++ b/pkgs/development/python-modules/qrcodegen/default.nix @@ -6,7 +6,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qrcodegen"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src ; - sourceRoot = "${src.name}/python"; + sourceRoot = "${finalAttrs.src.name}/python"; build-system = [ setuptools ]; @@ -38,4 +38,4 @@ buildPythonPackage rec { platforms ; }; -} +}) diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index 5a6cef69983b..10a9fb2d0f17 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -18,13 +18,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "quandl"; version = "3.7.0"; format = "setuptools"; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "Quandl"; hash = "sha256-bguC+8eGFhCzV3xTlyd8QiDgZe7g/tTkbNa2AhZVtkw="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ ilya-kolpakov ]; }; -} +}) diff --git a/pkgs/development/python-modules/randomfiletree/default.nix b/pkgs/development/python-modules/randomfiletree/default.nix index 5b6d433f752d..4347ace79819 100644 --- a/pkgs/development/python-modules/randomfiletree/default.nix +++ b/pkgs/development/python-modules/randomfiletree/default.nix @@ -4,14 +4,14 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "randomfiletree"; version = "1.2.0"; format = "setuptools"; src = fetchPypi { pname = "RandomFileTree"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-OpLhLsvwk9xrP8FAXGkDDtMts6ikpx8ockvTR/TEmvw="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ twitchy0 ]; }; -} +}) diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index 1fb0049f76e9..72e52c9f9f6f 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -12,7 +12,7 @@ pexpect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "readchar"; version = "4.2.1"; pyproject = true; @@ -20,8 +20,8 @@ buildPythonPackage rec { # Don't use wheels on PyPI src = fetchFromGitHub { owner = "magmax"; - repo = "python-${pname}"; - tag = "v${version}"; + repo = "python-${finalAttrs.pname}"; + tag = "v${finalAttrs.version}"; hash = "sha256-r+dKGv0a7AU+Ef94AGCCJLQolLqTTxaNmqRQYkxk15s="; }; @@ -30,7 +30,7 @@ buildPythonPackage rec { postPatch = '' # Tags on GitHub still have a postfix (-dev0) - sed -i 's/\(version = "\)[^"]*\(".*\)/\1${version}\2/' pyproject.toml + sed -i 's/\(version = "\)[^"]*\(".*\)/\1${finalAttrs.version}\2/' pyproject.toml # run Linux tests on Darwin as well # see https://github.com/magmax/python-readchar/pull/99 for why this is not upstreamed substituteInPlace tests/linux/conftest.py \ @@ -50,8 +50,8 @@ buildPythonPackage rec { meta = { description = "Python library to read characters and key strokes"; homepage = "https://github.com/magmax/python-readchar"; - changelog = "https://github.com/magmax/python-readchar/releases/tag/v${version}"; + changelog = "https://github.com/magmax/python-readchar/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mmahut ]; }; -} +}) diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix index 190909cf9550..ab6dde6c5ef4 100644 --- a/pkgs/development/python-modules/reedsolo/default.nix +++ b/pkgs/development/python-modules/reedsolo/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "reedsolo"; version = "1.7.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tomerfiliba"; repo = "reedsolomon"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nzdD1oGXHSeGDD/3PpQQEZYGAwn9ahD2KNYGqpgADh0="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ yorickvp ]; }; -} +}) diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix index 47790a3543ee..3624dafe8bab 100644 --- a/pkgs/development/python-modules/reflex-chakra/default.nix +++ b/pkgs/development/python-modules/reflex-chakra/default.nix @@ -8,7 +8,7 @@ uv-dynamic-versioning, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "reflex-chakra"; version = "0.8.2post1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex-chakra"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DugZRZpGP90EFkBjpAS1XkjrNPG6WWwCQPUcEZJ0ff8="; }; @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Chakra Implementation in Reflex"; homepage = "https://github.com/reflex-dev/reflex-chakra"; - changelog = "https://github.com/reflex-dev/reflex-chakra/releases/tag/${src.tag}"; + changelog = "https://github.com/reflex-dev/reflex-chakra/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/remotezip/default.nix b/pkgs/development/python-modules/remotezip/default.nix index 923df4c3b2e4..ebeb437395cb 100644 --- a/pkgs/development/python-modules/remotezip/default.nix +++ b/pkgs/development/python-modules/remotezip/default.nix @@ -8,7 +8,7 @@ requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "remotezip"; version = "0.12.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gtsystem"; repo = "python-remotezip"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TNEM7Dm4iH4Z/P/PAqjJppbn1CKmyi9Xpq/sU9O8uxg="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ nickcao ]; }; -} +}) diff --git a/pkgs/development/python-modules/repl-python-wakatime/default.nix b/pkgs/development/python-modules/repl-python-wakatime/default.nix index 93ee11c75742..d3d56ee62098 100644 --- a/pkgs/development/python-modules/repl-python-wakatime/default.nix +++ b/pkgs/development/python-modules/repl-python-wakatime/default.nix @@ -11,7 +11,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "repl-python-wakatime"; version = "0.1.6"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wakatime"; repo = "repl-python-wakatime"; - tag = version; + tag = finalAttrs.version; hash = "sha256-U7p0TnGtjxssYAMk6QteeU1Vdq7mrjdDZvwYhyNOIoY="; }; @@ -44,8 +44,8 @@ buildPythonPackage rec { meta = { description = "Python REPL plugin for automatic time tracking and metrics generated from your programming activity"; homepage = "https://github.com/wakatime/repl-python-wakatime"; - changelog = "https://github.com/wakatime/repl-python-wakatime/releases/tag/${src.tag}"; + changelog = "https://github.com/wakatime/repl-python-wakatime/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ jfvillablanca ]; }; -} +}) diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 38dc53c3229b..e961bf26a03b 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -13,7 +13,7 @@ robotstatuschecker, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "robotframework-seleniumlibrary"; version = "6.8.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robotframework"; repo = "SeleniumLibrary"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TyYlcmoV5q3mfV4II/7P/SApfSNd3yC1EFYcuHllcyQ="; }; @@ -49,10 +49,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = { - changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${src.tag}/docs/SeleniumLibrary-${version}.rst"; + changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${finalAttrs.src.tag}/docs/SeleniumLibrary-${finalAttrs.version}.rst"; description = "Web testing library for Robot Framework"; homepage = "https://github.com/robotframework/SeleniumLibrary"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index b1240d834fd9..270ff4c0ae2c 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -6,7 +6,7 @@ capstone, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ropgadget"; version = "7.7"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JonathanSalwan"; repo = "ROPgadget"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fKvXxz5SbrUynG/9pV6KMIxCVFU9l192oFJFB9HHBz0="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bennofs ]; }; -} +}) diff --git a/pkgs/development/python-modules/rtfde/default.nix b/pkgs/development/python-modules/rtfde/default.nix index 5f93e2f61e36..953d89a7467d 100644 --- a/pkgs/development/python-modules/rtfde/default.nix +++ b/pkgs/development/python-modules/rtfde/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rtfde"; version = "0.1.2.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "seamustuohy"; repo = "RTFDE"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1yjxp6N07I9kwFRtgsLo9UPSG4FU+ic1tNm6U/xWk74="; }; @@ -43,10 +43,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/seamustuohy/RTFDE/releases/tag/${src.tag}"; + changelog = "https://github.com/seamustuohy/RTFDE/releases/tag/${finalAttrs.src.tag}"; description = "Library for extracting encapsulated HTML and plain text content from the RTF bodies"; homepage = "https://github.com/seamustuohy/RTFDE"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index 2f40862c9b11..2451d45b336f 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -13,7 +13,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sense-energy"; version = "0.14.1"; pyproject = true; @@ -21,13 +21,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scottbonline"; repo = "sense"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xHI4HuPZFVqBNCC9+bILRVLoZ1LFBW9N0tVT8UzYClw="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}" + --replace-fail "{{VERSION_PLACEHOLDER}}" "${finalAttrs.version}" ''; build-system = [ setuptools ]; @@ -51,8 +51,8 @@ buildPythonPackage rec { meta = { description = "API for the Sense Energy Monitor"; homepage = "https://github.com/scottbonline/sense"; - changelog = "https://github.com/scottbonline/sense/releases/tag/${src.tag}"; + changelog = "https://github.com/scottbonline/sense/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/serverfiles/default.nix b/pkgs/development/python-modules/serverfiles/default.nix index 5decec746d7b..5e6670efaac5 100644 --- a/pkgs/development/python-modules/serverfiles/default.nix +++ b/pkgs/development/python-modules/serverfiles/default.nix @@ -6,13 +6,13 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "serverfiles"; version = "0.3.1"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XhD8MudYeR43NbwIvOLtRwKoOx5Fq5bF1ZzIruz76+E="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = [ lib.licenses.gpl3Plus ]; maintainers = [ lib.maintainers.lucasew ]; }; -} +}) diff --git a/pkgs/development/python-modules/service-identity/default.nix b/pkgs/development/python-modules/service-identity/default.nix index 26c96890bf9c..eb64e0455d16 100644 --- a/pkgs/development/python-modules/service-identity/default.nix +++ b/pkgs/development/python-modules/service-identity/default.nix @@ -14,7 +14,7 @@ pyopenssl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "service-identity"; version = "24.2.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyca"; repo = "service-identity"; - tag = version; + tag = finalAttrs.version; hash = "sha256-onxCUWqGVeenLqB5lpUpj3jjxTM61ogXCQOGnDnClT4="; }; @@ -49,8 +49,8 @@ buildPythonPackage rec { meta = { description = "Service identity verification for pyOpenSSL"; homepage = "https://service-identity.readthedocs.io"; - changelog = "https://github.com/pyca/service-identity/releases/tag/${version}"; + changelog = "https://github.com/pyca/service-identity/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/signify/default.nix b/pkgs/development/python-modules/signify/default.nix index c931fbf863c4..92a0b6f321fb 100644 --- a/pkgs/development/python-modules/signify/default.nix +++ b/pkgs/development/python-modules/signify/default.nix @@ -11,7 +11,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "signify"; version = "0.9.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ralphje"; repo = "signify"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ICmBzIbkynxRNojNQrQZoydMyFd6j3F1BLWN8VeB5dE="; }; @@ -38,10 +38,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - changelog = "https://github.com/ralphje/signify/blob/refs/tags/${src.tag}/docs/changelog.rst"; + changelog = "https://github.com/ralphje/signify/blob/refs/tags/${finalAttrs.src.tag}/docs/changelog.rst"; description = "Library that verifies PE Authenticode-signed binaries"; homepage = "https://github.com/ralphje/signify"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ baloo ]; }; -} +}) diff --git a/pkgs/development/python-modules/slovnet/default.nix b/pkgs/development/python-modules/slovnet/default.nix index 5a2515ed3810..2c42ca86d65e 100644 --- a/pkgs/development/python-modules/slovnet/default.nix +++ b/pkgs/development/python-modules/slovnet/default.nix @@ -8,13 +8,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "slovnet"; version = "0.6.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AtIle9ybnMHSQr007iyGHGSPcIPveJj+FGirzDge95k="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ npatsakula ]; }; -} +}) diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index 3a39c5e4a357..2f5c94b43399 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -5,13 +5,13 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "snowballstemmer"; version = "3.0.1"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-bV7u7I6fhNTVa4R2krrPebwsjpDH+AykRE/4tvLlKJU="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/python-modules/snowplow-tracker/default.nix b/pkgs/development/python-modules/snowplow-tracker/default.nix index bf4b0d82b0ce..9b31712d8109 100644 --- a/pkgs/development/python-modules/snowplow-tracker/default.nix +++ b/pkgs/development/python-modules/snowplow-tracker/default.nix @@ -10,7 +10,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "snowplow-tracker"; version = "1.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "snowplow"; repo = "snowplow-python-tracker"; - tag = version; + tag = finalAttrs.version; hash = "sha256-GfKMoMUUOxiUcUVdDc6YGgO+CVRvFjDtqQU/FrTO41U="; }; @@ -38,10 +38,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/snowplow/snowplow-python-tracker/blob/${src.tag}/CHANGES.txt"; + changelog = "https://github.com/snowplow/snowplow-python-tracker/blob/${finalAttrs.src.tag}/CHANGES.txt"; description = "Add analytics to your Python and Django apps, webapps and games"; homepage = "https://github.com/snowplow/snowplow-python-tracker"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 98619aa26173..2b9382f65109 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -13,7 +13,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "solo-python"; version = "0.1.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "solokeys"; repo = "solo-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { # https://github.com/solokeys/solo1-cli/issues/157 broken = lib.versionAtLeast fido2.version "1.0.0"; }; -} +}) diff --git a/pkgs/development/python-modules/spacy-curated-transformers/default.nix b/pkgs/development/python-modules/spacy-curated-transformers/default.nix index 33a507af91d7..22d8a94dd6b8 100644 --- a/pkgs/development/python-modules/spacy-curated-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-curated-transformers/default.nix @@ -9,7 +9,7 @@ torch, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spacy-curated-transformers"; version = "2.1.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "explosion"; repo = "spacy-curated-transformers"; - tag = "release-v${version}"; + tag = "release-v${finalAttrs.version}"; hash = "sha256-Y3puV9fDN5mAugLPmXuoIbwUBpSMcmkq+oXAyYdmQew="; }; @@ -41,8 +41,8 @@ buildPythonPackage rec { meta = { description = "spaCy entry points for Curated Transformers"; homepage = "https://github.com/explosion/spacy-curated-transformers"; - changelog = "https://github.com/explosion/spacy-curated-transformers/releases/tag/v${version}"; + changelog = "https://github.com/explosion/spacy-curated-transformers/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ danieldk ]; }; -} +}) diff --git a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix index 9d8b9d51e89b..df20d32593f4 100644 --- a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix +++ b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix @@ -6,7 +6,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-inline-tabs"; version = "2025.12.21.14"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pradyunsg"; repo = "sphinx-inline-tabs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-aHsTdCVu/e9uaM4ayOfY3IBjjivZwDiHoWA0W2vyvNA="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ Luflosi ]; }; -} +}) diff --git a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix index 7a60a1d79427..94826b6f3f68 100644 --- a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix +++ b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix @@ -15,7 +15,7 @@ defusedxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-jupyterbook-latex"; version = "1.0.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; repo = "sphinx-jupyterbook-latex"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZTR+s6a/++xXrLMtfFRmSmAeMWa/1de12ukxfsx85g4="; }; @@ -50,8 +50,8 @@ buildPythonPackage rec { meta = { description = "Latex specific features for jupyter book"; homepage = "https://github.com/executablebooks/sphinx-jupyterbook-latex"; - changelog = "https://github.com/executablebooks/sphinx-jupyterbook-latex/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/executablebooks/sphinx-jupyterbook-latex/raw/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index a5ec2c3a9725..aba070269087 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -5,14 +5,14 @@ isPy27, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-jsmath"; version = "1.0.1"; format = "setuptools"; disabled = isPy27; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-doc/sphinxcontrib-jsmath"; license = lib.licenses.bsd0; }; -} +}) diff --git a/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix b/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix index d62ed7292095..faa5daccbf22 100644 --- a/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix @@ -5,7 +5,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-log-cabinet"; version = "1.0.1"; format = "setuptools"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "davidism"; repo = "sphinxcontrib-log-cabinet"; - tag = version; + tag = finalAttrs.version; sha256 = "03cxspgqsap9q74sqkdx6r6b4gs4hq6dpvx4j58hm50yfhs06wn1"; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ kaction ]; }; -} +}) diff --git a/pkgs/development/python-modules/spython/default.nix b/pkgs/development/python-modules/spython/default.nix index fe4d698358b7..1b2b2902dc7c 100644 --- a/pkgs/development/python-modules/spython/default.nix +++ b/pkgs/development/python-modules/spython/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spython"; version = "0.3.15"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "singularityhub"; repo = "singularity-cli"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XYiudDXXiX0izFZZpQb71DBg/wRKjeupvKHixGFVuKM="; }; @@ -44,9 +44,9 @@ buildPythonPackage rec { meta = { description = "Streamlined singularity python client (spython) for singularity"; homepage = "https://github.com/singularityhub/singularity-cli"; - changelog = "https://github.com/singularityhub/singularity-cli/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/singularityhub/singularity-cli/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "spython"; }; -} +}) diff --git a/pkgs/development/python-modules/sre-yield/default.nix b/pkgs/development/python-modules/sre-yield/default.nix index 9b583b42c9de..c81e18c1df81 100644 --- a/pkgs/development/python-modules/sre-yield/default.nix +++ b/pkgs/development/python-modules/sre-yield/default.nix @@ -6,14 +6,14 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sre-yield"; version = "1.2"; format = "setuptools"; src = fetchPypi { pname = "sre_yield"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-6U8aKjy6//4dzRXB1U5AGhUX4FKqZMfTFk+I3HYde4o="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ danc86 ]; }; -} +}) diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index af454ac9b782..746286fcf2ea 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -6,13 +6,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "srptools"; version = "1.0.1"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-f6QzclahVC6PW7S+0Z4dmuqY/l/5uvdmkzQqHdasfJY="; }; @@ -26,8 +26,8 @@ buildPythonPackage rec { description = "Module to implement Secure Remote Password (SRP) authentication"; mainProgram = "srptools"; homepage = "https://github.com/idlesign/srptools"; - changelog = "https://github.com/idlesign/srptools/blob/v${version}/CHANGELOG"; + changelog = "https://github.com/idlesign/srptools/blob/v${finalAttrs.version}/CHANGELOG"; license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/svgelements/default.nix b/pkgs/development/python-modules/svgelements/default.nix index ab107fbecad8..0de7a72ed87c 100644 --- a/pkgs/development/python-modules/svgelements/default.nix +++ b/pkgs/development/python-modules/svgelements/default.nix @@ -14,7 +14,7 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "svgelements"; version = "1.9.6"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "meerk40t"; repo = "svgelements"; - tag = version; + tag = finalAttrs.version; hash = "sha256-nx2sGXeeh8S17TfRDFifQbdSxc4YGsDNnrPSSbxv7S4="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix index 78fab6105e3a..47673097ea0b 100644 --- a/pkgs/development/python-modules/svgwrite/default.nix +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -5,7 +5,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "svgwrite"; version = "1.4.3"; format = "setuptools"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mozman"; repo = "svgwrite"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-uOsrDhE9AwWU7GIrCVuL3uXTPqtrh8sofvo2C5t+25I="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/mozman/svgwrite"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/systemrdl-compiler/default.nix b/pkgs/development/python-modules/systemrdl-compiler/default.nix index fcf0e6486c15..7763a6a78b19 100644 --- a/pkgs/development/python-modules/systemrdl-compiler/default.nix +++ b/pkgs/development/python-modules/systemrdl-compiler/default.nix @@ -10,7 +10,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "systemrdl-compiler"; version = "1.32.2"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SystemRDL"; repo = "systemrdl-compiler"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1Dx6WxSzGaZxwRzXR/bjfZSU7TsvTYNVN0NaK3qQ7eo="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.jmbaur ]; }; -} +}) diff --git a/pkgs/development/python-modules/tcxreader/default.nix b/pkgs/development/python-modules/tcxreader/default.nix index 551d47c0cf23..51402fca7680 100644 --- a/pkgs/development/python-modules/tcxreader/default.nix +++ b/pkgs/development/python-modules/tcxreader/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tcxreader"; version = "0.4.11"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alenrajsp"; repo = "tcxreader"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Iz0VQSukF5CI8lKaxKU4HEmU+n0EbQkuKmduOfsZ/GM="; }; @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "Reader for Garmin’s TCX file format"; homepage = "https://github.com/alenrajsp/tcxreader"; - changelog = "https://github.com/alenrajsp/tcxreader/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/alenrajsp/tcxreader/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ firefly-cpp ]; }; -} +}) diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix index b53f701ba9be..9c61387138b5 100644 --- a/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/pkgs/development/python-modules/teamcity-messages/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "teamcity-messages"; version = "1.33"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JetBrains"; repo = "teamcity-messages"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BAwAfe54J+gbbiz03Yiu3eC/9RnI7P0mfR3nfM1oKZw="; }; @@ -29,8 +29,8 @@ buildPythonPackage rec { meta = { description = "Python unit test reporting to TeamCity"; homepage = "https://github.com/JetBrains/teamcity-messages"; - changelog = "https://github.com/JetBrains/teamcity-messages/releases/tag/v${src.tag}"; + changelog = "https://github.com/JetBrains/teamcity-messages/releases/tag/v${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/tellcore-net/default.nix b/pkgs/development/python-modules/tellcore-net/default.nix index 4e513953e9da..56c54a9c72df 100644 --- a/pkgs/development/python-modules/tellcore-net/default.nix +++ b/pkgs/development/python-modules/tellcore-net/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tellcore-net"; version = "0.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "tellcore-net"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yMNAu8iSFB2UDqJR3u2XFelpGRKzi/3HyuEbrZK6v8g="; }; @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "Python module that allows to run tellcore over TCP/IP"; homepage = "https://github.com/home-assistant-libs/tellcore-net"; - changelog = "https://github.com/home-assistant-libs/tellcore-net/releases/tag/${version}"; + changelog = "https://github.com/home-assistant-libs/tellcore-net/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.jamiemagee ]; }; -} +}) diff --git a/pkgs/development/python-modules/texsoup/default.nix b/pkgs/development/python-modules/texsoup/default.nix index d85deebf7479..361904d641ff 100644 --- a/pkgs/development/python-modules/texsoup/default.nix +++ b/pkgs/development/python-modules/texsoup/default.nix @@ -7,7 +7,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "texsoup"; version = "0.3.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alvinwan"; repo = "TexSoup"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XKYJycYivtrszU46B3Bd4JLrvckBpQu9gKDMdr6MyZU="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/textile/default.nix b/pkgs/development/python-modules/textile/default.nix index 28d30f93dd62..0f24fbc9e307 100644 --- a/pkgs/development/python-modules/textile/default.nix +++ b/pkgs/development/python-modules/textile/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textile"; version = "4.0.3"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "textile"; repo = "python-textile"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KVDppsvX48loV9OJ70yqmQ5ZSypzcxrjH1j31DcyfM8="; }; @@ -47,9 +47,9 @@ buildPythonPackage rec { meta = { description = "MOdule for generating web text"; homepage = "https://github.com/textile/python-textile"; - changelog = "https://github.com/textile/python-textile/blob/${version}/CHANGELOG.textile"; + changelog = "https://github.com/textile/python-textile/blob/${finalAttrs.version}/CHANGELOG.textile"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; mainProgram = "pytextile"; }; -} +}) diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix index ba60e1ed6b8e..095860813e73 100644 --- a/pkgs/development/python-modules/textual-textarea/default.nix +++ b/pkgs/development/python-modules/textual-textarea/default.nix @@ -18,7 +18,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textual-textarea"; version = "0.17.2"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tconbeer"; repo = "textual-textarea"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-y+2WvqD96eYkDEJn5qCGfGFNiJFAcF4KWWNgAIZUqJo="; }; @@ -62,8 +62,8 @@ buildPythonPackage rec { meta = { description = "Text area (multi-line input) with syntax highlighting for Textual"; homepage = "https://github.com/tconbeer/textual-textarea"; - changelog = "https://github.com/tconbeer/textual-textarea/releases/tag/v${version}"; + changelog = "https://github.com/tconbeer/textual-textarea/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pcboy ]; }; -} +}) diff --git a/pkgs/development/python-modules/toptica-lasersdk/default.nix b/pkgs/development/python-modules/toptica-lasersdk/default.nix index 13ddab17b036..4554abdde04b 100644 --- a/pkgs/development/python-modules/toptica-lasersdk/default.nix +++ b/pkgs/development/python-modules/toptica-lasersdk/default.nix @@ -11,14 +11,14 @@ pyserial, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "toptica-lasersdk"; version = "3.3.0"; pyproject = true; src = fetchPypi { pname = "toptica_lasersdk"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-VzgQCqfZP9JoFmotG0jPJpHMxLY+unNZqzxQGhtlYC4="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ doronbehar ]; }; -} +}) diff --git a/pkgs/development/python-modules/torch-audiomentations/default.nix b/pkgs/development/python-modules/torch-audiomentations/default.nix index 280b632821fc..ca01c81ced29 100644 --- a/pkgs/development/python-modules/torch-audiomentations/default.nix +++ b/pkgs/development/python-modules/torch-audiomentations/default.nix @@ -18,7 +18,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "torch-audiomentations"; version = "0.12.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asteroid-team"; repo = "torch-audiomentations"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5ccVO1ECiIn0q7m8ZLHxqD2fhaXeMDKUEswa49dRTsY="; }; @@ -74,8 +74,8 @@ buildPythonPackage rec { meta = { description = "Fast audio data augmentation in PyTorch"; homepage = "https://github.com/asteroid-team/torch-audiomentations"; - changelog = "https://github.com/asteroid-team/torch-audiomentations/releases/tag/v${version}"; + changelog = "https://github.com/asteroid-team/torch-audiomentations/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthewcroughan ]; }; -} +}) diff --git a/pkgs/development/python-modules/translatepy/default.nix b/pkgs/development/python-modules/translatepy/default.nix index 3a37f8f64c84..64d6973ec9c9 100644 --- a/pkgs/development/python-modules/translatepy/default.nix +++ b/pkgs/development/python-modules/translatepy/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "translatepy"; version = "2.3"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Animenosekai"; repo = "translate"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cx5OeBrB8il8KrcyOmQbQ7VCXoaA5RP++oTTxCs/PcM="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { license = with lib.licenses; [ agpl3Only ]; maintainers = with lib.maintainers; [ emilytrau ]; }; -} +}) diff --git a/pkgs/development/python-modules/translation-finder/default.nix b/pkgs/development/python-modules/translation-finder/default.nix index 6246e13fd442..afbbf84b5185 100644 --- a/pkgs/development/python-modules/translation-finder/default.nix +++ b/pkgs/development/python-modules/translation-finder/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "translation-finder"; version = "2.24"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "WeblateOrg"; repo = "translation-finder"; - tag = version; + tag = finalAttrs.version; hash = "sha256-OVAsw+snISVyz3ZvcfqCpv0BRfTNzYSpI+YLafW5OQg="; }; @@ -37,10 +37,10 @@ buildPythonPackage rec { meta = { description = "Translation file finder for Weblate"; homepage = "https://github.com/WeblateOrg/translation-finder"; - changelog = "https://github.com/WeblateOrg/translation-finder/blob/${src.tag}/CHANGES.rst"; + changelog = "https://github.com/WeblateOrg/translation-finder/blob/${finalAttrs.src.tag}/CHANGES.rst"; license = lib.licenses.gpl3Only; mainProgram = "weblate-discover"; maintainers = with lib.maintainers; [ erictapen ]; }; -} +}) diff --git a/pkgs/development/python-modules/tree-sitter-python/default.nix b/pkgs/development/python-modules/tree-sitter-python/default.nix index 98657560eaa3..5f1f1c3381e7 100644 --- a/pkgs/development/python-modules/tree-sitter-python/default.nix +++ b/pkgs/development/python-modules/tree-sitter-python/default.nix @@ -6,7 +6,7 @@ tree-sitter, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tree-sitter-python"; version = "0.25.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-F5XH21PjPpbwYylgKdwD3MZ5o0amDt4xf/e5UikPcxY="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ doronbehar ]; }; -} +}) diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 93a7c75564cf..29c65ae713d8 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -18,13 +18,13 @@ httpbin, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "treq"; version = "25.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Jd3jpVroXsLyxWMyyZrvJVqxT5l9DQBVLr/xNTipgEo="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 4e4a4d3b53c2..d2e37aa24ae4 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -25,7 +25,7 @@ mapbox-earcut, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trimesh"; version = "4.11.5"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mikedh"; repo = "trimesh"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LF7tjthYtsEZJLqBiQZBe4urLjSD3Vbi3g1ZJ++0Tyk="; }; @@ -92,11 +92,11 @@ buildPythonPackage rec { meta = { description = "Python library for loading and using triangular meshes"; homepage = "https://trimesh.org/"; - changelog = "https://github.com/mikedh/trimesh/releases/tag/${src.tag}"; + changelog = "https://github.com/mikedh/trimesh/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; mainProgram = "trimesh"; maintainers = with lib.maintainers; [ pbsds ]; }; -} +}) diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index bbc33844e1d5..e53474418e18 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -8,13 +8,13 @@ docopt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tubeup"; version = "2025.5.11"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LZ/kNtw5Tw3PtqQp4Dq2qOeXgofID5upFvpLMXUIuiM="; }; @@ -37,8 +37,8 @@ buildPythonPackage rec { description = "Youtube (and other video site) to Internet Archive Uploader"; mainProgram = "tubeup"; homepage = "https://github.com/bibanon/tubeup"; - changelog = "https://github.com/bibanon/tubeup/releases/tag/${version}"; + changelog = "https://github.com/bibanon/tubeup/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index 26d01980c15b..487816e39467 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -11,13 +11,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "twill"; version = "3.3.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/ZT5ntn7YMafrD9/rWaOvROKo+CGFKSldG9jjH/eR0Q="; }; @@ -47,8 +47,8 @@ buildPythonPackage rec { meta = { description = "Simple scripting language for Web browsing"; homepage = "https://twill-tools.github.io/twill/"; - changelog = "https://github.com/twill-tools/twill/releases/tag/v${version}"; + changelog = "https://github.com/twill-tools/twill/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mic92 ]; }; -} +}) diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix index ccf561b1583f..71758c8a20c6 100644 --- a/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/pkgs/development/python-modules/types-pyyaml/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-pyyaml"; version = "6.0.12.20250915"; pyproject = true; src = fetchPypi { pname = "types_pyyaml"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-D4tUpSjDA/Dm9xZWh90z+vqByAf8rCP2MrY6piTO0dM="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dnr ]; }; -} +}) diff --git a/pkgs/development/python-modules/types-six/default.nix b/pkgs/development/python-modules/types-six/default.nix index 9b8d99cfa181..e2e946e75e2d 100644 --- a/pkgs/development/python-modules/types-six/default.nix +++ b/pkgs/development/python-modules/types-six/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-six"; version = "1.17.0.20251009"; pyproject = true; src = fetchPypi { pname = "types_six"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-7+AwZOzQ/7D3r+EzmQojmNhJPY0cHMEP89/kdtV7pE8="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ YorikSar ]; }; -} +}) diff --git a/pkgs/development/python-modules/unidns/default.nix b/pkgs/development/python-modules/unidns/default.nix index 4655b929538d..667b5f4d1190 100644 --- a/pkgs/development/python-modules/unidns/default.nix +++ b/pkgs/development/python-modules/unidns/default.nix @@ -6,7 +6,7 @@ asysocks, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unidns"; version = "0.0.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "skelsec"; repo = "unidns"; - tag = version; + tag = finalAttrs.version; hash = "sha256-uhTb27HeBaoI4yURpNf1+D6bWIXSsmYzUyk0RJmgbjQ="; }; @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Basic async DNS library"; homepage = "https://github.com/skelsec/unidns"; - changelog = "https://github.com/skelsec/unidns/releases/${src.tag}"; + changelog = "https://github.com/skelsec/unidns/releases/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sarahec ]; }; -} +}) diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix index 8804cc9fd8b0..68fe60963051 100644 --- a/pkgs/development/python-modules/venstarcolortouch/default.nix +++ b/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -5,13 +5,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "venstarcolortouch"; version = "0.21"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-M+Sbpue6Z8+pvxzhq3teM84ect+pilwmlRe9PJYDzPU="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/videocr/default.nix b/pkgs/development/python-modules/videocr/default.nix index 0be19fa99e43..408003f34cb5 100644 --- a/pkgs/development/python-modules/videocr/default.nix +++ b/pkgs/development/python-modules/videocr/default.nix @@ -9,13 +9,13 @@ fuzzywuzzy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "videocr"; version = "0.1.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-w0hPfUK4un5JAjAP7vwOAuKlsZ+zv6sFV2vD/Rl3kbI="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ ozkutuk ]; }; -} +}) diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix index 1f286aa844cf..4d0ff2848a11 100644 --- a/pkgs/development/python-modules/viv-utils/default.nix +++ b/pkgs/development/python-modules/viv-utils/default.nix @@ -13,7 +13,7 @@ vivisect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "viv-utils"; version = "0.8.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "williballenthin"; repo = "viv-utils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YyD6CFA8lhc1XU7pckKv3th422ssYZkRJ/JfQD5e65c="; }; @@ -51,8 +51,8 @@ buildPythonPackage rec { meta = { description = "Utilities for working with vivisect"; homepage = "https://github.com/williballenthin/viv-utils"; - changelog = "https://github.com/williballenthin/viv-utils/releases/tag/${src.tag}"; + changelog = "https://github.com/williballenthin/viv-utils/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index cd3115b6039e..ac45d40c7932 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -9,7 +9,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "warlock"; version = "2.0.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bcwaldon"; repo = "warlock"; - tag = version; + tag = finalAttrs.version; hash = "sha256-HOCLzFYmOL/tCXT+NO/tCZuVXVowNEPP3g33ZYg4+6Q="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/widlparser/default.nix b/pkgs/development/python-modules/widlparser/default.nix index 2daecf920d36..83c2bc8da79e 100644 --- a/pkgs/development/python-modules/widlparser/default.nix +++ b/pkgs/development/python-modules/widlparser/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "widlparser"; version = "1.4.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "plinss"; repo = "widlparser"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-vYDldZH49GfNRjKh3x0DX05jYFOLQtA//7bw+B16O1M="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/wrapio/default.nix b/pkgs/development/python-modules/wrapio/default.nix index 5ad808db24e3..62a1d6af0588 100644 --- a/pkgs/development/python-modules/wrapio/default.nix +++ b/pkgs/development/python-modules/wrapio/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wrapio"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CUocIbdZ/tJQCxAHzhFpB267ynlXf8Mu+thcRRc0yeg="; }; @@ -22,8 +22,8 @@ buildPythonPackage rec { meta = { description = "Handling event-based streams"; homepage = "https://github.com/Exahilosys/wrapio"; - changelog = "https://github.com/Exahilosys/wrapio/releases/tag/v${version}"; + changelog = "https://github.com/Exahilosys/wrapio/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sfrijters ]; }; -} +}) diff --git a/pkgs/development/python-modules/xarray-dataclass/default.nix b/pkgs/development/python-modules/xarray-dataclass/default.nix index c4e47a2a39b0..20003dc324ba 100644 --- a/pkgs/development/python-modules/xarray-dataclass/default.nix +++ b/pkgs/development/python-modules/xarray-dataclass/default.nix @@ -9,7 +9,7 @@ xarray, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xarray-dataclass"; version = "3.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xarray-contrib"; repo = "xarray-dataclass"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NHJvrkoRhq5cPSBBMWzrWVn+3sPvveMRgTXc/NdLfuA="; }; @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Xarray data creation made easy by dataclass"; homepage = "https://xarray-contrib.github.io/xarray-dataclass"; - changelog = "https://github.com/xarray-contrib/xarray-dataclass/releases/tag/v${version}"; + changelog = "https://github.com/xarray-contrib/xarray-dataclass/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; -} +}) diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index b97ea7668358..966b37992e97 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xattr"; version = "1.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MEOfq9feB4eyfppuHVacWVmFTLMi9kznOA/tv6UDUDY="; }; @@ -37,8 +37,8 @@ buildPythonPackage rec { description = "Python wrapper for extended filesystem attributes"; mainProgram = "xattr"; homepage = "https://github.com/xattr/xattr"; - changelog = "https://github.com/xattr/xattr/blob/v${version}/CHANGES.txt"; + changelog = "https://github.com/xattr/xattr/blob/v${finalAttrs.version}/CHANGES.txt"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix index cc0d02084464..d503a4b38e3a 100644 --- a/pkgs/development/python-modules/xstatic-jquery/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -4,14 +4,14 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xstatic-jquery"; version = "3.5.1.1"; format = "setuptools"; src = fetchPypi { pname = "XStatic-jQuery"; - inherit version; + inherit (finalAttrs) version; sha256 = "e0ae8f8ec5bbd28045ba4bca06767a38bd5fc27cf9b71f434589f59370dcd323"; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ makefu ]; }; -} +}) diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index 8041c2b8b2b1..269cf7f554a4 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -7,7 +7,7 @@ unstableGitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yapsy"; version = "1.12.2-unstable-2023-03-28"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-QKZlUAhYMCCsT/jbEHb39ESZ2+2FZYnhJnc1PgsozBA="; }; - sourceRoot = "${src.name}/package"; + sourceRoot = "${finalAttrs.src.name}/package"; build-system = [ setuptools ]; @@ -36,4 +36,4 @@ buildPythonPackage rec { description = "Yet another plugin system"; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index f92829e94c0c..9fd8d7bdb090 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -8,13 +8,13 @@ twisted, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zfec"; version = "1.6.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xaGGHCU7USaYwuczrk2D9eLW6myIG32+ETNLaU51WgA="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ prusnak ]; }; -} +}) diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index 8d1c0a7992a2..a5b9f41a374d 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zict"; version = "3.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4yHiY7apeq/AeQw8+zwEZWtwZuZzjDf//MqV2APJ+6U="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ teh ]; }; -} +}) diff --git a/pkgs/development/rocm-modules/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/rocm-docs-core/default.nix index 3de29d072aed..621df5c9b7bd 100644 --- a/pkgs/development/rocm-modules/rocm-docs-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-docs-core/default.nix @@ -22,7 +22,7 @@ }: # FIXME: Move to rocmPackages_common -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rocm-docs-core"; version = "1.33.1"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-docs-core"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-eHX5Vz3MmIHi6n90hgBm4Ik+MGhxmniw2Me6pyZVC+k="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/tools/prospector/setoptconf.nix b/pkgs/development/tools/prospector/setoptconf.nix index d3730c958085..7e456c9bd5fa 100644 --- a/pkgs/development/tools/prospector/setoptconf.nix +++ b/pkgs/development/tools/prospector/setoptconf.nix @@ -4,13 +4,13 @@ lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "setoptconf-tmp"; version = "0.3.1"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0y2pgpraa36wzlzkxigvmz80mqd3mzcc9wv2yx9bliqks7fhlj70"; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { kamadorueda ]; }; -} +}) diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 300a09727d59..e7065a8359fc 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; @@ -12,7 +12,7 @@ buildPythonPackage rec { format = "wheel"; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; format = "wheel"; pname = "home_assistant_frontend"; dist = "py3"; @@ -27,10 +27,10 @@ buildPythonPackage rec { doCheck = false; meta = { - changelog = "https://github.com/home-assistant/frontend/releases/tag/${version}"; + changelog = "https://github.com/home-assistant/frontend/releases/tag/${finalAttrs.version}"; description = "Frontend for Home Assistant"; homepage = "https://github.com/home-assistant/frontend"; license = lib.licenses.asl20; teams = [ lib.teams.home-assistant ]; }; -} +}) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index e768e2f97690..14196e478fec 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -19,7 +19,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "home-assistant-intents"; version = "2026.3.24"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "OHF-Voice"; repo = "intents-package"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-nwKMg5O/QnYFFviwg1vC++NoQfMpHHK0WoJaxa1xDwE="; }; @@ -60,10 +60,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/OHF-Voice/intents-package/releases/tag/${src.tag}"; + changelog = "https://github.com/OHF-Voice/intents-package/releases/tag/${finalAttrs.src.tag}"; description = "Intents to be used with Home Assistant"; homepage = "https://github.com/OHF-Voice/intents-package"; license = lib.licenses.cc-by-40; teams = [ lib.teams.home-assistant ]; }; -} +}) diff --git a/pkgs/servers/home-assistant/python-modules/hass-web-proxy-lib/default.nix b/pkgs/servers/home-assistant/python-modules/hass-web-proxy-lib/default.nix index 9298bb0e9476..0292eedc5a6e 100644 --- a/pkgs/servers/home-assistant/python-modules/hass-web-proxy-lib/default.nix +++ b/pkgs/servers/home-assistant/python-modules/hass-web-proxy-lib/default.nix @@ -22,7 +22,7 @@ home-assistant-custom-components, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hass-web-proxy-lib"; version = "0.0.7"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { # no tags on git src = fetchPypi { pname = "hass_web_proxy_lib"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-bhz71tNOpZ+4tSlndS+UbC3w2WW5+dAMtpk7TnnFpuQ="; }; @@ -74,4 +74,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = home-assistant-custom-components.frigate.meta.maintainers; }; -} +}) diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 6d2b8780f135..e4a7ba3ecda4 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -8,13 +8,13 @@ with python3.pkgs; -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hyperkitty"; version = "1.3.12"; pyproject = true; src = fetchurl { - url = "https://gitlab.com/mailman/hyperkitty/-/releases/${version}/downloads/hyperkitty-${version}.tar.gz"; + url = "https://gitlab.com/mailman/hyperkitty/-/releases/${finalAttrs.version}/downloads/hyperkitty-${finalAttrs.version}.tar.gz"; hash = "sha256-3rWCk37FvJ6pwdXYa/t2pNpCm2Dh/qb9aWTnxmfPFh0="; }; @@ -94,4 +94,4 @@ buildPythonPackage rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ qyliss ]; }; -} +}) diff --git a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index 17202d26564e..00d14363fcbd 100644 --- a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix +++ b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix @@ -7,13 +7,13 @@ }: with python3.pkgs; -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mailman-hyperkitty"; version = "1.2.1"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+Nad+8bMtYKJbUCpppRXqhB1zdbvvFXTTHlwJLQLzDg="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ qyliss ]; }; -} +}) diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 7fccec1d831a..75cd2331ff87 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -10,13 +10,13 @@ with python3.pkgs; -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mailman"; version = "3.3.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GblXI6IwkLl+V1gEbMAe1baVyZOHMaYaYITXcTkp2Mo="; }; @@ -90,4 +90,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ qyliss ]; }; -} +}) diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 84944c14b9af..4dd32b8cd8f7 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -7,13 +7,13 @@ with python3.pkgs; -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "postorius"; version = "1.3.10"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GmbIqO+03LgbUxJ1nTStXrYN3t2MfvzbeYRAipfTW1o="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ qyliss ]; }; -} +}) diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index 1a2b363c7cd7..97a09edd2e23 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -11,13 +11,13 @@ with python3.pkgs; -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mailman_web"; version = "0.0.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3wnduej6xMQzrjGhGXQznfJud/Uoy3BDduukRJeahL8="; }; @@ -65,4 +65,4 @@ buildPythonPackage rec { m1cr0man ]; }; -} +}) From 0478817a4dc82a8905c2867c8a92aadfc8ded51d Mon Sep 17 00:00:00 2001 From: crertel Date: Sun, 19 Apr 2026 18:31:15 -0500 Subject: [PATCH 246/246] lmstudio: 0.4.10.1 -> 0.4.12.1 --- pkgs/by-name/lm/lmstudio/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 769358c36214..645b2fc28619 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,12 +7,12 @@ let pname = "lmstudio"; - version_aarch64-linux = "0.4.10-1"; - hash_aarch64-linux = "sha256-fo9jUmEtqu8bkfL1/v84IAp3RG0ua5g4hgieszhWOuM="; - version_aarch64-darwin = "0.4.10-1"; - hash_aarch64-darwin = "sha256-LgaxbTXmiKyI/T8D+K+SLVzUgiQzOq/6JKEDwktrrDU="; - version_x86_64-linux = "0.4.10-1"; - hash_x86_64-linux = "sha256-FC7rPA1CxTaYakpSSpjxYiPETW8+N5QmsmUib3RHD0o="; + version_aarch64-linux = "0.4.12-1"; + hash_aarch64-linux = "sha256-Gt3QiP4P3BpbRf7gvdKLUaf9/oz/eef5M0bVzCqHPSw="; + version_aarch64-darwin = "0.4.12-1"; + hash_aarch64-darwin = "sha256-S4Xj1mzjxGBKAECmayVnL4p1a2HuvQlz+BKHO4oPM3U="; + version_x86_64-linux = "0.4.12-1"; + hash_x86_64-linux = "sha256-U7TJkMUqmL4Wk77zcIN2/4IFz7artvVg0saREjoGy8I="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";