From 030e8fdbbd01db69aabda5014b49dbd6710a6a15 Mon Sep 17 00:00:00 2001 From: Maga Date: Fri, 24 Apr 2026 11:20:41 -0400 Subject: [PATCH 01/29] ankama-launcher: 3.14.8 -> 3.14.9 --- pkgs/by-name/an/ankama-launcher/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ankama-launcher/package.nix b/pkgs/by-name/an/ankama-launcher/package.nix index 8b7510c8831e..39dc447a9d26 100644 --- a/pkgs/by-name/an/ankama-launcher/package.nix +++ b/pkgs/by-name/an/ankama-launcher/package.nix @@ -5,15 +5,15 @@ }: let pname = "ankama-launcher"; - version = "3.14.8"; + version = "3.14.9"; # The original URL for the launcher is: # https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage # As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL. # To update the client, head to web.archive.org and create a new snapshot of the download page. src = fetchurl { - url = "https://web.archive.org/web/20260413125512/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; - hash = "sha256-wHLzF30ZeTgBG1TFlkSt0Tsm82cNb/C/eTUZjjYsgVE="; + url = "https://web.archive.org/web/20260424144939/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; + hash = "sha256-MkXOlMlBSVCgdxbtwlyO7XdCxY6ZSzuouLxbLelxrJ4="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From b2dafe7ca437dad7b8ab30ea75afa5ca3177c310 Mon Sep 17 00:00:00 2001 From: Maga Date: Thu, 4 Jun 2026 22:00:57 -0400 Subject: [PATCH 02/29] ankama-launcher: 3.14.9 -> 3.14.14 --- pkgs/by-name/an/ankama-launcher/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ankama-launcher/package.nix b/pkgs/by-name/an/ankama-launcher/package.nix index 39dc447a9d26..c0791db9e72e 100644 --- a/pkgs/by-name/an/ankama-launcher/package.nix +++ b/pkgs/by-name/an/ankama-launcher/package.nix @@ -5,15 +5,15 @@ }: let pname = "ankama-launcher"; - version = "3.14.9"; + version = "3.14.14"; # The original URL for the launcher is: # https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage # As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL. # To update the client, head to web.archive.org and create a new snapshot of the download page. src = fetchurl { - url = "https://web.archive.org/web/20260424144939/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; - hash = "sha256-MkXOlMlBSVCgdxbtwlyO7XdCxY6ZSzuouLxbLelxrJ4="; + url = "https://web.archive.org/web/20260605015300/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; + hash = "sha256-9w1ho9DZvDHXQbXjpMY1wnWDwYlMKO1igrJcCahQkVQ="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From bd6c14e64a581dd681cb01f730454481669afed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Thu, 18 Jun 2026 09:37:03 +0700 Subject: [PATCH 03/29] =?UTF-8?q?movim:=200.33.1=20=E2=86=92=200.34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/mo/movim/package.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 066e3dba1e06..e7af069352ad 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch2, writeShellScript, dash, php, @@ -45,23 +44,15 @@ let in php.buildComposerProject2 (finalAttrs: { pname = "movim"; - version = "0.33.1"; + version = "0.34"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; tag = "v${finalAttrs.version}"; - hash = "sha256-TQ8PLmz9hn+OFfIF5cckv5gGhID7vuA5O1xVJ6PSPVA="; + hash = "sha256-E2n0YxNCaNEseGjLLhFDBdvrGg/XfzxU+T/rw/6Y/qY="; }; - patches = [ - # Removes debug var_dump that was accidentally left in - (fetchpatch2 { - url = "https://github.com/movim/movim/commit/239bd099711d196df574106155374f301f2c9531.patch"; - hash = "sha256-tLWUOKTJDFE9obrnghG/S8FHJY0rcWlueWncHVdi0Jk="; - }) - ]; - php = php.buildEnv ( { extensions = ( @@ -97,7 +88,7 @@ php.buildComposerProject2 (finalAttrs: { ++ lib.optional minify.style.enable lightningcss ++ lib.optional minify.svg.enable scour; - vendorHash = "sha256-iy869AKgn/ZL1jYFvqvYkfr4lv5J4l2W6glGqZvJLhE="; + vendorHash = "sha256-Vs98gZAthDuYCdZiKSwmh+en4admfXSbDeoZXdbt8hQ="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; From 046aab8ec521512a12031095bae5621f87c8e16b Mon Sep 17 00:00:00 2001 From: eymeric Date: Thu, 18 Jun 2026 09:49:32 +0700 Subject: [PATCH 04/29] nebula-de-esser: 3.2.0 -> 3.3.0 --- pkgs/by-name/ne/nebula-de-esser/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ne/nebula-de-esser/package.nix b/pkgs/by-name/ne/nebula-de-esser/package.nix index 80db86f1e337..d9ea155b74eb 100644 --- a/pkgs/by-name/ne/nebula-de-esser/package.nix +++ b/pkgs/by-name/ne/nebula-de-esser/package.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nebula-de-esser"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "subhankardas15071992-cloud"; repo = "Nebula-De-Esser"; tag = "v${finalAttrs.version}"; - hash = "sha256-N+tVlhGTBRXZDKGRYo2WUamiekTe1FXvpqm34lwu2Z8="; + hash = "sha256-vV7Qc5WxGvb6h3o1CXTLYZzpWSc3ASt8cq3opI3qjEg="; }; - cargoHash = "sha256-+z6oFjmPr2bLf81F4Q3dJC+x+RWeZnnnMHrWLphTsq0="; + cargoHash = "sha256-swhj9JQsDCFYzB/+qKffcdcIOAZ1HXmrgZ/Iy/rxG1M="; __structuredAttrs = true; strictDeps = true; @@ -65,16 +65,12 @@ rustPlatform.buildRustPackage (finalAttrs: { installPhase = '' runHook preInstall - clapDir="${ - if stdenv.hostPlatform.isDarwin then "$out/Library/Audio/Plug-Ins/CLAP" else "$out/lib/clap" - }" vst3Dir="${ if stdenv.hostPlatform.isDarwin then "$out/Library/Audio/Plug-Ins/VST3" else "$out/lib/vst3" }" - mkdir -p "$clapDir" "$vst3Dir" + mkdir -p "$vst3Dir" - cp -r "target/bundled/Nebula De-Esser.clap" "$clapDir/" cp -r "target/bundled/Nebula De-Esser.vst3" "$vst3Dir/" runHook postInstall From a13c27a42c83435cccd1511e82f2b06eb0c5cb01 Mon Sep 17 00:00:00 2001 From: Naomi Roberts Date: Thu, 18 Jun 2026 22:32:07 +0100 Subject: [PATCH 05/29] shiru: 6.6.0 -> 6.7.0 Signed-off-by: Naomi Roberts --- .../0001-Remove-Windows-specific-dep.patch | 68 +++++++++++-------- pkgs/by-name/sh/shiru/package.nix | 10 +-- 2 files changed, 45 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/sh/shiru/0001-Remove-Windows-specific-dep.patch b/pkgs/by-name/sh/shiru/0001-Remove-Windows-specific-dep.patch index 291b61fc6954..f1619aa3c08e 100644 --- a/pkgs/by-name/sh/shiru/0001-Remove-Windows-specific-dep.patch +++ b/pkgs/by-name/sh/shiru/0001-Remove-Windows-specific-dep.patch @@ -1,4 +1,4 @@ -From 12b0c98a4e844ab18545c8ba521ac1ef71301938 Mon Sep 17 00:00:00 2001 +From a8011a8d2610bc86224965a9ab9a935510af36f1 Mon Sep 17 00:00:00 2001 From: Naomi Roberts Date: Thu, 4 Dec 2025 19:59:48 +0000 Subject: [PATCH] Remove Windows-specific dep @@ -9,23 +9,23 @@ Signed-off-by: Naomi Roberts electron/src/main/app.js | 17 +---------------- electron/webpack.config.cjs | 4 +--- package.json | 1 - - pnpm-lock.yaml | 11 ----------- - 5 files changed, 2 insertions(+), 32 deletions(-) + pnpm-lock.yaml | 16 ---------------- + 5 files changed, 2 insertions(+), 37 deletions(-) diff --git a/electron/package.json b/electron/package.json -index a7b2bd3e..ce55d877 100644 +index 13d40060..d7154097 100644 --- a/electron/package.json +++ b/electron/package.json -@@ -26,7 +26,6 @@ - "electron-updater": "^6.8.4" +@@ -27,7 +27,6 @@ + "electron-updater": "^6.8.9" }, "dependencies": { -- "@paymoapp/electron-shutdown-handler": "^1.1.2", +- "@paymoapp/electron-shutdown-handler": "^1.1.3", "@xhayper/discord-rpc": "^1.3.4", - "concurrently": "^9.2.1", + "concurrently": "^10.0.3", "jimp": "0.22.12", diff --git a/electron/src/main/app.js b/electron/src/main/app.js -index 5875d276..682d3bb1 100644 +index 68aeb491..7237ad09 100644 --- a/electron/src/main/app.js +++ b/electron/src/main/app.js @@ -7,7 +7,6 @@ import Jimp from 'jimp' @@ -75,42 +75,42 @@ index 716dfcf7..3c9e4d1f 100644 aliasFields: [], alias: { diff --git a/package.json b/package.json -index 52de5f3a..470faf9d 100644 +index b02fcb7d..4fddc6ea 100644 --- a/package.json +++ b/package.json -@@ -48,7 +48,6 @@ - "svelte-keybinds": "patches/svelte-keybinds.patch" +@@ -47,7 +47,6 @@ + "cordova-plugin-apkupdater": "patches/cordova-plugin-apkupdater.patch" }, "onlyBuiltDependencies": [ - "@paymoapp/electron-shutdown-handler", "bufferutil", "electron", - "fs-native-extensions", + "electron-winstaller", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml -index c373d877..e774678a 100644 +index 102a5cd1..5dcb8798 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml -@@ -257,9 +257,6 @@ importers: +@@ -267,9 +267,6 @@ importers: electron: dependencies: - '@paymoapp/electron-shutdown-handler': -- specifier: ^1.1.2 -- version: 1.1.2 +- specifier: ^1.1.3 +- version: 1.1.3 '@xhayper/discord-rpc': specifier: ^1.3.4 - version: 1.3.4(bufferutil@4.0.8)(utf-8-validate@6.0.4) -@@ -848,9 +845,6 @@ packages: - '@paralleldrive/cuid2@2.3.1': - resolution: {integrity: sha512-XO7cAxhnTZl0Yggq6jOgjiOHhbgcO4NqFqwSmQpjK3b6TEE6Uj/jfSk6wzYyemh3+I0sHirKSetjQwn5cZktFw==} + version: 1.3.4(bufferutil@4.1.0)(utf-8-validate@6.0.6) +@@ -930,9 +927,6 @@ packages: + '@obsidize/rx-console@6.2.1': + resolution: {integrity: sha512-UXa8S8pNoDmyZ9x2UjU/GJmqEhJ/LGmAI/2V/3njNBQRIxmDFCIPJIavsRv6x+JueNZ4mU1wHE0gU7paT5iWrA==} -- '@paymoapp/electron-shutdown-handler@1.1.2': -- resolution: {integrity: sha512-/MIC+wdRlVw1Sm56qJcT17O/KBpQARP2tOcAgg1OKB4W83B9IyBBtIoLXkRlpCOEJnGEleuv5HiSBryUgwbFvQ==} +- '@paymoapp/electron-shutdown-handler@1.1.3': +- resolution: {integrity: sha512-DfsuC7d1F07oNzzCcarSi0oNRd6NI9elCa3Ge1iWwqttJRJC/kuBbbYEalf6tSeCEK8D6Q+5reabkkexBKjB/w==} - - '@peculiar/asn1-cms@2.6.1': - resolution: {integrity: sha512-vdG4fBF6Lkirkcl53q6eOdn3XYKt+kJTG59edgRZORlg/3atWWEReRCx5rYE1ZzTTX6vLK5zDMjHh7vbrcXGtw==} + '@peculiar/asn1-cms@2.7.0': + resolution: {integrity: sha512-hew63shtzzvBcSHbhm+cyAmKe6AIfinT9hzEqSPjDC6opTTMKmTkQ0gHuN2KsWlvqiKw1S/fS94fhag/FJkioQ==} -@@ -4112,9 +4106,6 @@ packages: +@@ -3961,9 +3955,6 @@ packages: node-addon-api@4.3.0: resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==} @@ -120,7 +120,19 @@ index c373d877..e774678a 100644 node-addon-api@6.1.0: resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==} -@@ -10823,8 +10814,6 @@ snapshots: +@@ -6812,11 +6803,6 @@ snapshots: + + '@obsidize/rx-console@6.2.1': {} + +- '@paymoapp/electron-shutdown-handler@1.1.3': +- dependencies: +- node-addon-api: 5.1.0 +- prebuild-install: 7.1.3 +- + '@peculiar/asn1-cms@2.7.0': + dependencies: + '@peculiar/asn1-schema': 2.7.0 +@@ -10388,8 +10374,6 @@ snapshots: node-addon-api@4.3.0: {} @@ -130,5 +142,5 @@ index c373d877..e774678a 100644 node-api-version@0.2.1: -- -2.53.0 +2.54.0 diff --git a/pkgs/by-name/sh/shiru/package.nix b/pkgs/by-name/sh/shiru/package.nix index 6a1edc181684..c14c5a89bcb4 100644 --- a/pkgs/by-name/sh/shiru/package.nix +++ b/pkgs/by-name/sh/shiru/package.nix @@ -5,7 +5,7 @@ nodejs, fetchFromGitHub, python3, - electron_39, + electron_42, makeDesktopItem, makeBinaryWrapper, copyDesktopItems, @@ -15,17 +15,17 @@ }: let pnpm = pnpm_10; - electron = electron_39; + electron = electron_42; in stdenv.mkDerivation (finalAttrs: { pname = "shiru"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "RockinChaos"; repo = "shiru"; tag = "v${finalAttrs.version}"; - hash = "sha256-LccI6Z4hhkmzWHt0CKum9giJMVGm3qM0ZKNvChUCYQ4="; + hash = "sha256-+qXbtRucviNvdZYqIh/CjYX0AGIIxAmw8V5j41BocGE="; }; patches = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { cd electron ''; fetcherVersion = 3; - hash = "sha256-bTo6sEQuUghwm2I99WB7+akL4AOZ1ZN2ovaLWrd5MMg="; + hash = "sha256-y+CWr/YLmDjB9GDTFlsMni7uGAME3XOG3GB43KzZxOQ="; }; buildPhase = '' From 86b1c47fe18fd66e31c6990223415626b5d6149c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jun 2026 20:48:51 +0000 Subject: [PATCH 06/29] cloudflared: 2026.6.0 -> 2026.6.1 --- pkgs/by-name/cl/cloudflared/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix index 758efddd4e50..384532faa0c8 100644 --- a/pkgs/by-name/cl/cloudflared/package.nix +++ b/pkgs/by-name/cl/cloudflared/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "cloudflared"; - version = "2026.6.0"; + version = "2026.6.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; tag = finalAttrs.version; - hash = "sha256-V3fHxDNkxF7MwChZpyHZ7pn8bBgBe/ugNql2QzqSLFA="; + hash = "sha256-TQW0XnYS96sX/+dTGocKzz91fJG58cSV3jGZI3TBaeg="; }; vendorHash = null; From 3a0cd48f0c33f67d2c33f0a7e8d1f92fa94f6c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 21 Jun 2026 13:25:59 -0700 Subject: [PATCH 07/29] python3Packages.mysql-connector-python: rename from mysql-connector The project name (e.g. on PyPI) is mysql-connector-python. --- pkgs/by-name/sq/sqlit-tui/package.nix | 2 +- pkgs/by-name/sq/sqlite3-to-mysql/package.nix | 2 +- pkgs/development/python-modules/logfire/default.nix | 4 ++-- .../0001-Revert-Fix-MacOS-wheels-platform-tag.patch | 0 .../{mysql-connector => mysql-connector-python}/default.nix | 2 +- pkgs/development/python-modules/peewee/default.nix | 4 ++-- pkgs/development/python-modules/sqlalchemy/1_4.nix | 4 ++-- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- pkgs/development/python-modules/web/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 11 files changed, 15 insertions(+), 14 deletions(-) rename pkgs/development/python-modules/{mysql-connector => mysql-connector-python}/0001-Revert-Fix-MacOS-wheels-platform-tag.patch (100%) rename pkgs/development/python-modules/{mysql-connector => mysql-connector-python}/default.nix (98%) diff --git a/pkgs/by-name/sq/sqlit-tui/package.nix b/pkgs/by-name/sq/sqlit-tui/package.nix index 02b192d386f6..f5b8514c7db4 100644 --- a/pkgs/by-name/sq/sqlit-tui/package.nix +++ b/pkgs/by-name/sq/sqlit-tui/package.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication (finalAttrs: { duckdb keyring mariadb - mysql-connector + mysql-connector-python oracledb paramiko psycopg2 diff --git a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix index 1cedbdeef6e5..c17a7372ba54 100644 --- a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix +++ b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dependencies = with python3Packages; [ click - mysql-connector + mysql-connector-python pytimeparse2 pymysql pymysqlsa diff --git a/pkgs/development/python-modules/logfire/default.nix b/pkgs/development/python-modules/logfire/default.nix index e74853425256..6a7a080b2d6b 100644 --- a/pkgs/development/python-modules/logfire/default.nix +++ b/pkgs/development/python-modules/logfire/default.nix @@ -42,7 +42,7 @@ inline-snapshot, logfire-api, loguru, - mysql-connector, + mysql-connector-python, openai-agents, pandas, psycopg, @@ -138,7 +138,7 @@ buildPythonPackage (finalAttrs: { inline-snapshot logfire-api loguru - mysql-connector + mysql-connector-python openai-agents pandas psycopg diff --git a/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch b/pkgs/development/python-modules/mysql-connector-python/0001-Revert-Fix-MacOS-wheels-platform-tag.patch similarity index 100% rename from pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch rename to pkgs/development/python-modules/mysql-connector-python/0001-Revert-Fix-MacOS-wheels-platform-tag.patch diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector-python/default.nix similarity index 98% rename from pkgs/development/python-modules/mysql-connector/default.nix rename to pkgs/development/python-modules/mysql-connector-python/default.nix index 514afe45d2f7..162a7bea75aa 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector-python/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { - pname = "mysql-connector"; + pname = "mysql-connector-python"; version = "9.7.0"; format = "setuptools"; diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index f7b40872522a..79fdc6eee4c3 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -8,7 +8,7 @@ python, sqlite, withMysql ? false, - mysql-connector, + mysql-connector-python, withPostgres ? false, psycopg2, setuptools, @@ -37,7 +37,7 @@ buildPythonPackage rec { apsw ] ++ lib.optionals withPostgres [ psycopg2 ] - ++ lib.optionals withMysql [ mysql-connector ]; + ++ lib.optionals withMysql [ mysql-connector-python ]; nativeCheckInputs = [ flask ]; diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index c4d71b8624e3..6797b61694fb 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -17,7 +17,7 @@ cx-oracle, mariadb, mypy, - mysql-connector, + mysql-connector-python, mysqlclient, pg8000, psycopg2, @@ -63,7 +63,7 @@ buildPythonPackage rec { ]; mssql_pyodbc = [ pyodbc ]; mysql = [ mysqlclient ]; - mysql_connector = [ mysql-connector ]; + mysql_connector = [ mysql-connector-python ]; mariadb_connector = [ mariadb ]; oracle = [ cx-oracle ]; postgresql = [ psycopg2 ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 43176c93edcd..984523ba1473 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -22,7 +22,7 @@ cx-oracle, mariadb, mypy, - mysql-connector, + mysql-connector-python, mysqlclient, oracledb, pg8000, @@ -74,7 +74,7 @@ buildPythonPackage (finalAttrs: { mssql_pymysql = [ pymssql ]; mssql_pyodbc = [ pyodbc ]; mysql = [ mysqlclient ]; - mysql_connector = [ mysql-connector ]; + mysql_connector = [ mysql-connector-python ]; mariadb_connector = [ mariadb ]; oracle = [ cx-oracle ]; oracle_oracledb = [ oracledb ]; diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix index 19e68bdb2d8a..b9c660082aaa 100644 --- a/pkgs/development/python-modules/web/default.nix +++ b/pkgs/development/python-modules/web/default.nix @@ -8,7 +8,7 @@ dbutils, mysqlclient, pymysql, - mysql-connector, + mysql-connector-python, psycopg2, }: @@ -37,7 +37,7 @@ buildPythonPackage rec { dbutils mysqlclient pymysql - mysql-connector + mysql-connector-python psycopg2 ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e99e55652476..d594a9c69894 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -370,6 +370,7 @@ mapAliases { mullvad-closest = throw "'mullvad-closest' has been removed as it was unmaintained. Consider using 'mullvad-compass' instead."; # Added 2026-01-13 multi_key_dict = throw "'multi_key_dict' has been renamed to/replaced by 'multi-key-dict'"; # Converted to throw 2025-10-29 mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25 + mysql-connector = mysql-connector-python; # added 2026-06-21 net2grid = throw "'net2grid' has been renamed to/replaced by 'gridnet'"; # Converted to throw 2025-10-29 ninja-python = throw "'ninja-python' has been renamed to/replaced by 'ninja'"; # Converted to throw 2025-10-29 nitpick = throw "'nitpick' has been removed because it was unmaintained upstream since 2017 and using python2"; # added 2025-08-25 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d0ef73df8c5..b63c38d4a46b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11012,7 +11012,7 @@ self: super: with self; { mypyllant = callPackage ../development/python-modules/mypyllant { }; - mysql-connector = callPackage ../development/python-modules/mysql-connector { }; + mysql-connector-python = callPackage ../development/python-modules/mysql-connector-python { }; mysqlclient = callPackage ../development/python-modules/mysqlclient { }; From 0260bcb1f365ea4eada9a14c851094bc0641acef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 21 Jun 2026 15:44:51 -0700 Subject: [PATCH 08/29] newsboat: 2.43 -> 2.44 Diff: https://github.com/newsboat/newsboat/compare/r2.43...r2.44 Changelog: https://github.com/newsboat/newsboat/blob/r2.44/CHANGELOG.md --- pkgs/by-name/ne/newsboat/package.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix index b7e329e7f6ed..f803c4446e68 100644 --- a/pkgs/by-name/ne/newsboat/package.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -17,30 +17,22 @@ libiconv, makeWrapper, nix-update-script, - fetchpatch, }: stdenv.mkDerivation (finalAttrs: { pname = "newsboat"; - version = "2.43"; + version = "2.44"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; tag = "r${finalAttrs.version}"; - hash = "sha256-XnA20uylHoly1P5qpM2JmkkV6C5//Xu5M+CjWwCiI7c="; + hash = "sha256-OV7WpM0NBfqOtFv9Co728UwHut4HhT2u5qgvamy/FAg="; }; - patches = [ - (fetchpatch { - url = "https://github.com/newsboat/newsboat/commit/f7936d13013d33946b28b2ac51f1266423d66b23.patch"; - hash = "sha256-MnL/ylTIJJV1+3I1OxzNWedLUEZ4viuzxXNM63qk1aM="; - }) - ]; - cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-+QyN0YDQmSGVZ2ckLd5SDYRw/wZYFY6GNteeTRrNDcU="; + hash = "sha256-HJZnbQ7TDJ9zg0Rav1PCMEymaYy/mSxnrr2gkv4pTX0="; }; # allow other ncurses versions on Darwin From 55a0bf7a853f3ffd474f05aa2e02d494cb8cd21c Mon Sep 17 00:00:00 2001 From: eljamm Date: Fri, 5 Jun 2026 12:05:43 +0200 Subject: [PATCH 09/29] {python3Packages.,}:lookup-license: init at 0.1.30 Assisted-by: nix-init --- pkgs/by-name/lo/lookup-license/package.nix | 3 + .../python-modules/lookup-license/default.nix | 89 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 94 insertions(+) create mode 100644 pkgs/by-name/lo/lookup-license/package.nix create mode 100644 pkgs/development/python-modules/lookup-license/default.nix diff --git a/pkgs/by-name/lo/lookup-license/package.nix b/pkgs/by-name/lo/lookup-license/package.nix new file mode 100644 index 000000000000..0504ccaa5769 --- /dev/null +++ b/pkgs/by-name/lo/lookup-license/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.lookup-license diff --git a/pkgs/development/python-modules/lookup-license/default.nix b/pkgs/development/python-modules/lookup-license/default.nix new file mode 100644 index 000000000000..611425b902de --- /dev/null +++ b/pkgs/development/python-modules/lookup-license/default.nix @@ -0,0 +1,89 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + appdirs, + cachetools, + diskcache, + foss-flame, + license-expression, + packageurl-python, + python-magic, + requests, + scancode-toolkit, + xmltodict, + + # tests + pytestCheckHook, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "lookup-license"; + version = "0.1.30"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "hesa"; + repo = "lookup-license"; + tag = finalAttrs.version; + hash = "sha256-zFDqh62bjYkO3Duze3suS8LlrlzuqQes7ZaH+9G+yQ4="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + appdirs + cachetools + diskcache + foss-flame + license-expression + packageurl-python + python-magic + requests + scancode-toolkit + xmltodict + ]; + + pythonRelaxDeps = [ + "requests" + ]; + + nativeCheckInputs = [ + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + disabledTests = [ + # UnboundLocalError: cannot access local variable 'ret' where it is not associated with a value + "test_lookup_license_url_bad" + "test_lookup_license_url_good" + ]; + + pythonImportsCheck = [ + "lookup_license" + ]; + + meta = { + description = "Python tool to identify license from license text"; + homepage = "https://github.com/hesa/lookup-license"; + changelog = "https://github.com/hesa/lookup-license/releases/tag/${finalAttrs.src.tag}"; + mainProgram = "lookup-license"; + license = with lib.licenses; [ + gpl3Only + asl20 + cc-by-40 + gpl3Plus + ]; + maintainers = with lib.maintainers; [ eljamm ]; + teams = with lib.teams; [ ngi ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c08a84cbf5c..0469c8e63a26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9514,6 +9514,8 @@ self: super: with self; { london-tube-status = callPackage ../development/python-modules/london-tube-status { }; + lookup-license = callPackage ../development/python-modules/lookup-license { }; + lookyloo-models = callPackage ../development/python-modules/lookyloo-models { }; loompy = callPackage ../development/python-modules/loompy { }; From cee4a8b6755d508bbf11eadb2e8ce803dc6e007e Mon Sep 17 00:00:00 2001 From: eljamm Date: Fri, 5 Jun 2026 12:06:14 +0200 Subject: [PATCH 10/29] sbom-compliance-tool: init at 0.0.11 Assisted-by: nix-init --- .../sb/sbom-compliance-tool/package.nix | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/sb/sbom-compliance-tool/package.nix diff --git a/pkgs/by-name/sb/sbom-compliance-tool/package.nix b/pkgs/by-name/sb/sbom-compliance-tool/package.nix new file mode 100644 index 000000000000..fc70c2c62614 --- /dev/null +++ b/pkgs/by-name/sb/sbom-compliance-tool/package.nix @@ -0,0 +1,61 @@ +{ + lib, + python3Packages, + fetchFromGitea, + cyclonedx-python, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "sbom-compliance-tool"; + version = "0.0.11"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "software-compliance-org"; + repo = "sbom-compliance-tool"; + tag = finalAttrs.version; + hash = "sha256-6ZaHY1EKjJ78PrCov0wenj5doc93Ot9/yN4hEaagSmE="; + }; + + postPatch = '' + # https://setuptools.pypa.io/en/latest/userguide/package_discovery.html#finding-namespace-packages + substituteInPlace setup.py \ + --replace-fail \ + "packages=['sbom_compliance_tool']" \ + "packages=setuptools.find_namespace_packages(include=['sbom_compliance_tool*'])" + ''; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + cyclonedx-python + foss-flame + licomp + licomp-toolkit + lookup-license + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "sbom_compliance_tool" + "sbom_compliance_tool.reader" + ]; + + meta = { + description = "Tool to assist your compliance work with SBoM"; + homepage = "https://codeberg.org/software-compliance-org/sbom-compliance-tool"; + mainProgram = "sbom_compliance_tool"; + license = with lib.licenses; [ + gpl3Only + gpl3Plus + ]; + maintainers = with lib.maintainers; [ eljamm ]; + teams = with lib.teams; [ ngi ]; + }; +}) From 91ed899eec4dd28d8138cad60667662883f0e623 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 21 Jun 2026 01:27:19 +0400 Subject: [PATCH 11/29] =?UTF-8?q?python3Packages.pyotb:=202.1.0=20?= =?UTF-8?q?=E2=86=92=202.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/pyotb/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyotb/default.nix b/pkgs/development/python-modules/pyotb/default.nix index 0728317d4338..796b70728435 100644 --- a/pkgs/development/python-modules/pyotb/default.nix +++ b/pkgs/development/python-modules/pyotb/default.nix @@ -37,14 +37,14 @@ let in buildPythonPackage rec { pname = "pyotb"; - version = "2.1.0"; + version = "2.2.1"; pyproject = true; src = fetchFromGitHub { owner = "orfeotoolbox"; repo = "pyotb"; tag = version; - hash = "sha256-KomIMVx4jfsTSbGtoml9ON/82sHanOkp/mp1TiUaa2E="; + hash = "sha256-TDBhMCdO3kGjbysYZN9un7Y8YY+dGlHw5Vj/ZJVPXdk="; }; postPatch = '' @@ -72,6 +72,8 @@ buildPythonPackage rec { dependencies = [ otbWithPy ]; + pythonRelaxDeps = [ "numpy" ]; + pythonImportsCheck = [ "pyotb" ]; nativeCheckInputs = [ From 0e5430cc23e92fd6eb34f5b122d73744110b365f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jun 2026 13:03:17 +0000 Subject: [PATCH 12/29] lavacli: 2.8 -> 2.9.0 --- pkgs/by-name/la/lavacli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lavacli/package.nix b/pkgs/by-name/la/lavacli/package.nix index 8e01b708e4e6..f581759ea19b 100644 --- a/pkgs/by-name/la/lavacli/package.nix +++ b/pkgs/by-name/la/lavacli/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "lavacli"; - version = "2.8"; + version = "2.9.0"; pyproject = true; src = fetchFromGitLab { owner = "lava"; repo = "lavacli"; tag = "v${finalAttrs.version}"; - hash = "sha256-oIB5BLLwyaDkV5mQ8vndlQQv4R1lCEATHO9JqJDYv7s="; + hash = "sha256-yDcvOuU/SxrQz8VN1ellf9Do7Sjw4/RwXpzOe0+5oAo="; }; build-system = with python3.pkgs; [ From 53707531232304bc28244478a59a3ef4fb5ebd2d Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 22 Jun 2026 18:39:07 +0800 Subject: [PATCH 13/29] emacs.pkgs.ghostel: fix build on darwin Fixes: #515993 --- .../manual-packages/ghostel/package.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix index 65607c696103..7db1cf189afe 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix @@ -6,6 +6,7 @@ stdenv, zig_0_15, emacs, + xcbuild, }: let @@ -31,7 +32,7 @@ let hash = "sha256-CTsG3dXu3DECDbklBAtr2fYou82WNvQ1Q3JET0TmuyM="; }; - nativeBuildInputs = [ zig ]; + nativeBuildInputs = [ zig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; env.EMACS_INCLUDE_DIR = "${emacs}/include"; @@ -47,6 +48,19 @@ let zigBuildFlags = finalAttrs.zigCheckFlags; + postPatch = '' + # https://github.com/dakra/ghostel/issues/446 + substituteInPlace build.zig \ + --replace-fail 'addInstallFile(version_file, "../ghostel-module.version")' \ + 'addInstallFile(version_file, "ghostel-module.version")' + + # remove copy_step + substituteInPlace build.zig \ + --replace-fail 'b.getInstallStep().dependOn(©_step.step);' ' ' \ + --replace-fail 'const copy_step = b.addInstallFile' \ + '_ = b.addInstallFile' + ''; + postConfigure = '' cp -rLT ${finalAttrs.deps} "$ZIG_GLOBAL_CACHE_DIR/p" chmod -R u+w "$ZIG_GLOBAL_CACHE_DIR/p" From a820ef46e60e7ecb3d26951cb8f10a07ae9580cf Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 22 Jun 2026 20:40:10 +0800 Subject: [PATCH 14/29] emacs.pkgs.ghostel: install ghostel-module.version Co-authored-by: Vonfry --- .../emacs/elisp-packages/manual-packages/ghostel/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix index 7db1cf189afe..c0f90d6b68fd 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix @@ -73,11 +73,12 @@ melpaBuild { inherit pname version src; files = '' - (:defaults "etc" "ghostel-module${libExt}") + (:defaults "etc" "ghostel-module${libExt}" "ghostel-module.version") ''; preBuild = '' install ${module}/lib/libghostel-module${libExt} ghostel-module${libExt} + install --mode=444 ${module}/ghostel-module.version ghostel-module.version ''; passthru = { From 127e5842798a40c00c5244af4e5963c1a409981c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jun 2026 16:30:00 +0000 Subject: [PATCH 15/29] super-productivity: 18.12.0 -> 18.12.1 --- pkgs/by-name/su/super-productivity/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 32b201f0b24f..c36e900f1650 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -20,7 +20,7 @@ let in buildNpmPackage rec { pname = "super-productivity"; - version = "18.12.0"; + version = "18.12.1"; inherit nodejs; @@ -28,7 +28,7 @@ buildNpmPackage rec { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-v4/fPfgiUMOWAcmWdr13oCmu7NTZI3ki6uWJPWTcWzM="; + hash = "sha256-19wMmVKHnnSUsu2xOplNY3HeDhoOdFgX05I5XKTwRhM="; }; # Use custom fetcher for deps because super-productivity uses multiple @@ -74,7 +74,7 @@ buildNpmPackage rec { dontInstall = true; outputHashMode = "recursive"; - hash = "sha256-inutOgoQ+xvdVizK2ff6Ro4F/5n4l6dAYjfXJTHWfpo="; + hash = "sha256-MBlILswZWTpfjHxazTyH72vYUrJ/9ZD3Kdcix/yFNJ0="; } ); From 9b90c5da7fd88b75de0075f289e377900b7d6c39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jun 2026 17:18:13 +0000 Subject: [PATCH 16/29] ghostfolio: 3.10.0 -> 3.13.0 --- pkgs/by-name/gh/ghostfolio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 15be16873943..5ee10e29eb8f 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -12,13 +12,13 @@ buildNpmPackage (finalAttrs: { pname = "ghostfolio"; - version = "3.10.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = finalAttrs.version; - hash = "sha256-nVk4KjNOIQQRRRvyPdSodL4s3yarIb1p2t2fBNcMps4="; + hash = "sha256-tPVGMAP45x/4NTL8px9jEbW6hQyhiOYiZp0tuDdfYL8="; # 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; @@ -28,7 +28,7 @@ buildNpmPackage (finalAttrs: { ''; }; - npmDepsHash = "sha256-IMUbBYFiSS0AfsenPvxoC5HHHW7Lhxfd5DaysgV+vBU="; + npmDepsHash = "sha256-0/tHzfJrotlCxhiiVC6yddlj62Ef6IAeaZf/xufFiWU="; postPatch = '' substituteInPlace replace.build.mjs \ From 8c4e70501b972f3ce3c7d3b0d6aec52c8b51ce7b Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 5 Jun 2026 23:49:08 -0600 Subject: [PATCH 17/29] picocrypt-ng: 2.10 -> 2.17 https://github.com/Picocrypt-NG/Picocrypt-NG/releases/tag/2.17 --- pkgs/by-name/pi/picocrypt-ng/package.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pi/picocrypt-ng/package.nix b/pkgs/by-name/pi/picocrypt-ng/package.nix index 4ef584d36a41..15476f24b768 100644 --- a/pkgs/by-name/pi/picocrypt-ng/package.nix +++ b/pkgs/by-name/pi/picocrypt-ng/package.nix @@ -16,18 +16,19 @@ buildGoModule (finalAttrs: { pname = "picocrypt-ng"; - version = "2.10"; + version = "2.17"; src = fetchFromGitHub { owner = "Picocrypt-NG"; repo = "Picocrypt-NG"; - tag = finalAttrs.version; - hash = "sha256-Rp7BgtJnV3fPed/QlWSxH8nL7cCTgMDpRGcgX5VI2l0="; + # Rewritten git history many times + rev = "424db6105588e9fe6b929b6731ace4556a12f172"; + hash = "sha256-Bj0LK6si1ocGriRJf5GHZ/Z2xVhtyCIiv7H5+h8Dong="; }; sourceRoot = "${finalAttrs.src.name}/src"; - vendorHash = "sha256-yAM1jzebUlNkVWiY8lPtlelfqpFQonNcAqNmmghCdPU="; + vendorHash = "sha256-KaTatNjSUnQC44UsV3LFOlkad8WqLfTPFFff8Dn13DA="; ldflags = [ "-s" @@ -51,7 +52,14 @@ buildGoModule (finalAttrs: { ]; # git ls-files doesn't work as source is not a git repo - checkFlags = [ "-skip=^TestOldVersionLiteralsAreAllowlisted$" ]; + checkFlags = + let + skippedTests = [ + "TestOldVersionLiteralsAreAllowlisted" + "TestLinuxAppIdentityContract" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; env.CGO_ENABLED = 1; From 54bbbce998d12ff07044f91ce2f93dd0186db1f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jun 2026 01:03:03 +0000 Subject: [PATCH 18/29] lockbook-desktop: 26.6.1 -> 26.6.16 --- 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 b5ef5e0631f5..3425e2bbdfc1 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.6.1"; + version = "26.6.16"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = finalAttrs.version; - hash = "sha256-+r5WsaqQr6NlQNWDTQf/tvCh6P5LpFFyyLMTIZw9yis="; + hash = "sha256-HtmuFN7iNNwuQ0CXzqnEJN4PNh0D7weHniegtF4EuqQ="; }; - cargoHash = "sha256-ybAcG7sCEwZC6FxWx2KhHd1HkhK8wwkGeeLoI/KOXKU="; + cargoHash = "sha256-PUfXwtxuaheoyZA2fAyoc9CyD/oBAjkUsVrP6U7qvA0="; nativeBuildInputs = [ pkg-config From 2145ffc5a3d997f2a3e9aee2533a572b3d2b363b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jun 2026 01:04:52 +0000 Subject: [PATCH 19/29] inputplumber: 0.77.5 -> 0.77.7 --- pkgs/by-name/in/inputplumber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index 939f8f9b1c1c..c3a792134167 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inputplumber"; - version = "0.77.5"; + version = "0.77.7"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-L6Ebyh4K4l+7LlVlgDRym9o+XsQPExC7xH1EBPwyLB4="; + hash = "sha256-LECHrL+yopymcdpuEZUFvNX1QI30Z+mOtMYP7fnMpBM="; }; - cargoHash = "sha256-avwKy2AvgzT2IfRw/aMwllaYa4RLx7DJPxrgjHwBY1I="; + cargoHash = "sha256-1g4nHBu9LUMMr0bPkD4LCEFyyIc+GdhIWu+hlyGH3IM="; nativeBuildInputs = [ pkg-config From 0b7edd85923ed648bf639ed1a75c041d3c3c0307 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jun 2026 01:19:58 +0000 Subject: [PATCH 20/29] emacsPackages.ebuild-mode: 1.83 -> 1.84 --- .../elisp-packages/manual-packages/ebuild-mode/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index 83f2b5da36df..c9b05825c7df 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -6,11 +6,11 @@ melpaBuild (finalAttrs: { pname = "ebuild-mode"; - version = "1.83"; + version = "1.84"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${finalAttrs.version}.tar.bz2"; - hash = "sha256-xZA3Vkh8frgXzyGZs5UELdBh0vrcsXJN/2aJX56QH0Y="; + hash = "sha256-+WbKgOR0eCIvBgQrXzVOk8k2mV7INObY59vc46KvMYo="; }; meta = { From 23a691c0191cdc2eba46a30b6ea8380af8ae064b Mon Sep 17 00:00:00 2001 From: VZstless Date: Tue, 23 Jun 2026 10:11:06 +0800 Subject: [PATCH 21/29] snmalloc: 0.7.4 -> 0.7.5 --- pkgs/by-name/sn/snmalloc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snmalloc/package.nix b/pkgs/by-name/sn/snmalloc/package.nix index aaf7544b655b..1fc41faf3585 100644 --- a/pkgs/by-name/sn/snmalloc/package.nix +++ b/pkgs/by-name/sn/snmalloc/package.nix @@ -9,12 +9,12 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "snmalloc"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "microsoft"; repo = "snmalloc"; tag = finalAttrs.version; - hash = "sha256-+UCqUrfvhnB4leiYCnGJ8ORfVkTaGimaErP56XCJ5PM="; + hash = "sha256-1wgQilYHYjmKqhUhxA0wXF+OBPRH+hDPgVGMgVxqj4Y="; }; outputs = [ From a3bf35b96341126ae683cbf57ef49c4eaef44f49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jun 2026 03:29:53 +0000 Subject: [PATCH 22/29] itgmaniaPackages.itg2-sm5: 1.1.0-unstable-2025-10-08 -> 1.1.0-unstable-2026-05-07 --- pkgs/by-name/it/itgmania/themes/itg2-sm5.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/it/itgmania/themes/itg2-sm5.nix b/pkgs/by-name/it/itgmania/themes/itg2-sm5.nix index 5234bfea09e5..bd7b8474c67e 100644 --- a/pkgs/by-name/it/itgmania/themes/itg2-sm5.nix +++ b/pkgs/by-name/it/itgmania/themes/itg2-sm5.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "itg2-sm5"; - version = "1.1.0-unstable-2025-10-08"; + version = "1.1.0-unstable-2026-05-07"; src = fetchFromGitHub { owner = "JoseVarelaP"; repo = "In-The-Groove2-SM5"; - rev = "e25f1a44efa55cd2247891f40633403910b75d21"; - hash = "sha256-FMyT7ZA/1cqiClXDvD7CmJlOFaaWnPLuOuei6fsbzg8="; + rev = "07a71151b7170080902c3bf8118950ee4f410c01"; + hash = "sha256-SpYR6U/ujQ7toHIgCp+ogF1LdnH41ikshEdEjhMxlj4="; }; postInstall = '' From 33f4ce1047b925e488f7d31efa861968112d423f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jun 2026 03:30:13 +0000 Subject: [PATCH 23/29] itgmaniaPackages.itg3encore: 0-unstable-2026-06-13 -> 0-unstable-2026-06-22 --- pkgs/by-name/it/itgmania/themes/itg3encore.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/it/itgmania/themes/itg3encore.nix b/pkgs/by-name/it/itgmania/themes/itg3encore.nix index 82d2e06b68b4..ae675009a8f9 100644 --- a/pkgs/by-name/it/itgmania/themes/itg3encore.nix +++ b/pkgs/by-name/it/itgmania/themes/itg3encore.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "itg3encore"; - version = "0-unstable-2026-06-13"; + version = "0-unstable-2026-06-22"; src = fetchFromGitHub { owner = "DarkBahamut162"; repo = "itg3encore"; - rev = "409dc62c7c7a6c3ce3a713e84c81d95995eb20a6"; - hash = "sha256-sJLkHRngmA9dPZoQPpUdOAz1nLCHTTOPG4i/SP6rl9A="; + rev = "c669a04ce6487a32263a2f617efa26bfd5eaf764"; + hash = "sha256-CbqIzHcHmxICoi23z032Ti8AZyB5Ur/SPsolr1VjBhY="; }; postInstall = '' From 8522e068e40927f528c622f5c42ca689af2f5ffa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jun 2026 03:30:46 +0000 Subject: [PATCH 24/29] itgmaniaPackages.digital-dance: 1.1.3-unstable-2026-06-12 -> 1.1.3-unstable-2026-06-22 --- pkgs/by-name/it/itgmania/themes/digital-dance.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/it/itgmania/themes/digital-dance.nix b/pkgs/by-name/it/itgmania/themes/digital-dance.nix index e5ce1af962b3..7a502dc9f249 100644 --- a/pkgs/by-name/it/itgmania/themes/digital-dance.nix +++ b/pkgs/by-name/it/itgmania/themes/digital-dance.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "digital-dance"; - version = "1.1.3-unstable-2026-06-12"; + version = "1.1.3-unstable-2026-06-22"; src = fetchFromCodeberg { owner = "JNero"; repo = "Digital-Dance-ITGMania"; - rev = "d4456108422cb36e12dcc1bc227acc66b85d0395"; - hash = "sha256-2bcI9Lh5xNfqtRbYxsmi+8LJMyQ6hUOw2OLuGQFBftE="; + rev = "14d3d31a4f79f1557e3515de41a7907130d7b163"; + hash = "sha256-e/lOhwI+Q4sMn0EL5sPMhCaxoN6eOLVLBs7bMOPJUxY="; }; postInstall = '' From a4f72b0445ba7ab6e75bb22c8993fdf5f0366ec6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jun 2026 03:50:04 +0000 Subject: [PATCH 25/29] amnezia-vpn-bin: 4.8.18.0 -> 4.8.19.0 --- pkgs/by-name/am/amnezia-vpn-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/am/amnezia-vpn-bin/package.nix b/pkgs/by-name/am/amnezia-vpn-bin/package.nix index c063b5f8f0b4..7bece2028abe 100644 --- a/pkgs/by-name/am/amnezia-vpn-bin/package.nix +++ b/pkgs/by-name/am/amnezia-vpn-bin/package.nix @@ -29,13 +29,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn-bin"; - version = "4.8.18.0"; + version = "4.8.19.0"; __structuredAttrs = true; src = fetchzip { url = "https://github.com/amnezia-vpn/amnezia-client/releases/download/${finalAttrs.version}/AmneziaVPN_${finalAttrs.version}_linux_x64.tar"; - hash = "sha256-Mypzq/Lm+JI0HljRJ6/0ZDFlwOeVbZB+Lmuy33xE06M="; + hash = "sha256-2bCP5yeaH0yQcjgwnrCgSnF1vafhrf+AlGyVPPgbK0k="; }; strictDeps = true; From 5dc0e53f80c2314d110dec2fb3471d1776c3f348 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Tue, 23 Jun 2026 05:57:22 +0200 Subject: [PATCH 26/29] kanidm_1_10: 1.10.3 -> 1.10.4 Changelog: https://github.com/kanidm/kanidm/releases/tag/v1.10.4 --- pkgs/servers/kanidm/1_10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/kanidm/1_10.nix b/pkgs/servers/kanidm/1_10.nix index 0997a43c815e..079ef35443be 100644 --- a/pkgs/servers/kanidm/1_10.nix +++ b/pkgs/servers/kanidm/1_10.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "1.10.3"; - hash = "sha256-xf8/fHMkGGApPpKoOgpUJtttorOjf51E/S5KKguwiTM="; - cargoHash = "sha256-zu2uKtJnMi8En5btKQWgACs3mLkHnbrxA5XUkwLP+yc="; + version = "1.10.4"; + hash = "sha256-+PutvVt7mqnZN+/vr0FwstB8JPuO3kJ4TSmX2Sx8WvA="; + cargoHash = "sha256-rfANfheiQnHEcbBODRW0nrPrlPdWQx3S7NmSQ50q010="; } From 04bc8cb90472d0a750381e819d37677ea778dc78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jun 2026 04:16:49 +0000 Subject: [PATCH 27/29] aws-vault: 7.11.1 -> 7.12.3 --- 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 c368c38e6a43..fab9d8b93d42 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.11.1"; + version = "7.12.3"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${finalAttrs.version}"; - hash = "sha256-GsE8UtER5KDIlVA36uFVoKPsX2pJNwotKtaizZH33t0="; + hash = "sha256-wuQx++t2660Z8Vu63nCgxemMi3h5QwTQNLMSoQsSYP0="; }; proxyVendor = true; - vendorHash = "sha256-spGYYxSeAfbOy+ze854IBBxxv07jnmE9rNGGqenkkCw="; + vendorHash = "sha256-pqD3j1I0zENctgM2lBaYiU3DRCqeq9XIX3jWB2p139I="; nativeBuildInputs = [ installShellFiles From 587e146b57791963df056d99273b6c94899d8f16 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 22 Jun 2026 19:56:24 +0530 Subject: [PATCH 28/29] viddy: add versionCheckHook - fix update date by re-running updateScript - tag -> rev - fix changelog url - add __structuredAttrs Signed-off-by: phanirithvij --- pkgs/by-name/vi/viddy/package.nix | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix index def486b62e13..b27c75d4a0fe 100644 --- a/pkgs/by-name/vi/viddy/package.nix +++ b/pkgs/by-name/vi/viddy/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -11,26 +12,39 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "sachaos"; repo = "viddy"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RyPG8OAg3i9N2Fq5Hij48wMvfQuTNmJFpatvB3HbXKg="; }; cargoHash = "sha256-P+TtxV2kuHeBHr8GQeJ0VWPkjimfcAtBUFt0z79ML6A="; - env.VERGEN_BUILD_DATE = "2024-11-28"; # managed via the update script - env.VERGEN_GIT_DESCRIBE = "Nixpkgs"; + __structuredAttrs = true; - passthru.updateScript.command = [ ./update.sh ]; + env = { + VERGEN_BUILD_DATE = "2026-06-14"; # managed via the update script + VERGEN_GIT_DESCRIBE = "Nixpkgs"; + }; + + doInstallCheck = true; + versionCheckProgramArg = "-V"; + versionCheckKeepEnvironment = [ "VIDDY_DATA" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + + preInstallCheck = '' + export VIDDY_DATA="$PWD"; + ''; + + passthru.updateScript = ./update.sh; meta = { + changelog = "https://github.com/sachaos/viddy/releases/tag/${finalAttrs.src.rev}"; description = "Modern `watch` command"; - changelog = "https://github.com/sachaos/viddy/releases"; homepage = "https://github.com/sachaos/viddy"; license = lib.licenses.mit; + mainProgram = "viddy"; maintainers = with lib.maintainers; [ j-hui phanirithvij ]; - mainProgram = "viddy"; }; }) From f9e34611c6ae8a53da5475953d51ad95dd4576b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jun 2026 05:26:39 +0000 Subject: [PATCH 29/29] statix: 0.5.8-unstable-2026-06-13 -> 0.5.8-unstable-2026-06-22 --- pkgs/by-name/st/statix/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix index 3c6ed8dbb302..e5e62037af51 100644 --- a/pkgs/by-name/st/statix/package.nix +++ b/pkgs/by-name/st/statix/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "statix"; - version = "0.5.8-unstable-2026-06-13"; + version = "0.5.8-unstable-2026-06-22"; src = fetchFromGitHub { owner = "molybdenumsoftware"; repo = "statix"; - rev = "127a42f761909e5caa79f616a353e9b6e1a0587f"; - hash = "sha256-epwk3oW5A0ttTKSO2zgC50PkD9mTFjLtDlofTIeOdf8="; + rev = "5d23643fcb0aea7372f7b598b3edb3e2bd8adf83"; + hash = "sha256-woMMDcjiFgcbRt3Ywb5cOPv2P8S4+NqC6W6i8q1j4rU="; }; - cargoHash = "sha256-bsy8p8zbfQ7EjXCDwFbVaq4qN8aEsp27Jcn9zfW2eXw="; + cargoHash = "sha256-p3A88MMt3GkcC1shCNC8DmiXQCMXrWd+hA36D7VRZOE="; buildFeatures = lib.optional withJson "json";