From 0ba918e29914b264ddc3793bf25620a6fa58c4db Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Feb 2026 12:39:53 +0800 Subject: [PATCH 001/305] qt6Packages.waylib: drop --- pkgs/development/libraries/waylib/default.nix | 74 ------------------- pkgs/top-level/qt6-packages.nix | 2 - 2 files changed, 76 deletions(-) delete mode 100644 pkgs/development/libraries/waylib/default.nix diff --git a/pkgs/development/libraries/waylib/default.nix b/pkgs/development/libraries/waylib/default.nix deleted file mode 100644 index b6cb99025d64..000000000000 --- a/pkgs/development/libraries/waylib/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - wayland-scanner, - wrapQtAppsHook, - qtbase, - qtdeclarative, - qwlroots, - wayland, - wayland-protocols, - wlr-protocols, - pixman, - libdrm, - libinput, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "waylib"; - version = "0.6.14"; - - src = fetchFromGitHub { - owner = "vioken"; - repo = "waylib"; - rev = finalAttrs.version; - hash = "sha256-Yp7j1L+b41pmLWhxYN4M9W8OjXA31za3Ufp/iE3U/vM="; - }; - - depsBuildBuild = [ - # To find wayland-scanner - pkg-config - ]; - - nativeBuildInputs = [ - cmake - pkg-config - wayland-scanner - ]; - - buildInputs = [ - qtbase - qtdeclarative - qwlroots - wayland - wayland-protocols - wlr-protocols - pixman - libdrm - libinput - ]; - - strictDeps = true; - - dontWrapQtApps = true; - - outputs = [ - "out" - "dev" - ]; - - meta = { - description = "Wrapper for wlroots based on Qt"; - homepage = "https://github.com/vioken/waylib"; - license = with lib.licenses; [ - gpl3Only - lgpl3Only - asl20 - ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ wineee ]; - }; -}) diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 42d87e0f4d62..89380eaddb64 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -149,8 +149,6 @@ makeScopeWithSplicing' { timed = callPackage ../applications/system/timed { }; - waylib = callPackage ../development/libraries/waylib { }; - wayqt = callPackage ../development/libraries/wayqt { }; } ); From 8b4606b7558eb0ca36412fe8c5ddbc5604920d7c Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Feb 2026 12:40:31 +0800 Subject: [PATCH 002/305] qt6Packages.qwlroots: drop --- .../libraries/qwlroots/default.nix | 75 ------------------- pkgs/top-level/qt6-packages.nix | 4 - 2 files changed, 79 deletions(-) delete mode 100644 pkgs/development/libraries/qwlroots/default.nix diff --git a/pkgs/development/libraries/qwlroots/default.nix b/pkgs/development/libraries/qwlroots/default.nix deleted file mode 100644 index 49a105281e05..000000000000 --- a/pkgs/development/libraries/qwlroots/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - wrapQtAppsHook, - wayland-scanner, - qtbase, - wayland, - wayland-protocols, - wlr-protocols, - pixman, - libgbm, - vulkan-loader, - libinput, - libxcb-errors, - libxdmcp, - seatd, - wlroots, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "qwlroots"; - version = "0.5.3"; - - src = fetchFromGitHub { - owner = "vioken"; - repo = "qwlroots"; - rev = finalAttrs.version; - hash = "sha256-ZyG0JGUlz/ubtwN5wYtC8qeYsPur+0kTkD7iIjHX7KU="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - wayland-scanner - ]; - - buildInputs = [ - qtbase - wayland - wayland-protocols - wlr-protocols - pixman - libgbm - vulkan-loader - libinput - libxdmcp - libxcb-errors - seatd - ]; - - propagatedBuildInputs = [ - wlroots - ]; - - cmakeFlags = [ - (lib.cmakeBool "PREFER_QT_5" (lib.versionOlder qtbase.version "6")) - ]; - - dontWrapQtApps = true; - - meta = { - description = "Qt and QML bindings for wlroots"; - homepage = "https://github.com/vioken/qwlroots"; - license = with lib.licenses; [ - gpl3Only - lgpl3Only - asl20 - ]; - platforms = wlroots.meta.platforms; - maintainers = with lib.maintainers; [ wineee ]; - }; -}) diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 89380eaddb64..bd2aff231250 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -118,10 +118,6 @@ makeScopeWithSplicing' { qtspell = callPackage ../development/libraries/qtspell { }; - qwlroots = callPackage ../development/libraries/qwlroots { - wlroots = pkgs.wlroots_0_18; - }; - qwt = callPackage ../development/libraries/qwt/default.nix { }; qxlsx = callPackage ../development/libraries/qxlsx { }; From f43a2aaf79c12b2028d29a77b9519e86f0e94cd8 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Feb 2026 12:47:28 +0800 Subject: [PATCH 003/305] qt6Packages: add aliases for dropped packages --- pkgs/top-level/qt6-packages.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index bd2aff231250..b2cacadea0fa 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -147,5 +147,15 @@ makeScopeWithSplicing' { wayqt = callPackage ../development/libraries/wayqt { }; } + // lib.optionalAttrs config.allowAliases { + qwlroots = throw '' + 'qt6Packages.qwlroots' has been removed because it has been merged into treeland upstream. + The upstream no longer provides it as a standalone development library. + ''; # Added 2025-02-07 + waylib = throw '' + 'qt6Packages.waylib' has been removed because it has been merged into treeland upstream. + The upstream no longer provides it as a standalone development library. + ''; # Added 2025-02-07 + } ); } From 26b6d485cc0de1f431a55021ada5d9a4accadc7e Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 04:19:08 +0200 Subject: [PATCH 004/305] catppuccin-sddm: avoid .dev outputs propagation --- pkgs/by-name/ca/catppuccin-sddm/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin-sddm/package.nix b/pkgs/by-name/ca/catppuccin-sddm/package.nix index 88a7152552ea..3afb73c99358 100644 --- a/pkgs/by-name/ca/catppuccin-sddm/package.nix +++ b/pkgs/by-name/ca/catppuccin-sddm/package.nix @@ -35,7 +35,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - kdePackages.qtsvg + # avoid .dev outputs propagation + kdePackages.qtsvg.out ]; postPatch = '' @@ -91,11 +92,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - postFixup = '' - mkdir -p $out/nix-support - echo ${kdePackages.qtsvg} >> $out/nix-support/propagated-user-env-packages - ''; - meta = { description = "Soothing pastel theme for SDDM"; homepage = "https://github.com/catppuccin/sddm"; From 91d56f2fd4362e522ae7f1e6bfbcf23655e70681 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 04:19:13 +0200 Subject: [PATCH 005/305] catppuccin-sddm-corners: avoid .dev outputs propagation --- pkgs/by-name/ca/catppuccin-sddm-corners/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix b/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix index 0b8550de939f..e402e763397c 100644 --- a/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix +++ b/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix @@ -21,11 +21,12 @@ stdenvNoCC.mkDerivation { dontBuild = true; dontWrapQtApps = true; - propagatedUserEnvPkgs = with qt6; [ - qt5compat - qtwayland - qtquick3d - qtsvg + propagatedBuildInputs = with qt6; [ + # avoid .dev outputs propagation + qt5compat.out + qtwayland.out + qtquick3d.out + qtsvg.out ]; installPhase = '' From 80579d36f5cb0452bb299f9c4e9cbe0579d27953 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 04:19:16 +0200 Subject: [PATCH 006/305] where-is-my-sddm-theme: avoid .dev outputs propagation --- pkgs/by-name/wh/where-is-my-sddm-theme/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix index eb0fee939bc5..87041f4d3977 100644 --- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix +++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix @@ -43,12 +43,13 @@ lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants hash = "sha256-+R0PX84SL2qH8rZMfk3tqkhGWPR6DpY1LgX9bifNYCg="; }; - propagatedUserEnvPkgs = + propagatedBuildInputs = [ ] ++ lib.optionals (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ] + # avoid .dev outputs propagation ++ lib.optionals (lib.elem "qt6" variants) [ - qt6.qt5compat - qt6.qtsvg + qt6.qt5compat.out + qt6.qtsvg.out ]; installPhase = '' From f1058fdf675de7faa3f9af072de17f74d0d6f0e7 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 04:19:20 +0200 Subject: [PATCH 007/305] elegant-sddm: avoid .dev outputs propagation --- pkgs/by-name/el/elegant-sddm/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/el/elegant-sddm/package.nix b/pkgs/by-name/el/elegant-sddm/package.nix index aba9e5b902c2..2698963acff5 100644 --- a/pkgs/by-name/el/elegant-sddm/package.nix +++ b/pkgs/by-name/el/elegant-sddm/package.nix @@ -27,7 +27,8 @@ stdenvNoCC.mkDerivation { dontWrapQtApps = true; propagatedBuildInputs = [ - kdePackages.qt5compat + # avoid .dev outputs propagation + kdePackages.qt5compat.out ]; installPhase = '' From 942e62266583dd3fcf08d47099e8364b4d2135df Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 04:19:23 +0200 Subject: [PATCH 008/305] sddm-chili-theme: avoid .dev outputs propagation, add qtquickcontrols --- pkgs/by-name/sd/sddm-chili-theme/package.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sd/sddm-chili-theme/package.nix b/pkgs/by-name/sd/sddm-chili-theme/package.nix index 1708ec5ee2e4..24fab822e025 100644 --- a/pkgs/by-name/sd/sddm-chili-theme/package.nix +++ b/pkgs/by-name/sd/sddm-chili-theme/package.nix @@ -30,7 +30,9 @@ stdenv.mkDerivation { }; propagatedBuildInputs = [ - libsForQt5.qtgraphicaleffects + # avoid .dev outputs propagation + libsForQt5.qtgraphicaleffects.out + libsForQt5.qtquickcontrols.out ]; dontWrapQtApps = true; @@ -43,11 +45,6 @@ stdenv.mkDerivation { mv * $out/share/sddm/themes/chili/ ''; - postFixup = '' - mkdir -p $out/nix-support - - echo ${libsForQt5.qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages - ''; meta = { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ sents ]; From 959507dace3fc30c801911ea49bd218369bd5860 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 04:19:26 +0200 Subject: [PATCH 009/305] sddm-sugar-dark: avoid .dev outputs propagation --- pkgs/by-name/sd/sddm-sugar-dark/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/sddm-sugar-dark/package.nix b/pkgs/by-name/sd/sddm-sugar-dark/package.nix index 162f8e4ec266..ed9b093cd059 100644 --- a/pkgs/by-name/sd/sddm-sugar-dark/package.nix +++ b/pkgs/by-name/sd/sddm-sugar-dark/package.nix @@ -20,7 +20,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontWrapQtApps = true; - buildInputs = with libsForQt5.qt5; [ qtgraphicaleffects ]; + propagatedBuildInputs = [ + # avoid .dev outputs propagation + libsForQt5.qtgraphicaleffects.out + ]; installPhase = let From aef93624f94983b51b3b9d12a3421300174d0818 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 04:19:30 +0200 Subject: [PATCH 010/305] utterly-nord-plasma: avoid .dev outputs propagation --- pkgs/by-name/ut/utterly-nord-plasma/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ut/utterly-nord-plasma/package.nix b/pkgs/by-name/ut/utterly-nord-plasma/package.nix index 6e27725a1c30..7a1755fe99fe 100644 --- a/pkgs/by-name/ut/utterly-nord-plasma/package.nix +++ b/pkgs/by-name/ut/utterly-nord-plasma/package.nix @@ -16,12 +16,15 @@ stdenv.mkDerivation { hash = "sha256-moLgBFR+BgoiEBzV3y/LA6JZfLHrG1weL1+h8LN9ztA="; }; - propagatedUserEnvPkgs = with kdePackages; [ - breeze-icons - kdeclarative + dontWrapQtApps = true; + + propagatedBuildInputs = with kdePackages; [ + # avoid .dev outputs propagation + qt5compat.out kirigami - libplasma - plasma-workspace + libplasma.out + plasma5support.out + plasma-workspace.out ]; installPhase = '' From 378d1825bf977e2e4c491658aa23a29d4257ed46 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 04:19:34 +0200 Subject: [PATCH 011/305] nordic: avoid .dev outputs propagation --- pkgs/by-name/no/nordic/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/no/nordic/package.nix b/pkgs/by-name/no/nordic/package.nix index 418d526e703b..9369f13e7d9a 100644 --- a/pkgs/by-name/no/nordic/package.nix +++ b/pkgs/by-name/no/nordic/package.nix @@ -149,13 +149,11 @@ stdenvNoCC.mkDerivation { ''; postFixup = '' - # Propagate sddm theme dependencies to user env otherwise sddm - # does not find them. Putting them in buildInputs is not enough. - mkdir -p $sddm/nix-support - printWords ${kdePackages.breeze-icons} ${kdePackages.libplasma} ${kdePackages.plasma-workspace} \ - >> $sddm/nix-support/propagated-user-env-packages + # avoid .dev outputs propagation + printWords ${kdePackages.breeze-icons.out} ${kdePackages.libplasma.out} ${kdePackages.plasma-workspace.out} \ + >> $sddm/nix-support/propagated-build-inputs ''; meta = { From 33a22fc16b2c3b4ac64fe7c28a425e7b5da9fb7e Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 3 Mar 2026 10:06:52 +0100 Subject: [PATCH 012/305] minimal-bootstrap.mes: convert sources from Nix to JSON Replace sources.nix with sources.json, consumed via lib.importJSON. Update gen-sources.sh to emit JSON using jq for correctness. --- .../linux/minimal-bootstrap/mes/default.nix | 2 +- .../minimal-bootstrap/mes/gen-sources.sh | 61 +- .../linux/minimal-bootstrap/mes/libc.nix | 2 +- .../linux/minimal-bootstrap/mes/sources.json | 2314 +++++++++++++++++ .../linux/minimal-bootstrap/mes/sources.nix | 2308 ---------------- 5 files changed, 2348 insertions(+), 2339 deletions(-) create mode 100644 pkgs/os-specific/linux/minimal-bootstrap/mes/sources.json delete mode 100644 pkgs/os-specific/linux/minimal-bootstrap/mes/sources.nix diff --git a/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix index 7d461d9fc4c7..36849236ee6c 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix @@ -57,7 +57,7 @@ let } .${buildPlatform.system}; - sources = (import ./sources.nix).${arch}.linux.mescc; + sources = (lib.importJSON ./sources.json).${arch}.linux.mescc; inherit (sources) libc_mini_SOURCES diff --git a/pkgs/os-specific/linux/minimal-bootstrap/mes/gen-sources.sh b/pkgs/os-specific/linux/minimal-bootstrap/mes/gen-sources.sh index fa34d17492ec..fcee9605e42c 100755 --- a/pkgs/os-specific/linux/minimal-bootstrap/mes/gen-sources.sh +++ b/pkgs/os-specific/linux/minimal-bootstrap/mes/gen-sources.sh @@ -1,14 +1,14 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash coreutils gnutar +#!nix-shell -i bash -p bash coreutils gnutar jq -# Generate a sources.nix for a version of GNU mes. Creates lists of source files +# Generate a sources.json for a version of GNU mes. Creates lists of source files # from build-aux/configure-lib.sh. # # You may point this tool at a manually downloaded tarball, but more ideal is # using the source tarball from Nixpkgs. For example: # # MES_TARBALL="$(nix-build --no-link -A minimal-bootstrap.mes.src ../../../../..)" -# ./gen-sources.sh "$MES_TARBALL" > ./new-sources.nix +# ./gen-sources.sh "$MES_TARBALL" > ./new-sources.json set -eu @@ -18,10 +18,12 @@ KERNELS="linux" COMPILERS="mescc gcc" -format() { - echo "[" - echo $* | xargs printf ' "%s"\n' - echo " ]" +to_json_array() { + if [ $# -eq 0 ]; then + echo '[]' + else + printf '%s\n' "$@" | jq --raw-input --null-input '[inputs]' + fi } gen_sources() { @@ -34,17 +36,24 @@ gen_sources() { # Populate source file lists source $CONFIGURE_LIB_SH - cat <&2 exit 1 fi -echo "Generating sources.nix from $MES_TARBALL" >&2 +echo "Generating sources.json from $MES_TARBALL" >&2 TMP=$(mktemp -d) cd $TMP @@ -75,20 +84,14 @@ chmod +x config.sh echo "Configuring with $CONFIGURE_LIB_SH" >&2 -cat < Date: Wed, 11 Mar 2026 09:58:27 +0100 Subject: [PATCH 013/305] nixos/esphome: add options for setting environment variables This will allow users to easily set secrets and other environment variables. Signed-off-by: David Wronek --- .../services/home-automation/esphome.nix | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/home-automation/esphome.nix b/nixos/modules/services/home-automation/esphome.nix index 7a66b8ec19f2..b308b2ae4eb6 100644 --- a/nixos/modules/services/home-automation/esphome.nix +++ b/nixos/modules/services/home-automation/esphome.nix @@ -79,6 +79,28 @@ in type = types.bool; description = "Use ping to check online status of devices instead of mDNS"; }; + + environment = mkOption { + default = { }; + type = types.attrsOf types.str; + description = '' + Extra environment variables to pass to ESPHome. Secrets should be passed + using the {option}`services.esphome.environmentFile` option. + ''; + example = { + USERNAME = "reimu"; + PASSWORD = "gensokyo9"; + }; + }; + + environmentFile = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path to an environment file. + Use this option for setting the dashboard password. + ''; + }; }; config = mkIf cfg.enable { @@ -94,7 +116,8 @@ in # platformio fails to determine the home directory when using DynamicUser PLATFORMIO_CORE_DIR = "${stateDir}/.platformio"; } - // lib.optionalAttrs cfg.usePing { ESPHOME_DASHBOARD_USE_PING = "true"; }; + // lib.optionalAttrs cfg.usePing { ESPHOME_DASHBOARD_USE_PING = "true"; } + // cfg.environment; serviceConfig = { ExecStart = "${cfg.package}/bin/esphome dashboard ${esphomeParams} ${stateDir}"; @@ -107,6 +130,7 @@ in Restart = "on-failure"; RuntimeDirectory = mkIf cfg.enableUnixSocket "esphome"; RuntimeDirectoryMode = "0750"; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; # Hardening CapabilityBoundingSet = ""; From 19df2b0eb2f2bbff61410d0455d7359f85caf712 Mon Sep 17 00:00:00 2001 From: David Wronek Date: Wed, 11 Mar 2026 12:12:21 +0100 Subject: [PATCH 014/305] nixos/esphome: use %S specifier to find state directory root Signed-off-by: David Wronek --- nixos/modules/services/home-automation/esphome.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/home-automation/esphome.nix b/nixos/modules/services/home-automation/esphome.nix index b308b2ae4eb6..589c566174b5 100644 --- a/nixos/modules/services/home-automation/esphome.nix +++ b/nixos/modules/services/home-automation/esphome.nix @@ -17,7 +17,7 @@ let cfg = config.services.esphome; - stateDir = "/var/lib/esphome"; + stateDir = "esphome"; esphomeParams = if cfg.enableUnixSocket then @@ -114,17 +114,17 @@ in environment = { # platformio fails to determine the home directory when using DynamicUser - PLATFORMIO_CORE_DIR = "${stateDir}/.platformio"; + PLATFORMIO_CORE_DIR = "%S/${stateDir}/.platformio"; } // lib.optionalAttrs cfg.usePing { ESPHOME_DASHBOARD_USE_PING = "true"; } // cfg.environment; serviceConfig = { - ExecStart = "${cfg.package}/bin/esphome dashboard ${esphomeParams} ${stateDir}"; + ExecStart = "${cfg.package}/bin/esphome dashboard ${esphomeParams} %S/${stateDir}"; DynamicUser = true; User = "esphome"; Group = "esphome"; - WorkingDirectory = stateDir; + WorkingDirectory = "%S/${stateDir}"; StateDirectory = "esphome"; StateDirectoryMode = "0750"; Restart = "on-failure"; From d3e15cd7b18da416ea54c999cb6b49f280462adf Mon Sep 17 00:00:00 2001 From: David Wronek Date: Wed, 11 Mar 2026 12:17:39 +0100 Subject: [PATCH 015/305] nixos/esphome: add state directory to ExecPaths= and ReadWritePaths= Fixes the following issue: ``` sh: line 1: /var/lib/esphome/.platformio/packages/toolchain-gccarmnoneeabi/bin/arm-none-eabi-g++: Permission denied ``` Signed-off-by: David Wronek --- nixos/modules/services/home-automation/esphome.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/home-automation/esphome.nix b/nixos/modules/services/home-automation/esphome.nix index 589c566174b5..7dc8de0f531e 100644 --- a/nixos/modules/services/home-automation/esphome.nix +++ b/nixos/modules/services/home-automation/esphome.nix @@ -131,6 +131,8 @@ in RuntimeDirectory = mkIf cfg.enableUnixSocket "esphome"; RuntimeDirectoryMode = "0750"; EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; + ExecPaths = "%S/${stateDir}"; + ReadWritePaths = "%S/${stateDir}"; # Hardening CapabilityBoundingSet = ""; From a7b3afcd38593bbbace4cc4df630c2f3b55e81ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Mar 2026 14:22:12 +0000 Subject: [PATCH 016/305] ffizer: 2.13.7 -> 2.13.8 --- pkgs/by-name/ff/ffizer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix index a0067b7fd95d..3042d01b5e21 100644 --- a/pkgs/by-name/ff/ffizer/package.nix +++ b/pkgs/by-name/ff/ffizer/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ffizer"; - version = "2.13.7"; + version = "2.13.8"; buildFeatures = [ "cli" ]; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "ffizer"; repo = "ffizer"; rev = finalAttrs.version; - hash = "sha256-r4jaqjHYDZxftU7J6hGMXW/Oq+8biy9bFoHIOt33ta8="; + hash = "sha256-TV1+bupdJFmq72F4MbqyyvE/p9PufdeOUo24mPYvuAc="; }; - cargoHash = "sha256-+aXhumywpcynKz0R0wWPWhEMfqiPBuwLbIFsABvWTnA="; + cargoHash = "sha256-iEdNyzY4fzfQkayXIKthv4ofl11+U2KfV63VvXrR6HQ="; nativeBuildInputs = [ pkg-config From 0f363a1cb4f1a29a95f94c27ca22e4bcca93224f Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 12 Mar 2026 17:47:30 +0100 Subject: [PATCH 017/305] nixos: replace container activation scripts docker: move /init symlink creation from activationScript to installBootLoader, which is the mechanism switch-to-configuration already uses for this purpose. lxc: remove redundant activation script. The installBootLoader hook was already handling /sbin/init. incus: replace activationScript with a oneshot systemd service that uses ConditionPathExists to create /etc/nixos/configuration.nix only on first boot. See: https://github.com/NixOS/nixpkgs/issues/475305 --- .../scripts/incus/incus-container-image.nix | 22 ++++++++++++------- .../incus/incus-virtual-machine-image.nix | 22 ++++++++++++------- nixos/modules/profiles/docker-container.nix | 7 +++--- .../modules/virtualisation/lxc-container.nix | 3 --- 4 files changed, 32 insertions(+), 22 deletions(-) diff --git a/nixos/maintainers/scripts/incus/incus-container-image.nix b/nixos/maintainers/scripts/incus/incus-container-image.nix index 9faf6a5d87ad..989f583307fe 100644 --- a/nixos/maintainers/scripts/incus/incus-container-image.nix +++ b/nixos/maintainers/scripts/incus/incus-container-image.nix @@ -13,18 +13,24 @@ ]; }; - # copy the config for nixos-rebuild - system.activationScripts.config = + # Create a default configuration.nix on first boot so nixos-rebuild works + # out of the box. + systemd.services.incus-create-nixos-config = let - config = pkgs.replaceVars ./incus-container-image-inner.nix { + configFile = pkgs.replaceVars ./incus-container-image-inner.nix { stateVersion = lib.trivial.release; }; in - '' - if [ ! -e /etc/nixos/configuration.nix ]; then - install -m 0644 -D ${config} /etc/nixos/configuration.nix - fi - ''; + { + description = "Create default NixOS configuration for Incus"; + wantedBy = [ "multi-user.target" ]; + unitConfig.ConditionPathExists = "!/etc/nixos/configuration.nix"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/install -m 0644 -D ${configFile} /etc/nixos/configuration.nix"; + }; + }; networking = { dhcpcd.enable = false; diff --git a/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix b/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix index db60160c9c77..f06b43dc2675 100644 --- a/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix +++ b/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix @@ -13,18 +13,24 @@ ]; }; - # copy the config for nixos-rebuild - system.activationScripts.config = + # Create a default configuration.nix on first boot so nixos-rebuild works + # out of the box. + systemd.services.incus-create-nixos-config = let - config = pkgs.replaceVars ./incus-virtual-machine-image-inner.nix { + configFile = pkgs.replaceVars ./incus-virtual-machine-image-inner.nix { stateVersion = lib.trivial.release; }; in - '' - if [ ! -e /etc/nixos/configuration.nix ]; then - install -m 0644 -D ${config} /etc/nixos/configuration.nix - fi - ''; + { + description = "Create default NixOS configuration for Incus"; + wantedBy = [ "multi-user.target" ]; + unitConfig.ConditionPathExists = "!/etc/nixos/configuration.nix"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/install -m 0644 -D ${configFile} /etc/nixos/configuration.nix"; + }; + }; # Network networking = { diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix index 66d69361d584..06329d5d82f1 100644 --- a/nixos/modules/profiles/docker-container.nix +++ b/nixos/modules/profiles/docker-container.nix @@ -57,8 +57,9 @@ in ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; - # Install new init script - system.activationScripts.installInitScript = '' - ln -fs $systemConfig/init /init + # Update /init symlink when switching configurations so the container + # boots the new system on restart. + system.build.installBootLoader = pkgs.writeShellScript "install-docker-init" '' + ${pkgs.coreutils}/bin/ln -fs "$1/init" /init ''; } diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index a6964b8b2c9a..1eb5891b953b 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -119,8 +119,5 @@ systemd.packages = [ pkgs.distrobuilder.generator ]; - system.activationScripts.installInitScript = lib.mkForce '' - ln -fs $systemConfig/init /sbin/init - ''; }; } From 92498765b4b678733e02dee8c81ec8f015e0b53c Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 9 Mar 2026 11:45:42 +0000 Subject: [PATCH 018/305] nixos/tor: test: Build out a private Tor network to make test end-to-end --- nixos/tests/tor.nix | 476 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 456 insertions(+), 20 deletions(-) diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix index 0e2052f58898..b180b7c195ca 100644 --- a/nixos/tests/tor.nix +++ b/nixos/tests/tor.nix @@ -1,30 +1,466 @@ -{ lib, ... }: +{ + config, + lib, + pkgs, + ... +}: +let + # Helper to get a node's auto-assigned primary IPv4 address. + nodeIP = name: config.nodes.${name}.networking.primaryIPAddress; + nodeIPv6 = name: config.nodes.${name}.networking.primaryIPv6Address; + + # Generate all keys (both relay identity and authority) for a + # directory authority in a single derivation. + # + # tor --list-fingerprint generates the relay RSA/ed25519 identity + # keys and writes the fingerprint file. tor-gencert then generates + # the authority identity key, signing key, and certificate. + mkDAKeys = + name: + pkgs.runCommand "tor-da-keys-${name}" + { + nativeBuildInputs = [ pkgs.tor ]; + } + '' + DATADIR=$(mktemp -d) + mkdir -p "$DATADIR/keys" + + # Generate relay identity keys. + tor --list-fingerprint \ + --DataDirectory "$DATADIR" \ + --ORPort 9001 \ + --Nickname "${name}" \ + --SocksPort 0 \ + >/dev/null 2>&1 + + # Generate authority keys in the keys directory + ( + cd "$DATADIR/keys" + echo "" | tor-gencert --create-identity-key -m 24 \ + -a ${nodeIP name}:80 \ + --passphrase-fd 0 \ + >/dev/null 2>&1 + ) + + # Prepare output: keys in a subdirectory, fingerprints as plain files + mkdir -p $out/keys + cp "$DATADIR/keys/"* $out/keys/ + + # Extract relay fingerprint + # fingerprint file format: "Nickname XXXX XXXX XXXX XXXX ..." + cut -d' ' -f2- "$DATADIR/fingerprint" | tr -d ' \n' > $out/relay-fingerprint + + # Extract v3ident from authority certificate + # certificate format: "fingerprint ABCDEF1234..." + grep "^fingerprint " $out/keys/authority_certificate \ + | awk '{print $2}' | tr -d '\n' > $out/v3ident + + # Extract ed25519 identity + tail -c 32 "$DATADIR/keys/ed25519_master_id_public_key" \ + | base64 -w0 | tr -d '=' > $out/ed25519-identity + ''; + + # Node name lists - used to generate keys, node configs, and DA vote targets + daNames = [ + "da1" + "da2" + "da3" + ]; + relayNames = [ + "relay1" + "relay2" + "relay3" + "relay4" + "relay5" + ]; + exitNames = [ + "exit1" + "exit2" + "exit3" + ]; + + # Relays that receive the Guard flag. DAs are excluded here (they only + # do directory serving and voting) and exits are excluded so Guard + # and Exit remain distinct roles. + guardNames = relayNames; + + # Pre-generate keys for all directory authorities + daKeysets = lib.genAttrs daNames mkDAKeys; + + # Read a fingerprint text file from a derivation output + readFP = keys: file: builtins.readFile "${keys}/${file}"; + + # Build DirAuthority lines from the pre-generated keys. + # Format: nickname orport=PORT v3ident=V3IDENT ip:dirport RELAY_FINGERPRINT + dirAuthorityLines = lib.mapAttrsToList ( + name: keys: + "${name} orport=9001 ipv6=[${nodeIPv6 name}]:9001 v3ident=${readFP keys "v3ident"} ${nodeIP name}:80 ${readFP keys "relay-fingerprint"}" + ) daKeysets; + + # Tor settings shared by all node types + commonTorSettings = { + TestingTorNetwork = true; + AssumeReachable = true; + AssumeReachableIPv6 = true; + ControlPort = 9051; + CookieAuthentication = true; + DirAuthority = dirAuthorityLines; + }; + + # Tor settings shared by non-DA nodes (relays and exits) + nonDATorSettings = + name: + commonTorSettings + // { + Address = nodeIP name; + Nickname = name; + ContactInfo = "${name} <${name} AT localhost>"; + DirPort = 9030; + ORPort = [ + 9001 + { + addr = "[${nodeIPv6 name}]"; + port = 9001; + } + ]; + SocksPort = 0; + PublishServerDescriptor = "1"; + PathsNeededToBuildCircuits = "0.25"; + }; + + # Build a directory authority node configuration + mkDANode = name: { + networking.firewall.allowedTCPPorts = [ + 80 + 9001 + ]; + + systemd.services.tor = { + after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; + }; + + # Deploy pre-generated relay and authority keys before Tor starts. + # This ensures the relay fingerprint matches what's in DirAuthority lines. + system.activationScripts.tor-keys = lib.stringAfter [ "users" "groups" ] '' + mkdir -p /var/lib/tor/keys + cp ${daKeysets.${name}}/keys/* /var/lib/tor/keys/ + touch /var/lib/tor/sr-state + chown -R tor:tor /var/lib/tor + chmod 700 /var/lib/tor /var/lib/tor/keys + chmod 600 /var/lib/tor/keys/* + ''; + + services.tor = { + enable = true; + relay.enable = true; + relay.role = "relay"; + settings = commonTorSettings // { + AuthoritativeDirectory = true; + V3AuthoritativeDirectory = true; + Address = nodeIP name; + Nickname = name; + ContactInfo = "${name} <${name} AT localhost>"; + DirPort = 80; + ORPort = [ + 9001 + { + addr = "[${nodeIPv6 name}]"; + port = 9001; + } + ]; + SocksPort = 0; + # Only assign circuit-selection flags to non-DA relays (makes DAs only + # do directory serving). + TestingDirAuthVoteExit = lib.concatStringsSep "," exitNames; + TestingDirAuthVoteGuard = lib.concatStringsSep "," guardNames; + TestingDirAuthVoteHSDir = lib.concatStringsSep "," (relayNames ++ exitNames); + TestingMinExitFlagThreshold = 0; + V3AuthNIntervalsValid = 2; + }; + }; + }; + + # Build a relay node configuration + mkRelayNode = name: { + networking.firewall.allowedTCPPorts = [ + 9001 + 9030 + ]; + + services.tor = { + enable = true; + relay.enable = true; + relay.role = "relay"; + settings = nonDATorSettings name; + }; + }; + + # Build an exit node configuration. + mkExitNode = name: { + networking.firewall.allowedTCPPorts = [ + 9001 + 9030 + ]; + + services.tor = { + enable = true; + relay.enable = true; + relay.role = "exit"; + settings = nonDATorSettings name // { + # relay.role = "exit" prevents the NixOS module from force-setting + # ExitPolicy to "reject *:*", but the option's default is still "reject + # *:*". We must explicitly set a permissive ExitPolicy for the exit to + # be usable. + ExitRelay = true; + ExitPolicy = [ "accept *:*" ]; + }; + }; + }; + + hiddenServiceResponse = "Hello from the hidden service"; + + # Hidden service node: Caddy serves a static page, Tor exposes it as an onion service + mkHiddenServiceNode = { + services.caddy = { + enable = true; + virtualHosts."http://:8080" = { + extraConfig = '' + respond "${hiddenServiceResponse}" + ''; + }; + }; + + services.tor = { + enable = true; + relay.onionServices.web = { + map = [ + { + port = 80; + target = { + addr = "127.0.0.1"; + port = 8080; + }; + } + ]; + }; + settings = commonTorSettings // { + SocksPort = 0; + }; + }; + }; + + # Client node: uses Tor SOCKS proxy to access onion services + mkClientNode = { + environment.systemPackages = [ pkgs.curl ]; + + services.tor = { + enable = true; + client.enable = true; + settings = commonTorSettings; + }; + }; + + clearnetResponse = "Hello from the clearnet"; + + # Clearnet webserver to test exit node traffic + mkWebServerNode = { + networking.firewall.allowedTCPPorts = [ 80 ]; + + services.caddy = { + enable = true; + virtualHosts."http://:80" = { + extraConfig = '' + respond "${clearnetResponse}" + ''; + }; + }; + }; + + # Arti configuration + artiConfig = (pkgs.formats.toml { }).generate "arti.toml" { + proxy.socks_listen = 9150; + + storage = { + cache_dir = "/var/cache/arti"; + state_dir = "/var/lib/arti"; + port_info_file = "/var/lib/arti/public/port_info.json"; + permissions.dangerously_trust_everyone = true; + }; + + address_filter.allow_local_addrs = true; + + # Disable subnet restrictions since all nodes are on the same network + path_rules = { + ipv4_subnet_family_prefix = 33; + ipv6_subnet_family_prefix = 129; + }; + + # Disable vanguards - the small test network doesn't have enough relay + # diversity for arti to satisfy vanguard selection requirements + vanguards.mode = "disabled"; + + # Override Tor consensus parameters for the small test network. + # Arti's guard sampling defaults are configured for the real Tor + # network. + override_net_params = { + guard-max-sample-size = 4; + guard-min-filtered-sample-size = 2; + guard-n-primary-guards-to-use = 2; + }; + + tor_network = { + authorities = { + v3idents = lib.mapAttrsToList (_: keys: readFP keys "v3ident") daKeysets; + uploads = lib.mapAttrsToList (name: _: [ + "${nodeIP name}:80" + "[${nodeIPv6 name}]:80" + ]) daKeysets; + downloads = lib.mapAttrsToList (name: _: [ + "${nodeIP name}:80" + "[${nodeIPv6 name}]:80" + ]) daKeysets; + votes = lib.mapAttrsToList (name: _: [ + "${nodeIP name}:80" + "[${nodeIPv6 name}]:80" + ]) daKeysets; + }; + fallback_caches = lib.mapAttrsToList (name: keys: { + rsa_identity = readFP keys "relay-fingerprint"; + ed_identity = readFP keys "ed25519-identity"; + orports = [ + "${nodeIP name}:9001" + "[${nodeIPv6 name}]:9001" + ]; + }) daKeysets; + }; + }; + + # Arti client node + mkArtiClientNode = { + environment.systemPackages = [ pkgs.curl ]; + + systemd.services.arti = { + description = "Arti Tor Client"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = "${lib.getExe pkgs.arti} proxy -c ${artiConfig}"; + DynamicUser = true; + StateDirectory = "arti"; + CacheDirectory = "arti"; + }; + }; + }; +in { name = "tor"; - meta.maintainers = [ ]; + meta.maintainers = with lib.maintainers; [ jpds ]; - nodes.client = - { pkgs, ... }: - { - boot.kernelParams = [ - "audit=0" - "apparmor=0" - "quiet" - ]; - networking.firewall.enable = false; - networking.useDHCP = false; - - environment.systemPackages = [ pkgs.netcat ]; - services.tor.enable = true; - services.tor.client.enable = true; - services.tor.settings.ControlPort = 9051; + nodes = + lib.genAttrs daNames mkDANode + // lib.genAttrs relayNames mkRelayNode + // lib.genAttrs exitNames mkExitNode + // { + hiddenservice = mkHiddenServiceNode; + webserver = mkWebServerNode; + client = mkClientNode; + articlient = mkArtiClientNode; }; testScript = '' - client.wait_for_unit("tor.service") - client.wait_for_open_port(9051) - assert "514 Authentication required." in client.succeed( + # Start directory authorities and wait for consensus + for machine in da1, da2, da3: + machine.start() + machine.wait_for_unit("tor.service") + machine.wait_for_open_port(9051) + + for machine in da1, da2, da3: + machine.wait_until_succeeds( + "journalctl -o cat -u tor.service | grep 'Scheduling voting'" + ) + machine.wait_until_succeeds( + "journalctl -o cat -u tor.service | grep 'Consensus computed; uploading signature(s)'" + ) + + # Start relays and exits + for machine in relay1, relay2, relay3, relay4, relay5, exit1, exit2, exit3: + machine.start() + machine.wait_for_unit("tor.service") + machine.wait_for_open_port(9051) + + # Wait for all DAs to fully bootstrap + for machine in da1, da2, da3: + machine.wait_until_succeeds( + "journalctl -o cat -u tor.service | grep 'Bootstrapped 100%'" + ) + + # Wait for relays and exits to self-test and bootstrap + for machine in relay1, relay2, relay3, relay4, relay5, exit1, exit2, exit3: + machine.wait_until_succeeds( + "journalctl -o cat -u tor.service | grep 'Self-testing indicates your ORPort .* is reachable'" + ) + machine.wait_until_succeeds( + "journalctl -o cat -u tor.service | grep 'Bootstrapped 100%'" + ) + + # Verify the Tor control port is functional + assert "514 Authentication required." in da1.succeed( "echo GETINFO version | nc 127.0.0.1 9051" ) + + # Start hidden service and clearnet webserver - then web client + hiddenservice.start() + hiddenservice.wait_for_unit("caddy.service") + hiddenservice.wait_for_unit("tor.service") + + webserver.start() + webserver.wait_for_unit("caddy.service") + webserver.wait_for_open_port(80) + + client.start() + client.wait_for_unit("tor.service") + + # Wait for the hidden service to generate its .onion hostname + hiddenservice.wait_until_succeeds( + "test -f /var/lib/tor/onion/web/hostname" + ) + onion_addr = hiddenservice.succeed("cat /var/lib/tor/onion/web/hostname").strip() + + # Wait for the client to bootstrap + client.wait_until_succeeds( + "journalctl -o cat -u tor.service | grep 'Bootstrapped 100%'" + ) + + # Access the hidden service from the client via Tor SOCKS proxy + client.wait_until_succeeds( + f"curl --max-time 60 --socks5-hostname 127.0.0.1:9050 http://{onion_addr} | grep '${hiddenServiceResponse}'" + ) + + # Access the clearnet webserver through the Tor exit node + webserver_ip = "${nodeIP "webserver"}" + client.wait_until_succeeds( + f"curl --max-time 60 --socks5-hostname 127.0.0.1:9050 http://{webserver_ip} | grep '${clearnetResponse}'" + ) + + articlient.start() + articlient.wait_for_unit("arti.service") + articlient.wait_for_open_port(9150) + + # Access the hidden service from the client via arti + # Onion service access is not tested with arti. The HS client + # doesn't work reliably on small private networks. + # articlient.wait_until_succeeds( + # f"curl --max-time 60 --socks5-hostname 127.0.0.1:9150 http://{onion_addr} | grep '${hiddenServiceResponse}'" + # ) + + # Access the clearnet webserver through the Tor exit node with arti + articlient.wait_until_succeeds( + f"curl --max-time 60 --socks5-hostname 127.0.0.1:9150 http://{webserver_ip} | grep '${clearnetResponse}'" + ) + + da1.log(da1.succeed("systemd-analyze security tor.service | grep -v '✓'")) ''; } From 1ac2b4bc0c3eeb3135946e98ff5e407f1eb90149 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 9 Mar 2026 11:55:57 +0000 Subject: [PATCH 019/305] arti: Add NixOS test for Tor --- pkgs/by-name/ar/arti/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix index 91993e3c3dd2..3a9b39bb6546 100644 --- a/pkgs/by-name/ar/arti/package.nix +++ b/pkgs/by-name/ar/arti/package.nix @@ -8,6 +8,7 @@ openssl, versionCheckHook, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -67,6 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; passthru = { + inherit (nixosTests) tor; updateScript = nix-update-script { extraArgs = [ "--version-regex=^arti-v(.*)$" ]; }; }; From 61425f107b2b26c6ed11fd7b2fd926b99b8fedef Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 18 Mar 2026 16:55:18 +0100 Subject: [PATCH 020/305] nixos/tests/incus: test config creation and switch-to-configuration Add subtests to verify the activation script replacements: - config create service creates /etc/nixos/configuration.nix on first boot - service does not overwrite existing configuration (ConditionPathExists) - switch-to-configuration switch calls installBootLoader, creating /sbin/init (container-only, since VMs use a real bootloader) --- nixos/tests/incus/incus-tests-module.nix | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/nixos/tests/incus/incus-tests-module.nix b/nixos/tests/incus/incus-tests-module.nix index 085dbfbc8750..8d8752fde81f 100644 --- a/nixos/tests/incus/incus-tests-module.nix +++ b/nixos/tests/incus/incus-tests-module.nix @@ -156,6 +156,16 @@ in server.succeed(f"incus exec {instance_name} -- test -e /dev/tpm0") server.succeed(f"incus exec {instance_name} -- test -e /dev/tpmrm0") + + with subtest("[${image_id}] default configuration.nix is created on first boot"): + server.succeed(f"incus exec {instance_name} -- test -f /etc/nixos/configuration.nix") + + with subtest("[${image_id}] configuration.nix create service does not overwrite existing config"): + server.succeed(f"incus exec {instance_name} -- systemctl restart incus-create-nixos-config.service") + status = server.succeed( + f"incus exec {instance_name} -- systemctl show -p ActiveState incus-create-nixos-config.service" + ).strip() + assert "inactive" in status, f"Expected inactive (ConditionPathExists should prevent start), got {status}" '' # # container specific @@ -164,6 +174,21 @@ in lib.optionalString (config.type == "container") # python '' + with subtest("[${image_id}] switch-to-configuration updates /sbin/init via installBootLoader"): + # Remove /sbin/init so we can verify installBootLoader recreates it + server.succeed(f"incus exec {instance_name} -- rm -f /sbin/init") + server.fail(f"incus exec {instance_name} -- test -e /sbin/init") + + server.succeed( + f"incus exec {instance_name} -- /run/current-system/bin/switch-to-configuration switch" + ) + + # Verify installBootLoader recreated /sbin/init pointing to the system's init + server.succeed(f"incus exec {instance_name} -- test -x /sbin/init") + target = server.succeed(f"incus exec {instance_name} -- readlink -f /sbin/init").strip() + current = server.succeed(f"incus exec {instance_name} -- readlink -f /run/current-system/init").strip() + assert target == current, f"/sbin/init -> {target}, expected {current}" + # TODO troubleshoot VM hot memory resizing which was introduced in 6.12 with subtest("[${image_id}] memory limits can be hotplug changed"): server.set_instance_config(instance_name, "limits.memory 512MB") From 46a7610ee1440e49183919502fa02640b87bf1fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Mar 2026 05:34:41 +0000 Subject: [PATCH 021/305] perses: 0.53.0 -> 0.53.1 --- pkgs/by-name/pe/perses/package.nix | 8 +- pkgs/by-name/pe/perses/plugins.nix | 144 ++++++++++++++--------------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/pkgs/by-name/pe/perses/package.nix b/pkgs/by-name/pe/perses/package.nix index 04a6796fcf19..43a8f82eae20 100644 --- a/pkgs/by-name/pe/perses/package.nix +++ b/pkgs/by-name/pe/perses/package.nix @@ -28,13 +28,13 @@ let in buildGoModule (finalAttrs: { pname = "perses"; - version = "0.53.0"; + version = "0.53.1"; src = fetchFromGitHub { owner = "perses"; repo = "perses"; tag = "v${finalAttrs.version}"; - hash = "sha256-lr4+0MEKXOdPTsD28hu55o8SAspKbr2791dQAXhdxtA="; + hash = "sha256-Oxq+zweg1mpgxKXWBwnsanD66TcD+kOkt3WCTU2FqnQ="; }; outputs = [ @@ -53,7 +53,7 @@ buildGoModule (finalAttrs: { inherit (finalAttrs) version src; pname = "${finalAttrs.pname}-ui"; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-ObQvOZ2IvU/6lfozPweVu46nohKXT0YzZeTyd0VK7GM="; + hash = "sha256-yhqpwxWhnYBewDsYYP5R1n45dDTz6Wz3IJri77FBdO8="; }; npmRoot = "ui"; @@ -63,7 +63,7 @@ buildGoModule (finalAttrs: { preBuild = null; }; - vendorHash = "sha256-KV0zXXzMBgsMZ543+fLXeGvYtugq5PtYJXSQgqrtbMI="; + vendorHash = "sha256-dAvDBJGpY4Dlx4D9hR6VSUt+ppJLJPNNu5smsyutSC8="; ldflags = [ "-s" diff --git a/pkgs/by-name/pe/perses/plugins.nix b/pkgs/by-name/pe/perses/plugins.nix index 0f019fce8e07..72f88f598a95 100644 --- a/pkgs/by-name/pe/perses/plugins.nix +++ b/pkgs/by-name/pe/perses/plugins.nix @@ -2,123 +2,123 @@ # Do not edit this file manually. { "BarChart" = { - version = "0.11.0"; - url = "https://github.com/perses/plugins/releases/download/barchart/v0.11.0/BarChart-0.11.0.tar.gz"; - hash = "sha256-ppx0NLiyDV+IqvVXqwinIKuOfieUPmZFPxmjFiKGEnw="; + version = "0.11.1"; + url = "https://github.com/perses/plugins/releases/download/barchart/v0.11.1/BarChart-0.11.1.tar.gz"; + hash = "sha256-z18hd8Hme9Y3eNBMX1cuZr0Ux8sZhDYGJ1ZrHFgiDi0="; }; "ClickHouse" = { - version = "0.5.0"; - url = "https://github.com/perses/plugins/releases/download/clickhouse/v0.5.0/ClickHouse-0.5.0.tar.gz"; - hash = "sha256-cMVRAZL7stuSlk1yIuy5KIo7TbVovTy6501Geb3Ujdk="; + version = "0.5.1"; + url = "https://github.com/perses/plugins/releases/download/clickhouse/v0.5.1/ClickHouse-0.5.1.tar.gz"; + hash = "sha256-iqzWqU8Lovqkie9cM4NZRg0fzWaQP+cqREY8Mz9S5lg="; }; "DatasourceVariable" = { - version = "0.5.0"; - url = "https://github.com/perses/plugins/releases/download/datasourcevariable/v0.5.0/DatasourceVariable-0.5.0.tar.gz"; - hash = "sha256-Eek0TvPXoYDciuBhJ7i69V/kDY2ksEYdHD6VG0J/sjY="; + version = "0.5.1"; + url = "https://github.com/perses/plugins/releases/download/datasourcevariable/v0.5.1/DatasourceVariable-0.5.1.tar.gz"; + hash = "sha256-OWhRD1SlGto52z6W1LEoGSSlx5LmsgALsDSaLO+6NJk="; }; "FlameChart" = { - version = "0.5.0"; - url = "https://github.com/perses/plugins/releases/download/flamechart/v0.5.0/FlameChart-0.5.0.tar.gz"; - hash = "sha256-hvYYBhFHxIx4D/gbj3KvxL/2tloyG+Dxvk/3fBqGfkE="; + version = "0.5.1"; + url = "https://github.com/perses/plugins/releases/download/flamechart/v0.5.1/FlameChart-0.5.1.tar.gz"; + hash = "sha256-ajBGNPDAAslLSyUtGxCMdPFGPvtCsoEgDQdn61J0cRM="; }; "GaugeChart" = { - version = "0.12.0"; - url = "https://github.com/perses/plugins/releases/download/gaugechart/v0.12.0/GaugeChart-0.12.0.tar.gz"; - hash = "sha256-n0BE3B9L1b4l1B+AlN6GJtBu2NN7WovkAcrY9OMSM3Q="; + version = "0.12.1"; + url = "https://github.com/perses/plugins/releases/download/gaugechart/v0.12.1/GaugeChart-0.12.1.tar.gz"; + hash = "sha256-TrgaLLMASL+j2aU+vSKQT0eYiUwsYO4ayBO2ia+qAZ8="; }; "HistogramChart" = { - version = "0.11.0"; - url = "https://github.com/perses/plugins/releases/download/histogramchart/v0.11.0/HistogramChart-0.11.0.tar.gz"; - hash = "sha256-1V8jK5dwNyCqV5M/FEg4vy7acGi5i9oy8rb1drhWMxY="; + version = "0.11.1"; + url = "https://github.com/perses/plugins/releases/download/histogramchart/v0.11.1/HistogramChart-0.11.1.tar.gz"; + hash = "sha256-FZpzmig3wO2sbPLpPzD46S6nikUUYEiIG2z2QLQVYTI="; }; "HeatMapChart" = { - version = "0.4.0"; - url = "https://github.com/perses/plugins/releases/download/heatmapchart/v0.4.0/HeatMapChart-0.4.0.tar.gz"; - hash = "sha256-fV4HNpOYLa20Q1eSqOQgpSM5/sSGcq1llkM3Mc8OlNg="; + version = "0.4.1"; + url = "https://github.com/perses/plugins/releases/download/heatmapchart/v0.4.1/HeatMapChart-0.4.1.tar.gz"; + hash = "sha256-AlCGUsVhxMepNpgaqR9B253DGXHhNVVRbLgVNridK4w="; }; "LogsTable" = { - version = "0.2.0"; - url = "https://github.com/perses/plugins/releases/download/logstable/v0.2.0/LogsTable-0.2.0.tar.gz"; - hash = "sha256-XBa9NJna2F8EDP2zbZVltYwtb1S/og/aRYlNVIBvi00="; + version = "0.2.1"; + url = "https://github.com/perses/plugins/releases/download/logstable/v0.2.1/LogsTable-0.2.1.tar.gz"; + hash = "sha256-uJQXIeg2TYK42csV/Gco0lxdhKyB1URJYcrWmd5Jl/4="; }; "Loki" = { - version = "0.5.0"; - url = "https://github.com/perses/plugins/releases/download/loki/v0.5.0/Loki-0.5.0.tar.gz"; - hash = "sha256-REGbrfNSfvLJjb2MIqhRC8Ks2nIDW1ojSdShq6X99NA="; + version = "0.5.1"; + url = "https://github.com/perses/plugins/releases/download/loki/v0.5.1/Loki-0.5.1.tar.gz"; + hash = "sha256-YI2O6Dr+wZ9zVvZTGaErwkssMaYbuH9BqfiHAf2s8Jg="; }; "Markdown" = { - version = "0.11.0"; - url = "https://github.com/perses/plugins/releases/download/markdown/v0.11.0/Markdown-0.11.0.tar.gz"; - hash = "sha256-RRwPBfFTR4Ne8hUm6xfYGoIt7Lm3/KOdkYbpR7SEb/8="; + version = "0.11.1"; + url = "https://github.com/perses/plugins/releases/download/markdown/v0.11.1/Markdown-0.11.1.tar.gz"; + hash = "sha256-hXX/44SzKJhOYWeN3XpaboAW3MeFFpQtogYmU8VJhXo="; }; "PieChart" = { - version = "0.13.0"; - url = "https://github.com/perses/plugins/releases/download/piechart/v0.13.0/PieChart-0.13.0.tar.gz"; - hash = "sha256-zoZaC9LEPeC/XEJ63bdmp3IXC+qO/1RKj5kBvJhwXFY="; + version = "0.13.1"; + url = "https://github.com/perses/plugins/releases/download/piechart/v0.13.1/PieChart-0.13.1.tar.gz"; + hash = "sha256-VbHfcUfUDB+qZ4Zm5XchLnGy5QIPd50b8gO05cYLf2g="; }; "Prometheus" = { - version = "0.57.0"; - url = "https://github.com/perses/plugins/releases/download/prometheus/v0.57.0/Prometheus-0.57.0.tar.gz"; - hash = "sha256-ZekIhw/1w1utArGWT5P2SXjjMDTssduDip3O4IXdA2g="; + version = "0.57.1"; + url = "https://github.com/perses/plugins/releases/download/prometheus/v0.57.1/Prometheus-0.57.1.tar.gz"; + hash = "sha256-h48uCoyxtoLb6XpIgbAq+wmls1ukxuedE8ZU51ilAMc="; }; "Pyroscope" = { - version = "0.5.0"; - url = "https://github.com/perses/plugins/releases/download/pyroscope/v0.5.0/Pyroscope-0.5.0.tar.gz"; - hash = "sha256-ZFh6lpI493+UPTjT5cdrGhSUq0l6x28Jyc0sSO/JqJk="; + version = "0.5.1"; + url = "https://github.com/perses/plugins/releases/download/pyroscope/v0.5.1/Pyroscope-0.5.1.tar.gz"; + hash = "sha256-GSAGmMQRy7mRZs5G6EopvjONof+nvn7BQSN2U9ZiBdg="; }; "ScatterChart" = { - version = "0.10.0"; - url = "https://github.com/perses/plugins/releases/download/scatterchart/v0.10.0/ScatterChart-0.10.0.tar.gz"; - hash = "sha256-pkeTDz5yDIy/pID5+VtASRfAX/jGsEReehCHD9svckM="; + version = "0.10.1"; + url = "https://github.com/perses/plugins/releases/download/scatterchart/v0.10.1/ScatterChart-0.10.1.tar.gz"; + hash = "sha256-CRgW2TeX0M/RqHnGwtMBu9OgUfjDLQCWT6ZA4M9PovI="; }; "StatChart" = { - version = "0.12.0"; - url = "https://github.com/perses/plugins/releases/download/statchart/v0.12.0/StatChart-0.12.0.tar.gz"; - hash = "sha256-wVmi2wuE4JgQSKv/cwdXLOIaqFU1VjwatdmRyzvYGxY="; + version = "0.12.1"; + url = "https://github.com/perses/plugins/releases/download/statchart/v0.12.1/StatChart-0.12.1.tar.gz"; + hash = "sha256-/f9P4kU8Qjl4U3RCFEjxKx39h97XNZXZh21wxTLjgCY="; }; "StaticListVariable" = { - version = "0.8.0"; - url = "https://github.com/perses/plugins/releases/download/staticlistvariable/v0.8.0/StaticListVariable-0.8.0.tar.gz"; - hash = "sha256-DpU919lPJlMXae9XLq1/FL5uOUzu+I2B5H0SvyxxGNY="; + version = "0.8.1"; + url = "https://github.com/perses/plugins/releases/download/staticlistvariable/v0.8.1/StaticListVariable-0.8.1.tar.gz"; + hash = "sha256-jmZhHyy3pHzTE8rXr/7bSW18RWUaQbQr0uGKVL5E9Vk="; }; "StatusHistoryChart" = { - version = "0.12.0"; - url = "https://github.com/perses/plugins/releases/download/statushistorychart/v0.12.0/StatusHistoryChart-0.12.0.tar.gz"; - hash = "sha256-U966A9swak+3DKK2WayWZTY9wqJ5tZfP4049vNf90d0="; + version = "0.12.1"; + url = "https://github.com/perses/plugins/releases/download/statushistorychart/v0.12.1/StatusHistoryChart-0.12.1.tar.gz"; + hash = "sha256-A/q5nURlLx/ansZ1q7d9aviHpH0OXP/KGwOove+OMH0="; }; "Table" = { - version = "0.11.0"; - url = "https://github.com/perses/plugins/releases/download/table/v0.11.0/Table-0.11.0.tar.gz"; - hash = "sha256-5YujehfKuLFiiqRr0I1YcSln1eYN5a/rv1dGHiEIHZg="; + version = "0.11.1"; + url = "https://github.com/perses/plugins/releases/download/table/v0.11.1/Table-0.11.1.tar.gz"; + hash = "sha256-b0q2GEKFIosKL3OPiOO/ZXW+1JVinni34MlvFkMpe3o="; }; "Tempo" = { - version = "0.57.0"; - url = "https://github.com/perses/plugins/releases/download/tempo/v0.57.0/Tempo-0.57.0.tar.gz"; - hash = "sha256-u2ZqmtxgGdsO2JzdaSBZ4llme1dnX9L3M3rPN4BmF90="; + version = "0.57.1"; + url = "https://github.com/perses/plugins/releases/download/tempo/v0.57.1/Tempo-0.57.1.tar.gz"; + hash = "sha256-QqVf1kIK8a9fsmFmZ+9LJIeq8CV/5Hc93F6gVACsq40="; }; "TimeSeriesChart" = { - version = "0.12.0"; - url = "https://github.com/perses/plugins/releases/download/timeserieschart/v0.12.0/TimeSeriesChart-0.12.0.tar.gz"; - hash = "sha256-VwiwQRs0S5uLutVQ+2NeouUoZcGKFLu9O2p+hdfH9co="; + version = "0.12.1"; + url = "https://github.com/perses/plugins/releases/download/timeserieschart/v0.12.1/TimeSeriesChart-0.12.1.tar.gz"; + hash = "sha256-1oof/taprYKIduHb5lG72OlCu5LPL7c63l42KwSpIwM="; }; "TimeSeriesTable" = { - version = "0.11.0"; - url = "https://github.com/perses/plugins/releases/download/timeseriestable/v0.11.0/TimeSeriesTable-0.11.0.tar.gz"; - hash = "sha256-7tBQpgATLQUup63qmkagZ3/MKPI1lSQD8mHI5OCZgTE="; + version = "0.11.1"; + url = "https://github.com/perses/plugins/releases/download/timeseriestable/v0.11.1/TimeSeriesTable-0.11.1.tar.gz"; + hash = "sha256-t2QDT20Fma7Qkka/nx6PROgQKCj0adMuy+70JwCTNXA="; }; "TraceTable" = { - version = "0.10.0"; - url = "https://github.com/perses/plugins/releases/download/tracetable/v0.10.0/TraceTable-0.10.0.tar.gz"; - hash = "sha256-R2TVLKh1L+wKXX4qo/DiF+zlKIUMugmclBZ9D4j3tdc="; + version = "0.10.1"; + url = "https://github.com/perses/plugins/releases/download/tracetable/v0.10.1/TraceTable-0.10.1.tar.gz"; + hash = "sha256-oOJu0YDWl5v1cWNWj+583901hYnZGoSJHjjpQ400iKg="; }; "TracingGanttChart" = { - version = "0.12.0"; - url = "https://github.com/perses/plugins/releases/download/tracingganttchart/v0.12.0/TracingGanttChart-0.12.0.tar.gz"; - hash = "sha256-BE61Am6ZQeUpi4T9VLiurO4y0q4auJ/HZESxeZ03abA="; + version = "0.12.1"; + url = "https://github.com/perses/plugins/releases/download/tracingganttchart/v0.12.1/TracingGanttChart-0.12.1.tar.gz"; + hash = "sha256-AnI8TitOtkE4Lhu2w2C5E3D1w9pdgrZaaQ8FVMO8UOE="; }; "VictoriaLogs" = { - version = "0.3.0"; - url = "https://github.com/perses/plugins/releases/download/victorialogs/v0.3.0/VictoriaLogs-0.3.0.tar.gz"; - hash = "sha256-Jzaihrolx17qZwfc1pDZYYJ2c46PNjfogwkKZM0sinY="; + version = "0.3.1"; + url = "https://github.com/perses/plugins/releases/download/victorialogs/v0.3.1/VictoriaLogs-0.3.1.tar.gz"; + hash = "sha256-vCV06freSYzSHvObNNBk4gHMnX+O4IIKYY0UNOQdVRU="; }; } From 6a8a32481c1bc5daf8438faf5836a4f25dbca7d6 Mon Sep 17 00:00:00 2001 From: azban Date: Sat, 21 Mar 2026 11:28:40 -0600 Subject: [PATCH 022/305] iamb: temporary fix for matrix-sdk-sqlite failure This adds a patch to increase the recursion limit for the crate while matrix-sdk-sqlite figures out a more durable solution. --- ...rsion-limit-to-fix-matrix-sdk-sqlite.patch | 25 +++++++++++++++++++ pkgs/by-name/ia/iamb/package.nix | 4 +++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/by-name/ia/iamb/0001-increase-recursion-limit-to-fix-matrix-sdk-sqlite.patch diff --git a/pkgs/by-name/ia/iamb/0001-increase-recursion-limit-to-fix-matrix-sdk-sqlite.patch b/pkgs/by-name/ia/iamb/0001-increase-recursion-limit-to-fix-matrix-sdk-sqlite.patch new file mode 100644 index 000000000000..0f0dea263884 --- /dev/null +++ b/pkgs/by-name/ia/iamb/0001-increase-recursion-limit-to-fix-matrix-sdk-sqlite.patch @@ -0,0 +1,25 @@ +From 979dcc049c1d8b8b537ddf42133dba38ef17ee7f Mon Sep 17 00:00:00 2001 +From: azban +Date: Sat, 21 Mar 2026 11:23:30 -0600 +Subject: [PATCH] increase recursion limit to fix matrix-sdk-sqlite + +This is a temporary fix for build errors in the matrix-sdk-sqlite dependency. A more durable fix should be checked for in https://github.com/matrix-org/matrix-rust-sdk/issues/6254. +--- + src/main.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/main.rs b/src/main.rs +index 0a316c7..794f838 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -15,6 +15,7 @@ + #![allow(clippy::needless_return)] + #![allow(clippy::result_large_err)] + #![allow(clippy::bool_assert_comparison)] ++#![recursion_limit = "256"] + use std::collections::VecDeque; + use std::convert::TryFrom; + use std::fmt::Display; +-- +2.51.2 + diff --git a/pkgs/by-name/ia/iamb/package.nix b/pkgs/by-name/ia/iamb/package.nix index d4dc072cece4..8a15554b29cf 100644 --- a/pkgs/by-name/ia/iamb/package.nix +++ b/pkgs/by-name/ia/iamb/package.nix @@ -19,6 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-nvEOtV1Y5K9E1Lj+bPnQ6k1AneDM9OT3RbV3Urm/1Qs="; }; + patches = [ + ./0001-increase-recursion-limit-to-fix-matrix-sdk-sqlite.patch + ]; + cargoHash = "sha256-uWYNFNoCiqw6gYuHZWmZmZVs7lKNvhzjwEyxgcbvv+8="; nativeBuildInputs = [ From 92279148f5effe9dce137f33e2c5f8e5244c361a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Mar 2026 10:24:28 +0000 Subject: [PATCH 023/305] postman: 11.88.3 -> 11.89.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 a014cbd87449..8f9113f9ef59 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.88.3"; + version = "11.89.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-BYdEwE96SdxPwn8bTcIZcHcClAjPgrFd2rSO1zs/X5Y="; - aarch64-linux = "sha256-nWS4cPV6m/h1+RLkl1i9FZxCol/GPxFb2S+GRoL87QM="; - x86_64-darwin = "sha256-8lDFOysRuJMEJ5Ff2mkTZx+Mu+duiDq8EAdibi7yYL8="; - x86_64-linux = "sha256-98NRSIOpgsDZ9tehbgQi1Ms5U04ylWIh4A2qY0yasPA="; + 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="; }; }; From 5492d23dcce90112af6b9265122fff8d59865870 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 23 Mar 2026 10:49:34 -0500 Subject: [PATCH 024/305] lp_solve: migrate to by-name --- .../lp}/lp_solve/0001-fix-cross-compilation.patch | 0 .../lp_solve/default.nix => by-name/lp/lp_solve/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/science/math => by-name/lp}/lp_solve/0001-fix-cross-compilation.patch (100%) rename pkgs/{applications/science/math/lp_solve/default.nix => by-name/lp/lp_solve/package.nix} (96%) diff --git a/pkgs/applications/science/math/lp_solve/0001-fix-cross-compilation.patch b/pkgs/by-name/lp/lp_solve/0001-fix-cross-compilation.patch similarity index 100% rename from pkgs/applications/science/math/lp_solve/0001-fix-cross-compilation.patch rename to pkgs/by-name/lp/lp_solve/0001-fix-cross-compilation.patch diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/by-name/lp/lp_solve/package.nix similarity index 96% rename from pkgs/applications/science/math/lp_solve/default.nix rename to pkgs/by-name/lp/lp_solve/package.nix index 35bd657e7ad3..195c3ac3bcd8 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/by-name/lp/lp_solve/package.nix @@ -4,7 +4,7 @@ fetchurl, cctools, fixDarwinDylibNames, - autoSignDarwinBinariesHook, + darwin, replaceVars, buildPackages, binutils, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - autoSignDarwinBinariesHook + darwin.autoSignDarwinBinariesHook ]; env = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9732092816f4..052e57970a40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2343,10 +2343,6 @@ with pkgs; fluentd = callPackage ../tools/misc/fluentd { }; - lp_solve = callPackage ../applications/science/math/lp_solve { - inherit (darwin) autoSignDarwinBinariesHook; - }; - fpm = callPackage ../tools/package-management/fpm { }; ferdium = callPackage ../applications/networking/instant-messengers/ferdium { From 09a85412e03fd08839a38a6aa2d5da1e6e026d13 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 23 Mar 2026 10:50:29 -0500 Subject: [PATCH 025/305] lp_solve: refactor --- pkgs/by-name/lp/lp_solve/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lp/lp_solve/package.nix b/pkgs/by-name/lp/lp_solve/package.nix index 195c3ac3bcd8..cadd82feb7f0 100644 --- a/pkgs/by-name/lp/lp_solve/package.nix +++ b/pkgs/by-name/lp/lp_solve/package.nix @@ -10,13 +10,13 @@ binutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lp_solve"; version = "5.5.2.11"; src = fetchurl { - url = "mirror://sourceforge/project/lpsolve/lpsolve/${version}/lp_solve_${version}_source.tar.gz"; - sha256 = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8="; + url = "mirror://sourceforge/project/lpsolve/lpsolve/${finalAttrs.version}/lp_solve_${finalAttrs.version}_source.tar.gz"; + hash = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8="; }; nativeBuildInputs = @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) From c7411de5c0986f767c8d25475e4614309c8b04a3 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 23 Mar 2026 11:53:07 -0500 Subject: [PATCH 026/305] ilspycmd: migrate to by-name --- pkgs/{development/tools => by-name/il}/ilspycmd/deps.json | 0 .../ilspycmd/default.nix => by-name/il/ilspycmd/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{development/tools => by-name/il}/ilspycmd/deps.json (100%) rename pkgs/{development/tools/ilspycmd/default.nix => by-name/il/ilspycmd/package.nix} (96%) diff --git a/pkgs/development/tools/ilspycmd/deps.json b/pkgs/by-name/il/ilspycmd/deps.json similarity index 100% rename from pkgs/development/tools/ilspycmd/deps.json rename to pkgs/by-name/il/ilspycmd/deps.json diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/by-name/il/ilspycmd/package.nix similarity index 96% rename from pkgs/development/tools/ilspycmd/default.nix rename to pkgs/by-name/il/ilspycmd/package.nix index 7d5dc107cf22..4f4c36fc4d1c 100644 --- a/pkgs/development/tools/ilspycmd/default.nix +++ b/pkgs/by-name/il/ilspycmd/package.nix @@ -5,7 +5,7 @@ buildDotnetModule, dotnetCorePackages, powershell, - autoSignDarwinBinariesHook, + darwin, glibcLocales, }: buildDotnetModule (finalAttrs: { @@ -23,7 +23,7 @@ buildDotnetModule (finalAttrs: { powershell ] ++ lib.optionals (stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isAarch64) [ - autoSignDarwinBinariesHook + darwin.autoSignDarwinBinariesHook ]; # https://github.com/NixOS/nixpkgs/issues/38991 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9732092816f4..2bc26f046c73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2628,10 +2628,6 @@ with pkgs; packages = config.ihaskell.packages or (_: [ ]); }; - ilspycmd = callPackage ../development/tools/ilspycmd { - inherit (darwin) autoSignDarwinBinariesHook; - }; - incus-lts = callPackage ../by-name/in/incus/lts.nix { }; indexed-bzip2 = with python3Packages; toPythonApplication indexed-bzip2; From 7181b4e7f7da0e77c28bf9040dc3998fcf5d59a4 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 23 Mar 2026 11:53:42 -0500 Subject: [PATCH 027/305] ilspycmd: refactor --- pkgs/by-name/il/ilspycmd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/il/ilspycmd/package.nix b/pkgs/by-name/il/ilspycmd/package.nix index 4f4c36fc4d1c..58ed7373d0fd 100644 --- a/pkgs/by-name/il/ilspycmd/package.nix +++ b/pkgs/by-name/il/ilspycmd/package.nix @@ -15,7 +15,7 @@ buildDotnetModule (finalAttrs: { src = fetchFromGitHub { owner = "icsharpcode"; repo = "ILSpy"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YkZEStCI6Omu8HgClm5qHnXxm5pKJVILtbydY8vAFic="; }; @@ -42,7 +42,7 @@ buildDotnetModule (finalAttrs: { description = "Tool for decompiling .NET assemblies and generating portable PDBs"; mainProgram = "ilspycmd"; homepage = "https://github.com/icsharpcode/ILSpy"; - changelog = "https://github.com/icsharpcode/ILSpy/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/icsharpcode/ILSpy/releases/tag/${finalAttrs.src.tag}"; license = with lib.licenses; [ mit # third party dependencies From 558eec4a931854039ced605ea5aa9779e3c20986 Mon Sep 17 00:00:00 2001 From: Antoine Fontaine Date: Wed, 25 Mar 2026 15:30:39 +0100 Subject: [PATCH 028/305] unvanquished: 0.55.3 -> 0.56.1 --- pkgs/by-name/un/unvanquished/package.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/un/unvanquished/package.nix b/pkgs/by-name/un/unvanquished/package.nix index 509412e7bb7e..79b496625dcf 100644 --- a/pkgs/by-name/un/unvanquished/package.nix +++ b/pkgs/by-name/un/unvanquished/package.nix @@ -3,7 +3,7 @@ stdenv, fetchzip, fetchFromGitHub, - SDL2, + sdl3, buildFHSEnv, cmake, copyDesktopItems, @@ -34,15 +34,15 @@ }: let - version = "0.55.3"; - binary-deps-version = "10"; + version = "0.56.1"; + binary-deps-version = "11"; src = fetchFromGitHub { owner = "Unvanquished"; repo = "Unvanquished"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-wOFSPPEu7AGsEcqHG7xFWzFlYZRWAIvvfTj5FLZ3HFc="; + hash = "sha256-MIsHW56RYkh5xtidHpBOEwQQSsvGMEdAdGt5fQvqXxQ="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { @@ -51,8 +51,8 @@ let version = binary-deps-version; src = fetchzip { - url = "https://dl.unvanquished.net/deps/linux-amd64-default_${version}.tar.xz "; - hash = "sha256-5n8gRvTuke4e7EaZ/5G+dtCG6qmnawhtA1IXIFQPkzA="; + url = "https://dl.unvanquished.net/deps/linux-amd64-default_${version}.tar.xz"; + hash = "sha256-1PPqQYnMBFR7Jr48qiqQEduEjiFWx3XyvfPBwX/PzIY="; }; dontPatchELF = true; @@ -121,7 +121,7 @@ let pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256-6v6NO4Ad4rMFziWAO9x22CHtm/nfOuT0ptBEVhCMqZo="; + outputHash = "sha256-HnWdOvi7fcKmktLVbdUfMnB8v3iHb1t7jEERUcYcxNg="; outputHashMode = "recursive"; nativeBuildInputs = [ @@ -149,7 +149,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - unvanquished-binary-deps copyDesktopItems ]; @@ -162,7 +161,7 @@ stdenv.mkDerivation rec { lua5 nettle curl - SDL2 + sdl3 freetype glew openal @@ -177,10 +176,12 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DBUILD_CGAME=NO" - "-DBUILD_SGAME=NO" + "-DBUILD_CGAME=FALSE" + "-DBUILD_SGAME=FALSE" "-DUSE_HARDENING=TRUE" "-DUSE_LTO=TRUE" + "-DUSE_OPENMP=TRUE" + "-DUSE_EXTERNAL_DEPS_LIBS=FALSE" "-DOpenGL_GL_PREFERENCE=LEGACY" # https://github.com/DaemonEngine/Daemon/issues/474 ]; From deff67ea124ff626f313eeeff7d53f3cb8e18937 Mon Sep 17 00:00:00 2001 From: Alan Norbauer Date: Wed, 25 Mar 2026 14:57:29 -0700 Subject: [PATCH 029/305] nixos/netbird: fix coturn TURN port for UDP --- nixos/modules/services/networking/netbird/server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/netbird/server.nix b/nixos/modules/services/networking/netbird/server.nix index aa3127f1d67b..d5f6ebda2bb5 100644 --- a/nixos/modules/services/networking/netbird/server.nix +++ b/nixos/modules/services/networking/netbird/server.nix @@ -56,7 +56,7 @@ in } // (optionalAttrs cfg.coturn.enable rec { turnDomain = cfg.domain; - turnPort = config.services.coturn.tls-listening-port; + turnPort = config.services.coturn.listening-port; # We cannot merge a list of attrsets so we have to redefine the whole list settings = { TURNConfig.Turns = mkDefault [ From 17ca51d81a58dca32597da11ccafb1b071b50abe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Mar 2026 08:46:31 +0000 Subject: [PATCH 030/305] jj-pre-push: 0.3.4 -> 0.3.5 --- pkgs/by-name/jj/jj-pre-push/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix index b59a82ba12cb..06f70563b978 100644 --- a/pkgs/by-name/jj/jj-pre-push/package.nix +++ b/pkgs/by-name/jj/jj-pre-push/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "jj-pre-push"; - version = "0.3.4"; + version = "0.3.5"; pyproject = true; src = fetchFromGitHub { owner = "acarapetis"; repo = "jj-pre-push"; tag = "v${finalAttrs.version}"; - hash = "sha256-sj1JM2gcwTRMeEXSozI73LCwxSf69t4u/SmovV7Cyeg="; + hash = "sha256-T9IKPFGswwrszGkBCIz8et2vTgRpQ2l6ta2UfojGj7A="; }; postPatch = '' From fa23b0fe540fe707829fb1390b9265718094e058 Mon Sep 17 00:00:00 2001 From: Vitor Pavan Date: Mon, 30 Mar 2026 15:57:05 +0200 Subject: [PATCH 031/305] brave-search-cli: init at 1.2.0 --- pkgs/by-name/br/brave-search-cli/package.nix | 32 ++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/br/brave-search-cli/package.nix diff --git a/pkgs/by-name/br/brave-search-cli/package.nix b/pkgs/by-name/br/brave-search-cli/package.nix new file mode 100644 index 000000000000..01036e4d57c4 --- /dev/null +++ b/pkgs/by-name/br/brave-search-cli/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "brave-search-cli"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "brave"; + repo = "brave-search-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wcZwgCPqIy+AVxpqcCI8rOyUOWXb7aYSsHJDS2pfpnE="; + }; + + cargoHash = "sha256-qIBepW7I5meLX9V3yEq6zoIRaZWD3CVjyrN8zpTAbR0="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI for the Brave Search API with support for web, news, images, and AI answer endpoints"; + homepage = "https://github.com/brave/brave-search-cli"; + changelog = "https://github.com/brave/brave-search-cli/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ vitorpavani ]; + mainProgram = "bx"; + platforms = lib.platforms.all; + }; +}) From bab1276fe9b5c1e2d50b2d761b870ac09cee896c Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Tue, 31 Mar 2026 09:35:46 +0200 Subject: [PATCH 032/305] k3s_1_32: drop EOL, see https://kubernetes.io/releases/1.32/ --- .../cluster/k3s/1_32/chart-versions.nix | 10 ------- .../cluster/k3s/1_32/images-versions.json | 26 ------------------- .../networking/cluster/k3s/1_32/versions.nix | 21 --------------- .../networking/cluster/k3s/default.nix | 2 -- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 6 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix delete mode 100644 pkgs/applications/networking/cluster/k3s/1_32/images-versions.json delete mode 100644 pkgs/applications/networking/cluster/k3s/1_32/versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix deleted file mode 100644 index ef1bb654767c..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.201+up39.0.2.tgz"; - sha256 = "0r43kny2kkrlxjniivnivzbqqbiri08cg9qjrl6mx9rjzsxfxqwg"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.201+up39.0.2.tgz"; - sha256 = "1ci2wns11ibgwf7x4j90vcbrsf63rrz1slsm63iayvkdq3r3ri04"; - }; -} diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json deleted file mode 100644 index 44c32305b2ee..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "a73742d5f26b000c61eb1ada896950ca2168a0957c52d6fc8e13676244120ac1" - }, - "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "789c04f62ccb1b5adace8b5876e49dba0be739657e1324d1d9542a70c61971b0" - }, - "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "56e2336781b1ef115d91276aa07cdceacaa38f9aa6209aa3fff9c8f74530d8a4" - }, - "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "fcbb9b0b725b313ecfe077303e012ab6b88be446bbba1bf61f601a7ad90cffdb" - }, - "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "e9b3da2b855eb188eb170940f5e5bad79e04aafc7dff10317b30a4b2884f792c" - }, - "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "c5799a879b68adc996e9a09158d8ea7f04b46bff5241e9641c404809e687d29e" - } -} diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix deleted file mode 100644 index 44f6d6c8693c..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - k3sVersion = "1.32.13+k3s1"; - k3sCommit = "bf43a24f544763b0f3ef2d2da0beeea1cf357a35"; - k3sRepoSha256 = "1c7022il1gsxcyn575pl15l75nwidmm1d08kvb9ckvrv6abc98m6"; - k3sVendorHash = "sha256-42+SVIwUiZPCQ+gbk8ytGBzUrAWV1J9l9rEwCiEE+kE="; - chartVersions = import ./chart-versions.nix; - imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.15.0"; - k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; - k3sCNIVersion = "1.9.0-k3s1"; - k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c"; - containerdVersion = "2.1.5-k3s1.32"; - containerdSha256 = "1fzld9q0ycfg9b3054qg70mif1p6i7xqikcbabrmxapk81fy83kn"; - containerdPackage = "github.com/k3s-io/containerd/v2"; - criCtlVersion = "1.31.0-k3s2"; - flannelVersion = "v0.28.0"; - flannelPluginVersion = "v1.9.0-flannel1"; - kubeRouterVersion = "v2.6.3-k3s1"; - criDockerdVersion = "v0.3.19-k3s2.32"; - helmJobVersion = "v0.9.14-build20260210"; -} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 2be03398c65d..d27f9d97ca86 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -12,8 +12,6 @@ let extraArgs = removeAttrs args [ "callPackage" ]; in { - k3s_1_32 = common (import ./1_32/versions.nix) extraArgs; - k3s_1_33 = common (import ./1_33/versions.nix) extraArgs; k3s_1_34 = (common (import ./1_34/versions.nix) extraArgs).overrideAttrs { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e802736b7cab..8a8942ffc402 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -967,6 +967,7 @@ mapAliases { julia_19-bin = throw "Julia 1.9 has reached its end of life and 'julia_19-bin' has been removed. Please use a supported version."; # Added 2025-10-29 k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01 k3s_1_31 = throw "'k3s_1_31' has been removed from nixpkgs as it has reached end of life"; # Added 2025-12-08 + k3s_1_32 = throw "'k3s_1_32' has been removed from nixpkgs as it has reached end of life"; # Added 2026-03-31 kak-lsp = throw "'kak-lsp' has been renamed to/replaced by 'kakoune-lsp'"; # Converted to throw 2025-10-27 kanidm = throw "'kanidm' alias has been removed. You must use a versioned package, e.g. 'kanidm_1_x'."; # Added 2026-01-29 kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e395e3bf8dff..0fbf4d7f9c00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9863,7 +9863,6 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; inherit (callPackage ../applications/networking/cluster/k3s { }) - k3s_1_32 k3s_1_33 k3s_1_34 k3s_1_35 From 3a83af709f7fd4493df000974895f0ea07829c0d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 31 Mar 2026 16:50:43 -0500 Subject: [PATCH 033/305] teamviewer: migrate to by-name --- .../default.nix => by-name/te/teamviewer/package.nix} | 4 ++-- .../remote => by-name/te}/teamviewer/update-teamviewer.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) rename pkgs/{applications/networking/remote/teamviewer/default.nix => by-name/te/teamviewer/package.nix} (99%) rename pkgs/{applications/networking/remote => by-name/te}/teamviewer/update-teamviewer.sh (100%) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/by-name/te/teamviewer/package.nix similarity index 99% rename from pkgs/applications/networking/remote/teamviewer/default.nix rename to pkgs/by-name/te/teamviewer/package.nix index b6218e40fa42..bae0059e6268 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/by-name/te/teamviewer/package.nix @@ -16,7 +16,7 @@ libsm, libxfixes, coreutils, - wrapQtAppsHook, + libsForQt5, icu63, nss, minizip, @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ minizip diff --git a/pkgs/applications/networking/remote/teamviewer/update-teamviewer.sh b/pkgs/by-name/te/teamviewer/update-teamviewer.sh similarity index 100% rename from pkgs/applications/networking/remote/teamviewer/update-teamviewer.sh rename to pkgs/by-name/te/teamviewer/update-teamviewer.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb5759dcc792..527299b29868 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3512,8 +3512,6 @@ with pkgs; youtube-dl = yt-dlp; }; - teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; - buildTeleport = callPackage ../build-support/teleport { }; telepresence = callPackage ../tools/networking/telepresence { From b7ee3ad5baa5e8f227cf835f39e1faacefcedf0d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 31 Mar 2026 16:56:40 -0500 Subject: [PATCH 034/305] teamviewer: use finalAttrs --- pkgs/by-name/te/teamviewer/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/te/teamviewer/package.nix b/pkgs/by-name/te/teamviewer/package.nix index bae0059e6268..51953fad79ee 100644 --- a/pkgs/by-name/te/teamviewer/package.nix +++ b/pkgs/by-name/te/teamviewer/package.nix @@ -22,7 +22,7 @@ minizip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "teamviewer"; # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime outputs = [ @@ -33,15 +33,15 @@ stdenv.mkDerivation rec { src = let - base_url = "https://dl.teamviewer.com/download/linux/version_${lib.versions.major version}x"; + base_url = "https://dl.teamviewer.com/download/linux/version_${lib.versions.major finalAttrs.version}x"; in { x86_64-linux = fetchurl { - url = "${base_url}/teamviewer_${version}_amd64.deb"; + url = "${base_url}/teamviewer_${finalAttrs.version}_amd64.deb"; hash = "sha256-7QQlGzIr3BBFaur8ycGY0VuYz21cJI+EfCsRuCAr8XA="; }; aarch64-linux = fetchurl { - url = "${base_url}/teamviewer_${version}_arm64.deb"; + url = "${base_url}/teamviewer_${finalAttrs.version}_arm64.deb"; hash = "sha256-prz3RaeMykgLrK9ai3/ivzRsUFT1dyWP1xymEl3s4eA="; }; } @@ -164,4 +164,4 @@ stdenv.mkDerivation rec { c4patino ]; }; -} +}) From 4a9de2759e5279a636aca6b6ed71803004c37e46 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 1 Apr 2026 08:25:25 +0200 Subject: [PATCH 035/305] oxidized: 0.35.0 -> 0.36.0 --- pkgs/by-name/ox/oxidized/Gemfile | 3 ++- pkgs/by-name/ox/oxidized/Gemfile.lock | 12 ++++++------ pkgs/by-name/ox/oxidized/gemset.nix | 5 ++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ox/oxidized/Gemfile b/pkgs/by-name/ox/oxidized/Gemfile index e92ee6f43713..c89aabe1432b 100644 --- a/pkgs/by-name/ox/oxidized/Gemfile +++ b/pkgs/by-name/ox/oxidized/Gemfile @@ -1,6 +1,7 @@ source 'https://rubygems.org' -gem 'oxidized', '0.35.0' +gem 'oxidized', '0.36.0' gem 'oxidized-web', '0.18.1' gem 'oxidized-script', '0.7.0' gem 'psych', '~> 5.0' +gem 'net-scp', '~> 4.1' diff --git a/pkgs/by-name/ox/oxidized/Gemfile.lock b/pkgs/by-name/ox/oxidized/Gemfile.lock index ccef0248a676..43fc4cf335aa 100644 --- a/pkgs/by-name/ox/oxidized/Gemfile.lock +++ b/pkgs/by-name/ox/oxidized/Gemfile.lock @@ -31,21 +31,20 @@ GEM net-ssh (7.3.0) net-telnet (0.2.0) nio4r (2.7.4) - oxidized (0.35.0) + oxidized (0.36.0) asetus (~> 0.4) bcrypt_pbkdf (~> 1.0) ed25519 (~> 1.2) net-ftp (~> 0.2) net-http-digest_auth (~> 1.4) - net-scp (~> 4.1) net-ssh (~> 7.3) net-telnet (~> 0.2) psych (~> 5.0) rugged (~> 1.6) - semantic_logger (~> 4.17.0) + semantic_logger (~> 4.17) slop (~> 4.6) - syslog (~> 0.3.0) - syslog_protocol (~> 0.9.2) + syslog (~> 0.3) + syslog_protocol (~> 0.9) oxidized-script (0.7.0) oxidized (~> 0.29) slop (~> 4.6) @@ -105,7 +104,8 @@ PLATFORMS ruby DEPENDENCIES - oxidized (= 0.35.0) + net-scp (~> 4.1) + oxidized (= 0.36.0) oxidized-script (= 0.7.0) oxidized-web (= 0.18.1) psych (~> 5.0) diff --git a/pkgs/by-name/ox/oxidized/gemset.nix b/pkgs/by-name/ox/oxidized/gemset.nix index 1b9f4bef6397..57c52043065f 100644 --- a/pkgs/by-name/ox/oxidized/gemset.nix +++ b/pkgs/by-name/ox/oxidized/gemset.nix @@ -229,7 +229,6 @@ "ed25519" "net-ftp" "net-http-digest_auth" - "net-scp" "net-ssh" "net-telnet" "psych" @@ -243,10 +242,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1s7v9w357bc5xb89an4kclqmfjv2j6p9gnvsf7s2mnrgg482j76v"; + sha256 = "0g2a60bwpjidwkksai6l2ndnq3qbvqj33jv53c800m7m4hgr5r0n"; type = "gem"; }; - version = "0.35.0"; + version = "0.36.0"; }; oxidized-script = { dependencies = [ From 4eee67458101ae7d02047dc335bee687987e5523 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Apr 2026 19:37:28 +0000 Subject: [PATCH 036/305] stress-ng: 0.20.01 -> 0.21.00 --- pkgs/by-name/st/stress-ng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix index 47390ba36596..5c729a6ed242 100644 --- a/pkgs/by-name/st/stress-ng/package.nix +++ b/pkgs/by-name/st/stress-ng/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stress-ng"; - version = "0.20.01"; + version = "0.21.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "stress-ng"; tag = "V${finalAttrs.version}"; - hash = "sha256-C9TpUM18W+ARFAFLSqTl6RjRrI60pxhdP/veBHu2cco="; + hash = "sha256-kFIrbt/jJuQnuWmQUBuiFGuAfBb2pUtujhj6bwpDF4k="; }; postPatch = '' From 754097dbc4af44d4beb45f655eddb4694db6a8bb Mon Sep 17 00:00:00 2001 From: Philipp Herzog Date: Fri, 14 Nov 2025 09:50:01 +0100 Subject: [PATCH 037/305] opensearch: 2.19.2 -> 3.5.0 Release Notes: https://github.com/opensearch-project/opensearch-build/blob/main/release-notes/opensearch-release-notes-3.5.0.md --- nixos/modules/services/search/opensearch.nix | 1 + pkgs/by-name/op/opensearch/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/search/opensearch.nix b/nixos/modules/services/search/opensearch.nix index 339ab0699c0e..46a06b5d2216 100644 --- a/nixos/modules/services/search/opensearch.nix +++ b/nixos/modules/services/search/opensearch.nix @@ -210,6 +210,7 @@ in ln -sfT "${cfg.package}/plugins" "${cfg.dataDir}/plugins" ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules + ln -sfT ${cfg.package}/agent ${cfg.dataDir}/agent # opensearch needs to create the opensearch.keystore in the config directory # so this directory needs to be writable. diff --git a/pkgs/by-name/op/opensearch/package.nix b/pkgs/by-name/op/opensearch/package.nix index 6ef6a4075b9f..a9a06da64dad 100644 --- a/pkgs/by-name/op/opensearch/package.nix +++ b/pkgs/by-name/op/opensearch/package.nix @@ -12,11 +12,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.19.2"; + version = "3.5.0"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-EaOx8vs3y00ln7rUiaCGoD+HhiQY4bhQAzu18VfaTYw="; + hash = "sha256-0d6TQU1LTE983CsYbaK4fNuC86VAx23XD2xR6y2NuHw="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out - cp -R bin config lib modules plugins $out + cp -R bin config lib modules plugins agent $out substituteInPlace $out/bin/opensearch \ --replace 'bin/opensearch-keystore' "$out/bin/opensearch-keystore" From 2768938886693eb73402c4d6f31571d3911d8472 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Apr 2026 04:40:32 +0000 Subject: [PATCH 038/305] easyeffects: 8.1.6 -> 8.1.8 --- pkgs/by-name/ea/easyeffects/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 036e1e3bd1a4..03804d56a666 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -59,13 +59,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "easyeffects"; - version = "8.1.6"; + version = "8.1.8"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; tag = "v${finalAttrs.version}"; - hash = "sha256-MNBlhwF8quJ0wXBzwyn7KM2TNgbYbWYHTK6itn0fUVU="; + hash = "sha256-U0+OGxej5my2KpqzRTiHrB80arkWT1mxHOSxOCDsnb0="; }; nativeBuildInputs = [ From 7fb210d2bcffc0459a9c3095049a0eb7214dcc7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Apr 2026 05:43:01 +0000 Subject: [PATCH 039/305] libretro-shaders-slang: 0-unstable-2026-03-16 -> 0-unstable-2026-04-03 --- pkgs/by-name/li/libretro-shaders-slang/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index 948864dd9dfc..88a8dc9193ef 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2026-03-16"; + version = "0-unstable-2026-04-03"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "875bc1da241f4d174e6443c754e7dd4926f76f8c"; - hash = "sha256-N/JZ8qTJtg/RlWnQXJ9SJruz7zr5yHJdWL+XnxxMM84="; + rev = "f1b85fef8c82ae05bf24a2bda8eb2730b3b7023e"; + hash = "sha256-wAsU07lEjr9rFfW1WrnzflEriGwr/vzKpE9OM2zsPJA="; }; dontConfigure = true; From 2e12f1537c26b76070937d0eb07ae48bc91296e3 Mon Sep 17 00:00:00 2001 From: Veselin Ivanov Date: Sat, 4 Apr 2026 17:48:25 +0300 Subject: [PATCH 040/305] tmuxPlugins.harpoon: 0.4.0 -> 0.5.0 --- pkgs/misc/tmux-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index c72903c8ee71..08f7906c5168 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -384,12 +384,12 @@ in harpoon = mkTmuxPlugin { pluginName = "harpoon"; rtpFilePath = "harpoon.tmux"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "chaitanyabsprip"; repo = "tmux-harpoon"; - rev = "v0.4.0"; - hash = "sha256-+IakWkPoQFhIQ4m/98NVYWe5tFKmtfKBnPXZcfU9iOk="; + rev = "v0.5.0"; + hash = "sha256-eqzf3hEaliF1t7zwZlj1YDGvn0jKdbBTgy5PoOPVMEU="; }; meta = { homepage = "https://github.com/Chaitanyabsprip/tmux-harpoon"; From 046e31822fc448f0e74790c39680a1aa001722ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Apr 2026 19:19:48 +0000 Subject: [PATCH 041/305] waves: 0.1.42 -> 0.1.44 --- pkgs/by-name/wa/waves/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/waves/package.nix b/pkgs/by-name/wa/waves/package.nix index 2c2c5f308636..1788bbb284be 100644 --- a/pkgs/by-name/wa/waves/package.nix +++ b/pkgs/by-name/wa/waves/package.nix @@ -10,16 +10,16 @@ }: buildGoModule (finalAttrs: { pname = "waves"; - version = "0.1.42"; + version = "0.1.44"; src = fetchFromGitHub { owner = "llehouerou"; repo = "waves"; tag = "v${finalAttrs.version}"; - hash = "sha256-UReEoPXVGwBpWs53Dk8iWn2el2+/9PMAJ5KW4M9FjnA="; + hash = "sha256-uyTstoF3rhqMmhG5hwyyq1fGBa6mJjw3/NEjTIMYxi4="; }; - vendorHash = "sha256-mUifSJ8IalfzqQHeDpFp0jbtZDr7OWPq16st9RJVu7U="; + vendorHash = "sha256-lps0OdY8KoILJh/roY78iC+bYHPeENioQoIsL6v/N0A="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; From 0e11102330c3e172270f4836d381d0b8a5d2681b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Apr 2026 20:46:25 +0000 Subject: [PATCH 042/305] terragrunt: 0.99.5 -> 1.0.0 --- pkgs/by-name/te/terragrunt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index a827d501b0dd..6e166ef6a815 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "terragrunt"; - version = "0.99.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-VlJRuW8TAlwszp2GzVC/7FY1jhq/7NHi/i5xPnw1nec="; + hash = "sha256-BtgjfRKqFw18pQd0Ktr6w6qhHq5Qp5Lxc8buu8nxKnA="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { make generate-mocks ''; - vendorHash = "sha256-4j6qrYtIHkgQGHvWUt/+Mvwdzwnnkg2GAsQB1qgeJmw="; + vendorHash = "sha256-ZAVUnQv67HREFTsjbB7+oB73fST384Di4TcM3zDOOR8="; excludedPackages = [ "test/flake" ]; From 2baa46ae0b505899e7aa9c45970730478016cac5 Mon Sep 17 00:00:00 2001 From: GGG Date: Sun, 5 Apr 2026 16:31:15 -0300 Subject: [PATCH 043/305] vscode-extensions.ms-dotnettools.csharp: 2.93.22 -> 2.131.79 --- .../extensions/ms-dotnettools.csharp/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 44374aba418c..33ddac94f58f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -18,19 +18,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-gey2F+TrWJFbcyDHwwSUijt4mJZSZND+0WUyVFF3eUg="; + hash = "sha256-DtvdlODo0tbFxHTXR0MBOCM2wxWYqUCYbJRU1um+Pck="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-RxUEzWX4NPZZegdwMa+cLBZAdTNIrwHdsmyZQQ7ike4="; + hash = "sha256-WduoZivxgoePof1H/DGEdnqXN7sLvQMq9I0z9NzwDnI="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-o2MOxeDUnXkS6RaG3RajP1Mzi+2gKLFlb+WiRPG4R1s="; + hash = "sha256-a5njdsMEvqVcbfzaB5APzoGCHhl0Fcmo4tylckcv80U="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-XgM+0q5BoLORDVQueLABJP5X31iTB7lLv2o7FZH+DFk="; + hash = "sha256-6tFj6Am2SyhF/rHBhQIR7eL866Jq6Vqfl3IKWYu85zY="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") @@ -41,8 +41,8 @@ let # ideally should be done at the vscode-extensions level for # everyone to reuse. roslyn-copilot = fetchzip { - url = "https://roslyn.blob.core.windows.net/releases/Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer-18.0.479-alpha.zip"; - hash = "sha256-xq66gY3N3/R9bG6XWqLy53T/ExzGdZi3ZBNEzYAeqM8="; + url = "https://roslyn.blob.core.windows.net/releases/Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer-18.3.72-alpha.zip"; + hash = "sha256-Eh1XaF9eCN5saTrIf4NeZZKDeiEvrTo0m+vOiM5QZoI="; postFetch = '' touch install.Lock ''; @@ -52,7 +52,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csharp"; publisher = "ms-dotnettools"; - version = "2.93.22"; + version = "2.131.79"; inherit (extInfo) hash arch; }; From aa8854c92e1bd141b2d9f8e1af6dc71f29ae30f9 Mon Sep 17 00:00:00 2001 From: GGG Date: Sun, 5 Apr 2026 16:32:17 -0300 Subject: [PATCH 044/305] vscode-extensions.ms-dotnettools.csdevkit: 1.80.7 -> 3.10.4 --- .../extensions/ms-dotnettools.csdevkit/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index 52d427ed9079..7d6d5dca8190 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -16,19 +16,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-7BC+pL9rT/lG60F4mYPMLS9BTjMvJq3pzkpp/Dk5bak="; + hash = "sha256-ils23RuuuEn25DJl79mMkCXXXdoI+Pyr53VKer1Lvs8="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-aB/VNj361Z38rmIzwYc8JSCaFyYGkIxxCcBZE6YBSjU="; + hash = "sha256-RULUblmg5P0EU7PnTLJO6zl27AXhzbqCHWoFDSlI65E="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-ajOmvfdpiXN+qpT7u6mEnKL9VAeWUxFrECain6Pc/qM="; + hash = "sha256-30RHJ6hwjY1OrYYJNsycjcf2TcxhmL6YQCeIMiYRGrc="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-6MtUbdL8Q94/trh/B714n0ZMUhtUvjRPOLHFzvqQq2s="; + hash = "sha256-3bV8J09LzTj6i+YvBoP+Tqy7OIqGvBxDI7pDO0eOLGk="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") @@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csdevkit"; publisher = "ms-dotnettools"; - version = "1.80.7"; + version = "3.10.4"; inherit (extInfo) hash arch; }; sourceRoot = "extension"; # This has more than one folder. @@ -63,7 +63,7 @@ vscode-utils.buildVscodeMarketplaceExtension { substituteInPlace dist/extension.js \ --replace-fail 'e.extensionPath,"cache"' 'require("os").tmpdir(),"'"$ext_unique_id"'"' \ - --replace-fail 't.setExecuteBit=async function(e){if("win32"!==process.platform){const t=i.join(e[a.SERVICEHUB_CONTROLLER_COMPONENT_NAME],"Microsoft.VisualStudio.Code.ServiceController"),r=i.join(e[a.SERVICEHUB_HOST_COMPONENT_NAME],(0,a.getServiceHubHostEntrypointName)()),n=[(0,a.getServerPath)(e),t,r,(0,c.getReliabilityMonitorPath)(e)];await Promise.all(n.map((e=>(0,o.chmod)(e,"0755"))))}}' 't.setExecuteBit=async function(e){}' + --replace-fail 't.setExecuteBit=async function(e){if("win32"!==process.platform){const t=o.join(e[a.SERVICEHUB_CONTROLLER_COMPONENT_NAME],"Microsoft.VisualStudio.Code.ServiceController"),r=o.join(e[a.SERVICEHUB_HOST_COMPONENT_NAME],(0,a.getServiceHubHostEntrypointName)()),n=[(0,a.getServerPath)(e),t,r,(0,c.getReliabilityMonitorPath)(e)];await Promise.all(n.map((e=>(0,i.chmod)(e,"0755"))))}}' 't.setExecuteBit=async function(e){}' ''; preFixup = '' From b14aead2476e3f6986261f533a9b87ba2b05b1ec Mon Sep 17 00:00:00 2001 From: GGG Date: Sun, 5 Apr 2026 17:09:06 -0300 Subject: [PATCH 045/305] vscode-extensions.ms-dotnettools.csharp: drop ggg as maintainer --- .../editors/vscode/extensions/ms-dotnettools.csharp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 33ddac94f58f..00df6cd1e9a1 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -155,7 +155,7 @@ vscode-utils.buildVscodeMarketplaceExtension { description = "Official C# support for Visual Studio Code"; homepage = "https://github.com/dotnet/vscode-csharp"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ ggg ]; + maintainers = [ ]; platforms = [ "x86_64-linux" "aarch64-linux" From 1a4d446578f96e9faf8eb3f6f4de7f10de3fee3a Mon Sep 17 00:00:00 2001 From: GGG Date: Sun, 5 Apr 2026 17:09:18 -0300 Subject: [PATCH 046/305] vscode-extensions.ms-dotnettools.csdevkit: drop ggg as maintainer --- .../vscode/extensions/ms-dotnettools.csdevkit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index 7d6d5dca8190..a04cc834c334 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -134,7 +134,7 @@ vscode-utils.buildVscodeMarketplaceExtension { description = "Official Visual Studio Code extension for C# from Microsoft"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ ggg ]; + maintainers = [ ]; platforms = [ "x86_64-linux" "aarch64-linux" From 84164a941c73efb7d2d6d2b0bb1f18ac6dfd0682 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Mon, 24 Nov 2025 10:51:35 -0800 Subject: [PATCH 047/305] fstar: fix update script --- pkgs/by-name/fs/fstar/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix index d03a9c699821..5b8612c0bec1 100644 --- a/pkgs/by-name/fs/fstar/package.nix +++ b/pkgs/by-name/fs/fstar/package.nix @@ -105,7 +105,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "v(\\d{4}\\.\\d{2}\\.\\d{2})$" + "^v([0-9]{4}\\.[0-9]{2}\\.[0-9]{2})$" ]; }; z3 = fstarZ3; From c61757909f0c31495777d42969a681502a95fa9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Apr 2026 05:13:41 +0000 Subject: [PATCH 048/305] zettlr: 4.3.0 -> 4.3.1 --- pkgs/by-name/ze/zettlr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ze/zettlr/package.nix b/pkgs/by-name/ze/zettlr/package.nix index a503570146a1..c01c2e053b10 100644 --- a/pkgs/by-name/ze/zettlr/package.nix +++ b/pkgs/by-name/ze/zettlr/package.nix @@ -9,11 +9,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - hash = "sha256-nkGcVg/4Vsg+1uy4RlC9eYTiUlClWCeZ12qc7QfFIN8="; + hash = "sha256-7fQ4XObfXBiSqnhJPkUKsXBazucCTHjwvkK70dP74bE="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; From 0fb4a6fee47c30b68285fd54d63f9dad7086a9f7 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 4 Apr 2026 00:43:00 +0700 Subject: [PATCH 049/305] glances: migrate to by-name --- .../gl/glances/package.nix} | 88 ++++++++----------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 38 insertions(+), 52 deletions(-) rename pkgs/{applications/system/glances/default.nix => by-name/gl/glances/package.nix} (75%) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/by-name/gl/glances/package.nix similarity index 75% rename from pkgs/applications/system/glances/default.nix rename to pkgs/by-name/gl/glances/package.nix index 3feb79caab1a..c5929080386a 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/by-name/gl/glances/package.nix @@ -1,38 +1,20 @@ { - stdenv, - buildPythonApplication, - fetchFromGitHub, - isPyPy, lib, - chevron, - defusedxml, - packaging, - psutil, - pyinstrument, - setuptools, - nixosTests, - pytestCheckHook, - which, - podman, - selenium, - python-jose, - # Optional dependencies: - fastapi, - jinja2, - pysnmp, + stdenv, + fetchFromGitHub, hddtemp, - uvicorn, - requests, - prometheus-client, - shtab, + nixosTests, + podman, + python3Packages, + which, }: -buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "glances"; version = "4.5.2"; pyproject = true; - disabled = isPyPy; + disabled = python3Packages.isPyPy; src = fetchFromGitHub { owner = "nicolargo"; @@ -41,7 +23,7 @@ buildPythonApplication (finalAttrs: { hash = "sha256-o/q/zW7lRKQg+u4XblwNIswCVIroMdeUaPTNkN8QKwo="; }; - build-system = [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; # On Darwin this package segfaults due to mismatch of pure and impure # CoreFoundation. This issues was solved for binaries but for interpreted @@ -56,34 +38,40 @@ buildPythonApplication (finalAttrs: { # some tests fail in darwin sandbox doCheck = !stdenv.hostPlatform.isDarwin; - dependencies = [ - defusedxml - packaging - psutil - pyinstrument - pysnmp - fastapi - uvicorn - requests - jinja2 - python-jose - which - prometheus-client - shtab - ] - ++ lib.optional stdenv.hostPlatform.isLinux hddtemp; + dependencies = + with python3Packages; + [ + defusedxml + packaging + psutil + pyinstrument + pysnmp + fastapi + uvicorn + requests + jinja2 + python-jose + prometheus-client + shtab + ] + ++ [ which ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ hddtemp ]; passthru.tests = { service = nixosTests.glances; }; - nativeCheckInputs = [ - chevron - which - pytestCheckHook - selenium - podman - ]; + nativeCheckInputs = + with python3Packages; + [ + chevron + pytestCheckHook + selenium + ] + ++ [ + podman + which + ]; disabledTestPaths = [ # Message: Unable to obtain driver for chrome diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 033bc0eac052..34b85cecae09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1535,8 +1535,6 @@ with pkgs; gistyc = with python3Packages; toPythonApplication gistyc; - glances = python3Packages.callPackage ../applications/system/glances { }; - glm_1_0_1 = callPackage ../by-name/gl/glm/1_0_1.nix { }; go2tv-lite = go2tv.override { withGui = false; }; From 8f58e66f15fb078399102a9b9b628520160fd5d0 Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Mon, 6 Apr 2026 11:47:31 +0200 Subject: [PATCH 050/305] indilib: 2.1.9 -> 2.2.0 --- .../libraries/science/astronomy/indilib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index ac1ec4c381f9..a4b8a21ca9dc 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "indilib"; - version = "2.1.9"; + version = "2.2.0"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${finalAttrs.version}"; - hash = "sha256-L3qZ1VgL4J4TYYdgeSrWuVC2Xy+iBxIU9GBx8cllm1o="; + hash = "sha256-XTb+etafMRTP/Arb087s+kZoqFT50RT1fpVDeHaGdmY="; }; nativeBuildInputs = [ From fa34cd580f45d13ed85e6fbe30ce36b59f3c4a8b Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Mon, 6 Apr 2026 11:47:56 +0200 Subject: [PATCH 051/305] indi-3rdparty: 2.1.9 -> 2.2.0 --- .../astronomy/indilib/indi-3rdparty.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index c6b575f86d81..6416a1428ff1 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -41,13 +41,13 @@ }: let - thirdparty_version = "2.1.9"; + thirdparty_version = "2.2.0"; fxload = libusb1.override { withExamples = true; }; src-3rdparty = fetchFromGitHub { owner = "indilib"; repo = "indi-3rdparty"; rev = "v${thirdparty_version}"; - hash = "sha256-zHcJDbi+xsI1xDnZTFmUbk4GNGD8WqZUzf3hfSCmvpU="; + hash = "sha256-JGDaRlKYgHADMC3C2kiRmTqoL0dHuJKXiUVAYknQsGA="; }; buildIndi3rdParty = @@ -241,7 +241,7 @@ let pname = "libfishcamp"; postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "/lib/firmware" "lib/firmware" + substituteInPlace CMakeLists.txt --replace-fail "/usr/lib/firmware" "lib/firmware" ''; buildInputs = [ @@ -426,7 +426,7 @@ let postPatch = '' sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt substituteInPlace CMakeLists.txt \ - --replace-fail "/lib/firmware" "lib/firmware" + --replace-fail "/usr/lib/firmware" "lib/firmware" substituteInPlace 85-qhyccd.rules \ --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \ @@ -487,7 +487,7 @@ let postPatch = '' sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt - substituteInPlace CMakeLists.txt --replace-fail "/lib/firmware" "lib/firmware" + substituteInPlace CMakeLists.txt --replace-fail "/usr/lib/firmware" "lib/firmware" substituteInPlace 51-sbig-debian.rules \ --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \ --replace-fail "/lib/firmware" "$out/lib/firmware" @@ -635,7 +635,7 @@ in libnova ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" + substituteInPlace CMakeLists.txt --replace-fail "/usr/lib/udev/rules.d" "lib/udev/rules.d" ''; }; @@ -745,8 +745,8 @@ in postPatch = '' substituteInPlace CMakeLists.txt \ - --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" \ - --replace-fail "/lib/firmware" "lib/firmware" + --replace-fail "/usr/lib/udev/rules.d" "lib/udev/rules.d" \ + --replace-fail "/usr/lib/firmware" "lib/firmware" substituteInPlace 99-meadedsi.rules \ --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \ --replace-fail "/lib/firmware" "$out/lib/firmware" @@ -979,7 +979,7 @@ in ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" + substituteInPlace CMakeLists.txt --replace-fail "/usr/lib/udev/rules.d" "lib/udev/rules.d" ''; }; @@ -1036,7 +1036,7 @@ in ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" + substituteInPlace CMakeLists.txt --replace-fail "/usr/lib/udev/rules.d" "lib/udev/rules.d" ''; meta.platforms = libqsi.meta.platforms; @@ -1109,6 +1109,7 @@ in buildInputs = [ cfitsio indilib + libusb1 zlib ]; propagatedBuildInputs = [ libsvbony ]; @@ -1124,7 +1125,7 @@ in libusb1 ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" + substituteInPlace CMakeLists.txt --replace-fail "/usr/lib/udev/rules.d" "lib/udev/rules.d" ''; }; From 5e2a420f36186775dd13468f8fab70cf135047c4 Mon Sep 17 00:00:00 2001 From: Maevi Date: Mon, 6 Apr 2026 06:46:47 +0200 Subject: [PATCH 052/305] vpp: 25.10 -> 26.02 https://s3-docs.fd.io/vpp/26.02/aboutvpp/releasenotes/v26.02.html --- pkgs/by-name/vp/vpp/package.nix | 7 ++----- pkgs/by-name/vp/vpp/use-dynamic-libs.patch | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/vp/vpp/package.nix b/pkgs/by-name/vp/vpp/package.nix index cff8ef470e78..4ce186d8d3ed 100644 --- a/pkgs/by-name/vp/vpp/package.nix +++ b/pkgs/by-name/vp/vpp/package.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vpp"; - version = "25.10"; + version = "26.02"; src = fetchFromGitHub { owner = "FDio"; repo = "vpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-J+aJXzq9jKzcFKpUNBskX3KccwKtZhK+m8NTbrGjsXw="; + hash = "sha256-z9yh1ZMP28SSzHNBdO7UnvVqsIqtXUcwYZUH1UdBUB0="; }; postPatch = '' @@ -78,9 +78,6 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/src"; enableParallelBuilding = true; - # -Wno-incompatible-pointer-types can be removed in 26.02 (https://github.com/NixOS/nixpkgs/pull/479794) - env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-array-bounds -Wno-maybe-uninitialized -Wno-incompatible-pointer-types"; - cmakeFlags = [ "-DVPP_PLATFORM=default" "-DVPP_LIBRARY_DIR=lib" diff --git a/pkgs/by-name/vp/vpp/use-dynamic-libs.patch b/pkgs/by-name/vp/vpp/use-dynamic-libs.patch index 38422cbb5754..89f4078577a3 100644 --- a/pkgs/by-name/vp/vpp/use-dynamic-libs.patch +++ b/pkgs/by-name/vp/vpp/use-dynamic-libs.patch @@ -14,14 +14,21 @@ --- a/plugins/rdma/CMakeLists.txt +++ b/plugins/rdma/CMakeLists.txt -@@ -18,8 +18,8 @@ if (NOT IBVERBS_INCLUDE_DIR) +@@ -18,7 +18,7 @@ if (NOT IBVERBS_INCLUDE_DIR) return() endif() -vpp_plugin_find_library(rdma IBVERBS_LIB libibverbs.a) --vpp_plugin_find_library(rdma MLX5_LIB libmlx5.a) +vpp_plugin_find_library(rdma IBVERBS_LIB ibverbs) -+vpp_plugin_find_library(rdma MLX5_LIB mlx5) + if (NOT IBVERBS_LIB) + vpp_plugin_find_library(rdma IBVERBS_LIB libibverbs.so) + if (NOT IBVERBS_LIB) +@@ -28,7 +28,7 @@ if (NOT IBVERBS_LIB) + message(WARNING "-- linking rdma plugin against ibverbs shared libs") + endif() - if (NOT IBVERBS_LIB OR NOT MLX5_LIB) - message(WARNING "rdma plugin - ibverbs not found - rdma plugin disabled") +-vpp_plugin_find_library(rdma MLX5_LIB libmlx5.a) ++vpp_plugin_find_library(rdma MLX5_LIB mlx5) + if (MLX5_LIB) + string_append(RDMA_LINK_FLAGS "-Wl,--whole-archive,${MLX5_LIB},--no-whole-archive -Wl,--exclude-libs,ALL") + else() From eda0d54cbb2698eb1c04ddf557be7c8b136ed152 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Mon, 6 Apr 2026 20:02:51 +0530 Subject: [PATCH 053/305] actual-server: 26.3.0 -> 26.4.0 --- .../ac/actual-server/missing-hashes.json | 93 +++++++++++++------ pkgs/by-name/ac/actual-server/package.nix | 10 +- 2 files changed, 68 insertions(+), 35 deletions(-) diff --git a/pkgs/by-name/ac/actual-server/missing-hashes.json b/pkgs/by-name/ac/actual-server/missing-hashes.json index d4f68a3af3af..5659c9988fb1 100644 --- a/pkgs/by-name/ac/actual-server/missing-hashes.json +++ b/pkgs/by-name/ac/actual-server/missing-hashes.json @@ -90,25 +90,25 @@ "@oxlint-tsgolint/linux-x64@npm:0.13.0": "c2855e98f9bcf2ecc893c06518ab23dbcb661ba4c18bca60e6a48d12ed3a52737b23fed5ebe30f0c6afd4df9538a9c34330e15e42de4efb120b7eb0ebfeeba2a", "@oxlint-tsgolint/win32-arm64@npm:0.13.0": "e46e11b10c2d2e8efdbe110e99153036e34d1f1e19d0eb111c8717602228d3bfcee4aea04f2a1d2510aa6884fdf4c47f3a533782e45a6872721cb828f5065ab9", "@oxlint-tsgolint/win32-x64@npm:0.13.0": "d200689f40a6bc805b079230f1a731dae3b87d0747ea197ffcfaed94b2131335941c71b2e2df64df917ecf14f13cee4892195727c5fe996909d81edff499964f", - "@oxlint/binding-android-arm-eabi@npm:1.47.0": "1fe82b13b323947787a09cc095c9cefe72918886d06e46913267628d40d56852052d46df8150a1926c743b57345c85d1d975e8052592ed0689c28e103d6c299f", - "@oxlint/binding-android-arm64@npm:1.47.0": "02ad4a87cc64fa3fee178c566bdca5a529be9933c095b5fa22595f4824e2b54d5579fb309971d905f60e56e8071573ba4ac8b9f9613efcd3324c61b2fd6a5447", - "@oxlint/binding-darwin-arm64@npm:1.47.0": "519bc2385dad9e31c547735d783826ba23f1f6d3bf135e17313c5f5ba3a304ca65c991dd9a40fe31d519b7be99d4ad1231a7635e47cd85f1d851626cb7a144bf", - "@oxlint/binding-darwin-x64@npm:1.47.0": "86b116293ce19f3a71dc48bb23872a53a1a7c2b3ecf2e5ab2b839702704f6e360e57350bdb5510e42f3cdf91d29f6d092edc2816fdff400c06f056cef5ba0c91", - "@oxlint/binding-freebsd-x64@npm:1.47.0": "cb2edba0ee407462cc4d602fe707d10efde5104f0ac54674c5ba6081603f2fe9112e0f5b1098357fd5d1e7a9b47ff8994a97338223553709a3d1313cfcb8f219", - "@oxlint/binding-linux-arm-gnueabihf@npm:1.47.0": "e3534b373817510760db8f780185155596084baecd7fb30cdd61a6e6cb8d828b8ad2290f59675893eadabdd61466adc48e6bde2f08cad112fce1386cbb46d5a1", - "@oxlint/binding-linux-arm-musleabihf@npm:1.47.0": "842f447947ad42351d0cab63eb8b1568b2389298a16a5410d8f6dca1870c299fb058853297869320e1911cffeed0676d628773c88c166da4e3c71c674b14318f", - "@oxlint/binding-linux-arm64-gnu@npm:1.47.0": "1c42d827c2faad069ce8bc9ba1710b4e00a3c920617dffb77ca74b1f0b1b1a81dc67aed04f8cc0d53853b9ae847fde8f95ddb2021555c7b5d060d05ecc2039cb", - "@oxlint/binding-linux-arm64-musl@npm:1.47.0": "224a2d0f716e18f651aa8bffc1e91941229a311742aa1687cd0ca4844d3c4d9ce94ca459b3d2250e386c0965e3c15baa05789ce2864e770516efe70ac81375c1", - "@oxlint/binding-linux-ppc64-gnu@npm:1.47.0": "5be589bce11d156ad8ea25a651d3910f4cc0cef7b00ddd8e87db1db007d7d1aa62d665740cc76509368ed734a440c8bf8282a7e851bef5a9a4147d69f45f0d12", - "@oxlint/binding-linux-riscv64-gnu@npm:1.47.0": "35e1582bf13c2907192af9fd1852dd35e647ee3e04a304dcb9b5235e929731f1925920965090722624648b0ae3f6f9d3f5feabfc4913ef261cadd3751894e25c", - "@oxlint/binding-linux-riscv64-musl@npm:1.47.0": "355ea8587334e1f24c4ed0fcf76a453061e44bde1bf27a3d5fff28217bc9b0f5e79f0ecbaf0e25b5aa454cd777283a037157f482a9ad9eb164571956c26eec5f", - "@oxlint/binding-linux-s390x-gnu@npm:1.47.0": "3bb53f7cc220a1a07722f4fa034d23ee0eb7640d4763fc42a513c3f4774c063a7cd50e7960b87f63685f470d9cd48e0dc51ab70a0617ddaa262a808a5881f6cf", - "@oxlint/binding-linux-x64-gnu@npm:1.47.0": "6a37061689e582ffbabd0cd0909ab80580e336460c222ad3b97826b8e417b5825b2437a049d98917bcc50f57636094ecaca3fc9b5cc0d97ec4172c2109dd72bd", - "@oxlint/binding-linux-x64-musl@npm:1.47.0": "4d4907fd33ebe28bc244abadb22be33d45ad9203507b802d26edff461a8217e867bf1167b1fcd50d6e35e4f35e1a235931d7bf2b5e04724ee2585af8b58b01a1", - "@oxlint/binding-openharmony-arm64@npm:1.47.0": "58add856ee91d1454ddc433b7110799374b0fe9e3ed4d39edcffd68d263bca4933d6b8f9f08ce0ebd85318066bece1f41f9083654317e13905a78f4170a0678f", - "@oxlint/binding-win32-arm64-msvc@npm:1.47.0": "9991e2a52d4b1537f13d4897e99264d5649f3819d766fdd33be2c99bc72d77557c55b7575d661d34de36a0d07cc4168a9df10601729fab7aea462a62c0e02293", - "@oxlint/binding-win32-ia32-msvc@npm:1.47.0": "48a2ba7e9c82933cfc45579e4a8adc3611db8b98da644cb204253b88b9b3cdce20cfc9380592cbecb6143d3aaa6885b58bbdf285ac51b6524b3771d2b0224292", - "@oxlint/binding-win32-x64-msvc@npm:1.47.0": "0be3f7d47412c8fc5d516e60e50980a9f90824f5e5ab602f93ab096b12b3dac4ebd1d9079ea8c8bbf07a28e44d31aa8632fcc4ed46cb6882fffb84e97bccf5c5", + "@oxlint/binding-android-arm-eabi@npm:1.56.0": "463bd488374f85f064d5180bbf21ce8b265d6d9784e7f63af2195d35247d545ccb356ecfa1c16ee6ab31aa187f520d348b7198f49d1d6c546c49d25fe7f7e65a", + "@oxlint/binding-android-arm64@npm:1.56.0": "fabf10dec868c468d57fa9f291ba140a006cd8f6a03cf959e3961d072bfc776f9486b8bb4141b7ea3a31221b9a92299386b1cbb2a2e547fa66f2006b4be86ed9", + "@oxlint/binding-darwin-arm64@npm:1.56.0": "3041dd4d4d22c59107e9694b33b7b87ca2f62f6a0bb8880812986cd795709594fd02af791f6f7c87d4433198ef772b945915a50ab2d7984b4abca1128b8ec671", + "@oxlint/binding-darwin-x64@npm:1.56.0": "55ea3a1aca8a9dec9c91dde13e8c8a2de48256a1a548f7237bc150e12b6b861719f5d663fb0934096bc0491c5669b8628fbc68407dce01acdb49b5a505852c63", + "@oxlint/binding-freebsd-x64@npm:1.56.0": "f76e1637d00c3aca4371c9f469c133bb3290a13a2fe51e3e9e18c6e10de17fb10477bc73d77ce43053172e9314d2662adbc9db8ac51a51d0f8f7d78d3a651306", + "@oxlint/binding-linux-arm-gnueabihf@npm:1.56.0": "e385462613e6e5e479575c860dcd0855db092a163f0498ba9b89dd81f691704b9bc4b1818c0dc6dcc3973ad1fff1d2710797f87304ad3cfd9da6280766d7d520", + "@oxlint/binding-linux-arm-musleabihf@npm:1.56.0": "35f796b2ec0e4bd8f086e664033c1fd4c338b392ea8b9ab96821e00c75d05e0d3aacc2f270eb03e70a00013c52e1d53578df728065c48c9193e323aabd1bd0cd", + "@oxlint/binding-linux-arm64-gnu@npm:1.56.0": "6216ff386bb4e4fbcbb53fa69603f7e9eb1a156c0d3a34aca8cf664d8ff21a17804a905f6917626581037fc8b1a4f962302d626dee15160983c3e35960157359", + "@oxlint/binding-linux-arm64-musl@npm:1.56.0": "4e1e8fbbe11e39549e9c1def3ce7fdcd257b5eca46458bf9c82e3a5971775617dca7c6e3a50fe2c09c69b71980fee7fdd281ed1372af25a49b3497a7effe6050", + "@oxlint/binding-linux-ppc64-gnu@npm:1.56.0": "0688cf639b9d51c1e87c9aabcf9005cec6bfbf4d939871dc2853711935c3788bccec1a8aa3bf38af5a7a8821abca3fa68c5600424d34ebc339ab518a6b18bc21", + "@oxlint/binding-linux-riscv64-gnu@npm:1.56.0": "8a5eb4ad619be00b4345144c2af924f91ca311578386f96f0954f1d5cb64442e8dea857aa91fda55279a8f24f58b6f99d9824646976bc35c556da406218467b8", + "@oxlint/binding-linux-riscv64-musl@npm:1.56.0": "8e4b81e2fd1781b2017528973b37db4c46fee35a1dc8b317295ee65652e55bf8238b6560d6d48a4bd0a541b9f67730c605082842768eab67b4b06158503241c0", + "@oxlint/binding-linux-s390x-gnu@npm:1.56.0": "9f3c598dede43a697fa53014145c895aea1e1f5390d7c5e28bd0a9a03dd32536287373a98d1ce372a41c5be1141785aef19dc63432aeddc1a86f220814cfc183", + "@oxlint/binding-linux-x64-gnu@npm:1.56.0": "8cab5595ee3e7d39a3ea0add9813efbe57139e445b754f5dbbbfade372ef85c8784f5bd2cb0860941a1b7e9173f4b782ae20c8ecd4b59c4dab9ba80de3382aa0", + "@oxlint/binding-linux-x64-musl@npm:1.56.0": "b7111435cc3938911aa5fc05e90a8b878f0b848e7de4cbbd2f4cd633ceeca785b6b0354dd5fd37174485694ca333292039a142bbde0e546e4d8a58ba62d296f2", + "@oxlint/binding-openharmony-arm64@npm:1.56.0": "8d7184c5517c185f64ab6b076a9e59277bf49d46cff8e79f708992bf52d9b6fec9c83e04f7c94d8527044051709eb55e5b82e304e9af9e6cef93f66894601569", + "@oxlint/binding-win32-arm64-msvc@npm:1.56.0": "7fb42e1b53f453c53b33ea2f6564e864bb8245669e6dc52c0d4f9a27badeb52e7764c34b6f64b4a87ab056dd636b608be161aca5f0cbe29613365c60ff98810a", + "@oxlint/binding-win32-ia32-msvc@npm:1.56.0": "fc397d81eb0c0e319ec3e3242ce1f05efe8368e659c6aeba99e630a303b539a80adfe97bc361430b680d24ae713a163712d087205ac8c60804ca77c8018c2a1e", + "@oxlint/binding-win32-x64-msvc@npm:1.56.0": "29693e27fceb5daba0d13a1daa9f6767b2462a7e91ab8107164bdfebf6ccd88a8f648768c2cc024faa76dd75b22f54be16cdd50146e4483b9b8da2402d38d7a1", "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141", "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea", "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134", @@ -122,6 +122,21 @@ "@parcel/watcher-win32-arm64@npm:2.5.1": "0f467a731cf9403b8bc7d35418d991596cf5e7898029796b4c769bcbb38cd07ae6ec05ef0f19298e5f11e73ec5198bc474d79b056bdfbaea513525725103d7dd", "@parcel/watcher-win32-ia32@npm:2.5.1": "9ab5f3e9849a6077c8c2aba7bdf9030dea38f0ab9180792ecd30094520cddf16f3b68006f666845b86c5ef0e05c648364475c9ba151e0269561891ca3e276667", "@parcel/watcher-win32-x64@npm:2.5.1": "e588d87d5b892484d252ac8e1ec3f4bf7a664d91f0d03dd93764be8db2c35f81879275908dcbec42b0e43bc99c7afdfd29fe687ec022bb2c8c4bc7edd29eaa15", + "@rolldown/binding-android-arm64@npm:1.0.0-rc.9": "681d0f60ac8346ed1472b446dbb04c89f082d05eaadd643093f861d9782b8b9c961af1529ac50ede6e1d0d82162413be7996cda3582c6839fe8ce110e6a8fe47", + "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.9": "1aa953031ac0743e3c21c30d5423f91910228d3ca626178dfb6c526d7101ce0f782738c4508fd5c8c8b13db1a7cae7c60f56645903d1eeb6acfcd62d6038a62a", + "@rolldown/binding-darwin-x64@npm:1.0.0-rc.9": "04b667387c89dd09c16f19d89779faab109ef77747d574c9d19f03a45c6199d761c50f252ebcd72bb2f1a963d5159562e6b9c812412b59191cb5ad39976faf85", + "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.9": "be6560cb62878c11073455c3f8c9d60f27d42e847e6280341bb3f203344b45f6ad0045217229488c13f02a41b5b3f9c92cc4e3e5eda3167e92975ec6690559de", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.9": "d943e78b207ab210e0e30080f3ee67294e22346d44535e1e06252b954cb0df5188cc0808412b3c74a90b07f4b380f0ba00ab3c0500f8f59ac97c5a79d52a256a", + "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.9": "db9fbe0bc638788fc2bad53d63b9943af0472f01f37eecd552d06bb773f3ce6594fe7cf50b2bd8f2d5b72bc60b9bdcfc5b8e45ea8ea5d368bdc062d3104f37f2", + "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.9": "1284b2b09a688dfa979d0b3ba1969ae30ebd29fa56f700d267f1862aa14327fd58bb92e8e201f166c31e916d9c2b3e56a991dd5a83efeedde6c6b3925f066aab", + "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.9": "4c051717e829c1a412c924e8c02f2b665fece40d00945d73c533dae75d68f3a0c7a219abab602234a6bf15049c9a1861e3788a97e9f322aac95e91c6d12a2db6", + "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.9": "63528c47def8780bd56f0851d9d63fa9a4aff24e87766989cd3b30478f3e0240a38ada7df67343cc8c075f2f907b0ba3feff1de1fa312727446fd762b313b3ff", + "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.9": "9eee8d3facd1d0249f0e8c96a0cd0021875a6df39b00fee0a88629a1d3f83210e4c8216b35ce31b3cbe8e3399829fb10b805bf6ca6d2116658c8bbe5a63b93de", + "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.9": "542bc8bebc8c0373a3d6a7d9a8a3241cddf1cfb64bea0a93e208410d88ea4b6b40e3ade7615728203460c98055269386931faf79e3b94f184446241f2873a55b", + "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.9": "4c3f8c7e29c7f2e23c8a98f16bc88584b6c770e03ba4278d7730d844b9595cc9fe486dd8db8b5df514351c202de41dfeec29e9cb49a345b68fb89e751046355a", + "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.9": "a4f8b94a3c8fc67890e4ca4115a58fa096cd17060ff6a04f296fdf4e9925f88dae82e6ac9213b63b3bd1e44dd5454f7f37d24c5710e93466bc565f2eada56508", + "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.9": "ea4b5f173b212c0facc574814c7f303cf7ff3819e190ad2cbe0cc945853e01f984e3db475d586276c9d57bb33eaec3cbbfffda202dfba22a969457808b8f9037", + "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.9": "33ee0f9797ff858c5af077b5907a7becbd2719c76afaa8069cda7fb911d404fb4b038825f8c976efc3ee0bd6dc882a9d4c4b240ab9cf8000ddd720d551ef5a8a", "@rollup/rollup-android-arm-eabi@npm:4.40.1": "24131de0516010cd1c52d399fb17dbbe93b3ed6a981b57d82f363b9102a04083d470d0d7ead324fcc16e0eee7d54b7300ed3ce72bf43a4d277b959eb79f7490c", "@rollup/rollup-android-arm64@npm:4.40.1": "6b02d5c1a8e5cb045ea9d382d71a9bfcd81da1d508ebeddf5c5118f99ce13b431af357a0458d922c03b26a00ca6ea72a861b1e15b370f20275ee73eff91fd7ce", "@rollup/rollup-darwin-arm64@npm:4.40.1": "2c47b17a3670ff37a3a4ba6615f1514284317adedbf629b9d989f879f2ccd0c299f69c7733727150206b1edd96605ab9d94b6f0eae70cd7556542b436111d5c6", @@ -142,21 +157,39 @@ "@rollup/rollup-win32-arm64-msvc@npm:4.40.1": "d4c9002b95c4b6ee842faaa5087582a0772578c0969c9ee470697a6d3fd251845481285f5a4027bc8c0524bf277f3437844cae9936c5f96ca753dcca61e2f47f", "@rollup/rollup-win32-ia32-msvc@npm:4.40.1": "446e3ce5b037d1847af84e9a2b52734ae9f5425937fec2558d26ffb5c253dd8925dc35591abd78b0d43f7154222e47ee9aaeb3b167b3d69627805a97c5147185", "@rollup/rollup-win32-x64-msvc@npm:4.40.1": "39fe3c6b86ef880fb1d1261f6096d19707584c628271d6ae01f5a5f50d8a24ef62128b5929064c0aed4390c7c0c0b7cc9590e300fa5f10ed624816748da2fbb2", - "@swc/core-darwin-arm64@npm:1.15.11": "5ab85440e42aef149a895e75e6c3574d3e29fcdd4ad76c0dbef4aaa903472cce82457239105d1a43bffaf6d1d4ede967e6a498e7c02946a7a3d713f89eab4c66", - "@swc/core-darwin-x64@npm:1.15.11": "368d7ee0a3624327f2452c7b307d702b677bdf0cf97b86c783b20a8f2083af31eaaba880bf2aee2729e16aecb8b246d51df6473b6b78493b07033528c8f34ef7", - "@swc/core-linux-arm-gnueabihf@npm:1.15.11": "679c4e43f25710e1a51a543e32f1142e906597c06862bb202c2a677f6aaee2dfeba6903c1c63c7d34c63b9ab73a610e47680a44d023f7a213b97377e904082b8", - "@swc/core-linux-arm64-gnu@npm:1.15.11": "c1347763e73fd8c26757ed90f55f805fead5a045b8e5ef08a2393c31dc79e704a3a768631e7db3fa5c97937acbe42dd4039a15eb90b9bdf691fff5b2dbf055bd", - "@swc/core-linux-arm64-musl@npm:1.15.11": "95135575cfb9dc708add3c238dc16f72ff9fbcb98f52d36b078b06e7183b9e3e56eb8324d84a47d5e222c71e403503eab36c365d7d60c46f323bb8c2599c8377", - "@swc/core-linux-x64-gnu@npm:1.15.11": "2d6569466096c7b2e79283ae771bce075f29f50a09f333656983d616e1a92975fc744a37ef6facc229839d121479004498c08738f8a01f6d23dbe2e417793aa3", - "@swc/core-linux-x64-musl@npm:1.15.11": "9115262bfabe0dcb3064506a3ba7b7583a383b550b0ce69aa1d7224ac98e1fd77702b9b039e6bce3827c0781f4111113d19fca01a36d0a5755c5185938b758a0", - "@swc/core-win32-arm64-msvc@npm:1.15.11": "66d61ad408757f20f5a98e1c85f9ae84863ea68ca80bb29822e1c23c423698db466e41f139226c0ff30b471531644f91085e84355531964165cfdf41c5453151", - "@swc/core-win32-ia32-msvc@npm:1.15.11": "9ac651bec3106cceb2f97d443f1ed3cafa30bbfae0574a4c3023eeeb4d20bdb1192203c673e5140c43889e15d5a163d42b7c379a04b6cc6e6c656ced0832f175", - "@swc/core-win32-x64-msvc@npm:1.15.11": "e7f412c2cf9532464b9ebeec7af8c1caa95ec569b89d7eb004315ab65661a2c66056f85869a11758cba4497ac432322d14cc904bfe6c09d2ff71b36da63a011e", + "@swc/core-darwin-arm64@npm:1.15.18": "1597877545538954d6445a21f4a102766f098aa2b0d55ded3a766993b527bf1bae9bca54e50e3289b8f6a0cdb42b550f65da38564340d954690df15d2e27f56a", + "@swc/core-darwin-x64@npm:1.15.18": "326b8c3309c303a53bf4ed6afbfb0baee0acdb527253e734fe5cefc6916cea598d75fb508265e482143e92fabaf2cacfe9e3a30301ed527c32a727f998a65239", + "@swc/core-linux-arm-gnueabihf@npm:1.15.18": "0d26738b4675ee1ff5b0322295c947f351e6d2494303248971b601e2fcfd666a17357a030f0a745e11b60065329652daa58db44abcfc7620f2da8d92733dd0ee", + "@swc/core-linux-arm64-gnu@npm:1.15.18": "96aa824334204b6ae8a9c337a745a64dedd4913331f313561eb9544b853e142d9a933230d06052eb677cffbed0b1c961389f1d626936a9b5fad6400ad254229e", + "@swc/core-linux-arm64-musl@npm:1.15.18": "3781cb4bfce767fb85506a69bc6fb7745ec53be2a53735750ae88f51c3d6803725a3a906cb954888c529e7f675d3ff0f746bb22c646f1ac2caebdc2be64a852e", + "@swc/core-linux-x64-gnu@npm:1.15.18": "26f6fe774e88f8d58a48c18666eda6345cd7064cf065f02eae683f6eaac3e345a5fdbef22a8b3aa7069e332fe95c4b496cbab438bc2b474a9fdc8b37a616be0a", + "@swc/core-linux-x64-musl@npm:1.15.18": "96b5bd1bbacebbf806f9a6a02698d68ba2a677ce86b5c2d7a92ea6083b40d55a0a84abebd16b5afd7a574e727b8c19e9039315e8ef40f6c852bbfaee26f999cd", + "@swc/core-win32-arm64-msvc@npm:1.15.18": "3a170183da529015301e48bd305f9ea1bcbd38259ff25f1f6e778ee4bb68fda44552c696f067005729aa77407295b1388717a31d9429844725d7ee29645bde82", + "@swc/core-win32-ia32-msvc@npm:1.15.18": "a950c9d1d6338939734249ddb766c495e86e05509bb6a42f58d2713d419d4412c06fb0c11c7711c6612ab3e74520a8c1581449340aa3f4fe26f71c53675f37b4", + "@swc/core-win32-x64-msvc@npm:1.15.18": "68eac0d5148e7326b748a0f0adf44bffcfb1d0c78e366448aad9859eda537941391ea95e1863118460a49a58235ce9791ae1b20afc04a034677167e6ea43a5e2", + "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20260309.1": "437a0ffe06d99181f7dc9af64bd049ec1ec84f2a4587d2cfdc8fb64cffac527de6cb710b100f87a7ae4b97fe3cdd876466f570424399a1b71496c526c7cbec13", + "@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20260309.1": "02f218b9974f2ff8afcdc1716ee04d4021084c278d0e51a5cc5db2b8ffc590cf96877c95178d86157e0440513d7427e562c5d63b9e00ea81396dcb796385e789", + "@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20260309.1": "c3a070ae31cd0c2e2750c5ba2332352bc575a0be06e6923b8aa0f425d50c95b922df9ae540c17f87affb61948555db63ea9f21df6cb70b2345632f1bcedb2d87", + "@typescript/native-preview-linux-arm@npm:7.0.0-dev.20260309.1": "08c8f9a22cf9f1508c84cd8710a44e4983d41df95a58e79a9b32c177e1044f86d0b19b993cc0bfcbdba0b9ff12df1f22b878cd33cd20288eedd6903b25b69608", + "@typescript/native-preview-linux-x64@npm:7.0.0-dev.20260309.1": "7baa4d2aa516e2af41a255c2596c795f8a782d4f053ae109e08741eb67a6d5ebea630e29656519f4369b3a71d23467a50914b02206f4118d5135d0a71398724f", + "@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20260309.1": "0b6ff10d8ed63f11655d8750c723711c22e8f8eaf0a9a5958f6059dbbaf485fbbb2e673a62bf913178b3ea3d101a60ca33a667e059d1739714feb46e41f8079b", + "@typescript/native-preview-win32-x64@npm:7.0.0-dev.20260309.1": "d55b53ab9065c600e50f1f029692d1fed4cc62ff9672ef758c70754168c310853aebd7f231cdbf8eaaf8af85015b42a9a6985dbe387bc88e648adab511a00873", "dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa", "glob-hasher-darwin-arm64@npm:1.4.2": "1abc74c6f6c6251b8bea6e412090eff4e4918f3489a371971840ee81534344b9f9e62a610efb98157970fc46561161bf23382c8572578da98a7e884d6fb6853e", "glob-hasher-darwin-x64@npm:1.4.2": "44110045f0b2e0b3abaf4f70f917a3c57b9b0c6ee56e5d02932e1772cc63a36b066fb3bc1e6a275c40978b3b2d2ad62752e899bcd966930d4df8884b1d554764", "glob-hasher-linux-x64-gnu@npm:1.4.2": "3c4a12ba68d400ab6a4552793530a631e0a1d5e089202d93cd561e967f2e0c6d1a18bae0ef7c571c2d4b40d6ba56c4573277ba1c37dc351efc582fa88703986b", "glob-hasher-win32-arm64-msvc@npm:1.4.2": "809cd80c3e3e6e7bb82e2fc2ba917ce3ca91287a83faaa7b63cf0a1fcb14c228e974baffb731fa82c34dd8a9236622ab2b5238e21b62f8b0267adaa2da7b4de6", "glob-hasher-win32-x64-msvc@npm:1.4.2": "1ab2a78b788b21754f656cae706fa2e1db34185ffef79a6b85d3f24e169bc01e1faadc6a2588eef5fde5a1fe6ced68acfb815c7b03024c0a746e7c5631b0959e", - "iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0" + "iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0", + "lightningcss-android-arm64@npm:1.32.0": "119b578a5ce59674c45fe8dc269fdb2770d678571e7fd3f7eca763807d15542689d01f75f2836e1aa49b9ddd0caa7ab3a5301bb23b39418eaeba1efab3e85975", + "lightningcss-darwin-arm64@npm:1.32.0": "55010ae8ee7aac61da41fbc81992e11b1ca386087bb8493deb1014ea90c2deeef1b4126621722aa5b8a1aeee039ec7e3b1b9f7779d128963d6e436743f5d23aa", + "lightningcss-darwin-x64@npm:1.32.0": "dd74c964c85c93842576f8caaf6c31ea273545e2f39f931716fed7700668f30d7ca92516197913ded19d836f6ff1876a91cca008125f097e254c98177e67bf86", + "lightningcss-freebsd-x64@npm:1.32.0": "29b43c1a450171da1dece9ba2a13a6dc0866178e46fa51a8cf050fe9562eb81b45f8580a3aeaf2ac97fb2fd381d8cb88d950e701774c8d012e72a355df7ac264", + "lightningcss-linux-arm-gnueabihf@npm:1.32.0": "783e6f8bba55ffd585f17229e97056c370ed834e0123d0002884b51a7fb54d6807e97076726fd0bfd949396134983e21a0aace0d4f69b916994db679a0d8a360", + "lightningcss-linux-arm64-gnu@npm:1.32.0": "d694a6148f86d20e23b0806e8c6366de3bfc6927925ad17d226cd86c2ff4f025b1c88ae3d214dea06b45af2aa2d356cf504b1057b2a0a7027b44bfac11dc1f4d", + "lightningcss-linux-arm64-musl@npm:1.32.0": "ad946ead9c3ff13b43818d94426940b50cf1ff3dacd07835b8c50f0d412f64574be3c467410786dfb3524e93bc98fb789ebb73e6de845ceb1729fceb5296fe6f", + "lightningcss-linux-x64-gnu@npm:1.32.0": "183d5cda546283523761f606032596d70383d6fd153cfca56ab348d551ef06394ee009fae7818b0732de10d9d0ee27db483cbc7e0d0899305a37a118504d609e", + "lightningcss-linux-x64-musl@npm:1.32.0": "67079567d13d5464a2556630dcbcbb8ccd0e3188d56b0a732c651930a823a708b91faa067256a15be6f289f07f1b57ca433d38ad397a9a102fbb85d0b85b5ea0", + "lightningcss-win32-arm64-msvc@npm:1.32.0": "6117fdfb4ef1c2d8054fb469659e406ae32adae9dc712e2e5ed3f813bf25a52f0954911e92a5d397aeeba7151bafb3370dfc50504b94e719f4018de7d3cc3687", + "lightningcss-win32-x64-msvc@npm:1.32.0": "f4a917eebae4f3718eaa4d3a16e268a42f117180e6bda101b380939f6738d2754dbb69bd454ee412bbc6e6290e2d8446c5f6ee3a63b144c9bd6f40a93109b7ab" } diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix index ef1e664a7551..516bd9d68631 100644 --- a/pkgs/by-name/ac/actual-server/package.nix +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -13,13 +13,13 @@ let nodejs = nodejs_22; yarn-berry = yarn-berry_4.override { inherit nodejs; }; - version = "26.3.0"; + version = "26.4.0"; src = fetchFromGitHub { name = "actualbudget-actual-source"; owner = "actualbudget"; repo = "actual"; tag = "v${version}"; - hash = "sha256-V7dysdY5m5b96aPEqD7xsNhvZrfm1FnX9I2D6+d/uAg="; + hash = "sha256-Gc2klYxGv+vd1Yc2ftj25B4Kea0GKkpjYcVDN9HvLPk="; }; translations = fetchFromGitHub { name = "actualbudget-translations-source"; @@ -27,8 +27,8 @@ let repo = "translations"; # Note to updaters: this repo is not tagged, so just update this to the Git # tip at the time the update is performed. - rev = "d65b77cf33d4456f037605215d1be64b8b0644c0"; - hash = "sha256-xVokghZuM/q0meTeK3sKYVNQcCgJnhq6htvwPYhQ3Go="; + rev = "14c3f5e7ed4e47dedab8cebeaf5e2170cfa5f9d0"; + hash = "sha256-+4hENE9unsta1YoIDE7shcjy1AlWfnPczvm4jYnw5Dw="; }; in @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-wdOIUYtiLbAkLngl+hIB/TlMLuX/YWZ9dt+a4qm+Fp8="; + hash = "sha256-WWnf7HgTdyWrrHZA43hPjv8Q1PO1ETMKkd0eSu0pQ3M="; }; pname = "actual-server"; From 943affec9c3815607d9b54aa2dde8b96d3bb7eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 6 Apr 2026 12:40:10 -0300 Subject: [PATCH 054/305] sfwbar: 1.0_beta16.1 -> 1.0_beta17 Diff: https://github.com/LBCrion/sfwbar/compare/v1.0_beta16.1...v1.0_beta17 Changelog: https://github.com/LBCrion/sfwbar/releases/tag/v1.0_beta17 --- pkgs/by-name/sf/sfwbar/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sf/sfwbar/package.nix b/pkgs/by-name/sf/sfwbar/package.nix index 8f832c00e8c8..aeeff1bdccf9 100644 --- a/pkgs/by-name/sf/sfwbar/package.nix +++ b/pkgs/by-name/sf/sfwbar/package.nix @@ -11,6 +11,7 @@ libpulseaudio, libmpdclient, libxkbcommon, + pipewire, alsa-lib, makeWrapper, docutils, @@ -19,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sfwbar"; - version = "1.0_beta16.1"; + version = "1.0_beta17"; src = fetchFromGitHub { owner = "LBCrion"; repo = "sfwbar"; tag = "v${finalAttrs.version}"; - hash = "sha256-WA9BXX+0VR8eSdHOYLs+DoazBqVwMllQSxkubq4SkWo="; + hash = "sha256-xenXcGo5kdntOsSOlXaYA9WZ9Ed0hncGlb5Jgv6rbio="; }; buildInputs = [ @@ -35,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio libmpdclient libxkbcommon + pipewire alsa-lib docutils # for rst2man ]; From 6e4663b1af5e61c7e35d4173dbb9bde5d0393b77 Mon Sep 17 00:00:00 2001 From: Kamil Monicz Date: Tue, 7 Apr 2026 00:23:32 +0200 Subject: [PATCH 055/305] code-cursor: 2.6.22 -> 3.0.12 --- pkgs/by-name/co/code-cursor/sources.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index 91923720370e..95306b7b02cc 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,22 @@ { - "version": "2.6.22", + "version": "3.0.12", "vscodeVersion": "1.105.1", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/c6285feaba0ad62603f7c22e72f0a170dc8415a5/linux/x64/Cursor-2.6.22-x86_64.AppImage", - "hash": "sha256-rmPXBpIHIp87yF0PDJhqIgvtXOVYT0JXHT66Yynwggg=" + "url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/linux/x64/Cursor-3.0.12-x86_64.AppImage", + "hash": "sha256-dUAF18h48nzLW+pjcAGeY0c7jZVbwD/3ceczZXxKJv0=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/c6285feaba0ad62603f7c22e72f0a170dc8415a5/linux/arm64/Cursor-2.6.22-aarch64.AppImage", - "hash": "sha256-kMXmgDza9AndVIKEUFYaPxOX5C7wfNY6UWWKqdX3ElE=" + "url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/linux/arm64/Cursor-3.0.12-aarch64.AppImage", + "hash": "sha256-6RJaoJtx2YYr21174CfwxVYdjHoDXLAj19ekUA7E3Ck=" }, "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/c6285feaba0ad62603f7c22e72f0a170dc8415a5/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-o63Y3Ysm/TcFdS+OoYGZkwpylOKJgFLJ0CUHweDjVRw=" + "url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/darwin/x64/Cursor-darwin-x64.dmg", + "hash": "sha256-ct29cI2vrcy/E4nODVgdVf+pCm7faj3VlcaUws7cOps=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/c6285feaba0ad62603f7c22e72f0a170dc8415a5/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-Q26w+OBK8GnNh4z0DwOWqpfMap4O7OAOpxqLdMio5rk=" + "url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-7igCfkYPRVdwKzakKxYpY0cgqfbpneHJIfcUv3KfRKk=" } } } From 9a6336d739338332fe91f94f86b9b41d4e4c27bc Mon Sep 17 00:00:00 2001 From: Minegame YTB <53137994+minegameYTB@users.noreply.github.com> Date: Tue, 7 Apr 2026 01:17:20 +0200 Subject: [PATCH 056/305] deezer-enhanced: 1.4.2 -> 1.5.1 --- pkgs/by-name/de/deezer-enhanced/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/deezer-enhanced/package.nix b/pkgs/by-name/de/deezer-enhanced/package.nix index 5f850f2cdd27..67de6767442a 100644 --- a/pkgs/by-name/de/deezer-enhanced/package.nix +++ b/pkgs/by-name/de/deezer-enhanced/package.nix @@ -34,11 +34,11 @@ stdenvNoCC.mkDerivation rec { pname = "deezer-enhanced"; - version = "1.4.2"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/duzda/deezer-enhanced/releases/download/v${version}/deezer-enhanced_${version}_amd64.deb"; - hash = "sha256-PRq5R0AXCsW+cEuf1EU+o7g6oa8K5jGAphoNC8cSNFw="; + hash = "sha256-iMqQ6mqP5/1nKjqH58kfiQERUeOF54gHvAOiI8narKI="; }; nativeBuildInputs = [ From 9c14194f81fc2ad18f271f449b9ea596485f6172 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Apr 2026 00:10:47 +0000 Subject: [PATCH 057/305] gdevelop: 5.6.262 -> 5.6.265 --- pkgs/by-name/gd/gdevelop/darwin.nix | 2 +- pkgs/by-name/gd/gdevelop/linux.nix | 2 +- pkgs/by-name/gd/gdevelop/package.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix index 23df0dd99c3c..b807a4077a50 100644 --- a/pkgs/by-name/gd/gdevelop/darwin.nix +++ b/pkgs/by-name/gd/gdevelop/darwin.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip"; - hash = "sha256-Aem0VbIEPrC1yS48KdmBmttQoM8E/7GqKSbOwTCom18="; + hash = "sha256-F8FSgUhvG6iZK7cz4Mg2zZy4M7eSlCTnDy3H2S/+Xso="; }; sourceRoot = "."; diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix index e12faba8fc77..22c9fd129d0b 100644 --- a/pkgs/by-name/gd/gdevelop/linux.nix +++ b/pkgs/by-name/gd/gdevelop/linux.nix @@ -13,7 +13,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage"; - hash = "sha256-zKJdc2Pgp6yKtxNXG2owlk/m6DHis87K1Q2Ci9fvExI="; + hash = "sha256-wBI3D+FUGmXDaSjBdbLVjIXjzldUz3wx3c3CiTKyuXE="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix index 866df8ee4486..298c218281b9 100644 --- a/pkgs/by-name/gd/gdevelop/package.nix +++ b/pkgs/by-name/gd/gdevelop/package.nix @@ -4,7 +4,7 @@ callPackage, }: let - version = "5.6.262"; + version = "5.6.265"; pname = "gdevelop"; meta = { description = "Graphical Game Development Studio"; From 9534c394313680265e67676a6a46178ac715ce3a Mon Sep 17 00:00:00 2001 From: whispers Date: Sat, 4 Apr 2026 16:33:29 -0400 Subject: [PATCH 058/305] vicinae: 0.20.9 -> 0.20.12 Release notes: - https://github.com/vicinaehq/vicinae/releases/tag/v0.20.10 - https://github.com/vicinaehq/vicinae/releases/tag/v0.20.11 - https://github.com/vicinaehq/vicinae/releases/tag/v0.20.12 Diff: https://github.com/vicinaehq/vicinae/compare/v0.20.9...v0.20.12 --- pkgs/by-name/vi/vicinae/package.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index 2d4a657fc126..6b39cc7c4298 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -1,5 +1,4 @@ { - abseil-cpp, cmake, cmark-gfm, coreutils, @@ -14,7 +13,6 @@ nodejs, npmHooks, pkg-config, - protobuf, qt6, stdenv, wayland, @@ -23,23 +21,23 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.20.9"; + version = "0.20.12"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-ax517n+zbfOvr2H+QfyqAq/6Ad3Qu3CnlaI4q6JfrXk="; + hash = "sha256-esnDXLMXJz+Nw4VF8Dk/FX4M+eVNe3vJSq06IoJ/NwA="; }; apiDeps = fetchNpmDeps { src = "${finalAttrs.src}/src/typescript/api"; - hash = "sha256-Tr+m8MLaWR8wq+cYpQwZTIzRt2tgDIyc8vVda2x+k4k="; + hash = "sha256-lIXhMBJHujs6d9fXEK8Q+sfjkKyFJEMEtKrQorkfPeU="; }; extensionManagerDeps = fetchNpmDeps { src = "${finalAttrs.src}/src/typescript/extension-manager"; - hash = "sha256-8ONawCmKxHwWS0Tx04MCpQmtWfIpJYU8RcqMtQiT/Sw="; + hash = "sha256-gpbS6MIHOSuHIfd4zDEB4EcMi9LHk9tPdnxwT0S0nbA="; }; cmakeFlags = lib.mapAttrsToList lib.cmakeFeature { @@ -61,12 +59,10 @@ stdenv.mkDerivation (finalAttrs: { ninja nodejs pkg-config - protobuf qt6.wrapQtAppsHook ]; buildInputs = [ - abseil-cpp cmark-gfm glaze kdePackages.layer-shell-qt @@ -75,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: { libqalculate minizip nodejs - protobuf qt6.qtbase qt6.qtsvg qt6.qtwayland From f6c1d2f0134547e30221c4e94f60d3f3fd7cd39b Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Mon, 6 Apr 2026 20:50:03 -0500 Subject: [PATCH 059/305] bats: work around parallelized test break after 411981, make-symlinks-relative hook breaks a parallelization test: "setup_file is not over parallelized" Thankfully, the same PR adds dontRewriteSymlinks for disabling it. --- pkgs/by-name/ba/bats/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ba/bats/package.nix b/pkgs/by-name/ba/bats/package.nix index 5396fb6ffa22..dd823e869f49 100644 --- a/pkgs/by-name/ba/bats/package.nix +++ b/pkgs/by-name/ba/bats/package.nix @@ -208,6 +208,9 @@ resholve.mkDerivation rec { upstream = bats.unresholved.overrideAttrs (old: { name = "${bats.name}-tests"; dontInstall = true; # just need the build directory + # after 411981, make-symlinks-relative breaks a parallelization test: + # "setup_file is not over parallelized" + dontRewriteSymlinks = true; nativeInstallCheckInputs = [ ncurses parallel # skips some tests if it can't detect From 7ad32b3e2999d73b6c7f3ca123c51f3b7b90d4b0 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Mon, 6 Apr 2026 20:53:21 -0500 Subject: [PATCH 060/305] bats: disable packcc test on darwin This is failing on darwin after latest bump. Hopefully just temporary. Separate commit for easier reversion later. --- pkgs/by-name/ba/bats/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ba/bats/package.nix b/pkgs/by-name/ba/bats/package.nix index dd823e869f49..0a6232cde99c 100644 --- a/pkgs/by-name/ba/bats/package.nix +++ b/pkgs/by-name/ba/bats/package.nix @@ -246,13 +246,15 @@ resholve.mkDerivation rec { # to see when updates would break things, include packages # that use nixpkgs' bats for testing (as long as they # aren't massive builds) - inherit bash-preexec locate-dominating-file packcc; + inherit bash-preexec locate-dominating-file; resholve = resholve.tests.cli; } // lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { - # TODO: kikit's kicad dependency is marked broken on darwin atm - # may be able to fold this up if that resolves. - inherit kikit; + # TODO: + # - kikit's kicad dependency is marked broken on darwin atm + # may be able to fold this up if that resolves. + # - packcc's tests currently broken on darwin (apr 2026) + inherit kikit packcc; }; meta = { From cb93db89285547e01acc44341a623b00d91ff0b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Apr 2026 04:52:03 +0000 Subject: [PATCH 061/305] tideways-cli: 1.2.14 -> 1.2.16 --- pkgs/by-name/ti/tideways-cli/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ti/tideways-cli/package.nix b/pkgs/by-name/ti/tideways-cli/package.nix index 69112b6ca643..f85fa46b8650 100644 --- a/pkgs/by-name/ti/tideways-cli/package.nix +++ b/pkgs/by-name/ti/tideways-cli/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-cli"; - version = "1.2.14"; + version = "1.2.16"; nativeBuildInputs = [ installShellFiles ]; @@ -38,19 +38,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-fx8h/JmVS+s2Gzk2bUQre+MfOBCuXlVHekaskIdk1c8="; + hash = "sha256-dyCK64IxHbuW7Ciwpv4dz6pksSXp4rJlx76isUCm3tY="; }; "aarch64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-8inyaKajz3OAegXOevNfrMYFmH9shCvtCM4OEpgi6UE="; + hash = "sha256-C6A+FE+M1T8FNNvA7qzwUWuNxnHwFaS5vUp9avQoFQ0="; }; "x86_64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-tLN4B4JNKr7+V1ZgVKZEcRpfYwLNB84D3ix2vGINnXg="; + hash = "sha256-dFscQSdRBiT6giSGx+ASPKS+6/WcqtrlvEuqhblCFTE="; }; "aarch64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-fcpN/YvpmZA/EFxfqWWVTfF6RcwgePf0JZ4430bPLTU="; + hash = "sha256-v3h2IdET0SACeTzXZyuq0SFqBDU+oDNMn7im8hBqWaU="; }; }; From 3b4a0798b7c01d90ef25015e2dbdb47fe2a83fc2 Mon Sep 17 00:00:00 2001 From: ccicnce113424 Date: Tue, 7 Apr 2026 13:00:04 +0800 Subject: [PATCH 062/305] flutterPackages: fix `hostPlatform` rename evaluation warning --- pkgs/development/compilers/flutter/scope.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/scope.nix b/pkgs/development/compilers/flutter/scope.nix index ab7369a5513d..9ef8c0d8359f 100644 --- a/pkgs/development/compilers/flutter/scope.nix +++ b/pkgs/development/compilers/flutter/scope.nix @@ -94,7 +94,7 @@ lib.makeScope newScope ( inherit outputs; }; - host-artifacts = self.callPackage ./host-artifacts.nix { }; + host-artifacts = self.callPackage ./host-artifacts.nix { inherit (stdenv) hostPlatform; }; all-artifacts = self.callPackage ./all-artifacts.nix { }; From b57b0162ab0d0cc54999e5535a8201f620e7bcf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Apr 2026 07:36:56 +0000 Subject: [PATCH 063/305] libre: 4.6.0 -> 4.7.0 --- pkgs/by-name/li/libre/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libre/package.nix b/pkgs/by-name/li/libre/package.nix index 072f48477384..030bd489c0e3 100644 --- a/pkgs/by-name/li/libre/package.nix +++ b/pkgs/by-name/li/libre/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "4.6.0"; + version = "4.7.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-+0ZVNWfcB8yU8cQdSkxfgOuzwapQ4ZyahtSSWfEb25w="; + sha256 = "sha256-MkldMsPmU3TZhU+XUkDMiBOnppDtJ2o2uSlm+DyStvo="; }; buildInputs = [ From 78ac05d95885e518f107ecd5d0855a654ca8febb Mon Sep 17 00:00:00 2001 From: whispers Date: Tue, 7 Apr 2026 05:35:20 -0400 Subject: [PATCH 064/305] tor-browser: 15.0.8 -> 15.0.9 Changelog: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/tbb-15.0.9-build1/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt Firefox ESR: https://www.firefox.com/en-US/firefox/140.9.1/releasenotes/ Firefox diff: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/FIREFOX_140_9_0esr_BUILD1..FIREFOX_140_9_1esr_BUILD1 --- pkgs/by-name/to/tor-browser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 22229f479e44..0767c46f578c 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -102,7 +102,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg_7 ] ); - version = "15.0.8"; + version = "15.0.9"; sources = { x86_64-linux = fetchurl { @@ -112,7 +112,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-m/WZa1O9MTeE8YUku/BAbcl9Dx77yVkt44C5qe/1fP0="; + hash = "sha256-s7Ubr0OjXpBg7nRuBPhnFwHY86bnZRPUnlsNBI/2Ng0="; }; i686-linux = fetchurl { @@ -122,7 +122,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-QMv59Tj2voJAvBF/UM0xNe1byx8qZZtZhWqt2yGjdM4="; + hash = "sha256-FebSPdfJjxoW0iUBspt5AMugM5SWK7Wm7pP5zGU+icU="; }; }; From 1372584ef63cd5927cd2507422cd358006df0114 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 7 Apr 2026 11:50:44 +0200 Subject: [PATCH 065/305] openttd: 15.2 -> 15.3 --- pkgs/by-name/op/openttd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openttd/package.nix b/pkgs/by-name/op/openttd/package.nix index 3463dd86989c..7162b41ee827 100644 --- a/pkgs/by-name/op/openttd/package.nix +++ b/pkgs/by-name/op/openttd/package.nix @@ -68,11 +68,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openttd"; - version = "15.2"; + version = "15.3"; src = fetchzip { url = "https://cdn.openttd.org/openttd-releases/${finalAttrs.version}/openttd-${finalAttrs.version}-source.tar.xz"; - hash = "sha256-aoeG0mAmARzYPCzMAw2BeDbvuLYXJf8nIF+eEKkE7bc="; + hash = "sha256-xDpDEeWdAWMyA/I+ioQR98vwrL9WXYd5AjswJ4NuVMY="; }; nativeBuildInputs = [ From c0a1b9c43bfac061a8f8b5f3be407ab16c154e38 Mon Sep 17 00:00:00 2001 From: Eric Rodrigues Pires Date: Mon, 6 Apr 2026 19:52:54 -0300 Subject: [PATCH 066/305] sandhole: fix Darwin builds --- pkgs/by-name/sa/sandhole/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sa/sandhole/package.nix b/pkgs/by-name/sa/sandhole/package.nix index 0f18d8eab76a..4ce080ac11b4 100644 --- a/pkgs/by-name/sa/sandhole/package.nix +++ b/pkgs/by-name/sa/sandhole/package.nix @@ -2,8 +2,10 @@ cmake, fetchFromGitHub, lib, + lld, perl, rustPlatform, + stdenv, versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -27,7 +29,8 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ cmake perl - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ]; strictDeps = true; useNextest = true; From e3183e23e7f241686c0ce98740045216700c5868 Mon Sep 17 00:00:00 2001 From: algorithmiker <104317939+algorithmiker@users.noreply.github.com> Date: Tue, 7 Apr 2026 16:52:34 +0200 Subject: [PATCH 067/305] tango-cpp: add meta.changelog --- pkgs/by-name/ta/tango-cpp/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ta/tango-cpp/package.nix b/pkgs/by-name/ta/tango-cpp/package.nix index 3f172dfe7092..1a5ca1ce21d8 100644 --- a/pkgs/by-name/ta/tango-cpp/package.nix +++ b/pkgs/by-name/ta/tango-cpp/package.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Tango Distributed Control System - C++ library"; homepage = "https://gitlab.com/tango-controls/cppTango"; + changelog = "https://gitlab.com/tango-controls/cppTango/-/blob/${finalAttrs.version}/RELEASE_NOTES.md"; license = lib.licenses.lgpl3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.gilice ]; From 40c7e5635db83f206ca452ddceb4f2a7a3fb04b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Apr 2026 15:20:16 +0000 Subject: [PATCH 068/305] asccli: 1.0.1 -> 1.1.1 --- pkgs/by-name/as/asccli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/asccli/package.nix b/pkgs/by-name/as/asccli/package.nix index 140602c968e9..c4d979f243f4 100644 --- a/pkgs/by-name/as/asccli/package.nix +++ b/pkgs/by-name/as/asccli/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "asccli"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "rudrankriyam"; repo = "App-Store-Connect-CLI"; tag = "${finalAttrs.version}"; - hash = "sha256-e2USts+HC3skFvexeKhKSJT0KxHlB5LFr54lqGjhZqM="; + hash = "sha256-fO4U5no+o5h8dNO5aQQWJtOcRGBDF+JZ2C0g0YLlJuc="; }; vendorHash = "sha256-712Q7KiFQyTDjX4Srhukv3eQ84MRjnQxrpgBfqK2xa4="; From cc49931e1674f5d98d1be6c6de97ec23d73055a3 Mon Sep 17 00:00:00 2001 From: Reputable2722 <153411261+Reputable2772@users.noreply.github.com> Date: Tue, 7 Apr 2026 21:55:37 +0530 Subject: [PATCH 069/305] redact: 0.18.0 -> 0.21.18 Signed-off-by: Reputable2722 <153411261+Reputable2772@users.noreply.github.com> --- pkgs/by-name/re/redact/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/redact/package.nix b/pkgs/by-name/re/redact/package.nix index b04f6be12d16..f54e03efa8e4 100644 --- a/pkgs/by-name/re/redact/package.nix +++ b/pkgs/by-name/re/redact/package.nix @@ -7,10 +7,10 @@ }: let pname = "redact"; - version = "0.18.0"; + version = "0.21.18"; src = fetchurl { url = "https://update-desktop.redact.dev/build/Redact-${version}.AppImage"; - hash = "sha256-qqqf8BAwXEKgZwl6vsPw/0S+qItz5ZqB59DJkW9q1xc="; + hash = "sha256-NnOQIVv/Y4C+qR5TsXh7rQq/WOYd7Vdtfru4x78djZA="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; in From f5942ae4a81ffc831543a9261b8f6029d80c2668 Mon Sep 17 00:00:00 2001 From: Reputable2722 <153411261+Reputable2772@users.noreply.github.com> Date: Tue, 7 Apr 2026 21:55:53 +0530 Subject: [PATCH 070/305] redact: fix passthru.updateScript Signed-off-by: Reputable2722 <153411261+Reputable2772@users.noreply.github.com> --- pkgs/by-name/re/redact/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/re/redact/package.nix b/pkgs/by-name/re/redact/package.nix index f54e03efa8e4..b78cc8ef5c1e 100644 --- a/pkgs/by-name/re/redact/package.nix +++ b/pkgs/by-name/re/redact/package.nix @@ -41,11 +41,8 @@ appimageTools.wrapType2 { set -eu -o pipefail url="$(curl -ILs -w %{url_effective} -o /dev/null https://download.redact.dev/windows)" version="$(echo $url | sed -n 's/.*Redact-Setup-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')" - currentVersion=$(nix-instantiate --eval -E "with import ./. {}; redact.version or (lib.getVersion redact)" | tr -d '"') - if [[ "$version" != "$currentVersion" ]]; then - hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$url")") - update-source-version redact "$version" "$hash" --print-changes - fi + hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "https://update-desktop.redact.dev/build/Redact-$version.AppImage")") + update-source-version redact "$version" "$hash" --print-changes --ignore-same-version ''; meta = { From dcc5b8f7d3d883d01854fa15d00c58b8e7b81b47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Apr 2026 17:03:23 +0000 Subject: [PATCH 071/305] solarus: 2.0.3 -> 2.0.4 --- pkgs/by-name/so/solarus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix index e6f4d1b9f9af..c5cf0d1e851b 100644 --- a/pkgs/by-name/so/solarus/package.nix +++ b/pkgs/by-name/so/solarus/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "solarus"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitLab { owner = "solarus-games"; repo = "solarus"; tag = "v${finalAttrs.version}"; - hash = "sha256-gfKf4ERdZd2g+aiMAM/16/W04G1rNDLaSO3QbhatRxU="; + hash = "sha256-dgsRxP0tZQjwlQhgEd8RwPtO/oU62xyy8WrHECBRMjQ="; }; outputs = [ From 5f4797ae78c84eda0e3484536ccfc09c356d5da1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 6 Apr 2026 16:54:59 +0200 Subject: [PATCH 072/305] lasuite-docs{,-frontend,-collaboration-server}: 4.8.4 -> 4.8.5 ChangeLog: https://github.com/suitenumerique/docs/releases/tag/v4.8.5 --- .../modules/services/web-apps/lasuite-docs.nix | 5 +++++ .../package.nix | 6 +++--- .../la/lasuite-docs-frontend/package.nix | 17 +++-------------- pkgs/by-name/la/lasuite-docs/package.nix | 6 +++--- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/web-apps/lasuite-docs.nix b/nixos/modules/services/web-apps/lasuite-docs.nix index c5f1a4ed6a3b..6e1d39108079 100644 --- a/nixos/modules/services/web-apps/lasuite-docs.nix +++ b/nixos/modules/services/web-apps/lasuite-docs.nix @@ -519,6 +519,11 @@ in tryFiles = "$uri /docs/[id]/index.html"; }; + locations."~ '^/user-reconciliations/(active|inactive)/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/?$'" = + { + tryFiles = "$uri /user-reconciliations/$1/[id]/index.html"; + }; + locations."/api" = { proxyPass = "http://${cfg.bind}"; recommendedProxySettings = true; diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix index 05a1836f906c..bc8be01f4a84 100644 --- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix +++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix @@ -13,20 +13,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-collaboration-server"; - version = "4.8.4"; + version = "4.8.5"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${finalAttrs.version}"; - hash = "sha256-k90JxFxXL3vEGBMkgbQABUCK99utJ88E/v9Zcj/2oBo="; + hash = "sha256-zXV3gXUgN28a2J48EwS6RrYxkIgoj0IJ5lPTxvexYdA="; }; sourceRoot = "${finalAttrs.src.name}/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-ElI6WWKPCsO7Viexgp2XtcjXAXzFnG2ZPN5PjOaKO2g="; + hash = "sha256-3irVoASl77ZU6+WIe5O+HY7QSggeK9lxQwwEYzgwl+o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix index 51934141c2f6..aecb39d3ea96 100644 --- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, stdenv, - fetchpatch, fetchYarnDeps, nodejs, fixup-yarn-lock, @@ -13,30 +12,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-frontend"; - version = "4.8.4"; + version = "4.8.5"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${finalAttrs.version}"; - hash = "sha256-k90JxFxXL3vEGBMkgbQABUCK99utJ88E/v9Zcj/2oBo="; + hash = "sha256-zXV3gXUgN28a2J48EwS6RrYxkIgoj0IJ5lPTxvexYdA="; }; sourceRoot = "${finalAttrs.src.name}/src/frontend"; - patches = [ - # from https://github.com/suitenumerique/docs/pull/2147, - # fixes the frontend when using the MIT build. - (fetchpatch { - url = "https://github.com/suitenumerique/docs/commit/79e909cf6489428d8f6644d772006f73503b7073.patch"; - hash = "sha256-Ucw1KtsFrPvtoeeG2fH5L64Jfcog4RV38Qg+EykGcQY="; - stripLen = 2; - }) - ]; - offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-ElI6WWKPCsO7Viexgp2XtcjXAXzFnG2ZPN5PjOaKO2g="; + hash = "sha256-3irVoASl77ZU6+WIe5O+HY7QSggeK9lxQwwEYzgwl+o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix index b1930bd1911c..82abaab29f28 100644 --- a/pkgs/by-name/la/lasuite-docs/package.nix +++ b/pkgs/by-name/la/lasuite-docs/package.nix @@ -11,12 +11,12 @@ yarnConfigHook, }: let - version = "4.8.4"; + version = "4.8.5"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-k90JxFxXL3vEGBMkgbQABUCK99utJ88E/v9Zcj/2oBo="; + hash = "sha256-zXV3gXUgN28a2J48EwS6RrYxkIgoj0IJ5lPTxvexYdA="; }; mail-templates = stdenv.mkDerivation { @@ -29,7 +29,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/src/mail/yarn.lock"; - hash = "sha256-Fd9HJ7c7fh8YYZrfzRK7BnlnHAXeyeQ9UBabnRlA+w0="; + hash = "sha256-B2vtdQYFhhsA7dK5nwAJl65kaedspfYySJJBjVwYeBM="; }; nativeBuildInputs = [ From b563c5b211ba2dc4cd78b5e2ea7587ad294e52e4 Mon Sep 17 00:00:00 2001 From: Alistair Grant Date: Tue, 7 Apr 2026 20:43:07 +0200 Subject: [PATCH 073/305] glamoroustoolkit: 1.1.47 -> 1.1.58 --- pkgs/by-name/gl/glamoroustoolkit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index 0e3e6ae66d79..41ca480ef97d 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -36,12 +36,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.47"; + version = "1.1.58"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-iMMl99qrcAxSX0ReonSjtY6oDTmDwug8TDXngUTngfQ="; + hash = "sha256-UVbtUnTEyghbmnWErNmZhZ5/PgiLlmLRjZjVIvzMcYo="; }; nativeBuildInputs = [ From 0030acac9e980e5b2e3eb2828d4c61e7bd86ddea Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Tue, 7 Apr 2026 14:16:45 -0700 Subject: [PATCH 074/305] rocmPackages.miopen: add bnorm impureTest Repro for 'Internal error while accessing SQLite database: table config has no column named mode' --- pkgs/development/rocm-modules/miopen/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/rocm-modules/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix index 7a6eb06b4999..4718ea0e4949 100644 --- a/pkgs/development/rocm-modules/miopen/default.nix +++ b/pkgs/development/rocm-modules/miopen/default.nix @@ -285,7 +285,12 @@ stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = [ "big-parallel" ]; passthru.impureTests = { - # bash $(nix-build -A rocmPackages.miopen.passthru.impureTests.conv) + # bash $(nix-build -A rocmPackages.miopen.passthru.impureTests.conv) etc + bnorm = callPackage ./test-runtime-compilation.nix { + miopen = finalAttrs.finalPackage; + name = "bnorm"; + testScript = "MIOpenDriver bnorm -n 16 -c 16 -H 512 -W 512 -m 1 -F 1 -s 1 -r 1"; + }; conv = callPackage ./test-runtime-compilation.nix { miopen = finalAttrs.finalPackage; name = "conv"; From 853d5aa780730a58366605d06b9e45eabe63ef03 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Tue, 7 Apr 2026 14:17:13 -0700 Subject: [PATCH 075/305] rocmPackages.miopen: disable MIOPEN_USE_SQLITE_PERFDB to fix bnorm crash --- pkgs/development/rocm-modules/miopen/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/rocm-modules/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix index 4718ea0e4949..6d894fc47575 100644 --- a/pkgs/development/rocm-modules/miopen/default.nix +++ b/pkgs/development/rocm-modules/miopen/default.nix @@ -203,7 +203,6 @@ stdenv.mkDerivation (finalAttrs: { "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" supportedTargets}" "-DGPU_TARGETS=${lib.concatStringsSep ";" supportedTargets}" "-DGPU_ARCHS=${lib.concatStringsSep ";" supportedTargets}" - "-DMIOPEN_USE_SQLITE_PERFDB=ON" "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DCMAKE_MODULE_PATH=${clr}/hip/cmake" "-DCMAKE_BUILD_TYPE=Release" From 61efb76ea10cd9d2982900d1f3bc7606020676ee Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Tue, 7 Apr 2026 14:56:35 -0700 Subject: [PATCH 076/305] rocmPackages.miopen: add impureTest for droupout kernels --- pkgs/development/rocm-modules/miopen/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/rocm-modules/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix index 6d894fc47575..88d824355ed3 100644 --- a/pkgs/development/rocm-modules/miopen/default.nix +++ b/pkgs/development/rocm-modules/miopen/default.nix @@ -295,6 +295,11 @@ stdenv.mkDerivation (finalAttrs: { name = "conv"; testScript = "MIOpenDriver conv -n 1 -c 1 -H 4 -W 4 -k 1 -y 3 -x 3 -p 0 -q 0 -V 0"; }; + dropout = callPackage ./test-runtime-compilation.nix { + miopen = finalAttrs.finalPackage; + name = "dropout"; + testScript = "MIOpenDriver dropout -d 64,32,14,14"; + }; pool = callPackage ./test-runtime-compilation.nix { miopen = finalAttrs.finalPackage; name = "pool"; From 9342064af943ad960842a4f301b246e71b74cab6 Mon Sep 17 00:00:00 2001 From: Paul Mulders Date: Tue, 7 Apr 2026 14:41:41 +0200 Subject: [PATCH 077/305] miopen: fix src/comgr.cpp patching for HIPRTC compile ROCM PATH Co-authored-by: Luna Nova --- pkgs/development/rocm-modules/miopen/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/rocm-modules/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix index 88d824355ed3..396f23b00291 100644 --- a/pkgs/development/rocm-modules/miopen/default.nix +++ b/pkgs/development/rocm-modules/miopen/default.nix @@ -23,6 +23,7 @@ half, boost, sqlite, + symlinkJoin, bzip2, lbzip2, nlohmann_json, @@ -82,6 +83,15 @@ let ) ); + # for hiprtcCompileProgram (dropout kernels require rocrand in -I at runtime) + hiprtcCompileRocmPath = symlinkJoin { + name = "miopen-hiprtc-compile-rocm-path"; + paths = [ + clr + rocrand + ]; + }; + # Kernel databases moved from Git LFS to DVC (anonymous s3 bucket s3://therock-dvc/rocm-libraries) fetchKdb = name: @@ -243,7 +253,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs test src/composable_kernel fin utils install_deps.cmake substituteInPlace src/comgr.cpp \ - --replace-fail '"/opt/rocm"' '"${clr}"' + --replace-fail '"/opt/rocm"' '"${hiprtcCompileRocmPath}"' '' + linkKDBsTo "src/kernels" + '' From 7f3e9729bff2863ba280fb7c608f432e8d6ed025 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 8 Apr 2026 15:53:43 +1000 Subject: [PATCH 078/305] simgear: 2024.1.4 -> 2024.1.5 https://gitlab.com/flightgear/simgear/-/tags/2024.1.5 --- pkgs/by-name/si/simgear/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix index 15e3e81caa29..e70558ddbea6 100644 --- a/pkgs/by-name/si/simgear/package.nix +++ b/pkgs/by-name/si/simgear/package.nix @@ -28,7 +28,7 @@ c-ares, }: let - version = "2024.1.4"; + version = "2024.1.5"; in stdenv.mkDerivation (finalAttrs: { pname = "simgear"; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "flightgear"; repo = "simgear"; tag = finalAttrs.version; - hash = "sha256-WJI15egN1H+EAIaFuI3svYCvM0xzsIGcIPsZgLsvBc0="; + hash = "sha256-WONlVdfDWIcoj/UfcFA4Vw5edlgr0vlT/fjIPDti7fk="; }; nativeBuildInputs = [ cmake ]; From b6c924d5992517307baaa9b3b9b98be0aa92b26d Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 8 Apr 2026 15:53:52 +1000 Subject: [PATCH 079/305] flightgear: 2024.1.4 -> 2024.1.5 https://gitlab.com/flightgear/flightgear/-/tags/2024.1.5 --- pkgs/by-name/fl/flightgear/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix index 5b1d89423184..8ab1960ae548 100644 --- a/pkgs/by-name/fl/flightgear/package.nix +++ b/pkgs/by-name/fl/flightgear/package.nix @@ -34,7 +34,7 @@ }: let - version = "2024.1.4"; + version = "2024.1.5"; data = stdenv.mkDerivation rec { pname = "flightgear-data"; inherit version; @@ -43,7 +43,7 @@ let owner = "flightgear"; repo = "fgdata"; tag = version; - hash = "sha256-0cIOyQhw/+jqwO1OddBC09ZnvrmtyjSoMhcu1tuwx4k="; + hash = "sha256-8B5wSYjkWuPEySpqBiprZ+jrHy01HA9+iX70wNAn81s="; }; dontUnpack = true; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { owner = "flightgear"; repo = "flightgear"; tag = version; - hash = "sha256-s897bsHsVP0OAcrwDVRTPz3YNJkynyErJpH18oLPl3Y="; + hash = "sha256-sORiO0SDChIVWIhGKelm7IE/cZ40gMqlZ1OoZZna7kI="; }; nativeBuildInputs = [ From 476cb019c54d99bc45123cafb869e6b09fe4d172 Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 8 Apr 2026 10:18:37 +0200 Subject: [PATCH 080/305] mattermost-desktop: 6.1.0 -> 6.1.1 Diff: https://github.com/mattermost/desktop/compare/v6.1.0...v6.1.1 Changelog: https://github.com/mattermost/desktop/releases/tag/v6.1.1 --- pkgs/by-name/ma/mattermost-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index a224695795c8..7dc24b53521e 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -15,16 +15,16 @@ in buildNpmPackage rec { pname = "mattermost-desktop"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "mattermost"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-5sVYDnz5RPkHfCpA3I1+Lm7z7YLa3fOFYOTEI6Sbxz8="; + hash = "sha256-NSTOmrHq1igcO9Wm6PYKHXpVfidLitUaCFou0d6+E2g="; }; - npmDepsHash = "sha256-YdpF/wuH2H+ouBDzCUcTQWLB8s8wa9L12UiGj4MnurQ="; + npmDepsHash = "sha256-Er3D7wQMhdEXwR7ISk/OUa7Zu9TkAZj1xCQ5jWcRXgc="; npmBuildScript = "build-prod"; makeCacheWritable = true; From 32c3ab2c64fe340a866d85ff8dbd751c88a8934e Mon Sep 17 00:00:00 2001 From: Aiden Schembri Date: Wed, 8 Apr 2026 10:19:20 +0200 Subject: [PATCH 081/305] antigravity: 1.21.9 -> 1.22.2 --- pkgs/by-name/an/antigravity/information.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json index 237942111016..0bd4832fc776 100644 --- a/pkgs/by-name/an/antigravity/information.json +++ b/pkgs/by-name/an/antigravity/information.json @@ -1,22 +1,22 @@ { - "version": "1.21.9", + "version": "1.22.2", "vscodeVersion": "1.107.0", "sources": { "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/linux-x64/Antigravity.tar.gz", - "sha256": "85ea4d55f52d32fbbf9d92fddc747f10e8d04c1bd00a07721b571fa7f2ef5226" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/linux-x64/Antigravity.tar.gz", + "sha256": "85c6b2decfefef2c6e0adaf161b602da7c1ecb2db6157ec0a4caffcfe4811209" }, "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/linux-arm/Antigravity.tar.gz", - "sha256": "76d56462e0fad95a98efaf25d06be9c4789e3b8551fe5b936a6858b14c723364" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/linux-arm/Antigravity.tar.gz", + "sha256": "601fe7d97bf49fe06ebde331f1385e9e7e58269d23667808ae58256a87929a23" }, "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/darwin-x64/Antigravity.zip", - "sha256": "a8ebdbf3b18c75d39b876541904c95576422e281fd92e45f7f7f4e7231ac769c" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/darwin-x64/Antigravity.zip", + "sha256": "14686d6b15741b33abaf52b19a10f18e8427796461efa285a2fa2ddb30e0dcad" }, "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/darwin-arm/Antigravity.zip", - "sha256": "f9ec42d0a791cc13cbb57a1f7c36b2421e67f180cd0bdfb01fd8fa23ad87440b" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/darwin-arm/Antigravity.zip", + "sha256": "51e1f488da34f4e38c63806eed28a6b4bd5b583c275907945871710bed0f85d5" } } } From 10290c32ad606622a852417a8369ff485d4e6c0f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Apr 2026 12:50:37 +0200 Subject: [PATCH 082/305] python3Packages.rich-click: 1.9.5 -> 1.9.7 Diff: https://github.com/ewels/rich-click/compare/v1.9.5...v1.9.7 Changelog: https://github.com/ewels/rich-click/blob/v1.9.7/CHANGELOG.md --- pkgs/development/python-modules/rich-click/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 1dfb80c6c200..8f5a3c0d62fa 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.9.5"; + version = "1.9.7"; pyproject = true; src = fetchFromGitHub { owner = "ewels"; repo = "rich-click"; tag = "v${version}"; - hash = "sha256-VSaPSC49icIB4z3ZPHtedh2gXkYBIODrG362T++i0Eo="; + hash = "sha256-HT82Dk3dYNMVU4lKJodKtn2KfEH7HUAORpa2RKSmg68="; }; build-system = [ setuptools ]; From b6fe5a9ce2e0fa2a1faa56a55ef4bcaae90bf1d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 8 Apr 2026 13:27:09 +0200 Subject: [PATCH 083/305] mysql80: drop MySQL 8.0 reaches EOL on 2026-04-30 and cannot be supported throughout the NixOS 26.05 release cycle. --- .../manual/release-notes/rl-2605.section.md | 2 + nixos/modules/services/databases/mysql.nix | 2 +- nixos/modules/services/web-apps/keycloak.nix | 2 +- nixos/tests/mysql/common.nix | 2 +- pkgs/by-name/li/libcbor/package.nix | 4 +- .../li/libmysqlconnectorcpp/package.nix | 6 +- pkgs/by-name/my/mysql-workbench/package.nix | 4 +- pkgs/by-name/sq/sqlite3-to-mysql/package.nix | 4 +- .../mysql-connector/default.nix | 18 ++- pkgs/servers/sql/mysql/8.0.x.nix | 130 ------------------ .../sql/mysql/no-force-outline-atomics.patch | 24 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 7 - pkgs/top-level/perl-packages.nix | 3 +- 14 files changed, 28 insertions(+), 181 deletions(-) delete mode 100644 pkgs/servers/sql/mysql/8.0.x.nix delete mode 100644 pkgs/servers/sql/mysql/no-force-outline-atomics.patch diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index a81de0fdb95e..576f3c6db4c4 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -206,6 +206,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh - `rocmPackages_6` has been removed. `rocmPackages` has been updated to ROCm 7.x. Out of tree packages may rely on obsolete hipblas APIs or compile time constant warp size and need to be updated. +- `mysql80` has been removed. Please update to `mysql84` or `mariadb`. See the [upgrade guide](https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/) for more information. + - `services.prometheus.exporters.rspamd` has been removed. It relied on the Rspamd /stat endpoint via the JSON exporter. You can use the Rspamd [/metrics](https://docs.rspamd.com/developers/protocol#controller-http-endpoints) endpoint directly instead. - The Bash implementation of the `nixos-rebuild` program is removed. All switchable systems now use the Python rewrite. Any prior usage of `system.rebuild.enableNg` must now be removed. If you have any outstanding issues with the new implementation, please open an issue on GitHub. diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 176c3fd4548c..73f8644b2d36 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -9,7 +9,7 @@ let cfg = config.services.mysql; isMariaDB = lib.getName cfg.package == lib.getName pkgs.mariadb; - isOracle = lib.getName cfg.package == lib.getName pkgs.mysql80; + isOracle = lib.getName cfg.package == lib.getName pkgs.mysql84; # Oracle MySQL has supported "notify" service type since 8.0 hasNotify = isMariaDB || (isOracle && lib.versionAtLeast cfg.package.version "8.0"); diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index 31ee97320492..1be7f974c687 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -802,7 +802,7 @@ in services.mysql.enable = mkDefault createLocalMySQL; services.mysql.package = let - dbPkg = if cfg.database.type == "mariadb" then pkgs.mariadb else pkgs.mysql80; + dbPkg = if cfg.database.type == "mariadb" then pkgs.mariadb else pkgs.mysql84; in mkIf createLocalMySQL (mkDefault dbPkg); }; diff --git a/nixos/tests/mysql/common.nix b/nixos/tests/mysql/common.nix index 17e961021f14..04be129482fe 100644 --- a/nixos/tests/mysql/common.nix +++ b/nixos/tests/mysql/common.nix @@ -4,7 +4,7 @@ import ../../../pkgs/servers/sql/mariadb pkgs ); mysqlPackages = { - inherit (pkgs) mysql80; + inherit (pkgs) mysql84; }; perconaPackages = { inherit (pkgs) percona-server_8_0 percona-server_8_4; diff --git a/pkgs/by-name/li/libcbor/package.nix b/pkgs/by-name/li/libcbor/package.nix index c2445e7d8965..31ad8ed2fbd1 100644 --- a/pkgs/by-name/li/libcbor/package.nix +++ b/pkgs/by-name/li/libcbor/package.nix @@ -7,7 +7,7 @@ # for passthru.tests libfido2, - mysql80, + mysql84, openssh, systemd, }: @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ cmocka ]; passthru.tests = { - inherit libfido2 mysql80; + inherit libfido2 mysql84; openssh = (openssh.override { withFIDO = true; }); systemd = ( systemd.override { diff --git a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix index 5ea9bff13894..3caf6b592b1f 100644 --- a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix +++ b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix @@ -5,7 +5,7 @@ cmake, boost, openssl, - mysql80, + mysql84, }: stdenv.mkDerivation (finalAttrs: { @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - mysql80 + mysql84 ]; buildInputs = [ boost openssl - mysql80 + mysql84 ]; strictDeps = true; diff --git a/pkgs/by-name/my/mysql-workbench/package.nix b/pkgs/by-name/my/mysql-workbench/package.nix index f0217144bb0c..63ac0e07f947 100644 --- a/pkgs/by-name/my/mysql-workbench/package.nix +++ b/pkgs/by-name/my/mysql-workbench/package.nix @@ -20,7 +20,7 @@ python3Packages, cairo, - mysql80, + mysql84, libiodbc, proj, @@ -41,7 +41,7 @@ }: let - mysql = mysql80; + mysql = mysql84; gdal' = gdal.override { libmysqlclient = mysql; }; antlr = antlr4_13; diff --git a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix index 8ff3ff9c4542..1cedbdeef6e5 100644 --- a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix +++ b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix @@ -5,7 +5,7 @@ nixosTests, testers, sqlite3-to-mysql, - mysql80, + mysql84, }: python3Packages.buildPythonApplication (finalAttrs: { @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication (finalAttrs: { tabulate unidecode packaging - mysql80 + mysql84 python-dateutil sqlglot ]; diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 87ee1887ed02..e97df02712ac 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,7 +4,7 @@ dnspython, fetchFromGitHub, protobuf, - mysql80, + mysql84, openssl, pkgs, }: @@ -15,11 +15,11 @@ buildPythonPackage rec { format = "setuptools"; setupPyBuildFlags = [ - "--with-mysql-capi=${mysql80}" + "--with-mysql-capi=${mysql84}" "--with-openssl-include-dir=${openssl.dev}/include" "--with-openssl-lib-dir=${lib.getLib openssl}/lib" "-L" - "${lib.getLib pkgs.zstd}/lib:${lib.getLib mysql80}/lib" + "${lib.getLib pkgs.zstd}/lib:${lib.getLib mysql84}/lib" ]; src = fetchFromGitHub { @@ -40,14 +40,18 @@ buildPythonPackage rec { ./0001-Revert-Fix-MacOS-wheels-platform-tag.patch ]; - nativeBuildInputs = [ mysql80 ]; + nativeBuildInputs = [ mysql84 ]; + + buildInputs = [ + mysql84 + openssl + pkgs.zlib + pkgs.zstd + ]; propagatedBuildInputs = [ dnspython protobuf - mysql80 - openssl - pkgs.zstd ]; pythonImportsCheck = [ "mysql" ]; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix deleted file mode 100644 index 868d9b2b9ca3..000000000000 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - bison, - cmake, - pkg-config, - boost, - icu, - libedit, - libevent, - lz4, - ncurses, - openssl, - protobuf, - re2, - readline, - zlib, - zstd, - libfido2, - numactl, - cctools, - developer_cmds, - libtirpc, - rpcsvc-proto, - curl, - DarwinTools, - nixosTests, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "mysql"; - version = "8.0.45"; - - src = fetchurl { - url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-tDXyLmWMj8k7gWmPo0uaVjJaMEs/Pf+H8n+2dMkKu8s="; - }; - - nativeBuildInputs = [ - bison - cmake - pkg-config - protobuf - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; - - patches = [ - ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch - ]; - - ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool ${cctools}/bin/libtool - substituteInPlace cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool ${cctools}/bin/libtool - substituteInPlace cmake/package_name.cmake --replace-fail "COMMAND sw_vers" "COMMAND ${DarwinTools}/bin/sw_vers" - ''; - - buildInputs = [ - boost - (curl.override { inherit openssl; }) - icu - libedit - libevent - lz4 - ncurses - openssl - protobuf - re2 - readline - zlib - zstd - libfido2 - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - numactl - libtirpc - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - developer_cmds - ]; - - strictDeps = true; - - outputs = [ - "out" - "static" - ]; - - cmakeFlags = [ - "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. - "-DWITH_ROUTER=OFF" # It may be packaged separately. - "-DWITH_SYSTEM_LIBS=ON" - "-DWITH_UNIT_TESTS=OFF" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" - "-DMYSQL_DATADIR=/var/lib/mysql" - "-DINSTALL_INFODIR=share/mysql/docs" - "-DINSTALL_MANDIR=share/man" - "-DINSTALL_PLUGINDIR=lib/mysql/plugin" - "-DINSTALL_INCLUDEDIR=include/mysql" - "-DINSTALL_DOCREADMEDIR=share/mysql" - "-DINSTALL_SUPPORTFILESDIR=share/mysql" - "-DINSTALL_MYSQLSHAREDIR=share/mysql" - "-DINSTALL_MYSQLTESTDIR=" - "-DINSTALL_DOCDIR=share/mysql/docs" - "-DINSTALL_SHAREDIR=share/mysql" - ]; - - postInstall = '' - moveToOutput "lib/*.a" $static - so=${stdenv.hostPlatform.extensions.sharedLibrary} - ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so - ''; - - passthru = { - client = finalAttrs.finalPackage; - connector-c = finalAttrs.finalPackage; - server = finalAttrs.finalPackage; - mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests = nixosTests.mysql.mysql80; - }; - - meta = { - homepage = "https://www.mysql.com/"; - description = "World's most popular open source database"; - license = lib.licenses.gpl2Only; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/servers/sql/mysql/no-force-outline-atomics.patch b/pkgs/servers/sql/mysql/no-force-outline-atomics.patch deleted file mode 100644 index a716a4f7f481..000000000000 --- a/pkgs/servers/sql/mysql/no-force-outline-atomics.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 727d66011f9..acae1aada57 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1338,19 +1338,6 @@ IF(UNIX AND MY_COMPILER_IS_GNU_OR_CLANG - ENDIF() - ENDIF() - --# For aarch64 some sub-architectures support LSE atomics and some don't. Thus, --# compiling for the common denominator (-march=armv8-a) means LSE is not used. --# The -moutline-atomics switch enables run-time detection of LSE support. --# There are compilers (gcc 9.3.1 for example) which support this switch, but --# do not enable it by default, even though it seems to help. So, we force it. --IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") -- MY_CHECK_CXX_COMPILER_FLAG( "-moutline-atomics" HAVE_OUTLINE_ATOMICS) -- IF(HAVE_OUTLINE_ATOMICS) -- STRING_APPEND(CMAKE_C_FLAGS " -moutline-atomics") -- STRING_APPEND(CMAKE_CXX_FLAGS " -moutline-atomics") -- ENDIF() --ENDIF() -- - IF(LINUX) - OPTION(LINK_RANDOMIZE "Randomize the order of all symbols in the binary" OFF) - SET(LINK_RANDOMIZE_SEED "mysql" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a827d8e45ddc..1ebdd42840d1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1398,6 +1398,7 @@ mapAliases { mutter46 = throw "'mutter46' has been removed, no longer used by Pantheon"; # Added 2026-01-24 muzika = throw "muzika was discontinued upstream in november 2024"; # Added 2025-12-15; mx-puppet-discord = throw "mx-puppet-discord was removed since the packaging was unmaintained and was the sole user of sha1 hashes in nixpkgs"; # Added 2025-07-24 + mysql80 = throw "'mysql80' reached end of life on 2026-04-30 and has been removed."; # Added 2026-04-08 mysql-client = throw "mysql-client has been replaced by mariadb.client"; # Converted to throw 2025-10-26 n98-magerun = throw "n98-magerun doesn't support new PHP newer than 8.1"; # Added 2025-10-03 nagiosPluginsOfficial = throw "'nagiosPluginsOfficial' has been renamed to/replaced by 'monitoring-plugins'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11eb191e29f0..d2b9010caaff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8330,13 +8330,6 @@ with pkgs; boost = boost179.override { enableShared = false; }; }; - mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { - inherit (darwin) developer_cmds DarwinTools; - boost = boost177; # Configure checks for specific version. - icu = icu69; - protobuf = protobuf_21; - }; - mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { }; jtds_jdbc = callPackage ../servers/sql/mssql/jdbc/jtds.nix { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 66e94648bc2a..14552ea229ec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9818,7 +9818,7 @@ with self; }; nativeBuildInputs = [ - pkgs.mysql80 # for mysql_config + pkgs.mysql84 # for mysql_config ]; buildInputs = [ DevelChecklib @@ -9828,6 +9828,7 @@ with self; pkgs.libmysqlconnectorcpp pkgs.libxcrypt pkgs.openssl + pkgs.zlib pkgs.zstd ]; propagatedBuildInputs = [ DBI ]; From 226ab2049795def5642273886e6b33d3822a872b Mon Sep 17 00:00:00 2001 From: yuannan Date: Wed, 8 Apr 2026 12:22:42 +0000 Subject: [PATCH 084/305] supabase-cli: 2.84.2 -> 2.88.1 --- pkgs/by-name/su/supabase-cli/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index fc1e90e768a8..04206a38e8bd 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "supabase-cli"; - version = "2.84.2"; + version = "2.88.1"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-0S+FV1aty/RzkLA6WK4Me/eKEr4LduDfIVdruQO9ZrM="; + hash = "sha256-v4H+sABhR53vKreq+yX9iJK7+5xlM+KXcuEUawDFZto="; }; - vendorHash = "sha256-7BkSPFR5ciEVA/i1gy53SZu26MMkZNC+VwRHMoLJSxI="; + vendorHash = "sha256-5DWsFaZ700FGb6AnqTs3ewhieHuTl4SrnQHdbiNZBY4="; ldflags = [ "-s" @@ -60,6 +60,7 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ gerschtli kashw2 + yuannan ]; mainProgram = "supabase"; }; From 1d8461260cca63a42ea86e330a9de14f40439cf3 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 1 Apr 2026 15:37:37 -0400 Subject: [PATCH 085/305] telegram-desktop: 6.6.2 -> 6.7.5 Diff: https://github.com/telegramdesktop/tdesktop/compare/v6.6.2...v6.7.5 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v6.7.5 --- .../telegram/telegram-desktop/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index 5af1e743f91b..148ea225fa6d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "6.6.2"; + version = "6.7.5"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-sMg7h+he+mlqTu8wSLAsSJzCmwTX3t+suTEY77RH+aI="; + hash = "sha256-HsXNTZY/+Xz7pIT7durOd5T/u7jML0rVBOPb4pnIXow="; }; nativeBuildInputs = [ From e14f108586e373dd08933185baf878b8db47651f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 7 Apr 2026 14:56:24 -0400 Subject: [PATCH 086/305] telegram-desktop: disable swift 6 local translation --- .../instant-messengers/telegram/telegram-desktop/unwrapped.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index 148ea225fa6d..e1c442e386bf 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -104,6 +104,8 @@ stdenv.mkDerivation (finalAttrs: { # We're allowed to used the API ID of the Snap package: (lib.cmakeFeature "TDESKTOP_API_ID" "611335") (lib.cmakeFeature "TDESKTOP_API_HASH" "d524b414d21f4d37f08684c1df41ac9c") + # swift 6 is not available in nixpkgs + (lib.cmakeBool "DESKTOP_APP_DISABLE_SWIFT6" true) ]; installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' From 8211b89bd1f7d60c356e7316e0d455f064047e60 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 2 Apr 2026 19:57:25 -0400 Subject: [PATCH 087/305] _64gram: 1.1.94 -> 1.1.99 Diff: https://github.com/TDesktop-x64/tdesktop/compare/v1.1.94...v1.1.99 Changelog: https://github.com/TDesktop-x64/tdesktop/releases/tag/v1.1.99 --- pkgs/by-name/_6/_64gram/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index 61861c856227..18968647d9e8 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -10,13 +10,13 @@ telegram-desktop.override { inherit withWebkit; unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec { pname = "64gram-unwrapped"; - version = "1.1.94"; + version = "1.1.99"; src = fetchFromGitHub { owner = "TDesktop-x64"; repo = "tdesktop"; tag = "v${version}"; - hash = "sha256-pMcG0B3YxrvvaLsC2yWJsm9wHpv5+xLtp+wQhRtJ38Q="; + hash = "sha256-p1mdNoTjftbAeoWJ+AKVPFr87BoxOLIT5fDzWY3VXMQ="; fetchSubmodules = true; }; From b0b2d00c7bc31cabe2167b5f5af4dcb6e926e599 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 8 Apr 2026 15:18:51 +0100 Subject: [PATCH 088/305] python3Packages.lightgbm: use boost187 This regressed in 186f1b3fd624e63c99fe0780a6abcc84008887e9, which bumped nixpkgs `boost` alias to `boost189`. However, it explicitly needs boost187. --- pkgs/development/python-modules/lightgbm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 5409d1662452..6fbba4c436c6 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -18,7 +18,7 @@ # buildInputs llvmPackages, - boost, + boost187, ocl-icd, opencl-headers, @@ -85,7 +85,7 @@ buildPythonPackage rec { buildInputs = (lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]) ++ (lib.optionals gpuSupport [ - boost + boost187 ocl-icd opencl-headers ]) From e73227e28c4afbb7201ec13d5b0235af0d500cc8 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 8 Apr 2026 15:42:57 +0100 Subject: [PATCH 089/305] python3Packages.lightgbm: fix lib_lightgbm.so location cmake installs lib_lightgbm.so into the wrong place, `$out/lib/python3.13/site-packages/lib/lib_lightgbm.so`, which is not part of the locations `lightgbm/libpath.py` considers. Instead of patching that file, which seems to have regressed, set the `__BUILD_FOR_PYTHON` `cmakeBool` (as in `pyproject.toml`), which causes the .so file to be placed to a location that will be considered for dlopen()'ing later, removing the need for any patching alltogether. The new location of the .so file is also more aligned with how other python packages in nixpkgs do it, `$out/lib/python3.13/site-packages/lightgbm/lib/lib_lightgbm.so`. --- .../python-modules/lightgbm/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 6fbba4c436c6..46016b92469e 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -55,18 +55,6 @@ buildPythonPackage rec { hash = "sha256-yxxZcg61aTicC6dNFPUjUbVzr0ifIwAyocnzFPi6t/4="; }; - # Patch dll search path to fix proper discovery of lib_lightgbm.so - # Exception: Cannot find lightgbm library file in following paths: - # /nix/store/...-python3.13-lightgbm-4.6.0/lib/python3.13/site-packages/lib_lightgbm.so - # /nix/store/...-python3.13-lightgbm-4.6.0/lib/python3.13/site-packages/lightgbm/bin/lib_lightgbm.so - # /nix/store/...-python3.13-lightgbm-4.6.0/lib/python3.13/site-packages/lightgbm/lib/lib_lightgbm.so - postPatch = '' - substituteInPlace lightgbm/libpath.py \ - --replace-fail \ - 'curr_path.parents[0] / "lib",' \ - 'curr_path.parents[1] / "lib",' - ''; - build-system = [ scikit-build-core ]; @@ -102,6 +90,9 @@ buildPythonPackage rec { cmakeFlags = [ (lib.cmakeBool "USE_GPU" gpuSupport) (lib.cmakeBool "USE_CUDA" cudaSupport) + # Set in pyproject.toml for `cmake.args` in `[tool.scikit-build]`, + # but not set by our hooks. + (lib.cmakeBool "__BUILD_FOR_PYTHON" true) ]; optional-dependencies = { From 3adf10aec59459d975c5722c09addea0ff7f0b34 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 4 Apr 2026 17:30:32 +0200 Subject: [PATCH 090/305] gelly: 1.0.0 -> 1.1.2 --- pkgs/by-name/ge/gelly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix index 472bd8dd2bc5..d2a6d9266c28 100644 --- a/pkgs/by-name/ge/gelly/package.nix +++ b/pkgs/by-name/ge/gelly/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gelly"; - version = "1.0.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "Fingel"; repo = "gelly"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZmtofGQYC32pz9WWTvENTU1qSVOXDu+CneyX/YelvZU="; + hash = "sha256-oEDpfpOkA0J9fSF+haEvhmZGSZIRCaN2qHa2pHUujBs="; }; - cargoHash = "sha256-dlMC+nUStrrjYlwxG+NVoqFOuTMcdaUL5a20dN3G5HQ="; + cargoHash = "sha256-YpFeu5re+kYjjv6Id9kvus3oGmz3qExD8ofLFObAZdI="; nativeBuildInputs = [ pkg-config From e927e5a98d9851432a251830ed20da5e46593cd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 16:57:31 +0000 Subject: [PATCH 091/305] plasma-panel-spacer-extended: 1.14.0 -> 1.15.0 --- pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix index 0297274709c3..f6c16f5023e5 100644 --- a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix +++ b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-spacer-extended"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-spacer-extended"; tag = "v${finalAttrs.version}"; - hash = "sha256-zqdELL7A4pZpPfbgBgyqZnP6HY200rYxRFl3/aIE3Eo="; + hash = "sha256-ivfIlZvr7OOXa/zyrorcUPaaFU6IcS2L3yFiX29jnd4="; }; nativeBuildInputs = [ From 02648ba9d9cf0191ed9f71a1b3c57c08f4164d4a Mon Sep 17 00:00:00 2001 From: algorithmiker <104317939+algorithmiker@users.noreply.github.com> Date: Tue, 7 Apr 2026 16:55:52 +0200 Subject: [PATCH 092/305] tango-cpp: 10.1.2 -> 10.3.0 --- pkgs/by-name/ta/tango-cpp/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ta/tango-cpp/package.nix b/pkgs/by-name/ta/tango-cpp/package.nix index 1a5ca1ce21d8..3b6ff008a33a 100644 --- a/pkgs/by-name/ta/tango-cpp/package.nix +++ b/pkgs/by-name/ta/tango-cpp/package.nix @@ -16,24 +16,16 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tango-cpp"; - version = "10.1.2"; + version = "10.3.0"; src = fetchFromGitLab { owner = "tango-controls"; repo = "cppTango"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-8AFQMw3mUKbHFJBm3Xmme2ehqgZowLQsU0cn1gMLbTc="; + hash = "sha256-X4r2nMdW61TAqDLcVZ0tibJnn/ffXHt8RWSBDRqA0/8="; }; - patches = [ - # corresponds to PR https://gitlab.com/tango-controls/cppTango/-/merge_requests/1525 - (fetchpatch { - url = "https://gitlab.com/tango-controls/cppTango/-/commit/66bd2d9deb79fb557eb2314376f9559e7476d3a1.patch"; - hash = "sha256-ZUcBS4apVfXmXKnpGOQJ9DF8t79qJ2yqKXwaseiOC6U="; - }) - ]; - nativeBuildInputs = [ cmake cppzmq From a170dab68aefae9cc9c8d012d5023260d97d3d4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 17:40:07 +0000 Subject: [PATCH 093/305] nest-cli: 11.0.17 -> 11.0.18 --- pkgs/by-name/ne/nest-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix index ec301d9d892f..9bac505927d5 100644 --- a/pkgs/by-name/ne/nest-cli/package.nix +++ b/pkgs/by-name/ne/nest-cli/package.nix @@ -9,16 +9,16 @@ buildNpmPackage (finalAttrs: { pname = "nest-cli"; - version = "11.0.17"; + version = "11.0.18"; src = fetchFromGitHub { owner = "nestjs"; repo = "nest-cli"; tag = finalAttrs.version; - hash = "sha256-TolI/HpC5kEvXrqkIcjcVny2yY96Jz37f5+mw4fHt1M="; + hash = "sha256-fqVsvox7c50bZ5jqGrpu3QiQG+ghY3eh8SETrdKnRCY="; }; - npmDepsHash = "sha256-y9yjZT7AhXPrKEQo81k5KjX9voIWY7VcuUGY6QuiLcw="; + npmDepsHash = "sha256-1M53H0tLD3+9To4kxt136P7kOvzo3gfWEFkFlcUSy6g="; npmFlags = [ "--legacy-peer-deps" ]; env = { From b1b5a88d3c93e4a3481b816bddbe03a6ab60c244 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 17:49:42 +0000 Subject: [PATCH 094/305] signalbackup-tools: 20260325 -> 20260407 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 4ffffd4064e1..f8ed4776cb82 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "signalbackup-tools"; - version = "20260325"; + version = "20260407"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = finalAttrs.version; - hash = "sha256-5Tb9bY0sZvCUlYkGpmu6hVi7EOEMaygEH9x3tbyo2T4="; + hash = "sha256-rkIhaYLRBpqMLpwOHhTAEpgqrKRc3UBMwhS1oiCcbvc="; }; nativeBuildInputs = [ From a8d4b43ef5d55d1f994830b2b416024090575411 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 18:43:22 +0000 Subject: [PATCH 095/305] tuckr: 0.13.0 -> 0.13.1 --- pkgs/by-name/tu/tuckr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/tuckr/package.nix b/pkgs/by-name/tu/tuckr/package.nix index 02b39c4a0f18..39f8af6d2ad6 100644 --- a/pkgs/by-name/tu/tuckr/package.nix +++ b/pkgs/by-name/tu/tuckr/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tuckr"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "RaphGL"; repo = "Tuckr"; rev = finalAttrs.version; - hash = "sha256-1fiz45x7XgVJtzxF+cxe6W203oIs3wytjh3V/IGk4XA="; + hash = "sha256-QFGT032gpyzdobGdICEyvgbAMDGbBSNhIH16AlGPK4s="; }; - cargoHash = "sha256-q64BgL/UOWd/WNTyG8D1pwfa5ca1mKN79BI+W15ooMQ="; + cargoHash = "sha256-ffAp+1kkLTaKYPhfwQt4ieR3d/w8SeJPfeaFh0Vzc1w="; doCheck = false; # test result: FAILED. 5 passed; 3 failed; From b73fae8d27df7206f51ed129cea73cb7669ef5da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 18:53:30 +0000 Subject: [PATCH 096/305] sqldef: 3.10.1 -> 3.11.0 --- pkgs/by-name/sq/sqldef/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix index 0415f8350261..5cc99147c274 100644 --- a/pkgs/by-name/sq/sqldef/package.nix +++ b/pkgs/by-name/sq/sqldef/package.nix @@ -6,18 +6,18 @@ buildGoModule (finalAttrs: { pname = "sqldef"; - version = "3.10.1"; + version = "3.11.0"; src = fetchFromGitHub { owner = "sqldef"; repo = "sqldef"; rev = "v${finalAttrs.version}"; - hash = "sha256-6z73BmddtPrqbaWnDSTMeyECMomwHFtLRqIS08UfaLY="; + hash = "sha256-//wAzWGgNIYp/uajrhX2GexIsdYRjRAOPcHXZuSdj+E="; }; proxyVendor = true; - vendorHash = "sha256-XSb3nMUv2JngkvvjpqfStFXJQFrCaSSTkYaKDGaFfuE="; + vendorHash = "sha256-xX4ZrhIdHvNFRTXHkZfEbevauuv4x9IYfDVfq7IFDg8="; ldflags = [ "-s" From f1422919651904ea83ab3299307b5c306498394c Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Wed, 8 Apr 2026 21:24:09 +0200 Subject: [PATCH 097/305] batman-adv: 2026.0 -> 2026.1 Changelog: https://www.open-mesh.org/news/127 --- pkgs/os-specific/linux/batman-adv/version.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 606d6fea7846..e12da2673ae4 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,14 +1,14 @@ { - version = "2026.0"; + version = "2026.1"; # To get these, run: # # ``` - # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2026.0/$tool-2026.0.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri; done + # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2026.1/$tool-2026.1.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri; done # ``` sha256 = { - alfred = "sha256-35EVL+Mftjd6JM6TEwRFlzUQRpr5N35MycX10l4451E="; - batctl = "sha256-tLcNrmIBBuRe492x9RL2kHVpKxI0PQUhJnQDyyEqSiY="; - batman-adv = "sha256-lGHWE8T4OgojOp9wBq1tFed514nEm9NePMCNfiiG/Ko="; + alfred = "sha256-Rd+8uKfLuq7j4SYHpGYB3YbOUiUHJTXptJ2kC78CtIk="; + batctl = "sha256-hEQWhsHUTtV6Vg8qC+n4brksMQ8iqqSgCTPrbIk2CHo="; + batman-adv = "sha256-ZIfdO0rQ+FUQ3tu6M1/nexuHfQ53OTxR3coHp0Ubj0U="; }; } From a2d3b3dd86e61fb3125386a2ecf389f5029ef322 Mon Sep 17 00:00:00 2001 From: hulr <> Date: Wed, 8 Apr 2026 21:27:00 +0200 Subject: [PATCH 098/305] iwe: 0.0.64 -> 0.0.67 --- pkgs/by-name/iw/iwe/package.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/iw/iwe/package.nix b/pkgs/by-name/iw/iwe/package.nix index e72644f559ce..1f7627403802 100644 --- a/pkgs/by-name/iw/iwe/package.nix +++ b/pkgs/by-name/iw/iwe/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "iwe"; - version = "0.0.64"; + version = "0.0.67"; src = fetchFromGitHub { owner = "iwe-org"; repo = "iwe"; tag = "iwe-v${finalAttrs.version}"; - hash = "sha256-aqoUTatYUUFKw3ZQYagQ0KchQM3JMgSzL/hG6CiyG9U="; + hash = "sha256-/irCQgMDuO2boitdTyl4OlkMvuyFPfsTx8Jo/VhLYuw="; }; - cargoHash = "sha256-iTudRDC53wZvWwuPYGG3rQfsC/th+3FwpiqZsZnbekg="; + cargoHash = "sha256-oAIF+ekKzvfT7WzQ+PE4RWUUMMDkBOFBdgwUMXBZsFk="; cargoBuildFlags = [ "--package=iwe" @@ -28,14 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace crates/iwe/tests/common.rs --replace-fail \ 'binary_path.push("target");' \ 'binary_path.push("target/${stdenv.hostPlatform.rust.rustcTarget}");' - - # Tests here are looking for /usr to exist, which is not present in a build environment - substituteInPlace crates/iwes/tests/transform_test.rs --replace-fail \ - 'cwd: Some("/usr".to_string()),' \ - 'cwd: Some("/tmp".to_string()),' - substituteInPlace crates/iwes/tests/transform_test.rs --replace-fail \ - 'vec![uri(1).to_edit("/usr\n")]' \ - 'vec![uri(1).to_edit("/tmp\n")]' ''; nativeInstallCheckInputs = [ versionCheckHook ]; From b7dc96b5ea5ad8079e7c968016f6df9cc439605c Mon Sep 17 00:00:00 2001 From: Camilo Vera Date: Wed, 8 Apr 2026 15:32:12 -0400 Subject: [PATCH 099/305] gemini-cli: 0.36.0 -> 0.37.0 --- pkgs/by-name/ge/gemini-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 12339dc95457..c38404fc1986 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -15,18 +15,18 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-eSGznx64xN/2/TPkLTx57Ar56FogYSzUkINBduhMn/8="; + hash = "sha256-8UiHsBggmiJCs9sWGQoq0W2FNToAKFakGdAKvFl4ceo="; }; nodejs = nodejs_22; - npmDepsHash = "sha256-ztpKe7kgQAgfCBiIBlzPDa5muOI+9kESwrzBLqwz3V0="; + npmDepsHash = "sha256-lLywxLYmfO7EIYewPwISV5izAcOpy1350oJGwdsV6L8="; dontPatchElf = stdenv.isDarwin; From 12be73268caacd2e3bf9d7eac3ebcbba24cf604b Mon Sep 17 00:00:00 2001 From: Saad Nadeem Date: Wed, 8 Apr 2026 15:47:37 -0400 Subject: [PATCH 100/305] vimPlugins.nvim-jump: init at 0-unstable-2026-04-08 https://github.com/yorickpeterse/nvim-jump --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 17b58b91c787..3859c50b4e73 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11640,6 +11640,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + nvim-jump = buildVimPlugin { + pname = "nvim-jump"; + version = "0-unstable-2026-04-08"; + src = fetchFromGitHub { + owner = "yorickpeterse"; + repo = "nvim-jump"; + rev = "79c91e5860b856c66187107d8d3c8d0950261f2c"; + hash = "sha256-P6PU3nFc02i52mzJUDG136z1YD3DXU0UFqtunmgUhuc="; + }; + meta.homepage = "https://github.com/yorickpeterse/nvim-jump/"; + meta.hydraPlatforms = [ ]; + }; + nvim-k8s-crd = buildVimPlugin { pname = "nvim-k8s-crd"; version = "0-unstable-2026-02-16"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e9c859169953..417b027b2b73 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -894,6 +894,7 @@ https://github.com/nvim-java/nvim-java-refactor/,HEAD, https://github.com/nvim-java/nvim-java-test/,HEAD, https://codeberg.org/mfussenegger/nvim-jdtls/,, https://github.com/gennaro-tedesco/nvim-jqx/,, +https://github.com/yorickpeterse/nvim-jump/,HEAD, https://github.com/anasinnyk/nvim-k8s-crd/,HEAD, https://github.com/ethanholz/nvim-lastplace/,HEAD, https://github.com/kosayoda/nvim-lightbulb/,, From beae3c607d5c186de810128f9b2d3e4bd1c8336e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 20:12:37 +0000 Subject: [PATCH 101/305] route-graph: 0.2.2 -> 0.3.0 --- pkgs/by-name/ro/route-graph/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix index 94c0c0139b61..8402524ec9c0 100644 --- a/pkgs/by-name/ro/route-graph/package.nix +++ b/pkgs/by-name/ro/route-graph/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "route-graph"; - version = "0.2.2"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "route-graph"; tag = finalAttrs.version; - hash = "sha256-HmfmUeT5vt0yWVs7GhIPVt4NZtTfe7HYPLRqfQE/tZM="; + hash = "sha256-NxATrPx1JzEripu4x2UkFSAgrJUYQ7P7U2C6EmNuY5g="; }; pythonRelaxDeps = [ From aa4224fabd410924253c195ac3535f45237cc3cd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 8 Apr 2026 22:06:42 +0200 Subject: [PATCH 102/305] qdng: init at 1.0.0 --- pkgs/by-name/qd/qdng/package.nix | 60 ++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/qd/qdng/package.nix diff --git a/pkgs/by-name/qd/qdng/package.nix b/pkgs/by-name/qd/qdng/package.nix new file mode 100644 index 000000000000..d2267a71e623 --- /dev/null +++ b/pkgs/by-name/qd/qdng/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + bison, + flex, + gfortran, + blas, + bzip2, + fftw, + lapack, + libxml2, + protobuf_21, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qdng"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "quantum-dynamics-ng"; + repo = "QDng"; + tag = "v${finalAttrs.version}"; + hash = "sha256-T59Bb014KSUOOFTFjPOrWmbF6GqIqAIyrb3Xe5TwU88="; + }; + + configureFlags = [ + "--enable-openmp" + "--disable-gccopt" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoreconfHook + bison + flex + gfortran + ]; + + buildInputs = [ + blas + bzip2 + fftw + lapack + libxml2 + protobuf_21 + zlib + ]; + + meta = { + description = "Molecular wavepacket dynamics package"; + homepage = "https://github.com/quantum-dynamics-ng/QDng"; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.markuskowa ]; + license = lib.licenses.gpl3Only; + }; +}) From 1ed1f021f94fc552805300f10e716963fb3259d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 20:38:41 +0000 Subject: [PATCH 103/305] cue: 0.16.0 -> 0.16.1 --- pkgs/by-name/cu/cue/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index a45ceebe8179..d81886fcebcf 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "cue"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; tag = "v${finalAttrs.version}"; - hash = "sha256-dmoBux8yeyXa2bNL/qpQ0UDdXlAV8/aT1Xc4xnH0EFQ="; + hash = "sha256-mTj3XMWByNrKjm+/MOQGLyUKIv4JJ8i6Oaphbzls84U="; }; - vendorHash = "sha256-KPhwu4Z8PcXr74NEZ9+Uz7FHIMzcKqkd20FDFW+a2NA="; + vendorHash = "sha256-HXRrVPjPc10Q1MVr1d9vZBWgSVqNZ5J0UgvP/hTPfcg="; subPackages = [ "cmd/*" ]; From b6e7129fb218ccec8f2db9913eccb641e32d4357 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 20:47:22 +0000 Subject: [PATCH 104/305] stevenblack-blocklist: 3.16.72 -> 3.16.74 --- pkgs/by-name/st/stevenblack-blocklist/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index c719cc855d05..ed549f7a505e 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.72"; + version = "3.16.74"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-4jL8uNtLxjFObsp34uYAdPinNHZEcLk+wQ9Dg2wGxgk="; + hash = "sha256-nF+xeCM07xSLYud/bsptWe+mxs5BBMaVwzcVmb+bnUE="; }; outputs = [ From bf3a288bc46f9c72334b83f3df09b1aa8c420401 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 20:50:49 +0000 Subject: [PATCH 105/305] vscode-extensions.moshfeu.compare-folders: 0.28.0 -> 0.29.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6ef9add065ec..09c935c50d85 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3073,8 +3073,8 @@ let mktplcRef = { name = "compare-folders"; publisher = "moshfeu"; - version = "0.28.0"; - hash = "sha256-QoaZ/P2lIaJQjD9RF7+pUJkOneR9olCe6xuT/9vsiZ4="; + version = "0.29.0"; + hash = "sha256-oX4182qaoHbvZC9MdzzARBlW4MbtE7H0Fg687K5h2XQ="; }; meta = { From 344f554fab821a19f0014a8f263db235b5197533 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 20:54:59 +0000 Subject: [PATCH 106/305] buildah-unwrapped: 1.43.0 -> 1.43.1 --- pkgs/by-name/bu/buildah-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix index 20670b02fdaf..ff56773dbfbf 100644 --- a/pkgs/by-name/bu/buildah-unwrapped/package.nix +++ b/pkgs/by-name/bu/buildah-unwrapped/package.nix @@ -18,13 +18,13 @@ buildGoModule (finalAttrs: { pname = "buildah"; - version = "1.43.0"; + version = "1.43.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; tag = "v${finalAttrs.version}"; - hash = "sha256-SihJXPnUrOe4TxbbnQOhXoZlbQZfLy0YGMV32CtojV8="; + hash = "sha256-Xshe0EvsGhtP8ffoo6yV9iY9YZy1krJjnVUmYouSpAM="; }; outputs = [ From 82195b062b401acfb62f4e5af2c295c6741e98a3 Mon Sep 17 00:00:00 2001 From: Stephane Date: Wed, 8 Apr 2026 23:09:36 +0200 Subject: [PATCH 107/305] ollama: 0.20.3 -> 0.20.4 --- pkgs/by-name/ol/ollama/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 2a0d37e666e8..f5a8bb751000 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -94,7 +94,7 @@ let cudaToolkit = buildEnv { # ollama hardcodes the major version in the Makefile to support different variants. - # - https://github.com/ollama/ollama/blob/v0.20.3/CMakePresets.json#L21-L47 + # - https://github.com/ollama/ollama/blob/v0.20.4/CMakePresets.json#L21-L47 name = "cuda-merged-${cudaMajorVersion}"; paths = map lib.getLib cudaLibs ++ [ (lib.getOutput "static" cudaPackages.cuda_cudart) @@ -140,13 +140,13 @@ let in goBuild (finalAttrs: { pname = "ollama"; - version = "0.20.3"; + version = "0.20.4"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-o9iCqdOfNMxfIyThQAOSSQZE2ZyBuyJWFr6wqvQo1A0="; + hash = "sha256-8TbZvxxaUdROpe3gnBx0XzX62tbQ9QeJP3Yp7XXJoTQ="; }; vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos="; @@ -232,7 +232,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.3/docs/development.md#library-detection + # https://github.com/ollama/ollama/blob/v0.20.4/docs/development.md#library-detection postInstall = '' mkdir -p $out/lib cp -r build/lib/ollama $out/lib/ From e388cfc99770b00213a9b3bb8856f550a421db63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 21:34:06 +0000 Subject: [PATCH 108/305] aws-vault: 7.9.13 -> 7.9.14 --- pkgs/by-name/aw/aws-vault/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index f4c0c15461df..7c87f96c5354 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "aws-vault"; - version = "7.9.13"; + version = "7.9.14"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${finalAttrs.version}"; - hash = "sha256-O0O7sIx9h5DKrKdqi0ecNM6ImRmCsrUGnk94yn5SRYg="; + hash = "sha256-L3WJtS94EYgNqgwM2Gzayx89l2aKHkjaGNwOtfJMk3o="; }; proxyVendor = true; - vendorHash = "sha256-RcQQL+exDBQn5vo+9OT5ShD92WDDjfE+Seqmofiz7hs="; + vendorHash = "sha256-axxV3XCxZVY3UM0yzC2ziTO0cbwJiNnDkOKAQADKUKA="; nativeBuildInputs = [ installShellFiles From 9492ebdb8fb8b22783d080be3da6bfa8b247486e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 21:36:30 +0000 Subject: [PATCH 109/305] xremap: 0.14.19 -> 0.15.0 --- pkgs/by-name/xr/xremap/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix index 0df804557fb3..fef979ea4001 100644 --- a/pkgs/by-name/xr/xremap/package.nix +++ b/pkgs/by-name/xr/xremap/package.nix @@ -58,13 +58,13 @@ assert ( ); rustPlatform.buildRustPackage (finalAttrs: { pname = "xremap${variant.suffix or ""}"; - version = "0.14.19"; + version = "0.15.0"; src = fetchFromGitHub { owner = "xremap"; repo = "xremap"; tag = "v${finalAttrs.version}"; - hash = "sha256-t/eSUFYTZ41uJJLjmMOWiV9ffYJjDVw+fy0P3XnvJ40="; + hash = "sha256-8IryQGSAxIVQiGGiY3trDvvJ50c19LHP4KvIa3P0zII="; }; nativeBuildInputs = [ pkg-config ]; @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildNoDefaultFeatures = true; buildFeatures = variant.features; - cargoHash = "sha256-Ypujuqz8TNLNfNB1NizjZoOK2VL+a4MY7c/aGIcCjns="; + cargoHash = "sha256-5vDKb6S4G+oNm//WtGsr4kEthozoznzn2N8ajtiMIeY="; passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants; From d9aa992ed94fc520f2c4c2b7d152c47f0dcba442 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 8 Apr 2026 16:30:54 -0500 Subject: [PATCH 110/305] luaPackages: update on 2026-04-08 --- .../lua-modules/generated-packages.nix | 90 ++++++++++--------- pkgs/development/lua-modules/overrides.nix | 4 +- 2 files changed, 49 insertions(+), 45 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 280dd6587c92..f31caa40438d 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1008,15 +1008,15 @@ final: prev: { }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.2558-1"; + version = "0.0.2565-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.2558-1.rockspec"; - sha256 = "0s4vnm2wbwqf3z733n5h4g5y0p66ml2vgapnhailkq7f7c5gkbs0"; + url = "mirror://luarocks/fzf-lua-0.0.2565-1.rockspec"; + sha256 = "1ipcw3xx7ahspr57nn400v1zvdxqcf1685dh7dynsishw5y2fny1"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/3f194300c92e3ec2de8f9307d6a7ce988b7b6d0c.zip"; - sha256 = "0g0kn4ycc719h7fn91398mbxav36clf59ms7igghry59nva64hkr"; + url = "https://github.com/ibhagwan/fzf-lua/archive/9f0432fdd7825ab163520045831a40b6df82ea28.zip"; + sha256 = "0m416my25nc9crawfbhp4askng69xcnhvwwbsvkvakv2ak1i2bbh"; }; disabled = luaOlder "5.1"; @@ -1105,15 +1105,15 @@ final: prev: { }: buildLuarocksPackage { pname = "grug-far.nvim"; - version = "1.6.63-1"; + version = "1.6.65-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/grug-far.nvim-1.6.63-1.rockspec"; - sha256 = "14hmd8i604bfiv51fbpm4xw5f6b750bmxac4ghc5w36wdzg1cl7y"; + url = "mirror://luarocks/grug-far.nvim-1.6.65-1.rockspec"; + sha256 = "111gpirhbxha8ynih644vdw6qahqxfil19wvzbci9wc1s8d1097k"; }).outPath; src = fetchzip { - url = "https://github.com/MagicDuck/grug-far.nvim/archive/dc4684e163971bb1f5bfb93fbd4bb3e892bf9b15.zip"; - sha256 = "1225sn36wqy8bdlyhbhajivhjhp936kbq307d4p94lcagvrvf7vp"; + url = "https://github.com/MagicDuck/grug-far.nvim/archive/37d0eafc6a2dcf8641aa19fc2a8db5e391b7f16b.zip"; + sha256 = "0gk1fq4pyhzc1pd7dnzdvvzkszxih7shwk4fn2gfkhh7av9n0pac"; }; disabled = luaOlder "5.1"; @@ -1136,15 +1136,15 @@ final: prev: { }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "8.1.0-1"; + version = "8.1.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-8.1.0-1.rockspec"; - sha256 = "1khw7f1zllgx3l4ijmqv86cy3y6g12xrwy95q20a62mkzcck8rk4"; + url = "mirror://luarocks/haskell-tools.nvim-8.1.1-1.rockspec"; + sha256 = "06k911dmlfwf0nnswpi454xph96waymvqjywbqrs3k517p1ch2dw"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v8.1.0.zip"; - sha256 = "1x15z28ga130f59dvfb7mrmfz27rp2kd0l2n923s0qqmgqld26yb"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v8.1.1.zip"; + sha256 = "178a8qgrigcnf662xzbw7yzh400vyhl7xvacv4k1sy5rk7f236l3"; }; disabled = luaOlder "5.1"; @@ -1935,8 +1935,9 @@ final: prev: { meta = { homepage = "https://github.com/euclidianAce/ltreesitter"; - description = "Treesitter bindings to Lua"; license.fullName = "MIT"; + description = "Treesitter bindings to Lua"; + longDescription = "Standalone Lua bindings to the Treesitter api (with full type definitions for Teal)."; }; } ) { }; @@ -1964,8 +1965,9 @@ final: prev: { meta = { homepage = "https://github.com/FourierTransformer/ltreesitter-ts"; - description = "Treesitter parsing library bindings for Lua"; license.fullName = "MIT"; + description = "Treesitter parsing library bindings for Lua"; + longDescription = "This combines [ltreesitter](https://github.com/EuclidianAce/ltreesitter) and the [tree-sitter](https://github.com/tree-sitter/tree-sitter) library together to have an easy LuaRocks based install for tree sitter parsing. There are no other enhancements to either library. It can be imported as just `ltreesitter`."; }; } ) { }; @@ -3275,17 +3277,17 @@ final: prev: { }: buildLuarocksPackage { pname = "lualine.nvim"; - version = "scm-1"; + version = "scm-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lualine.nvim-scm-1.rockspec"; - sha256 = "01cqa4nvpq0z4230szwbcwqb0kd8cz2dycrd764r0z5c6vivgfzs"; + url = "mirror://luarocks/lualine.nvim-scm-2.rockspec"; + sha256 = "0lfwmiq9jcrxyhg6qk7l7znab356lwndrp52b9f3h86a48v5ywj0"; }).outPath; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "74114f0df664f14d7c228945693ba68a3b70a794"; - hash = "sha256-dgiB5nzjGfkv85qSx3oJPKv/9e7QCHa6aPRSuMLDByU="; + rev = "f5d2a8570f8b736ddb9bb4be504355bcd6e15ec8"; + hash = "sha256-woyw4T0rG5Q3ipbsvI0F094tzJ8bnOOlaCzsibi/AKw="; }; disabled = luaOlder "5.1"; @@ -3592,8 +3594,9 @@ final: prev: { meta = { homepage = "https://github.com/FourierTransformer/luarocks-build-tree-sitter-cli"; - description = "A LuaRocks build backend to install the tree-sitter CLI"; license.fullName = "MIT"; + description = "A LuaRocks build backend to install the tree-sitter CLI"; + longDescription = "luarocks-build-tree-sitter-cli is a LuaRocks build.type that allows installing tree-sitter CLI binaries via LuaRocks directly. It works similarly to the npm install option for tree-sitter, but uses LuaRocks instead."; }; } ) { }; @@ -3710,15 +3713,15 @@ final: prev: { }: buildLuarocksPackage { pname = "luasnip"; - version = "2.4.1-1"; + version = "2.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasnip-2.4.1-1.rockspec"; - sha256 = "03cl2qybqa06q41vxckamr46s7ij9igqz59ak0wshhzp7yysn2xr"; + url = "mirror://luarocks/luasnip-2.5.0-1.rockspec"; + sha256 = "1qgd4536yglz0v21bpia3q2xbjcakxh4jhphhficm7nqb82xfsap"; }).outPath; src = fetchzip { - url = "https://github.com/L3MON4D3/LuaSnip/archive/v2.4.1.zip"; - sha256 = "1vjn0fwxv89p4dxycwn5lf7c0fgspzymbjp76n27rqnkab6v1qzy"; + url = "https://github.com/L3MON4D3/LuaSnip/archive/v2.5.0.zip"; + sha256 = "16cirbi0zjg874858yqd36p3kbrmlpfii3bvx6lm9bpli7b4w9kn"; }; disabled = luaOlder "5.1"; @@ -4685,15 +4688,15 @@ final: prev: { }: buildLuarocksPackage { pname = "neorg-interim-ls"; - version = "2.1.1-1"; + version = "2.1.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/neorg-interim-ls-2.1.1-1.rockspec"; - sha256 = "0kx8ql89yadlhnw2jl7ck950vrzs0ihjm079mg0vlnklriw4zw5v"; + url = "mirror://luarocks/neorg-interim-ls-2.1.4-1.rockspec"; + sha256 = "16c6b4in826fnv2wgxl1b7qsxvj62qq2xjnbik7z0hiij2vwc52x"; }).outPath; src = fetchzip { - url = "https://github.com/benlubas/neorg-interim-ls/archive/v2.1.1.zip"; - sha256 = "1vszvmsy27n68ivi6bmk1hifi00dg33mc9iz66nv2gfmwcfwbsfz"; + url = "https://github.com/benlubas/neorg-interim-ls/archive/v2.1.4.zip"; + sha256 = "0fpzfjpamb4amlnqf89zy9hdg95qh0mzdfrzh7qw13yvh4273z27"; }; disabled = luaOlder "5.1"; @@ -5490,21 +5493,21 @@ final: prev: { }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "9.0.0-2"; + version = "9.0.1-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-9.0.0-2.rockspec"; - sha256 = "0amjbw96n9ijh1f1zd4m0nkpr6ngysb6bysfb6jzr2p48r2jkfws"; + url = "mirror://luarocks/rustaceanvim-9.0.1-2.rockspec"; + sha256 = "0r33jq01qyrspl2vsk0bv5bx32ycyyhkhylfs5xxrilgpzv0rh5h"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.0.zip"; - sha256 = "1g5lsy7wz7hd3jnx28vmy1nflvrzz7ibswzv9jglpm132m05x6q2"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.1.zip"; + sha256 = "1vzp5vf5wpkpsp40zwwkl9l29ifiap4h2hr8wxjhgznsjk3y8y5y"; }; disabled = lua.luaversion != "5.1"; meta = { - homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.0.zip"; + homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.1.zip"; maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "GPL-2.0-only"; description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim"; @@ -5877,8 +5880,8 @@ final: prev: { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "cfb85dcf7f822b79224e9e6aef9e8c794211b20b"; - hash = "sha256-QNBlbeVc7wl8j+K38xfC6ZT4XpGJzylQtateQiZxjBY="; + rev = "48d2656e54d3e3953ae647153ccdaffa50d4d76b"; + hash = "sha256-PtNTNzNk6V5SoxytHk6KYiY1LreMug7Qw3B7WtyHeHs="; }; disabled = lua.luaversion != "5.1"; @@ -6035,8 +6038,9 @@ final: prev: { meta = { homepage = "https://github.com/FourierTransformer/tree-sitter-cli"; - description = "Install tree-sitter CLI binaries"; license.fullName = "MIT"; + description = "Install tree-sitter CLI binaries"; + longDescription = "An option to install the tree-sitter CLI via LuaRocks"; }; } ) { }; @@ -6160,8 +6164,8 @@ final: prev: { meta = { homepage = "https://github.com/euclidianAce/tree-sitter-teal"; - description = "tree-sitter parser for teal"; license.fullName = "UNKNOWN"; + description = "tree-sitter parser for teal"; }; } ) { }; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index eed80766bf63..2c4cde548e79 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -255,8 +255,8 @@ in # Update dependency check to respect packaged version substituteInPlace lua/grug-far/test/dependencies.lua \ - --replace-fail "local RG_VERSION = '14.1.0'" "local RG_VERSION = '${lib.getVersion ripgrep}'" \ - --replace-fail "local SG_VERSION = '0.35.0'" "local SG_VERSION = '${lib.getVersion ast-grep}'" + --replace-fail "local RG_VERSION = '15.1.0'" "local RG_VERSION = '${lib.getVersion ripgrep}'" \ + --replace-fail "local SG_VERSION = '0.41.1'" "local SG_VERSION = '${lib.getVersion ast-grep}'" make test dir=base runHook postCheck From 69203d07d91cd8d5f29fa7ae824682b62c5efce1 Mon Sep 17 00:00:00 2001 From: Maroun Deeb Date: Wed, 8 Apr 2026 23:49:00 +0200 Subject: [PATCH 111/305] vimPlugins.codediff-nvim: fix library build on Darwin Upstream falls back to `brew --prefix libomp` on macOS when `find_package(OpenMP)` fails, which does not work in the Nix sandbox. Patch the CMake fallback to use `llvmPackages.openmp` instead. No extra `libomp.dylib` symlink is needed on Darwin, since the built library already references `libomp.dylib` from the Nix store. --- .../plugins/non-generated/codediff-nvim/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix index 1ee3a51bfa0e..0e900bd057dc 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix @@ -7,6 +7,7 @@ vimPlugins, autoPatchelfHook, stdenv, + llvmPackages, }: vimUtils.buildVimPlugin rec { pname = "codediff.nvim"; @@ -22,8 +23,16 @@ vimUtils.buildVimPlugin rec { dependencies = [ vimPlugins.nui-nvim ]; nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; dontUseCmakeConfigure = true; + + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace libvscode-diff/CMakeLists.txt \ + --replace-fail 'COMMAND brew --prefix libomp' 'COMMAND echo ${llvmPackages.openmp}' + ''; + buildPhase = '' runHook preBuild make From bcee6b0fafa8232e49ac21dbabd127d634059295 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 8 Apr 2026 18:46:59 -0400 Subject: [PATCH 112/305] matrix-authentication-service: 1.14.0 -> 1.15.0 Diff: https://github.com/element-hq/matrix-authentication-service/compare/v1.14.0...v1.15.0 Changelog: https://github.com/element-hq/matrix-authentication-service/releases/tag/v1.15.0 --- pkgs/by-name/ma/matrix-authentication-service/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index e17d8e6bbba1..6a6a22e82b9e 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -18,21 +18,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-authentication-service"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-/13RYd5p46eM2rX5y9bPzHB63zCeZ2NbLDqTnk3+Vn8="; + hash = "sha256-q3MtMRdvuL0olnqvqK8uWeFCT7UpKjZN4zz9ZFlyGd4="; }; - cargoHash = "sha256-eNmD/O7t2YykGlVqovBxi/DKPQ2W2mxxCOaMBzqhTZo="; + cargoHash = "sha256-FV4ZKR6lq8b5PMj+mZ+/RBWLmoGc6WuAXw00+PGJUi8="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; src = "${finalAttrs.src}/${finalAttrs.npmRoot}"; - hash = "sha256-lWFJEjTVHMkmFnfjjIDtE/T3nw4qF3IJhUayfFVLPQo="; + hash = "sha256-OA7T8dTWEb8QiiRBx1A/R8H2Bu/xv3RFr8K9IVU3674="; }; npmRoot = "frontend"; From 43ec484cac55a60dc938a390b3f1298dcd2331e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 22:49:08 +0000 Subject: [PATCH 113/305] python3Packages.llama-index-cli: 0.5.6 -> 0.5.7 --- pkgs/development/python-modules/llama-index-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index c0f0ad00bfcb..b8477e7a735b 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -10,13 +10,13 @@ buildPythonPackage (finalAttrs: { pname = "llama-index-cli"; - version = "0.5.6"; + version = "0.5.7"; pyproject = true; src = fetchPypi { pname = "llama_index_cli"; inherit (finalAttrs) version; - hash = "sha256-ThTQcv6/Ym0F+CHQSoWN6N2cx8mDdmWKCrmEifWmvPc="; + hash = "sha256-n80Z69VhWsaQ0cK+RzOqRhBlBGQsF7CcaSh0CDezkZk="; }; build-system = [ hatchling ]; From 1c8f2099d88650d5c322acc1972dc946d836f513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 9 Apr 2026 01:04:26 +0200 Subject: [PATCH 114/305] uim: remove null from inputs Those packages are never undefined and if they would, that would be a bug, hence we can remove that outdated pattern. --- pkgs/by-name/ui/uim/package.nix | 36 ++++++++++----------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ui/uim/package.nix b/pkgs/by-name/ui/uim/package.nix index 36e96c610829..897ae44d915e 100644 --- a/pkgs/by-name/ui/uim/package.nix +++ b/pkgs/by-name/ui/uim/package.nix @@ -16,46 +16,32 @@ m17n_db, expat, withAnthy ? true, - anthy ? null, + anthy, withGtk ? true, withGtk2 ? withGtk, - gtk2 ? null, + gtk2, withGtk3 ? withGtk, - gtk3 ? null, + gtk3, # Was never enabled in the history of this package and is not needed by any # dependent package, hence disabled to save up closure size. withQt ? false, withQt5 ? withQt, - qt5 ? null, + qt5, withLibnotify ? true, - libnotify ? null, + libnotify, withSqlite ? true, - sqlite ? null, + sqlite, withNetworking ? true, - curl ? null, - openssl ? null, + curl, + openssl, withFFI ? true, - libffi ? null, + libffi, # Things that are clearly an overkill to be enabled by default withMisc ? false, - libeb ? null, + libeb, }: -let - automake = automake116x; -in - -assert withGtk2 -> gtk2 != null; -assert withGtk3 -> gtk3 != null; - -assert withAnthy -> anthy != null; -assert withLibnotify -> libnotify != null; -assert withSqlite -> sqlite != null; -assert withNetworking -> curl != null && openssl != null; -assert withFFI -> libffi != null; -assert withMisc -> libeb != null; - stdenv.mkDerivation (finalAttrs: { version = "1.9.6"; pname = "uim"; @@ -70,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoconf - automake + automake116x intltool libtool pkg-config From cc1fe3e1247c49831976f78ed9214b43b45276a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 00:51:59 +0200 Subject: [PATCH 115/305] cups-printers: 1.0.0 -> 1.1.0 Changelog: https://github.com/audiusGmbH/cups-printers/blob/1.1.0/CHANGELOG.md --- pkgs/by-name/cu/cups-printers/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix index ac1c4c16a285..faa88bd80f28 100644 --- a/pkgs/by-name/cu/cups-printers/package.nix +++ b/pkgs/by-name/cu/cups-printers/package.nix @@ -6,17 +6,18 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "cups-printers"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "cups-printers"; tag = finalAttrs.version; - hash = "sha256-HTR9t9ElQmCzJfdWyu+JQ8xBfDNpXl8XtNsJxGSfBXk="; + hash = "sha256-Fne7V9dEZwdV6OsQPg2gzrz/wloAOOuwlx3CqXOyWBc="; }; pythonRelaxDeps = [ + "rich" "typer" "validators" ]; @@ -25,6 +26,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { dependencies = with python3.pkgs; [ pycups + rich typer validators ]; @@ -37,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { meta = { description = "Tool for interacting with a CUPS server"; homepage = "https://github.com/audiusGmbH/cups-printers"; - changelog = "https://github.com/audiusGmbH/cups-printers/blob/${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/audiusGmbH/cups-printers/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "cups-printers"; From 7b1085d1cc4f2306b3d5bd27b17077f5ccc5cfab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 00:58:52 +0200 Subject: [PATCH 116/305] cups-printers: update meta --- pkgs/by-name/cu/cups-printers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix index faa88bd80f28..7378b14fe30b 100644 --- a/pkgs/by-name/cu/cups-printers/package.nix +++ b/pkgs/by-name/cu/cups-printers/package.nix @@ -38,8 +38,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: { meta = { description = "Tool for interacting with a CUPS server"; - homepage = "https://github.com/audiusGmbH/cups-printers"; - changelog = "https://github.com/audiusGmbH/cups-printers/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + homepage = "https://github.com/audius/cups-printers"; + changelog = "https://github.com/audius/cups-printers/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "cups-printers"; From 05889e872510746343c47c333f661b87abba3a8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 23:17:55 +0000 Subject: [PATCH 117/305] python3Packages.cyvest: 5.4.0 -> 5.4.1 --- pkgs/development/python-modules/cyvest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyvest/default.nix b/pkgs/development/python-modules/cyvest/default.nix index fd739f0700cc..148ee24377fc 100644 --- a/pkgs/development/python-modules/cyvest/default.nix +++ b/pkgs/development/python-modules/cyvest/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "cyvest"; - version = "5.4.0"; + version = "5.4.1"; pyproject = true; src = fetchFromGitHub { owner = "PakitoSec"; repo = "cyvest"; tag = "v${finalAttrs.version}"; - hash = "sha256-ap4QsUw+WX6bFF4ggbt9h2U7qXUgYRi8XNB1k17vJsM="; + hash = "sha256-FEi/0pWUHFE1ZwDtKt6u2MPFAUeiOqA8LYfoqDu3vzI="; }; postPatch = '' From e7376e4d450a3fa5761ad3ec01284aaa3911f20a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 23:27:10 +0000 Subject: [PATCH 118/305] nwg-hello: 0.4.3 -> 0.4.4 --- pkgs/by-name/nw/nwg-hello/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nw/nwg-hello/package.nix b/pkgs/by-name/nw/nwg-hello/package.nix index e46f0e395f24..1efe5ebc1d24 100644 --- a/pkgs/by-name/nw/nwg-hello/package.nix +++ b/pkgs/by-name/nw/nwg-hello/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "nwg-hello"; - version = "0.4.3"; + version = "0.4.4"; pyproject = true; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-hello"; tag = "v${finalAttrs.version}"; - hash = "sha256-sWp9fSCPb2MrHdvTBnmsvf3idrRPcqmBFsFbRXGjFB0="; + hash = "sha256-XJVUEuSu24NozFjted4pujo4A83cpF7KmfDSpc8/JzY="; }; nativeBuildInputs = [ From c3b1b2995fa681f3e01ed001a6ebc12dc88cf30a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 23:33:17 +0000 Subject: [PATCH 119/305] python3Packages.google-cloud-texttospeech: 2.35.0 -> 2.36.0 --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index af0a3d19880f..b964bf2e0e45 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -13,13 +13,13 @@ buildPythonPackage (finalAttrs: { pname = "google-cloud-texttospeech"; - version = "2.35.0"; + version = "2.36.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_texttospeech"; inherit (finalAttrs) version; - hash = "sha256-tipe7KQQvKqwNlMorvuLoSBuQnYK5AjAQgobfa7ttbo="; + hash = "sha256-bGBa9+R3TBusmfyq9FOPFSsQu6dziiP0IYRVf0RNxrc="; }; build-system = [ setuptools ]; From bdd981fa1c433e8dc848623341feb1dd9696b8f5 Mon Sep 17 00:00:00 2001 From: qzylinra Date: Thu, 9 Apr 2026 07:47:57 +0800 Subject: [PATCH 120/305] chatmcp: drop --- pkgs/by-name/ch/chatmcp/package.nix | 70 - pkgs/by-name/ch/chatmcp/pubspec.lock.json | 2038 --------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 2108 deletions(-) delete mode 100644 pkgs/by-name/ch/chatmcp/package.nix delete mode 100644 pkgs/by-name/ch/chatmcp/pubspec.lock.json diff --git a/pkgs/by-name/ch/chatmcp/package.nix b/pkgs/by-name/ch/chatmcp/package.nix deleted file mode 100644 index 4fa6fcaa8305..000000000000 --- a/pkgs/by-name/ch/chatmcp/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - flutter332, - fetchFromGitHub, - autoPatchelfHook, - copyDesktopItems, - makeDesktopItem, - runCommand, - yq, - chatmcp, - _experimental-update-script-combinators, - gitUpdater, -}: - -flutter332.buildFlutterApplication rec { - pname = "chatmcp"; - version = "0.0.76"; - - src = fetchFromGitHub { - owner = "daodao97"; - repo = "chatmcp"; - tag = "v${version}"; - hash = "sha256-MU2AFiIvc3Y27/nX/OqYs/VKkw50cqznMY2zUdys8ts="; - }; - - pubspecLock = lib.importJSON ./pubspec.lock.json; - - nativeBuildInputs = [ - copyDesktopItems - autoPatchelfHook - ]; - - desktopItems = [ - (makeDesktopItem { - name = "chatmcp"; - exec = "chatmcp %U"; - icon = "chatmcp"; - desktopName = "ChatMCP"; - }) - ]; - - postInstall = '' - install -Dm0644 assets/logo.png $out/share/icons/hicolor/1024x1024/apps/chatmcp.png - ''; - - passthru = { - pubspecSource = - runCommand "pubspec.lock.json" - { - nativeBuildInputs = [ yq ]; - inherit (chatmcp) src; - } - '' - cat $src/pubspec.lock | yq > $out - ''; - updateScript = _experimental-update-script-combinators.sequence [ - (gitUpdater { rev-prefix = "v"; }) - (_experimental-update-script-combinators.copyAttrOutputToFile "chatmcp.pubspecSource" ./pubspec.lock.json) - ]; - }; - - meta = { - description = "AI chat client implementing the Model Context Protocol"; - homepage = "https://github.com/daodao97/chatmcp"; - mainProgram = "chatmcp"; - license = lib.licenses.asl20; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/by-name/ch/chatmcp/pubspec.lock.json b/pkgs/by-name/ch/chatmcp/pubspec.lock.json deleted file mode 100644 index cedc49980d56..000000000000 --- a/pkgs/by-name/ch/chatmcp/pubspec.lock.json +++ /dev/null @@ -1,2038 +0,0 @@ -{ - "packages": { - "_fe_analyzer_shared": { - "dependency": "transitive", - "description": { - "name": "_fe_analyzer_shared", - "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "85.0.0" - }, - "analyzer": { - "dependency": "transitive", - "description": { - "name": "analyzer", - "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.7.1" - }, - "archive": { - "dependency": "transitive", - "description": { - "name": "archive", - "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.7" - }, - "args": { - "dependency": "transitive", - "description": { - "name": "args", - "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.7.0" - }, - "async": { - "dependency": "transitive", - "description": { - "name": "async", - "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.13.0" - }, - "boolean_selector": { - "dependency": "transitive", - "description": { - "name": "boolean_selector", - "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "bot_toast": { - "dependency": "direct main", - "description": { - "name": "bot_toast", - "sha256": "6b93030a99a98335b8827ecd83021e92e885ffc61d261d3825ffdecdd17f3bdf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.3" - }, - "build": { - "dependency": "transitive", - "description": { - "name": "build", - "sha256": "7d95cbbb1526ab5ae977df9b4cc660963b9b27f6d1075c0b34653868911385e4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "build_config": { - "dependency": "transitive", - "description": { - "name": "build_config", - "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "build_daemon": { - "dependency": "transitive", - "description": { - "name": "build_daemon", - "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.4" - }, - "build_resolvers": { - "dependency": "transitive", - "description": { - "name": "build_resolvers", - "sha256": "38c9c339333a09b090a638849a4c56e70a404c6bdd3b511493addfbc113b60c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "build_runner": { - "dependency": "direct dev", - "description": { - "name": "build_runner", - "sha256": "b971d4a1c789eba7be3e6fe6ce5e5b50fd3719e3cb485b3fad6d04358304351d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.6.0" - }, - "build_runner_core": { - "dependency": "transitive", - "description": { - "name": "build_runner_core", - "sha256": "c04e612ca801cd0928ccdb891c263a2b1391cb27940a5ea5afcf9ba894de5d62", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "9.2.0" - }, - "built_collection": { - "dependency": "transitive", - "description": { - "name": "built_collection", - "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "built_value": { - "dependency": "transitive", - "description": { - "name": "built_value", - "sha256": "ba95c961bafcd8686d1cf63be864eb59447e795e124d98d6a27d91fcd13602fb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.11.1" - }, - "cached_network_image": { - "dependency": "direct main", - "description": { - "name": "cached_network_image", - "sha256": "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.4.1" - }, - "cached_network_image_platform_interface": { - "dependency": "transitive", - "description": { - "name": "cached_network_image_platform_interface", - "sha256": "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.1" - }, - "cached_network_image_web": { - "dependency": "transitive", - "description": { - "name": "cached_network_image_web", - "sha256": "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.1" - }, - "characters": { - "dependency": "transitive", - "description": { - "name": "characters", - "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.0" - }, - "checked_yaml": { - "dependency": "transitive", - "description": { - "name": "checked_yaml", - "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.4" - }, - "cli_config": { - "dependency": "transitive", - "description": { - "name": "cli_config", - "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "cli_util": { - "dependency": "transitive", - "description": { - "name": "cli_util", - "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.2" - }, - "clock": { - "dependency": "transitive", - "description": { - "name": "clock", - "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "code_builder": { - "dependency": "transitive", - "description": { - "name": "code_builder", - "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.10.1" - }, - "collection": { - "dependency": "transitive", - "description": { - "name": "collection", - "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.19.1" - }, - "convert": { - "dependency": "transitive", - "description": { - "name": "convert", - "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, - "coverage": { - "dependency": "transitive", - "description": { - "name": "coverage", - "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.15.0" - }, - "cross_file": { - "dependency": "transitive", - "description": { - "name": "cross_file", - "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.4+2" - }, - "crypto": { - "dependency": "direct main", - "description": { - "name": "crypto", - "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.6" - }, - "csslib": { - "dependency": "transitive", - "description": { - "name": "csslib", - "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.2" - }, - "cupertino_icons": { - "dependency": "direct main", - "description": { - "name": "cupertino_icons", - "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.8" - }, - "dart_style": { - "dependency": "transitive", - "description": { - "name": "dart_style", - "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" - }, - "dbus": { - "dependency": "transitive", - "description": { - "name": "dbus", - "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.11" - }, - "dev_build": { - "dependency": "transitive", - "description": { - "name": "dev_build", - "sha256": "fda8a54458b2a873a84e0cd1513f4323a1fb0599ed5455245359bc0398bad9ee", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2+11" - }, - "dio": { - "dependency": "direct main", - "description": { - "name": "dio", - "sha256": "d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.9.0" - }, - "dio_web_adapter": { - "dependency": "transitive", - "description": { - "name": "dio_web_adapter", - "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "event_bus": { - "dependency": "direct main", - "description": { - "name": "event_bus", - "sha256": "1a55e97923769c286d295240048fc180e7b0768902c3c2e869fe059aafa15304", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.1" - }, - "eventflux": { - "dependency": "direct main", - "description": { - "name": "eventflux", - "sha256": "f6da4534c84b11531ae84546fbd0202b743ca7ef6bc92c84c0f50d7a1c487a12", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.1" - }, - "fake_async": { - "dependency": "transitive", - "description": { - "name": "fake_async", - "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.3" - }, - "ffi": { - "dependency": "transitive", - "description": { - "name": "ffi", - "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "file": { - "dependency": "transitive", - "description": { - "name": "file", - "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.1" - }, - "file_picker": { - "dependency": "direct main", - "description": { - "name": "file_picker", - "sha256": "97a943524074a1e8e858aa154d09e38a4168a9ad765d6cac66606fd906b86875", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "10.2.2" - }, - "fixnum": { - "dependency": "transitive", - "description": { - "name": "fixnum", - "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "flutter": { - "dependency": "direct main", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" - }, - "flutter_cache_manager": { - "dependency": "direct main", - "description": { - "name": "flutter_cache_manager", - "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.4.1" - }, - "flutter_client_sse": { - "dependency": "direct main", - "description": { - "name": "flutter_client_sse", - "sha256": "4ce0297206473dfc064b255fe086713240002e149f52519bd48c21423e4aa5d2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "flutter_form_builder": { - "dependency": "direct main", - "description": { - "name": "flutter_form_builder", - "sha256": "db01493da4ef0f9ca1b2367fd1653569e933052eb06d6fbd944be97c76764fb8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "10.1.0" - }, - "flutter_highlight": { - "dependency": "direct main", - "description": { - "name": "flutter_highlight", - "sha256": "7b96333867aa07e122e245c033b8ad622e4e3a42a1a2372cbb098a2541d8782c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.0" - }, - "flutter_inappwebview": { - "dependency": "direct main", - "description": { - "name": "flutter_inappwebview", - "sha256": "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.5" - }, - "flutter_inappwebview_android": { - "dependency": "transitive", - "description": { - "name": "flutter_inappwebview_android", - "sha256": "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.3" - }, - "flutter_inappwebview_internal_annotations": { - "dependency": "transitive", - "description": { - "name": "flutter_inappwebview_internal_annotations", - "sha256": "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "flutter_inappwebview_ios": { - "dependency": "transitive", - "description": { - "name": "flutter_inappwebview_ios", - "sha256": "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "flutter_inappwebview_macos": { - "dependency": "transitive", - "description": { - "name": "flutter_inappwebview_macos", - "sha256": "c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "flutter_inappwebview_platform_interface": { - "dependency": "transitive", - "description": { - "name": "flutter_inappwebview_platform_interface", - "sha256": "cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.0+1" - }, - "flutter_inappwebview_web": { - "dependency": "transitive", - "description": { - "name": "flutter_inappwebview_web", - "sha256": "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "flutter_inappwebview_windows": { - "dependency": "transitive", - "description": { - "name": "flutter_inappwebview_windows", - "sha256": "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.0" - }, - "flutter_keyboard_visibility": { - "dependency": "direct main", - "description": { - "name": "flutter_keyboard_visibility", - "sha256": "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.0" - }, - "flutter_keyboard_visibility_linux": { - "dependency": "transitive", - "description": { - "name": "flutter_keyboard_visibility_linux", - "sha256": "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "flutter_keyboard_visibility_macos": { - "dependency": "transitive", - "description": { - "name": "flutter_keyboard_visibility_macos", - "sha256": "c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "flutter_keyboard_visibility_platform_interface": { - "dependency": "transitive", - "description": { - "name": "flutter_keyboard_visibility_platform_interface", - "sha256": "e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "flutter_keyboard_visibility_web": { - "dependency": "transitive", - "description": { - "name": "flutter_keyboard_visibility_web", - "sha256": "d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "flutter_keyboard_visibility_windows": { - "dependency": "transitive", - "description": { - "name": "flutter_keyboard_visibility_windows", - "sha256": "fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "flutter_launcher_icons": { - "dependency": "direct dev", - "description": { - "name": "flutter_launcher_icons", - "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7", - "url": "https://pub.dev" - }, - "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_localizations": { - "dependency": "direct main", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" - }, - "flutter_math_fork": { - "dependency": "direct main", - "description": { - "name": "flutter_math_fork", - "sha256": "6d5f2f1aa57ae539ffb0a04bb39d2da67af74601d685a161aff7ce5bda5fa407", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.4" - }, - "flutter_plugin_android_lifecycle": { - "dependency": "transitive", - "description": { - "name": "flutter_plugin_android_lifecycle", - "sha256": "6382ce712ff69b0f719640ce957559dde459e55ecd433c767e06d139ddf16cab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.29" - }, - "flutter_popup": { - "dependency": "direct main", - "description": { - "name": "flutter_popup", - "sha256": "08e554be1173f4e7bb5eda2ae2e5addd565873026a3ac9b64c38ea86dfd4dc9d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.3.9" - }, - "flutter_svg": { - "dependency": "direct main", - "description": { - "name": "flutter_svg", - "sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - }, - "flutter_switch": { - "dependency": "direct main", - "description": { - "name": "flutter_switch", - "sha256": "b91477f926bba135d2d203d7b24367492662d8d9c3aa6adb960b14c1087d3c41", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.2" - }, - "flutter_test": { - "dependency": "direct dev", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" - }, - "flutter_web_plugins": { - "dependency": "transitive", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" - }, - "frontend_server_client": { - "dependency": "transitive", - "description": { - "name": "frontend_server_client", - "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.0" - }, - "glob": { - "dependency": "transitive", - "description": { - "name": "glob", - "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.3" - }, - "graphs": { - "dependency": "transitive", - "description": { - "name": "graphs", - "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.2" - }, - "highlight": { - "dependency": "transitive", - "description": { - "name": "highlight", - "sha256": "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.0" - }, - "html": { - "dependency": "transitive", - "description": { - "name": "html", - "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.15.6" - }, - "html2md": { - "dependency": "direct main", - "description": { - "name": "html2md", - "sha256": "465cf8ffa1b510fe0e97941579bf5b22e2d575f2cecb500a9c0254efe33a8036", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.2" - }, - "http": { - "dependency": "direct main", - "description": { - "name": "http", - "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.0" - }, - "http_methods": { - "dependency": "transitive", - "description": { - "name": "http_methods", - "sha256": "6bccce8f1ec7b5d701e7921dca35e202d425b57e317ba1a37f2638590e29e566", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "http_multi_server": { - "dependency": "transitive", - "description": { - "name": "http_multi_server", - "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.2" - }, - "http_parser": { - "dependency": "transitive", - "description": { - "name": "http_parser", - "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.2" - }, - "image": { - "dependency": "transitive", - "description": { - "name": "image", - "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.5.4" - }, - "intl": { - "dependency": "direct main", - "description": { - "name": "intl", - "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.20.2" - }, - "io": { - "dependency": "transitive", - "description": { - "name": "io", - "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.5" - }, - "js": { - "dependency": "transitive", - "description": { - "name": "js", - "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.2" - }, - "json_annotation": { - "dependency": "transitive", - "description": { - "name": "json_annotation", - "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.9.0" - }, - "json_serializable": { - "dependency": "direct main", - "description": { - "name": "json_serializable", - "sha256": "ce2cf974ccdee13be2a510832d7fba0b94b364e0b0395dee42abaa51b855be27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.10.0" - }, - "keyboard_dismisser": { - "dependency": "direct main", - "description": { - "name": "keyboard_dismisser", - "sha256": "f67e032581fc3dd1f77e1cb54c421b089e015d122aeba2490ba001cfcc42a181", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "leak_tracker": { - "dependency": "transitive", - "description": { - "name": "leak_tracker", - "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "10.0.9" - }, - "leak_tracker_flutter_testing": { - "dependency": "transitive", - "description": { - "name": "leak_tracker_flutter_testing", - "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.9" - }, - "leak_tracker_testing": { - "dependency": "transitive", - "description": { - "name": "leak_tracker_testing", - "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.1" - }, - "lints": { - "dependency": "transitive", - "description": { - "name": "lints", - "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.0" - }, - "logging": { - "dependency": "direct main", - "description": { - "name": "logging", - "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.0" - }, - "markdown": { - "dependency": "direct main", - "description": { - "name": "markdown", - "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.3.0" - }, - "markdown_widget": { - "dependency": "direct main", - "description": { - "name": "markdown_widget", - "sha256": "b52c13d3ee4d0e60c812e15b0593f142a3b8a2003cde1babb271d001a1dbdc1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.2+8" - }, - "matcher": { - "dependency": "transitive", - "description": { - "name": "matcher", - "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.17" - }, - "material_color_utilities": { - "dependency": "transitive", - "description": { - "name": "material_color_utilities", - "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.11.1" - }, - "meta": { - "dependency": "transitive", - "description": { - "name": "meta", - "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.16.0" - }, - "mime": { - "dependency": "direct main", - "description": { - "name": "mime", - "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "mobile_scanner": { - "dependency": "direct main", - "description": { - "name": "mobile_scanner", - "sha256": "54005bdea7052d792d35b4fef0f84ec5ddc3a844b250ecd48dc192fb9b4ebc95", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.1" - }, - "mockito": { - "dependency": "direct dev", - "description": { - "name": "mockito", - "sha256": "2314cbe9165bcd16106513df9cf3c3224713087f09723b128928dc11a4379f99", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.5.0" - }, - "nested": { - "dependency": "transitive", - "description": { - "name": "nested", - "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "network_info_plus": { - "dependency": "direct main", - "description": { - "name": "network_info_plus", - "sha256": "5bd4b86e28fed5ed4e6ac7764133c031dfb7d3f46aa2a81b46f55038aa78ecc0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.0.3" - }, - "network_info_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "network_info_plus_platform_interface", - "sha256": "7e7496a8a9d8136859b8881affc613c4a21304afeb6c324bcefc4bd0aff6b94b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "nm": { - "dependency": "transitive", - "description": { - "name": "nm", - "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.0" - }, - "node_preamble": { - "dependency": "transitive", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "octo_image": { - "dependency": "transitive", - "description": { - "name": "octo_image", - "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "package_config": { - "dependency": "transitive", - "description": { - "name": "package_config", - "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - }, - "package_info_plus": { - "dependency": "direct main", - "description": { - "name": "package_info_plus", - "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.3.0" - }, - "package_info_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "package_info_plus_platform_interface", - "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.0" - }, - "path": { - "dependency": "direct main", - "description": { - "name": "path", - "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.9.1" - }, - "path_parsing": { - "dependency": "transitive", - "description": { - "name": "path_parsing", - "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "path_provider": { - "dependency": "direct main", - "description": { - "name": "path_provider", - "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.5" - }, - "path_provider_android": { - "dependency": "transitive", - "description": { - "name": "path_provider_android", - "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.17" - }, - "path_provider_foundation": { - "dependency": "transitive", - "description": { - "name": "path_provider_foundation", - "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "path_provider_linux": { - "dependency": "transitive", - "description": { - "name": "path_provider_linux", - "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.1" - }, - "path_provider_platform_interface": { - "dependency": "transitive", - "description": { - "name": "path_provider_platform_interface", - "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "path_provider_windows": { - "dependency": "transitive", - "description": { - "name": "path_provider_windows", - "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.0" - }, - "petitparser": { - "dependency": "transitive", - "description": { - "name": "petitparser", - "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.0" - }, - "platform": { - "dependency": "transitive", - "description": { - "name": "platform", - "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.6" - }, - "plugin_platform_interface": { - "dependency": "transitive", - "description": { - "name": "plugin_platform_interface", - "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.8" - }, - "pool": { - "dependency": "transitive", - "description": { - "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.1" - }, - "posix": { - "dependency": "transitive", - "description": { - "name": "posix", - "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.3" - }, - "process_run": { - "dependency": "transitive", - "description": { - "name": "process_run", - "sha256": "6ec839cdd3e6de4685318e7686cd4abb523c3d3a55af0e8d32a12ae19bc66622", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.4" - }, - "provider": { - "dependency": "direct main", - "description": { - "name": "provider", - "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.5" - }, - "pub_semver": { - "dependency": "transitive", - "description": { - "name": "pub_semver", - "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - }, - "pubspec_parse": { - "dependency": "transitive", - "description": { - "name": "pubspec_parse", - "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.0" - }, - "qr": { - "dependency": "transitive", - "description": { - "name": "qr", - "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "qr_flutter": { - "dependency": "direct main", - "description": { - "name": "qr_flutter", - "sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.0" - }, - "rxdart": { - "dependency": "transitive", - "description": { - "name": "rxdart", - "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.28.0" - }, - "screen_retriever": { - "dependency": "transitive", - "description": { - "name": "screen_retriever", - "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "screen_retriever_linux": { - "dependency": "transitive", - "description": { - "name": "screen_retriever_linux", - "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "screen_retriever_macos": { - "dependency": "transitive", - "description": { - "name": "screen_retriever_macos", - "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "screen_retriever_platform_interface": { - "dependency": "transitive", - "description": { - "name": "screen_retriever_platform_interface", - "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "screen_retriever_windows": { - "dependency": "transitive", - "description": { - "name": "screen_retriever_windows", - "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "screenshot": { - "dependency": "direct main", - "description": { - "name": "screenshot", - "sha256": "63817697a7835e6ce82add4228e15d233b74d42975c143ad8cfe07009fab866b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "scroll_to_index": { - "dependency": "transitive", - "description": { - "name": "scroll_to_index", - "sha256": "b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.1" - }, - "share_plus": { - "dependency": "direct main", - "description": { - "name": "share_plus", - "sha256": "b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "11.0.0" - }, - "share_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "share_plus_platform_interface", - "sha256": "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.0" - }, - "shared_preferences": { - "dependency": "direct main", - "description": { - "name": "shared_preferences", - "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.3" - }, - "shared_preferences_android": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_android", - "sha256": "5bcf0772a761b04f8c6bf814721713de6f3e5d9d89caf8d3fe031b02a342379e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.11" - }, - "shared_preferences_foundation": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_foundation", - "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.4" - }, - "shared_preferences_linux": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_linux", - "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "shared_preferences_platform_interface": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_platform_interface", - "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "shared_preferences_web": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_web", - "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.3" - }, - "shared_preferences_windows": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_windows", - "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "shelf": { - "dependency": "direct main", - "description": { - "name": "shelf", - "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.2" - }, - "shelf_cors_headers": { - "dependency": "direct main", - "description": { - "name": "shelf_cors_headers", - "sha256": "a127c80f99bbef3474293db67a7608e3a0f1f0fcdb171dad77fa9bd2cd123ae4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.5" - }, - "shelf_packages_handler": { - "dependency": "transitive", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_router": { - "dependency": "direct main", - "description": { - "name": "shelf_router", - "sha256": "f5e5d492440a7fb165fe1e2e1a623f31f734d3370900070b2b1e0d0428d59864", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.4" - }, - "shelf_static": { - "dependency": "transitive", - "description": { - "name": "shelf_static", - "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.3" - }, - "shelf_web_socket": { - "dependency": "transitive", - "description": { - "name": "shelf_web_socket", - "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "sky_engine": { - "dependency": "transitive", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" - }, - "source_gen": { - "dependency": "transitive", - "description": { - "name": "source_gen", - "sha256": "fc787b1f89ceac9580c3616f899c9a447413cbdac1df071302127764c023a134", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "source_helper": { - "dependency": "transitive", - "description": { - "name": "source_helper", - "sha256": "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.6" - }, - "source_map_stack_trace": { - "dependency": "transitive", - "description": { - "name": "source_map_stack_trace", - "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "source_maps": { - "dependency": "transitive", - "description": { - "name": "source_maps", - "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.13" - }, - "source_span": { - "dependency": "transitive", - "description": { - "name": "source_span", - "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.1" - }, - "sprintf": { - "dependency": "transitive", - "description": { - "name": "sprintf", - "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, - "sqflite": { - "dependency": "direct main", - "description": { - "name": "sqflite", - "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2" - }, - "sqflite_android": { - "dependency": "transitive", - "description": { - "name": "sqflite_android", - "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "sqflite_common": { - "dependency": "transitive", - "description": { - "name": "sqflite_common", - "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.6" - }, - "sqflite_common_ffi": { - "dependency": "direct main", - "description": { - "name": "sqflite_common_ffi", - "sha256": "9faa2fedc5385ef238ce772589f7718c24cdddd27419b609bb9c6f703ea27988", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.6" - }, - "sqflite_common_ffi_web": { - "dependency": "direct main", - "description": { - "name": "sqflite_common_ffi_web", - "sha256": "33495e9172c958d907c48fd43fbea0b9c0a2ec2e36a548ebd07672fde61b6497", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1+1" - }, - "sqflite_darwin": { - "dependency": "transitive", - "description": { - "name": "sqflite_darwin", - "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2" - }, - "sqflite_platform_interface": { - "dependency": "transitive", - "description": { - "name": "sqflite_platform_interface", - "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.0" - }, - "sqlite3": { - "dependency": "transitive", - "description": { - "name": "sqlite3", - "sha256": "f393d92c71bdcc118d6203d07c991b9be0f84b1a6f89dd4f7eed348131329924", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.9.0" - }, - "stack_trace": { - "dependency": "transitive", - "description": { - "name": "stack_trace", - "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.12.1" - }, - "stream_channel": { - "dependency": "transitive", - "description": { - "name": "stream_channel", - "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "stream_transform": { - "dependency": "transitive", - "description": { - "name": "stream_transform", - "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "string_scanner": { - "dependency": "transitive", - "description": { - "name": "string_scanner", - "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.1" - }, - "synchronized": { - "dependency": "direct main", - "description": { - "name": "synchronized", - "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.4.0" - }, - "term_glyph": { - "dependency": "transitive", - "description": { - "name": "term_glyph", - "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.2" - }, - "test": { - "dependency": "direct dev", - "description": { - "name": "test", - "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.25.15" - }, - "test_api": { - "dependency": "transitive", - "description": { - "name": "test_api", - "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.4" - }, - "test_core": { - "dependency": "transitive", - "description": { - "name": "test_core", - "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.8" - }, - "timing": { - "dependency": "transitive", - "description": { - "name": "timing", - "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.2" - }, - "tuple": { - "dependency": "transitive", - "description": { - "name": "tuple", - "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "typed_data": { - "dependency": "transitive", - "description": { - "name": "typed_data", - "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.0" - }, - "url_launcher": { - "dependency": "direct main", - "description": { - "name": "url_launcher", - "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.2" - }, - "url_launcher_android": { - "dependency": "transitive", - "description": { - "name": "url_launcher_android", - "sha256": "0aedad096a85b49df2e4725fa32118f9fa580f3b14af7a2d2221896a02cd5656", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.17" - }, - "url_launcher_ios": { - "dependency": "transitive", - "description": { - "name": "url_launcher_ios", - "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.3" - }, - "url_launcher_linux": { - "dependency": "transitive", - "description": { - "name": "url_launcher_linux", - "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "url_launcher_macos": { - "dependency": "transitive", - "description": { - "name": "url_launcher_macos", - "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.2" - }, - "url_launcher_platform_interface": { - "dependency": "transitive", - "description": { - "name": "url_launcher_platform_interface", - "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.2" - }, - "url_launcher_web": { - "dependency": "transitive", - "description": { - "name": "url_launcher_web", - "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "url_launcher_windows": { - "dependency": "transitive", - "description": { - "name": "url_launcher_windows", - "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.4" - }, - "uuid": { - "dependency": "direct main", - "description": { - "name": "uuid", - "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.5.1" - }, - "vector_graphics": { - "dependency": "transitive", - "description": { - "name": "vector_graphics", - "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.19" - }, - "vector_graphics_codec": { - "dependency": "transitive", - "description": { - "name": "vector_graphics_codec", - "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.13" - }, - "vector_graphics_compiler": { - "dependency": "transitive", - "description": { - "name": "vector_graphics_compiler", - "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.17" - }, - "vector_math": { - "dependency": "transitive", - "description": { - "name": "vector_math", - "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "visibility_detector": { - "dependency": "transitive", - "description": { - "name": "visibility_detector", - "sha256": "dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.0+2" - }, - "vm_service": { - "dependency": "transitive", - "description": { - "name": "vm_service", - "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "15.0.0" - }, - "watcher": { - "dependency": "transitive", - "description": { - "name": "watcher", - "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "web": { - "dependency": "transitive", - "description": { - "name": "web", - "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "web_socket": { - "dependency": "transitive", - "description": { - "name": "web_socket", - "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "web_socket_channel": { - "dependency": "transitive", - "description": { - "name": "web_socket_channel", - "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "webkit_inspection_protocol": { - "dependency": "transitive", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "win32": { - "dependency": "transitive", - "description": { - "name": "win32", - "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.14.0" - }, - "window_manager": { - "dependency": "direct main", - "description": { - "name": "window_manager", - "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.1" - }, - "xdg_directories": { - "dependency": "transitive", - "description": { - "name": "xdg_directories", - "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "xml": { - "dependency": "transitive", - "description": { - "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.5.0" - }, - "yaml": { - "dependency": "transitive", - "description": { - "name": "yaml", - "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.3" - } - }, - "sdks": { - "dart": ">=3.8.1 <4.0.0", - "flutter": ">=3.32.0" - } -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a827d8e45ddc..a58f8f2a2aab 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -441,6 +441,7 @@ mapAliases { charmcraft = throw "charmcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # Added 2025-09-18 charybdis = throw "charybdis was removed since its upstream repo was archived in 2021"; # Added 2026-01-13 chatgpt-retrieval-plugin = throw "chatgpt-retrieval-plugin has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 + chatmcp = throw "chatmcp has been removed, as it is unmaintained"; # Added 2026-04-09 check-esxi-hardware = throw "'check-esxi-hardware' has been renamed to/replaced by 'nagiosPlugins.check_esxi_hardware'"; # Converted to throw 2025-10-27 check-mssql-health = throw "'check-mssql-health' has been renamed to/replaced by 'nagiosPlugins.check_mssql_health'"; # Converted to throw 2025-10-27 check-nwc-health = throw "'check-nwc-health' has been renamed to/replaced by 'nagiosPlugins.check_nwc_health'"; # Converted to throw 2025-10-27 From 61f94de09c835444639cbfd0e402ce3f7a64bc81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Apr 2026 23:55:28 +0000 Subject: [PATCH 121/305] ananicy-rules-cachyos: 0-unstable-2026-03-30 -> 0-unstable-2026-04-06 --- pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 8d0e58a9face..03787e8af1dc 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2026-03-30"; + version = "0-unstable-2026-04-06"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "7460ed8d375425f50517119b0df3a57b876b504e"; - hash = "sha256-hFBQGmGKUw/LT1DiyfnTsYO5Lt2c7LBMLRVBMmjYakY="; + rev = "ca5e3e7714eb051de7d70ee0324c11b5cecf10f8"; + hash = "sha256-a0T6KYB6ZpCCIbEIgvkx7mb0iOS75r9aC5xmmhR5/f0="; }; dontConfigure = true; From 1e9b5d08569cce793f59f9e24a542fad9b2622a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 02:10:03 +0200 Subject: [PATCH 122/305] snmpen: init at 1.1.0 SNMP Enumeration tool https://github.com/fabaff/snmpen --- pkgs/by-name/sn/snmpen/package.nix | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/sn/snmpen/package.nix diff --git a/pkgs/by-name/sn/snmpen/package.nix b/pkgs/by-name/sn/snmpen/package.nix new file mode 100644 index 000000000000..e97f1acec472 --- /dev/null +++ b/pkgs/by-name/sn/snmpen/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + python3, + versionCheckHook, +}: + +python3.pkgs.buildPythonApplication (finalAttrs: { + pname = "snmpen"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fabaff"; + repo = "snmpen"; + tag = finalAttrs.version; + hash = "sha256-PH1kUnDOiiE7ouEkhd1+TuIBziB2uxCVnmiEkCgQma0="; + }; + + build-system = with python3.pkgs; [ hatchling ]; + + dependencies = with python3.pkgs; [ + humanize + pysnmp + rich + ]; + + nativeBuildInputs = with python3.pkgs; [ + pytestCheckHook + pytest-asyncio + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + pythonImportsCheck = [ "snmpen" ]; + + doInstallCheck = true; + + meta = { + description = "SNMP Enumeration tool"; + homepage = "https://github.com/fabaff/snmpen"; + changelog = "https://github.com/fabaff/snmpen/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "snmpen"; + }; +}) From be7ef6a5bd0aad0d33c3ade5170d821599ea4845 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 02:28:26 +0200 Subject: [PATCH 123/305] python3Packages.tencentcloud-sdk-python: 3.1.72 -> 3.1.73 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.72...3.1.73 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.73/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 83c7839d9ce5..0a94e4a85409 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.72"; + version = "3.1.73"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = finalAttrs.version; - hash = "sha256-Et9Tkyh7IIC8Z6P3OF/aQMIl3p2UNNoHbjMlrYGtpMw="; + hash = "sha256-VYjJLaFVGgIV35naRZaFhTSf8Z3AjCmPTkcxJdshSyY="; }; build-system = [ setuptools ]; From 270376c92fa3ded1d2cecabfcfdb0368ec03ceab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 02:29:05 +0200 Subject: [PATCH 124/305] python3Packages.iamdata: 0.1.202604071 -> 0.1.202604081 Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202604071...v0.1.202604081 Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202604081 --- pkgs/development/python-modules/iamdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index f3bff8841552..2de0bbc6916b 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202604071"; + version = "0.1.202604081"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-jlzyncEWMY/XqoYkIAGwy+zv5gmHj+mBpMuRCApvakA="; + hash = "sha256-hUFiO0yGRxlI3hex4ohhG/FyQI0zdcaHoMtZfISdiL4="; }; __darwinAllowLocalNetworking = true; From 860bedcabb9799e7f5e39f0dff5c6beb401b5f01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 00:30:00 +0000 Subject: [PATCH 125/305] snowflake: 2.12.1 -> 2.13.1 --- pkgs/by-name/sn/snowflake/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snowflake/package.nix b/pkgs/by-name/sn/snowflake/package.nix index 9b7bb3dcd23f..d91f0ebf0de7 100644 --- a/pkgs/by-name/sn/snowflake/package.nix +++ b/pkgs/by-name/sn/snowflake/package.nix @@ -6,7 +6,7 @@ buildGoModule (finalAttrs: { pname = "snowflake"; - version = "2.12.1"; + version = "2.13.1"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -14,10 +14,10 @@ buildGoModule (finalAttrs: { owner = "anti-censorship/pluggable-transports"; repo = "snowflake"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-3aXO6AvOHPX8QCXK5dFx3QVxQ7BNAi4DJAZ63BMOI1g="; + sha256 = "sha256-XbBlUEkv0ptrb+X+oPDRCvy6HE6XHgSSLwFTXw071pU="; }; - vendorHash = "sha256-X7SfTTxUL/4f2OndF8gnhz5JVpqGzeGLctiOFx5pJPI="; + vendorHash = "sha256-bhv7soUyZnIG+AS1mMH38GZEG74tDk/ap7cQr6k4Pzs="; meta = { description = "System to defeat internet censorship"; From c4f5a352eca78b13f807f546dd345bdaf36e23da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 00:30:38 +0000 Subject: [PATCH 126/305] python3Packages.memray: 1.19.2 -> 1.19.3 --- pkgs/development/python-modules/memray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/memray/default.nix b/pkgs/development/python-modules/memray/default.nix index 80cf7a4be605..776a22e81d1d 100644 --- a/pkgs/development/python-modules/memray/default.nix +++ b/pkgs/development/python-modules/memray/default.nix @@ -21,14 +21,14 @@ buildPythonPackage (finalAttrs: { pname = "memray"; - version = "1.19.2"; + version = "1.19.3"; pyproject = true; src = fetchFromGitHub { owner = "bloomberg"; repo = "memray"; tag = "v${finalAttrs.version}"; - hash = "sha256-z9/6BKVhaaZwu/MvIXI4LsgVO73zVaiCYGJekzWW1mk="; + hash = "sha256-A9XbVpuW/MlMNdFq5bbpg90GFh5c1aEWQOvGAOXyUgc="; }; build-system = [ From 6235266151b6cdeaeba640a65637d8f40378d1f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 00:31:23 +0000 Subject: [PATCH 127/305] syft: 1.42.3 -> 1.42.4 --- pkgs/by-name/sy/syft/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index ecc5a5b03dea..e13abcab8684 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "syft"; - version = "1.42.3"; + version = "1.42.4"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${finalAttrs.version}"; - hash = "sha256-EPno5G2Wfgrcu9DdObn1NNwIkf2r6VgD/S2h/BUjIzU="; + hash = "sha256-RIPdH3XT4jruT2a3cU0GsR2PeExVuVAHeN2Za1E7Gyg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-Iy5syp/Mbuuz422Ylzl6lN/Q60PwrYW1jMfNahEH3Xg="; + vendorHash = "sha256-4S9U4nZxCckp+kbRRsSLCIbLJ9E98X1ELtkAYCMAG0k="; nativeBuildInputs = [ installShellFiles ]; From 2ba31cc82b06db582f59819de282eb65ede8538a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 00:33:55 +0000 Subject: [PATCH 128/305] lockbook: 26.3.22 -> 26.4.8 --- pkgs/by-name/lo/lockbook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index a7fca5634da6..fc1482437801 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "lockbook"; - version = "26.3.22"; + version = "26.4.8"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = finalAttrs.version; - hash = "sha256-Mroh2xSLe5dlKNXxTPyP9RzLtwcEf2JXZnE1tN4t1fE="; + hash = "sha256-dz4jloG7B/qgtYxDQki8aZiEa+fwvPrzuC9oNoObZR0="; }; - cargoHash = "sha256-hPQlDG2eFmiPXkCyjk10fpVDAbq3R8mQs7bOHbCBhwg="; + cargoHash = "sha256-ZzKNcBWq4RnCiRY69BlCt9GFPDiSk+PxjcoTyTrLJtw="; doCheck = false; # there are no cli tests cargoBuildFlags = [ From c6beaaf902f0f083fa1c54b0e14f8883816aac50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 00:41:00 +0000 Subject: [PATCH 129/305] lichess-bot: 2026.3.29.1 -> 2026.4.3.1 --- pkgs/by-name/li/lichess-bot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lichess-bot/package.nix b/pkgs/by-name/li/lichess-bot/package.nix index 953c6a2ebd08..3e3901b78ae3 100644 --- a/pkgs/by-name/li/lichess-bot/package.nix +++ b/pkgs/by-name/li/lichess-bot/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "lichess-bot"; - version = "2026.3.29.1"; + version = "2026.4.3.1"; pyproject = false; src = fetchFromGitHub { owner = "lichess-bot-devs"; repo = "lichess-bot"; - rev = "bfd5e5e1005be7c5c4a7c880b6981c7e265fc066"; - hash = "sha256-ZsrepZLbIJEqbxyads+nFeO+FPFQ7H56wE6eaT79Fys="; + rev = "98c70bbd693e12eafe1eff40996fb61c08c60ddb"; + hash = "sha256-GpnplQ+MQdA+RrLKaq2JO7TQjJY1jWGxSu/Kbg5bBEo="; }; propagatedBuildInputs = with python3Packages; [ From d7f63337b99ea990d3f9d0b29971c984e097f24a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Dec 2025 13:01:41 +0000 Subject: [PATCH 130/305] implot: 0.16 -> 0.17 --- pkgs/by-name/im/implot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/implot/package.nix b/pkgs/by-name/im/implot/package.nix index 541e85c73f58..5d00625ede02 100644 --- a/pkgs/by-name/im/implot/package.nix +++ b/pkgs/by-name/im/implot/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "implot"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "epezent"; repo = "implot"; rev = "v${version}"; - hash = "sha256-/wkVsgz3wiUVZBCgRl2iDD6GWb+AoHN+u0aeqHHgem0="; + hash = "sha256-HNzNRHPLr352EDkAci4nx5qQnPI308rGH8yHkF+n5OY="; }; cmakeRules = "${vcpkg.src}/ports/implot"; From ddfc0301a312dd810ad711278d82236fa6e3cb0d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 2 Feb 2026 14:15:59 +0100 Subject: [PATCH 131/305] implot: fix tests --- pkgs/by-name/im/implot/demos/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/im/implot/demos/default.nix b/pkgs/by-name/im/implot/demos/default.nix index 6ddde64aaaae..5c5ae8ca6d27 100644 --- a/pkgs/by-name/im/implot/demos/default.nix +++ b/pkgs/by-name/im/implot/demos/default.nix @@ -46,7 +46,12 @@ stdenv.mkDerivation { }) ]; - cmakeFlags = [ (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) ]; + cmakeFlags = [ + (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") + ]; + + env.NIX_CFLAGS_COMPILE = "-fpermissive"; nativeBuildInputs = [ cmake From 584febb54e82deee2c6ddd3b34e98ccd45483532 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 00:46:38 +0000 Subject: [PATCH 132/305] cargo-leptos: 0.3.5 -> 0.3.6 --- pkgs/by-name/ca/cargo-leptos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index db7348ea2c31..1dd81c9405df 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-leptos"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "leptos-rs"; repo = "cargo-leptos"; rev = "v${finalAttrs.version}"; - hash = "sha256-wSnz3Hi+hUTwYFXoWMC6Uq9UH0+q0vHoryNwn4t8iMk="; + hash = "sha256-Y81cCy1w4FoWRyTN15BuC9Z8FSVPJxYObXms0rJHxwM="; }; - cargoHash = "sha256-2ax2yH/dMgXRVNffbl59OTeeMG+v83MnQnsyylrW22s="; + cargoHash = "sha256-Wv1gsrcrsJ3izYYFCPMO4ds1w6RQcIlWh+GcsckoKM4="; nativeBuildInputs = [ pkg-config ]; From a3da496ee6f15eaea04d19a67a8362fd7b6d1128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 00:54:51 +0000 Subject: [PATCH 133/305] terraform-providers.spotinst_spotinst: 1.232.5 -> 1.233.1 --- .../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 77f8917e0c1c..83d8ede0481c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1247,13 +1247,13 @@ "vendorHash": "sha256-u3WK/pLsuwySJX6GMNho8ImB+F+XXUPC6h+IQtDrOp8=" }, "spotinst_spotinst": { - "hash": "sha256-dZStuj7YjSF9X5/AEkrZyqDT2l2orpV4jY6CJrXjOgA=", + "hash": "sha256-ow/8K8MXUKG0D5U2ILHImPBzRZwAp5oxybCf5wqbclA=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.232.5", + "rev": "v1.233.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-Cj7RVITkFxIjAZAqHFhnoTa4lTZFXG22ny801g0Y+NE=" + "vendorHash": "sha256-wcuB0GpsrVajguxa6FQ7jELVdgpZ0chazUKeH0ElVMo=" }, "statuscakedev_statuscake": { "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=", From 2ffb82eec114d3717a2223949e473d1851359572 Mon Sep 17 00:00:00 2001 From: Else Someone Date: Thu, 9 Apr 2026 04:09:47 +0300 Subject: [PATCH 134/305] imgui: rebase cmakelists patch Post vcpkg update (https://github.com/NixOS/nixpkgs/pull/507064), and accommodating imnodes update (https://github.com/NixOS/nixpkgs/pull/505138#issuecomment-4210519258) --- ...-allow-installing-into-split-outputs.patch | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/im/imgui/0001-imgui-allow-installing-into-split-outputs.patch b/pkgs/by-name/im/imgui/0001-imgui-allow-installing-into-split-outputs.patch index 48764cc56f25..c0d9f0d63332 100644 --- a/pkgs/by-name/im/imgui/0001-imgui-allow-installing-into-split-outputs.patch +++ b/pkgs/by-name/im/imgui/0001-imgui-allow-installing-into-split-outputs.patch @@ -1,14 +1,17 @@ -From c5fe9a321d83fc70cf30ef999c24377869cedbd8 Mon Sep 17 00:00:00 2001 -From: SomeoneSerge +From 85c36c4a692a229b7ce688ba92fa2bdd5b9d6877 Mon Sep 17 00:00:00 2001 +From: Else Someone Date: Thu, 27 Jun 2024 11:15:38 +0000 Subject: [PATCH] imgui: allow installing into split outputs +Change install(... DESTINATION include) to +install(... DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}. +Use $ where appropriate. --- - ports/imgui/CMakeLists.txt | 74 +++++++++++++++++++++++--------------- - 1 file changed, 45 insertions(+), 29 deletions(-) + ports/imgui/CMakeLists.txt | 78 +++++++++++++++++++++++--------------- + 1 file changed, 47 insertions(+), 31 deletions(-) diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt -index 1502a5aff2..be05d29f4f 100644 +index 03eefb8b8f..1b3fa8b285 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -8,13 +8,15 @@ if(APPLE) @@ -28,7 +31,7 @@ index 1502a5aff2..be05d29f4f 100644 ) target_sources( -@@ -154,18 +156,32 @@ list(REMOVE_DUPLICATES BINDINGS_SOURCES) +@@ -174,18 +176,32 @@ list(REMOVE_DUPLICATES BINDINGS_SOURCES) install( TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}_target @@ -67,7 +70,7 @@ index 1502a5aff2..be05d29f4f 100644 ) endforeach() -@@ -178,47 +194,47 @@ if(NOT IMGUI_SKIP_HEADERS) +@@ -198,47 +214,47 @@ if(NOT IMGUI_SKIP_HEADERS) ${CMAKE_CURRENT_SOURCE_DIR}/imstb_rectpack.h ${CMAKE_CURRENT_SOURCE_DIR}/imstb_truetype.h ${CMAKE_CURRENT_SOURCE_DIR}/misc/cpp/imgui_stdlib.h @@ -126,7 +129,7 @@ index 1502a5aff2..be05d29f4f 100644 endif() if(IMGUI_BUILD_OPENGL3_BINDING) -@@ -227,16 +243,16 @@ if(NOT IMGUI_SKIP_HEADERS) +@@ -247,16 +263,16 @@ if(NOT IMGUI_SKIP_HEADERS) ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.h ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3_loader.h DESTINATION @@ -146,7 +149,7 @@ index 1502a5aff2..be05d29f4f 100644 endif() if(IMGUI_BUILD_SDLGPU3_BINDING) -@@ -245,24 +261,24 @@ if(NOT IMGUI_SKIP_HEADERS) +@@ -265,28 +281,28 @@ if(NOT IMGUI_SKIP_HEADERS) ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlgpu3.h ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlgpu3_shaders.h DESTINATION @@ -170,13 +173,25 @@ index 1502a5aff2..be05d29f4f 100644 + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_win32.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) endif() + if(IMGUI_BUILD_WEBGPU_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_wgpu.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_wgpu.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + if(IMGUI_FREETYPE) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) endif() if(IMGUI_TEST_ENGINE) -@@ -285,13 +301,13 @@ if(NOT IMGUI_SKIP_HEADERS) +@@ -303,19 +319,19 @@ if(NOT IMGUI_SKIP_HEADERS) + ${CMAKE_CURRENT_SOURCE_DIR}/test-engine/imgui_te_ui.h + ${CMAKE_CURRENT_SOURCE_DIR}/test-engine/imgui_te_utils.h + DESTINATION +- include ++ ${CMAKE_INSTALL_INCLUDEDIR} + ) + endif() endif() include(CMakePackageConfigHelpers) @@ -194,5 +209,5 @@ index 1502a5aff2..be05d29f4f 100644 + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ) -- -2.47.2 +2.53.0 From 47cb4878d179e72d62a38470a72a50e580eb0497 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 01:12:14 +0000 Subject: [PATCH 135/305] gh-enhance: 0.5.1 -> 0.6.0 --- pkgs/by-name/gh/gh-enhance/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/gh-enhance/package.nix b/pkgs/by-name/gh/gh-enhance/package.nix index 4491492d7ff4..e57ecb3d35d5 100644 --- a/pkgs/by-name/gh/gh-enhance/package.nix +++ b/pkgs/by-name/gh/gh-enhance/package.nix @@ -8,16 +8,16 @@ }: buildGoModule (finalAttrs: { pname = "gh-enhance"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-enhance"; rev = "v${finalAttrs.version}"; - hash = "sha256-IHtI8wnPLMkqxdBFXqkt6inYMOIqKjdTKdZbTxIhPzo="; + hash = "sha256-g6nhEcBt72sol/49FVlYSo9HKtWHfj+zKw7FZ0ZjKXI="; }; - vendorHash = "sha256-rgql0vsHAzWeubw4EYBu/yPmm2QeADsIeACWsbcWtSk="; + vendorHash = "sha256-us25CXQC3cd3BTa+wOYArbBiMtwkgpfeCQoD3S7+3rU="; ldflags = [ "-s" From 8c3f3ecded24dae6c6d95c3bfe796922b6a0d512 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 01:33:21 +0000 Subject: [PATCH 136/305] kdash: 0.6.2 -> 1.0.0 --- pkgs/by-name/kd/kdash/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kd/kdash/package.nix b/pkgs/by-name/kd/kdash/package.nix index f9cc5f64fa11..4a343d03851d 100644 --- a/pkgs/by-name/kd/kdash/package.nix +++ b/pkgs/by-name/kd/kdash/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kdash"; - version = "0.6.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "kdash-rs"; repo = "kdash"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-fFpdWVoeWycnp/hRw2S+hYpnXYmCs+rLqcZdmSSMGwI="; + sha256 = "sha256-1ZG0u4k95tm+k/cvLIzWD/pvVrdP3+ivTqtKr3Pniqw="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # Fix for build failure with gcc15 env.NIX_CFLAGS_COMPILE = "-std=gnu17"; - cargoHash = "sha256-72DuM64wj8WW6soagodOFIeHvVn1CPpb1T3Y7GQYsbs="; + cargoHash = "sha256-zcvlR7BDkeTcwhGi2Fyz2VdfZH4+JOMRTIjIXkTAHOU="; meta = { description = "Simple and fast dashboard for Kubernetes"; From 853daad4347a6017154eda6078a11d01eab3afee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 01:38:12 +0000 Subject: [PATCH 137/305] terraform-providers.hashicorp_tfe: 0.76.0 -> 0.76.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1a27eabdb3e2..7e482d4b29f4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -652,11 +652,11 @@ "vendorHash": "sha256-GlkqFg9Bgs+Hi59PYAxqq3YW9ji1qeuX4vz59wQ4pRw=" }, "hashicorp_tfe": { - "hash": "sha256-6Qzchshn6T9gHdk6nd2wzDesFTUsGUViwTrBmMue3yI=", + "hash": "sha256-TDDnW6786MGOBuptsIBqPe4/PUHQ3pKeLFqLHex3ObI=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.76.0", + "rev": "v0.76.1", "spdx": "MPL-2.0", "vendorHash": "sha256-JNTe1RI2aDw86jNzYJqmiBr5BBnr824/DhkJeaMpbKI=" }, From ffb02ac8111d2605db543808bae245f3a4ee2903 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 01:39:11 +0000 Subject: [PATCH 138/305] spedread: 2.7.0 -> 2.8.0 --- pkgs/by-name/sp/spedread/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spedread/package.nix b/pkgs/by-name/sp/spedread/package.nix index 6601c650c69a..c65b45dd863f 100644 --- a/pkgs/by-name/sp/spedread/package.nix +++ b/pkgs/by-name/sp/spedread/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spedread"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "Darazaki"; repo = "Spedread"; tag = "v${finalAttrs.version}"; - hash = "sha256-3Ykucgw2LkW22gn4nroCO22CbfLB9DGeyyv+PS3fv2U="; + hash = "sha256-IZhvKZ4kllL6ItUn47+EnUwVPKXC0mz2Mvsg/7CT5Qw="; }; postPatch = '' From 10f9620f319f5456c0bc4ad8c6df2e17ce5e1bba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 01:46:07 +0000 Subject: [PATCH 139/305] vscode-extensions.github.copilot-chat: 0.42.0 -> 0.42.3 --- .../editors/vscode/extensions/github.copilot-chat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix index 053a2a0973ff..3f0d86d8ad7d 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.42.0"; - hash = "sha256-iKDRDqQ8qJe2c4SQJBiJLCEtmVmcci6753+I7uH7YVk="; + version = "0.42.3"; + hash = "sha256-bkVfwPFQSuTMcIEoEa/M91foSZC+0H4ESFXFwDDDhbc="; }; meta = { From 14a457ba21de6cddf134a1b7df6f9eac3f351eb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 01:54:43 +0000 Subject: [PATCH 140/305] vscode-extensions.ms-ceintl.vscode-language-pack-fr: 1.110.2026033112 -> 1.110.2026040813 --- .../vscode/extensions/language-packs.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/language-packs.nix b/pkgs/applications/editors/vscode/extensions/language-packs.nix index d05d7aa4251e..cdee6fe42969 100644 --- a/pkgs/applications/editors/vscode/extensions/language-packs.nix +++ b/pkgs/applications/editors/vscode/extensions/language-packs.nix @@ -13,7 +13,7 @@ let buildVscodeLanguagePack = { language, - version ? "1.110.2026033112", + version ? "1.110.2026040813", hash, }: buildVscodeMarketplaceExtension { @@ -41,71 +41,71 @@ in # French vscode-language-pack-fr = buildVscodeLanguagePack { language = "fr"; - hash = "sha256-ctn6bY2zJVz6XfhI37NOdf12RiKsS/Pa2IYFBMD06fs="; + hash = "sha256-/34hQYL82oNV4AK+X9Qhc49y11U7QjBtQZkxX2DJCv0="; }; # Italian vscode-language-pack-it = buildVscodeLanguagePack { language = "it"; - hash = "sha256-ZZgTzQa0oTS7HFzYuJXncG97tPUovKr8BEh4ZgGwmWY="; + hash = "sha256-igknYIMrlTf6dzPRCWeE2IQ8s7SsD4AFN/oPPISv5Vk="; }; # German vscode-language-pack-de = buildVscodeLanguagePack { language = "de"; - hash = "sha256-8qCjGIArVSfy/kwv00aLPniBREVW+cNAUbged10VQQs="; + hash = "sha256-ovzQBQfdPQoVVgKl47qnucUQfhBBDCbbGwKlI86gR10="; }; # Spanish vscode-language-pack-es = buildVscodeLanguagePack { language = "es"; - hash = "sha256-9F4JEp0qVu1rsrJ01QMuhZPgMxybH/J5ENh2riDAe2c="; + hash = "sha256-tn1irueWoqGidrxOv49IP0pdUPjk1mPvFppe2RHEs3E="; }; # Russian vscode-language-pack-ru = buildVscodeLanguagePack { language = "ru"; - hash = "sha256-1xRKJLuKjxYQ2D20K9QaQQQjmd8oHFmWVIe0OdeEfG8="; + hash = "sha256-3RMlWPzjHAYJsiulQOMqIZ0/u2hqxF+gZ9vVZVvPJWE="; }; # Chinese (Simplified) vscode-language-pack-zh-hans = buildVscodeLanguagePack { language = "zh-hans"; - hash = "sha256-VxM+Jjch/hVO80boUCU1iYkYoToTtUewHcIuJhQGkZA="; + hash = "sha256-5ig0jME4lljWRKL3j64RobHW98IdjzrF/cZEEkpjMZo="; }; # Chinese (Traditional) vscode-language-pack-zh-hant = buildVscodeLanguagePack { language = "zh-hant"; - hash = "sha256-ADR/ouefp5HnBwmGV0UBNAklgHg5mXNcBfX+VbJed74="; + hash = "sha256-gV/Z1br8I+fp+/4ALQQt75sNYJGK+opvUHpkYHwV2Xc="; }; # Japanese vscode-language-pack-ja = buildVscodeLanguagePack { language = "ja"; - hash = "sha256-hSilIspgNnJ05qgZk7uWvr8y4BAAPK/82j+dwshsGVc="; + hash = "sha256-UilZzzy8DjhXQP6jrkndNBZFqUeX2zLVy05nOIDViKk="; }; # Korean vscode-language-pack-ko = buildVscodeLanguagePack { language = "ko"; - hash = "sha256-A2gGsrno76caJvZguMsjE2xa6AzOfCz1Ge3fbh7yZWw="; + hash = "sha256-Z4a01eQD1bgQnlf0174DozkKqo5TeVR6J8sgnMPGmMg="; }; # Czech vscode-language-pack-cs = buildVscodeLanguagePack { language = "cs"; - hash = "sha256-t70KwNkxiXFSw0NdiOGH6tjmeRP/RYinK/YxwLGfSw8="; + hash = "sha256-CCqtlFQrlgRN8ds/pqMFP6S5Ks+ZpGu3iUfchSFX1mA="; }; # Portuguese (Brazil) vscode-language-pack-pt-br = buildVscodeLanguagePack { language = "pt-BR"; - hash = "sha256-wOjewAGd1BCkrOQuhcWRbMm7YsRJGjac2+w5+fjWhBM="; + hash = "sha256-Yi2W8bdieyNxJfGy3XNafB5DX27VujSz8Dp8BMyBi1w="; }; # Turkish vscode-language-pack-tr = buildVscodeLanguagePack { language = "tr"; - hash = "sha256-X7A8MWlBzijd+1Z6POBSRef5BgeI9qfSy576dx3yfII="; + hash = "sha256-lKHTQryxzSgW7S3QVXHCr7DvFihD+vr2lOwiWk1klVQ="; }; # Polish vscode-language-pack-pl = buildVscodeLanguagePack { language = "pl"; - hash = "sha256-bJc428MT8HyEUltmCFZEliSSPOE5TpHsaVKL1qukbVk="; + hash = "sha256-l2PBwwGS+HFswTF4gbS++AREmTMzzbiZtHzzvX900yc="; }; # Pseudo Language vscode-language-pack-qps-ploc = buildVscodeLanguagePack { language = "qps-ploc"; - hash = "sha256-XVT+ssMh4SD+O93oDYbkLh4b8VPYA/9HOAKQURrLUuQ="; + hash = "sha256-9/SDMQ9v0zZq1fveWDx6TI/28o9NDzN0YI/tOcC7dks="; }; } From 27f560a7e9df90233563c5881fcd75f5b1c78d3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 01:57:59 +0000 Subject: [PATCH 141/305] flow: 0.305.1 -> 0.308.0 --- pkgs/by-name/fl/flow/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flow/package.nix b/pkgs/by-name/fl/flow/package.nix index 0ae40e06cd0d..f50870b27c9d 100644 --- a/pkgs/by-name/fl/flow/package.nix +++ b/pkgs/by-name/fl/flow/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "flow"; - version = "0.305.1"; + version = "0.308.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; tag = "v${finalAttrs.version}"; - hash = "sha256-yXC/liSwqEzPdNPUR86sEBzAPGVeN2q8wBxjMvkQrJU="; + hash = "sha256-PWSGay3WVXUtk3NA5ukAY2HMrJV49BXISoMM1UyqzXE="; }; patches = [ From 2189e6beeddff6dd451b844caa5fd18bc283283f Mon Sep 17 00:00:00 2001 From: crertel Date: Wed, 8 Apr 2026 20:59:30 -0500 Subject: [PATCH 142/305] lmstudio: 0.4.9.1 -> 0.4.10.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 71bc707b3d60..769358c36214 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.9-1"; - hash_aarch64-linux = "sha256-fQgXmhkbqTjbW/pyPvyZsIxtkQanpgh1DkzyrbFH6t8="; - version_aarch64-darwin = "0.4.9-1"; - hash_aarch64-darwin = "sha256-MuvYJ5mVC6Usz37DF/TG4M8gOHsKG2uN9qzq+dXNa7M="; - version_x86_64-linux = "0.4.9-1"; - hash_x86_64-linux = "sha256-+vn8gExfdfbYUBVzc59kCDlw7nEbFIyGR0fF9sFFodo="; + 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="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; From 5c1ce9a451d2b0b4c671e255fa8b56453bc7a6c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 02:41:46 +0000 Subject: [PATCH 143/305] downkyicore: 1.0.23 -> 1.0.24 --- pkgs/by-name/do/downkyicore/deps.json | 88 +++++++++++-------------- pkgs/by-name/do/downkyicore/package.nix | 4 +- 2 files changed, 41 insertions(+), 51 deletions(-) diff --git a/pkgs/by-name/do/downkyicore/deps.json b/pkgs/by-name/do/downkyicore/deps.json index a265fec199b1..99895cca1610 100644 --- a/pkgs/by-name/do/downkyicore/deps.json +++ b/pkgs/by-name/do/downkyicore/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Avalonia", - "version": "11.3.6", - "hash": "sha256-dSq6RshqnvbHBPkSvp4rTOgtWmVUPVvaGZadPI2TK9g=" + "version": "11.3.13", + "hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -11,33 +11,33 @@ }, { "pname": "Avalonia.BuildServices", - "version": "0.0.31", - "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" + "version": "11.3.2", + "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.3.6", - "hash": "sha256-oiaEB3gLyafsRyY8YZ/f//Wne4vAhd73jCF5XOZDIkw=" + "version": "11.3.13", + "hash": "sha256-hzGLVkFxGDxqYE0+1J6Ze/akUUmhnGiNaeHeNx9JYlg=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.3.6", - "hash": "sha256-Hk1EOnd1E+ZrQTavmQtBZ4NvHiyFhzIMcT7UQPuU2Sw=" + "version": "11.3.13", + "hash": "sha256-uqpRip0O+DUk/zsytLdJhZz103har19xPqMq0hI/Ppg=" }, { "pname": "Avalonia.Desktop", - "version": "11.3.6", - "hash": "sha256-n54YrP1SviFQH9VEXfw0O3o6K86rhGBbVw4vXhWUFOE=" + "version": "11.3.13", + "hash": "sha256-NTwCJzVSyUXbobwgsHI3jOwc27eFAIYzQnXXueS86LI=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.3.6", - "hash": "sha256-uFKSZLA5qvta/ZSVr+vvKT8l9asBT56iF6Lgxcawsgk=" + "version": "11.3.13", + "hash": "sha256-hGiZB8zq56ByjzSf1o3XEJ0rHTnVNrGrVm3xgwVwleg=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.3.6", - "hash": "sha256-KnnXq7iFyS94PbHfbk3ks/DHEQVKxkHD+Nhe0pTPZnc=" + "version": "11.3.13", + "hash": "sha256-YLAdQj/8zmrKJp7+7EQY6bmDXfCiBtUHYrVw0KPpXNw=" }, { "pname": "Avalonia.Markup.Xaml.Loader", @@ -46,33 +46,33 @@ }, { "pname": "Avalonia.Native", - "version": "11.3.6", - "hash": "sha256-uVFziTCL3J2DvrjNl7O3aIKCChsm4tO7INDh+3hrlJw=" + "version": "11.3.13", + "hash": "sha256-vRrv5uLH3XLGo8FelJz8kYxcp5sdMakkK02k+xjDsaE=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.3.6", - "hash": "sha256-Nxg+jt3Eit9amUZPPicmXy+5/2nqEu6rTLRk7ccH+qE=" + "version": "11.3.13", + "hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc=" }, { "pname": "Avalonia.Skia", - "version": "11.3.6", - "hash": "sha256-PqoGzraRMb4SAl0FAeROcTmPXUm5SHn6KCCdexIBgLM=" + "version": "11.3.13", + "hash": "sha256-kNIZ8HpNiQIqEyYYlJ/ND/tBGT5KY3jeL8W6GFTJIvU=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.3.6", - "hash": "sha256-omvYccZgdrkD5KnPKQlafz7lMFL46KMQrTJVxF9AV0E=" + "version": "11.3.13", + "hash": "sha256-PzCYsrELqrINWcTzIHpnKQ757xsiYMEBa6fTUQGg3zE=" }, { "pname": "Avalonia.Win32", - "version": "11.3.6", - "hash": "sha256-zlYoHQMyvirc73hEnpjZbhz5BUss/jAlq6Jwb+8Fucc=" + "version": "11.3.13", + "hash": "sha256-JNQ2kmrjAvwN8pboT66HVi1r28Cc9WG+8cnxL/AYCWs=" }, { "pname": "Avalonia.X11", - "version": "11.3.6", - "hash": "sha256-nXHgvgp2cOjwchgkN1E0N47JWyYEkYTZ69FyEtCATf8=" + "version": "11.3.13", + "hash": "sha256-Eeeq4K4q2GihIVFhCKFjTc+di/M39OgfFyF7aaZOJdg=" }, { "pname": "Downloader", @@ -89,21 +89,6 @@ "version": "5.1.0", "hash": "sha256-k6AOQjAAWiZI0g7wr32z+0kb48gfcQ1n2XhK4TL53xA=" }, - { - "pname": "FreeSql", - "version": "3.5.212", - "hash": "sha256-VwgsUXriNR09s19t3WxHFEmU49BF3fppo9Jormq/3VA=" - }, - { - "pname": "FreeSql.DbContext", - "version": "3.5.212", - "hash": "sha256-pXfIFJoHcRZFaDnXSiCvr6j9oTNDCL81YL50Mf+fL6I=" - }, - { - "pname": "FreeSql.Provider.SqliteCore", - "version": "3.5.212", - "hash": "sha256-6MGO6qZgiOXyYLRKvDUwFBP2B/SeAdlZPx+pkAJ3hfo=" - }, { "pname": "Google.Protobuf", "version": "3.25.1", @@ -149,11 +134,6 @@ "version": "9.0.5", "hash": "sha256-LmIKIg6oTKjrLmbJgETn9vFmhVYFazUW2W7VfzPgQSM=" }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.0", - "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" - }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "8.0.1", @@ -164,6 +144,11 @@ "version": "8.0.1", "hash": "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U=" }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, { "pname": "Microsoft.NETCore.Platforms", "version": "3.1.0", @@ -274,6 +259,11 @@ "version": "2.1.11", "hash": "sha256-wHveswfPGD1t70PcHOvB9o4devEiGRJfnA/f0GC9wHg=" }, + { + "pname": "SQLitePCLRaw.core", + "version": "2.1.10", + "hash": "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8=" + }, { "pname": "SQLitePCLRaw.core", "version": "2.1.11", @@ -416,7 +406,7 @@ }, { "pname": "Xaml.Behaviors", - "version": "11.3.0", - "hash": "sha256-n8s/zTSzovI9HYvTzBQHUi6e/zo//6thM2w73O9T+iY=" + "version": "11.3.9.5", + "hash": "sha256-Dyd5RkbPZ3STAuSrwv2ebAa4rSuMS+rimbY/Rd+wwhY=" } -] \ No newline at end of file +] diff --git a/pkgs/by-name/do/downkyicore/package.nix b/pkgs/by-name/do/downkyicore/package.nix index dbecfc742178..ed4d7a1c6302 100644 --- a/pkgs/by-name/do/downkyicore/package.nix +++ b/pkgs/by-name/do/downkyicore/package.nix @@ -29,13 +29,13 @@ buildDotnetModule (finalAttrs: { pname = "downkyicore"; - version = "1.0.23"; + version = "1.0.24"; src = fetchFromGitHub { owner = "yaobiao131"; repo = "downkyicore"; tag = "v${finalAttrs.version}"; - hash = "sha256-1APolFe2eq7aIZdg3Sl4DI/6lnvaAgX/GDcHx3M+o/I="; + hash = "sha256-fE4n/PMMkt6m/CuQrPlIIIMPgWiwtN1oh1q5AijlaS8="; }; projectFile = "DownKyi/DownKyi.csproj"; From ae410b5f2681f20e5b5a75e6de16b453d5904fdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 03:02:00 +0000 Subject: [PATCH 144/305] vscode-extensions.visualjj.visualjj: 0.27.0 -> 0.27.1 --- .../vscode/extensions/visualjj.visualjj/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 3ee8803d64f4..d0ff01bb914f 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-4w/A3C9WWfKbZF3LnaLR9aZ78hvU+lrEXS8nnMbgzeA="; + hash = "sha256-xsenzYvX6uAMK91K9fjhRAhYvxSobq4N1yBsksh4bkM="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-+2+geG0UcCf7L+SbgKGjMkmctH+3q7nLsZFsb/BrhF0="; + hash = "sha256-3f7Sw47uHigXD1sUE8LWfrfAmXCFRoSuYru106jv2Bk="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-QUopKDFQxWinvtkCkmRSCG2TpopGRRD8dXyfC3iww6Y="; + hash = "sha256-pjqEVhqUsAPkfLOdIMoJooAabIfNG3vUSzMuNZtBS24="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-7ZglgfAbjdCS8R9MhX8qB7P4aCVDy76qFmQ7klzGbjg="; + hash = "sha256-jPvkC5ZmA8LToXIZvkY1iMbEWnJGWQMT74RZ+PS3ZBg="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.27.0"; + version = "0.27.1"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); From 9404051e1b34b42829e558ca4745f2b39268cf94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 03:04:48 +0000 Subject: [PATCH 145/305] kin-openapi: 0.134.0 -> 0.135.0 --- pkgs/by-name/ki/kin-openapi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix index bca32a410642..3af4c768b845 100644 --- a/pkgs/by-name/ki/kin-openapi/package.nix +++ b/pkgs/by-name/ki/kin-openapi/package.nix @@ -5,14 +5,14 @@ }: buildGoModule (finalAttrs: { pname = "kin-openapi"; - version = "0.134.0"; - vendorHash = "sha256-+PE/OyZ9Y4uZV4AmzATasrFseQF3UrWQT0bKoxm3uXM="; + version = "0.135.0"; + vendorHash = "sha256-Tf/F7L2F3nhyf6WYsc1FFsBEcMwFHfqkNBlRfcnVRO8="; src = fetchFromGitHub { owner = "getkin"; repo = "kin-openapi"; tag = "v${finalAttrs.version}"; - hash = "sha256-MJ6oG2CU8jzPk394iJqCZPmm3LCbF6Nz112/fJ65c5w="; + hash = "sha256-Hg8FK11Q3dRcuKGCBsXkoBaHXpSGQLKM6PnKEir0kBI="; }; checkFlags = From 9ac0211741d89cfda5942b10f863469099e348df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 03:10:21 +0000 Subject: [PATCH 146/305] spirit: 0.11.3 -> 0.12.0 --- pkgs/by-name/sp/spirit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spirit/package.nix b/pkgs/by-name/sp/spirit/package.nix index 9c8a90d92907..bc8a14d7620f 100644 --- a/pkgs/by-name/sp/spirit/package.nix +++ b/pkgs/by-name/sp/spirit/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "spirit"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "block"; repo = "spirit"; tag = "v${finalAttrs.version}"; - hash = "sha256-gQ4DeiUWqOy1Qg1+F2hjxhI6578MXvuNlTB5djN1zD4="; + hash = "sha256-5H/yDujoxzeslZ4rm6qrBIy9pM3F6o/XmqPyG960M/0="; }; vendorHash = "sha256-dC+qryYDiYPuMlgkHsXYOsqHxl1O5QtGUFbNnkRE3eU="; From 1c0ae394f42a8b22282bdcaa48c32c08d1b7d5be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 03:27:56 +0000 Subject: [PATCH 147/305] aonsoku: 0.13.0 -> 0.14.0 --- pkgs/by-name/ao/aonsoku/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ao/aonsoku/package.nix b/pkgs/by-name/ao/aonsoku/package.nix index 43f0be90bcd2..dc708ce30d79 100644 --- a/pkgs/by-name/ao/aonsoku/package.nix +++ b/pkgs/by-name/ao/aonsoku/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aonsoku"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "victoralvesf"; repo = "aonsoku"; tag = "v${finalAttrs.version}"; - hash = "sha256-jpBO5MqOc18KGncpOWB/3IjCgkWb2zFfNxTpkcayZwo="; + hash = "sha256-Rbte0qYcZQ70E6ib8rj0YsNP5SMNO8eC3MEvWcT7N08="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 3; - hash = "sha256-B5bEAj6Ii/c7ZZobQmc8nHFbpBX9n/eYwRZ7lsLs3fk="; + hash = "sha256-oBwqYOx2KEtF0qdMKEIgdArZ4xs/AyeOqFoU4nHl3xY="; }; nativeBuildInputs = [ From baa4321760ad72c0f779d918d598a079814d2b86 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Wed, 8 Apr 2026 20:36:06 -0700 Subject: [PATCH 148/305] wslu: remove Project discontinued; repository archived. https://github.com/wslutilities/wslu --- .../ws/wslu/fallback-conf-nix-store.diff | 22 --------- pkgs/by-name/ws/wslu/package.nix | 45 ------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 pkgs/by-name/ws/wslu/fallback-conf-nix-store.diff delete mode 100644 pkgs/by-name/ws/wslu/package.nix diff --git a/pkgs/by-name/ws/wslu/fallback-conf-nix-store.diff b/pkgs/by-name/ws/wslu/fallback-conf-nix-store.diff deleted file mode 100644 index 6315e78d7de4..000000000000 --- a/pkgs/by-name/ws/wslu/fallback-conf-nix-store.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/wslu-header b/src/wslu-header -index 5f33925..159c6af 100644 ---- a/src/wslu-header -+++ b/src/wslu-header -@@ -169,11 +169,17 @@ if [ -f "$HOME/.config/wslu/conf" ]; then - debug_echo "$HOME/.config/wslu/conf found, sourcing" - source "$HOME/.config/wslu/conf" - fi -+ - if [ -f "$HOME/.wslurc" ]; then - debug_echo "$HOME/.wslurc found, sourcing" - source "$HOME/.wslurc" - fi - -+if [ -f "@out@/share/wslu/conf" ]; then -+ debug_echo "@out@/share/wslu/conf found, sourcing" -+ source "@out@/share/wslu/conf" -+fi -+ - # functions - - function help { diff --git a/pkgs/by-name/ws/wslu/package.nix b/pkgs/by-name/ws/wslu/package.nix deleted file mode 100644 index 913ef1f7557a..000000000000 --- a/pkgs/by-name/ws/wslu/package.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - copyDesktopItems, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "wslu"; - version = "4.1.4"; - - src = fetchFromGitHub { - owner = "wslutilities"; - repo = "wslu"; - tag = "v${finalAttrs.version}"; - hash = "sha256-ssiwYkQg2rOirC/ZZVq2bJm4Ggc364uRkoS2y365Eb0="; - }; - - nativeBuildInputs = [ copyDesktopItems ]; - - patches = [ - ./fallback-conf-nix-store.diff - ]; - - postPatch = '' - substituteInPlace src/wslu-header \ - --subst-var out - substituteInPlace src/etc/wslview.desktop \ - --replace-fail /usr/bin/wslview wslview - ''; - - makeFlags = [ - "DESTDIR=$(out)" - "PREFIX=" - ]; - - meta = { - description = "Collection of utilities for Windows Subsystem for Linux"; - homepage = "https://github.com/wslutilities/wslu"; - changelog = "https://github.com/wslutilities/wslu/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ jamiemagee ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a58f8f2a2aab..a8d36e11b7ca 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2117,6 +2117,7 @@ mapAliases { wrapGradle = throw "'wrapGradle' has been removed; use `gradle-packages.wrapGradle` or `(gradle-packages.mkGradle { ... }).wrapped` instead"; # Added 2025-11-02 wring = throw "'wring' has been removed since it has been abandoned upstream"; # Added 2025-11-07 write_stylus = throw "'write_stylus' has been renamed to/replaced by 'styluslabs-write-bin'"; # Converted to throw 2025-10-27 + wslu = throw "'wslu' has been removed because the project has been discontinued and the repository has been archived"; # Added 2026-04-08 wxGTK31 = warnAlias "'wxGTK31' has been renamed to 'wxwidgets_3_1'" wxwidgets_3_1; # Added 2026-02-12 wxGTK32 = warnAlias "'wxGTK32' has been renamed to 'wxwidgets_3_2'" wxwidgets_3_2; # Added 2026-02-12 wxGTK33 = wxwidgets_3_3; # Added 2025-07-20 From 097827106d2df4c6b033f6eac38c3615c3e36c6a Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Wed, 8 Apr 2026 20:57:48 -0700 Subject: [PATCH 149/305] github-copilot-cli: 1.0.19 -> 1.0.21 --- pkgs/by-name/gi/github-copilot-cli/sources.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gi/github-copilot-cli/sources.json b/pkgs/by-name/gi/github-copilot-cli/sources.json index c5a40002ce45..2d37414f45c2 100644 --- a/pkgs/by-name/gi/github-copilot-cli/sources.json +++ b/pkgs/by-name/gi/github-copilot-cli/sources.json @@ -1,19 +1,19 @@ { - "version": "1.0.19", + "version": "1.0.21", "x86_64-linux": { "name": "copilot-linux-x64", - "hash": "sha256-8ZlmXw8lIuTDFf59nl65g+Yg7CvJeyJJ1pGMaARz+bg=" + "hash": "sha256-pvxJSj3Vp2JG+zNCS68Iq7W0y2iJ//KM8pUVXCixz3c=" }, "aarch64-linux": { "name": "copilot-linux-arm64", - "hash": "sha256-/hGO951vg8oWE3ONQ03Pa4yeMRqJaml5Q2J3YaMOzRI=" + "hash": "sha256-QUuuOtIo5LtJ734f5pf7wUSdNF+VdmBxp8Haa7IasWg=" }, "x86_64-darwin": { "name": "copilot-darwin-x64", - "hash": "sha256-zsPRSgIe5h+EkKeqCPZZpQvmWgJpIXMg86YgvIIEHy4=" + "hash": "sha256-dS3MmOrDhgatzqZOXumIiinINduWm17dq95rqPmeqXc=" }, "aarch64-darwin": { "name": "copilot-darwin-arm64", - "hash": "sha256-0hvupLiJbzc89Pw5u8DS9MS+1N4LEjkR3nx6U+AN78w=" + "hash": "sha256-mQy7nZTNLa0CRej3xO0riP+qhlMb+Eboby2QWPTUWIo=" } } From dde0a138b46c9bc2e7ed54879bc34a81fa820c35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 04:12:27 +0000 Subject: [PATCH 150/305] vscode-extensions.signageos.signageos-vscode-sops: 0.9.3 -> 0.9.4 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e48f252edb5a..c0502d385fc2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4232,8 +4232,8 @@ let mktplcRef = { name = "signageos-vscode-sops"; publisher = "signageos"; - version = "0.9.3"; - hash = "sha256-fOSLlszr6yLkRC9gy+MCnL+Y/1TXrmVWAWavpvXHj4U="; + version = "0.9.4"; + hash = "sha256-SH+hmxFQAXcL0MP9WToGmvdBjn/l2TWxF/YL30FwXes="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/signageos.signageos-vscode-sops/changelog"; From 41dd676e8e7f2f8e9c5f0a2c9495b766049133b1 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Wed, 4 Jun 2025 21:10:12 -0700 Subject: [PATCH 151/305] android-studio: fix update script substituting incorrect URLs Followup to f31788b40bd4967804ee7a7d26ab0568b8b3dc4e. We need to substitute the entire URL now, and return 0 for dev. --- .../editors/android-studio/update.sh | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/android-studio/update.sh b/pkgs/applications/editors/android-studio/update.sh index 04efbb366754..89839334ad2b 100755 --- a/pkgs/applications/editors/android-studio/update.sh +++ b/pkgs/applications/editors/android-studio/update.sh @@ -16,7 +16,7 @@ getLatest() { *) local select=".channel == \"${channel^}\"" ;; esac local result="$(echo "$RELEASES_JSON" \ - | jq -r ".content.item[] | select(${select}) | [.version, .${attribute}] | join(\" \")" \ + | jq -r ".content.item[] | select(${select}) | [.version, (${attribute})] | join(\" \")" \ | sort --version-sort \ | cut -d' ' -f 2- \ | tail -n 1)" @@ -24,14 +24,14 @@ getLatest() { if [[ -n "$result" ]]; then echo "$result" else - echo "could not find the latest $attribute for $channel" + echo "could not find the latest $attribute for $channel" >&2 exit 1 fi } updateChannel() { local channel="$1" - local latestVersion="$(getLatest "version" "$channel")" + local latestVersion="$(getLatest ".version" "$channel")" local localVersion="$(nix --extra-experimental-features nix-command eval --raw --file . androidStudioPackages."${channel}".version)" if [[ "${latestVersion}" == "${localVersion}" ]]; then @@ -40,15 +40,24 @@ updateChannel() { fi echo "updating $channel from $localVersion to $latestVersion" - local latestHash="$(nix-prefetch-url "https://dl.google.com/dl/android/studio/ide-zips/${latestVersion}/android-studio-${latestVersion}-linux.tar.gz")" - local latestSri="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$latestHash")" + local latestUrl="$(getLatest "[.download[] | select(.link | endswith(\"-linux.tar.gz\"))][0].link" "$channel")" + local latestHash="$(getLatest "[.download[] | select(.link | endswith(\"-linux.tar.gz\"))][0].checksum" "$channel")" + + if [[ "$latestUrl" != https://edgedl.me.gvt1.com/android/studio/* ]]; then + echo "URL '$latestUrl' had an unexpected value, maybe the server changed?" >&2 + exit 1 + fi + + local latestSri="$(nix --extra-experimental-features nix-command hash convert --from base16 --hash-algo sha256 "$latestHash")" + local localUrl="$(nix --extra-experimental-features nix-command eval --json --file . androidStudioPackages."${channel}".unwrapped.src.drvAttrs.urls | jq -r '.[0]')" local localHash="$(nix --extra-experimental-features nix-command eval --raw --file . androidStudioPackages."${channel}".unwrapped.src.drvAttrs.outputHash)" sed -i "s~${localHash}~${latestSri}~g" "${DEFAULT_NIX}" # Match the formatting of default.nix: `version = "2021.3.1.14"; # "Android Studio Dolphin (2021.3.1) Beta 5"` - local versionString="${latestVersion}\"; # \"$(getLatest "name" "${channel}")\"" + local versionString="${latestVersion}\"; # \"$(getLatest ".name" "${channel}")\"" + sed -i "s~${localUrl}~${latestUrl}~g" "${DEFAULT_NIX}" sed -i "s~${localVersion}.*~${versionString}~g" "${DEFAULT_NIX}" - echo "updated ${channel} to ${latestVersion}" + echo "updated ${channel} to ${latestVersion}" >&2 } if (( $# == 0 )); then @@ -60,8 +69,10 @@ else case "$1" in beta|canary|stable) updateChannel "$1" ;; + dev) + echo "no autoupdate for dev" >&2 && exit 0 ;; *) - echo "unknown channel: $1" && exit 1 ;; + echo "unknown channel: $1" >&2 && exit 1 ;; esac shift 1 done From 70a1f1bbd0109cc7948d3c6771a9d0e21f57d0dc Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 5 Apr 2026 19:21:19 -0700 Subject: [PATCH 152/305] android-studio: run update script - stable: 2025.3.2.6 -> 2025.3.3.6 - beta: 2025.3.2.5 -> 2025.3.3.5 - latest: 2025.3.3.2 -> 2025.3.4.3 --- .../editors/android-studio/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 35af9bf0cc73..5d7533f5e414 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -16,19 +16,19 @@ let inherit tiling_wm; }; stableVersion = { - version = "2025.3.2.6"; # "Android Studio Panda 2 | 2025.3.2" - sha256Hash = "sha256-MpQtjNdogZLPPNB78oL7EgA1ub2bVubxPFVA5tOYB+k="; - url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.2.6/android-studio-panda2-linux.tar.gz"; + version = "2025.3.3.6"; # "Android Studio Panda 3 | 2025.3.3" + sha256Hash = "sha256-NBrA/BfbyYfQUw4M+zJxJUgFM9ZzOoifITdja+zUhqU="; + url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.3.6/android-studio-panda3-linux.tar.gz"; }; betaVersion = { - version = "2025.3.2.5"; # "Android Studio Panda 2 | 2025.3.2 RC 1" - sha256Hash = "sha256-qpmc7MO48GV2nnxEdRstg3ne0Gvlrgk9UX5Dr60gAMM="; - url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.2.5/android-studio-panda2-rc1-linux.tar.gz"; + version = "2025.3.3.5"; # "Android Studio Panda 3 | 2025.3.3 RC 1" + sha256Hash = "sha256-lKpFKw2Oq7OlDrPjFJhMH3aQsJO7TeOKy7HGUCE0B1U="; + url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.3.5/android-studio-panda3-rc1-linux.tar.gz"; }; latestVersion = { - version = "2025.3.3.2"; # "Android Studio Panda 3 | 2025.3.3 Canary 2" - sha256Hash = "sha256-z8GpBqyEnbyyBc0XPo5q52WS5d7b4292QgUj0FPW+C0="; - url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.3.2/android-studio-panda3-canary2-linux.tar.gz"; + version = "2025.3.4.3"; # "Android Studio Panda 4 | 2025.3.4 Canary 3" + sha256Hash = "sha256-8fqHdU6IPuRmcJeCZQOqUPgfild9k98sLnN77dl2Hs8="; + url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.3/android-studio-panda4-canary3-linux.tar.gz"; }; in { From 7c61392f0dae6cd5c6395ae6308312f582401007 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 04:20:53 +0000 Subject: [PATCH 153/305] tar2ext4: 0.14.0 -> 0.14.1 --- pkgs/by-name/ta/tar2ext4/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tar2ext4/package.nix b/pkgs/by-name/ta/tar2ext4/package.nix index 44bc4792427a..eebeb10e9f6f 100644 --- a/pkgs/by-name/ta/tar2ext4/package.nix +++ b/pkgs/by-name/ta/tar2ext4/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "tar2ext4"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-8FPEGQ6DBYYnT6mIjYmSTRfHMloS42oB8xPU5wmFLwI="; + sha256 = "sha256-n/YYajbQo+s1ssPAbS4gUdFYBHNmoNBKcEM/kcAZR94="; }; sourceRoot = "${finalAttrs.src.name}/cmd/tar2ext4"; From 98c682c6ef0539fe853416368f96788db87c8a74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 04:21:14 +0000 Subject: [PATCH 154/305] miniserve: 0.33.0 -> 0.35.0 --- pkgs/by-name/mi/miniserve/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index edad55816dd2..56bb57953d04 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "miniserve"; - version = "0.33.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; tag = "v${finalAttrs.version}"; - hash = "sha256-2uXZ2ItqgesAgm9/DDbFW3WKQ/VZfvTR2lQY6Gq9ohw="; + hash = "sha256-ae2Y51GuFjC65n2JYIPB1D029Zfhy7OvgZeQy+Syzqw="; }; - cargoHash = "sha256-xCdugvSw9IR9EDp/8ZxgqnFwTYHnF0o+ldk1AlSSzSc="; + cargoHash = "sha256-KwkmkbQ1E2LJeif7iQmb7pFjZtXhu7BU+YutGb5UmY4="; nativeBuildInputs = [ pkg-config From 1bb976bfbf3cb9654773f68b61440803675f6ef6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 04:24:15 +0000 Subject: [PATCH 155/305] xml2rfc: 3.32.0 -> 3.33.0 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index ead691a159f1..7ff247d4c4d6 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.32.0"; + version = "3.33.0"; pyproject = true; src = fetchFromGitHub { owner = "ietf-tools"; repo = "xml2rfc"; tag = "v${version}"; - hash = "sha256-3SE54ihJY5zs4YIROalHhKoeCiXCk6wYgaOBHEP3ze0="; + hash = "sha256-eoTuA4OJjqJGRP+uRi2TMWfS3yrCCUPIKI2uNPnjqcA="; }; postPatch = '' From 420f25d1669d2e01d102172c61136bcd30a59fff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 04:39:18 +0000 Subject: [PATCH 156/305] python3Packages.requests-ratelimiter: 0.9.2 -> 0.9.3 --- .../python-modules/requests-ratelimiter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-ratelimiter/default.nix b/pkgs/development/python-modules/requests-ratelimiter/default.nix index 6b278ba6c82b..e94e1d8c5cd3 100644 --- a/pkgs/development/python-modules/requests-ratelimiter/default.nix +++ b/pkgs/development/python-modules/requests-ratelimiter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "requests-ratelimiter"; - version = "0.9.2"; + version = "0.9.3"; pyproject = true; src = fetchFromGitHub { owner = "JWCook"; repo = "requests-ratelimiter"; tag = "v${finalAttrs.version}"; - hash = "sha256-6Uw6JPArOzKD7va6mthumCDW/G0Yn/C1d+1VflrJ/JY="; + hash = "sha256-73/B9PlkZOm51srTzDFP+VXxlE77Ge5Mt5iY5fVagkk="; }; build-system = [ hatchling ]; From 417d0a89a60f593bd4b841a67641ee06b5f3c0cf Mon Sep 17 00:00:00 2001 From: hellodword <46193371+hellodword@users.noreply.github.com> Date: Thu, 26 Mar 2026 07:03:31 +0000 Subject: [PATCH 157/305] gvisor: 20251110.0 -> 20260316.0 --- pkgs/by-name/gv/gvisor/fix-go-mod-tidy.diff | 40 +++++++++++++++++++++ pkgs/by-name/gv/gvisor/package.nix | 10 +++--- 2 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/gv/gvisor/fix-go-mod-tidy.diff diff --git a/pkgs/by-name/gv/gvisor/fix-go-mod-tidy.diff b/pkgs/by-name/gv/gvisor/fix-go-mod-tidy.diff new file mode 100644 index 000000000000..339dfcab3e70 --- /dev/null +++ b/pkgs/by-name/gv/gvisor/fix-go-mod-tidy.diff @@ -0,0 +1,40 @@ +diff --git a/go.mod b/go.mod +index 60f4e32..87a9269 100644 +--- a/go.mod ++++ b/go.mod +@@ -4,7 +4,6 @@ go 1.25.5 + + require ( + github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c +- github.com/bazelbuild/rules_go v0.44.2 + github.com/cenkalti/backoff v2.2.1+incompatible + github.com/cilium/ebpf v0.12.3 + github.com/containerd/cgroups v1.0.4 +@@ -44,7 +43,6 @@ require ( + github.com/Microsoft/go-winio v0.6.0 // indirect + github.com/Microsoft/hcsshim v0.9.12 // indirect + github.com/containerd/ttrpc v1.1.2 // indirect +- github.com/creack/pty v1.1.24 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect + github.com/docker/go-units v0.4.0 // indirect +@@ -53,7 +51,6 @@ require ( + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/go-cmp v0.7.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect +- github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect +@@ -68,11 +65,9 @@ require ( + go.opencensus.io v0.24.0 // indirect + golang.org/x/net v0.44.0 // indirect + golang.org/x/oauth2 v0.30.0 // indirect +- golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect + golang.org/x/term v0.35.0 // indirect + golang.org/x/text v0.29.0 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect +- google.golang.org/api v0.249.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect + google.golang.org/grpc v1.75.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/pkgs/by-name/gv/gvisor/package.nix b/pkgs/by-name/gv/gvisor/package.nix index 44cd2d0a7b58..2d1fec6f6597 100644 --- a/pkgs/by-name/gv/gvisor/package.nix +++ b/pkgs/by-name/gv/gvisor/package.nix @@ -12,7 +12,7 @@ buildGoModule { pname = "gvisor"; - version = "20251110.0"; + version = "20260316.0"; # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go) # that can be used to build gvisor without bazel. @@ -21,8 +21,8 @@ buildGoModule { src = fetchFromGitHub { owner = "google"; repo = "gvisor"; - rev = "2617196c08506a30764bf6261b79d52797916dda"; - hash = "sha256-qx1uCRTJVotSbTojBf/Nj8LfLdUvsnxMkPuyJjLLadM="; + rev = "7644cf3a343c39df4706458b27fa87e021187ac9"; + hash = "sha256-L+SpxYthtuypW+6iP1wp7bqF8LiCwVNnzH7Obzh24ps="; }; # Replace the placeholder with the actual path to ldconfig @@ -31,7 +31,7 @@ buildGoModule { --replace-fail '"/sbin/ldconfig"' '"${glibc}/bin/ldconfig"' ''; - vendorHash = "sha256-Ey4M3NK/+AVkr7r0aA+kAfNk1yVfnDn3Izy7u74HFkE="; + vendorHash = "sha256-8Zkgt5hegYEHnG1lF+wLgdru6t3l+Z/qKRvJHukZbPo="; nativeBuildInputs = [ makeWrapper ]; @@ -60,6 +60,8 @@ buildGoModule { mv $out/bin/shim $out/bin/containerd-shim-runsc-v1 ''; + patches = [ ./fix-go-mod-tidy.diff ]; + passthru.tests = { inherit (nixosTests) gvisor; }; meta = { From 20307f65cdb2b235a0e2b5bcd67e9fed13b36c5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 05:02:23 +0000 Subject: [PATCH 158/305] snx-rs: 5.2.3 -> 5.2.4 --- pkgs/by-name/sn/snx-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 8826325c3a88..417d990e7a14 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -15,13 +15,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "snx-rs"; - version = "5.2.3"; + version = "5.2.4"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-GeEUOgFEYBzTsORUSxI/fU5sn7RlRWetf2sNHkt9VsY="; + hash = "sha256-Jqj2cux11V0l0YRZY2O19PzduvcxB1Ze186jG5Vo+Gs="; }; passthru.updateScript = nix-update-script { }; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; - cargoHash = "sha256-2BXJSlVSQVhxc/bxY0ycd/g8ZZ+Ye5gMuM4Sh5W0jyI="; + cargoHash = "sha256-XY4kZ1HBwHpb8hHtt0bay80Jc3d3zyAoKQv3m0n1AL4="; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; From 194ff685cd1deff85298e8b0c3f09130035e9881 Mon Sep 17 00:00:00 2001 From: hellodword <46193371+hellodword@users.noreply.github.com> Date: Thu, 9 Apr 2026 05:02:30 +0000 Subject: [PATCH 159/305] gvisor: 20260316.0 -> 20260406.0 --- pkgs/by-name/gv/gvisor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gv/gvisor/package.nix b/pkgs/by-name/gv/gvisor/package.nix index 2d1fec6f6597..40232cc38810 100644 --- a/pkgs/by-name/gv/gvisor/package.nix +++ b/pkgs/by-name/gv/gvisor/package.nix @@ -12,7 +12,7 @@ buildGoModule { pname = "gvisor"; - version = "20260316.0"; + version = "20260406.0"; # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go) # that can be used to build gvisor without bazel. @@ -21,8 +21,8 @@ buildGoModule { src = fetchFromGitHub { owner = "google"; repo = "gvisor"; - rev = "7644cf3a343c39df4706458b27fa87e021187ac9"; - hash = "sha256-L+SpxYthtuypW+6iP1wp7bqF8LiCwVNnzH7Obzh24ps="; + rev = "db8d2c9abca39156c61ee2769d52b8a11accbe16"; + hash = "sha256-T0ilLqZTX2KNZdR7wuMnYimnL+G5Tbkd77IULCZE764="; }; # Replace the placeholder with the actual path to ldconfig From 15a34c9a0068c8b152f5257017c58f1404f9ff01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 05:22:20 +0000 Subject: [PATCH 160/305] nezha: 2.0.6 -> 2.0.7 --- pkgs/by-name/ne/nezha/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 0aebafab97c9..54b84dd46d46 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -48,13 +48,13 @@ let in buildGoModule (finalAttrs: { pname = "nezha"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "nezhahq"; repo = "nezha"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZqDqua76y9b2bqcb8kVzZHqQzBAuhoxWT4yEj95wvyk="; + hash = "sha256-QFNv1O0XYkH+OwrUbkmeuLKTSsumo+1uvunDn8LbTho="; }; proxyVendor = true; From 40cd86681752663fcb2a85b61b6fa3f71f72cc67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 05:34:40 +0000 Subject: [PATCH 161/305] application-title-bar: 0.9.0 -> 0.9.1 --- pkgs/by-name/ap/application-title-bar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix index feb968f2fde6..9e9d47d7e283 100644 --- a/pkgs/by-name/ap/application-title-bar/package.nix +++ b/pkgs/by-name/ap/application-title-bar/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "application-title-bar"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "antroids"; repo = "application-title-bar"; tag = "v${finalAttrs.version}"; - hash = "sha256-bnuMlssXALcFBnBY0iXhZO4QqW2hM9r0y8Ywe2X2/wA="; + hash = "sha256-UsAZaYA088nJWnVkT7Awcib3G3JUNTY0mA8ao+9m4d0="; }; propagatedUserEnvPkgs = with kdePackages; [ kconfig ]; From bbf733f4b3949b6da8b38cf93d13849b583a5651 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 05:43:06 +0000 Subject: [PATCH 162/305] cog: 0.1.5 -> 0.1.6 --- pkgs/by-name/co/cog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix index 8e07f8db7bd5..1b9fc3fb5d7b 100644 --- a/pkgs/by-name/co/cog/package.nix +++ b/pkgs/by-name/co/cog/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "cog"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "grafana"; repo = "cog"; tag = "v${finalAttrs.version}"; - hash = "sha256-QMYqrPmJjDmB7Kc9HZN9ypqtiwF9Cah3fnj4iMM8W4Y="; + hash = "sha256-Dbp+7+nokUUKP8GW3xqRhx3Zn1ltEndkpk1iHRRgPug="; }; vendorHash = "sha256-KOk8SvajH98jjvoPZPC4UAsF5tXKjn1xcVq5juQXQVA="; From fa9a9172d673f69cc40454b9e0c5c474c04bd6de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 05:45:37 +0000 Subject: [PATCH 163/305] libretro.gambatte: 0-unstable-2026-03-31 -> 0-unstable-2026-04-03 --- pkgs/applications/emulators/libretro/cores/gambatte.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index 85d58a1129be..c7e77bc9a076 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2026-03-31"; + version = "0-unstable-2026-04-03"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "9669d1f9266684e60ac1c5ed9b438bd2a02a3b4d"; - hash = "sha256-/mxkjVG7fkjUZ1LHNtFYA0/7ZTyvAYtcF5xO8cxWkzc="; + rev = "483a1f13f7e8a1c2b3076eb8bfc38e668e640c17"; + hash = "sha256-efpehssNF3FmSbJAqRS1PkYWTs1v0y0KTdBiRV8K/WY="; }; meta = { From fae76e2bb81f966d4fe41b620ca8a2214b5a12a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 05:48:09 +0000 Subject: [PATCH 164/305] grafanaPlugins.grafana-metricsdrilldown-app: 2.0.0 -> 2.0.1 --- .../grafana/plugins/grafana-metricsdrilldown-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix index c340ad3f3425..6eff3bc260ed 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-metricsdrilldown-app"; - version = "2.0.0"; - zipHash = "sha256-6eYQDDIBBKJ66jsDBFQ4GQxXh1eMfFn/kDkIicEPOSM="; + version = "2.0.1"; + zipHash = "sha256-fZVp+Bd5o10doJlzDFSfPgjI33XG+lUnGcOFwERYxBY="; meta = { description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries"; license = lib.licenses.agpl3Only; From a548280134ea9cc1469f8b09c12e1c326c5b6205 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 05:53:51 +0000 Subject: [PATCH 165/305] vscode-extensions.detachhead.basedpyright: 1.38.4 -> 1.39.0 --- .../vscode/extensions/detachhead.basedpyright/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index 2e16b6cb2eb2..9e1ba184ebf9 100644 --- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "basedpyright"; publisher = "detachhead"; - version = "1.38.4"; - hash = "sha256-05Pu65luhtoYQscIXfO7lXdJCbadRerSY2xFjTji/W4="; + version = "1.39.0"; + hash = "sha256-DCLDw+rwhHrVN3m+D4VOCcVWNv9fG4sONiNylbWgPPE="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; From 905b8e6a5e5a209e563d3d1f305bcefd54e2fbd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 06:07:37 +0000 Subject: [PATCH 166/305] vscode-extensions.tuttieee.emacs-mcx: 0.109.2 -> 0.110.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e48f252edb5a..d614c90a151c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4772,8 +4772,8 @@ let mktplcRef = { name = "emacs-mcx"; publisher = "tuttieee"; - version = "0.109.2"; - hash = "sha256-rrTM/xzp8IoQRtUrg8rsP6gUPwUeZ6TMz1Sc7QyA5r0="; + version = "0.110.2"; + hash = "sha256-E2L95LQw/Oku8cJMpKVeY6VOhZzIkSkZI4+ozmFqyg4="; }; meta = { changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md"; From 3b789d8983c8b570ffb558856b4785799a9cb0d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 06:08:51 +0000 Subject: [PATCH 167/305] sioyek: 2.0.0-unstable-2026-03-13 -> 2.0.0-unstable-2026-04-08 --- pkgs/by-name/si/sioyek/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix index 6975adb229ba..bdc4644b7b46 100644 --- a/pkgs/by-name/si/sioyek/package.nix +++ b/pkgs/by-name/si/sioyek/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "2.0.0-unstable-2026-03-13"; + version = "2.0.0-unstable-2026-04-08"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "13a37e0e0ab77a76f8dbe3adf599ee916615b3db"; - hash = "sha256-3bMVoF4f1+pZV3tdti8KNS17wWK1tmIgjKQUQS+Rzt8="; + rev = "a0650b5a71c15692c4797fec2908cc55c5aafd12"; + hash = "sha256-9g1JhZEqBz6x2gv690efXaV7TNggyRvOq1xn8phubEY="; }; buildInputs = [ From 56b3e7e57b90e65c33525cc78b5548539b9e7a03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 06:19:54 +0000 Subject: [PATCH 168/305] algia: 0.0.107 -> 0.0.111 --- pkgs/by-name/al/algia/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix index 1fb85afd8826..33d2de791842 100644 --- a/pkgs/by-name/al/algia/package.nix +++ b/pkgs/by-name/al/algia/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "algia"; - version = "0.0.107"; + version = "0.0.111"; src = fetchFromGitHub { owner = "mattn"; repo = "algia"; tag = "v${finalAttrs.version}"; - hash = "sha256-23h2sVwOhKXnpYBq1jZbbC275dzc6HnqUpB/1wbrpw4="; + hash = "sha256-Jih/KR3m2Qjn8ZizaoVakbrIXiqSSL/FxZgBYegXzaU="; }; vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU="; From cde4a66bb0bc1041f53d6f9e8cdbad8a176bcb85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 06:29:51 +0000 Subject: [PATCH 169/305] claude-code-bin: 2.1.92 -> 2.1.97 --- pkgs/by-name/cl/claude-code-bin/manifest.json | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/cl/claude-code-bin/manifest.json b/pkgs/by-name/cl/claude-code-bin/manifest.json index b7febebaf9b0..cd3310a9a193 100644 --- a/pkgs/by-name/cl/claude-code-bin/manifest.json +++ b/pkgs/by-name/cl/claude-code-bin/manifest.json @@ -1,46 +1,46 @@ { - "version": "2.1.92", - "buildDate": "2026-04-03T23:31:32Z", + "version": "2.1.97", + "buildDate": "2026-04-08T20:52:51Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "6d1b9657727dce81332b3cda11bfe0a8c83e2392e3c062a31022e10b0e71cdd1", - "size": 198736976 + "checksum": "9104eba60ca82c590ababc5eee0d01f2dc5440d7cf2d668e4c48d6485e41cfeb", + "size": 199579088 }, "darwin-x64": { "binary": "claude", - "checksum": "d422b5cc974b3bc4b28f698144fd0316f3e17774babe0bc1eb76c2bb0858d0aa", - "size": 200226896 + "checksum": "d6e6ee329dbf1cd0222cd710039086aab9621bc85d65d314adee421446dda08c", + "size": 201052496 }, "linux-arm64": { "binary": "claude", - "checksum": "08deb3d56477496eb92e624f492e25b123f4527dd5674f71afff58a48eccd953", - "size": 231082560 + "checksum": "85167cb721655fdd90b002012a28eca273c89dc2fd709be49afe2a7724c365a0", + "size": 231868992 }, "linux-x64": { "binary": "claude", - "checksum": "e22324514967ff2d5e9f91f0ee37e4675bf8b6dfec27fafb19cb25cc5b23fcaf", - "size": 230787712 + "checksum": "0d43fcd11d29206563eeef3a1f787f0615c21cd703cc91f3a180915fd5797ef6", + "size": 231615104 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "d0163f8857511b8f9dad7de1f072de2ca8c4e881d006b3b43525af3534050ae3", - "size": 224201152 + "checksum": "b0cfda67d7dbfadb37c0f2f8714a2694958f988e29785d5bcf00d6f3968ab611", + "size": 224987584 }, "linux-x64-musl": { "binary": "claude", - "checksum": "e0f4a300ff9d0d9cb9c3ee37c706a9db239e3bbce96118245196ae6bc1b0492e", - "size": 225102272 + "checksum": "ab1e66323397e1687ca6a074d471af44ba3cee7ac839632e6b3dbf55dfa75f0d", + "size": 225929664 }, "win32-x64": { "binary": "claude.exe", - "checksum": "ebd9007c464d912593418f133a61d9f24866428530a81e88e910a24823066415", - "size": 240482464 + "checksum": "b678e7827fdcfcd9ac9b0eb7c7b1dda4f06b7ecbff4fd89c7fd22be3578f79ea", + "size": 241307296 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "c258bce79aefac609f909e5abde92d1653bcef47d3577656d299d1d56f1604bb", - "size": 237192864 + "checksum": "78db7edd6de917d733bdcb55560d0f8f7543666254ea3a66b05053a45c549f3b", + "size": 238017696 } } } From 45b7befa6e5722d74f11573968d4d2f325da27f7 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Wed, 8 Apr 2026 10:37:40 +0200 Subject: [PATCH 170/305] libwebsockets: Fix CMake config for static build --- pkgs/by-name/li/libwebsockets/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix index 973541089c39..1435543f0ad7 100644 --- a/pkgs/by-name/li/libwebsockets/package.nix +++ b/pkgs/by-name/li/libwebsockets/package.nix @@ -69,6 +69,13 @@ stdenv.mkDerivation (finalAttrs: { ] ); + # Remove after https://github.com/warmcat/libwebsockets/pull/3567 has been merged or otherwise addressed + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + substituteInPlace "cmake/libwebsockets-config.cmake.in" --replace-fail \ + "set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared)" \ + "set(LIBWEBSOCKETS_LIBRARIES websockets)" + ''; + postInstall = '' # Fix path that will be incorrect on move to "dev" output. substituteInPlace "$out/lib/cmake/libwebsockets/LibwebsocketsTargets-release.cmake" \ From a11f4539366ca9b60798d6f17bcf8fcde4a766b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 09:00:23 +0200 Subject: [PATCH 171/305] python3Packages.mypy-boto3-backup: 1.42.73 -> 1.42.86 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 0d2e4ae1eeff..e69e68aaf19b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -155,8 +155,8 @@ in "sha256-BJ5MKA8jpafHN014Y+pLo1IKcVq1PAfufGlCFwEGSKk="; mypy-boto3-backup = - buildMypyBoto3Package "backup" "1.42.73" - "sha256-rL2H5FRbjO5aDNqBabi8TROtC3NPOx9Zkzcjh5jwkeA="; + buildMypyBoto3Package "backup" "1.42.86" + "sha256-qPxL3n/CZGpncMBs1nIOmZPsQP5wAF3bE8kH+zGvkZo="; mypy-boto3-backup-gateway = buildMypyBoto3Package "backup-gateway" "1.42.58" From 34f1faecb0fb417b8f84e3fcfffa1e65ce9b539d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 09:00:41 +0200 Subject: [PATCH 172/305] python3Packages.mypy-boto3-drs: 1.42.3 -> 1.42.86 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index e69e68aaf19b..0bbcf9993b10 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -423,8 +423,8 @@ in "sha256-lELlqGCIpJDadB4McePclQ56IyVBo7s9B05mBI3vWdY="; mypy-boto3-drs = - buildMypyBoto3Package "drs" "1.42.3" - "sha256-31X59K6RtNoN/iIqZMkpoH1z55k69wteY/Mw2va4txI="; + buildMypyBoto3Package "drs" "1.42.86" + "sha256-Gs2IKLV8vnT9M1fT2v16WlgjjfgAUfeGh9DubBwjtBk="; mypy-boto3-ds = buildMypyBoto3Package "ds" "1.42.3" From 9b68d7a498124abb4305bd051765c2bb0196026b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 09:00:44 +0200 Subject: [PATCH 173/305] python3Packages.mypy-boto3-ecr: 1.42.67 -> 1.42.86 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 0bbcf9993b10..4a2f81d5c85e 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -451,8 +451,8 @@ in "sha256-qe5aitxIPiQA2Et/+MtGVsnmWvk45Rg04/U/kR+tmK0="; mypy-boto3-ecr = - buildMypyBoto3Package "ecr" "1.42.67" - "sha256-fZ0qmXfIwP+rAs5MmfwRuSGY8C0KNYBu45ScOdlZvRg="; + buildMypyBoto3Package "ecr" "1.42.86" + "sha256-TWtQ8YpclFCeRdqngLdHi3KZT+Q6V3IP9zKgm+m3Yy0="; mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.42.3" From 052841e0c538dbe5cc7315fc8b36474a801f44c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 09:01:02 +0200 Subject: [PATCH 174/305] python3Packages.mypy-boto3-ivs-realtime: 1.42.68 -> 1.42.86 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 4a2f81d5c85e..e2627b46b014 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -698,8 +698,8 @@ in "sha256-TzudGWLWWzTRWZb3585Tkar1iXmt5TtFNox+DJzvhS4="; mypy-boto3-ivs-realtime = - buildMypyBoto3Package "ivs-realtime" "1.42.68" - "sha256-Q+++H+qR9OKMnbyZVL06+uDV9KuPuEabZDVXcrkAozM="; + buildMypyBoto3Package "ivs-realtime" "1.42.86" + "sha256-0O6dAerORo30pB6IRlfyUjSHBaAgQ+JeND63vWcswoM="; mypy-boto3-ivschat = buildMypyBoto3Package "ivschat" "1.42.3" From 7481a82896a7f259624e9849530f57c104fbcfa1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 09:01:14 +0200 Subject: [PATCH 175/305] python3Packages.mypy-boto3-medialive: 1.42.83 -> 1.42.86 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index e2627b46b014..524e89014333 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -862,8 +862,8 @@ in "sha256-+Dgo1XpVUPmmUntpzFlPDeym6xUxRiXZki1j5ieS3CU="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.42.83" - "sha256-FmfFTQiciHHNheumvBOAXoBYVNfMp8owUndvr7n1JHs="; + buildMypyBoto3Package "medialive" "1.42.86" + "sha256-udG3y+0adjMbsHjwb2rI84KzPH5FDDoJsIwcjXeTuPc="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.42.3" From e37f8fb47cce73523ce252ddd145a8ab38d21560 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 09:01:24 +0200 Subject: [PATCH 176/305] python3Packages.mypy-boto3-outposts: 1.42.85 -> 1.42.86 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 524e89014333..8491a8795859 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -990,8 +990,8 @@ in "sha256-+t1Mh2gV7wu5YAFzp0jABFUC6/8P/FHMnBCHilIFXac="; mypy-boto3-outposts = - buildMypyBoto3Package "outposts" "1.42.85" - "sha256-SB07dOhPo1fFcd+9N9al/tYG1GV8NQcwz8W4d61i65c="; + buildMypyBoto3Package "outposts" "1.42.86" + "sha256-roB4+wKTlaxt7vX5x77mhQoJVn4AyziwaiVCxlG3BDI="; mypy-boto3-panorama = buildMypyBoto3Package "panorama" "1.42.3" From e8c59f09c07208d3267e478a74c901f6038e52d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 09:02:02 +0200 Subject: [PATCH 177/305] python3Packages.boto3-stubs: 1.42.85 -> 1.42.86 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 4703f10761dd..8241bacfb826 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.42.85"; + version = "1.42.86"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-3q9StRpmCWMXABLMa38bIgAI5sWf6oTjX79UOfE2Ddc="; + hash = "sha256-hfwSM39wUj4l8wiFuA/u7PhiOXerpT92cr03pWdHGKM="; }; build-system = [ setuptools ]; From 2349bafd63e649fcfef0906ab5d392b77af12c5c Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 8 Apr 2026 14:25:03 +0200 Subject: [PATCH 178/305] gitlab: 18.10.1 -> 18.10.3 https://gitlab.com/gitlab-org/gitlab/-/blob/v18.10.3-ee/CHANGELOG.md --- pkgs/by-name/gi/gitaly/package.nix | 4 ++-- pkgs/by-name/gi/gitlab-pages/package.nix | 4 ++-- pkgs/by-name/gi/gitlab/data.json | 14 ++++++------ .../gi/gitlab/gitlab-workhorse/default.nix | 2 +- pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock | 6 ++--- pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix | 22 ++++++++++++++----- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index 5b0780194cfa..3c9b730ea3f5 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "18.10.1"; + version = "18.10.3"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,7 +21,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-s9nDqhtNmLpUHRJ+jJvu9WikPbQLUwEum6TGV3PvG8Y="; + hash = "sha256-edILaF/dW7yOm5W9nV9d7Cj4+W9kshagkOb/2mfIOtQ="; }; vendorHash = "sha256-W7ZI8IOaW/88zWrVymDkRQqzk+aLgvdO+rPycK70Bb0="; diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index 2e4206a736e6..fa1c02e8d9d9 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,14 +6,14 @@ buildGoModule (finalAttrs: { pname = "gitlab-pages"; - version = "18.10.1"; + version = "18.10.3"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${finalAttrs.version}"; - hash = "sha256-B/6BJaH2xge9/3HrI0yMIMtw4TeC+/bNqLFmKbZ2Ubw="; + hash = "sha256-TsImrWD6cLvVoasatQpWVFCAuQw3/38EfFC+igikhVo="; }; vendorHash = "sha256-EaTYw8ydHMA3Rmr8YJvUxWBIkPhyKLc8zNUsJRTlMmE="; diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json index 612d0ce02701..4686c8e42a08 100644 --- a/pkgs/by-name/gi/gitlab/data.json +++ b/pkgs/by-name/gi/gitlab/data.json @@ -1,17 +1,17 @@ { - "version": "18.10.1", - "repo_hash": "sha256-z4MRfgqGOBxAE4EzqhIKosMLOZXDuiH88wSxkwUpV5E=", + "version": "18.10.3", + "repo_hash": "sha256-x8nmMKbL8hnmQfIrnAhbQHu6Mg2PnjMJeRXUBiI7QFA=", "yarn_hash": "sha256-tWpPN//SdgnRONVa1ykagVHCNs7TCboTnQLQ5Sx0DQs=", "frontend_islands_yarn_hash": "sha256-OkCoiyL9FFJcWcNUbeRSBGGSauYIm7l+yxNfA0CsNEQ=", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v18.10.1-ee", + "rev": "v18.10.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "18.10.1", - "GITLAB_KAS_VERSION": "18.10.1", - "GITLAB_PAGES_VERSION": "18.10.1", + "GITALY_SERVER_VERSION": "18.10.3", + "GITLAB_KAS_VERSION": "18.10.3", + "GITLAB_PAGES_VERSION": "18.10.3", "GITLAB_SHELL_VERSION": "14.47.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.1", - "GITLAB_WORKHORSE_VERSION": "18.10.1" + "GITLAB_WORKHORSE_VERSION": "18.10.3" } } diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix index 88ec396c3ffc..ec2932e97170 100644 --- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix @@ -10,7 +10,7 @@ in buildGoModule (finalAttrs: { pname = "gitlab-workhorse"; - version = "18.10.1"; + version = "18.10.3"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock index 745424da4379..a428217abd97 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock @@ -1051,11 +1051,11 @@ GEM nokogiri (>= 1.0, < 2.0) htmlbeautifier (1.4.2) htmlentities (4.3.4) - http (5.1.1) + http (5.3.1) addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) - llhttp-ffi (~> 0.4.0) + llhttp-ffi (~> 0.5.0) http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) @@ -1171,7 +1171,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - llhttp-ffi (0.4.0) + llhttp-ffi (0.5.1) ffi-compiler (~> 1.0) rake (~> 13.0) locale (2.1.4) diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix index ada970fef11e..68009ec2ebd0 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix +++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix @@ -4309,14 +4309,19 @@ src: { "http-form_data" "llhttp-ffi" ]; - groups = [ "default" ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw"; + sha256 = "0z8x4c2bcg05x7ffrjy47cwarfqzlg8kcfxchk5jcfdyx7c04265"; type = "gem"; }; - version = "5.1.1"; + version = "5.3.1"; }; http-accept = { groups = [ "default" ]; @@ -4948,14 +4953,19 @@ src: { "ffi-compiler" "rake" ]; - groups = [ "default" ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5"; + sha256 = "1g57iw0l3y7x50132x6a1jyssxa6pw7srh69g0d6j7ri37yaf9cs"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.1"; }; locale = { groups = [ From 0e3e7e5d6939c2cc98e063de0e8f617cdc2678b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 09:10:14 +0200 Subject: [PATCH 179/305] python3Packages.iamdata: 0.1.202604081 -> 0.1.202604091 Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202604081...v0.1.202604091 Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202604091 --- pkgs/development/python-modules/iamdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 2de0bbc6916b..17bd2700fcc0 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202604081"; + version = "0.1.202604091"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-hUFiO0yGRxlI3hex4ohhG/FyQI0zdcaHoMtZfISdiL4="; + hash = "sha256-KcXJmV+5aeOhIxN3xvjZPFQSDTMxeFPYq/1IErnV1t0="; }; __darwinAllowLocalNetworking = true; From a87924a45f9ef97ce9c03c57a2e6027a834a21b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 07:10:39 +0000 Subject: [PATCH 180/305] librelane: 3.0.1 -> 3.0.2 --- pkgs/by-name/li/librelane/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/librelane/package.nix b/pkgs/by-name/li/librelane/package.nix index 93a445e3d4c2..b69a4611da90 100644 --- a/pkgs/by-name/li/librelane/package.nix +++ b/pkgs/by-name/li/librelane/package.nix @@ -23,14 +23,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "librelane"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; src = fetchFromGitHub { owner = "librelane"; repo = "librelane"; tag = finalAttrs.version; - hash = "sha256-NrfZm7GlFxIEIqaPB2SubKMV7DdqYzRtdRfIePMqwgM="; + hash = "sha256-JxWuaOBhkjjw4sp7l++QF+0EzGIhPAOaJcKwwmdTg+w="; }; build-system = [ From d3198170244fee953e4fe65999921b801e929f71 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 09:16:08 +0200 Subject: [PATCH 181/305] route-graph: update URLs --- pkgs/by-name/ro/route-graph/package.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix index 8402524ec9c0..91fd936626d0 100644 --- a/pkgs/by-name/ro/route-graph/package.nix +++ b/pkgs/by-name/ro/route-graph/package.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pyproject = true; src = fetchFromGitHub { - owner = "audiusGmbH"; + owner = "audius"; repo = "route-graph"; tag = finalAttrs.version; hash = "sha256-NxATrPx1JzEripu4x2UkFSAgrJUYQ7P7U2C6EmNuY5g="; @@ -22,9 +22,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { "typing-extensions" ]; - build-system = with python3.pkgs; [ - poetry-core - ]; + build-system = with python3.pkgs; [ poetry-core ]; propagatedBuildInputs = [ graphviz @@ -38,14 +36,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "route_graph" - ]; + pythonImportsCheck = [ "route_graph" ]; meta = { description = "CLI tool for creating graphs of routes"; - homepage = "https://github.com/audiusGmbH/route-graph"; - changelog = "https://github.com/audiusGmbH/route-graph/releases/tag/${finalAttrs.version}"; + homepage = "https://github.com/audius/route-graph"; + changelog = "https://github.com/audius/route-graph/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "route-graph"; From c441726211c93945793eb1a8dfe1cab5a6e66779 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 07:29:00 +0000 Subject: [PATCH 182/305] ctlptl: 0.9.1 -> 0.9.2 --- pkgs/by-name/ct/ctlptl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ct/ctlptl/package.nix b/pkgs/by-name/ct/ctlptl/package.nix index e30477e99352..91f8fc07822d 100644 --- a/pkgs/by-name/ct/ctlptl/package.nix +++ b/pkgs/by-name/ct/ctlptl/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "ctlptl"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = "ctlptl"; rev = "v${finalAttrs.version}"; - hash = "sha256-vbg3gaVCFkQ6jKguNq6ClstEKpTrk9ryUG572emEY4U="; + hash = "sha256-0Y1baXkb37UKtT/lcoFdunRkxIpSCh+zfkjkZZ9SfXU="; }; vendorHash = "sha256-b9lzCNjO0rrK/kJlw5dssuQD/cyf/Wu/LJ2YNQ645LE="; From c0b04fdad8808971298d9045cb4a1cb281ae3713 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 07:32:24 +0000 Subject: [PATCH 183/305] fishPlugins.forgit: 26.04.0 -> 26.04.1 --- pkgs/shells/fish/plugins/forgit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index ab4a491fc181..20e810bba77f 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -6,13 +6,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "26.04.0"; + version = "26.04.1"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-H5Vuf+VIrurs9lwad/K4klElXvM1kg6LEjm/wgv1/z8="; + hash = "sha256-/tG//6s0km8IUJXI4f++/UUCTAOYTDE/C5bbkHFhdNY="; }; postInstall = '' From 66412c7548ed0e402edc321d0302edf37434bd9d Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 9 Apr 2026 10:49:03 +0300 Subject: [PATCH 184/305] qui: 1.15.0 -> 1.16.1 --- pkgs/by-name/qu/qui/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/qu/qui/package.nix b/pkgs/by-name/qu/qui/package.nix index fe06be4bb593..b7d475e5da1d 100644 --- a/pkgs/by-name/qu/qui/package.nix +++ b/pkgs/by-name/qu/qui/package.nix @@ -14,12 +14,12 @@ }: buildGo126Module (finalAttrs: { pname = "qui"; - version = "1.15.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "autobrr"; repo = "qui"; tag = "v${finalAttrs.version}"; - hash = "sha256-TdZNccViu+YArjziohnAHJ5js97iMD8qA5iGUPBbwDU="; + hash = "sha256-yqk5qOSXXL710VjwLlIdnHcp6TGqiN1G7r+g2jLrcdk="; }; qui-web = stdenvNoCC.mkDerivation (finalAttrs': { @@ -44,7 +44,7 @@ buildGo126Module (finalAttrs: { ; pnpm = pnpm_9; fetcherVersion = 3; - hash = "sha256-9ZPtkxRWzYm9SIYj/ncaKXo/xkyAamdcdFwvfbseb20="; + hash = "sha256-CgkIKLlckf5fhvZuBrTr+fI7CDyvuXQoqfyC2jQ3dnk="; }; postBuild = '' @@ -56,7 +56,7 @@ buildGo126Module (finalAttrs: { ''; }); - vendorHash = "sha256-eex2smQRfArp1+aWNh+yBV4AtHNSEEPRsyZVkDDOt5w="; + vendorHash = "sha256-FJWJgvX5SDp70kPaZAnTWzcKKrLOjkAVf6OFTBmyLos="; preBuild = '' cp -r ${finalAttrs.qui-web}/* web/dist From 445ef1116f44fdbd45d6fca1f4243fd2a2d14ee8 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 9 Apr 2026 10:52:06 +0300 Subject: [PATCH 185/305] netbird: 0.67.3 -> 0.68.1 Diff: https://github.com/netbirdio/netbird/compare/v0.67.3...v0.68.1 Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.68.1 --- pkgs/by-name/ne/netbird/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index 98c118fd339b..27c6680a3b65 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -67,16 +67,16 @@ let in buildGoModule (finalAttrs: { pname = "netbird-${componentName}"; - version = "0.67.3"; + version = "0.68.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-bt6NMyRxzzzAnMh0V62cu9+eg/jvV0RRwGqHJm32eZw="; + hash = "sha256-2/TnyN/CGIRlXEH2KxYaEJL7Q7dm3mRe3/00gYxCebg="; }; - vendorHash = "sha256-tsAbNuSqH8NjI6VWDXJ/9u3JKkBAnhjcEdeDXT2Bbv8="; + vendorHash = "sha256-NUdMiTPXgKb6vxF5odJ0MBBwatqA2SlN+0KR2Z8HoWM="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config; From 49cca1a3df3d068da374c676f39e53b54b0fc8ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 09:54:29 +0200 Subject: [PATCH 186/305] route-graph: 0.3.0 -> 0.4.0 Diff: https://github.com/audius/route-graph/compare/0.3.0...0.4.0 Changelog: https://github.com/audius/route-graph/releases/tag/0.4.0 --- pkgs/by-name/ro/route-graph/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix index 91fd936626d0..3cc4d733da41 100644 --- a/pkgs/by-name/ro/route-graph/package.nix +++ b/pkgs/by-name/ro/route-graph/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "route-graph"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "audius"; repo = "route-graph"; tag = finalAttrs.version; - hash = "sha256-NxATrPx1JzEripu4x2UkFSAgrJUYQ7P7U2C6EmNuY5g="; + hash = "sha256-aLTzej4YtKkQE5q8LKxIBe+aqrjwrG+2pbonzlWhLvU="; }; pythonRelaxDeps = [ @@ -33,8 +33,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: { typing-extensions ]); - # Project has no tests - doCheck = false; + nativeCheckInputs = with python3.pkgs; [ + pytest-mock + pytestCheckHook + ]; pythonImportsCheck = [ "route_graph" ]; From b9df05e43525a8279a02f9c47559ab94ed92f530 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 9 Apr 2026 09:54:44 +0200 Subject: [PATCH 187/305] nbytes: 0.1.3 -> 0.1.4 --- pkgs/by-name/nb/nbytes/package.nix | 19 +++++----------- .../nb/nbytes/use-nix-googletest.patch | 22 ------------------- 2 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 pkgs/by-name/nb/nbytes/use-nix-googletest.patch diff --git a/pkgs/by-name/nb/nbytes/package.nix b/pkgs/by-name/nb/nbytes/package.nix index 38b45611d4db..b886e53522f1 100644 --- a/pkgs/by-name/nb/nbytes/package.nix +++ b/pkgs/by-name/nb/nbytes/package.nix @@ -2,7 +2,6 @@ lib, cmake, fetchFromGitHub, - fetchpatch2, gtest, nix-update-script, stdenv, @@ -12,34 +11,28 @@ stdenv.mkDerivation (finalAttrs: { pname = "nbytes"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "nodejs"; repo = "nbytes"; tag = "v${finalAttrs.version}"; - hash = "sha256-10l/YrvZPwEdEh/Q170WhZUQzdFEpjy7zeKKzYfyoYc="; + hash = "sha256-etCRWjak7tKL6dKlQR7SD6HXx/mn/8gnR4l+CAjoQgA="; }; - patches = [ - # Use `gtest` from Nixpkgs to allow an offline build - ./use-nix-googletest.patch - ]; - - outputs = [ - "out" - ]; - nativeBuildInputs = [ cmake validatePkgConfig ]; - buildInputs = [ + + doCheck = true; + checkInputs = [ gtest ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "NBYTES_ENABLE_TESTING" finalAttrs.finalPackage.doCheck) ]; passthru = { diff --git a/pkgs/by-name/nb/nbytes/use-nix-googletest.patch b/pkgs/by-name/nb/nbytes/use-nix-googletest.patch deleted file mode 100644 index 859aa81603bd..000000000000 --- a/pkgs/by-name/nb/nbytes/use-nix-googletest.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2efa3c..3f363dd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,15 +11,9 @@ endif() - option(NBYTES_DEVELOPMENT_CHECKS "Enable development checks" OFF) - - include(GNUInstallDirs) --include(FetchContent) - --FetchContent_Declare( -- googletest -- URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip --) --# For Windows: Prevent overriding the parent project's compiler/linker settings --set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) --FetchContent_MakeAvailable(googletest) -+# Use find_package to use the gtest package provided by Nix -+find_package(GTest REQUIRED) - - add_subdirectory(src) - enable_testing() From 7e821aee58a5db88d2a63522992ce12f88edfc1a Mon Sep 17 00:00:00 2001 From: Aiden Schembri Date: Thu, 9 Apr 2026 10:09:00 +0200 Subject: [PATCH 188/305] zed-editor: 0.230.1 -> 0.231.1 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index b8a6156adf63..4d96e83f705e 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -111,7 +111,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.230.1"; + version = "0.231.1"; outputs = [ "out" @@ -124,7 +124,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-J+WnR0xGMWS5m8FWQfTwRCZckxt2Y5kQy06TvpYZks4="; + hash = "sha256-DTJ8+L5JzW0sN7G2ZibeTsPmqOBMw/8IoJ6ZDUU9HWQ="; }; postPatch = '' @@ -150,7 +150,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-EbRLFIKpPnfyGeh7jHVDilez++4elZ1rz2iO3U9XOpQ="; + cargoHash = "sha256-vFBkjos+Wa0E1li8t4ZCVnRq7q5XSQQe2fx0QqgaCiM="; nativeBuildInputs = [ cmake From 5a82fbf110a031928b6057c521b6d654aefaa732 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 08:10:13 +0000 Subject: [PATCH 189/305] terraform-providers.argoproj-labs_argocd: 7.15.1 -> 7.15.3 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 52f5d5575170..6ff2cb304dd3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -63,14 +63,14 @@ "vendorHash": "sha256-kg6RylB2sW5XLWxJLmIDq3h54rzQoCKrxVu7L76lvCE=" }, "argoproj-labs_argocd": { - "hash": "sha256-Nj7czoKDRDk4i75T7M990EBQr0yOU1Zwc0nU2wQ6YoY=", + "hash": "sha256-c6+WY4oXL8evvPk/RzVrwtgq4XLB/LzAH5tpjErbE60=", "homepage": "https://registry.terraform.io/providers/argoproj-labs/argocd", "owner": "argoproj-labs", "proxyVendor": true, "repo": "terraform-provider-argocd", - "rev": "v7.15.1", + "rev": "v7.15.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-CO09y7rdbY27VFX85pV2ocnO0rvhGJg3hXfLWaF+HTI=" + "vendorHash": "sha256-FHBpTYSmVivoqz+Eaa/r5y1f/saIx4l6mjOtZhxZVRw=" }, "auth0_auth0": { "hash": "sha256-1gtBZPyzYk3UqLrRKHeyLt/2KPPP6QlJYo042XNDWkY=", From 2eb18a122d3d6b306c38b1cbf5f3a6154d0184d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 08:18:22 +0000 Subject: [PATCH 190/305] vimPlugins.zig-vim: 0-unstable-2026-02-27 -> 0-unstable-2026-03-09 --- .../editors/vim/plugins/non-generated/zig-vim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix index 2c6fe14639c1..0b704e2f828a 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix @@ -6,13 +6,13 @@ }: vimUtils.buildVimPlugin { pname = "zig.vim"; - version = "0-unstable-2026-02-27"; + version = "0-unstable-2026-03-09"; src = fetchFromCodeberg { owner = "ziglang"; repo = "zig.vim"; - rev = "366ef4855d22fd1377b81c382542466475b73a01"; - hash = "sha256-bo6/lvDx8JCttwTVw1eAImF/b5Aa0ekDN5H6WI0TAdo="; + rev = "9e76c2843f6292dc9c804996d78244fe1028891a"; + hash = "sha256-eWQqr/LopjzFJhZC3mHdUrWVDcLPHDHkxcuhrJMaY3w="; }; passthru.updateScript = nix-update-script { From ecde3b364b3df5d9657bc41e6945240490815ac5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 08:37:06 +0000 Subject: [PATCH 191/305] discordo: 0-unstable-2026-03-30 -> 0-unstable-2026-04-09 --- pkgs/by-name/di/discordo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/di/discordo/package.nix b/pkgs/by-name/di/discordo/package.nix index 5f3cc1d70dac..f9a83fc65ec7 100644 --- a/pkgs/by-name/di/discordo/package.nix +++ b/pkgs/by-name/di/discordo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "discordo"; - version = "0-unstable-2026-03-30"; + version = "0-unstable-2026-04-09"; src = fetchFromGitHub { owner = "ayn2op"; repo = "discordo"; - rev = "48f3b5316c6a340da845c5d050b9de44d680184a"; - hash = "sha256-1SOpy8XCdfsY/Fbp4NjDS9KFA/zcSIIjZHMjIEYB+8M="; + rev = "d804e0271c51239e18109dd786be73347cf21dfd"; + hash = "sha256-dgj3JWJ3NGwBvvHV/phfjIHa612XNUfYArXXpzJ0Mf4="; }; - vendorHash = "sha256-yQlx61R1Lx5fkctSkm64uYLqHeZZydVubpIaP00XA+U="; + vendorHash = "sha256-BSYPEUE6qyNY4+ur+uVB66ogYVktm9AUCzLTMiJMmKQ="; env.CGO_ENABLED = 1; From 118166bfee6c6155527c497a974f7732fb2b8d9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 08:52:52 +0000 Subject: [PATCH 192/305] terraform-providers.vancluever_acme: 2.46.0 -> 2.46.1 --- .../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 52f5d5575170..883fb329439f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1418,13 +1418,13 @@ "vendorHash": null }, "vancluever_acme": { - "hash": "sha256-V/dkcnlqYyAdDAWpMp2ib0mlnDb1A6YlJHQhKyjKBo4=", + "hash": "sha256-aUfIrYKuNsZEv/YKqpHwb5E/aLS9EPc01bkli+Wa6Ek=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.46.0", + "rev": "v2.46.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-JayuT74/oNcmwtq/VePYRRQ5iyc2HfunDWYOVJsLTrE=" + "vendorHash": "sha256-E7ym1msahCoJw3Dxn4ex/1yQqodi/RCaO4cLRNpFbcM=" }, "venafi_venafi": { "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=", From b75283958be1a8e9f84184ddd7afefa9a94007ce Mon Sep 17 00:00:00 2001 From: Samuel Meenzen Date: Thu, 9 Apr 2026 10:59:28 +0200 Subject: [PATCH 193/305] zammad: 7.0.0 -> 7.0.1 --- pkgs/by-name/za/zammad/gemset.nix | 60 +++++++++++++++--------------- pkgs/by-name/za/zammad/package.nix | 10 ++--- pkgs/by-name/za/zammad/source.json | 4 +- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/za/zammad/gemset.nix b/pkgs/by-name/za/zammad/gemset.nix index e00c1e1e84dd..e28271028927 100644 --- a/pkgs/by-name/za/zammad/gemset.nix +++ b/pkgs/by-name/za/zammad/gemset.nix @@ -22,10 +22,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17z0flj504z9d5hmzmd8g2gmaiz1a3yndvkxmbz6qrkvjzr2pnxa"; + sha256 = "12xv89kmr6l6mflzqddk0zsmbbsr53mv9dz6z91sdcb3ifjd3881"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; actionmailbox = { dependencies = [ @@ -40,10 +40,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03yqbiiz9z1nqy4n7rhjpavn20lx5rvjbq0sl0dkvdiga15662zd"; + sha256 = "0m00a0sqf68rllzmsfkb02cqy4vi5q2lrrmgld1i5pf31iyahl96"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; actionmailer = { dependencies = [ @@ -58,10 +58,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jyyfp786csg4hmsxfywi8131p1pk51jzi8i9d9zn2lzw7c714iv"; + sha256 = "0qc5ycibnxricdlgmrihds0hqjli5hhksbv947nqbsfg8b4gl63r"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; actionpack = { dependencies = [ @@ -84,10 +84,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nyd4f58r11b0x5gsjlnyk2k9y2kd0zhv8szf82g9j1j5xccfr03"; + sha256 = "0dabvb49acbwvy91587cbn36ghv3bsyl14a9aq4ll4nxfn4qdpn9"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; actiontext = { dependencies = [ @@ -102,10 +102,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h13x9y767i9nan09jyhiw32s1gmdmcb4mjld1jvhadcd019gcs0"; + sha256 = "1q8jm23v29zv055wpgyrwzb008bvqbm4x8bb64l0f8r6ccywxwqj"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; actionview = { dependencies = [ @@ -124,10 +124,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0j0n38p02s73r9a8fg615z8m78n9agpf9d9b0v7i97m5wwgc9lsv"; + sha256 = "04ql6lpvdmrl5169y166pfr9w53c6f40jkgmn4ljgkzh7pkaj3vd"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; activejob = { dependencies = [ @@ -138,10 +138,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1knc9xwfnyqcxqzfsfix210ai2yhw9ps7j19aq5bk30n1rfsij6b"; + sha256 = "047asb83p78zh93v0q1svrfl6da3aqqbjlkwd2jap172pz1ybard"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; activemodel = { dependencies = [ "activesupport" ]; @@ -149,10 +149,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1z8dff84qgqinhwsj0i91r674vvg412kg72162zv216i7jn4yklg"; + sha256 = "1hjv2kmv7i0jk8zkng3pxa1kdd90qpgr3v60qvs764yw8qyq35n7"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; activerecord = { dependencies = [ @@ -164,10 +164,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cmz9k27zy0746zpljg28ir4857df9r3nza4c1acmrcr2wbjr8xx"; + sha256 = "1ri9l5v4601bxwrkl105k1ccxxg2wpvg6x94rwqr834irnv63cl9"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; activerecord-import = { dependencies = [ "activerecord" ]; @@ -209,10 +209,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0hx0chzrszc3kbjn8psagxaaas4ns5479kr0kxkc36685yb15ws7"; + sha256 = "1wrxnj6rqzp7n80f0cfrdalz7b2md6sqqmx8lrgd3klaiwzqm295"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; activesupport = { dependencies = [ @@ -238,10 +238,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0np97w7kc9dx7kx092nzhy3g6qxmqivcsfnzlzjzmd9kfxn3ljl9"; + sha256 = "08ybmp63qrfaxq7bv7mvb4xvfb4fcylw2a0szankzkrpdbzi7wip"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; acts_as_list = { dependencies = [ @@ -1588,10 +1588,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0r77iy9q5mvsplla88mgvxi27xjbll6svynikbr53mdfa32mdzzc"; + sha256 = "1xfr3686v5brfwhpz7cjj638rxzac5z0jh7cxay184jd9dwgngdn"; type = "gem"; }; - version = "2.12.1"; + version = "2.12.2"; }; icalendar-recurrence = { dependencies = [ @@ -1716,10 +1716,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11prr7nrxh1y4rfsqa51gy4ixx63r18cz9mdnmk0938va1ajf4gy"; + sha256 = "1kw39sqnr0lprwsd2h0zx1ic96skhqf88i14xv7c8drcicqvvqg7"; type = "gem"; }; - version = "2.18.1"; + version = "2.19.2"; }; json-jwt = { dependencies = [ @@ -3010,10 +3010,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nv2g40b3hks0gqp7pbapj26cxz78z73dl1mq7azkhrd5nir8i1n"; + sha256 = "1rjvzpnl0js6axlygij5a5c6cwmraxvv6z6c2px95qlbjj80zd2c"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; rails-controller-testing = { dependencies = [ @@ -3092,10 +3092,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0iybsmr8yv8gg6a4cikmh0394sk707qr7h85vny4mazzvi9xh0w2"; + sha256 = "1md96yl05v436jkgz9725cax9hf61sv74267cg7yidwnl3lwd65d"; type = "gem"; }; - version = "8.0.4"; + version = "8.0.5"; }; rainbow = { groups = [ diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix index 825dbb116d5d..77a8aa14bd9e 100644 --- a/pkgs/by-name/za/zammad/package.nix +++ b/pkgs/by-name/za/zammad/package.nix @@ -23,7 +23,7 @@ let pname = "zammad"; - version = "7.0.0"; + version = "7.0.1"; src = applyPatches { src = fetchFromGitHub (lib.importJSON ./source.json); @@ -32,9 +32,9 @@ let ]; postPatch = '' - sed -i -e "s|ruby '3.2.[0-9]\+'|ruby '${ruby.version}'|" Gemfile - sed -i -e "s|ruby 3.2.[0-9]\+p[0-9]\+|ruby ${ruby.version}|" Gemfile.lock - sed -i -e "s|3.2.[0-9]\+|${ruby.version}|" .ruby-version + sed -i -e "s|ruby '3.4.[0-9]\+'|ruby '${ruby.version}'|" Gemfile + sed -i -e "s|ruby 3.4.[0-9]\+p[0-9]\+|ruby ${ruby.version}|" Gemfile.lock + sed -i -e "s|3.4.[0-9]\+|${ruby.version}|" .ruby-version ${jq}/bin/jq '. += {name: "Zammad", version: "${version}"}' package.json | ${moreutils}/bin/sponge package.json ''; }; @@ -87,7 +87,7 @@ stdenvNoCC.mkDerivation { pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-oqVlhOzkqv+2mj/nDUR/PBXkRy5O7gtx2msEchGywfo="; + hash = "sha256-BhkKCo9fVkG7G2er/NVyEP17T8P1rLqCQdJlcjHsSxQ="; }; buildPhase = '' diff --git a/pkgs/by-name/za/zammad/source.json b/pkgs/by-name/za/zammad/source.json index 0888c84cd96f..2a45ffe78f6a 100644 --- a/pkgs/by-name/za/zammad/source.json +++ b/pkgs/by-name/za/zammad/source.json @@ -1,8 +1,8 @@ { "owner": "zammad", "repo": "zammad", - "rev": "f3228274c4feefac470d7efad12f240debd678bc", - "hash": "sha256-rMb8/owMhcxzFwN5yZ0t3ABtfPTrUd5CzDm1QwQOvek=", + "rev": "6a5ac49588022c610896a50516dc5876ac1f24b9", + "hash": "sha256-E2hDdl32C4dQOZqnbAOsJ12zJsC9bJ9qFPadm4rEeKA=", "fetchSubmodules": true } From acb0df8d297e98a2f15d6451867bff8d8d29a86f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 09:10:17 +0000 Subject: [PATCH 194/305] python3Packages.pybotvac: 0.0.28 -> 0.0.29 --- pkgs/development/python-modules/pybotvac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 0944e4590685..df375edd86da 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.28"; + version = "0.0.29"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-XIGG8HmjI3dSq42co2e05xHIYjIM39qVanMJLDqWFCg="; + hash = "sha256-9mapPFzdAAzHJFuFaxiyGh0utznzTSXzRa6AZRj/Oq8="; }; build-system = [ setuptools ]; From 33d25fce324dc25a2162e11f1fbd7c6bd6076f71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 09:28:52 +0000 Subject: [PATCH 195/305] python3Packages.pyosmium: 4.3.0 -> 4.3.1 --- pkgs/development/python-modules/pyosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 925c8730b17f..fa20f2cfa3f2 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; disabled = isPyPy; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "osmcode"; repo = "pyosmium"; tag = "v${version}"; - hash = "sha256-baLa3Zy67kbUBGoDqJjfO/ICSbr7cNYY8bUuVfcy3yQ="; + hash = "sha256-lEkT+3R6200XarMW1oZcOzMLPviDcpG8kQilXVWOyu0="; }; build-system = [ From bfed9e792f18471fdc306a0edb32217535b4c174 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 09:35:25 +0000 Subject: [PATCH 196/305] rundeck-cli: 2.0.9 -> 2.0.10 --- pkgs/by-name/ru/rundeck-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ru/rundeck-cli/package.nix b/pkgs/by-name/ru/rundeck-cli/package.nix index 0460f469e6f1..bff71bbf655a 100644 --- a/pkgs/by-name/ru/rundeck-cli/package.nix +++ b/pkgs/by-name/ru/rundeck-cli/package.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rundeck-cli"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { url = "https://github.com/rundeck/rundeck-cli/releases/download/v${finalAttrs.version}/rundeck-cli-${finalAttrs.version}-all.jar"; - hash = "sha256-c6QAgwyRCtoOlS7DEmjyK3BwHV122bilL6H+Hzrv2dQ="; + hash = "sha256-RiGWsscenvNpKr+yOHpy2F7dPZ3M/R9SWD+EKF7nq18="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From be70f1f7f91f8edbdee0f81e6f8bf01dbcbf75ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 11:38:32 +0200 Subject: [PATCH 197/305] audiness: 0.5.0 -> 1.0.0 Diff: https://github.com/audiusGmbH/audiness/compare/0.5.0...1.0.0 Changelog: https://github.com/audius/audiness/releases/tag/1.0.0 --- pkgs/by-name/au/audiness/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix index f6b3aba177a6..868497ae9e04 100644 --- a/pkgs/by-name/au/audiness/package.nix +++ b/pkgs/by-name/au/audiness/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "audiness"; - version = "0.5.0"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "audiness"; tag = finalAttrs.version; - hash = "sha256-+5NDea4p/JWEk305EhAtab3to36a74KR50eosw6c5qI="; + hash = "sha256-row372NA8/DJbI6WJyGmKrlfuCsxUa5inhMljRzShT8="; }; pythonRelaxDeps = [ @@ -29,12 +29,17 @@ python3.pkgs.buildPythonApplication (finalAttrs: { validators ]; + nativeCheckInputs = with python3.pkgs; [ + pytest-mock + pytestCheckHook + ]; + pythonImportsCheck = [ "audiness" ]; meta = { description = "CLI tool to interact with Nessus"; - homepage = "https://github.com/audiusGmbH/audiness"; - changelog = "https://github.com/audiusGmbH/audiness/releases/tag/${finalAttrs.version}"; + homepage = "https://github.com/audius/audiness"; + changelog = "https://github.com/audius/audiness/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "audiness"; From c754250402a55147c1144116f4ed46c63fd9722a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 11:42:25 +0200 Subject: [PATCH 198/305] python3Packages.pybotvac: migrate to finalAttrs --- pkgs/development/python-modules/pybotvac/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index df375edd86da..fab50f5cc6e3 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybotvac"; version = "0.0.29"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9mapPFzdAAzHJFuFaxiyGh0utznzTSXzRa6AZRj/Oq8="; }; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Python module for interacting with Neato Botvac Connected vacuum robots"; homepage = "https://github.com/stianaske/pybotvac"; - changelog = "https://github.com/stianaske/pybotvac/releases/tag/v${version}"; + changelog = "https://github.com/stianaske/pybotvac/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From c96d98cb106a195e0a919a6bb0f56af4094c591f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 09:46:56 +0000 Subject: [PATCH 199/305] wakatime-cli: 2.0.8 -> 2.2.0 --- pkgs/by-name/wa/wakatime-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix index f50240efc067..3d7810aae7e0 100644 --- a/pkgs/by-name/wa/wakatime-cli/package.nix +++ b/pkgs/by-name/wa/wakatime-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "wakatime-cli"; - version = "2.0.8"; + version = "2.2.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-VBlERyaoRmOO7CGPmF9R2f6sU+8BNJ3Ze4AX2mxezCo="; + hash = "sha256-TOdAcT+IS6XONIfkASRvd7oTSSW5VX8w5q5ASvJlQb8="; }; - vendorHash = "sha256-1BtTtR8wPVzzOEGv3te3hOeKakZX7cS+HYvoCLnuZ/c="; + vendorHash = "sha256-HngszNLX2b2EVvh8ovouIEvjBOJL1jA5AhA6Y11ke9Y="; ldflags = [ "-s" From ce05a72d3b81558bde2b4ca897c15fc6ef70ca8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 12:03:43 +0200 Subject: [PATCH 200/305] python3Packages.netbox-plugin-prometheus-sd: 1.2.0 -> 1.3.0 Changelog: https://github.com/FlxPeters/netbox-plugin-prometheus-sd/releases/tag/v1.3.0 --- .../python-modules/netbox-plugin-prometheus-sd/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix b/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix index 61150d906859..fe69526e3124 100644 --- a/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix +++ b/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix @@ -10,19 +10,17 @@ buildPythonPackage rec { pname = "netbox-plugin-prometheus-sd"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "FlxPeters"; repo = "netbox-plugin-prometheus-sd"; tag = "v${version}"; - hash = "sha256-L5kJnaY9gKpsWAgwkjVRQQauL2qViinqk7rHLXTVzT4="; + hash = "sha256-2SVfWkw6/AkDihWp9chU8rTqLiSn9ax4uLaK1xydfGM="; }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' substituteInPlace netbox_prometheus_sd/__init__.py \ --replace-fail "from extras.plugins import PluginConfig" "from netbox.plugins import PluginConfig" ''; From 53756dd54ee8845bb7f60c672a96e012620d6a42 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 12:06:21 +0200 Subject: [PATCH 201/305] python3Packages.netbox-plugin-prometheus-sd: migrate to finalAttrs --- .../netbox-interface-synchronization/default.nix | 7 ++++++- .../netbox-plugin-prometheus-sd/default.nix | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix b/pkgs/development/python-modules/netbox-interface-synchronization/default.nix index 1ed00a95154a..7cd73a59d825 100644 --- a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix +++ b/pkgs/development/python-modules/netbox-interface-synchronization/default.nix @@ -1,12 +1,15 @@ { lib, buildPythonPackage, - fetchFromGitHub, django, + fetchFromGitHub, netaddr, netbox, + numpy, + requests, setuptools, }: + buildPythonPackage rec { pname = "netbox-interface-synchronization"; version = "4.1.7"; @@ -24,6 +27,8 @@ buildPythonPackage rec { dependencies = [ django netaddr + requests + numpy ]; # netbox is required for the pythonImportsCheck; plugin does not provide unit tests diff --git a/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix b/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix index fe69526e3124..b125e7af9daa 100644 --- a/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix +++ b/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix @@ -8,7 +8,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-plugin-prometheus-sd"; version = "1.3.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "FlxPeters"; repo = "netbox-plugin-prometheus-sd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2SVfWkw6/AkDihWp9chU8rTqLiSn9ax4uLaK1xydfGM="; }; @@ -43,8 +43,8 @@ buildPythonPackage rec { meta = { description = "Netbox plugin to provide Netbox entires to Prometheus HTTP service discovery"; homepage = "https://github.com/FlxPeters/netbox-plugin-prometheus-sd"; - changelog = "https://github.com/FlxPeters/netbox-plugin-prometheus-sd/releases/tag/${src.tag}"; + changelog = "https://github.com/FlxPeters/netbox-plugin-prometheus-sd/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ xanderio ]; }; -} +}) From a9b57c69f314c300161ebcb4409a2642ad244162 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Fri, 27 Mar 2026 23:13:35 -0700 Subject: [PATCH 202/305] tree-sitter-grammars.tree-sitter-ocamllex: init at 0.25.0 --- .../parsing/tree-sitter/grammars/grammar-sources.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix index bf672fccf608..0284b6249420 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix @@ -1781,6 +1781,18 @@ }; }; + ocamllex = { + version = "0.25.0"; + url = "github:314eter/tree-sitter-ocamllex"; + hash = "sha256-mqp/qHr1zWMJinlMJ0HNAKuFUQ4NqQiLzKx0DoN4wGI="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + leungbk + ]; + }; + }; + odin = { version = "1.3.0-unstable-2025-01-12"; url = "github:tree-sitter-grammars/tree-sitter-odin"; From 76d3dd050d9407a92e1cfb72221b7b1a656f27a4 Mon Sep 17 00:00:00 2001 From: Harinn Date: Thu, 9 Apr 2026 17:25:44 +0700 Subject: [PATCH 203/305] rtk: 0.34.3 -> 0.35.0 --- pkgs/by-name/rt/rtk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rt/rtk/package.nix b/pkgs/by-name/rt/rtk/package.nix index 25908ef85288..4c855a81d91e 100644 --- a/pkgs/by-name/rt/rtk/package.nix +++ b/pkgs/by-name/rt/rtk/package.nix @@ -12,18 +12,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rtk"; - version = "0.34.3"; + version = "0.35.0"; src = fetchFromGitHub { owner = "rtk-ai"; repo = "rtk"; tag = "v${finalAttrs.version}"; - hash = "sha256-SQJhPit7efAjBezCNHtn5iZEEly6eApxsO9jGHLrKlg="; + hash = "sha256-7DAL4dsnq2ZWmkyoI+BeN21ouK0VyLvSxOCt5hPWCl4="; }; strictDeps = true; - cargoHash = "sha256-WpSwEx/pkGTIlDv1cTFtTcTC3YgddMYVbOLlqKYeDK0="; + cargoHash = "sha256-r/PCA15MsmERCq3z8nObxdbX3KijsrInxsgJ6aqRVc4="; nativeBuildInputs = [ makeWrapper From 374881e13ae192a790bca11cabd8382a8d503bf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 10:26:17 +0000 Subject: [PATCH 204/305] postgresqlPackages.pg_background: 1.9.1 -> 1.9.2 --- pkgs/servers/sql/postgresql/ext/pg_background.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_background.nix b/pkgs/servers/sql/postgresql/ext/pg_background.nix index 603693027b39..5d310ba278ec 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_background.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_background.nix @@ -8,13 +8,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg_background"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "vibhorkum"; repo = "pg_background"; tag = "v${finalAttrs.version}"; - hash = "sha256-UbqMz7s4rSr7kKeZb+UVMc2Xg2r5GuM34SxI6DEIMPg="; + hash = "sha256-R78lB/58/dfZPg4XZ5xGuQ/Ftv+SQzU4aeJop6tslK8="; }; buildInputs = postgresql.buildInputs; From c05492cbe729f859a6a1e1881fdb30c99b50885b Mon Sep 17 00:00:00 2001 From: bas Date: Thu, 9 Apr 2026 12:04:16 +0200 Subject: [PATCH 205/305] autobrr: add module tests to passthru --- pkgs/by-name/au/autobrr/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index 77900e44ee78..8da8322a2f9a 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, stdenvNoCC, nix-update-script, + nixosTests, nodejs, pnpm_10, fetchPnpmDeps, @@ -86,11 +87,14 @@ buildGoModule (finalAttrs: { versionCheckProgram = "${placeholder "out"}/bin/autobrrctl"; versionCheckProgramArg = "version"; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--subpackage" - "autobrr-web" - ]; + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "autobrr-web" + ]; + }; + tests.testService = nixosTests.autobrr; }; meta = { From 3707d70bcbaf5b9c42e2470cd928f6b4616544c8 Mon Sep 17 00:00:00 2001 From: bas Date: Thu, 9 Apr 2026 12:07:54 +0200 Subject: [PATCH 206/305] nixos/autobrr: add av-gal as maintainer --- nixos/modules/services/misc/autobrr.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/misc/autobrr.nix b/nixos/modules/services/misc/autobrr.nix index 9ea4cef85ac5..466ffe70cf20 100644 --- a/nixos/modules/services/misc/autobrr.nix +++ b/nixos/modules/services/misc/autobrr.nix @@ -83,4 +83,6 @@ in networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.settings.port ]; }; }; + + meta.maintainers = with lib.maintainers; [ av-gal ]; } From 562440897a57440244b267552fac12d89c6d4792 Mon Sep 17 00:00:00 2001 From: bas Date: Thu, 9 Apr 2026 12:12:42 +0200 Subject: [PATCH 207/305] nixos/autobrr: add options to settings submodule --- nixos/modules/services/misc/autobrr.nix | 28 +++++++++++++---- nixos/tests/autobrr.nix | 40 ++++++++++++++++++++----- 2 files changed, 55 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/misc/autobrr.nix b/nixos/modules/services/misc/autobrr.nix index 466ffe70cf20..264345792be1 100644 --- a/nixos/modules/services/misc/autobrr.nix +++ b/nixos/modules/services/misc/autobrr.nix @@ -28,13 +28,31 @@ in }; settings = lib.mkOption { - type = lib.types.submodule { freeformType = configFormat.type; }; - default = { - host = "127.0.0.1"; - port = 7474; - checkForUpdates = true; + type = lib.types.submodule { + freeformType = configFormat.type; + options = { + host = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = "The host address autobrr listens on."; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 7474; + description = "The port autobrr listens on."; + }; + + checkForUpdates = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Whether autobrr needs to check for updates."; + }; + }; }; + default = { }; example = { + port = 7654; logLevel = "DEBUG"; }; description = '' diff --git a/nixos/tests/autobrr.nix b/nixos/tests/autobrr.nix index c6b820057272..96f62b892dbd 100644 --- a/nixos/tests/autobrr.nix +++ b/nixos/tests/autobrr.nix @@ -6,18 +6,42 @@ nodes.machine = { pkgs, ... }: + let + # We create this secret in the Nix store (making it readable by everyone). + # DO NOT DO THIS OUTSIDE OF TESTS!! + testSecretFile = pkgs.writeText "session_secret" "not-secret"; + in { services.autobrr = { enable = true; - # We create this secret in the Nix store (making it readable by everyone). - # DO NOT DO THIS OUTSIDE OF TESTS!! - secretFile = pkgs.writeText "session_secret" "not-secret"; + secretFile = testSecretFile; + }; + + # Use port other than default to test if settings options work. + specialisation.settingsPort.configuration = { + services.autobrr = { + enable = true; + secretFile = testSecretFile; + settings.port = 7777; + }; }; }; - testScript = '' - machine.wait_for_unit("autobrr.service") - machine.wait_for_open_port(7474) - machine.succeed("curl --fail http://localhost:7474/") - ''; + testScript = + { nodes, ... }: + let + settingsPort = "${nodes.machine.system.build.toplevel}/specialisation/settingsPort"; + in + # python + '' + def test_webui(port): + machine.wait_for_unit("autobrr.service") + machine.wait_for_open_port(port) + machine.wait_until_succeeds(f"curl --fail http://localhost:{port}") + + test_webui(7474) + + machine.succeed("${settingsPort}/bin/switch-to-configuration test") + test_webui(7777) + ''; } From 50d1876c2dcca1c1b9ec85f4063ce797628c6958 Mon Sep 17 00:00:00 2001 From: bas Date: Thu, 9 Apr 2026 12:38:17 +0200 Subject: [PATCH 208/305] nixos/autobrr: use AUTOBRR__SESSION_SECRET_FILE --- nixos/modules/services/misc/autobrr.nix | 47 +++++++++++++++---------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/misc/autobrr.nix b/nixos/modules/services/misc/autobrr.nix index 264345792be1..47ada630cd82 100644 --- a/nixos/modules/services/misc/autobrr.nix +++ b/nixos/modules/services/misc/autobrr.nix @@ -8,8 +8,7 @@ let cfg = config.services.autobrr; configFormat = pkgs.formats.toml { }; - configTemplate = configFormat.generate "autobrr.toml" cfg.settings; - templaterCmd = ''${lib.getExe pkgs.dasel} put -f '${configTemplate}' -v "$(${config.systemd.package}/bin/systemd-creds cat sessionSecret)" -o %S/autobrr/config.toml "sessionSecret"''; + configFile = configFormat.generate "autobrr.toml" cfg.settings; in { options = { @@ -79,23 +78,35 @@ in } ]; - systemd.services.autobrr = { - description = "Autobrr"; - after = [ - "syslog.target" - "network-online.target" - ]; - wants = [ "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; + systemd = { + tmpfiles.settings = { + "10-autobrr" = { + # DynamicUser uses /var/lib/private/ + "/var/lib/private/autobrr/config.toml"."L+" = { + argument = "${configFile}"; + }; + }; + }; - serviceConfig = { - Type = "simple"; - DynamicUser = true; - LoadCredential = "sessionSecret:${cfg.secretFile}"; - StateDirectory = "autobrr"; - ExecStartPre = "${lib.getExe pkgs.bash} -c '${templaterCmd}'"; - ExecStart = "${lib.getExe cfg.package} --config %S/autobrr"; - Restart = "on-failure"; + services.autobrr = { + description = "Autobrr"; + after = [ + "syslog.target" + "network-online.target" + ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ configFile ]; + + serviceConfig = { + Type = "simple"; + DynamicUser = true; + LoadCredential = "sessionSecret:${cfg.secretFile}"; + Environment = [ "AUTOBRR__SESSION_SECRET_FILE=%d/sessionSecret" ]; + StateDirectory = "autobrr"; + ExecStart = "${lib.getExe cfg.package} --config %S/autobrr"; + Restart = "on-failure"; + }; }; }; From 0b6ef36e487f517ad459f2e581061a9828bcbf68 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 11:00:03 +0000 Subject: [PATCH 209/305] home-assistant-custom-components.solax_modbus: 2026.03.4 -> 2026.04.2 --- .../home-assistant/custom-components/solax_modbus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix index c2adeeb3bc20..4e9106835dd7 100644 --- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2026.03.4"; + version = "2026.04.2"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; tag = version; - hash = "sha256-bgXpwY2kWwOAQCE2BioOmhkWVXBSX4cXL71kkB7EomE="; + hash = "sha256-9T7rfFyNehd6dGNYJdXSXOcvUp87WEyvJQwr6yyeBRo="; }; dependencies = [ pymodbus ]; From abe821fb1c120917f911d5ad2b980c2802506723 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 11:03:21 +0000 Subject: [PATCH 210/305] mcp-nixos: 2.3.0 -> 2.3.1 --- pkgs/by-name/mc/mcp-nixos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mc/mcp-nixos/package.nix b/pkgs/by-name/mc/mcp-nixos/package.nix index d0fe8aa06966..ef1053c62ccb 100644 --- a/pkgs/by-name/mc/mcp-nixos/package.nix +++ b/pkgs/by-name/mc/mcp-nixos/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mcp-nixos"; - version = "2.3.0"; + version = "2.3.1"; pyproject = true; src = fetchFromGitHub { owner = "utensils"; repo = "mcp-nixos"; tag = "v${finalAttrs.version}"; - hash = "sha256-ogAug05ChGLSJ+KvmP5xXreDhkLHau15Wnp0ry7Ck88="; + hash = "sha256-A7KhRVOqLmtta507DPZoKbO8D1AlMMDWLMfHEBhEAxY="; }; build-system = [ python3Packages.hatchling ]; From 3f3e7abb147dee232245d52c47749049052ae452 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Fri, 14 Nov 2025 20:19:14 +0700 Subject: [PATCH 211/305] jc303: init at 0.12.3 --- pkgs/by-name/jc/jc303/package.nix | 186 ++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) create mode 100644 pkgs/by-name/jc/jc303/package.nix diff --git a/pkgs/by-name/jc/jc303/package.nix b/pkgs/by-name/jc/jc303/package.nix new file mode 100644 index 000000000000..df589c158785 --- /dev/null +++ b/pkgs/by-name/jc/jc303/package.nix @@ -0,0 +1,186 @@ +{ + stdenv, + fetchFromGitHub, + fetchpatch, + lib, + cmake, + pkg-config, + writableTmpDirAsHomeHook, + nix-update-script, + juce, + libx11, + libxrandr, + libxinerama, + libxext, + libxcursor, + freetype, + fontconfig, + alsa-lib, + + buildVST3 ? true, + buildLV2 ? true, + buildCLAP ? true, +}: + +let + juce-clap-extensions = fetchFromGitHub { + owner = "free-audio"; + repo = "clap-juce-extensions"; + rev = "02f91b7988298f7f1f05c706da16e1d9da852a87"; + hash = "sha256-cPi+prl+jLq/KvjZ5M2MxxZVLSKCiJB9SQHK8psW2OU="; + fetchSubmodules = true; + }; + + chowdsp_utils = fetchFromGitHub { + owner = "Chowdhury-DSP"; + repo = "chowdsp_utils"; + rev = "ffc70ba399f9afaeefb996eb14e55a1d487270b8"; # LIB_CHOWDSP_UTILS_TAG from CMakeLists.txt + hash = "sha256-rKjrhb+w/lW9k3Dg5jWM2eJRa0fPDF8SNVrCTFrRMoM="; + }; + + # src/dsp/guitarml-byod/CMakeLists.txt + rtneural = fetchFromGitHub { + owner = "jatinchowdhury18"; + repo = "RTNeural"; + rev = "04cb333bc4b174760958a77c7ce076eae38fe8e4"; # LIB_RTNEURAL_TAG + hash = "sha256-kTHYEpoXPYNKEs7rHeSwBHVQnOQKhKnST+UWa++uCsc="; + fetchSubmodules = true; + + postFetch = '' + # note: if rtneural is updated, this won't be needed anymore + substituteInPlace $out/CMakeLists.txt \ + --replace-fail "include(cmake/CPM.cmake)" "# No tests" \ + + # Required for CMake 4 + substituteInPlace $out/CMakeLists.txt \ + --replace-fail \ + "cmake_minimum_required(VERSION 3.5)" \ + "cmake_minimum_required(VERSION 4.0)" + ''; + }; + + # src/dsp/guitarml-byod/CMakeLists.txt + math_approx = fetchFromGitHub { + owner = "Chowdhury-DSP"; + repo = "math_approx"; + rev = "0c68d4d17242d707ba07fa7f1901692b7ed72d58"; # LIB_CHOWDSP_MATH_APPROX_TAG + hash = "sha256-t6UrsZGRJjJVp+aGkwBa++Skj9xkdQuZKAxRrTkfM0E="; + }; + + # src/dsp/guitarml-byod/CMakeLists.txt + ea_variant = fetchFromGitHub { + owner = "eyalamirmusic"; + repo = "Variant"; + rev = "3fce49cfca50ba3b05026d41ffc4911a8e653378"; # LIB_VARIANT_TAG + hash = "sha256-2zzam7rKY6zoT2jFqDtr4pwOCAWTu0GTxUqVGxVHbQQ="; + }; + + formats = lib.concatStringsSep " " [ + (lib.optionalString buildVST3 "VST3") + (lib.optionalString buildLV2 "LV2") + ]; +in +stdenv.mkDerivation (finalAttrs: { + pname = "jc303"; + version = "0.12.3"; + + src = fetchFromGitHub { + owner = "midilab"; + repo = "jc303"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5OA7ir8loT0Lx05guwuZNCW9J9I3TA5+A9JZ9E7oWXA="; + }; + + patches = [ + # `BUILD_CLAP` cmake flag + (fetchpatch { + url = "https://github.com/midilab/jc303/commit/837d3fc5cf4e993375403a45d7e23df1b4e3cf7f.diff"; + hash = "sha256-WvLIcSHrLiXj1VEV+IxS05YSWEq7oz57qIbNsqRySaY="; + }) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "set(PLUGIN_FORMATS AU VST3 LV2)" "set(PLUGIN_FORMATS ${formats})" \ + ''; + + nativeBuildInputs = [ + cmake + pkg-config + writableTmpDirAsHomeHook + ]; + + buildInputs = [ + libx11 + libxrandr + libxext + libxcursor + libxinerama + freetype + fontconfig + alsa-lib + ]; + + cmakeFlags = [ + # CMakeLists.txt + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_JUCE" "${juce.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_JUCE-CLAP-EXTENSIONS" "${juce-clap-extensions}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CHOWDSP_UTILS" "${chowdsp_utils}") + + # src/dsp/guitarml-byod/CMakeLists.txt + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_RTNEURAL" "${rtneural}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MATH_APPROX" "${math_approx}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_EA_VARIANT" "${ea_variant}") + + (lib.cmakeBool "BUILD_CLAP" buildCLAP) + ]; + + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + enableParallelBuilding = true; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux (toString [ + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. + "-ffat-lto-objects" + ]); + + installPhase = '' + runHook preInstall + + pushd JC303_artefacts/Release + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + cp -r VST3/JC303.vst3 $out/lib/vst3 + ''} + + ${lib.optionalString buildCLAP '' + mkdir -p $out/lib/clap + cp -r CLAP/JC303.clap $out/lib/clap + ''} + + ${lib.optionalString buildLV2 '' + mkdir -p $out/lib/lv2 + cp -r LV2/JC303.lv2 $out/lib/lv2 + ''} + popd + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Roland TB-303 clone plugin"; + homepage = "https://github.com/midilab/jc303"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.mrtnvgr ]; + }; +}) From eeb0f0a45a8fec27a357e0a4ca0e183d744b4012 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 11:10:53 +0000 Subject: [PATCH 212/305] libation: 13.3.2 -> 13.3.3 --- pkgs/by-name/li/libation/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index 3f8f95abd080..478bfb30edec 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -16,13 +16,13 @@ buildDotnetModule rec { pname = "libation"; - version = "13.3.2"; + version = "13.3.3"; src = fetchFromGitHub { owner = "rmcrackan"; repo = "Libation"; tag = "v${version}"; - hash = "sha256-IwKpM6BBHTbfdH4Sf3nYR0HDIxU8S5Pz0XxYdVRJcn4="; + hash = "sha256-nWmTk3oMuTcSvEzN/+2BnRWEqwLecRy2mS6uPNUP9UI="; }; sourceRoot = "${src.name}/Source"; From 4bb5600c29eb5ba2cb622cfb364a41ef16f90770 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 11:15:46 +0000 Subject: [PATCH 213/305] clojure: 1.12.4.1618 -> 1.12.4.1629 --- pkgs/by-name/cl/clojure/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clojure/package.nix b/pkgs/by-name/cl/clojure/package.nix index f2c3f2740f9d..8e8bcc40b292 100644 --- a/pkgs/by-name/cl/clojure/package.nix +++ b/pkgs/by-name/cl/clojure/package.nix @@ -13,12 +13,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.12.4.1618"; + version = "1.12.4.1629"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-E3adptY6mN6yAkN4rhpk5O4hGsEDU0DfynppRMQc3iE="; + hash = "sha256-swBF0lh+vAvPHKKoXHXXHcVtfHTefu5tx/3vwl93KM4="; }; nativeBuildInputs = [ From fb31a51f8cb28815f3674dd19d044e17a0e9bedf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 11:21:33 +0000 Subject: [PATCH 214/305] deezer-desktop: 7.1.120 -> 7.1.140 --- pkgs/by-name/de/deezer-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/deezer-desktop/package.nix b/pkgs/by-name/de/deezer-desktop/package.nix index ab20516815a8..12220e390402 100644 --- a/pkgs/by-name/de/deezer-desktop/package.nix +++ b/pkgs/by-name/de/deezer-desktop/package.nix @@ -8,15 +8,15 @@ }: let - version = "7.1.120"; + version = "7.1.140"; srcs = { x86_64-linux = fetchurl { url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz"; - hash = "sha256-RrsM8Rx/uYJpH9+w/XX0RoPw+N/+nzJCC+KFdbYzSdc="; + hash = "sha256-e7wgUH7sh8SwyRq/llCBu8ZuB74LTPiDEW35dfX8da4="; }; aarch64-linux = fetchurl { url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz"; - hash = "sha256-WgCfX7Av8YoCHmhACyyVtxut0FUfAdgTAXaIBydWTRI="; + hash = "sha256-6PA/f7QOXR9BZGtINtNW00BRQ6ghWVIJudQ+/lx7kZc="; }; }; From 74f15b9b2a861f166309090a67d92547d4e5d8e3 Mon Sep 17 00:00:00 2001 From: Mirza Arnaut Date: Thu, 9 Apr 2026 13:31:29 +0200 Subject: [PATCH 215/305] context7-mcp: 2.1.6 -> 2.1.7 --- pkgs/by-name/co/context7-mcp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix index 8c3dabd9feaf..a1c1dc60f8ee 100644 --- a/pkgs/by-name/co/context7-mcp/package.nix +++ b/pkgs/by-name/co/context7-mcp/package.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "context7-mcp"; - version = "2.1.4"; + version = "2.1.7"; src = fetchFromGitHub { owner = "upstash"; repo = "context7"; tag = "${tag-prefix}@${finalAttrs.version}"; - hash = "sha256-bQXmKY4I5k5uaQ2FVEOPkym5X3mR87nALf3+jqJjJjE="; + hash = "sha256-u0sFNX19ZBWvA7HYWdM4iI9AvEVz/CK6dLfZ80Rxa9c="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 3; - hash = "sha256-EjEdbPKXJbxaDBuAg/j+BSjI/W3HdsqbtDky0TPUB88="; + hash = "sha256-8RRHfCTZVC91T1Qx+ACCo2oG4ZwMNy5WYakCjmBhe3Q="; }; buildPhase = '' From 96590d9a80c11eac1be72ee3ffb298d7fbcadffa Mon Sep 17 00:00:00 2001 From: Mirza Arnaut Date: Thu, 9 Apr 2026 13:32:31 +0200 Subject: [PATCH 216/305] context7-mcp: add versionCheckHook --- pkgs/by-name/co/context7-mcp/package.nix | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix index a1c1dc60f8ee..d3fc98d89159 100644 --- a/pkgs/by-name/co/context7-mcp/package.nix +++ b/pkgs/by-name/co/context7-mcp/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, makeWrapper, nix-update-script, + versionCheckHook, nodejs, pnpm, @@ -62,25 +63,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - echo "Executing custom version check for MCP stdio server..." - - output=$(< /dev/null $out/bin/context7-mcp 2>&1 || true) - - if echo "$output" | grep -Fq "v${finalAttrs.version}"; then - echo "versionCheckPhase: found version v${finalAttrs.version}" - else - echo "versionCheckPhase: failed to find version v${finalAttrs.version}" - echo "Output was:" - echo "$output" - exit 1 - fi - - runHook postInstallCheck - ''; passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex '${tag-prefix}@(.*)'" ]; From aae94c5c77ffc655fc93cfb88fef59c12d85bac4 Mon Sep 17 00:00:00 2001 From: Mirza Arnaut Date: Thu, 9 Apr 2026 13:33:01 +0200 Subject: [PATCH 217/305] context7-mcp: fix nix-update-script arguments --- pkgs/by-name/co/context7-mcp/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix index d3fc98d89159..c30396501940 100644 --- a/pkgs/by-name/co/context7-mcp/package.nix +++ b/pkgs/by-name/co/context7-mcp/package.nix @@ -67,7 +67,10 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; passthru.updateScript = nix-update-script { - extraArgs = [ "--version-regex '${tag-prefix}@(.*)'" ]; + extraArgs = [ + "--version-regex" + "${tag-prefix}@(.*)" + ]; }; meta = { From 1157a9b3b54a9511cc51dc755426cedc90f2c348 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 11:45:52 +0000 Subject: [PATCH 218/305] clash-meta: 1.19.22 -> 1.19.23 --- pkgs/by-name/mi/mihomo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index 03d7cc2dfefb..dd239f3e18f8 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.19.22"; + version = "1.19.23"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-HRFtKx9g7AsBPl3HlOf+2giDc6a7e4YmQZlg4hElfdI="; + hash = "sha256-0KaTf/FXlLBxbq6ViNkD4uSIKJ7pNxEBMFIYL983hAY="; }; - vendorHash = "sha256-K5lC6bvetwaXvufa+FU+noXWXBem/IZ1pkl2eLo7vTc="; + vendorHash = "sha256-4xu/ZcoFCpO226tVfhVwkXaTEIyblFjKezX/haHjyNE="; excludedPackages = [ "./test" ]; From 86f2907f989b96da450efc807985df9a278505fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 11:47:52 +0000 Subject: [PATCH 219/305] sprite: 0.0.1-rc42 -> 0.0.1-rc43 --- pkgs/by-name/sp/sprite/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sp/sprite/package.nix b/pkgs/by-name/sp/sprite/package.nix index c5550d7a4dfd..08103661017c 100644 --- a/pkgs/by-name/sp/sprite/package.nix +++ b/pkgs/by-name/sp/sprite/package.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sprite"; - version = "0.0.1-rc42"; + version = "0.0.1-rc43"; src = fetchurl { url = "https://sprites-binaries.t3.storage.dev/client/v${finalAttrs.version}/sprite-${ @@ -16,10 +16,10 @@ stdenv.mkDerivation (finalAttrs: { }-${if stdenv.hostPlatform.isx86_64 then "amd64" else "arm64"}.tar.gz"; hash = { - aarch64-darwin = "sha256-ih0RonsNu7ZHUWbQcMqHmm7RXg0VvekDvq6WpnKvSjY="; - x86_64-darwin = "sha256-p3Tpf2Mg0rfOaw/y7cKI2Q7SvEpm+a1ykYVrr/dzVLc="; - aarch64-linux = "sha256-vMhkzX9noNL8Aw6MWhEAYmufCRpLsY/FbveBP3PYrQQ="; - x86_64-linux = "sha256-Jmym6yg0Wl83KTn840jWF3md5+r4NBh8czQudY5Iomk="; + aarch64-darwin = "sha256-6ztxc59b2H76+o7k7zMOvA/PAOib4m7WRXo1XsigL04="; + x86_64-darwin = "sha256-Ni779eJIFbZQ/zrAA3zQyYFFQ7ikEU9UYL9GeO1OcKA="; + aarch64-linux = "sha256-YTNHlVknlVkyUsiI422Quo04CyIMxCbrjhPvGADHw2s="; + x86_64-linux = "sha256-wEClvx4Kv7WK4uMYwNJqvsvjyQsonI01xlCo3z7CuwQ="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 50448097333e9e6598bac815570d365a9714756c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 11:58:39 +0000 Subject: [PATCH 220/305] proton-vpn: 4.15.1 -> 4.15.2 --- pkgs/by-name/pr/proton-vpn/linux.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-vpn/linux.nix b/pkgs/by-name/pr/proton-vpn/linux.nix index 758c425f9b85..d14ed210c869 100644 --- a/pkgs/by-name/pr/proton-vpn/linux.nix +++ b/pkgs/by-name/pr/proton-vpn/linux.nix @@ -14,14 +14,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "proton-vpn"; - version = "4.15.1"; + version = "4.15.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; tag = "v${finalAttrs.version}"; - hash = "sha256-mWQW/KR2zQxSMkcu5k79H3TNATmFB6J2vgFhgXNpM2s="; + hash = "sha256-spxlYITDo2TZp4Qv47/HmiIaGU07THZXLG5cFIFZrow="; }; nativeBuildInputs = [ From b5fbd6ab90da6ff56cd6bfb5b3cba7d02ab00b62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 12:02:36 +0000 Subject: [PATCH 221/305] dn42-registry-wizard: 0.4.19 -> 0.4.20 --- pkgs/by-name/dn/dn42-registry-wizard/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dn/dn42-registry-wizard/package.nix b/pkgs/by-name/dn/dn42-registry-wizard/package.nix index 41add124d1a3..3bbe574b6dd9 100644 --- a/pkgs/by-name/dn/dn42-registry-wizard/package.nix +++ b/pkgs/by-name/dn/dn42-registry-wizard/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dn42-registry-wizard"; - version = "0.4.19"; + version = "0.4.20"; src = fetchFromGitHub { owner = "Kioubit"; repo = "dn42_registry_wizard"; tag = "v${finalAttrs.version}"; - hash = "sha256-axtNkBX0OTm/3HwpZATsAefW/LEFDtTODLJgHJiFws8="; + hash = "sha256-WFU1K0Ib1ETSib2WJkwus3zHYJXoVOtFDqv4/QNiP7E="; }; - cargoHash = "sha256-VfdxsS8VIgDDyhNXML5jVl+9uxwHa83aWB6nJ7mHflI="; + cargoHash = "sha256-o8MF6uqk8f0Zc2fjBqLGElh56TKjLRRtNxrll5nY+bM="; postInstall = '' mv $out/bin/{registry_wizard,dn42-registry-wizard} From 50adaf4dada98728e3140b3a087d140a0b145d53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 12:02:56 +0000 Subject: [PATCH 222/305] actool: 1.3.2 -> 1.4.0 --- pkgs/by-name/ac/actool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ac/actool/package.nix b/pkgs/by-name/ac/actool/package.nix index 079c79f9fdc8..f74aa007be56 100644 --- a/pkgs/by-name/ac/actool/package.nix +++ b/pkgs/by-name/ac/actool/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "actool"; - version = "1.3.2"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "viraptor"; repo = "actool"; tag = finalAttrs.version; - hash = "sha256-4g4Uex6eE5ULKi9JGaOIlyTAzwuK0cPKdYMxTnvKN3U="; + hash = "sha256-WtiunUS0E6t7X+5lZqm4vZJ7C4dvFGiUKfjvHwNNtR0="; }; build-system = with python3Packages; [ From 335e648e74bb03a88b82c2a84ff6e68661a4c837 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 12:05:33 +0000 Subject: [PATCH 223/305] betterleaks: 1.1.1 -> 1.1.2 --- pkgs/by-name/be/betterleaks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/betterleaks/package.nix b/pkgs/by-name/be/betterleaks/package.nix index 0c4d6b2358d0..14ff444c2642 100644 --- a/pkgs/by-name/be/betterleaks/package.nix +++ b/pkgs/by-name/be/betterleaks/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "betterleaks"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "betterleaks"; repo = "betterleaks"; tag = "v${finalAttrs.version}"; - hash = "sha256-PJGFvm+QoExUMliL6rvBAKKjt8Ce5VZfQxCYbpXUXfU="; + hash = "sha256-JgwusK6iYuFkba1Gekir9ufKStqL8phmKbIgNzF+JDE="; }; - vendorHash = "sha256-lIblIctRnq//ic+most3g9Ff92XhfqbFfHrLdI0beQQ="; + vendorHash = "sha256-wAYKsNI4FxF702Jb/82u5Ga/u2+ReRPo3LamPIHw6tM="; ldflags = [ "-s" From 16aacb40e80d4a84d11a31a16c9093c8817159a2 Mon Sep 17 00:00:00 2001 From: Alexander Nabokikh Date: Thu, 9 Apr 2026 14:07:53 +0200 Subject: [PATCH 224/305] hyprland: use absolute uwsm paths in hyprland-uwsm.desktop --- pkgs/by-name/hy/hyprland/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 2af08df87af1..1bf942534d48 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -33,6 +33,7 @@ re2, systemd, tomlplusplus, + uwsm, wayland, wayland-protocols, wayland-scanner, @@ -100,6 +101,9 @@ customStdenv.mkDerivation (finalAttrs: { --replace-fail "@PREFIX@/" "" substituteInPlace example/hyprland.desktop.in \ --replace-fail "@PREFIX@/" "" + substituteInPlace systemd/hyprland-uwsm.desktop \ + --replace-fail "Exec=uwsm " "Exec=${lib.getExe uwsm} " \ + --replace-fail "TryExec=uwsm" "TryExec=${lib.getExe uwsm}" ''; # variables used by CMake, and shown in `hyprctl version` From 8f143dd4342bb0354ad8cf22f303e990098587c2 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:20:18 +0200 Subject: [PATCH 225/305] vimPlugins.windsurf-nvim: move to non-generated --- .../editors/vim/plugins/generated.nix | 13 --- .../non-generated/windsurf-nvim/default.nix | 106 ++++++++++++++++++ .../editors/vim/plugins/overrides.nix | 83 -------------- .../editors/vim/plugins/vim-plugin-names | 1 - 4 files changed, 106 insertions(+), 97 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 27a617661a66..0bdd6a0d9575 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -23266,19 +23266,6 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - windsurf-nvim = buildVimPlugin { - pname = "windsurf.nvim"; - version = "0-unstable-2025-04-30"; - src = fetchFromGitHub { - owner = "Exafunction"; - repo = "windsurf.nvim"; - rev = "821b570b526dbb05b57aa4ded578b709a704a38a"; - hash = "sha256-TWezce2+XrkzaiW/V3VgfX3FMdS8qFE8/FfPEK/Ii84="; - }; - meta.homepage = "https://github.com/Exafunction/windsurf.nvim/"; - meta.hydraPlatforms = [ ]; - }; - windsurf-vim = buildVimPlugin { pname = "windsurf.vim"; version = "1.20.8-unstable-2026-01-22"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix new file mode 100644 index 000000000000..ca8b0fec8b1c --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix @@ -0,0 +1,106 @@ +{ + lib, + codeium, + fetchFromGitHub, + fetchurl, + jq, + stdenv, + vimPlugins, + vimUtils, +}: +let + # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json + codeiumVersion = "1.20.9"; + codeiumHashes = { + x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM="; + aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4="; + x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE="; + aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48="; + }; + + codeium' = codeium.overrideAttrs rec { + version = codeiumVersion; + + src = + let + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + platform = + { + x86_64-linux = "linux_x64"; + aarch64-linux = "linux_arm"; + x86_64-darwin = "macos_x64"; + aarch64-darwin = "macos_arm"; + } + .${system} or throwSystem; + + hash = codeiumHashes.${system} or throwSystem; + in + fetchurl { + name = "codeium-${version}.gz"; + url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${version}/language_server_${platform}.gz"; + inherit hash; + }; + }; +in +vimUtils.buildVimPlugin { + pname = "windsurf.nvim"; + version = "0-unstable-2025-04-30"; + src = fetchFromGitHub { + owner = "Exafunction"; + repo = "windsurf.nvim"; + rev = "821b570b526dbb05b57aa4ded578b709a704a38a"; + hash = "sha256-TWezce2+XrkzaiW/V3VgfX3FMdS8qFE8/FfPEK/Ii84="; + }; + + dependencies = [ vimPlugins.plenary-nvim ]; + buildPhase = '' + cat << EOF > lua/codeium/installation_defaults.lua + return { + tools = { + language_server = "${codeium'}/bin/codeium_language_server" + }; + }; + EOF + ''; + + doCheck = true; + checkInputs = [ + jq + codeium' + ]; + checkPhase = '' + runHook preCheck + + expected_codeium_version=$(jq -r '.version' lua/codeium/versions.json) + actual_codeium_version=$(codeium_language_server --version) + + expected_codeium_stamp=$(jq -r '.stamp' lua/codeium/versions.json) + actual_codeium_stamp=$(codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2) + + if [ "$actual_codeium_stamp" != "$expected_codeium_stamp" ]; then + echo " + The version of codeium patched in vimPlugins.codeium-nvim is incorrect. + Expected stamp: $expected_codeium_stamp + Actual stamp: $actual_codeium_stamp + + Expected codeium version: $expected_codeium_version + Actual codeium version: $actual_codeium_version + + Please, update 'codeiumVersion' in pkgs/applications/editors/vim/plugins/overrides.nix accordingly to: + https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json + " + exit 1 + fi + + runHook postCheck + ''; + + meta = { + description = "Native neovim extension for Codeium"; + homepage = "https://github.com/Exafunction/windsurf.nvim"; + license = lib.licenses.mit; + platforms = lib.attrNames codeiumHashes; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index c79da53f66fe..c2cf81fbdfcd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -735,89 +735,6 @@ assertNoAdditions { nvimSkipModules = [ "codesettings.build.cli" ]; }; - windsurf-nvim = - let - # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json - codeiumVersion = "1.20.9"; - codeiumHashes = { - x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM="; - aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4="; - x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE="; - aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48="; - }; - - codeium' = codeium.overrideAttrs rec { - version = codeiumVersion; - - src = - let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - - platform = - { - x86_64-linux = "linux_x64"; - aarch64-linux = "linux_arm"; - x86_64-darwin = "macos_x64"; - aarch64-darwin = "macos_arm"; - } - .${system} or throwSystem; - - hash = codeiumHashes.${system} or throwSystem; - in - fetchurl { - name = "codeium-${version}.gz"; - url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${version}/language_server_${platform}.gz"; - inherit hash; - }; - }; - - in - super.windsurf-nvim.overrideAttrs { - dependencies = [ self.plenary-nvim ]; - buildPhase = '' - cat << EOF > lua/codeium/installation_defaults.lua - return { - tools = { - language_server = "${codeium'}/bin/codeium_language_server" - }; - }; - EOF - ''; - - doCheck = true; - checkInputs = [ - jq - codeium' - ]; - checkPhase = '' - runHook preCheck - - expected_codeium_version=$(jq -r '.version' lua/codeium/versions.json) - actual_codeium_version=$(codeium_language_server --version) - - expected_codeium_stamp=$(jq -r '.stamp' lua/codeium/versions.json) - actual_codeium_stamp=$(codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2) - - if [ "$actual_codeium_stamp" != "$expected_codeium_stamp" ]; then - echo " - The version of codeium patched in vimPlugins.codeium-nvim is incorrect. - Expected stamp: $expected_codeium_stamp - Actual stamp: $actual_codeium_stamp - - Expected codeium version: $expected_codeium_version - Actual codeium version: $actual_codeium_version - - Please, update 'codeiumVersion' in pkgs/applications/editors/vim/plugins/overrides.nix accordingly to: - https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json - " - exit 1 - fi - - runHook postCheck - ''; - }; - codewindow-nvim = super.codewindow-nvim.overrideAttrs { dependencies = [ self.nvim-treesitter-legacy ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 417b027b2b73..a8bb5fbf3787 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1787,7 +1787,6 @@ https://github.com/SUSTech-data/wildfire.nvim/,HEAD, https://github.com/gcmt/wildfire.vim/,, https://github.com/fgheng/winbar.nvim/,main, https://github.com/anuvyklack/windows.nvim/,, -https://github.com/Exafunction/windsurf.nvim/,HEAD, https://github.com/Exafunction/windsurf.vim/,HEAD, https://github.com/sindrets/winshift.nvim/,, https://github.com/wannesm/wmgraphviz.vim/,, From 97673d2b4037440acc7ba6ffaf453cbcf290bc11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 12:27:56 +0000 Subject: [PATCH 226/305] libretro.play: 0-unstable-2026-03-31 -> 0-unstable-2026-04-07 --- pkgs/applications/emulators/libretro/cores/play.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index 4dd6b1f215b0..8babb39b5a13 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2026-03-31"; + version = "0-unstable-2026-04-07"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "cd1dba563cb39925796175f2b8ce95a15c90ee1a"; - hash = "sha256-nP22juzUOuD/SQqrIm3AXfa1x98Uqf9rKLhzhXA4yQI="; + rev = "d862ad9cae6c76cbe494db54fa985f21bfcef2a8"; + hash = "sha256-//P/ApU/36TamIMepjoBWsUHs2tR5K47V9Gf5HG3goE="; fetchSubmodules = true; }; From 75fc4e3daea740fa28592504b5d03b6983a06a04 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:29:56 +0200 Subject: [PATCH 227/305] vimPlugins.aider-nvim: avoid using prime (') For some reason, it breaks keep-sorted. Also `aider-chat` does not have `aider` binary. --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index c2cf81fbdfcd..e03819063fc8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -194,7 +194,9 @@ assertNoAdditions { aider-nvim = super.aider-nvim.overrideAttrs { patches = [ - (replaceVars ./patches/aider-nvim/bin.patch { aider = lib.getExe' aider-chat "aider"; }) + (replaceVars ./patches/aider-nvim/bin.patch { + aider = lib.getExe aider-chat; + }) ]; }; From 8989e7dba0307270cac09310bab291db5af29aa7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 12:30:37 +0000 Subject: [PATCH 228/305] python3Packages.wiim: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/wiim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wiim/default.nix b/pkgs/development/python-modules/wiim/default.nix index 71dbb31e5f9a..612be92c7006 100644 --- a/pkgs/development/python-modules/wiim/default.nix +++ b/pkgs/development/python-modules/wiim/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "wiim"; - version = "0.1.0"; + version = "0.1.1"; pyproject = true; src = fetchFromGitHub { owner = "Linkplay2020"; repo = "wiim"; tag = "v${finalAttrs.version}"; - hash = "sha256-cX8CLbzoNUs8u0+HLcg9C5aw48Dw/wI19T/q/5np6KE="; + hash = "sha256-WJbnVJ7ZM4wZk3Y8zTRc3i24CyTA8Wz9EKYr5BNlx6o="; }; build-system = [ setuptools ]; From cfbee4633d20ffdee095bcb529991372d4857c3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 12:31:16 +0000 Subject: [PATCH 229/305] wl-tray-bridge: 0.1.0-unstable-2026-02-16 -> 0-unstable-2026-02-16 --- pkgs/by-name/wl/wl-tray-bridge/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wl/wl-tray-bridge/package.nix b/pkgs/by-name/wl/wl-tray-bridge/package.nix index e753bbee7f7d..88bd1867ae80 100644 --- a/pkgs/by-name/wl/wl-tray-bridge/package.nix +++ b/pkgs/by-name/wl/wl-tray-bridge/package.nix @@ -11,7 +11,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wl-tray-bridge"; - version = "0.1.0-unstable-2026-02-16"; + version = "0-unstable-2026-02-16"; src = fetchFromGitHub { owner = "mahkoh"; From af966d305a6b3c4635f261d2403f8bacbdf6cb91 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:31:59 +0200 Subject: [PATCH 230/305] vim/plugins/overrides.nix: run keep-sorted --- .../editors/vim/plugins/overrides.nix | 410 +++++++++--------- 1 file changed, 206 insertions(+), 204 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e03819063fc8..ac3f29e5730b 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -233,15 +233,15 @@ assertNoAdditions { checkInputs = [ self.toggleterm-nvim ]; }; - autosave-nvim = super.autosave-nvim.overrideAttrs { - dependencies = [ self.plenary-nvim ]; - }; - auto-session = super.auto-session.overrideAttrs { # Optional integration checkInputs = [ self.telescope-nvim ]; }; + autosave-nvim = super.autosave-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + aw-watcher-vim = super.aw-watcher-vim.overrideAttrs { patches = [ (replaceVars ./patches/aw-watcher-vim/program_paths.patch { @@ -316,6 +316,10 @@ assertNoAdditions { dependencies = [ self.plenary-nvim ]; }; + blink-cmp-env = super.blink-cmp-env.overrideAttrs { + dependencies = [ self.blink-cmp ]; + }; + blink-cmp-git = super.blink-cmp-git.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -336,14 +340,6 @@ assertNoAdditions { ]; }; - blink-emoji-nvim = super.blink-emoji-nvim.overrideAttrs { - dependencies = [ self.blink-cmp ]; - }; - - blink-nerdfont-nvim = super.blink-nerdfont-nvim.overrideAttrs { - dependencies = [ self.blink-cmp ]; - }; - blink-cmp-words = super.blink-cmp-words.overrideAttrs (old: { dependencies = [ self.blink-cmp ]; meta = old.meta // { @@ -352,11 +348,15 @@ assertNoAdditions { }; }); - blink-cmp-env = super.blink-cmp-env.overrideAttrs { + blink-cmp-yanky = super.blink-cmp-yanky.overrideAttrs { dependencies = [ self.blink-cmp ]; }; - blink-cmp-yanky = super.blink-cmp-yanky.overrideAttrs { + blink-emoji-nvim = super.blink-emoji-nvim.overrideAttrs { + dependencies = [ self.blink-cmp ]; + }; + + blink-nerdfont-nvim = super.blink-nerdfont-nvim.overrideAttrs { dependencies = [ self.blink-cmp ]; }; @@ -455,6 +455,12 @@ assertNoAdditions { ]; }; + claude-fzf-history-nvim = super.claude-fzf-history-nvim.overrideAttrs { + dependencies = with self; [ + fzf-lua + ]; + }; + claude-fzf-nvim = super.claude-fzf-nvim.overrideAttrs { dependencies = with self; [ claudecode-nvim @@ -468,12 +474,6 @@ assertNoAdditions { ''; }; - claude-fzf-history-nvim = super.claude-fzf-history-nvim.overrideAttrs { - dependencies = with self; [ - fzf-lua - ]; - }; - clighter8 = super.clighter8.overrideAttrs { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${lib.getLib llvmPackages.clang.cc}/lib/libclang.so')|" \ @@ -586,11 +586,6 @@ assertNoAdditions { checkInputs = [ self.nvim-cmp ]; }; - cmp_luasnip = super.cmp_luasnip.overrideAttrs { - checkInputs = [ self.nvim-cmp ]; - dependencies = [ self.luasnip ]; - }; - cmp-neosnippet = super.cmp-neosnippet.overrideAttrs { checkInputs = [ self.nvim-cmp ]; dependencies = [ self.neosnippet-vim ]; @@ -685,6 +680,11 @@ assertNoAdditions { dependencies = [ zsh ]; }; + cmp_luasnip = super.cmp_luasnip.overrideAttrs { + checkInputs = [ self.nvim-cmp ]; + dependencies = [ self.luasnip ]; + }; + cobalt2-nvim = super.cobalt2-nvim.overrideAttrs { dependencies = with self; [ colorbuddy-nvim ]; # Few broken themes @@ -699,6 +699,15 @@ assertNoAdditions { ]; }; + codecompanion-history-nvim = super.codecompanion-history-nvim.overrideAttrs { + dependencies = with self; [ + # transitive dependency for codecompanion-nvim + plenary-nvim + + codecompanion-nvim + ]; + }; + codecompanion-nvim = super.codecompanion-nvim.overrideAttrs { checkInputs = with self; [ # Optional completion @@ -723,15 +732,6 @@ assertNoAdditions { ]; }; - codecompanion-history-nvim = super.codecompanion-history-nvim.overrideAttrs { - dependencies = with self; [ - # transitive dependency for codecompanion-nvim - plenary-nvim - - codecompanion-nvim - ]; - }; - codesettings-nvim = super.codesettings-nvim.overrideAttrs { # This module is a build CLI and should not be `require`d directly! nvimSkipModules = [ "codesettings.build.cli" ]; @@ -806,19 +806,6 @@ assertNoAdditions { nvimSkipModules = [ "context.highlight" ]; }; - CopilotChat-nvim = super.CopilotChat-nvim.overrideAttrs { - checkInputs = with self; [ - # Optional integrations - fzf-lua - telescope-nvim - snacks-nvim - ]; - dependencies = with self; [ - copilot-lua - plenary-nvim - ]; - }; - copilot-cmp = super.copilot-cmp.overrideAttrs { dependencies = [ self.copilot-lua ]; }; @@ -843,6 +830,19 @@ assertNoAdditions { }; }); + CopilotChat-nvim = super.CopilotChat-nvim.overrideAttrs { + checkInputs = with self; [ + # Optional integrations + fzf-lua + telescope-nvim + snacks-nvim + ]; + dependencies = with self; [ + copilot-lua + plenary-nvim + ]; + }; + coq_nvim = super.coq_nvim.overrideAttrs { passthru.python3Dependencies = ps: with ps; [ @@ -966,6 +966,10 @@ assertNoAdditions { dependencies = [ self.ddc-vim ]; }; + ddc-ui-native = super.ddc-ui-native.overrideAttrs { + dependencies = [ self.ddc-vim ]; + }; + ddc-ui-pum = super.ddc-ui-pum.overrideAttrs { dependencies = with self; [ ddc-vim @@ -973,10 +977,6 @@ assertNoAdditions { ]; }; - ddc-ui-native = super.ddc-ui-native.overrideAttrs { - dependencies = [ self.ddc-vim ]; - }; - ddc-vim = super.ddc-vim.overrideAttrs { dependencies = [ self.denops-vim ]; }; @@ -1293,16 +1293,12 @@ assertNoAdditions { runtimeDeps = [ curl ]; }; - ghcid = super.ghcid.overrideAttrs { - configurePhase = "cd plugins/nvim"; - }; - gh-nvim = super.gh-nvim.overrideAttrs { dependencies = [ self.litee-nvim ]; }; - gitlinker-nvim = super.gitlinker-nvim.overrideAttrs { - dependencies = [ self.plenary-nvim ]; + ghcid = super.ghcid.overrideAttrs { + configurePhase = "cd plugins/nvim"; }; git-conflict-nvim = super.git-conflict-nvim.overrideAttrs { @@ -1321,6 +1317,10 @@ assertNoAdditions { dependencies = [ self.plenary-nvim ]; }; + gitlinker-nvim = super.gitlinker-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + go-nvim = super.go-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter @@ -1600,6 +1600,23 @@ assertNoAdditions { } ); + lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs { + dependencies = [ self.nvim-lspconfig ]; + }; + + lazy-nvim = super.lazy-nvim.overrideAttrs { + patches = [ ./patches/lazy-nvim/no-helptags.patch ]; + nvimSkipModules = [ + # Requires headless config option + "lazy.manage.task.init" + "lazy.manage.checker" + "lazy.manage.init" + "lazy.manage.runner" + "lazy.view.commands" + "lazy.build" + ]; + }; + lazydocker-nvim = super.lazydocker-nvim.overrideAttrs { runtimeDeps = [ lazydocker @@ -1643,23 +1660,6 @@ assertNoAdditions { ]; }; - lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs { - dependencies = [ self.nvim-lspconfig ]; - }; - - lazy-nvim = super.lazy-nvim.overrideAttrs { - patches = [ ./patches/lazy-nvim/no-helptags.patch ]; - nvimSkipModules = [ - # Requires headless config option - "lazy.manage.task.init" - "lazy.manage.checker" - "lazy.manage.init" - "lazy.manage.runner" - "lazy.view.commands" - "lazy.build" - ]; - }; - LeaderF = super.LeaderF.overrideAttrs { nativeBuildInputs = [ python3.pkgs.setuptools ]; buildInputs = [ python3 ]; @@ -1821,6 +1821,10 @@ assertNoAdditions { dependencies = [ self.plenary-nvim ]; }; + lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + lspcontainers-nvim = super.lspcontainers-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; }; @@ -1836,10 +1840,6 @@ assertNoAdditions { nvimRequireCheck = "lspsaga"; }; - lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs { - dependencies = [ self.plenary-nvim ]; - }; - ltex_extra-nvim = super.ltex_extra-nvim.overrideAttrs { # Other modules require setup call first nvimRequireCheck = "ltex_extra"; @@ -1946,13 +1946,6 @@ assertNoAdditions { ]; }; - mason-nvim-dap-nvim = super.mason-nvim-dap-nvim.overrideAttrs { - dependencies = with self; [ - mason-nvim - nvim-dap - ]; - }; - mason-nvim = super.mason-nvim.overrideAttrs { nvimSkipModules = [ # lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&' @@ -1962,6 +1955,13 @@ assertNoAdditions { ]; }; + mason-nvim-dap-nvim = super.mason-nvim-dap-nvim.overrideAttrs { + dependencies = with self; [ + mason-nvim + nvim-dap + ]; + }; + mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs { dependencies = [ self.mason-nvim ]; }; @@ -2084,6 +2084,17 @@ assertNoAdditions { dependencies = [ self.ultisnips ]; }; + neo-tree-nvim = super.neo-tree-nvim.overrideAttrs { + checkInputs = [ git ]; + dependencies = with self; [ + plenary-nvim + nui-nvim + ]; + nvimSkipModule = [ + "neo-tree.types.fixes.compat-0.10" + ]; + }; + neoconf-nvim = super.neoconf-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; @@ -2253,7 +2264,7 @@ assertNoAdditions { nvimSkipModules = "neotest-jest-assertions"; }; - neotest-mocha = super.neotest-mocha.overrideAttrs { + neotest-minitest = super.neotest-minitest.overrideAttrs { dependencies = with self; [ neotest nvim-nio @@ -2261,7 +2272,7 @@ assertNoAdditions { ]; }; - neotest-minitest = super.neotest-minitest.overrideAttrs { + neotest-mocha = super.neotest-mocha.overrideAttrs { dependencies = with self; [ neotest nvim-nio @@ -2365,14 +2376,16 @@ assertNoAdditions { ]; }; - neo-tree-nvim = super.neo-tree-nvim.overrideAttrs { - checkInputs = [ git ]; + neovim-tips = super.neovim-tips.overrideAttrs { + dependencies = [ + self.nui-nvim + ]; + }; + + neovim-trunk = super.neovim-trunk.overrideAttrs { dependencies = with self; [ plenary-nvim - nui-nvim - ]; - nvimSkipModule = [ - "neo-tree.types.fixes.compat-0.10" + telescope-nvim ]; }; @@ -2387,19 +2400,6 @@ assertNoAdditions { ]; }; - neovim-trunk = super.neovim-trunk.overrideAttrs { - dependencies = with self; [ - plenary-nvim - telescope-nvim - ]; - }; - - neovim-tips = super.neovim-tips.overrideAttrs { - dependencies = [ - self.nui-nvim - ]; - }; - nlsp-settings-nvim = super.nlsp-settings-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; }; @@ -2503,10 +2503,6 @@ assertNoAdditions { dependencies = [ self.nvim-dap ]; }; - nvim-dap-vscode-js = super.nvim-dap-vscode-js.overrideAttrs { - dependencies = [ self.nvim-dap ]; - }; - nvim-dap-lldb = super.nvim-dap-lldb.overrideAttrs { dependencies = [ self.nvim-dap ]; }; @@ -2540,6 +2536,10 @@ assertNoAdditions { dependencies = [ self.nvim-dap ]; }; + nvim-dap-vscode-js = super.nvim-dap-vscode-js.overrideAttrs { + dependencies = [ self.nvim-dap ]; + }; + nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs { dependencies = [ self.nvim-treesitter-legacy ]; }; @@ -2606,6 +2606,13 @@ assertNoAdditions { dependencies = [ self.nvim-java-core ]; }; + nvim-k8s-crd = super.nvim-k8s-crd.overrideAttrs { + dependencies = with self; [ + plenary-nvim + nvim-lspconfig + ]; + }; + nvim-lilypond-suite = super.nvim-lilypond-suite.overrideAttrs { nvimSkipModule = [ # Option not set immediately @@ -2615,13 +2622,6 @@ assertNoAdditions { ]; }; - nvim-k8s-crd = super.nvim-k8s-crd.overrideAttrs { - dependencies = with self; [ - plenary-nvim - nvim-lspconfig - ]; - }; - nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -2647,6 +2647,7 @@ assertNoAdditions { nvim-navic ]; }; + nvim-navic = super.nvim-navic.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; }; @@ -2780,16 +2781,16 @@ assertNoAdditions { callPackage ./nvim-treesitter/overrides.nix { } self super ); - # TODO: raise warning at 26.04; drop at 26.11 - nvim-treesitter-legacy = super.nvim-treesitter-legacy.overrideAttrs ( - callPackage ./nvim-treesitter-legacy/overrides.nix { } self super - ); - nvim-treesitter-context = super.nvim-treesitter-context.overrideAttrs { # Meant for CI installing parsers nvimSkipModules = [ "install_parsers" ]; }; + # TODO: raise warning at 26.04; drop at 26.11 + nvim-treesitter-legacy = super.nvim-treesitter-legacy.overrideAttrs ( + callPackage ./nvim-treesitter-legacy/overrides.nix { } self super + ); + nvim-treesitter-pairs = super.nvim-treesitter-pairs.overrideAttrs { dependencies = [ self.nvim-treesitter-legacy ]; }; @@ -2921,6 +2922,14 @@ assertNoAdditions { nvimSkipModules = "omni-lightline"; }; + one-nvim = super.one-nvim.overrideAttrs (old: { + # E5108: /lua/one-nvim.lua:14: Unknown option 't_Co' + # https://github.com/Th3Whit3Wolf/one-nvim/issues/23 + meta = old.meta // { + broken = true; + }; + }); + onedark-nvim = super.onedark-nvim.overrideAttrs { nvimSkipModules = [ # Requires global config value @@ -2935,14 +2944,6 @@ assertNoAdditions { configurePhase = "cd vim"; }; - one-nvim = super.one-nvim.overrideAttrs (old: { - # E5108: /lua/one-nvim.lua:14: Unknown option 't_Co' - # https://github.com/Th3Whit3Wolf/one-nvim/issues/23 - meta = old.meta // { - broken = true; - }; - }); - opencode-nvim = super.opencode-nvim.overrideAttrs { runtimeDeps = [ curl @@ -2974,10 +2975,6 @@ assertNoAdditions { ]; }; - org-roam-nvim = super.org-roam-nvim.overrideAttrs { - dependencies = [ self.orgmode ]; - }; - org-notebook-nvim = super.org-notebook-nvim.overrideAttrs { dependencies = [ self.orgmode @@ -2989,6 +2986,10 @@ assertNoAdditions { ]; }; + org-roam-nvim = super.org-roam-nvim.overrideAttrs { + dependencies = [ self.orgmode ]; + }; + otter-nvim = super.otter-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; nvimSkipModules = [ @@ -3219,6 +3220,10 @@ assertNoAdditions { }); + rust-tools-nvim = super.rust-tools-nvim.overrideAttrs { + dependencies = [ self.nvim-lspconfig ]; + }; + rustaceanvim = super.rustaceanvim.overrideAttrs { checkInputs = [ # Optional integration @@ -3226,10 +3231,6 @@ assertNoAdditions { ]; }; - rust-tools-nvim = super.rust-tools-nvim.overrideAttrs { - dependencies = [ self.nvim-lspconfig ]; - }; - rzls-nvim = super.rzls-nvim.overrideAttrs { dependencies = [ self.roslyn-nvim ]; }; @@ -3253,10 +3254,6 @@ assertNoAdditions { scretch-nvim = super.scretch-nvim.overrideAttrs { }; - searchbox-nvim = super.searchbox-nvim.overrideAttrs { - dependencies = [ self.nui-nvim ]; - }; - search-and-replace-nvim = super.search-and-replace-nvim.overrideAttrs { runtimeDeps = [ fd @@ -3264,6 +3261,10 @@ assertNoAdditions { ]; }; + searchbox-nvim = super.searchbox-nvim.overrideAttrs { + dependencies = [ self.nui-nvim ]; + }; + sidekick-nvim = super.sidekick-nvim.overrideAttrs { runtimeDeps = [ copilot-language-server @@ -3466,6 +3467,7 @@ assertNoAdditions { maintainers = with lib.maintainers; [ fredeb ]; }; }); + telekasten-nvim = super.telekasten-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim @@ -3802,64 +3804,6 @@ assertNoAdditions { }; }); - vimacs = super.vimacs.overrideAttrs (old: { - buildPhase = '' - substituteInPlace bin/vim \ - --replace-fail '/usr/bin/vim' 'vim' \ - --replace-fail '/usr/bin/gvim' 'gvim' - # remove unnecessary duplicated bin wrapper script - rm -r plugin/vimacs - ''; - meta = old.meta // { - description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; - homepage = "http://algorithm.com.au/code/vimacs"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ millerjason ]; - }; - }); - - vimade = super.vimade.overrideAttrs { - checkInputs = with self; [ - # Optional providers - hlchunk-nvim - mini-nvim - snacks-nvim - ]; - }; - - vimsence = super.vimsence.overrideAttrs (old: { - meta = old.meta // { - description = "Discord rich presence for Vim"; - homepage = "https://github.com/hugolgst/vimsence"; - maintainers = with lib.maintainers; [ hugolgst ]; - }; - }); - - vimtex = super.vimtex.overrideAttrs { - checkInputs = with self; [ - # Optional integrations - fzf-lua - snacks-nvim - ]; - }; - - vimproc-vim = super.vimproc-vim.overrideAttrs { - buildInputs = [ which ]; - - # TODO: revisit - buildPhase = '' - substituteInPlace autoload/vimproc.vim \ - --replace-fail vimproc_mac.so vimproc_unix.so \ - --replace-fail vimproc_linux64.so vimproc_unix.so \ - --replace-fail vimproc_linux32.so vimproc_unix.so - make -f make_unix.mak - ''; - }; - - vimshell-vim = super.vimshell-vim.overrideAttrs { - dependencies = [ self.vimproc-vim ]; - }; - vim-addon-actions = super.vim-addon-actions.overrideAttrs { dependencies = with self; [ vim-addon-mw-utils @@ -4001,6 +3945,10 @@ assertNoAdditions { dependencies = with self; [ fzf-vim ]; }; + vim-gist = super.vim-gist.overrideAttrs { + dependencies = [ self.webapi-vim ]; + }; + # change the go_bin_path to point to a path in the nix store. See the code in # fatih/vim-go here # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159 @@ -4033,10 +3981,6 @@ assertNoAdditions { ''; }; - vim-gist = super.vim-gist.overrideAttrs { - dependencies = [ self.webapi-vim ]; - }; - vim-grammarous = super.vim-grammarous.overrideAttrs { # use `:GrammarousCheck` to initialize checking # In neovim, you also want to use set @@ -4195,6 +4139,64 @@ assertNoAdditions { ]; }; + vimacs = super.vimacs.overrideAttrs (old: { + buildPhase = '' + substituteInPlace bin/vim \ + --replace-fail '/usr/bin/vim' 'vim' \ + --replace-fail '/usr/bin/gvim' 'gvim' + # remove unnecessary duplicated bin wrapper script + rm -r plugin/vimacs + ''; + meta = old.meta // { + description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; + homepage = "http://algorithm.com.au/code/vimacs"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ millerjason ]; + }; + }); + + vimade = super.vimade.overrideAttrs { + checkInputs = with self; [ + # Optional providers + hlchunk-nvim + mini-nvim + snacks-nvim + ]; + }; + + vimproc-vim = super.vimproc-vim.overrideAttrs { + buildInputs = [ which ]; + + # TODO: revisit + buildPhase = '' + substituteInPlace autoload/vimproc.vim \ + --replace-fail vimproc_mac.so vimproc_unix.so \ + --replace-fail vimproc_linux64.so vimproc_unix.so \ + --replace-fail vimproc_linux32.so vimproc_unix.so + make -f make_unix.mak + ''; + }; + + vimsence = super.vimsence.overrideAttrs (old: { + meta = old.meta // { + description = "Discord rich presence for Vim"; + homepage = "https://github.com/hugolgst/vimsence"; + maintainers = with lib.maintainers; [ hugolgst ]; + }; + }); + + vimshell-vim = super.vimshell-vim.overrideAttrs { + dependencies = [ self.vimproc-vim ]; + }; + + vimtex = super.vimtex.overrideAttrs { + checkInputs = with self; [ + # Optional integrations + fzf-lua + snacks-nvim + ]; + }; + virt-column-nvim = super.virt-column-nvim.overrideAttrs { # Meta file nvimSkipModules = "virt-column.config.types"; From 3766bb7b6efac72713cb577246f892ab436445e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 12:33:23 +0000 Subject: [PATCH 231/305] sfeed: 2.3 -> 2.4 --- pkgs/by-name/sf/sfeed/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sf/sfeed/package.nix b/pkgs/by-name/sf/sfeed/package.nix index 6f3fad79ba59..96b1067b3a57 100644 --- a/pkgs/by-name/sf/sfeed/package.nix +++ b/pkgs/by-name/sf/sfeed/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "sfeed"; - version = "2.3"; + version = "2.4"; src = fetchgit { url = "git://git.codemadness.org/sfeed"; tag = finalAttrs.version; - hash = "sha256-VvPBRc2mRuDXaCz0Ds8012wSbcRo+2bZ4n7KKwDmvhw="; + hash = "sha256-4ItAZ3HYmFc/OlUErAhUANm/BkeCIHvPtriWn9N29lg="; }; buildInputs = [ ncurses ]; From 7921127c00dc1389ec65f1fbbc6bec862cefe8c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 12:39:27 +0000 Subject: [PATCH 232/305] clever-tools: 4.7.1 -> 4.8.0 --- pkgs/by-name/cl/clever-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 5e29e6c203ae..7335c70aa945 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -11,7 +11,7 @@ buildNpmPackage rec { pname = "clever-tools"; - version = "4.7.1"; + version = "4.8.0"; nodejs = nodejs_22; @@ -19,10 +19,10 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-FUhqvUN4ml3uCKnU6YJLp96rX27/+LL+mrUul+LV4Vs="; + hash = "sha256-ei5wwx9rUfKe6hGbHuNU65kGo5quvTtRKb6sHjkEzQE="; }; - npmDepsHash = "sha256-sT3rNYPli6hy7fv3v++JQ9Pex6y5h1tyCWAU1TekqLw="; + npmDepsHash = "sha256-3gmDTBi0WpmtN+qTQXDvuXGkw0g/wdxuruMdyD4UMIc="; nativeBuildInputs = [ installShellFiles From f15101597af27d58cfdd623f83e9d76cb18ea176 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 12:41:36 +0000 Subject: [PATCH 233/305] libphonenumber: 9.0.27 -> 9.0.28 --- pkgs/by-name/li/libphonenumber/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix index b0a26db33ff4..cdf64d4b29c6 100644 --- a/pkgs/by-name/li/libphonenumber/package.nix +++ b/pkgs/by-name/li/libphonenumber/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "9.0.27"; + version = "9.0.28"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qcn7Ms2YizAJK5IPVW/NeCUkfH8bk5Mg0xjcMcsE5H8="; + hash = "sha256-Mi+FpM8viPUWgzT8tp3zc9e5fsI9xhlsdsYYlaVRTNk="; }; patches = [ From c23eb148c4249a9313065d55e982ebd182c108b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 13:05:57 +0000 Subject: [PATCH 234/305] trufflehog: 3.94.2 -> 3.94.3 --- pkgs/by-name/tr/trufflehog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index ab65b94e92f4..ba2a09598c05 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "trufflehog"; - version = "3.94.2"; + version = "3.94.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${finalAttrs.version}"; - hash = "sha256-/uJR17eYTj61V/csMj/zEGiI42gWaLZEGh+oM7kaY80="; + hash = "sha256-dNQjBBHtu0MFlAr/FluHAxR75q621HqHttpT2tBZKsg="; }; vendorHash = "sha256-BzZflc9NbqmvZ+RmGvkcknotvn10V/XrgfW8mG8GgiA="; From 53091a0f90fcdbb7b9935952861f42ea1b9b8168 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 13:06:26 +0000 Subject: [PATCH 235/305] scalr-cli: 0.17.7 -> 0.17.8 --- pkgs/by-name/sc/scalr-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scalr-cli/package.nix b/pkgs/by-name/sc/scalr-cli/package.nix index adbd58b2a811..12411ab7dcd0 100644 --- a/pkgs/by-name/sc/scalr-cli/package.nix +++ b/pkgs/by-name/sc/scalr-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "scalr-cli"; - version = "0.17.7"; + version = "0.17.8"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZGq76TPMNrlyuHs5yUgw3pJ+a2wVNwBTTSgzIofD4io="; + hash = "sha256-hJvIVSv40Wlua1nOWJb5pu4OSfsATiwMoqNrZsWCBNA="; }; vendorHash = "sha256-TUf+0Z0yBDOpzMuETn+FCAPXWvQltjRhwQ3Xz0X6YOI="; From a36a063a04b7756592019345d5a72c8fff30148e Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 13:22:41 +0200 Subject: [PATCH 236/305] vimPlugins.bitbake: move back to generated.nix It was moved to non-generated, because "updater can't handle sub directories". Added a `sourceRoot` override to `overrides.nix` and the plugin builds. --- .../editors/vim/plugins/deprecated.json | 4 ++++ .../editors/vim/plugins/generated.nix | 13 ++++++++++++ .../non-generated/bitbake-vim/default.nix | 21 ------------------- .../editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 5 files changed, 22 insertions(+), 21 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index fa8c481f4917..4af18da693a7 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -83,6 +83,10 @@ "date": "2026-02-04", "new": "bats-vim" }, + "bitbake-vim": { + "date": "2026-04-09", + "new": "bitbake" + }, "calendar": { "date": "2026-02-04", "new": "calendar-vim" diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 0bdd6a0d9575..5bb6cacfa5ae 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1582,6 +1582,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + bitbake = buildVimPlugin { + pname = "bitbake"; + version = "2.12.0-unstable-2026-04-08"; + src = fetchFromGitHub { + owner = "openembedded"; + repo = "bitbake"; + rev = "5d722b5d65e4eef7befe6376983385421e993f86"; + hash = "sha256-nOnNIXRUxsYNaEBhWuzCMTg37C9/S4ekxNbCpvBe+TU="; + }; + meta.homepage = "https://github.com/openembedded/bitbake/"; + meta.hydraPlatforms = [ ]; + }; + blame-nvim = buildVimPlugin { pname = "blame.nvim"; version = "0-unstable-2026-02-12"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix deleted file mode 100644 index f43b0557c4d8..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - vimUtils, - fetchFromGitHub, -}: -vimUtils.buildVimPlugin rec { - pname = "bitbake-vim"; - version = "2.10.4"; - - # The tags are very messy on the upstream repo. We prefer disabling automatic updates for this plugin. - # nixpkgs-update: no auto update - src = fetchFromGitHub { - owner = "openembedded"; - repo = "bitbake"; - tag = version; - hash = "sha256-gdxPnRhd4Hj1PWgCU5A/+639ndJXlkdArOBZt6eiZWA="; - }; - - sourceRoot = "source/contrib/vim"; - - meta.homepage = "https://github.com/openembedded/bitbake/"; -} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index ac3f29e5730b..95a1c87e0d60 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -304,6 +304,10 @@ assertNoAdditions { ]; }; + bitbake = super.bitbake.overrideAttrs { + sourceRoot = "source/contrib/vim"; + }; + blink-cmp-conventional-commits = super.blink-cmp-conventional-commits.overrideAttrs { dependencies = [ self.blink-cmp ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a8bb5fbf3787..da5c2c3d2f9a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -120,6 +120,7 @@ https://github.com/rbgrouleff/bclose.vim/,, https://github.com/sontungexpt/better-diagnostic-virtual-text/,HEAD, 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, From 92c4fa3b95598fe9fea5046de730bbb7913518eb Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 13:23:53 +0200 Subject: [PATCH 237/305] vimPlugins.clangd_extensions-nvim: move back to generated.nix --- .../editors/vim/plugins/generated.nix | 12 +++++++++ .../clangd_extensions-nvim/default.nix | 26 ------------------- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 13 insertions(+), 26 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5bb6cacfa5ae..fd14f2ec7804 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2258,6 +2258,18 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + clangd_extensions-nvim = buildVimPlugin { + pname = "clangd_extensions.nvim"; + version = "0-unstable-2026-01-12"; + src = fetchgit { + url = "https://git.sr.ht/~p00f/clangd_extensions.nvim"; + rev = "997d20e6bc83ea1a6223c08d2b9db76943abf56b"; + hash = "sha256-5XES8qyl3tdMmsT+mkVcJ1sC5AKJDpHI/elsoB8XE/8="; + }; + meta.homepage = "https://git.sr.ht/~p00f/clangd_extensions.nvim"; + meta.hydraPlatforms = [ ]; + }; + claude-code-nvim = buildVimPlugin { pname = "claude-code.nvim"; version = "0.4.3-unstable-2026-02-04"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix deleted file mode 100644 index 5f998af8c27e..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - fetchFromSourcehut, - nix-update-script, - vimUtils, -}: -vimUtils.buildVimPlugin { - pname = "clangd_extensions.nvim"; - version = "0-unstable-2025-01-27"; - - src = fetchFromSourcehut { - owner = "~p00f"; - repo = "clangd_extensions.nvim"; - rev = "db28f29be928d18cbfb86fbfb9f83f584f658feb"; - hash = "sha256-XdA638W0Zb85v5uAUNpvUiiQXGKOM2xykD2ClLk8Qpo="; - }; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Clangd's off-spec features for neovim's LSP client"; - homepage = "https://git.sr.ht/~p00f/clangd_extensions.nvim"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index da5c2c3d2f9a..3ae0bae855bb 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -172,6 +172,7 @@ https://github.com/declancm/cinnamon.nvim/,HEAD, 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, From 07dcf163761c84c0724634f43aeb04f6cf5aa20d Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 13:25:31 +0200 Subject: [PATCH 238/305] vimPlugins.cmp-async-path: move back to generated.nix --- .../editors/vim/plugins/generated.nix | 12 +++++++ .../non-generated/cmp-async-path/default.nix | 31 ------------------- .../editors/vim/plugins/overrides.nix | 4 +++ .../editors/vim/plugins/vim-plugin-names | 1 + 4 files changed, 17 insertions(+), 31 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index fd14f2ec7804..4a85724bf730 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2439,6 +2439,18 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + cmp-async-path = buildVimPlugin { + pname = "cmp-async-path"; + version = "0-unstable-2026-01-28"; + src = fetchgit { + url = "https://codeberg.org/FelipeLema/cmp-async-path/"; + rev = "f8af3f726e07f2e9d37672eaa9102581aefce149"; + hash = "sha256-ALMK7TnEB7/UZibVgOl4r6/gYsHCo6YAZcAR536VL4g="; + }; + meta.homepage = "https://codeberg.org/FelipeLema/cmp-async-path/"; + meta.hydraPlatforms = [ ]; + }; + cmp-beancount = buildVimPlugin { pname = "cmp-beancount"; version = "0-unstable-2025-11-26"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix deleted file mode 100644 index 29ffe4e42c07..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - vimUtils, - fetchFromCodeberg, - nix-update-script, - vimPlugins, -}: -vimUtils.buildVimPlugin { - pname = "cmp-async-path"; - version = "0-unstable-2026-01-28"; - - src = fetchFromCodeberg { - owner = "FelipeLema"; - repo = "cmp-async-path"; - rev = "f8af3f726e07f2e9d37672eaa9102581aefce149"; - hash = "sha256-ALMK7TnEB7/UZibVgOl4r6/gYsHCo6YAZcAR536VL4g="; - }; - - checkInputs = [ vimPlugins.nvim-cmp ]; - - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; - - meta = { - description = "Nvim-cmp source for filesystem paths with async processing"; - homepage = "https://codeberg.org/FelipeLema/cmp-async-path/"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 95a1c87e0d60..f3585b278533 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -510,6 +510,10 @@ assertNoAdditions { ]; }; + cmp-async-path = super.cmp-async-path.overrideAttrs { + checkInputs = [ self.nvim-cmp ]; + }; + cmp-beancount = super.cmp-beancount.overrideAttrs { checkInputs = [ self.nvim-cmp ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 3ae0bae855bb..89fe2f079d2d 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -186,6 +186,7 @@ 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/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, From 849ce4126e0fd38812179528fab59191a9181004 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:43:37 +0200 Subject: [PATCH 239/305] vimPlugins.gitlab-vim: move back to generated.nix --- .../editors/vim/plugins/generated.nix | 12 ++++++++ .../non-generated/gitlab-vim/default.nix | 29 ------------------- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4a85724bf730..da2fdca96a9d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6058,6 +6058,18 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + gitlab-vim = buildVimPlugin { + pname = "gitlab.vim"; + version = "1.1.0-unstable-2026-03-17"; + src = fetchgit { + url = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; + rev = "cb750761acf8dc17f4f1051d1b4ade6c0aaeb432"; + hash = "sha256-rhYz3Z1Dcffvo8E3390gOBcqfFclWJ19wTKwp6L/874="; + }; + meta.homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; + meta.hydraPlatforms = [ ]; + }; + gitlineage-nvim = buildVimPlugin { pname = "gitlineage.nvim"; version = "0-unstable-2026-02-14"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix deleted file mode 100644 index 824190179389..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - vimUtils, - fetchFromGitLab, - nix-update-script, -}: -let - version = "0.1.1"; -in -vimUtils.buildVimPlugin { - pname = "gitlab.vim"; - inherit version; - - src = fetchFromGitLab { - owner = "gitlab-org/editor-extensions"; - repo = "gitlab.vim"; - rev = "v${version}"; - hash = "sha256-W/FV+i/QJYX6A8uyxAQN4ov1kMd9UFCghFmSQp1kbnM="; - }; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Integrate GitLab Duo with Neovim"; - homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 89fe2f079d2d..55a332a74e42 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -464,6 +464,7 @@ 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/vim-scripts/gitignore.vim/,, +https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim,HEAD, https://github.com/LionyxML/gitlineage.nvim/,HEAD, https://github.com/ruifm/gitlinker.nvim/,, https://github.com/trevorhauter/gitportal.nvim/,, From 368d82f6e9433956ad2f086397ed631d60980b69 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:44:03 +0200 Subject: [PATCH 240/305] vimPlugins.hare-vim: move back to generated.nix --- .../editors/vim/plugins/generated.nix | 12 +++++++++ .../non-generated/hare-vim/default.nix | 26 ------------------- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 13 insertions(+), 26 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index da2fdca96a9d..3ab0580cfae9 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6500,6 +6500,18 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + hare-vim = buildVimPlugin { + pname = "hare.vim"; + version = "0-unstable-2026-02-05"; + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/hare.vim"; + rev = "cbc1195ce25b853788d3006c34ff6be0aba6483d"; + hash = "sha256-zueMmX8rHXMpnv6ukrcFcTIWVOoYrBC/0Tn2+5fTRlU="; + }; + meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; + meta.hydraPlatforms = [ ]; + }; + harpoon = buildVimPlugin { pname = "harpoon"; version = "0-unstable-2024-08-29"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix deleted file mode 100644 index 7180615ced27..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - vimUtils, - fetchFromSourcehut, - nix-update-script, -}: -vimUtils.buildVimPlugin { - pname = "hare.vim"; - version = "0-unstable-2025-04-24"; - - src = fetchFromSourcehut { - owner = "~sircmpwn"; - repo = "hare.vim"; - rev = "41b8b615f46a39d807a9a069039aac79c925c389"; - hash = "sha256-GPFoQI6tipcLzkvjaeufmMrNnQM46lPas9D1SwzjKF4="; - }; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Hare programming in Vim"; - homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; - license = lib.licenses.vim; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 55a332a74e42..4a2f0436e5de 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -498,6 +498,7 @@ 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/ThePrimeagen/harpoon/,harpoon2,harpoon2 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD, From c2486fd3d7ccb6b43c1e23cdce6375f47f1f3266 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:45:34 +0200 Subject: [PATCH 241/305] vimPlugins.jsonfly-nvim: move back to generated.nix --- .../editors/vim/plugins/generated.nix | 12 +++++++++ .../non-generated/jsonfly-nvim/default.nix | 27 ------------------- .../editors/vim/plugins/overrides.nix | 8 ++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 4 files changed, 21 insertions(+), 27 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3ab0580cfae9..b6318b3ee7b8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -7398,6 +7398,18 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + jsonfly-nvim = buildVimPlugin { + pname = "jsonfly.nvim"; + version = "0-unstable-2025-11-02"; + src = fetchgit { + url = "https://git.myzel394.app/Myzel394/jsonfly.nvim"; + rev = "3d58635cb195a5435743e7882c6ac7cff710204f"; + hash = "sha256-bTh/6zmYQ+XqBsccKo8i149nU5bBfFv+8UKMayHIoo4="; + }; + meta.homepage = "https://git.myzel394.app/Myzel394/jsonfly.nvim"; + meta.hydraPlatforms = [ ]; + }; + jule-nvim = buildVimPlugin { pname = "jule.nvim"; version = "0-unstable-2025-12-26"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix deleted file mode 100644 index 22d445b55ded..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - fetchFromGitea, - vimUtils, - nix-update-script, -}: -vimUtils.buildVimPlugin { - pname = "jsonfly.nvim"; - version = "0-unstable-2025-06-07"; - - src = fetchFromGitea { - domain = "git.myzel394.app"; - owner = "Myzel394"; - repo = "jsonfly.nvim"; - rev = "db4394d856059d99d82ea2c75d033721e9dcb1fc"; - hash = "sha256-PmYm+vZ0XONoHUo08haBozbXRpN+/LAlr6Fyg7anTNw="; - }; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Search blazingly fast for JSON / XML / YAML keys via Telescope"; - homepage = "https://git.myzel394.app/Myzel394/jsonfly.nvim"; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ myzel394 ]; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f3585b278533..a70b5a657271 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1568,6 +1568,14 @@ assertNoAdditions { ''; }; + jsonfly-nvim = super.jsonfly-nvim.overrideAttrs (old: { + meta = old.meta // { + maintainers = old.meta.maintainers or [ ] ++ [ + lib.maintainers.myzel394 + ]; + }; + }); + jupytext-nvim = super.jupytext-nvim.overrideAttrs { passthru.python3Dependencies = ps: [ ps.jupytext ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4a2f0436e5de..f1b3a4e50be0 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -567,6 +567,7 @@ https://github.com/HiPhish/jinja.vim/,HEAD, https://github.com/NicolasGB/jj.nvim/,HEAD, 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://github.com/JuliaEditorSupport/julia-vim/,, From e4e2323de667fb061f801321e09a2be48e5b45c2 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:46:12 +0200 Subject: [PATCH 242/305] vimPlugins.lsp_lines-nvim: move back to generated.nix --- .../editors/vim/plugins/generated.nix | 12 ++++++++ .../non-generated/lsp_lines-nvim/default.nix | 29 ------------------- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b6318b3ee7b8..c5d825e3f9f8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8346,6 +8346,18 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + lsp_lines-nvim = buildVimPlugin { + pname = "lsp_lines.nvim"; + version = "3.0.0-unstable-2024-12-21"; + src = fetchgit { + url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; + rev = "a92c755f182b89ea91bd8a6a2227208026f27b4d"; + hash = "sha256-jHiIZemneQACTDYZXBJqX2/PRTBoxq403ILvt1Ej1ZM="; + }; + meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; + meta.hydraPlatforms = [ ]; + }; + lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; version = "0.3.1-unstable-2026-04-07"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix deleted file mode 100644 index 72d9495af2d2..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - vimUtils, - fetchFromSourcehut, - nix-update-script, -}: -let - version = "3.0.0"; -in -vimUtils.buildVimPlugin { - pname = "lsp_lines.nvim"; - inherit version; - - src = fetchFromSourcehut { - owner = "~whynothugo"; - repo = "lsp_lines.nvim"; - rev = "v${version}"; - hash = "sha256-QsvmPOer7JgO7Y+N/iaNJD7Kmy69gnlV4CeyaQesNvA="; - }; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Neovim diagnostics using virtual lines"; - homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index f1b3a4e50be0..d3a1e41f0d58 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -641,6 +641,7 @@ 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/nvim-lua/lsp_extensions.nvim/,, +https://git.sr.ht/~whynothugo/lsp_lines.nvim,HEAD, https://github.com/ray-x/lsp_signature.nvim/,, https://github.com/lspcontainers/lspcontainers.nvim/,, https://github.com/deathbeam/lspecho.nvim/,HEAD, From a3b6dd2685c874f1328e49194d38fa348297e180 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:47:02 +0200 Subject: [PATCH 243/305] vimPlugins.nvim-julia-autotest: move back to generated.nix --- .../editors/vim/plugins/generated.nix | 12 ++++++++ .../nvim-julia-autotest/default.nix | 28 ------------------- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c5d825e3f9f8..8ea24bcace40 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11725,6 +11725,18 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + nvim-julia-autotest = buildVimPlugin { + pname = "nvim-julia-autotest"; + version = "0-unstable-2022-10-31"; + src = fetchgit { + url = "https://gitlab.com/usmcamp0811/nvim-julia-autotest"; + rev = "b74e2f9c961e604cb56cc23f87188348bfa0f33f"; + hash = "sha256-IaNsbBe5q7PB9Q/N/Z9nEnP6jlkQ6+xlkC0TCFnJpkk="; + }; + meta.homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest"; + meta.hydraPlatforms = [ ]; + }; + nvim-jump = buildVimPlugin { pname = "nvim-jump"; version = "0-unstable-2026-04-08"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix deleted file mode 100644 index 032705f8359b..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - vimUtils, - fetchFromGitLab, - nix-update-script, -}: -vimUtils.buildVimPlugin { - pname = "nvim-julia-autotest"; - version = "0-unstable-2022-10-31"; - - src = fetchFromGitLab { - owner = "usmcamp0811"; - repo = "nvim-julia-autotest"; - rev = "b74e2f9c961e604cb56cc23f87188348bfa0f33f"; - hash = "sha256-IaNsbBe5q7PB9Q/N/Z9nEnP6jlkQ6+xlkC0TCFnJpkk="; - }; - - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; - - meta = { - description = "Automatically run Julia tests when you save runtest.jl file"; - homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest"; - license = lib.licenses.gpl3; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d3a1e41f0d58..047366ed2de2 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -901,6 +901,7 @@ https://github.com/nvim-java/nvim-java-refactor/,HEAD, https://github.com/nvim-java/nvim-java-test/,HEAD, 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, From 18e85dca8b49bbcc55565cb763f7f6b5a82d61d3 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:48:14 +0200 Subject: [PATCH 244/305] vimPlugins.rainbow-delimiters-nvim: move back to generated.nix --- .../editors/vim/plugins/generated.nix | 12 +++++++ .../rainbow-delimiters-nvim/default.nix | 33 ------------------- .../editors/vim/plugins/overrides.nix | 9 +++++ .../editors/vim/plugins/vim-plugin-names | 1 + 4 files changed, 22 insertions(+), 33 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8ea24bcace40..48bfe3bb0132 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -13910,6 +13910,18 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + rainbow-delimiters-nvim = buildVimPlugin { + pname = "rainbow-delimiters.nvim"; + version = "0.12.0-unstable-2026-04-06"; + src = fetchgit { + url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; + rev = "aab6caaffd79b8def22ec4320a5344f7c42f58d2"; + hash = "sha256-aQM0Ay5GZZwcTnZ2PV4iucyBmoik98EAeIPIIJSxuYk="; + }; + meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; + meta.hydraPlatforms = [ ]; + }; + rainbow_csv = buildVimPlugin { pname = "rainbow_csv"; version = "4.3.0-unstable-2024-07-05"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix deleted file mode 100644 index 436518afa33c..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - vimUtils, - fetchFromGitLab, - nix-update-script, -}: -vimUtils.buildVimPlugin rec { - pname = "rainbow-delimiters.nvim"; - version = "0.12.0"; - - src = fetchFromGitLab { - owner = "HiPhish"; - repo = "rainbow-delimiters.nvim"; - tag = "v${version}"; - hash = "sha256-q4cBvF8d5h+BM1LTm5aq02OBVmwSUb9rC1smHlxbRzg="; - }; - - nvimSkipModules = [ - # rainbow-delimiters.types.lua - "rainbow-delimiters.types" - # Test that requires an unpackaged dependency - "rainbow-delimiters._test.highlight" - ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Rainbow delimiters for Neovim with Tree-sitter"; - homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - license = lib.licenses.gpl3; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a70b5a657271..bb02ee75cad2 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3179,6 +3179,15 @@ assertNoAdditions { ]; }; + rainbow-delimiters-nvim = super.rainbow-delimiters-nvim.overrideAttrs { + nvimSkipModules = [ + # rainbow-delimiters.types.lua + "rainbow-delimiters.types" + # Test that requires an unpackaged dependency + "rainbow-delimiters._test.highlight" + ]; + }; + range-highlight-nvim = super.range-highlight-nvim.overrideAttrs { dependencies = [ self.cmd-parser-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 047366ed2de2..173fa9445e4a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1069,6 +1069,7 @@ https://github.com/stefandtw/quickfix-reflector.vim/,, https://github.com/dannyob/quickfixstatus/,, https://github.com/jbyuki/quickmath.nvim/,HEAD, https://github.com/luochen1990/rainbow/,, +https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD, https://github.com/mechatroner/rainbow_csv/,HEAD, https://github.com/kien/rainbow_parentheses.vim/,, https://github.com/vim-scripts/random.vim/,, From 653e37788f360fa76bdbe87e65650a0e60c6db68 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:49:02 +0200 Subject: [PATCH 245/305] vimPlugins.sonarlint-nvim: move back to generated.nix --- .../editors/vim/plugins/generated.nix | 12 ++++++++ .../non-generated/sonarlint-nvim/default.nix | 28 ------------------- .../editors/vim/plugins/overrides.nix | 8 ++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 4 files changed, 21 insertions(+), 28 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 48bfe3bb0132..e76b26804d18 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -14821,6 +14821,18 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + sonarlint-nvim = buildVimPlugin { + pname = "sonarlint.nvim"; + version = "0-unstable-2026-01-19"; + src = fetchgit { + url = "https://gitlab.com/schrieveslaach/sonarlint.nvim"; + rev = "acd09b78969ddc965a7ddf59abb9d9eec5ecd94f"; + hash = "sha256-71emILbp291AZmh9Rc0S92mbkcZ88zjCvPTaumEM7Qg="; + }; + meta.homepage = "https://gitlab.com/schrieveslaach/sonarlint.nvim"; + meta.hydraPlatforms = [ ]; + }; + sonarqube-nvim = buildVimPlugin { pname = "sonarqube.nvim"; version = "0-unstable-2025-06-24"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix deleted file mode 100644 index b38fd053f059..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - vimUtils, - fetchFromGitLab, - nix-update-script, -}: -vimUtils.buildVimPlugin { - pname = "sonarlint.nvim"; - version = "0-unstable-2026-01-19"; - - src = fetchFromGitLab { - owner = "schrieveslaach"; - repo = "sonarlint.nvim"; - rev = "acd09b78969ddc965a7ddf59abb9d9eec5ecd94f"; - hash = "sha256-71emILbp291AZmh9Rc0S92mbkcZ88zjCvPTaumEM7Qg="; - }; - - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; - - meta = { - homepage = "https://gitlab.com/schrieveslaach/sonarlint.nvim"; - description = "Extensions for the built-in Language Server Protocol support in Neovim for sonarlint-language-server"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.sinics ]; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index bb02ee75cad2..552ef22b39de 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3387,6 +3387,14 @@ assertNoAdditions { ]; }; + sonarlint-nvim = super.sonarlint-nvim.overrideAttrs (old: { + meta = old.meta // { + maintainers = old.meta.maintainers or [ ] ++ [ + lib.maintainers.sinics + ]; + }; + }); + spaceman-nvim = super.spaceman-nvim.overrideAttrs { # Optional telescope integration nvimSkipModules = "spaceman.adapters.telescope"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 173fa9445e4a..a2ccfc26801e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1139,6 +1139,7 @@ https://github.com/leath-dub/snipe.nvim/,HEAD, 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/sainnhe/sonokai/,, https://github.com/sQVe/sort.nvim/,HEAD, From 64b82af6119db9ed74eba32709425bcd6b6d2e51 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:51:04 +0200 Subject: [PATCH 246/305] vimPlugins.vim-stationeers-ic10-syntax: move back to generated.nix --- .../editors/vim/plugins/generated.nix | 12 ++++++++ .../vim-stationeers-ic10-syntax/default.nix | 28 ------------------- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e76b26804d18..efdc02b3c36d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -21943,6 +21943,18 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + vim-stationeers-ic10-syntax = buildVimPlugin { + pname = "vim-stationeers-ic10-syntax"; + version = "0-unstable-2025-11-02"; + src = fetchgit { + url = "https://gitlab.com/LittleMorph/vim-ic10"; + rev = "74446a16078ef4f3d2088136b32af939fb6bc2a4"; + hash = "sha256-YCxrSB7eRQ54iZhpcsAR930Uccj+2ZyogpYGKbcSlys="; + }; + meta.homepage = "https://gitlab.com/LittleMorph/vim-ic10"; + meta.hydraPlatforms = [ ]; + }; + vim-strip-trailing-whitespace = buildVimPlugin { pname = "vim-strip-trailing-whitespace"; version = "1.0-unstable-2022-02-01"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix deleted file mode 100644 index 8d628bdd7767..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - vimUtils, - fetchFromGitLab, - nix-update-script, -}: -vimUtils.buildVimPlugin { - pname = "vim-ic10"; - version = "0-unstable-2025-11-02"; - - src = fetchFromGitLab { - owner = "LittleMorph"; - repo = "vim-ic10"; - rev = "74446a16078ef4f3d2088136b32af939fb6bc2a4"; - hash = "sha256-YCxrSB7eRQ54iZhpcsAR930Uccj+2ZyogpYGKbcSlys="; - }; - - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; - - meta = { - description = "Stationeers IC10 syntax highlighting for Vim"; - homepage = "https://gitlab.com/LittleMorph/vim-ic10"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a2ccfc26801e..5f811437506d 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1686,6 +1686,7 @@ https://github.com/kbenzie/vim-spirv/,, https://github.com/yorokobi/vim-splunk/,HEAD, https://github.com/mhinz/vim-startify/,, https://github.com/dstein64/vim-startuptime/,, +https://gitlab.com/LittleMorph/vim-ic10,HEAD,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/,, From 770e035d7a75bc6ae55e6ad5528dbb6597567538 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 13:22:46 +0000 Subject: [PATCH 247/305] paretosecurity: 0.3.15 -> 0.3.16 --- pkgs/by-name/pa/paretosecurity/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix index 2cece2e2e8c0..b0a71805a2cd 100644 --- a/pkgs/by-name/pa/paretosecurity/package.nix +++ b/pkgs/by-name/pa/paretosecurity/package.nix @@ -17,13 +17,13 @@ buildGoModule (finalAttrs: { webkitgtk_4_1 ]; pname = "paretosecurity"; - version = "0.3.15"; + version = "0.3.16"; src = fetchFromGitHub { owner = "ParetoSecurity"; repo = "agent"; rev = finalAttrs.version; - hash = "sha256-2oGDxnbxuyAMWjEUFKzwYz72/FYUbUZHSFoZk2pMfeY="; + hash = "sha256-93+8r7GOdaQ5HnPEvJ0L2DDStHT6HvH1tuDsCSoDU0E="; }; vendorHash = "sha256-jAcUf4VjtKB/Q2wHOVnCgcmPp5XNMqV8Ei9kpWoGO4Q="; From cf775bf62c8995030e40f0f3c8e0193a8fdadcc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 13:26:35 +0000 Subject: [PATCH 248/305] secrethound: 1.1.0 -> 1.2.0 --- pkgs/by-name/se/secrethound/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/secrethound/package.nix b/pkgs/by-name/se/secrethound/package.nix index 18eb778b9839..e836371ac04c 100644 --- a/pkgs/by-name/se/secrethound/package.nix +++ b/pkgs/by-name/se/secrethound/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "secrethound"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "rafabd1"; repo = "SecretHound"; rev = "v${finalAttrs.version}"; - hash = "sha256-mZ2rZMjNKLJ+AQQlEGUwgSpIAhqbHG53wUNDIEtJXwI="; + hash = "sha256-ca0AwD1oFBB8F2J4gLMtaDssacczugAkkSYdBTvT4VQ="; }; vendorHash = "sha256-oTyI3/+evDTzyH+BjfSP0A1r2bYVAMxtWRsg0G1d2zQ="; From dbda3b9deae9813d5e04034fd37a94c975290bd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 13:28:01 +0000 Subject: [PATCH 249/305] the-powder-toy: 99.3.384 -> 99.5.394 --- pkgs/by-name/th/the-powder-toy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix index 6c88a58767d1..779cfb0e645c 100644 --- a/pkgs/by-name/th/the-powder-toy/package.nix +++ b/pkgs/by-name/th/the-powder-toy/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "the-powder-toy"; - version = "99.3.384"; + version = "99.5.394"; src = fetchFromGitHub { owner = "The-Powder-Toy"; repo = "The-Powder-Toy"; tag = "v${finalAttrs.version}"; - hash = "sha256-vlswHNkjyxM9sZT+mwiCMfNbdAbhYyx06w+ZLfaPaEQ="; + hash = "sha256-ejkWIxlS6J9DHw/XNmEC94oc0xmqvj+hFu3TBPyCqwg="; }; nativeBuildInputs = [ From 7b2ea576674d7f07c4bf73c9b3d03c857eee3672 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 13:40:28 +0000 Subject: [PATCH 250/305] cdk8s-cli: 2.205.6 -> 2.206.3 --- pkgs/by-name/cd/cdk8s-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cd/cdk8s-cli/package.nix b/pkgs/by-name/cd/cdk8s-cli/package.nix index 29ac028fc33e..858252ad7350 100644 --- a/pkgs/by-name/cd/cdk8s-cli/package.nix +++ b/pkgs/by-name/cd/cdk8s-cli/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdk8s-cli"; - version = "2.205.6"; + version = "2.206.3"; src = fetchFromGitHub { owner = "cdk8s-team"; repo = "cdk8s-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZHorjCZbZ8Lu7DwhAbCC/uKNrg+rYwL75NCjKskh/JM="; + hash = "sha256-ezxwAhSxDSmP4DhT4vF8nuO+TcnWgLk5szJb3RIv1xg="; }; yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-VAy3k99JB2j4MUCwXKyxSl+9OmGC1/xoJBF1/Xvuc54="; + hash = "sha256-fkG7gre4OOpoZf/vQAJU0Lnbl7eDsgZy0H/+4C7aWvI="; }; nativeBuildInputs = [ From 3dfbbb094a2bcac1036a9a27dba5e75f7cb91b79 Mon Sep 17 00:00:00 2001 From: Schahin Rouhanizadeh Date: Thu, 9 Apr 2026 15:44:14 +0200 Subject: [PATCH 251/305] fluxcd: 2.8.3 -> 2.8.5 --- pkgs/by-name/fl/fluxcd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index c8944693d01a..1bcb6d082fd1 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -9,10 +9,10 @@ }: let - version = "2.8.3"; - srcHash = "sha256-5bs7atecd7NqUrJySMxOe01zGpTMbgrau5B6QkUTRyg="; - vendorHash = "sha256-ICI9Lace4gv2GE/nb9y5yRlvsOkujr2DA2gQ8PnIrIs="; - manifestsHash = "sha256-V1rWHu23K4224eiwUuueG2vk3LsdgtvVGZVQG5vBhLQ="; + version = "2.8.5"; + srcHash = "sha256-2Q6l+egcRntGjieXpXz/frGGw4GMhGXxQAUOAZfxBE4="; + vendorHash = "sha256-D92vOyTvlpOou/1WHS6xpb4e8igZMQhm4DP7SVSLKPI="; + manifestsHash = "sha256-X0Cf8UZufqUWKLxYVjblYNCz5IU/s+mI+h6TpTeks5k="; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; From 4c4626a7c5cc0e81a45adc75a2aaf7485bd3f0be Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Thu, 26 Mar 2026 01:10:11 +0000 Subject: [PATCH 252/305] ocamlPackages.luv: 0.5.12 -> 0.5.14 --- pkgs/development/compilers/haxe/default.nix | 4 +- .../development/ocaml-modules/luv/default.nix | 99 ++++++++++--------- pkgs/top-level/ocaml-packages.nix | 9 +- 3 files changed, 63 insertions(+), 49 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index a103221b85b9..953949b949a0 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -24,7 +24,7 @@ let ptmap camlp5 sha - luv + luv-0-5-12 extlib ] else @@ -37,7 +37,7 @@ let ptmap camlp5 sha - luv + luv-0-5-12 extlib-1-7-7 ]; diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix index 207d1a1aea3e..465d8c4b75cb 100644 --- a/pkgs/development/ocaml-modules/luv/default.nix +++ b/pkgs/development/ocaml-modules/luv/default.nix @@ -1,5 +1,3 @@ -# nixpkgs-update: no auto update -# haxe depends on specific version of luv { lib, buildDunePackage, @@ -11,51 +9,64 @@ file, }: -buildDunePackage rec { - pname = "luv"; - version = "0.5.12"; +let + generic = + { + version, + sha256, + }: + buildDunePackage rec { + pname = "luv"; + inherit version; - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; - src = fetchurl { - url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; + src = fetchurl { + url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; + inherit sha256; + }; + + patches = lib.optional (lib.versionOlder version "0.5.14") ./incompatible-pointer-type-fix.diff; + + postConfigure = '' + for f in src/c/vendor/configure/{ltmain.sh,configure}; do + substituteInPlace "$f" --replace /usr/bin/file file + done + ''; + + nativeBuildInputs = [ file ]; + propagatedBuildInputs = [ + ctypes + result + ]; + checkInputs = [ alcotest ]; + # Alcotest depends on fmt that needs 4.08 or newer + doCheck = lib.versionAtLeast ocaml.version "4.08"; + + meta = { + homepage = "https://github.com/aantron/luv"; + description = "Binding to libuv: cross-platform asynchronous I/O"; + # MIT-licensed, extra licenses apply partially to libuv vendor + license = with lib.licenses; [ + mit + bsd2 + bsd3 + cc-by-sa-40 + ]; + maintainers = with lib.maintainers; [ + locallycompact + sternenseemann + ]; + }; + }; +in +{ + luv-0-5-12 = generic { + version = "0.5.12"; sha256 = "sha256-dp9qCIYqSdROIAQ+Jw73F3vMe7hnkDe8BgZWImNMVsA="; }; - - patches = [ - # backport of patch to fix incompatible pointer type. remove next update - # https://github.com/aantron/luv/commit/ad7f953fccb8732fe4eb9018556e8d4f82abf8f2 - ./incompatible-pointer-type-fix.diff - ]; - - postConfigure = '' - for f in src/c/vendor/configure/{ltmain.sh,configure}; do - substituteInPlace "$f" --replace /usr/bin/file file - done - ''; - - nativeBuildInputs = [ file ]; - propagatedBuildInputs = [ - ctypes - result - ]; - checkInputs = [ alcotest ]; - # Alcotest depends on fmt that needs 4.08 or newer - doCheck = lib.versionAtLeast ocaml.version "4.08"; - - meta = { - homepage = "https://github.com/aantron/luv"; - description = "Binding to libuv: cross-platform asynchronous I/O"; - # MIT-licensed, extra licenses apply partially to libuv vendor - license = with lib.licenses; [ - mit - bsd2 - bsd3 - cc-by-sa-40 - ]; - maintainers = with lib.maintainers; [ - locallycompact - sternenseemann - ]; + luv = generic { + version = "0.5.14"; + sha256 = "sha256-jgG0pQyIds3ZjY4kXAaHxNxNiDrtFhrZxazh+x/arpk="; }; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 72027961b6da..85a8b5df2a14 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1147,9 +1147,12 @@ let lutils = callPackage ../development/ocaml-modules/lutils { }; - luv = callPackage ../development/ocaml-modules/luv { - inherit (pkgs) file; - }; + inherit + (callPackage ../development/ocaml-modules/luv { + }) + luv-0-5-12 + luv + ; lwd = callPackage ../development/ocaml-modules/lwd { }; From 41b660719803ab4a584a82ef7e0e3bb0c5ff0157 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Thu, 9 Apr 2026 11:08:52 +0100 Subject: [PATCH 253/305] ocamlPackages.luv: clean up ocaml version handling OCaml 4.08 and below has been removed from nix so we can assume we have at least 4.09. --- pkgs/development/ocaml-modules/luv/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix index 465d8c4b75cb..bfa6774d0575 100644 --- a/pkgs/development/ocaml-modules/luv/default.nix +++ b/pkgs/development/ocaml-modules/luv/default.nix @@ -1,7 +1,6 @@ { lib, buildDunePackage, - ocaml, fetchurl, ctypes, result, @@ -19,8 +18,6 @@ let pname = "luv"; inherit version; - minimalOCamlVersion = "4.03"; - src = fetchurl { url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; inherit sha256; @@ -40,8 +37,7 @@ let result ]; checkInputs = [ alcotest ]; - # Alcotest depends on fmt that needs 4.08 or newer - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = { homepage = "https://github.com/aantron/luv"; From 5d7f24d5155a30f7b60d88f84c31a047887f1504 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Thu, 9 Apr 2026 12:27:28 +0100 Subject: [PATCH 254/305] ocamlPackages.luv: clean up autotool file patching Files named configure are already patched automatically: 97c43828fb7e016b4ee8fe434bc4d5e0b8a8b4be. We only need to worry about ltmain.sh now. Since we no longer have to worry about the missing substitution in configure, we can use --replace-fail instead of --replace which avoids the deprecation warning. --- pkgs/development/ocaml-modules/luv/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix index bfa6774d0575..193edadb4b09 100644 --- a/pkgs/development/ocaml-modules/luv/default.nix +++ b/pkgs/development/ocaml-modules/luv/default.nix @@ -26,9 +26,7 @@ let patches = lib.optional (lib.versionOlder version "0.5.14") ./incompatible-pointer-type-fix.diff; postConfigure = '' - for f in src/c/vendor/configure/{ltmain.sh,configure}; do - substituteInPlace "$f" --replace /usr/bin/file file - done + substituteInPlace "src/c/vendor/configure/ltmain.sh" --replace-fail /usr/bin/file file ''; nativeBuildInputs = [ file ]; From 49426923b2a32efb48fb86b7917d2703c6852e26 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 16:45:52 +0200 Subject: [PATCH 255/305] python3Packages.rfc3161-client: 1.0.5 -> 1.0.6 Diff: https://github.com/trailofbits/rfc3161-client/compare/v1.0.5...v1.0.6 Changelog: https://github.com/trailofbits/rfc3161-client/releases/tag/v1.0.6 https://github.com/trailofbits/rfc3161-client/security/advisories/GHSA-3xxc-pwj6-jgrj --- pkgs/development/python-modules/rfc3161-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rfc3161-client/default.nix b/pkgs/development/python-modules/rfc3161-client/default.nix index ab9df7c1aadd..3d567f11904d 100644 --- a/pkgs/development/python-modules/rfc3161-client/default.nix +++ b/pkgs/development/python-modules/rfc3161-client/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "rfc3161-client"; - version = "1.0.5"; + version = "1.0.6"; pyproject = true; src = fetchFromGitHub { owner = "trailofbits"; repo = "rfc3161-client"; tag = "v${version}"; - hash = "sha256-EF4d9MnBhWt99vy2MOK+u0aUQ3ZEH/8mYezlWQtGvhU="; + hash = "sha256-8OjohrHqUgsKXRZ28Au6Un6Wlzh81XVSQosoQC2f+Fs="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 5defe9e445f179e8283a08cc84828a078502223f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 16:51:27 +0200 Subject: [PATCH 256/305] python3Packages.rfc3161-client: migrate to finalAttrs --- .../python-modules/rfc3161-client/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/rfc3161-client/default.nix b/pkgs/development/python-modules/rfc3161-client/default.nix index 3d567f11904d..9d8dfdc33826 100644 --- a/pkgs/development/python-modules/rfc3161-client/default.nix +++ b/pkgs/development/python-modules/rfc3161-client/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rfc3161-client"; version = "1.0.6"; pyproject = true; @@ -17,12 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "trailofbits"; repo = "rfc3161-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8OjohrHqUgsKXRZ28Au6Un6Wlzh81XVSQosoQC2f+Fs="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src pname; + inherit (finalAttrs) src pname; hash = "sha256-jQsogV+qR0jAkHz/Slg9oBO/f96osU8YcjuaX4ZJQTk="; }; @@ -50,7 +50,7 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ bot-wxt1221 ]; license = lib.licenses.asl20; platforms = lib.platforms.all; - changelog = "https://github.com/trailofbits/rfc3161-client/releases/tag/v${version}"; + changelog = "https://github.com/trailofbits/rfc3161-client/releases/tag/${finalAttrs.src.tag}"; description = "Opinionated Python RFC3161 Client"; }; -} +}) From aaec4c2dad11247694f0ab41913c89e7eaf6ddf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 15:54:39 +0200 Subject: [PATCH 257/305] secrethound: add changelog to meta - update meta --- pkgs/by-name/se/secrethound/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/secrethound/package.nix b/pkgs/by-name/se/secrethound/package.nix index e836371ac04c..1e90e726faf2 100644 --- a/pkgs/by-name/se/secrethound/package.nix +++ b/pkgs/by-name/se/secrethound/package.nix @@ -11,7 +11,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "rafabd1"; repo = "SecretHound"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ca0AwD1oFBB8F2J4gLMtaDssacczugAkkSYdBTvT4VQ="; }; @@ -23,8 +23,9 @@ buildGoModule (finalAttrs: { ]; meta = { - description = "A powerful CLI tool designed to find secrets in JavaScript files, web pages, and other text sources."; + description = "CLI tool designed to find secrets in JavaScript files, web pages, and other text sources"; homepage = "https://github.com/rafabd1/SecretHound"; + changelog = "https://github.com/rafabd1/SecretHound/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.michaelBelsanti ]; mainProgram = "secrethound"; From fad988762ff1499cea6ebaf6200f74cfbc5bc437 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 15:49:31 +0000 Subject: [PATCH 258/305] terraform-providers.datadog_datadog: 4.3.0 -> 4.4.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ae3e2261828a..5f04875afe05 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -274,13 +274,13 @@ "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI=" }, "datadog_datadog": { - "hash": "sha256-Is1XgOFmRl1Ieua5ZlBI/4bHal4AhsPhbl95r97bYN4=", + "hash": "sha256-WMggvZAgj36OyelTSE8I/1GRoTivs7q9szUbAFi6XdY=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v4.3.0", + "rev": "v4.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-4A7qf+1RZYWyA5G/qSFhOjDR4GUtGzkh6m81n3Nvads=" + "vendorHash": "sha256-2uj7Ff8g43s2T+zQIbTYFxxuaLpFxPQRo2z/0HNmh9k=" }, "datadrivers_nexus": { "hash": "sha256-yfxlDln4brI8QTFnhVsNOO3vRiqft3YWytvy2GMNBdY=", From 7cce57d87a63ea7374bed2c2e49f97c96837c5f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 Apr 2026 17:52:16 +0200 Subject: [PATCH 259/305] evcc: 0.304.0 -> 0.304.2 https://github.com/evcc-io/evcc/releases/tag/0.304.2 --- pkgs/by-name/ev/evcc/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 70be3472aef2..326002a5aacb 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.304.0"; + version = "0.304.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-zT/V3b0SQbstUk/dLmCN7bufQ7NsS5UTHIzmQsnaHIU="; + hash = "sha256-BViPo9P3c5ptI+pvKfpPVrYJFbbV5cF3Nn1eZ90BaRM="; }; - vendorHash = "sha256-7Uz/VYuVnRjpDHvwPO2LLif9iWrGDvxdsre0fENBiwU="; + vendorHash = "sha256-CDbFutP+pLHt9IJWaCdVxoM/PE/tJ/XU7SStqMd6A6Y="; commonMeta = { license = lib.licenses.mit; @@ -52,7 +52,7 @@ buildGo126Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-/M/htYm3T5DJfNKLMudItfKKQ179mrUWdL/EVGSt2ss="; + hash = "sha256-DmpwSART/Aw2vLMAp9fxoZ6iDZiSfDfvNCFLlAdDDRU="; }; nativeBuildInputs = [ From 4ff5bde55c65f498892d201dfed75f01351d0697 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Mar 2026 12:48:02 +0100 Subject: [PATCH 260/305] python3Packages.ebcdic: 1.1.1 -> 2.0.0 --- .../python-modules/ebcdic/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ebcdic/default.nix b/pkgs/development/python-modules/ebcdic/default.nix index 2c925eedd853..40aa8512dce9 100644 --- a/pkgs/development/python-modules/ebcdic/default.nix +++ b/pkgs/development/python-modules/ebcdic/default.nix @@ -2,25 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + flit-core, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ebcdic"; - version = "1.1.1"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "roskakori"; repo = "CodecMapper"; - tag = "v${version}"; - hash = "sha256-gRyZychcF3wYocgVbdF255cSuZh/cl8X0WH/Iplkmxc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-71EMWUGoJrsc3EOVHeV4xqSJRKoA7Sz2dvmZJ1sjQCg="; }; - sourceRoot = "${src.name}/${pname}"; + sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pname}"; - nativeBuildInputs = [ setuptools ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 7afb723621dc0d40e227920fe3ceb929bf18bc35 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 Apr 2026 13:16:04 +0200 Subject: [PATCH 261/305] nginxModules.vod: 1.33 -> 1.7.0; switch to fork The kaltura upstream has not merged any PRs since 2024-05. In the meantime a well-maintained upstream has picked up open PRs and made 12 releases since 2025-06. --- pkgs/servers/http/nginx/modules.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 87d9c905ee51..e4ba92fa0bf6 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -998,35 +998,35 @@ let }; }; - vod = { + vod = rec { name = "vod"; + version = "1.7.0"; + src = applyPatches { name = "vod"; src = fetchFromGitHub { - owner = "kaltura"; + owner = "dio-az"; repo = "nginx-vod-module"; - tag = "1.33"; - hash = "sha256-hf4iprkdNP7lVlrm/7kMkrp/8440PuTZiL1hv/Icfm4="; + tag = "v${version}"; + hash = "sha256-IcXbbmAs16F9qOEJWgH6XqP5sBMYszclGByVghj0eBM="; }; + postPatch = '' substituteInPlace vod/media_set.h \ --replace-fail "MAX_CLIPS (128)" "MAX_CLIPS (1024)" - substituteInPlace vod/subtitle/dfxp_format.c \ - --replace-fail '(!ctxt->wellFormed && !ctxt->recovery))' '!ctxt->wellFormed)' - # https://github.com/kaltura/nginx-vod-module/pull/1593 - substituteInPlace ngx_http_vod_module.c \ - --replace-fail 'ngx_http_vod_exit_process()' 'ngx_http_vod_exit_process(ngx_cycle_t *cycle)' ''; }; inputs = [ - ffmpeg_6-headless + ffmpeg-headless fdk_aac openssl libxml2 libiconv ]; + passthru.tests = nixosTests.frigate; + meta = { description = "VOD packager"; homepage = "https://github.com/kaltura/nginx-vod-module"; From 50271477c4a5a9e6b69f0be0db0d8aa3e19c6af8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 Apr 2026 16:50:39 +0200 Subject: [PATCH 262/305] nixos/frigate: set vod_hls_version Nginx warned with the updated vod plugin: > "vod_hls_version" must be at least 6 when "vod_hls_container_format" is fmp4 --- nixos/modules/services/video/frigate.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index c21be4a189d2..5ecb88bfb8a2 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -640,6 +640,7 @@ in listen 127.0.0.1:5000; # vod settings + vod_hls_version 6; vod_base_url ""; vod_segments_base_url ""; vod_mode mapped; From 3f9466994ec1379cc8f613bf0df0191bf6a43ad2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 18:01:48 +0200 Subject: [PATCH 263/305] python3Packages.oletools: disable failing tests --- pkgs/development/python-modules/oletools/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix index 2ccd85b43e80..bc197109e83a 100644 --- a/pkgs/development/python-modules/oletools/default.nix +++ b/pkgs/development/python-modules/oletools/default.nix @@ -43,6 +43,10 @@ buildPythonPackage rec { # Test fails with AssertionError: Tuples differ: ('MS Word 2007+... "test_all" "test_xlm" + # AssertionError: Found "warn" in output... + "test_empty_behaviour" + "test_rtf_behaviour" + "test_text_behaviour" ]; pythonImportsCheck = [ "oletools" ]; From e82e9bd8a33da6facd6d2368274ee40e393173e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 18:05:39 +0200 Subject: [PATCH 264/305] python3Packages.oletools: modernize --- .../python-modules/oletools/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix index bc197109e83a..2d10dfe9509a 100644 --- a/pkgs/development/python-modules/oletools/default.nix +++ b/pkgs/development/python-modules/oletools/default.nix @@ -7,11 +7,12 @@ msoffcrypto-tool, olefile, pcodedmp, + setuptools, pyparsing, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oletools"; version = "0.60.2"; format = "setuptools"; @@ -19,11 +20,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "decalage2"; repo = "oletools"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ons1VeWStxUZw2CPpnX9p5I3Q7cMhi34JU8TeuUDt+Y="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "pyparsing" ]; + + build-system = [ setuptools ]; + + dependencies = [ colorclass easygui msoffcrypto-tool @@ -34,11 +39,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pyparsing>=2.1.0,<3" "pyparsing>=2.1.0" - ''; - disabledTests = [ # Test fails with AssertionError: Tuples differ: ('MS Word 2007+... "test_all" @@ -54,10 +54,11 @@ buildPythonPackage rec { meta = { description = "Module to analyze MS OLE2 files and MS Office documents"; homepage = "https://github.com/decalage2/oletools"; + changelog = "https://github.com/decalage2/oletools/releases/tag/${finalAttrs.src.tag}"; license = with lib.licenses; [ bsd2 # and mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 11b51d906dedfb4d420efc3077e2e075a4c1854c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 16:15:56 +0000 Subject: [PATCH 265/305] home-assistant-custom-lovelace-modules.auto-entities: 2.1.0 -> 2.2.0 --- .../custom-lovelace-modules/auto-entities/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix index d113600c562c..708b9c4df730 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "auto-entities"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Lint-Free-Technology"; repo = "lovelace-auto-entities"; tag = "v${version}"; - hash = "sha256-lErNtkRS6xbbpNvqrOu8k8ZZyKcwwzP/6Hlll4CggEQ="; + hash = "sha256-z+WrkLPuyzfYiKqfCmVyj1o7z/WjByr7gYoJblyQS3I="; }; - npmDepsHash = "sha256-diRmXYsbsMP6jC/dBRraRDknloZKA1SNrnoLST8wMfw="; + npmDepsHash = "sha256-09JWRjHhGHQ2NtLgY5x/dH/B+l/Sy4OfbEckHY3ezZI="; installPhase = '' runHook preInstall From ab962bd231869d10e175eec09d69260d65ff27c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 16:28:51 +0000 Subject: [PATCH 266/305] jumppad: 0.24.0 -> 0.25.1 --- pkgs/by-name/ju/jumppad/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/jumppad/package.nix b/pkgs/by-name/ju/jumppad/package.nix index 8154a75ef7ff..30df4c28faf2 100644 --- a/pkgs/by-name/ju/jumppad/package.nix +++ b/pkgs/by-name/ju/jumppad/package.nix @@ -6,15 +6,15 @@ buildGoModule (finalAttrs: { pname = "jumppad"; - version = "0.24.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = finalAttrs.version; - hash = "sha256-OH06qQ+gkPv9McHr+YiMRiqTvdvhW9UqcEJK2NZxGQo="; + hash = "sha256-Dqwug09ESljbgANQdmRyQCOswGDxOwhkd7yQiLdEh8M="; }; - vendorHash = "sha256-m2aMRQ/K8etAKgGEcMbOrx2cYxp3ncdLe70Q3zYdj4I="; + vendorHash = "sha256-5eI41EKgi61dVFAvsgxI2Vk1zrxtVinxYKquKlaSOyQ="; subPackages = [ "." ]; From 41788f370c3af4bdc9d31939ee27073388600a82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 16:30:59 +0000 Subject: [PATCH 267/305] airwindows: 0-unstable-2026-04-01 -> 0-unstable-2026-04-04 --- pkgs/by-name/ai/airwindows/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index c589c8e4092f..572f20876adf 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2026-04-01"; + version = "0-unstable-2026-04-04"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "974a26ea5a96a3cd57c3f8f8d95745bb765a5a72"; - hash = "sha256-Gin8I86TpLVG9SzfErVZobryW3rZQEidwLrUb7sd+rs="; + rev = "714ffb2db6f799067e63bf1f88ae8a89f4ee0d3c"; + hash = "sha256-Ed8U0AC+9ggsPS+fWfm7yBdnygjhHIdUtJlML2J4zKY="; }; # we patch helpers because honestly im spooked out by where those variables From 7316724ca89d58f096e36bb610faf748e9a6db08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 17:05:58 +0000 Subject: [PATCH 268/305] azurehound: 2.11.0 -> 2.12.0 --- pkgs/by-name/az/azurehound/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix index c21c58408c3c..0878a72d7602 100644 --- a/pkgs/by-name/az/azurehound/package.nix +++ b/pkgs/by-name/az/azurehound/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "azurehound"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "SpecterOps"; repo = "AzureHound"; tag = "v${finalAttrs.version}"; - hash = "sha256-HelzDMnQOZP8LBcF5eoQfgTOk6fBK5oCx+gu4v638JA="; + hash = "sha256-+3h9/R909/Bkxq0Y7oN0xpE6OH8+0Xvs/8X1NBQFrMg="; }; vendorHash = "sha256-QCZFIDUL/RbSMrDfQ8L0A6xJPcWJorBXvHhdIA1WK4Q="; From 7d67e1231d91f60d3f505929032380399ae4c40d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 17:06:28 +0000 Subject: [PATCH 269/305] allure: 2.38.1 -> 2.39.0 --- pkgs/by-name/al/allure/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix index 49eee83272e9..1f27bd1a8023 100644 --- a/pkgs/by-name/al/allure/package.nix +++ b/pkgs/by-name/al/allure/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.38.1"; + version = "2.39.0"; src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-y241mNyZsqiwvYgFeAgqxevq6bLiwKEdx1yFD7aXNr0="; + hash = "sha256-dDg/ZgacwPbsLQ/a0vHXYfExhPbNKJM0sdz8QjdzVmU="; }; dontConfigure = true; From bb92560436e16d508499c8e2b43e574c9b4b8116 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 19:06:46 +0200 Subject: [PATCH 270/305] python3Packages.extract-msg: relax ebcdic --- pkgs/development/python-modules/extract-msg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix index 633218c3621b..d0cd36b0d317 100644 --- a/pkgs/development/python-modules/extract-msg/default.nix +++ b/pkgs/development/python-modules/extract-msg/default.nix @@ -31,13 +31,13 @@ buildPythonPackage (finalAttrs: { hash = "sha256-n/v3ubgzWlWqLXZfy1O7+FvTJoLMtgL7DFPL39SZnfM="; }; - build-system = [ - setuptools - ]; - pythonRelaxDeps = [ "beautifulsoup4" + "ebcdic" ]; + + build-system = [ setuptools ]; + dependencies = [ beautifulsoup4 compressed-rtf From 1ae6be9291582bdf9c546dbe7bab6202cb23d06c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 17:06:47 +0000 Subject: [PATCH 271/305] python3Packages.py-ocsf-models: 0.8.1 -> 0.9.0 --- pkgs/development/python-modules/py-ocsf-models/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix index 43c17483b57f..76744b7ddaa4 100644 --- a/pkgs/development/python-modules/py-ocsf-models/default.nix +++ b/pkgs/development/python-modules/py-ocsf-models/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "py-ocsf-models"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "py-ocsf-models"; tag = finalAttrs.version; - hash = "sha256-Wtls4Ei1160hxvZjdyH0rJCQWEN/CwpxfllwgGTzMog="; + hash = "sha256-MdDpCr6FuPEt67PUjF0MjWXiA+ZyKLiACc/XPp+NoII="; }; pythonRelaxDeps = true; From 1d070f2f478b870824f83ee40346f2cec97cc2f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 17:29:27 +0000 Subject: [PATCH 272/305] python3Packages.python-fsutil: 0.16.0 -> 0.16.1 --- pkgs/development/python-modules/python-fsutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index de5c9aac1dcb..ae8d768045c6 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "python-fsutil"; - version = "0.16.0"; + version = "0.16.1"; pyproject = true; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = "python-fsutil"; tag = finalAttrs.version; - hash = "sha256-1XYyfBuaUED+xnVrILEtB+fUpc8sk4BDzGp8Hln/rlc="; + hash = "sha256-/KlnQdN8R95qjxMGui0SofLFZl10vq6ufl05JuVuhDw="; }; build-system = [ setuptools ]; From c9632a20d703c22f124e614742f055daea83607b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 20:03:54 +0200 Subject: [PATCH 273/305] python3Packages.weheat: 2026.2.28 -> 2026.4.8 Diff: https://github.com/wefabricate/wh-python/compare/2026.2.28...2026.4.8 Changelog: https://github.com/wefabricate/wh-python/releases/tag/2026.4.8 --- pkgs/development/python-modules/weheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weheat/default.nix b/pkgs/development/python-modules/weheat/default.nix index f4a5fd26782d..778d70faf839 100644 --- a/pkgs/development/python-modules/weheat/default.nix +++ b/pkgs/development/python-modules/weheat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "weheat"; - version = "2026.2.28"; + version = "2026.4.8"; pyproject = true; src = fetchFromGitHub { owner = "wefabricate"; repo = "wh-python"; tag = finalAttrs.version; - hash = "sha256-V29B30LztIHFbTRTqppR3kvVNwDoK4BPq5fK1blJUrU="; + hash = "sha256-AJaGedI0ctp0TCgfjB9AkM+VH9zqTqosgWq4nskOMSo="; }; build-system = [ setuptools ]; From eac997253b727c01a5a7113569f706b9ba65d138 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 18:04:29 +0000 Subject: [PATCH 274/305] mkbrr: 1.20.0 -> 1.22.0 --- pkgs/by-name/mk/mkbrr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mk/mkbrr/package.nix b/pkgs/by-name/mk/mkbrr/package.nix index fdeb094c4b09..cdf3e4c080ad 100644 --- a/pkgs/by-name/mk/mkbrr/package.nix +++ b/pkgs/by-name/mk/mkbrr/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "mkbrr"; - version = "1.20.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "mkbrr"; tag = "v${finalAttrs.version}"; - hash = "sha256-5oyzeinRjR09GEvLMGdCDH+UGYWPu1Qs8dXs/nIlwjs="; + hash = "sha256-M4lulMYb6jomS2sZ4E5nA6rP1KmuGiMjQEyuXqyl2vQ="; }; - vendorHash = "sha256-mbcbACOKMohBw0SH5gH06CTkHtJk3WmbAqpcO0qMFOs="; + vendorHash = "sha256-BNswyeGBhm0CY6D9HcJHTDKIGCJ5QotiwRnr22HltMo="; ldflags = [ "-s" From c40847fe6ea1f04ff86e02ed0a558aba486b73f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 20:04:36 +0200 Subject: [PATCH 275/305] python3Packages.aiotractive: 1.0.1 -> 1.0.2 Diff: https://github.com/zhulik/aiotractive/compare/v1.0.1...v1.0.2 Changelog: https://github.com/zhulik/aiotractive/releases/tag/v1.0.2 --- pkgs/development/python-modules/aiotractive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix index b42628aa409c..98d48aa5aa4f 100644 --- a/pkgs/development/python-modules/aiotractive/default.nix +++ b/pkgs/development/python-modules/aiotractive/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aiotractive"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "zhulik"; repo = "aiotractive"; tag = "v${version}"; - hash = "sha256-DP0dFDXaa0PyaERmhL6dNCOpiNs+N7ojMIapcajfMrk="; + hash = "sha256-Tr8USF7GF9CMOcjy62e+oTu4k/1jIAOsZmWTFWEzJvk="; }; build-system = [ setuptools ]; From d4e3f17cfb92c735a5ea572866abd65417f7bd2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 20:05:25 +0200 Subject: [PATCH 276/305] python3Packages.pyvlx: 0.2.32 -> 0.2.33 Diff: https://github.com/Julius2342/pyvlx/compare/0.2.32...0.2.33 Changelog: https://github.com/Julius2342/pyvlx/releases/tag/0.2.33 --- pkgs/development/python-modules/pyvlx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 92d0b6f5b8d6..5d06a71b3519 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "pyvlx"; - version = "0.2.32"; + version = "0.2.33"; pyproject = true; src = fetchFromGitHub { owner = "Julius2342"; repo = "pyvlx"; tag = finalAttrs.version; - hash = "sha256-ArNWXvYZ/eZWPUvV8z/+6WsAcm5MTnKblMrUFj51JhM="; + hash = "sha256-CdBpXga/OxkNILUPDe8bna0wbwNk7GLzYgZJeScJ948="; }; build-system = [ From 16db4521ceb4298a9b16f37384b3a0dbf13d38f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 20:08:40 +0200 Subject: [PATCH 277/305] python3Packages.aiotractive: migrate to finalAttrs --- .../python-modules/aiotractive/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix index 98d48aa5aa4f..32169475b486 100644 --- a/pkgs/development/python-modules/aiotractive/default.nix +++ b/pkgs/development/python-modules/aiotractive/default.nix @@ -8,7 +8,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiotractive"; version = "1.0.2"; pyproject = true; @@ -16,15 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zhulik"; repo = "aiotractive"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Tr8USF7GF9CMOcjy62e+oTu4k/1jIAOsZmWTFWEzJvk="; }; build-system = [ setuptools ]; - pythonRelaxDeps = [ - "orjson" - ]; + pythonRelaxDeps = [ "orjson" ]; dependencies = [ aiohttp @@ -40,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Python client for the Tractive REST API"; homepage = "https://github.com/zhulik/aiotractive"; - changelog = "https://github.com/zhulik/aiotractive/releases/tag/${src.tag}"; + changelog = "https://github.com/zhulik/aiotractive/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From cb42e3b24b6da647115b8c0889078b5195b22bf5 Mon Sep 17 00:00:00 2001 From: Birdee <85372418+BirdeeHub@users.noreply.github.com> Date: Thu, 9 Apr 2026 11:07:55 -0700 Subject: [PATCH 278/305] vimPlugins.lze: remove outdated test overrides --- pkgs/development/lua-modules/overrides.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 2c4cde548e79..67fc7542c809 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -836,24 +836,6 @@ in ]; }; - lze = prev.lze.overrideAttrs { - doCheck = lua.luaversion == "5.1"; - nativeCheckInputs = [ - final.nlua - final.bustedCheckHook - writableTmpDirAsHomeHook - ]; - }; - - lzextras = prev.lzextras.overrideAttrs { - doCheck = lua.luaversion == "5.1"; - nativeCheckInputs = [ - final.nlua - lua.pkgs.bustedCheckHook - final.lze - ]; - }; - magick = prev.magick.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ imagemagick From 84ffd528f3ac079f661b9187881e34464f7c064e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 9 Apr 2026 13:14:56 -0500 Subject: [PATCH 279/305] cgit: migrate to by-name --- .../cgit/default.nix => by-name/cg/cgit/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/version-management/cgit/default.nix => by-name/cg/cgit/package.nix} (100%) diff --git a/pkgs/applications/version-management/cgit/default.nix b/pkgs/by-name/cg/cgit/package.nix similarity index 100% rename from pkgs/applications/version-management/cgit/default.nix rename to pkgs/by-name/cg/cgit/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a492c9241374..68cd68abf788 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1161,8 +1161,6 @@ with pkgs; bump2version = with python3Packages; toPythonApplication bump2version; - cgit = callPackage ../applications/version-management/cgit { }; - datalad = with python3Packages; toPythonApplication datalad; datalad-gooey = with python3Packages; toPythonApplication datalad-gooey; From ea841c0ffeb2a0556559f68a4ac72b423967de29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 20:22:14 +0200 Subject: [PATCH 280/305] python3Packages.cyclopts: 4.10.1 -> 4.10.2 Diff: https://github.com/BrianPugh/cyclopts/compare/v4.10.1...v4.10.2 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v4.10.2 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 5cda15428217..42416fd3cf88 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "cyclopts"; - version = "4.10.1"; + version = "4.10.2"; pyproject = true; src = fetchFromGitHub { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${finalAttrs.version}"; - hash = "sha256-LgpnpE1Hyx4o2Pi9zXmPLlV7K2wTX5PiNlYD+7333dQ="; + hash = "sha256-vlsjhBfI08QMQ8FzM+BogAXbukHhnr4aD8ZmZVicCv0="; }; build-system = [ From d1403c90a5e5fe6008d8e2d4f3bcd139ed17771a Mon Sep 17 00:00:00 2001 From: Evy Garden Date: Thu, 9 Apr 2026 20:23:08 +0200 Subject: [PATCH 281/305] sdl3-image: 3.4.0 -> 3.4.2 --- pkgs/by-name/sd/sdl3-image/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index 7528527e0ae2..795e5faad0c9 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdl3-image"; - version = "3.4.0"; + version = "3.4.2"; outputs = [ "lib" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libsdl-org"; repo = "SDL_image"; tag = "release-${finalAttrs.version}"; - hash = "sha256-XRPHDcJ49sZa7y8TCWfS2gPOhpGyUnMMXVqvjV9f8E0="; + hash = "sha256-LNEbXhUDB6OKk3HxwV+jANnskS82ewhQe8pDy+P6L40="; }; strictDeps = true; From 10e5c485e489c68a748388842446cbac0e60ad7e Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Wed, 18 Mar 2026 19:43:36 +0100 Subject: [PATCH 282/305] hardware.amdgpu.zluda.enable: init --- nixos/modules/services/hardware/amdgpu.nix | 53 +++++++++++++--------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/hardware/amdgpu.nix b/nixos/modules/services/hardware/amdgpu.nix index 5c98a0db50ad..1b4c2f449be9 100644 --- a/nixos/modules/services/hardware/amdgpu.nix +++ b/nixos/modules/services/hardware/amdgpu.nix @@ -40,30 +40,41 @@ in }; opencl.enable = lib.mkEnableOption "OpenCL support using ROCM runtime library"; + zluda.enable = lib.mkEnableOption "CUDA support using ZLUDA runtime library"; + zluda.package = lib.mkPackageOption pkgs "zluda" { }; }; - config = { - boot.kernelParams = - lib.optionals cfg.legacySupport.enable [ - "amdgpu.si_support=1" - "amdgpu.cik_support=1" - "radeon.si_support=0" - "radeon.cik_support=0" - ] - ++ lib.optionals cfg.overdrive.enable [ - "amdgpu.ppfeaturemask=${cfg.overdrive.ppfeaturemask}" - ]; + config = lib.mkMerge [ + { + boot.kernelParams = + lib.optionals cfg.legacySupport.enable [ + "amdgpu.si_support=1" + "amdgpu.cik_support=1" + "radeon.si_support=0" + "radeon.cik_support=0" + ] + ++ lib.optionals cfg.overdrive.enable [ + "amdgpu.ppfeaturemask=${cfg.overdrive.ppfeaturemask}" + ]; - boot.initrd.kernelModules = lib.optionals cfg.initrd.enable [ "amdgpu" ]; - - hardware.graphics = lib.mkIf cfg.opencl.enable { - enable = lib.mkDefault true; - extraPackages = [ - pkgs.rocmPackages.clr - pkgs.rocmPackages.clr.icd - ]; - }; - }; + boot.initrd.kernelModules = lib.optionals cfg.initrd.enable [ "amdgpu" ]; + } + (lib.mkIf cfg.opencl.enable { + hardware.graphics = { + enable = lib.mkDefault true; + extraPackages = [ + pkgs.rocmPackages.clr + pkgs.rocmPackages.clr.icd + ]; + }; + }) + (lib.mkIf cfg.zluda.enable { + hardware.graphics = { + enable = lib.mkDefault true; + extraPackages = [ cfg.zluda.package ]; + }; + }) + ]; meta = { maintainers = with lib.maintainers; [ johnrtitor ]; From a8a1365dd293322ae60e6f6c7935d4db09ae6d09 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Wed, 18 Mar 2026 19:44:31 +0100 Subject: [PATCH 283/305] programs.nix-required-mounts.presets.zluda.enable: init --- .../modules/programs/nix-required-mounts.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index f3e7a75646d0..d4de973c0401 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -67,6 +67,23 @@ let # TODO: Refactor `hardware.graphics` to ease referencing the closure # NOTE: A naive implementation may e.g. introduce a conditional infinite recursion (https://github.com/NixOS/nixpkgs/pull/488199) nvidia-gpu.unsafeFollowSymlinks = true; + + zluda = { + onFeatures = [ + "cuda" + ]; + paths = [ + pkgs.addDriverRunpath.driverLink + "/dev/dri" + "/dev/kfd" + "/sys/devices/virtual/kfd" + # As per https://www.kernel.org/doc/Documentation/admin-guide/devices.txt + # 226 is the major ID for "Direct Rendering Infrastructure (DRI)" devices + "/sys/dev/char/226:*" + ] + ++ config.hardware.graphics.extraPackages; + unsafeFollowSymlinks = true; + }; }; in { @@ -82,6 +99,16 @@ in You may extend or override the exposed paths via the `programs.nix-required-mounts.allowedPatterns.nvidia-gpu.paths` option. ''; + + presets.zluda.enable = lib.mkEnableOption '' + Same as `programs.nix-required-mounts.presets.nvidia-gpu` but adds paths + to the sandbox that are needed for running CUDA applications on top of + the ZLUDA translation layer combined with AMD GPUs. + + You may extend or override the exposed paths via the + `programs.nix-required-mounts.allowedPatterns.zluda.paths` option. + ''; + allowedPatterns = with lib.types; lib.mkOption { @@ -122,6 +149,14 @@ in inherit (defaults) nvidia-gpu; }; }) + (lib.mkIf cfg.presets.zluda.enable { + hardware.graphics.enable = lib.mkDefault true; + hardware.amdgpu.zluda.enable = lib.mkDefault true; + nix.settings.system-features = cfg.allowedPatterns.zluda.onFeatures; + programs.nix-required-mounts.allowedPatterns = { + inherit (defaults) zluda; + }; + }) ] ); } From 32b0364cbedbb906de873cb1e53c888826c0383b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 19:46:26 +0000 Subject: [PATCH 284/305] skopeo: 1.22.0 -> 1.22.1 --- pkgs/by-name/sk/skopeo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix index c8c556f2fa9b..44214cf15087 100644 --- a/pkgs/by-name/sk/skopeo/package.nix +++ b/pkgs/by-name/sk/skopeo/package.nix @@ -19,13 +19,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-ERMOquT8ke/4urC6V0To+jJPeBICohHXL9YcCmGLST4="; + hash = "sha256-MS91KzOxcVhmH420zdUcSUw0UggRt3hQ6c3A3QSAYkA="; }; outputs = [ From c8bf0dcfac96e7053b90359b4c28a097745ae0d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 20:06:16 +0000 Subject: [PATCH 285/305] pomerium-cli: 0.32.0 -> 0.32.2 --- pkgs/by-name/po/pomerium-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/pomerium-cli/package.nix b/pkgs/by-name/po/pomerium-cli/package.nix index 64261bc15356..0f1409717ad0 100644 --- a/pkgs/by-name/po/pomerium-cli/package.nix +++ b/pkgs/by-name/po/pomerium-cli/package.nix @@ -14,16 +14,16 @@ let in buildGoModule (finalAttrs: { pname = "pomerium-cli"; - version = "0.32.0"; + version = "0.32.2"; src = fetchFromGitHub { owner = "pomerium"; repo = "cli"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-dxN3pVDt6v/xEnBwvmOFf8gf6YZWv23a4K6mTRovv+k="; + sha256 = "sha256-t2Sp4zAIybUsxaBdQ9ev+EJsFpWqM8KWaE2UOI4xw5A="; }; - vendorHash = "sha256-pDoV7CzQFiAi6OAqqW8b6/Sl9PSQou9pU2c5nU7Rt0A="; + vendorHash = "sha256-LzXcHGRBn99WhDsxLQKY3t8Zp4sw9Ec5CbA/rU/3SQ0="; subPackages = [ "cmd/pomerium-cli" From aab7dd7a6853fddec9d9e3bc13f099df30343063 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 9 Apr 2026 11:42:10 -0700 Subject: [PATCH 286/305] python3Packages.langgraph-cli: 0.4.19 -> 0.4.21 --- .../python-modules/langgraph-cli/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index cf4af2833d67..d34e924c73bc 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -8,9 +8,11 @@ # dependencies click, - langgraph, + httpx, langgraph-runtime-inmem, langgraph-sdk, + langgraph, + pathspec, python-dotenv, # testing @@ -24,14 +26,14 @@ buildPythonPackage (finalAttrs: { pname = "langgraph-cli"; - version = "0.4.19"; + version = "0.4.21"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "cli==${finalAttrs.version}"; - hash = "sha256-a92xh9BOA3gxJ3TLRQc49G611+LnCukhT3kgf6ian6c="; + hash = "sha256-PwVJzg+LQ6gScd/lewBqN66rzADnucMeIA/4gmP4xPw="; }; sourceRoot = "${finalAttrs.src.name}/libs/cli"; @@ -40,7 +42,10 @@ buildPythonPackage (finalAttrs: { dependencies = [ click + httpx langgraph-sdk + pathspec + python-dotenv ]; optional-dependencies = { From c0e00ffeae8ab6304d453be41a756870ca3b56ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 20:40:16 +0000 Subject: [PATCH 287/305] python3Packages.qpageview: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/qpageview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix index 238c489ca28d..ebe6aef0af6c 100644 --- a/pkgs/development/python-modules/qpageview/default.nix +++ b/pkgs/development/python-modules/qpageview/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "qpageview"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "frescobaldi"; repo = "qpageview"; tag = "v${version}"; - hash = "sha256-cKidVtsqNXGuWNTTgvVOP3Wyf6M+Xctwaq7pOZb8eeo="; + hash = "sha256-PqoYxSYOsR/tsV3NZmxCtK1fKQuo8WUJZVBSNRjVNLw="; }; build-system = [ hatchling ]; From 5da35a230a356e9d19151495805cc031400b094e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jan 2026 10:43:29 +0100 Subject: [PATCH 288/305] python313Packages.hibpwned: init at 1.3.9 Python API wrapper for haveibeenpwned.com https://github.com/plasticuproject/hibpwned --- .../python-modules/hibpwned/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/hibpwned/default.nix diff --git a/pkgs/development/python-modules/hibpwned/default.nix b/pkgs/development/python-modules/hibpwned/default.nix new file mode 100644 index 000000000000..19b8ed98dac4 --- /dev/null +++ b/pkgs/development/python-modules/hibpwned/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + requests, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "hibpwned"; + version = "1.3.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "plasticuproject"; + repo = "hibpwned"; + tag = finalAttrs.version; + hash = "sha256-d3EhRu7HcvbyjWWHVSax0j39yE4+hJp8zvtyRKoh4sY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + # Test require network access + doCheck = false; + + pythonImportsCheck = [ "hibpwned" ]; + + meta = { + description = "Python API wrapper for haveibeenpwned.com"; + homepage = "https://github.com/plasticuproject/hibpwned"; + changelog = "https://github.com/plasticuproject/hibpwned/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8350b4d38e44..7faf4851bcf9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7014,6 +7014,8 @@ self: super: with self; { hg-git = callPackage ../development/python-modules/hg-git { }; + hibpwned = callPackage ../development/python-modules/hibpwned { }; + hickle = callPackage ../development/python-modules/hickle { }; hid = callPackage ../development/python-modules/hid { inherit (pkgs) hidapi; }; From 395de7e93d48f890db8af8d32adeb2c2a8e7d2e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jan 2026 15:08:39 +0100 Subject: [PATCH 289/305] python313Packages.ignorant: init at 1.2 Module to check if a phone number is use https://github.com/megadose/ignorant --- .../python-modules/ignorant/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/ignorant/default.nix diff --git a/pkgs/development/python-modules/ignorant/default.nix b/pkgs/development/python-modules/ignorant/default.nix new file mode 100644 index 000000000000..3a88e6d30826 --- /dev/null +++ b/pkgs/development/python-modules/ignorant/default.nix @@ -0,0 +1,51 @@ +{ + lib, + beautifulsoup4, + buildPythonPackage, + fetchPypi, + httpx, + setuptools, + termcolor, + tqdm, + trio, +}: + +buildPythonPackage rec { + pname = "ignorant"; + version = "1.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-SLjED08uI+RjX+E0WHTQceReTEaY9WLPhXR3n0fP080="; + }; + + pythonRemoveDeps = [ + # https://github.com/megadose/ignorant/pull/37 + "argparse" + # https://github.com/megadose/ignorant/pull/36 + "bs4" + ]; + + build-system = [ setuptools ]; + + dependencies = [ + beautifulsoup4 + httpx + termcolor + tqdm + trio + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "ignorant" ]; + + meta = { + description = "Module to check if a phone number is used on different sites"; + homepage = "https://pypi.org/project/ignorant/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8350b4d38e44..b277bf7f7814 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7390,6 +7390,8 @@ self: super: with self; { ignite = callPackage ../development/python-modules/ignite { }; + ignorant = callPackage ../development/python-modules/ignorant { }; + igraph = callPackage ../development/python-modules/igraph { inherit (pkgs) igraph; }; ihcsdk = callPackage ../development/python-modules/ihcsdk { }; From 99b6678490a0b9a7a3373cd2725052dc8e4371fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Jan 2026 02:52:28 +0100 Subject: [PATCH 290/305] python313Packages.pydig: init at 0.4.0 Python wrapper library for the 'dig' command line tool https://github.com/leonsmith/pydig --- .../python-modules/pydig/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/pydig/default.nix diff --git a/pkgs/development/python-modules/pydig/default.nix b/pkgs/development/python-modules/pydig/default.nix new file mode 100644 index 000000000000..8cfea5037b59 --- /dev/null +++ b/pkgs/development/python-modules/pydig/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + pkgs, + poetry-core, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "pydig"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "leonsmith"; + repo = "pydig"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bNGqIEGPcd/TSTSDs2nGxBh60QI7sXRX9A0NVYflqPc="; + }; + + patches = [ + # Switch to poetry-core, https://github.com/leonsmith/pydig/pull/21 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/leonsmith/pydig/commit/6e8ad99494b16084974c799db9afa020f1741886.patch"; + hash = "sha256-KhVQICsR93n+EuCcGhj81lChB/gBSQWncg1PYyo0dlc="; + }) + ]; + + build-system = [ poetry-core ]; + + dependencies = [ pkgs.dig ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pydig" ]; + + meta = { + description = "Python wrapper library for the 'dig' command line tool"; + homepage = "https://github.com/leonsmith/pydig"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8350b4d38e44..03769eb63803 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13592,6 +13592,8 @@ self: super: with self; { pydiffx = callPackage ../development/python-modules/pydiffx { }; + pydig = callPackage ../development/python-modules/pydig { }; + pydigiham = callPackage ../development/python-modules/pydigiham { }; pydiscourse = callPackage ../development/python-modules/pydiscourse { }; From 5bfa8ae5a76791d4c8a23c3b2b88769c59176566 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Jan 2026 03:04:18 +0100 Subject: [PATCH 291/305] python313Packages.requests-random-user-agent: init at 2025.01.19 Configures the requests library to randomly select a desktop User-Agent https://github.com/DavidWittman/requests-random-user-agent --- .../requests-random-user-agent/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/requests-random-user-agent/default.nix diff --git a/pkgs/development/python-modules/requests-random-user-agent/default.nix b/pkgs/development/python-modules/requests-random-user-agent/default.nix new file mode 100644 index 000000000000..5f7ed47ddc93 --- /dev/null +++ b/pkgs/development/python-modules/requests-random-user-agent/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + requests, + pytestCheckHook, + pytest-httpbin, +}: + +buildPythonPackage (finalAttrs: { + pname = "requests-random-user-agent"; + version = "2025.01.19"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DavidWittman"; + repo = "requests-random-user-agent"; + tag = finalAttrs.version; + hash = "sha256-El/aibqEyx5diVTOe/4PEFB7KRfKqUJGPar6j6hZyIc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "requests_random_user_agent" ]; + + disabledTests = [ + # Tests require network access + "test_request" + "test_request_different_without_session" + "test_request_without_session" + ]; + + meta = { + description = "Configures the requests library to randomly select a desktop User-Agent"; + homepage = "https://github.com/DavidWittman/requests-random-user-agent"; + changelog = "https://github.com/DavidWittman/requests-random-user-agent/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 8350b4d38e44..a3bb8e648149 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16764,6 +16764,10 @@ self: super: with self; { requests-pkcs12 = callPackage ../development/python-modules/requests-pkcs12 { }; + requests-random-user-agent = + callPackage ../development/python-modules/requests-random-user-agent + { }; + requests-ratelimiter = callPackage ../development/python-modules/requests-ratelimiter { }; requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; From 40a0cb178ebf75e600a96699cc2af14fed842227 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 21:15:29 +0000 Subject: [PATCH 292/305] lockbook-desktop: 26.3.22 -> 26.4.9 --- pkgs/by-name/lo/lockbook-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index 44ea5a056650..268e83f9e710 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "lockbook-desktop"; - version = "26.3.22"; + version = "26.4.9"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = finalAttrs.version; - hash = "sha256-Mroh2xSLe5dlKNXxTPyP9RzLtwcEf2JXZnE1tN4t1fE="; + hash = "sha256-MQobOqixxWDuHMLVk7pfIquLSA3rZNYn4MaENAoIsuM="; }; - cargoHash = "sha256-hPQlDG2eFmiPXkCyjk10fpVDAbq3R8mQs7bOHbCBhwg="; + cargoHash = "sha256-sLfZ8c2cbXT2NXcopqKJaX1SMlsi3Zy9V+VDi6zarxs="; nativeBuildInputs = [ pkg-config From 6413987880e16da45934fe75d2e418e23010640e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 21:17:41 +0000 Subject: [PATCH 293/305] open-scq30: 2.5.1 -> 2.6.2 --- pkgs/by-name/op/open-scq30/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index c7534d1914a1..f420e38703e0 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "open-scq30"; - version = "2.5.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "Oppzippy"; repo = "OpenSCQ30"; rev = "v${finalAttrs.version}"; - hash = "sha256-XBK7KxuksQoYZs/uVkh6+8S20G05W9ftK9pviUFNJ8s="; + hash = "sha256-4K/3kulUbUa21YbWh1nYXeeHAIVD/FX8VtWArpij0JQ="; }; nativeBuildInputs = [ @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: { libxi ]; - cargoHash = "sha256-P4r1MoFCkG80X0dJ1MpmjgedcpQ/HDTC3XikNUDKRaQ="; + cargoHash = "sha256-1Ccbi/21jTyTPt9WqhnwpBFuD0f90PabwyVRwZI1l0k="; env.INSTALL_PREFIX = placeholder "out"; From e805baacb77baa58d7e11a65907544b2d800143b Mon Sep 17 00:00:00 2001 From: Alex Tunstall Date: Wed, 12 Nov 2025 01:14:09 +0000 Subject: [PATCH 294/305] haskell.{compiler,packages}.microhs: init The package set is built entirely from source using the stdenv and Hugs. This also replaces the recently added microhs package, which was built from pre-generated compiler output. Co-authored-by: sternenseemann --- doc/release-notes/rl-2605.section.md | 2 + maintainers/maintainer-list.nix | 14 + pkgs/by-name/mi/microhs/package.nix | 46 -- .../compilers/microhs/0.15.4.0.nix | 4 + pkgs/development/compilers/microhs/boot.nix | 40 ++ pkgs/development/compilers/microhs/common.nix | 94 ++++ pkgs/development/compilers/microhs/cpphs.nix | 50 +++ .../microhs/patches/hugs-viewpatterns.patch | 406 +++++++++++++++++ .../compilers/microhs/patches/hugs.patch | 365 +++++++++++++++ .../compilers/microhs/patches/link-math.patch | 21 + .../microhs/patches/simple-unicode.patch | 35 ++ pkgs/development/compilers/microhs/stage1.nix | 36 ++ pkgs/development/compilers/microhs/stage2.nix | 61 +++ .../compilers}/microhs/test-hello-world.nix | 0 .../development/compilers/microhs/wrapper.nix | 52 +++ .../haskell-modules/configuration-microhs.nix | 78 ++++ .../haskell-modules/make-package-set.nix | 104 +++-- .../haskell-modules/microhs-builder.nix | 420 ++++++++++++++++++ ...f1b5dec81561a1b1d36b8e3065ce091dce2ec6.nix | 7 + .../tools/haskell/microcabal/common.nix | 69 +++ pkgs/top-level/haskell-packages.nix | 25 +- 21 files changed, 1836 insertions(+), 93 deletions(-) delete mode 100644 pkgs/by-name/mi/microhs/package.nix create mode 100644 pkgs/development/compilers/microhs/0.15.4.0.nix create mode 100644 pkgs/development/compilers/microhs/boot.nix create mode 100644 pkgs/development/compilers/microhs/common.nix create mode 100644 pkgs/development/compilers/microhs/cpphs.nix create mode 100644 pkgs/development/compilers/microhs/patches/hugs-viewpatterns.patch create mode 100644 pkgs/development/compilers/microhs/patches/hugs.patch create mode 100644 pkgs/development/compilers/microhs/patches/link-math.patch create mode 100644 pkgs/development/compilers/microhs/patches/simple-unicode.patch create mode 100644 pkgs/development/compilers/microhs/stage1.nix create mode 100644 pkgs/development/compilers/microhs/stage2.nix rename pkgs/{by-name/mi => development/compilers}/microhs/test-hello-world.nix (100%) create mode 100644 pkgs/development/compilers/microhs/wrapper.nix create mode 100644 pkgs/development/haskell-modules/configuration-microhs.nix create mode 100644 pkgs/development/haskell-modules/microhs-builder.nix create mode 100644 pkgs/development/tools/haskell/microcabal/0.5.3.0-31f1b5dec81561a1b1d36b8e3065ce091dce2ec6.nix create mode 100644 pkgs/development/tools/haskell/microcabal/common.nix diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 2e5d9f73d444..f19364281c28 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -284,6 +284,8 @@ - the `autossh-ng` NixOS module was introduced as a simpler alternative to the existing `autossh` module. +- Added `haskell.packages.microhs`, a set of Haskell packages built with MicroHs. + - `gnuradio`: Overriding the `.pkgs` package set is now possible with a `packageOverrides` function, like with `python.pkgs` and other language-specific package sets. Example: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 115c78f08cf3..44c2aabf8e95 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1192,6 +1192,20 @@ githubId = 49609151; name = "Popa Ioan Alexandru"; }; + AlexandreTunstall = { + name = "Alex Tunstall"; + email = "alex@tunstall.xyz"; + matrix = "@alex:tunstall.xyz"; + github = "AlexandreTunstall"; + githubId = 32900877; + keys = [ + { + # Fetch with WKD (e.g. gpg --locate-external-keys alex@tunstall.xyz) + # The fetched key should have this fingerprint (please let me know if not) + fingerprint = "51A5 8478 068E B19D FD35 D542 F6CA 1AD5 54DC A5E4"; + } + ]; + }; alexandru0-dev = { email = "alexandru.italia32+nixpkgs@gmail.com"; github = "alexandru0-dev"; diff --git a/pkgs/by-name/mi/microhs/package.nix b/pkgs/by-name/mi/microhs/package.nix deleted file mode 100644 index 847f3c766f66..000000000000 --- a/pkgs/by-name/mi/microhs/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - callPackage, - stdenv, - fetchFromGitHub, - lib, - writableTmpDirAsHomeHook, - nix-update-script, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "microhs"; - version = "0.15.4.0"; - - src = fetchFromGitHub { - owner = "augustss"; - repo = "MicroHs"; - tag = "v${finalAttrs.version}"; - hash = "sha256-V3Of72rpXvImV90sSoYz02H06o1J3FqHDQNbB+M6/8A="; - }; - - # mcabal doesn't seem to respect the make flag and fails with /homeless-shelter - # This works around the issue - nativeBuildInputs = [ writableTmpDirAsHomeHook ]; - - makeFlags = [ "MCABAL=$(out)" ]; - buildFlags = [ "bootstrap" ]; - - # MicroCabal is a separate repository, which should be packaged separately - # The MicroCabal that is installed by `make install` is pregenerated, does not respect MCABAL above, and so is not useable - postInstall = "rm $out/bin/mcabal"; - - passthru = { - updateScript = nix-update-script { }; - tests = { - hello-world = callPackage ./test-hello-world.nix { microhs = finalAttrs.finalPackage; }; - }; - }; - - meta = { - description = "Haskell implemented with combinators"; - homepage = "https://github.com/augustss/MicroHs"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.steeleduncan ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/development/compilers/microhs/0.15.4.0.nix b/pkgs/development/compilers/microhs/0.15.4.0.nix new file mode 100644 index 000000000000..b0f454e723a0 --- /dev/null +++ b/pkgs/development/compilers/microhs/0.15.4.0.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "0.15.4.0"; + hash = "sha256-FUr2EA3zbmt2Tr2F8zT1wHnB8GDlUVb2W1fP4IqNd80="; +} diff --git a/pkgs/development/compilers/microhs/boot.nix b/pkgs/development/compilers/microhs/boot.nix new file mode 100644 index 000000000000..b55587a8438f --- /dev/null +++ b/pkgs/development/compilers/microhs/boot.nix @@ -0,0 +1,40 @@ +{ + stdenvNoCC, + hugs, + makeWrapper, + microhs-src, +}: + +stdenvNoCC.mkDerivation { + pname = "microhs"; + version = "${microhs-src.version}-hugs"; + + inherit (microhs-src) + src + patches + postPatch + meta + ; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" "$out/share/microhs-hugs" + s="$out/share/microhs-hugs/src" + cp -r . "$s" + + makeWrapper ${hugs}/bin/runhugs "$out/bin/mhs" \ + --add-flags "'+P$s/hugs:$s/src:$s/paths:{Hugs}/packages/*:hugs/obj' -98 +o +w -h100m '$s/hugs/Main.hs'" + + runHook postInstall + ''; + + passthru = { + isMhs = true; + usesHugs = true; + }; +} diff --git a/pkgs/development/compilers/microhs/common.nix b/pkgs/development/compilers/microhs/common.nix new file mode 100644 index 000000000000..36d65abb2b69 --- /dev/null +++ b/pkgs/development/compilers/microhs/common.nix @@ -0,0 +1,94 @@ +{ + version, + mcabalVersion ? "0.5.3.0-31f1b5dec81561a1b1d36b8e3065ce091dce2ec6", + rev ? "refs/tags/v${version}", + hash, +}: + +{ + lib, + buildPackages, + pkgsBuildBuild, + callPackage, + fetchFromGitHub, + fetchpatch, + microhs-boot, + stdenv, + versionCheckHook, + writeShellScript, +}: + +let + args = finalAttrs: { + inherit version; + + src = fetchFromGitHub { + owner = "augustss"; + repo = "MicroHs"; + fetchSubmodules = true; + inherit rev hash; + }; + + patches = [ + patches/hugs.patch + patches/hugs-viewpatterns.patch + ] + ++ lib.optional stdenv.hostPlatform.isGnu patches/link-math.patch; + + # The source contains pre-compiled files + # We delete them to be certain we are building from source + postPatch = '' + rm -r generated + ''; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + meta = { + description = "Small compiler for Haskell"; + longDescription = '' + A compiler for an extended subset of Haskell 2010. + The compiler translates to combinators and can compile itself. + ''; + homepage = "https://github.com/augustss/MicroHs"; + license = lib.licensesSpdx."Apache-2.0"; + mainProgram = "mhs"; + maintainers = with lib.maintainers; [ + AlexandreTunstall + steeleduncan + ]; + platforms = lib.platforms.all; + }; + }; + + microhs-stage1-build = pkgsBuildBuild.callPackage ./stage1.nix { + inherit args microhs-boot; + }; + + microhs-stage1 = buildPackages.callPackage ./stage1.nix { + inherit args microhs-boot; + }; + + microhs-stage2 = callPackage ./stage2.nix { + inherit + args + microcabal-stage1 + microhs-stage1 + cpphs + ; + }; + + microcabal-stage1 = buildPackages.callPackage ../../tools/haskell/microcabal/${mcabalVersion}.nix { + microhs = microhs-stage1-build; + }; + + cpphs = buildPackages.callPackage ./cpphs.nix { + inherit args; + microhs = microhs-stage2; + }; + +in +microhs-stage2 diff --git a/pkgs/development/compilers/microhs/cpphs.nix b/pkgs/development/compilers/microhs/cpphs.nix new file mode 100644 index 000000000000..7b288ebe4120 --- /dev/null +++ b/pkgs/development/compilers/microhs/cpphs.nix @@ -0,0 +1,50 @@ +{ + args, + hugs, + microhs, + stdenv, +}: + +stdenv.mkDerivation ( + finalAttrs: + let + args' = args finalAttrs; + in + args' + // { + pname = "microhs-cpphs"; + + nativeBuildInputs = [ hugs ]; + + makeFlags = [ "USECPPHS=$(TMP)/cpphs-boot" ]; + buildFlags = [ + "bootstrapcpphs" + "bin/cpphs" + ]; + + # Generate cpphs-boot and populate paths that the target uses + # We can't use cpphs-hugs directly because it's too primitive + preBuild = '' + mkdir -p $TMP/cpphs-hugs/src + cp -r hugs/* cpphscompat/* cpphssrc/malcolm-wallace-universe/{polyparse-*/src,cpphs-*}/* $TMP/cpphs-hugs/src/ + find $TMP/cpphs-hugs/src -type f -name '*.hs' -exec ${hugs}/bin/cpphs-hugs --noline '{}' '-O{}.tmp' \; + find $TMP/cpphs-hugs/src -type f -name '*.hs' -exec mv '{}.tmp' '{}' \; + sed -i -e '/fail *= *Fail\.fail/d' $TMP/cpphs-hugs/src/Text/ParserCombinators/Poly/Parser.hs + + ${microhs}/bin/mhs -l -i$TMP/cpphs-hugs/src $TMP/cpphs-hugs/src/cpphs.hs -o$TMP/cpphs-boot + + mkdir -p bin generated + touch cpphssrc/malcolm-wallace-universe/.git targets.conf + cp ${microhs}/bin/mhs bin/mhs + ''; + + installPhase = '' + runHook preInstall + install -m755 -d $out/bin + install -m755 bin/cpphs $out/bin/cpphs + runHook postInstall + ''; + + doInstallCheck = false; + } +) diff --git a/pkgs/development/compilers/microhs/patches/hugs-viewpatterns.patch b/pkgs/development/compilers/microhs/patches/hugs-viewpatterns.patch new file mode 100644 index 000000000000..5fc8c08d2b72 --- /dev/null +++ b/pkgs/development/compilers/microhs/patches/hugs-viewpatterns.patch @@ -0,0 +1,406 @@ +If you need to update this patch, apply it to the old version, then use Git to +rebase it onto the new version. + +diff --git a/src/MicroHs/ExpPrint.hs b/src/MicroHs/ExpPrint.hs +index 59afc0d0..bada27d2 100644 +--- a/src/MicroHs/ExpPrint.hs ++++ b/src/MicroHs/ExpPrint.hs +@@ -30,7 +30,7 @@ removeUnused (ds, emain) = dfs roots M.empty + dMap = M.fromList ds + dfs :: [Ident] -> M.Map Exp -> [LDef] + dfs [] done = M.toList done +- dfs (i:is) done | Just _ <- M.lookup i done = dfs is done ++ dfs (i:is) done | isJust (M.lookup i done) = dfs is done + | otherwise = dfs (freeVars e ++ is) (M.insert i e done) + where e = fromMaybe (error $ "removeUnused: undef " ++ show i) $ M.lookup i dMap + +@@ -81,7 +81,7 @@ toStringCMdl :: CMdl -> String + toStringCMdl (ds, emain) = + let + def :: (Ident, Exp) -> (String -> String) -> (String -> String) +- def (i, e) r | Just (e', _) <- getForExp e = def (i, e') r ++ def (i, e) r | isJust (getForExp e) = let Just (e', _) = getForExp e in def (i, e') r + def (i, e) r = + ("A " ++) . toStringP e . ((":" ++ showIdent i ++ " @\n") ++) . r . ("@" ++) + +diff --git a/src/MicroHs/Expr.hs b/src/MicroHs/Expr.hs +index bd05f1bc..14225927 100644 +--- a/src/MicroHs/Expr.hs ++++ b/src/MicroHs/Expr.hs +@@ -514,7 +514,7 @@ getTupleConstr i = + getExprTuple :: EType -> Maybe [EType] + getExprTuple = loop [] + where loop ts (EApp f a) = loop (a:ts) f +- loop ts (EVar i) | Just n <- getTupleConstr i, length ts == n = Just ts ++ loop ts (EVar i) | isJust (getTupleConstr i) && length ts == fromJust (getTupleConstr i) = Just ts + loop _ _ = Nothing + + -- Create a tuple selector, component i (0 based) of n +@@ -1015,13 +1015,13 @@ ppExprR raw = ppE + ppApp :: [Expr] -> Expr -> Doc + ppApp as (EApp f a) = ppApp (a:as) f + ppApp as f | raw = ppApply f as +- ppApp as (EVar i) | isOperChar cop, [a, b] <- as = parens $ ppE a <+> text op <+> ppExpr b +- | isOperChar cop, [a] <- as = parens $ ppE a <+> text op +- | cop == ',' && length op + 1 == length as +- = ppE (ETuple as) +- | op == "[]", length as == 1 = ppE (EListish (LList as)) +- where op = unIdent (unQualIdent i) +- cop = head op ++ ppApp as (EVar i) = case as of ++ [a, b] | isOperChar cop -> parens $ ppE a <+> text op <+> ppExpr b ++ [a] | isOperChar cop -> parens $ ppE a <+> text op ++ _ | cop == ',' && length op + 1 == length as -> ppE (ETuple as) ++ | op == "[]" && length as == 1 -> ppE (EListish (LList as)) ++ where op = unIdent (unQualIdent i) ++ cop = head op + ppApp as f = ppApply f as + ppApply f as = parens $ hsep (map ppE (f:as)) + +@@ -1212,5 +1212,5 @@ getImplies _ = Nothing + + dropForallContext :: EType -> EType + dropForallContext (EForall _ _ t) = dropForallContext t +-dropForallContext t | Just (_, t') <- getImplies t = dropForallContext t' ++dropForallContext t | isJust (getImplies t) = let Just (_, t') = getImplies t in dropForallContext t' + | otherwise = t +diff --git a/src/MicroHs/FFI.hs b/src/MicroHs/FFI.hs +index 4e79ab18..292a28fb 100644 +--- a/src/MicroHs/FFI.hs ++++ b/src/MicroHs/FFI.hs +@@ -1,6 +1,7 @@ + module MicroHs.FFI(makeFFI) where + import qualified Prelude(); import MHSPrelude + import Data.List ++import Data.Maybe(fromJust, isJust) + import MicroHs.Desugar(LDef) + import MicroHs.Exp + import MicroHs.Expr +@@ -175,7 +176,8 @@ arity = length . fst . getArrows + cTypeHsName :: HasCallStack => EType -> String + cTypeHsName (EApp (EVar ptr) _t) | ptr == identPtr = "Ptr" + | ptr == identFunPtr = "FunPtr" +-cTypeHsName (EVar i) | Just c <- lookup (unIdent i) cHsTypes = c ++cTypeHsName (EVar i) | isJust mc = fromJust mc ++ where mc = lookup (unIdent i) cHsTypes + cTypeHsName t = errorMessage (getSLoc t) $ "Not a valid C type: " ++ showEType t + + cHsTypes :: [(String, String)] +@@ -193,7 +195,8 @@ cHsTypes = + -- Use to construct 'foreign export ccall' signature. + cTypeName :: EType -> String + cTypeName (EApp (EVar ptr) _t) | ptr == identPtr = "void*" +-cTypeName (EVar i) | Just c <- lookup (unIdent i) cTypes = c ++cTypeName (EVar i) | isJust mc = fromJust mc ++ where mc = lookup (unIdent i) cTypes + cTypeName t = errorMessage (getSLoc t) $ "Not a valid C type: " ++ showEType t + + cTypes :: [(String, String)] +@@ -211,7 +214,8 @@ cTypes = + -- Use to construct 'foreign import javascript' return value wrapper. + jsTypeNameR :: EType -> String + jsTypeNameR (EApp (EVar ptr) _) | ptr == identPtr = "PTR" +-jsTypeNameR (EVar i) | Just c <- lookup (unIdent i) jsTypesR = c ++jsTypeNameR (EVar i) | isJust mc = fromJust mc ++ where mc = lookup (unIdent i) jsTypesR + jsTypeNameR t = errorMessage (getSLoc t) $ "Not a valid Javascript return type: " ++ showEType t + + jsTypesR :: [(String, String)] +@@ -224,7 +228,8 @@ jsTypesR = + -- Use to construct 'foreign import javascript' argument wrapper. + jsTypeName :: EType -> String + jsTypeName (EApp (EVar ptr) _) | ptr == identPtr = "Ptr" +-jsTypeName (EVar i) | Just c <- lookup (unIdent i) jsTypes = c ++jsTypeName (EVar i) | isJust mc = fromJust mc ++ where mc = lookup (unIdent i) jsTypes + jsTypeName t = errorMessage (getSLoc t) $ "Not a valid Javascript argument type: " ++ showEType t + + jsTypes :: [(String, String)] +diff --git a/src/MicroHs/Lex.hs b/src/MicroHs/Lex.hs +index 12e0213f..ebe591df 100644 +--- a/src/MicroHs/Lex.hs ++++ b/src/MicroHs/Lex.hs +@@ -8,7 +8,7 @@ module MicroHs.Lex( + import qualified Prelude(); import MHSPrelude hiding(lex) + import Data.Char + import Data.List +-import Data.Maybe (fromJust) ++import Data.Maybe (fromJust, isJust) + import MicroHs.Ident + import Text.ParserComb(TokenMachine(..)) + +@@ -101,14 +101,14 @@ lex loc ('(':dcs@(d:cs)) | d == '#' = TSpec loc 'L' : lex (addCol loc 2) cs + | otherwise = TSpec loc '(' : lex (addCol loc 1) dcs + lex loc ('#':')':cs) = TSpec loc 'R' : lex (addCol loc 2) cs + -- Recognize #line 123 "file/name.hs" +-lex loc ('#':xcs) | (SLoc _ _ 1) <- loc, Just cs <- stripPrefix "line " xcs = ++lex (SLoc _ _ 1) ('#':'l':'i':'n':'e':' ':cs) = + case span (/= '\n') cs of + (line, rs) -> -- rs will contain the '\n', so subtract 1 below + let ws = words line + file = tail $ init $ ws!!1 -- strip the initial and final '"' + loc' = SLoc file (readInt (ws!!0) - 1) 1 + in lex loc' rs +- | (SLoc _ 1 1) <- loc, take 1 xcs == "!" = ++lex loc@(SLoc _ 1 1) ('#':xcs@('!':cs)) = + -- It's a shebang (#!), ignore the rest of the line + skipLine loc xcs + lex loc ('!':' ':cs) = -- ! followed by a space is always an operator +@@ -231,7 +231,7 @@ tIndent ts = TIndent (tokensLoc ts) : ts + + lexLitStr :: SLoc -> SLoc -> (String -> Token) -> (String -> Maybe Int) -> (String -> String) -> String -> [Token] + lexLitStr oloc loc mk end post acs = loop loc [] acs +- where loop l rs cs | Just k <- end cs = mk (decodeEscs $ post $ reverse rs) : lex (addCol l k) (drop k cs) ++ where loop l rs cs | isJust (end cs) = let Just k = end cs in mk (decodeEscs $ post $ reverse rs) : lex (addCol l k) (drop k cs) + loop l rs ('\\':c:cs) | isSpace c = remGap l rs cs + loop l rs ('\\':'^':'\\':cs) = loop (addCol l 3) ('\\':'^':'\\':rs) cs -- special hack for unescaped \ + loop l rs ('\\':cs) = loop' (addCol l 1) ('\\':rs) cs +@@ -270,8 +270,10 @@ decodeEsc ('x':cs) = conv 16 0 cs + decodeEsc ('o':cs) = conv 8 0 cs + decodeEsc ('^':c:cs) | '@' <= c && c <= '_' = chr (ord c - ord '@') : decodeEscs cs + decodeEsc cs@(c:_) | isDigit c = conv 10 0 cs +-decodeEsc (c1:c2:c3:cs) | Just c <- lookup [c1,c2,c3] ctlCodes = c : decodeEscs cs +-decodeEsc (c1:c2:cs) | Just c <- lookup [c1,c2] ctlCodes = c : decodeEscs cs ++decodeEsc (c1:c2:c3:cs) | isJust mc = let Just c = mc in c : decodeEscs cs ++ where mc = lookup [c1,c2,c3] ctlCodes ++decodeEsc (c1:c2:cs) | isJust mc = let Just c = mc in c : decodeEscs cs ++ where mc = lookup [c1,c2] ctlCodes + decodeEsc (c :cs) = c : decodeEscs cs + decodeEsc [] = mhsError "Bad \\ escape" + +@@ -417,7 +419,7 @@ pragma loc cs = + in case words cs of + p : _ | map toUpper p == "SOURCE" -> TPragma loc p : skip + -- hsc2hs generates LINE pragmas +- p : ln@(_:_) : fn : _ | map toUpper p == "LINE", all isDigit ln -> ++ p : ln@(_:_) : fn : _ | map toUpper p == "LINE" && all isDigit ln -> + let f = tail (init fn) + l = readInt ln - 1 + in seq l $ skipNest (SLoc f l 1) 1 ('#':cs) +diff --git a/src/MicroHs/Main.hs b/src/MicroHs/Main.hs +index 913c197b..7f17e313 100644 +--- a/src/MicroHs/Main.hs ++++ b/src/MicroHs/Main.hs +@@ -141,16 +141,16 @@ decodeArgs f mdls (arg:args) = + "-z" -> decodeArgs f{compress = True} mdls args + "-b64" -> decodeArgs f{base64 = True} mdls args + "-Q" -> decodeArgs f{installPkg = True} mdls args +- "-o" | s : args' <- args +- -> decodeArgs f{output = s} mdls args' +- "-optc" | s : args' <- args +- -> decodeArgs f{cArgs = cArgs f ++ [s]} mdls args' +- "-optl" | s : args' <- args +- -> decodeArgs f{lArgs = lArgs f ++ [s]} mdls args' +- "-optF" | s : args' <- args +- -> decodeArgs f{fArgs = fArgs f ++ [s]} mdls args' +- "-pgmF" | s : args' <- args +- -> decodeArgs f{fPgm = Just s} mdls args' ++ "-o" | not (null args) ++ -> let s : args' = args in decodeArgs f{output = s} mdls args' ++ "-optc" | not (null args) ++ -> let s : args' = args in decodeArgs f{cArgs = cArgs f ++ [s]} mdls args' ++ "-optl" | not (null args) ++ -> let s : args' = args in decodeArgs f{lArgs = lArgs f ++ [s]} mdls args' ++ "-optF" | not (null args) ++ -> let s : args' = args in decodeArgs f{fArgs = fArgs f ++ [s]} mdls args' ++ "-pgmF" | not (null args) ++ -> let s : args' = args in decodeArgs f{fPgm = Just s} mdls args' + "-F" -> decodeArgs f{doF = True} mdls args + '-':'i':[] -> decodeArgs f{paths = []} mdls args + '-':'i':s -> decodeArgs f{paths = paths f ++ [s]} mdls args +@@ -163,7 +163,7 @@ decodeArgs f mdls (arg:args) = + '-':'a':s -> decodeArgs f{pkgPath = pkgPath f ++ [s]} mdls args + '-':'L':s -> decodeArgs f{listPkg = Just s} mdls args + '-':'p':s -> decodeArgs f{preload = preload f ++ [s]} mdls args +- '-':'d':'d':'u':'m':'p':'-':r | Just d <- lookup r dumpFlagTable -> ++ '-':'d':'d':'u':'m':'p':'-':r | isJust (lookup r dumpFlagTable) -> let Just d = lookup r dumpFlagTable in + decodeArgs f{dumpFlags = d : dumpFlags f} mdls args + "--stdin" -> decodeArgs f{useStdin = True} mdls args + '-':_ -> mhsError $ "Unknown flag: " ++ arg ++ "\n" ++ usage +diff --git a/src/MicroHs/TypeCheck.hs b/src/MicroHs/TypeCheck.hs +index db7f3527..b006e8f9 100644 +--- a/src/MicroHs/TypeCheck.hs ++++ b/src/MicroHs/TypeCheck.hs +@@ -824,7 +824,7 @@ tInst :: HasCallStack => Expr -> EType -> T (Expr, EType) + tInst ae (EForall _ vks t) = do + t' <- tInstForall vks t + tInst ae t' +-tInst ae at | Just (ctx, t) <- getImplies at = do ++tInst ae at | isJust (getImplies at) = let Just (ctx, t) = getImplies at in do + --tcTrace $ "tInst: addConstraint: " ++ show ae ++ ", " ++ show d ++ " :: " ++ show ctx + {- + if eqExpr ae eCannotHappen then +@@ -1326,7 +1326,7 @@ expandClass d = return [d] + -- Ignoring initial quantifiers and context, how many arrows does the type have? + countArrows :: EType -> Int + countArrows (EForall _ _ t) = countArrows t +-countArrows t | Just (_, t') <- getImplies t = countArrows t' ++countArrows t | isJust (getImplies t) = let Just (_, t') = getImplies t in countArrows t' + | otherwise = length . fst . getArrows $ t + + simpleEqn :: Expr -> [Eqn] +@@ -1772,7 +1772,7 @@ tInferExpr = tInfer tcExpr + + tCheckExpr :: HasCallStack => + EType -> Expr -> T Expr +-tCheckExpr t e | Just (ctx, t') <- getImplies t = do ++tCheckExpr t e | isJust (getImplies t) = let Just (ctx, t') = getImplies t in do + -- tcTrace $ "tCheckExpr: " ++ show (e, ctx, t') + xt <- expandSyn t + unless (eqEType t xt) undefined +@@ -2125,7 +2125,7 @@ needDsCase ex lbls ae = + vt <- gets valueTable + case stLookupGlbUnqMany lbl vt of + -- check the return type of an unambiguous label +- Just [Entry _ t] | (t':_, _) <- getArrows (dropForallContext t) -> needT t' ++ Just [Entry _ t] | not $ null $ fst $ getArrows (dropForallContext t) -> needT $ head $ fst $ getArrows $ dropForallContext t + _ -> return Nothing + + -- Do a record update using case. +@@ -2184,8 +2184,8 @@ tcExprAp mt ae args = do + EUVar r -> fmap (fromMaybe t) (getUVar r) + _ -> return t + -- tcTrace $ "exExprAp: EVar " ++ showIdent i ++ " :: " ++ showExpr t ++ " = " ++ showExpr t' ++ " mt=" ++ show mt +- case fn of +- EVar ii | ii == mkIdent "Data.Function.$", f:as <- args -> tcExprAp mt f as ++ case (fn, args) of ++ (EVar ii, f:as) | ii == mkIdent "Data.Function.$" -> tcExprAp mt f as + _ -> tcExprApFn mt fn t' args + EQVar f t -> -- already resolved + tcExprApFn mt f t args +@@ -2216,17 +2216,17 @@ tcExprApFn mt fn atfn aargs = do + let -- loop _ats aas ft | trace ("loop: " ++ show (aas, ft)) False = undefined + loop ats [] ft = final (reverse ats) ft + loop ats aas@(a:as) aft = do +- case nextArg aft of +- AReqd (IdKind i k) ft -> useType i k a ft +- AForall _ (IdKind i k:iks) ft | ETypeArg t <- a -> do ++ case (nextArg aft, a) of ++ (AReqd (IdKind i k) ft, _) -> useType i k a ft ++ (AForall _ (IdKind i k:iks) ft, ETypeArg t) -> do + -- traceM ("AForall " ++ show (i, t)) + useType i k t (EForall QExpl iks ft) +- AForall _ iks ft -> do ++ (AForall _ iks ft, _) -> do + ft' <- tInstForall iks ft + loop ats aas ft' +- AConstaint ctx ft -> ++ (AConstaint ctx ft, _) -> + loop (ArgCtx ctx : ats) aas ft +- ARet aft' -> do ++ (ARet aft', _) -> do + (at, rt) <- unArrow loc aft' + --traceM ("ARet " ++ show (at, rt)) + loop (ArgExpr a at : ats) as rt +@@ -2543,7 +2543,7 @@ nextArg :: EType -> Arg + nextArg (EForall _ [] t) = nextArg t + nextArg (EForall QReqd (ik:iks) t) = AReqd ik (EForall QReqd iks t) + nextArg (EForall q iks t) = AForall q iks t +-nextArg t | Just (ctx, t') <- getImplies t = AConstaint ctx t' ++nextArg t | isJust (getImplies t) = let Just (ctx, t') = getImplies t in AConstaint ctx t' + | otherwise = ARet t + + tcExprLam :: HasCallStack => Expected -> SLoc -> [Eqn] -> T Expr +@@ -2559,7 +2559,7 @@ tcEqns' top at eqns = + case at of + EForall QExpl iks t -> withExtTyps iks $ tcEqns' top t eqns + EForall QImpl _ t -> tcEqns' top t eqns +- _ | Just (ctx, t') <- getImplies at -> do ++ _ | isJust (getImplies at) -> let Just (ctx, t') = getImplies at in do + let loc = getSLoc eqns + d <- newADictIdent loc + f <- newIdent loc "fcnD" +@@ -3109,7 +3109,7 @@ skolemise (EForall _ tvs ty) = do -- Rule PRPOLY + (sks1, ty') <- shallowSkolemise tvs ty + (sks2, ty'') <- skolemise ty' + return (sks1 ++ sks2, ty'') +-skolemise t@(EApp _ _) | Just (arg_ty, res_ty) <- getArrow t = do ++skolemise t@(EApp _ _) | isJust (getArrow t) = let Just (arg_ty, res_ty) = getArrow t in do + (sks, res_ty') <- skolemise res_ty + return (sks, arg_ty `tArrow` res_ty') + skolemise (EApp f a) = do +@@ -3178,13 +3178,13 @@ subsCheckRho loc exp1 (EForall _ vs1 t1) (EForall _ vs2 t2) | length vs1 == leng + subsCheckRho loc exp1 sigma1@EForall{} rho2 = do -- Rule SPEC + (exp1', rho1) <- tInst exp1 sigma1 + subsCheckRho loc exp1' rho1 rho2 +-subsCheckRho loc exp1 arho1 rho2 | Just _ <- getImplies arho1 = do ++subsCheckRho loc exp1 arho1 rho2 | isJust (getImplies arho1) = do + (exp1', rho1) <- tInst exp1 arho1 + subsCheckRho loc exp1' rho1 rho2 +-subsCheckRho loc exp1 rho1 rho2 | Just (a2, r2) <- getArrow rho2 = do -- Rule FUN ++subsCheckRho loc exp1 rho1 rho2 | isJust (getArrow rho2) = let Just (a2, r2) = getArrow rho2 in do -- Rule FUN + (a1, r1) <- unArrow loc rho1 + subsCheckFun loc exp1 a1 r1 a2 r2 +-subsCheckRho loc exp1 rho1 rho2 | Just (a1, r1) <- getArrow rho1 = do -- Rule FUN ++subsCheckRho loc exp1 rho1 rho2 | isJust (getArrow rho1) = let Just (a1, r1) = getArrow rho1 in do -- Rule FUN + (a2,r2) <- unArrow loc rho2 + subsCheckFun loc exp1 a1 r1 a2 r2 + subsCheckRho loc exp1 tau1 tau2 = do -- Rule MONO +@@ -3366,10 +3366,12 @@ canonPatSynType at = do + pure $ mkTyp [] emptyCtx [] emptyCtx ty + + splitPatSynType :: EType -> ([IdKind], EConstraint, [IdKind], EConstraint, EType) +-splitPatSynType (EForall _ vks1 t0) +- | Just (ctx1, EForall _ vks2 t1) <- getImplies t0 +- , Just (ctx2, ty) <- getImplies t1 +- = (vks1, ctx1, vks2, ctx2, ty) ++splitPatSynType (EForall _ vks1 t0) | isJust x = fromJust x ++ where ++ x = do ++ (ctx1, EForall _ vks2 t1) <- getImplies t0 ++ (ctx2, ty) <- getImplies t1 ++ Just (vks1, ctx1, vks2, ctx2, ty) + splitPatSynType t = impossibleShow t + + ----- +@@ -3465,7 +3467,7 @@ defaultOneTyVar tv = do + -- traceM $ "defaultOneTyVar: cvs = " ++ show cvs + dvs <- getSuperClasses cvs -- add superclasses + -- traceM $ "defaultOneTyVar: dvs = " ++ show dvs +- let oneCls c | Just ts <- M.lookup c (defaults old) = ++ let oneCls c | isJust (M.lookup c $ defaults old) = let Just ts = M.lookup c (defaults old) in + take 1 $ filter (\ t -> all (\ cc -> soluble cc t) cvs) ts + | otherwise = [] + soluble c t = fst $ flip tcRun old $ do +@@ -3571,7 +3573,7 @@ solvers = + -- Examine each goal, either solve it (possibly producing new goals) or let it remain unsolved. + solveMany :: [Goal] -> [UGoal] -> [(EType, Soln)] -> [Improve] -> T ([UGoal], [Soln], [Improve]) + solveMany [] uns sol imp = return (uns, map snd sol, imp) +-solveMany ((di, ct) : cnss) uns sol imp | Just (_, (dd, _)) <- find (eqEType ct . fst) sol = ++solveMany ((di, ct) : cnss) uns sol imp | isJust (find (eqEType ct . fst) sol) = let Just (_, (dd, _)) = find (eqEType ct . fst) sol in + solveMany cnss uns ((ct, (di, EVar dd)) : sol) imp + -- Need to handle ct of the form C => T, and forall a . T + solveMany (cns@(di, ct) : cnss) uns sol imp = do +@@ -3889,7 +3891,7 @@ solveEq eqs t1 t2 | normTypeEq eqs t1 `eqEType` normTypeEq eqs t2 = Just [] + -- XXX This guaranteed by how it's called, but I'm not sure it always works properly. + addTypeEq :: EType -> EType -> TypeEqTable -> TypeEqTable + addTypeEq t1 t2 aeqs = +- let deref (EVar i) | Just t <- lookup i aeqs = t ++ let deref (EVar i) | isJust (lookup i aeqs) = fromJust $ lookup i aeqs + deref (ESign t _) = t + deref t = t + t1' = deref t1 +@@ -3990,7 +3992,7 @@ standaloneDeriving str narg act = do + -- traceM ("standaloneDeriving 1 " ++ show (_vks, _ctx, cc)) + (cls, ts, tname) <- + case getAppM cc of +- Just (c, ts@(_:_)) | Just (n, _) <- getAppM (last ts) -> return (c, init ts, n) ++ Just (c, ts@(_:_)) | isJust (getAppM $ last ts) -> let Just (n, _) = getAppM (last ts) in return (c, init ts, n) + _ -> tcError (getSLoc act) "malformed standalone deriving" + -- traceM ("standaloneDeriving 2 " ++ show (act, cls, tname)) + dtable <- gets dataTable +diff --git a/src/Text/ParserComb.hs b/src/Text/ParserComb.hs +index 6efd5a3f..8ab72759 100644 +--- a/src/Text/ParserComb.hs ++++ b/src/Text/ParserComb.hs +@@ -127,7 +127,9 @@ satisfy msg f = P $ \ acs -> + satisfyM :: forall tm t a . TokenMachine tm t => String -> (t -> Maybe a) -> Prsr tm t a + satisfyM msg f = P $ \ acs -> + case tmNextToken acs of +- (c, cs) | Just a <- f c -> Success a cs noFail ++ (c, cs) -> case f c of ++ Just a -> Success a cs noFail ++ _ -> Failure (LastFail (tmLeft acs) (firstToken acs) [msg]) + _ -> Failure (LastFail (tmLeft acs) (firstToken acs) [msg]) + + infixl 9 diff --git a/pkgs/development/compilers/microhs/patches/hugs.patch b/pkgs/development/compilers/microhs/patches/hugs.patch new file mode 100644 index 000000000000..2948380da664 --- /dev/null +++ b/pkgs/development/compilers/microhs/patches/hugs.patch @@ -0,0 +1,365 @@ +This patch is based on https://github.com/augustss/MicroHs/pull/429 +If you need to update it, rebase the above PR onto the new version's tag. + +diff --git a/hugs/Data/Semigroup.hs b/hugs/Data/Semigroup.hs +index b7360013..eab8c48d 100644 +--- a/hugs/Data/Semigroup.hs ++++ b/hugs/Data/Semigroup.hs +@@ -18,11 +18,11 @@ class Semigroup a where + | otherwise = f x0 y0 + where + f x y +- | even y == 0 = f (x <> x) (y `quot` 2) ++ | even y = f (x <> x) (y `quot` 2) + | y == 1 = x + | otherwise = g (x <> x) (y `quot` 2) x + g x y z +- | even y == 0 = g (x <> x) (y `quot` 2) z ++ | even y = g (x <> x) (y `quot` 2) z + | y == 1 = x <> z + | otherwise = g (x <> x) (y `quot` 2) (x <> z) + +diff --git a/hugs/Data/String.hs b/hugs/Data/String.hs +new file mode 100644 +index 00000000..1de782d3 +--- /dev/null ++++ b/hugs/Data/String.hs +@@ -0,0 +1,17 @@ ++module Data.String( ++ IsString(..), ++ String, ++ lines, unlines, ++ words, unwords, ++ ) where ++ ++import qualified Data.ByteString.Char8 as BS8 ++ ++class IsString a where ++ fromString :: String -> a ++ ++instance IsString [Char] where ++ fromString s = s ++ ++instance IsString BS8.ByteString where ++ fromString = BS8.pack +diff --git a/hugs/Data/Text.hs b/hugs/Data/Text.hs +index fbd1c731..75f8e829 100644 +--- a/hugs/Data/Text.hs ++++ b/hugs/Data/Text.hs +@@ -8,6 +8,7 @@ module Data.Text( + null, + head, + tail, ++ cons, + uncons, + ) where + import Prelude hiding(head, tail, null) +@@ -64,6 +65,9 @@ head (T t) = Prelude.head t + tail :: Text -> Text + tail (T t) = T (Prelude.tail t) + ++cons :: Char -> Text -> Text ++cons c (T t) = T (c : t) ++ + uncons :: Text -> Maybe (Char, Text) + uncons t | null t = Nothing + | otherwise = Just (head t, tail t) +diff --git a/hugs/MHSPrelude.hs b/hugs/MHSPrelude.hs +index cb6b36f6..cb47e041 100644 +--- a/hugs/MHSPrelude.hs ++++ b/hugs/MHSPrelude.hs +@@ -4,10 +4,11 @@ module MHSPrelude( + module Prelude, + module MHSPrelude, + -- module Control.Monad.Fail, +- module Control.Arrow, ++ -- Exporting these with 'module Control.Arrow' does not work ++ first, second, + module Data.Monoid, + module Data.Semigroup, +- (<$>), Applicative(..), (*>), ++ (<$>), Applicative(..), (*>), (<*), (>=>), (<=<) + ) where + import Hugs.Prelude() + import Prelude hiding(fail) +@@ -16,6 +17,7 @@ import Control.Arrow(first, second) + import Control.Applicative + import Control.Exception(Exception, try) + --import Control.Monad.Fail ++import Data.Int + import Data.List + import Data.Maybe + import Data.Monoid +@@ -55,6 +57,12 @@ spanEnd p xs = (dropWhileEnd p xs, takeWhileEnd p xs) + breakEnd :: (a -> Bool) -> [a] -> ([a], [a]) + breakEnd p = spanEnd (not . p) + ++subsequences :: [a] -> [[a]] ++subsequences xs = [] : sub xs ++ where sub [] = [] ++ sub (x:xs) = [x] : foldr f [] (sub xs) ++ where f ys r = ys : (x : ys) : r ++ + ------- Version -------- + + makeVersion :: [Int] -> Version +@@ -193,6 +201,7 @@ force :: (NFData a) => a -> a + force x = x `deepseq` x + + instance NFData Int ++instance NFData Int64 + instance NFData Word + instance NFData Float + instance NFData Double +@@ -229,3 +238,11 @@ instance NFData MD5CheckSum + + class HasCallStack + instance HasCallStack ++ ++(<=<) :: forall m a b c . Monad m => (b -> m c) -> (a -> m b) -> (a -> m c) ++f <=< g = \ a -> do ++ b <- g a ++ f b ++ ++(>=>) :: forall m a b c . Monad m => (a -> m b) -> (b -> m c) -> (a -> m c) ++(>=>) = flip (<=<) +diff --git a/src/MicroHs/Compile.hs b/src/MicroHs/Compile.hs +index ddec7993..643319aa 100644 +--- a/src/MicroHs/Compile.hs ++++ b/src/MicroHs/Compile.hs +@@ -123,12 +123,17 @@ compile flags nm ach = do + return ((tModuleName cm, concatMap tBindingsOf $ cachedModules ch), syms, ch) + + -- Compile a module for the interactive system +-compileInteractive :: Flags -> EModule -> CM (TModule [LDef], Symbols, TCState) +-compileInteractive flags mdl = do +- ((dmdl, syms, _, _, _), tcstate) <- compileModuleP flags ImpNormal mdl ++compileInteractive :: Flags -> EModule -> Maybe TCState -> CM (TModule [LDef], Symbols, TCState) ++compileInteractive flags mdl mtcstate = do ++ ((dmdl, syms, _, _, _), tcstate') <- compile ++ flags ImpNormal mdl + loadBoots flags + loadDependencies flags +- return (dmdl, syms, tcstate) ++ return (dmdl, syms, tcstate') ++ where ++ compile = case mtcstate of ++ Nothing -> compileModuleP ++ Just tcstate -> compileModuleP' (\flags _ impt aimps mdl -> typeCheck' flags impt (map filterImports aimps) mdl tcstate) + + -- Compile a module with the given name. + -- If the module has already been compiled, return the cached result. +@@ -233,7 +238,12 @@ compileModule flags impt mn pathfn file = do + return (cmdl, syms, tThis + tImp) + + compileModuleP :: Flags -> ImpType -> EModule -> CM ((TModule [LDef], Symbols, [(ImpType, IdentModule)], Time, Time), TCState) +-compileModuleP flags impt mdl@(EModule _ _ defs) = do ++compileModuleP = compileModuleP' typeCheck ++ ++compileModuleP' ++ :: (Flags -> GlobTables -> ImpType -> [(ImportSpec, TModule [LDef])] -> EModule -> (TModule [EDef], GlobTables, Symbols, TCState)) ++ -> Flags -> ImpType -> EModule -> CM ((TModule [LDef], Symbols, [(ImpType, IdentModule)], Time, Time), TCState) ++compileModuleP' tc flags impt mdl@(EModule _ _ defs) = do + -- liftIO $ putStrLn $ showEModule mdl + -- liftIO $ putStrLn $ showEDefs defs + let +@@ -244,7 +254,7 @@ compileModuleP flags impt mdl@(EModule _ _ defs) = do + t3 <- liftIO getTimeMilli + glob <- gets getCacheTables + let +- (tmdl, glob', syms, tcstate) = typeCheck flags glob impt (zip specs impMdls) mdl ++ (tmdl, glob', syms, tcstate) = tc flags glob impt (zip specs impMdls) mdl + modify $ setCacheTables glob' + dumpIf flags Dtypecheck $ + liftIO $ putStrLn $ "type checked:\n" ++ showTModule showEDefs tmdl ++ "-----\n" +@@ -258,9 +268,9 @@ compileModuleP flags impt mdl@(EModule _ _ defs) = do + return ((dmdl, syms, imported, tThis, tImp), tcstate) + + compileToCombinators :: TModule [LDef] -> TModule [LDef] +-compileToCombinators dmdl = do ++compileToCombinators dmdl = + let cmdl = setBindings dmdl [ (i, compileOpt e) | (i, e) <- tBindingsOf dmdl ] +- seq (rnf cmdl) cmdl -- This makes execution slower, but speeds up GC ++ in seq (rnf cmdl) cmdl -- This makes execution slower, but speeds up GC + + -- Add implicit imports: + -- import Prelude +diff --git a/src/MicroHs/Expr.hs b/src/MicroHs/Expr.hs +index 84578594..bd05f1bc 100644 +--- a/src/MicroHs/Expr.hs ++++ b/src/MicroHs/Expr.hs +@@ -57,11 +57,11 @@ module MicroHs.Expr( + dropForallContext, + ) where + import qualified Prelude(); import MHSPrelude hiding ((<>)) ++import Data.Int + import Data.List + import Data.Maybe + import MicroHs.Builtin + import MicroHs.Ident +-import {-# SOURCE #-} MicroHs.TCMonad(TCState) + import Text.PrettyPrint.HughesPJLite + + type IdentModule = Ident +@@ -96,8 +96,6 @@ data EDef + | Pattern LHS EPat (Maybe [Eqn]) + | StandDeriving DerStrategy Int EConstraint + | DfltSign Ident EType -- only in class declarations +- -- Only used by interactive system to load a cached TCState to avoid import processing +- | SetTCState TCState + --DEBUG deriving (Show) + + instance NFData EDef where +@@ -118,7 +116,6 @@ instance NFData EDef where + rnf (Pattern a b c) = rnf a `seq` rnf b `seq` rnf c + rnf (StandDeriving a b c) = rnf a `seq` rnf b `seq` rnf c + rnf (DfltSign a b) = rnf a `seq` rnf b +- rnf (SetTCState a) = seq a () + + data ImpType = ImpNormal | ImpBoot + deriving (Eq) +@@ -900,7 +897,6 @@ ppEDef def = + Pattern lhs@(i,_) p meqns -> text "pattern" <+> ppLHS lhs <+> text "=" <+> ppExpr p <+> maybe empty (ppWhere (text ";") . (:[]) . Fcn i) meqns + StandDeriving _s _narg ct -> text "deriving instance" <+> ppEType ct + DfltSign i t -> text "default" <+> ppIdent i <+> text "::" <+> ppEType t +- SetTCState _ -> text "SetTCState ..." + + ppDerivings :: [Deriving] -> Doc + ppDerivings = sep . map ppDeriving +diff --git a/src/MicroHs/Interactive.hs b/src/MicroHs/Interactive.hs +index ebb33b43..7b70064a 100644 +--- a/src/MicroHs/Interactive.hs ++++ b/src/MicroHs/Interactive.hs +@@ -295,11 +295,11 @@ compile file = do + let mdl@(EModule mn es _) = parseDie pTopModule "" file + defs <- updateTCStateCache mdl + (_, tcstate, _) <- gets isCComp +- let mdl' = EModule mn es (SetTCState tcstate : defs) ++ let mdl' = EModule mn es defs + flgs <- gets isFlags + cash <- gets isCache + -- putStrLnI $ " tryCompile compile " ++ show mdl' +- ((dmdl, _, tcstate'), _) <- liftIO $ runStateIO (compileInteractive flgs mdl') cash ++ ((dmdl, _, tcstate'), _) <- liftIO $ runStateIO (compileInteractive flgs mdl' $ Just tcstate) cash + cmdl <- liftIO $ evaluate $ compileToCombinators dmdl + -- putStrLnI $ " tryCompile dmdl = " ++ (show $ tBindingsOf dmdl) + return (tBindingsOf cmdl, tcstate') +@@ -398,7 +398,7 @@ updateTCStateCache (EModule mn es ds) = do + cash <- gets isCache + -- putStrLnI "*** update tcstate" + let mdl' = addPreludeImport mdl +- ((_, syms, tcstate), ch) <- liftIO $ runStateIO (compileInteractive flgs mdl') cash ++ ((_, syms, tcstate), ch) <- liftIO $ runStateIO (compileInteractive flgs mdl' Nothing) cash + let idmap = translateMap $ concatMap tBindingsOf $ cachedModules ch + -- putStrLnI $ "*** update isFast " ++ show nImps + modify $ \ is -> is{ isCComp = (nImps, tcstate, idmap), isCache = ch, isSymbols = syms } +diff --git a/src/MicroHs/Parse.hs b/src/MicroHs/Parse.hs +index 821718a7..6a68a01a 100644 +--- a/src/MicroHs/Parse.hs ++++ b/src/MicroHs/Parse.hs +@@ -791,7 +791,7 @@ pDo = do + case last ss of + SThen e -> + pure $ EDo q [SRec (init ss), SThen e] +- _ -> fail "mdo" ++ _ -> Control.Monad.Fail.fail "mdo" + else + pure (EDo q ss) + +diff --git a/src/MicroHs/TCMonad.hs-boot b/src/MicroHs/TCMonad.hs-boot +deleted file mode 100644 +index f88ad533..00000000 +--- a/src/MicroHs/TCMonad.hs-boot ++++ /dev/null +@@ -1,2 +0,0 @@ +-module MicroHs.TCMonad where +-data TCState +diff --git a/src/MicroHs/TypeCheck.hs b/src/MicroHs/TypeCheck.hs +index 47f2b461..db7f3527 100644 +--- a/src/MicroHs/TypeCheck.hs ++++ b/src/MicroHs/TypeCheck.hs +@@ -2,7 +2,7 @@ + -- See LICENSE file for full license. + {-# OPTIONS_GHC -Wno-incomplete-uni-patterns -Wno-unused-imports -Wno-unused-do-bind #-} + module MicroHs.TypeCheck( +- typeCheck, ++ typeCheck, typeCheck', filterImports, + TModule(..), showTModule, + GlobTables, emptyGlobTables, mergeGlobTables, + impossible, impossibleShow, +@@ -102,35 +102,34 @@ type Sigma = EType + type Rho = EType + + typeCheck :: Flags -> GlobTables -> ImpType -> [(ImportSpec, TModule a)] -> EModule -> (TModule [EDef], GlobTables, Symbols, TCState) +-typeCheck flags globs impt aimps (EModule mn exps defs) = ++typeCheck flags globs impt aimps mdl@(EModule mn exps defs) = + -- trace (unlines $ map (showTModuleExps . snd) aimps) $ +- let +- imps = map filterImports aimps +- tc = +- case defs of +- SetTCState tcs : _ -> tcs -- hack to set the saved TCState +- _ -> mkTCState mn globs imps +- in case tcRun (tcDefs flags impt defs) tc of +- (tds, tcs) -> +- let +- thisMdl = (mn, mkTModule tds tcs) +- impMdls = [(fromMaybe m mm, tm) | (ImportSpec _ _ m mm _, tm) <- imps] +- allMdls = thisMdl : impMdls +- (texps, vexps) = +- unzip $ map (getTVExps impMap (typeTable tcs) (valueTable tcs) (assocTable tcs)) exps +- where impMap = M.fromListWith (++) [(i, [m]) | (i, m) <- allMdls] +- fexps = map (tFixDefs . snd) allMdls +- sexps = synTable tcs +- dexps = dataTable tcs +- iexps = instTable tcs +- ctbl = classTable tcs +- dflts = M.fromList $ filter ((`elem` ds) . fst) $ M.toList $ defaults tcs +- where ds = [ tyQIdent $ expLookup ti (typeTable tcs) | ExpDefault ti <- exps ] +- in ( tModule mn (nubBy ((==) `on` fst) (concat fexps)) (concat texps) (concat vexps) dflts tds +- , GlobTables { gSynTable = sexps, gDataTable = dexps, gClassTable = ctbl, gInstInfo = iexps } +- , (typeTable tcs, valueTable tcs) +- , tcs +- ) ++ let imps = map filterImports aimps ++ in typeCheck' flags impt imps mdl $ mkTCState mn globs imps ++ ++typeCheck' :: Flags -> ImpType -> [(ImportSpec, TModule a)] -> EModule -> TCState -> (TModule [EDef], GlobTables, Symbols, TCState) ++typeCheck' flags impt imps (EModule mn exps defs) tc = ++ case tcRun (tcDefs flags impt defs) tc of ++ (tds, tcs) -> ++ let ++ thisMdl = (mn, mkTModule tds tcs) ++ impMdls = [(fromMaybe m mm, tm) | (ImportSpec _ _ m mm _, tm) <- imps] ++ allMdls = thisMdl : impMdls ++ (texps, vexps) = ++ unzip $ map (getTVExps impMap (typeTable tcs) (valueTable tcs) (assocTable tcs)) exps ++ where impMap = M.fromListWith (++) [(i, [m]) | (i, m) <- allMdls] ++ fexps = map (tFixDefs . snd) allMdls ++ sexps = synTable tcs ++ dexps = dataTable tcs ++ iexps = instTable tcs ++ ctbl = classTable tcs ++ dflts = M.fromList $ filter ((`elem` ds) . fst) $ M.toList $ defaults tcs ++ where ds = [ tyQIdent $ expLookup ti (typeTable tcs) | ExpDefault ti <- exps ] ++ in ( tModule mn (nubBy ((==) `on` fst) (concat fexps)) (concat texps) (concat vexps) dflts tds ++ , GlobTables { gSynTable = sexps, gDataTable = dexps, gClassTable = ctbl, gInstInfo = iexps } ++ , (typeTable tcs, valueTable tcs) ++ , tcs ++ ) + + -- A hack to force evaluation of errors. + -- This should be redone to all happen in the T monad. +diff --git a/src/Text/ParserComb.hs b/src/Text/ParserComb.hs +index 5b0e8753..6efd5a3f 100644 +--- a/src/Text/ParserComb.hs ++++ b/src/Text/ParserComb.hs +@@ -115,7 +115,7 @@ instance TokenMachine tm t => Alternative (Prsr tm t) where + r -> r + + instance TokenMachine tm t => MonadPlus (Prsr tm t) where +- mzero = fail "mzero" ++ mzero = F.fail "mzero" + mplus = (<|>) + + satisfy :: forall tm t . TokenMachine tm t => String -> (t -> Bool) -> Prsr tm t t diff --git a/pkgs/development/compilers/microhs/patches/link-math.patch b/pkgs/development/compilers/microhs/patches/link-math.patch new file mode 100644 index 000000000000..a9df7bf53cbe --- /dev/null +++ b/pkgs/development/compilers/microhs/patches/link-math.patch @@ -0,0 +1,21 @@ +commit beaea6f66e4f53d617418a4c155b9a14e2c9327e +Author: Alex Tunstall +Date: Fri Mar 20 06:52:08 2026 +0000 + + Add -lm to default link flags + + MicroHs should always link with -lm because its RTS requires it. + +diff --git a/src/MicroHs/Flags.hs b/src/MicroHs/Flags.hs +index e20797c6..df89730e 100644 +--- a/src/MicroHs/Flags.hs ++++ b/src/MicroHs/Flags.hs +@@ -54,7 +54,7 @@ defaultFlags dir = Flags { + doCPP = False, + cppArgs = [], + cArgs = [], +- lArgs = [], ++ lArgs = ["-lm"], + compress = False, + base64 = False, + buildPkg = Nothing, diff --git a/pkgs/development/compilers/microhs/patches/simple-unicode.patch b/pkgs/development/compilers/microhs/patches/simple-unicode.patch new file mode 100644 index 000000000000..ac32c35d9952 --- /dev/null +++ b/pkgs/development/compilers/microhs/patches/simple-unicode.patch @@ -0,0 +1,35 @@ +commit bf89dce66a0833c1ace0a253ef597531435a6798 +Author: Alex Tunstall +Date: Tue Sep 23 04:48:17 2025 +0100 + + Disable Unicode support for Hugs bootstrap + +diff --git a/lib/Data/Char/Unicode.hs b/lib/Data/Char/Unicode.hs +index 4bb46cc2..7180e2d7 100644 +--- a/lib/Data/Char/Unicode.hs ++++ b/lib/Data/Char/Unicode.hs +@@ -207,23 +207,12 @@ decompressRLE = BS.pack . de 0 . BS.unpack + -- XXX Instead of having a totally decompressed (large!) bytestring, + -- we could build a search tree from the RLE encoding. + generalCategory :: Char -> GeneralCategory +-generalCategory c = +- let i = primOrd c +- in if i < 0 || i >= BS.length bytestringGCTable then +- NotAssigned +- else +- toEnum (fromEnum (BS.primBSindex bytestringGCTable i)) +- +-bytestringGCTable :: BS.ByteString +-bytestringGCTable = decompressRLE compressedGCTable ++generalCategory c = error "generalCategory: unsupported" + + -- These tables are generated by unicode/UniParse.hs + -- This is for Unicode 17.0.0 + unicodeVersion :: Version + unicodeVersion = makeVersion [17,0,0] +-compressedGCTable :: ByteString +-compressedGCTable = +- "\159\25\22\130\17\19\130\17\13\14\17\18\17\12\17\17\137\8\17\17\130\18\17\17\153\0\13\17\14\20\11\20\153\1\13\18\14\18\160\25\22\17\131\19\21\17\20\21\4\15\18\26\21\20\21\18\10\10\20\1\17\17\20\10\4\16\130\10\17\150\0\18\134\0\151\1\18\135\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\0\1\0\1\0\130\1\0\0\1\0\1\0\0\1\130\0\1\1\131\0\1\0\0\1\130\0\130\1\0\0\1\0\0\1\0\1\0\1\0\0\1\0\1\1\0\1\0\0\1\130\0\1\0\1\0\0\1\1\4\0\130\1\131\4\0\2\1\0\2\1\0\2\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\1\0\2\1\0\1\130\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\134\1\0\0\1\0\0\1\1\0\1\131\0\1\0\1\0\1\0\1\0\196\1\4\4\153\1\145\3\131\20\139\3\141\20\132\3\134\20\3\20\3\144\20\239\5\0\1\0\1\3\20\0\1\29\29\3\130\1\17\0\131\29\20\20\0\17\130\0\29\0\29\0\0\1\144\0\29\136\0\162\1\0\1\1\130\0\130\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\132\1\0\1\18\0\1\0\0\1\1\178\0\175\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\21\132\5\7\7\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\0\1\0\1\0\1\0\1\0\1\0\1\0\1\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\29\165\0\29\29\3\133\17\168\1\17\12\29\29\21\21\19\29\172\5\12\5\17\5\5\17\5\5\17\5\135\29\154\4\131\29\131\4\17\17\138\29\133\26\130\18\17\17\19\17\17\21\21\138\5\17\26\130\17\159\4\3\137\4\148\5\137\8\131\17\4\4\5\226\4\17\4\134\5\26\21\133\5\3\3\5\5\21\131\5\4\4\137\8\130\4\21\21\4\141\17\29\26\4\5\157\4\154\5\29\29\216\4\138\5\4\141\29\137\8\160\4\136\5\3\3\21\130\17\3\29\29\5\19\19\149\4\131\5\3\136\5\3\130\5\3\132\5\29\29\142\17\29\152\4\130\5\29\29\17\29\138\4\132\29\151\4\20\134\4\26\26\132\29\136\5\168\4\3\151\5\26\159\5\6\181\4\5\6\5\4\130\6\135\5\131\6\5\6\6\4\134\5\137\4\5\5\17\17\137\8\17\3\142\4\5\6\6\29\135\4\29\29\4\4\29\29\149\4\29\134\4\29\4\130\29\131\4\29\29\5\4\130\6\131\5\29\29\6\6\29\29\6\6\5\4\135\29\6\131\29\4\4\29\130\4\5\5\29\29\137\8\4\4\19\19\133\10\21\19\4\17\5\29\29\5\5\6\29\133\4\131\29\4\4\29\29\149\4\29\134\4\29\4\4\29\4\4\29\4\4\29\29\5\29\130\6\5\5\131\29\5\5\29\29\130\5\130\29\5\134\29\131\4\29\4\134\29\137\8\5\5\130\4\5\17\137\29\5\5\6\29\136\4\29\130\4\29\149\4\29\134\4\29\4\4\29\132\4\29\29\5\4\130\6\132\5\29\5\5\6\29\6\6\5\29\29\4\142\29\4\4\5\5\29\29\137\8\17\19\134\29\4\133\5\29\5\6\6\29\135\4\29\29\4\4\29\29\149\4\29\134\4\29\4\4\29\132\4\29\29\5\4\6\5\6\131\5\29\29\6\6\29\29\6\6\5\134\29\5\5\6\131\29\4\4\29\130\4\5\5\29\29\137\8\21\4\133\10\137\29\5\4\29\133\4\130\29\130\4\29\131\4\130\29\4\4\29\4\29\4\4\130\29\4\4\130\29\130\4\130\29\139\4\131\29\6\6\5\6\6\130\29\130\6\29\130\6\5\29\29\4\133\29\6\141\29\137\8\130\10\133\21\19\21\132\29\5\130\6\5\135\4\29\130\4\29\150\4\29\143\4\29\29\5\4\130\5\131\6\29\130\5\29\131\5\134\29\5\5\29\130\4\29\4\4\29\29\4\4\5\5\29\29\137\8\134\29\17\134\10\21\4\5\6\6\17\135\4\29\130\4\29\150\4\29\137\4\29\132\4\29\29\5\4\6\5\132\6\29\5\6\6\29\6\6\5\5\134\29\6\6\132\29\130\4\29\4\4\5\5\29\29\137\8\29\4\4\6\139\29\5\5\6\6\136\4\29\130\4\29\168\4\5\5\4\130\6\131\5\29\130\6\29\130\6\5\4\21\131\29\130\4\6\134\10\130\4\5\5\29\29\137\8\136\10\21\133\4\29\5\6\6\29\145\4\130\29\151\4\29\136\4\29\4\29\29\134\4\130\29\5\131\29\130\6\130\5\29\5\29\135\6\133\29\137\8\29\29\6\6\17\139\29\175\4\5\4\4\134\5\131\29\19\133\4\3\135\5\17\137\8\17\17\164\29\4\4\29\4\29\132\4\29\151\4\29\4\29\137\4\5\4\4\136\5\4\29\29\132\4\29\3\29\134\5\29\137\8\29\29\131\4\159\29\4\130\21\142\17\21\17\130\21\5\5\133\21\137\8\137\10\21\5\21\5\21\5\13\14\13\14\6\6\135\4\29\163\4\131\29\141\5\6\132\5\17\5\5\132\4\138\5\29\163\5\29\135\21\5\133\21\29\21\21\132\17\131\21\17\17\164\29\170\4\6\6\131\5\6\133\5\6\5\5\6\6\5\5\4\137\8\133\17\133\4\6\6\5\5\131\4\130\5\4\130\6\4\4\134\6\130\4\131\5\140\4\5\6\6\5\5\133\6\5\4\6\137\8\130\6\5\21\21\165\0\29\0\132\29\0\29\29\170\1\17\3\130\1\130\200\4\29\131\4\29\29\134\4\29\4\29\131\4\29\29\168\4\29\131\4\29\29\160\4\29\131\4\29\29\134\4\29\4\29\131\4\29\29\142\4\29\184\4\29\131\4\29\29\194\4\29\29\130\5\136\17\147\10\130\29\143\4\137\21\133\29\213\0\29\29\133\1\29\29\12\132\235\4\21\17\144\4\22\153\4\13\14\130\29\202\4\130\17\130\9\135\4\134\29\145\4\130\5\6\136\29\146\4\5\5\6\17\17\136\29\145\4\5\5\139\29\140\4\29\130\4\29\5\5\139\29\179\4\5\5\6\134\5\135\6\5\6\6\138\5\130\17\3\130\17\19\4\5\29\29\137\8\133\29\137\10\133\29\133\17\12\131\17\130\5\26\5\137\8\133\29\162\4\3\180\4\134\29\132\4\5\5\161\4\5\4\132\29\197\4\137\29\158\4\29\130\5\131\6\5\5\130\6\131\29\6\6\5\133\6\130\5\131\29\21\130\29\17\17\137\8\157\4\29\29\132\4\138\29\171\4\131\29\153\4\133\29\137\8\10\130\29\161\21\150\4\5\5\6\6\5\29\29\17\17\180\4\6\5\6\134\5\29\5\6\5\6\6\135\5\133\6\137\5\29\29\5\137\8\133\29\137\8\133\29\134\17\3\133\17\29\29\141\5\7\158\5\29\29\139\5\147\29\131\5\6\174\4\5\6\132\5\6\5\132\6\5\6\6\135\4\29\17\17\137\8\134\17\137\21\136\5\136\21\130\17\5\5\6\157\4\6\131\5\6\6\5\5\6\130\5\4\4\137\8\171\4\5\6\5\5\130\6\5\6\130\5\6\6\135\29\131\17\163\4\135\6\135\5\6\6\5\5\130\29\132\17\137\8\130\29\130\4\137\8\157\4\133\3\17\17\136\1\0\1\132\29\170\0\29\29\130\0\135\17\135\29\130\5\17\140\5\6\134\5\131\4\5\133\4\5\4\4\6\5\5\4\132\29\171\1\190\3\140\1\3\161\1\164\3\191\5\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\136\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\136\1\135\0\133\1\29\29\133\0\29\29\135\1\135\0\135\1\135\0\133\1\29\29\133\0\29\29\135\1\29\0\29\0\29\0\29\0\135\1\135\0\141\1\29\29\135\1\135\2\135\1\135\2\135\1\135\2\132\1\29\1\1\131\0\2\20\1\130\20\130\1\29\1\1\131\0\2\130\20\131\1\29\29\1\1\131\0\29\130\20\135\1\132\0\130\20\29\29\130\1\29\1\1\131\0\2\20\20\29\138\22\132\26\133\12\17\17\15\16\13\15\15\16\13\15\135\17\23\24\132\26\22\136\17\15\16\131\17\11\11\130\17\18\13\14\138\17\18\17\11\137\17\22\132\26\29\137\26\10\3\29\29\133\10\130\18\13\14\3\137\10\130\18\13\14\29\140\3\130\29\161\19\141\29\140\5\131\7\5\130\7\139\5\142\29\21\21\0\131\21\0\21\21\1\130\0\1\1\130\0\1\21\0\21\21\18\132\0\133\21\0\21\0\21\0\21\131\0\21\1\131\0\1\131\4\1\21\21\1\1\0\0\132\18\0\131\1\21\18\21\21\1\21\143\10\162\9\0\1\131\9\10\21\21\131\29\132\18\132\21\18\18\131\21\18\21\21\18\21\21\18\134\21\18\158\21\18\18\21\21\18\21\18\158\21\130\139\18\135\21\13\14\13\14\147\21\18\18\134\21\13\14\208\21\18\157\21\152\18\167\21\133\18\199\21\149\29\138\21\148\29\187\10\205\21\149\10\129\182\21\18\136\21\18\181\21\135\18\238\21\18\129\247\21\13\14\13\14\13\14\13\14\13\14\13\14\13\14\157\10\171\21\132\18\13\14\158\18\13\14\13\14\13\14\13\14\13\14\143\18\129\255\21\129\130\18\13\14\13\14\13\14\13\14\13\14\13\14\13\14\13\14\13\14\13\14\13\14\190\18\13\14\13\14\159\18\13\14\130\129\18\175\21\148\18\21\21\133\18\166\21\29\29\129\137\21\175\0\175\1\0\1\130\0\1\1\0\1\0\1\0\1\131\0\1\0\1\1\0\133\1\3\3\130\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\1\133\21\0\1\0\1\130\5\0\1\132\29\131\17\10\17\17\165\1\29\1\132\29\1\29\29\183\4\134\29\3\17\141\29\5\150\4\136\29\134\4\29\134\4\29\134\4\29\134\4\29\134\4\29\134\4\29\134\4\29\134\4\29\159\5\17\17\15\16\15\16\130\17\15\16\17\15\16\136\17\12\17\17\12\17\15\16\17\17\15\16\13\14\13\14\13\14\13\14\132\17\3\137\17\12\12\131\17\12\17\13\140\17\21\21\130\17\13\14\13\14\13\14\13\14\12\161\29\153\21\29\216\21\139\29\129\213\21\153\29\143\21\22\130\17\21\3\4\9\13\14\13\14\13\14\13\14\13\14\21\21\13\14\13\14\13\14\13\14\12\13\14\14\21\136\9\131\5\6\6\12\132\3\21\21\130\9\3\4\17\21\21\29\213\4\29\29\5\5\20\20\3\3\4\12\217\4\17\130\3\4\132\29\170\4\29\221\4\29\21\21\131\10\137\21\159\4\165\21\136\29\21\143\4\158\21\29\137\10\157\21\135\10\21\142\10\159\21\137\10\166\21\142\10\130\191\21\4\179\189\29\4\191\21\4\129\163\253\29\149\4\3\136\246\4\130\29\182\21\136\29\167\4\133\3\17\17\130\139\4\3\130\17\143\4\137\8\4\4\147\29\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\4\5\130\7\17\137\5\17\3\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\3\3\5\5\197\4\137\9\5\5\133\17\135\29\150\20\136\3\20\20\0\1\0\1\0\1\0\1\0\1\0\1\0\130\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\3\135\1\0\1\0\1\0\0\1\0\1\0\1\0\1\0\1\3\20\20\0\1\0\1\4\0\1\0\130\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\132\0\1\132\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\131\0\1\0\1\0\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\1\0\147\29\131\3\0\1\4\3\3\1\134\4\5\130\4\5\131\4\5\150\4\6\6\5\5\6\131\21\5\130\29\133\10\21\21\19\21\133\29\179\4\131\17\135\29\6\6\177\4\143\6\5\5\135\29\17\17\137\8\133\29\145\5\133\4\130\17\4\17\4\4\5\137\8\155\4\135\5\17\17\150\4\138\5\6\6\138\29\17\156\4\130\29\130\5\6\174\4\5\6\6\131\5\6\6\5\5\130\6\140\17\29\3\137\8\131\29\17\17\132\4\5\3\136\4\137\8\132\4\29\168\4\133\5\6\6\5\5\6\6\5\5\136\29\130\4\5\135\4\5\6\29\29\137\8\29\29\131\17\143\4\3\133\4\130\21\4\6\5\6\177\4\5\4\130\5\4\4\5\5\132\4\5\5\4\5\4\151\29\4\4\3\17\17\138\4\6\5\5\6\6\17\17\4\3\3\6\5\137\29\133\4\29\29\133\4\29\29\133\4\136\29\134\4\29\134\4\29\170\1\20\131\3\136\1\3\20\20\131\29\207\1\162\4\6\6\5\6\6\5\6\6\17\6\5\29\29\137\8\133\29\4\215\161\29\4\139\29\150\4\131\29\176\4\131\29\27\134\253\29\27\27\253\29\27\27\135\253\29\27\28\177\253\29\28\130\237\4\29\29\233\4\165\29\134\1\139\29\132\1\132\29\4\5\137\4\18\140\4\29\132\4\29\4\29\4\4\29\4\4\29\235\4\144\20\143\21\130\234\4\14\13\143\21\191\4\21\21\181\4\135\21\159\29\139\4\19\130\21\143\5\134\17\13\14\17\133\29\143\5\17\12\12\11\11\13\14\13\14\13\14\13\14\13\14\13\14\13\14\13\14\17\17\13\14\131\17\130\11\130\17\29\131\17\12\13\14\13\14\13\14\130\17\18\12\130\18\29\17\19\17\17\131\29\132\4\29\129\134\4\29\29\26\29\130\17\19\130\17\13\14\17\18\17\12\17\17\137\8\17\17\130\18\17\17\153\0\13\17\14\20\11\20\153\1\13\18\14\18\13\14\17\13\14\17\17\137\4\3\172\4\3\3\158\4\130\29\133\4\29\29\133\4\29\29\133\4\29\29\130\4\130\29\19\19\18\20\21\19\19\29\21\131\18\21\21\137\29\130\26\21\21\29\29\139\4\29\153\4\29\146\4\29\4\4\29\142\4\29\29\141\4\161\29\250\4\132\29\130\17\131\29\172\10\130\29\136\21\180\9\131\10\144\21\10\10\130\21\29\140\21\130\29\21\174\29\172\21\5\129\129\29\156\4\130\29\176\4\142\29\5\154\10\131\29\159\4\131\10\136\29\147\4\9\135\4\9\132\29\165\4\132\5\132\29\157\4\29\17\163\4\131\29\135\4\17\132\9\169\29\167\0\167\1\205\4\29\29\137\8\133\29\163\0\131\29\163\1\131\29\167\4\135\29\179\4\138\29\17\138\0\29\142\0\29\134\0\29\0\0\29\138\1\29\142\1\29\134\1\29\1\1\130\29\179\4\139\29\130\182\4\136\29\149\4\137\29\135\4\151\29\133\3\29\169\3\29\136\3\196\29\133\4\29\29\4\29\171\4\29\4\4\130\29\4\29\29\150\4\29\17\135\10\150\4\21\21\134\10\158\4\135\29\136\10\175\29\146\4\29\4\4\132\29\132\10\149\4\133\10\130\29\17\153\4\132\29\17\153\4\165\29\183\4\131\29\10\10\4\4\143\10\29\29\173\10\4\130\5\29\5\5\132\29\131\5\131\4\29\130\4\29\156\4\29\29\130\5\131\29\5\136\10\134\29\136\17\134\29\156\4\10\10\17\156\4\130\10\159\29\135\4\21\155\4\5\5\131\29\132\10\134\17\136\29\181\4\130\29\134\17\149\4\29\29\135\10\146\4\132\29\135\10\145\4\134\29\131\17\139\29\134\10\207\29\200\4\182\29\178\0\140\29\178\1\134\29\133\10\163\4\131\5\135\29\137\8\133\29\137\8\131\4\3\4\149\0\130\29\132\5\12\3\149\1\135\29\18\18\129\207\29\158\10\29\169\4\29\5\5\12\29\29\4\4\143\29\130\4\3\4\4\135\29\17\135\21\160\29\133\5\156\4\137\10\4\135\29\149\4\138\5\131\10\132\17\149\29\145\4\131\5\131\17\165\29\148\4\134\10\147\29\150\4\136\29\6\5\6\180\4\142\5\134\17\131\29\147\10\137\8\5\4\4\5\5\4\136\29\130\5\6\172\4\130\6\131\5\6\6\5\5\17\17\26\131\17\5\137\29\26\29\29\152\4\134\29\137\8\133\29\130\5\163\4\132\5\6\135\5\29\137\8\131\17\4\6\6\4\135\29\162\4\5\17\17\4\136\29\5\5\6\175\4\130\6\136\5\6\6\131\4\131\17\131\5\17\6\5\137\8\4\17\4\130\17\29\147\10\138\29\145\4\29\152\4\130\6\130\5\6\6\5\6\5\5\133\17\5\4\4\5\189\29\134\4\29\4\29\131\4\29\142\4\29\137\4\17\133\29\174\4\5\130\6\135\5\132\29\137\8\133\29\5\5\6\6\29\135\4\29\29\4\4\29\29\149\4\29\134\4\29\4\4\29\132\4\29\5\5\4\6\6\5\131\6\29\29\6\6\29\29\130\6\29\29\4\133\29\6\132\29\132\4\6\6\29\29\134\5\130\29\132\5\138\29\137\4\29\4\29\29\4\29\165\4\29\4\130\6\133\5\29\6\29\29\6\29\131\6\29\6\6\5\6\5\4\5\4\17\17\29\17\17\135\29\5\5\156\29\180\4\130\6\135\5\6\6\130\5\6\5\131\4\132\17\137\8\17\17\29\17\5\130\4\157\29\175\4\130\6\133\5\6\5\131\6\5\5\6\5\5\4\4\17\4\135\29\137\8\129\165\29\174\4\130\6\131\5\29\29\131\6\5\5\6\5\5\150\17\131\4\5\5\161\29\175\4\130\6\135\5\6\6\5\6\5\5\130\17\4\138\29\137\8\133\29\140\17\146\29\170\4\5\6\5\6\6\133\5\6\5\4\17\133\29\137\8\133\29\147\8\155\29\154\4\29\29\5\6\5\6\6\131\5\6\132\5\131\29\137\8\10\10\130\17\21\134\4\129\184\29\171\4\130\6\136\5\6\5\5\17\227\29\159\0\159\1\137\8\136\10\139\29\135\4\29\29\4\29\29\135\4\29\4\4\29\151\4\133\6\29\6\6\29\29\5\5\6\5\4\6\4\6\5\130\17\136\29\137\8\197\29\135\4\29\29\166\4\130\6\131\5\29\29\5\5\131\6\5\4\17\4\6\154\29\4\137\5\167\4\133\5\6\4\131\5\135\17\5\135\29\4\133\5\6\6\130\5\173\4\140\5\6\5\5\130\17\4\132\17\140\29\200\4\134\29\137\17\213\29\5\6\130\5\6\5\6\215\29\160\4\17\141\29\137\8\133\29\136\4\29\164\4\6\134\5\29\133\5\6\5\4\132\17\137\29\137\8\146\10\130\29\17\17\157\4\29\29\149\5\29\6\134\5\6\5\5\6\5\5\200\29\134\4\29\4\4\29\165\4\133\5\130\29\5\29\5\5\29\134\5\4\5\135\29\137\8\133\29\133\4\29\4\4\29\159\4\132\6\29\5\5\29\6\6\5\6\5\4\134\29\137\8\133\29\168\4\3\4\4\131\29\137\8\129\245\29\146\4\5\5\6\6\17\17\134\29\5\5\4\6\140\4\29\161\4\6\6\132\5\130\29\6\6\5\6\5\140\17\137\8\5\212\29\4\142\29\148\10\135\21\131\19\144\21\140\29\17\135\153\4\229\29\238\9\29\132\17\138\29\129\195\4\148\203\29\224\4\17\17\140\29\136\175\4\143\26\5\133\4\142\5\137\29\159\154\4\132\29\132\198\4\181\184\29\157\4\139\5\130\6\130\5\137\8\141\197\29\132\184\4\134\29\158\4\29\137\8\131\29\17\17\206\4\29\137\8\133\29\157\4\29\29\132\5\17\137\29\175\4\134\5\132\17\131\21\131\3\17\21\137\29\137\8\29\134\10\29\148\4\132\29\146\4\131\175\29\130\3\167\4\3\3\130\17\137\8\129\197\29\159\0\159\1\150\10\131\17\132\29\152\0\29\29\152\1\171\29\202\4\131\29\5\4\182\6\134\29\131\5\140\3\191\29\3\3\17\3\5\138\29\6\6\3\3\130\9\136\29\4\175\253\29\137\214\4\168\29\4\4\156\29\4\224\29\242\4\195\252\29\131\3\29\134\3\29\3\3\29\130\162\4\142\29\4\156\29\130\4\29\29\4\141\29\131\4\135\29\131\139\4\146\131\29\234\4\132\29\140\4\130\29\136\4\134\29\137\4\29\29\21\5\5\17\131\26\158\219\29\129\239\21\137\8\130\21\130\29\131\179\21\133\29\150\21\142\29\143\21\18\142\29\173\5\29\29\150\5\136\29\243\21\187\29\129\245\21\137\29\166\21\29\29\187\21\6\6\130\5\130\21\133\6\135\26\135\5\21\21\134\5\157\21\131\5\188\21\148\29\193\21\130\5\21\249\29\147\10\139\29\147\10\139\29\214\21\136\29\152\10\129\134\29\153\0\153\1\153\0\134\1\29\145\1\153\0\153\1\0\29\0\0\29\29\0\29\29\0\0\29\29\131\0\29\135\0\131\1\29\1\29\134\1\29\138\1\153\0\153\1\0\0\29\131\0\29\29\135\0\29\134\0\29\153\1\0\0\29\131\0\29\132\0\29\0\130\29\134\0\29\153\1\153\0\153\1\153\0\153\1\153\0\153\1\153\0\153\1\153\0\153\1\153\0\155\1\29\29\152\0\18\152\1\18\133\1\152\0\18\152\1\18\133\1\152\0\18\152\1\18\133\1\152\0\18\152\1\18\133\1\152\0\18\152\1\18\133\1\0\1\29\29\177\8\131\255\21\182\5\131\21\177\5\135\21\5\141\21\5\21\21\132\17\142\29\132\5\29\142\5\136\207\29\137\1\4\147\1\133\29\133\1\129\212\29\134\5\29\144\5\29\29\134\5\29\5\5\29\132\5\132\29\189\3\160\29\5\239\29\172\4\130\29\134\5\134\3\29\29\137\8\131\29\4\21\130\191\29\157\4\5\144\29\171\4\131\5\137\8\132\29\19\131\207\29\154\4\3\131\5\137\8\129\213\29\157\4\5\5\4\137\8\131\29\17\129\191\29\158\4\29\130\4\5\4\4\5\134\4\5\5\132\4\5\135\29\4\3\129\223\29\134\4\29\131\4\29\4\4\29\142\4\29\129\196\4\29\29\136\10\134\5\168\29\161\0\161\1\134\5\3\131\29\137\8\131\29\17\17\134\144\29\186\10\21\130\10\19\131\10\203\29\172\10\21\142\10\129\193\29\131\4\29\154\4\29\4\4\29\4\29\29\4\29\137\4\29\131\4\29\4\29\4\133\29\4\131\29\4\29\4\29\4\29\130\4\29\4\4\29\4\29\29\4\29\4\29\4\29\4\29\4\29\4\4\29\4\29\29\131\4\29\134\4\29\131\4\29\131\4\29\4\29\137\4\29\144\4\132\29\130\4\29\132\4\29\144\4\179\29\18\18\130\141\29\171\21\131\29\227\21\139\29\142\21\29\29\142\21\29\142\21\29\164\21\137\29\140\10\129\160\21\183\29\156\21\140\29\171\21\131\29\136\21\134\29\21\21\141\29\133\21\129\153\29\129\250\21\132\20\133\216\21\130\29\144\21\130\29\140\21\130\29\129\217\21\133\29\139\21\131\29\21\142\29\139\21\131\29\183\21\135\29\137\21\133\29\167\21\135\29\157\21\29\29\139\21\131\29\21\21\141\29\136\18\166\29\130\215\21\135\29\141\21\29\29\140\21\130\29\138\21\130\29\184\21\29\21\131\29\143\21\29\29\139\21\131\29\137\21\134\29\129\146\21\29\219\21\137\8\21\136\132\29\4\130\205\221\29\4\159\29\4\160\189\29\4\4\129\219\29\4\29\29\4\173\139\29\4\29\29\4\186\174\29\4\142\29\4\132\235\29\4\147\161\29\132\157\4\139\225\29\4\166\200\29\4\132\29\4\160\221\29\4\4\161\199\29\4\171\151\134\29\26\157\29\223\26\255\29\129\239\5\131\252\143\29\28\131\255\251\29\28\29\29\28\131\255\251\29\28" + + tcTable :: [(Int, Int, Int)] + tcTable = diff --git a/pkgs/development/compilers/microhs/stage1.nix b/pkgs/development/compilers/microhs/stage1.nix new file mode 100644 index 000000000000..625f1e05ac44 --- /dev/null +++ b/pkgs/development/compilers/microhs/stage1.nix @@ -0,0 +1,36 @@ +{ + lib, + args, + microhs-boot, + stdenv, +}: + +stdenv.mkDerivation ( + finalAttrs: + let + args' = args finalAttrs; + in + args' + // { + pname = "microhs-stage1"; + patches = + (args'.patches or [ ]) + ++ lib.optionals microhs-boot.usesHugs [ + patches/simple-unicode.patch + ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + installTargets = [ + "targets.conf" + "oldinstall" + ]; + + buildPhase = '' + runHook preBuild + mkdir -p bin + printf 'Building bin/mhs using ${microhs-boot}/bin/mhs\n' + ${microhs-boot}/bin/mhs -l -imhs -isrc -ipaths MicroHs.Main -o bin/mhs + runHook postBuild + ''; + } +) diff --git a/pkgs/development/compilers/microhs/stage2.nix b/pkgs/development/compilers/microhs/stage2.nix new file mode 100644 index 000000000000..fa8b9d3640f3 --- /dev/null +++ b/pkgs/development/compilers/microhs/stage2.nix @@ -0,0 +1,61 @@ +{ + args, + cpphs, + microcabal-stage1, + microhs-stage1, + stdenv, + callPackage, +}: + +stdenv.mkDerivation ( + finalAttrs: + let + args' = args finalAttrs; + haskellCompilerName = "mhs-${args'.version}"; + in + args' + // { + pname = "microhs"; + + nativeBuildInputs = [ + microcabal-stage1 + microhs-stage1 + ]; + + env = { + CABALDIR = "${placeholder "out"}/lib/mcabal"; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + pushd lib + mcabal -v install + popd + mcabal -v install + + mkdir -p $out/bin + ln -s ../lib/mcabal/bin/mhs $out/bin/mhs + + runHook postInstall + ''; + + passthru = { + inherit + haskellCompilerName + cpphs + microcabal-stage1 + microhs-stage1 + ; + targetPrefix = ""; + isMhs = true; + usesHugs = false; + + tests = { + hello-world = callPackage ./test-hello-world.nix { microhs = finalAttrs.finalPackage; }; + }; + }; + } +) diff --git a/pkgs/by-name/mi/microhs/test-hello-world.nix b/pkgs/development/compilers/microhs/test-hello-world.nix similarity index 100% rename from pkgs/by-name/mi/microhs/test-hello-world.nix rename to pkgs/development/compilers/microhs/test-hello-world.nix diff --git a/pkgs/development/compilers/microhs/wrapper.nix b/pkgs/development/compilers/microhs/wrapper.nix new file mode 100644 index 000000000000..50b496bb7b41 --- /dev/null +++ b/pkgs/development/compilers/microhs/wrapper.nix @@ -0,0 +1,52 @@ +{ + lib, + runCommand, + runtimeShell, + writeShellScript, +}: + +{ + microhs, + packages, +}: + +let + packages' = [ microhs ] ++ lib.filter (p: p != null) packages; + extraFlags = lib.concatMapStringsSep " " ( + p: "-a${p}/lib/mcabal/${microhs.haskellCompilerName}" + ) packages'; + + wrapper = writeShellScript "mhs-wrapper" '' + args=("$@") + noExtra=0 + for ((i=0; i<"''${#args[@]}"; ++i)); do + case "''${args[i]}" in + --version | --numeric-version) + noExtra=1 + ;; + *) + ;; + esac + done + if test "$noExtra" -eq 0; then + for arg in ${extraFlags}; do + args[i++]="$arg" + done + fi + if (( "''${NIX_DEBUG:-0}" >= 1 )); then + printf 'mhs-wrapper: mhs %s\n' "''${args[*]}" >&2 + fi + exec ${microhs}/bin/mhs "''${args[@]}" + ''; + +in +runCommand "${microhs.name}-wrapped" + { + inherit (microhs) passthru; + } + '' + mkdir -p $out/bin + cp -rs ${microhs}/bin/* $out/bin/ + rm $out/bin/mhs 2>/dev/null || true + cp ${wrapper} $out/bin/mhs + '' diff --git a/pkgs/development/haskell-modules/configuration-microhs.nix b/pkgs/development/haskell-modules/configuration-microhs.nix new file mode 100644 index 000000000000..bdf91c6423ed --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-microhs.nix @@ -0,0 +1,78 @@ +{ pkgs, haskellLib }: + +with haskellLib; + +self: super: { + # Disable MicroHs core libraries + base = null; + bytestring = null; + deepseq = null; + directory = null; + process = null; + text = null; + MicroHs = null; + + # External MicroHs core libraries + ghc-compat = markUnbroken super.ghc-compat; + + # Bootstrap MicroCabal + MicroCabal = self.mkDerivation { + pname = "MicroCabal"; + version = self.ghc.microcabal-stage1.version; + src = self.ghc.microcabal-stage1.src; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = with self; [ base ]; + inherit (self.ghc.microcabal-stage1.meta) + description + homepage + license + mainProgram + maintainers + ; + }; + + # hackage-packages does not include GHC core libraries + binary = self.binary_0_8_9_3; + Cabal = self.Cabal_3_16_1_0; + Cabal-syntax = self.Cabal-syntax_3_16_1_0; + containers = self.containers_0_8; + exceptions = self.exceptions_0_10_12; + filepath = self.filepath_1_5_5_0; + ghc-bignum = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-heap = null; + ghc-internal = null; + ghc-platform = null; + ghc-prim = null; + ghci = null; + haskeline = self.haskeline_0_8_4_1; + hpc = self.hpc_0_7_0_2; + integer-gmp = self.integer-gmp_1_1; + libiserv = null; + mtl = self.mtl_2_3_2; + os-string = self.os-string_2_0_10; + parsec = self.parsec_3_1_18_0; + pretty = self.pretty_1_1_3_6; + rts = null; + semaphore-compat = null; + stm = null; + system-cxx-std-lib = null; + template-haskell = null; + terminfo = self.terminfo_0_4_1_7; + time = self.time_1_15; + transformers = self.transformers_0_6_3_0; + unix = self.unix_2_8_8_0; + xhtml = self.xhtml_3000_4_0_0; + + # MicroHs replacements for widely used libraries + array = self.array-mhs; + array-mhs = markUnbroken super.array-mhs; + random = self.random-mhs; + random-mhs = markUnbroken super.random-mhs; + + # Depends on time when not using GHC + splitmix = addBuildDepends [ self.time ] super.splitmix; +} diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 70998a96e822..f413d9b198a3 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -48,50 +48,64 @@ let inherit (lib) fix' extends makeOverridable; inherit (haskellLib) overrideCabal; - mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { - inherit stdenv haskellLib; - nodejs = buildPackages.nodejs-slim; - inherit (self) - buildHaskellPackages - ghc - ghcWithHoogle - ghcWithPackages - ; - iserv-proxy = { - build = buildHaskellPackages.iserv-proxy; - host = self.iserv-proxy; - }; - inherit (self.buildHaskellPackages) jailbreak-cabal; - hscolour = overrideCabal (drv: { - isLibrary = false; - doHaddock = false; - hyperlinkSource = false; # Avoid depending on hscolour for this build. - postFixup = "rm -rf $out/lib $out/share $out/nix-support"; - }) self.buildHaskellPackages.hscolour; - cpphs = - overrideCabal - (drv: { - isLibrary = false; - postFixup = "rm -rf $out/lib $out/share $out/nix-support"; - }) - ( - self.cpphs.overrideScope ( - self: super: { - mkDerivation = - drv: - super.mkDerivation ( - drv - // { - enableSharedExecutables = false; - enableSharedLibraries = false; - doHaddock = false; - useCpphs = false; - } - ); - } - ) - ); - }; + builder = if !(ghc.isMhs or false) then ./generic-builder.nix else ./microhs-builder.nix; + + mkDerivationImpl = pkgs.callPackage builder ( + { + inherit stdenv; + inherit (self) + buildHaskellPackages + ghc + ; + inherit (self.buildHaskellPackages) jailbreak-cabal; + } + // lib.optionalAttrs (!(ghc.isMhs or false)) { + inherit haskellLib; + inherit (self) + ghcWithHoogle + ghcWithPackages + ; + nodejs = buildPackages.nodejs-slim; + iserv-proxy = { + build = buildHaskellPackages.iserv-proxy; + host = self.iserv-proxy; + }; + hscolour = overrideCabal (drv: { + isLibrary = false; + doHaddock = false; + hyperlinkSource = false; # Avoid depending on hscolour for this build. + postFixup = "rm -rf $out/lib $out/share $out/nix-support"; + }) self.buildHaskellPackages.hscolour; + cpphs = + overrideCabal + (drv: { + isLibrary = false; + postFixup = "rm -rf $out/lib $out/share $out/nix-support"; + }) + ( + self.cpphs.overrideScope ( + self: super: { + mkDerivation = + drv: + super.mkDerivation ( + drv + // { + enableSharedExecutables = false; + enableSharedLibraries = false; + doHaddock = false; + useCpphs = false; + } + ); + } + ) + ); + } + // lib.optionalAttrs (ghc.isMhs or false) { + inherit (self) wrapMhs ghc-compat; + MicroCabal = self.ghc.microcabal-stage1; + cpphs = self.ghc.cpphs; + } + ); mkDerivation = makeOverridable mkDerivationImpl; @@ -663,6 +677,8 @@ package-set { inherit pkgs lib callPackage; } self withHoogle = self.ghcWithHoogle; }; + wrapMhs = pkgs.callPackage ../compilers/microhs/wrapper.nix { }; + /* Run `cabal sdist` on a source. diff --git a/pkgs/development/haskell-modules/microhs-builder.nix b/pkgs/development/haskell-modules/microhs-builder.nix new file mode 100644 index 000000000000..1a4363d8a372 --- /dev/null +++ b/pkgs/development/haskell-modules/microhs-builder.nix @@ -0,0 +1,420 @@ +{ + buildHaskellPackages, + buildPackages, + fetchurl, + ghc, + jailbreak-cabal, + lib, + MicroCabal, + cpphs, + ghc-compat, + pkg-config, + runCommandCC, + stdenv, + wrapMhs, +}: + +let + # make-package-set always names the compiler ghc + compiler = ghc; + + isCross = stdenv.buildPlatform != stdenv.hostPlatform; + +in +{ + pname, + version, + revision ? null, + sha256 ? null, + src ? fetchurl { + url = "mirror://hackage/${pname}-${version}.tar.gz"; + inherit sha256; + }, + # Extra environment variables to set during the build. + # See: `../../../doc/languages-frameworks/haskell.section.md` + env ? { }, + buildDepends ? [ ], + setupHaskellDepends ? [ ], + libraryHaskellDepends ? [ ], + executableHaskellDepends ? [ ], + buildTools ? [ ], + libraryToolDepends ? [ ], + executableToolDepends ? [ ], + testToolDepends ? [ ], + benchmarkToolDepends ? [ ], + configureFlags ? [ ], + description ? null, + doCheck ? !isCross, + doBenchmark ? false, + editedCabalFile ? null, + extraLibraries ? [ ], + librarySystemDepends ? [ ], + executableSystemDepends ? [ ], + # On macOS, statically linking against system frameworks is not supported; + # see https://developer.apple.com/library/content/qa/qa1118/_index.html + # They must be propagated to the environment of any executable linking with the library + libraryFrameworkDepends ? [ ], + executableFrameworkDepends ? [ ], + homepage ? "https://hackage.haskell.org/package/${pname}", + platforms ? with lib.platforms; all, # GHC can cross-compile + badPlatforms ? lib.platforms.none, + hydraPlatforms ? null, + isExecutable ? false, + isLibrary ? !isExecutable, + jailbreak ? false, + license, + maintainers ? null, + teams ? null, + changelog ? null, + mainProgram ? null, + passthru ? { }, + pkg-configDepends ? [ ], + libraryPkgconfigDepends ? [ ], + executablePkgconfigDepends ? [ ], + testPkgconfigDepends ? [ ], + benchmarkPkgconfigDepends ? [ ], + testDepends ? [ ], + testHaskellDepends ? [ ], + testSystemDepends ? [ ], + testFrameworkDepends ? [ ], + benchmarkDepends ? [ ], + benchmarkHaskellDepends ? [ ], + benchmarkSystemDepends ? [ ], + benchmarkFrameworkDepends ? [ ], + broken ? false, + preCompileBuildDriver ? null, + postCompileBuildDriver ? null, + preUnpack ? null, + postUnpack ? null, + patches ? null, + patchPhase ? null, + prePatch ? "", + postPatch ? "", + preConfigure ? null, + postConfigure ? null, + preBuild ? null, + postBuild ? null, + preHaddock ? null, + postHaddock ? null, + installPhase ? null, + preInstall ? null, + postInstall ? null, + checkPhase ? null, + preCheck ? null, + postCheck ? null, + preFixup ? null, + postFixup ? null, + shellHook ? "", + ... +}@args: + +assert editedCabalFile != null -> revision != null; + +let + allPkgconfigDepends = + pkg-configDepends + ++ libraryPkgconfigDepends + ++ executablePkgconfigDepends + ++ lib.optionals doCheck testPkgconfigDepends + ++ lib.optionals doBenchmark benchmarkPkgconfigDepends; + + # MicroCabal adds a dependency on ghc-compat unless the package name is one of the following + isCorePkg = pname == "base" || pname == "ghc-compat" || pname == "MicroHs" || pname == "MicroCabal"; + buildDepends' = buildDepends ++ lib.optional (!isCorePkg) ghc-compat; + + depsBuildBuild = lib.optionals (!stdenv.hasCC) [ buildPackages.stdenv.cc ]; + collectedToolDepends = + buildTools + ++ libraryToolDepends + ++ executableToolDepends + ++ lib.optionals doCheck testToolDepends + ++ lib.optionals doBenchmark benchmarkToolDepends; + nativeBuildInputs = [ + MicroCabal + cpphs + compilerWithPkgs + buildPackages.removeReferencesTo + ]; + propagatedBuildInputs = + buildDepends' ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; + otherBuildInputsHaskell = + lib.optionals doCheck (testDepends ++ testHaskellDepends) + ++ lib.optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends); + otherBuildInputsSystem = + extraLibraries + ++ librarySystemDepends + ++ executableSystemDepends + ++ executableFrameworkDepends + ++ allPkgconfigDepends + ++ lib.optionals doCheck (testSystemDepends ++ testFrameworkDepends) + ++ lib.optionals doBenchmark (benchmarkSystemDepends ++ benchmarkFrameworkDepends); + otherBuildInputs = otherBuildInputsHaskell ++ otherBuildInputsSystem; + + newCabalFileUrl = "mirror://hackage/${pname}-${version}/revision/${revision}.cabal"; + newCabalFile = fetchurl { + url = newCabalFileUrl; + sha256 = editedCabalFile; + name = "${pname}-${version}-r${revision}.cabal"; + }; + + hsLibBuildInputs = lib.filter (p: p ? isHaskellLibrary && p.isHaskellLibrary) propagatedBuildInputs; + compilerWithPkgs = wrapMhs { + microhs = compiler; + packages = hsLibBuildInputs; + }; + + compilerCommand' = "mhs"; + compilerCommand = "${compiler.targetPrefix}${compilerCommand'}"; + + compilerLibdir = "lib/mcabal/${compiler.haskellCompilerName}"; + + env' = { + CABALDIR = "${placeholder "out"}/lib/mcabal"; + } + // env; + +in +stdenv.mkDerivation { + inherit pname version; + + pos = builtins.unsafeGetAttrPos "pname" args; + + prePhases = [ "setupCompilerEnvironmentPhase" ]; + preConfigurePhases = [ "compileBuildDriverPhase" ]; + preInstallPhases = [ "haddockPhase" ]; + + inherit src patches; + + inherit depsBuildBuild nativeBuildInputs; + buildInputs = lib.optionals (!isLibrary) propagatedBuildInputs; + propagatedBuildInputs = lib.optionals isLibrary propagatedBuildInputs; + + env = env'; + + prePatch = + lib.optionalString (editedCabalFile != null) '' + echo "Replace Cabal file with edited version from ${newCabalFileUrl}." + cp ${newCabalFile} ${pname}.cabal + '' + + prePatch; + + postPatch = + lib.optionalString jailbreak '' + echo "Run jailbreak-cabal to lift version restrictions on build inputs." + ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal + '' + + postPatch; + + setupCompilerEnvironmentPhase = '' + runHook preSetupCompilerEnvironment + + echo "Building with ${compilerWithPkgs}" + mkdir -p "$CABALDIR/${compiler.haskellCompilerName}/packages" + ${lib.concatMapStrings (p: '' + ln -s ${p}/${compilerLibdir}/packages/${p.name}.pkg $CABALDIR/${compiler.haskellCompilerName}/packages/${p.name}.pkg + '') (lib.closePropagation hsLibBuildInputs)} + + runHook postSetupCompilerEnvironment + ''; + + compileBuildDriverPhase = '' + runHook preCompileBuildDriver + + runHook postCompileBuildDriver + ''; + + buildPhase = '' + runHook preBuild + + echo "Skipping buildPhase because MicroCabal always builds on install" + + runHook postBuild + ''; + + inherit doCheck; + + checkPhase = '' + runHook preCheck + + echo "Skipping checkPhase because MicroCabal doesn't support test suites" + + runHook postCheck + ''; + + haddockPhase = '' + runHook preHaddock + + echo "Skipping haddockPhase because MicroCabal doesn't support Haddock" + + runHook postHaddock + ''; + + installPhase = '' + runHook preInstall + + mcabal -v ${lib.concatStringsSep " " configureFlags} install + mkdir -p $out/bin + find "$CABALDIR/bin" -type f -exec ln -s '{}' "$out/bin/" \; || true + find "$CABALDIR/${compiler.haskellCompilerName}/packages" -type l -delete + + runHook postInstall + ''; + + inherit + preCompileBuildDriver + postCompileBuildDriver + preUnpack + postUnpack + preConfigure + postConfigure + preBuild + postBuild + preHaddock + postHaddock + preInstall + postInstall + preCheck + postCheck + preFixup + postFixup + ; + + passthru = passthru // rec { + inherit pname version; + + compiler = ghc; + + # All this information is intended just for `shellFor`. It should be + # considered unstable and indeed we knew how to keep it private we would. + getCabalDeps = { + inherit + buildDepends' + buildTools + executableFrameworkDepends + executableHaskellDepends + executablePkgconfigDepends + executableSystemDepends + executableToolDepends + extraLibraries + libraryFrameworkDepends + libraryHaskellDepends + libraryPkgconfigDepends + librarySystemDepends + libraryToolDepends + pkg-configDepends + setupHaskellDepends + ; + } + // lib.optionalAttrs doCheck { + inherit + testDepends + testFrameworkDepends + testHaskellDepends + testPkgconfigDepends + testSystemDepends + testToolDepends + ; + } + // lib.optionalAttrs doBenchmark { + inherit + benchmarkDepends + benchmarkFrameworkDepends + benchmarkHaskellDepends + benchmarkPkgconfigDepends + benchmarkSystemDepends + benchmarkToolDepends + ; + }; + + # Attributes for the old definition of `shellFor`. Should be removed but + # this predates the warning at the top of `getCabalDeps`. + getBuildInputs = rec { + inherit propagatedBuildInputs otherBuildInputs allPkgconfigDepends; + haskellBuildInputs = isHaskellPartition.right; + systemBuildInputs = isHaskellPartition.wrong; + isHaskellPartition = lib.partition (x: x ? isHaskellLibrary) ( + propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild ++ nativeBuildInputs + ); + }; + + isHaskellLibrary = isLibrary; + + haddockDir = null; + + # Creates a derivation containing all of the necessary dependencies for building the + # parent derivation. The attribute set that it takes as input can be viewed as: + # + # { withHoogle } + # + # The derivation that it builds contains no outpaths because it is meant for use + # as an environment + # + # # Example use + # # Creates a shell with all of the dependencies required to build the "hello" package, + # # and with python: + # + # > nix-shell -E 'with (import {}); \ + # > haskellPackages.hello.envFunc { buildInputs = [ python ]; }' + envFunc = + { + # Unsupported + withHoogle ? false, + }: + let + name = "microhs-shell-for-${pname}"; + + compilerCommandCaps = lib.toUpper compilerCommand'; + in + runCommandCC name { + inherit shellHook; + + nativeBuildInputs = [ + compilerWithPkgs + ] + ++ lib.optional (allPkgconfigDepends != [ ]) pkg-config + ++ collectedToolDepends; + buildInputs = otherBuildInputsSystem; + + env = { + "NIX_${compilerCommandCaps}" = "${compiler}/bin/${compilerCommand}"; + # TODO: is this still valid? + "NIX_${compilerCommandCaps}_LIBDIR" = "${compiler}/${compilerLibdir}"; + } + // lib.optionalAttrs (stdenv.buildPlatform.libc == "glibc") { + # TODO: Why is this written in terms of `buildPackages`, unlike + # the outer `env`? + # + # According to @sternenseemann [1]: + # + # > The condition is based on `buildPlatform`, so it needs to + # > match. `LOCALE_ARCHIVE` is set to accompany `LANG` which + # > concerns things we execute on the build platform like + # > `haddock`. + # > + # > Arguably the outer non `buildPackages` one is incorrect and + # > probably works by accident in most cases since the locale + # > archive is not platform specific (the trouble is that it + # > may sometimes be impossible to cross-compile). At least + # > that would be my assumption. + # + # [1]: https://github.com/NixOS/nixpkgs/pull/424368#discussion_r2202683378 + LOCALE_ARCHIVE = "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + } + // env'; + } "echo $nativeBuildInputs $buildInputs > $out"; + + env = envFunc { }; + }; + + meta = { + inherit homepage license platforms; + } + // lib.optionalAttrs (args ? broken) { inherit broken; } + // lib.optionalAttrs (args ? description) { inherit description; } + // lib.optionalAttrs (args ? maintainers) { inherit maintainers; } + // lib.optionalAttrs (args ? teams) { inherit teams; } + // lib.optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } + // lib.optionalAttrs (args ? badPlatforms) { inherit badPlatforms; } + // lib.optionalAttrs (args ? changelog) { inherit changelog; } + // lib.optionalAttrs (args ? mainProgram) { inherit mainProgram; }; +} diff --git a/pkgs/development/tools/haskell/microcabal/0.5.3.0-31f1b5dec81561a1b1d36b8e3065ce091dce2ec6.nix b/pkgs/development/tools/haskell/microcabal/0.5.3.0-31f1b5dec81561a1b1d36b8e3065ce091dce2ec6.nix new file mode 100644 index 000000000000..9917f7b4cd29 --- /dev/null +++ b/pkgs/development/tools/haskell/microcabal/0.5.3.0-31f1b5dec81561a1b1d36b8e3065ce091dce2ec6.nix @@ -0,0 +1,7 @@ +import ./common.nix rec { + # MicroCabal has important changes to mirror some changes in MicroHs but its + # version releases are not frequent enough, so we need to use newer commits + version = "0.5.3.0-${rev}"; + rev = "31f1b5dec81561a1b1d36b8e3065ce091dce2ec6"; + hash = "sha256-/oTcWGA43KQwniQKyZEPOlpmoRusDjb+k29GWc8wZzw="; +} diff --git a/pkgs/development/tools/haskell/microcabal/common.nix b/pkgs/development/tools/haskell/microcabal/common.nix new file mode 100644 index 000000000000..bbe7773fbfa7 --- /dev/null +++ b/pkgs/development/tools/haskell/microcabal/common.nix @@ -0,0 +1,69 @@ +{ + version, + rev, + hash, +}: + +{ + lib, + microhs, + stdenv, + fetchFromGitHub, + fetchpatch, +}: + +stdenv.mkDerivation { + pname = "microcabal-stage1"; + inherit version; + + src = fetchFromGitHub { + owner = "augustss"; + repo = "MicroCabal"; + inherit rev hash; + }; + + patches = [ + (fetchpatch { + # https://github.com/augustss/MicroCabal/pull/23 + name = "remove-mtl-mhs-override.patch"; + url = "https://github.com/AlexandreTunstall/MicroCabal/commit/ad30461aaf3dd295f4f5cf5db12635e42557cbfa.patch"; + hash = "sha256-Gmlt76C19ZtCHpKyNim0ggtjXnVuq5F0ywvX8BW15uM="; + }) + (fetchpatch { + # https://github.com/augustss/MicroCabal/pull/34 + name = "package-install-path.patch"; + url = "https://github.com/augustss/MicroCabal/commit/dc358bbab312e1788564fbb36f835347c21792c0.patch"; + hash = "sha256-aUQwuyp+ihXZ9PeSCqGUylcvzA6/ktZyeyBXiEoVY54="; + }) + (fetchpatch { + # https://github.com/augustss/MicroCabal/pull/34 + name = "package-search-path.patch"; + url = "https://github.com/augustss/MicroCabal/commit/3898e5f0596a7391818a0a2cfa994317cda62479.patch"; + hash = "sha256-76yEUpzH5xZZt3U+BCSqyWsImfpOEowupd5YCaYVTO0="; + }) + ]; + + makeFlags = [ + "MHS=${microhs}/bin/mhs" + "MHSDIR=${microhs}/lib/mhs" + ]; + + installPhase = '' + runHook preInstall + install -m755 -d $out/bin + install -m755 bin/mcabal $out/bin/mcabal + runHook postInstall + ''; + + meta = { + description = "A partial Cabal replacement"; + longDescription = '' + A portable subset of the Cabal functionality. + ''; + homepage = "https://github.com/augustss/MicroCabal"; + license = lib.licensesSpdx."Apache-2.0"; + mainProgram = "mcabal"; + maintainers = with lib.maintainers; [ AlexandreTunstall ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5c5c7fff8c94..a8146c05d831 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -68,6 +68,9 @@ let ghc910 = sets.ghc9103; ghc912 = sets.ghc9122; ghc914 = sets.ghc9141; + + microhs_0_15 = sets.microhs_0_15_4_0; + microhs = sets.microhs_0_15; }; in { @@ -220,15 +223,24 @@ in # with "native" and "gmp" backends. native-bignum = let - nativeBignumGhcNames = pkgs.lib.filter (name: !(builtins.elem name nativeBignumExcludes)) ( - pkgs.lib.attrNames compiler - ); + isNativeBignumGhc = + name: + !(builtins.elem name nativeBignumExcludes) && !(compiler.${name} ? isMhs && compiler.${name}.isMhs); + nativeBignumGhcNames = pkgs.lib.filter isNativeBignumGhc (pkgs.lib.attrNames compiler); in pkgs.lib.recurseIntoAttrs ( pkgs.lib.genAttrs nativeBignumGhcNames ( name: compiler.${name}.override { enableNativeBignum = true; } ) ); + + microhs-boot = callPackage ../development/compilers/microhs/boot.nix { + microhs-src = bb.compiler.microhs_0_15_4_0; + }; + + microhs_0_15_4_0 = callPackage ../development/compilers/microhs/0.15.4.0.nix { + inherit (bb.compiler) microhs-boot; + }; } // chooseDefaultVersions compiler // pkgs.lib.optionalAttrs config.allowAliases { @@ -332,6 +344,13 @@ in buildHaskellPackages = bh.packages.native-bignum.${name}; } ); + + microhs_0_15_4_0 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.microhs_0_15_4_0; + ghc = bh.compiler.microhs_0_15_4_0; + compilerConfig = callPackage ../development/haskell-modules/configuration-microhs.nix { }; + packageSetConfig = bootstrapPackageSet; + }; } // chooseDefaultVersions packages // pkgs.lib.optionalAttrs config.allowAliases { From 903ce1aac6c503cd4f8a091dbb849e226948e0b8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 8 Apr 2026 17:04:50 +0200 Subject: [PATCH 295/305] microhs: make alias/shortcut for haskell.compiler.microhs --- pkgs/top-level/all-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11eb191e29f0..f7125655a811 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4265,6 +4265,9 @@ with pkgs; haskell.compiler.ghc910 ); + # TODO(@NixOS/haskell): deprecate this alias? + microhs = targetPackages.haskell.packages.microhs.ghc or haskell.compiler.microhs; + alex = haskell.lib.compose.justStaticExecutables haskellPackages.alex; happy = haskell.lib.compose.justStaticExecutables haskellPackages.happy; From 74f842ffbed24fdce1f702e7b3e71e2b06ceb431 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 8 Apr 2026 17:05:16 +0200 Subject: [PATCH 296/305] top-level/release-haskell.nix: test some pkgs with MicroHs --- pkgs/top-level/release-haskell.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 1515645fb40e..fab634c34802 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -574,6 +574,23 @@ let compilerNames.ghc9122 compilerNames.ghc9123 ] released; + + # MicroHs + array = [ + compilerNames.microhs + ]; + ghc-compat = [ + compilerNames.microhs + ]; + hscolour = [ + compilerNames.microhs + ]; + MicroCabal = [ + compilerNames.microhs + ]; + random = [ + compilerNames.microhs + ]; }) { mergeable = pkgs.releaseTools.aggregate { From b23b370052efe85a0235a8865fc7613cdc1942d3 Mon Sep 17 00:00:00 2001 From: Alex Tunstall Date: Thu, 9 Apr 2026 17:13:35 +0100 Subject: [PATCH 297/305] top-level/release-haskell.nix: test GHC boot pkgs Test the GHC boot packages that are known to work with MicroHs and mark those that don't work as broken. --- .../haskell-modules/configuration-microhs.nix | 12 ++--- pkgs/top-level/release-haskell.nix | 45 ++++++++++++++++--- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-microhs.nix b/pkgs/development/haskell-modules/configuration-microhs.nix index bdf91c6423ed..afeb84ac4217 100644 --- a/pkgs/development/haskell-modules/configuration-microhs.nix +++ b/pkgs/development/haskell-modules/configuration-microhs.nix @@ -33,7 +33,7 @@ self: super: { }; # hackage-packages does not include GHC core libraries - binary = self.binary_0_8_9_3; + binary = markBroken self.binary_0_8_9_3; Cabal = self.Cabal_3_16_1_0; Cabal-syntax = self.Cabal-syntax_3_16_1_0; containers = self.containers_0_8; @@ -49,13 +49,13 @@ self: super: { ghc-prim = null; ghci = null; haskeline = self.haskeline_0_8_4_1; - hpc = self.hpc_0_7_0_2; - integer-gmp = self.integer-gmp_1_1; + hpc = markBroken self.hpc_0_7_0_2; + integer-gmp = markBroken self.integer-gmp_1_1; libiserv = null; mtl = self.mtl_2_3_2; os-string = self.os-string_2_0_10; parsec = self.parsec_3_1_18_0; - pretty = self.pretty_1_1_3_6; + pretty = markBroken self.pretty_1_1_3_6; rts = null; semaphore-compat = null; stm = null; @@ -64,8 +64,8 @@ self: super: { terminfo = self.terminfo_0_4_1_7; time = self.time_1_15; transformers = self.transformers_0_6_3_0; - unix = self.unix_2_8_8_0; - xhtml = self.xhtml_3000_4_0_0; + unix = markBroken self.unix_2_8_8_0; + xhtml = markBroken self.xhtml_3000_4_0_0; # MicroHs replacements for widely used libraries array = self.array-mhs; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index fab634c34802..94d921fe217f 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -575,17 +575,50 @@ let compilerNames.ghc9123 ] released; - # MicroHs - array = [ - compilerNames.microhs - ]; + # MicroHs core packages ghc-compat = [ compilerNames.microhs ]; - hscolour = [ + MicroCabal = [ compilerNames.microhs ]; - MicroCabal = [ + + # MicroHs-specific replacement packages + array = [ + compilerNames.microhs + ]; + + # GHC boot packages known to be compatible with MicroHs + containers = [ + compilerNames.microhs + ]; + exceptions = [ + compilerNames.microhs + ]; + filepath = [ + compilerNames.microhs + ]; + mtl = [ + compilerNames.microhs + ]; + os-string = [ + compilerNames.microhs + ]; + parsec = [ + compilerNames.microhs + ]; + terminfo = [ + compilerNames.microhs + ]; + time = [ + compilerNames.microhs + ]; + transformers = [ + compilerNames.microhs + ]; + + # MicroHs upstream tested + hscolour = [ compilerNames.microhs ]; random = [ From 8fbef8091f94074bcfab1db5c7613aeedf85da80 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 9 Apr 2026 22:45:25 +0200 Subject: [PATCH 298/305] haskell.packages.microhs: add doDistribute where necessary Packages that have an empty hydraPlatforms won't be tested on Hydra otherwise, even if explicitly requested. --- .../haskell-modules/configuration-microhs.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-microhs.nix b/pkgs/development/haskell-modules/configuration-microhs.nix index afeb84ac4217..182394c829f5 100644 --- a/pkgs/development/haskell-modules/configuration-microhs.nix +++ b/pkgs/development/haskell-modules/configuration-microhs.nix @@ -13,7 +13,7 @@ self: super: { MicroHs = null; # External MicroHs core libraries - ghc-compat = markUnbroken super.ghc-compat; + ghc-compat = doDistribute (markUnbroken super.ghc-compat); # Bootstrap MicroCabal MicroCabal = self.mkDerivation { @@ -34,11 +34,11 @@ self: super: { # hackage-packages does not include GHC core libraries binary = markBroken self.binary_0_8_9_3; - Cabal = self.Cabal_3_16_1_0; - Cabal-syntax = self.Cabal-syntax_3_16_1_0; - containers = self.containers_0_8; - exceptions = self.exceptions_0_10_12; - filepath = self.filepath_1_5_5_0; + Cabal = doDistribute self.Cabal_3_16_1_0; + Cabal-syntax = doDistribute self.Cabal-syntax_3_16_1_0; + containers = doDistribute self.containers_0_8; + exceptions = doDistribute self.exceptions_0_10_12; + filepath = doDistribute self.filepath_1_5_5_0; ghc-bignum = null; ghc-boot = null; ghc-boot-th = null; @@ -48,30 +48,30 @@ self: super: { ghc-platform = null; ghc-prim = null; ghci = null; - haskeline = self.haskeline_0_8_4_1; + haskeline = doDistribute self.haskeline_0_8_4_1; hpc = markBroken self.hpc_0_7_0_2; integer-gmp = markBroken self.integer-gmp_1_1; libiserv = null; - mtl = self.mtl_2_3_2; - os-string = self.os-string_2_0_10; - parsec = self.parsec_3_1_18_0; + mtl = doDistribute self.mtl_2_3_2; + os-string = doDistribute self.os-string_2_0_10; + parsec = doDistribute self.parsec_3_1_18_0; pretty = markBroken self.pretty_1_1_3_6; rts = null; semaphore-compat = null; stm = null; system-cxx-std-lib = null; template-haskell = null; - terminfo = self.terminfo_0_4_1_7; - time = self.time_1_15; - transformers = self.transformers_0_6_3_0; + terminfo = doDistribute self.terminfo_0_4_1_7; + time = doDistribute self.time_1_15; + transformers = doDistribute self.transformers_0_6_3_0; unix = markBroken self.unix_2_8_8_0; xhtml = markBroken self.xhtml_3000_4_0_0; # MicroHs replacements for widely used libraries array = self.array-mhs; - array-mhs = markUnbroken super.array-mhs; + array-mhs = doDistribute (markUnbroken super.array-mhs); random = self.random-mhs; - random-mhs = markUnbroken super.random-mhs; + random-mhs = doDistribute (markUnbroken super.random-mhs); # Depends on time when not using GHC splitmix = addBuildDepends [ self.time ] super.splitmix; From be13771605214840072ca4a4678b279d4d1b5406 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Mar 2026 19:40:07 +0100 Subject: [PATCH 299/305] python3Packages.ghapi: 1.0.10 -> 1.0.13 Changelog: https://github.com/fastai/ghapi/releases/tag/1.0.13 --- pkgs/development/python-modules/ghapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix index b47440fb8f86..69c5b1bf9d52 100644 --- a/pkgs/development/python-modules/ghapi/default.nix +++ b/pkgs/development/python-modules/ghapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "ghapi"; - version = "1.0.10"; + version = "1.0.13"; pyproject = true; src = fetchFromGitHub { owner = "fastai"; repo = "ghapi"; tag = finalAttrs.version; - hash = "sha256-2x9uiULYniFVpUNgRie4i49xEqtYfq/9u/07eozw0WQ="; + hash = "sha256-Xv48jY5PW8JdzdWktNOtWAUmn5voWlNv1TqcNmc09zE="; }; build-system = [ setuptools ]; From df141ea75a4bdc8e8a8038a3725ed4f892f8b7d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 21:36:18 +0000 Subject: [PATCH 300/305] terraform-providers.aminueza_minio: 3.28.1 -> 3.30.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 ae3e2261828a..78c37fdd2b98 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -54,13 +54,13 @@ "vendorHash": "sha256-Kk0YeStlev8AurZasORMe/42Rd3ZPFoFMat/rMpZFbE=" }, "aminueza_minio": { - "hash": "sha256-aWsMTUNIDwBzI/qsy78uA3ELnzUA+c4jP2jGD7QqrvI=", + "hash": "sha256-Qt51J0DcwrpJ9+8s8KwngGhhFhZQQYv3dAwFGOYvavo=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.28.1", + "rev": "v3.30.0", "spdx": "AGPL-3.0", - "vendorHash": "sha256-kg6RylB2sW5XLWxJLmIDq3h54rzQoCKrxVu7L76lvCE=" + "vendorHash": "sha256-Mm7IwFX51hsG3ducCbanRoelgkyK6pe+9K8d18U01Z8=" }, "argoproj-labs_argocd": { "hash": "sha256-c6+WY4oXL8evvPk/RzVrwtgq4XLB/LzAH5tpjErbE60=", From 229c9865b31f08e647ca922a28303934055c7166 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Apr 2026 22:26:23 +0000 Subject: [PATCH 301/305] terraform-providers.e-breuninger_netbox: 5.2.1 -> 5.3.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 ae3e2261828a..d151ef596e7c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -364,13 +364,13 @@ "vendorHash": "sha256-RtS88NqkO1nG/8znM0sQqsAIfDc+sOMy8N4T4hmvaVA=" }, "e-breuninger_netbox": { - "hash": "sha256-a9YE3zbMPLKyrD2hG31ymKxI780ONzKfzEPHCN2NhyA=", + "hash": "sha256-hY3XZFMP1qT4mHJpxsVSGsyd025NOeJogbh2m9hk7qE=", "homepage": "https://registry.terraform.io/providers/e-breuninger/netbox", "owner": "e-breuninger", "repo": "terraform-provider-netbox", - "rev": "v5.2.1", + "rev": "v5.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-/kTRJnHbr9crrzdKsDz0q7svYTmiuDbSW/6kBfGgyZY=" + "vendorHash": "sha256-5IZeoZpZj4vgAlyxbycs+IPeOEBS1tw3tM/7zoT4DCg=" }, "equinix_equinix": { "hash": "sha256-Tn8CnLx2ibkj7qlzpYCX7Cm+yoTcZujVELMJSbG+/ec=", From 11056076185446fe8d8e563104ffa70827250215 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 8 Apr 2026 16:09:19 +0100 Subject: [PATCH 302/305] python3Packages.lightgbm: fix cuda build nvcc needs `-std=c++14` to successfully compile. --- pkgs/development/python-modules/lightgbm/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 46016b92469e..ca051551f394 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -93,6 +93,10 @@ buildPythonPackage rec { # Set in pyproject.toml for `cmake.args` in `[tool.scikit-build]`, # but not set by our hooks. (lib.cmakeBool "__BUILD_FOR_PYTHON" true) + ] + ++ lib.optionals cudaSupport [ + # build fails otherwise + (lib.cmakeFeature "CMAKE_CUDA_STANDARD" "14") ]; optional-dependencies = { From d31f834be0adb7faf2c246aac128a3e09b56f211 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 8 Apr 2026 16:22:14 +0100 Subject: [PATCH 303/305] python3Packages.lightgbm: add flokli to maintainers --- pkgs/development/python-modules/lightgbm/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index ca051551f394..c5ad41943771 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -125,6 +125,9 @@ buildPythonPackage rec { homepage = "https://github.com/lightgbm-org/LightGBM"; changelog = "https://github.com/lightgbm-org/LightGBM/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ teh ]; + maintainers = with lib.maintainers; [ + flokli + teh + ]; }; } From 2fa06e7751f235ac10428167edc5caa3838bc1ba Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 8 Apr 2026 16:50:41 +0100 Subject: [PATCH 304/305] python3Packages.lightgbm: use finalAttrs --- pkgs/development/python-modules/lightgbm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index c5ad41943771..a53f669d90a7 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -42,7 +42,7 @@ assert gpuSupport -> !cudaSupport; assert cudaSupport -> !gpuSupport; -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { inherit (pkgs.lightgbm) pname version @@ -51,7 +51,7 @@ buildPythonPackage rec { pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yxxZcg61aTicC6dNFPUjUbVzr0ifIwAyocnzFPi6t/4="; }; @@ -123,11 +123,11 @@ buildPythonPackage rec { meta = { description = "Fast, distributed, high performance gradient boosting (GBDT, GBRT, GBM or MART) framework"; homepage = "https://github.com/lightgbm-org/LightGBM"; - changelog = "https://github.com/lightgbm-org/LightGBM/releases/tag/v${version}"; + changelog = "https://github.com/lightgbm-org/LightGBM/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ flokli teh ]; }; -} +}) From 23c177448c69887c8f8e3718a860ae6dcdb99528 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 9 Apr 2026 23:41:36 +0100 Subject: [PATCH 305/305] python3Packages.lightgbm: override stdenv if built with cuda support From https://github.com/NixOS/nixpkgs/pull/507972#discussion_r3053161889: > [This prevents] the other stdenv and its cc from leaking into the > build. The latter is somewhat optional, but the leakage can result in, > on one hand, in mixing object files from different cc releases ("works > in practice but nobody offers guarantees"), and on the other in the > hypothetical possibility that cuda tools use up wrong cc. > > If lightgbm builds cuda kernel, it "should" conditionally override > stdenv, so far we don't have a better system to configure this > transparently to individual packages... --- pkgs/development/python-modules/lightgbm/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index a53f669d90a7..57e90a429249 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -42,7 +42,10 @@ assert gpuSupport -> !cudaSupport; assert cudaSupport -> !gpuSupport; -buildPythonPackage (finalAttrs: { +let + effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv; +in +buildPythonPackage.override { stdenv = effectiveStdenv; } (finalAttrs: { inherit (pkgs.lightgbm) pname version