From 194ca807f40bc8b34ab3ea4867590b498d495fb5 Mon Sep 17 00:00:00 2001 From: mefengl <71683364+mefengl@users.noreply.github.com> Date: Sun, 11 Jan 2026 19:52:29 +0800 Subject: [PATCH 01/46] kamal: 2.8.2 -> 2.10.1 --- pkgs/by-name/ka/kamal/Gemfile.lock | 36 ++++++++-------- pkgs/by-name/ka/kamal/gemset.nix | 67 +++++++++++++++++------------- 2 files changed, 58 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/ka/kamal/Gemfile.lock b/pkgs/by-name/ka/kamal/Gemfile.lock index 2978804b7ad0..e02dd12e0d51 100644 --- a/pkgs/by-name/ka/kamal/Gemfile.lock +++ b/pkgs/by-name/ka/kamal/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (8.1.1) + activesupport (8.1.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -15,19 +15,19 @@ GEM tzinfo (~> 2.0, >= 2.0.5) uri (>= 0.13.1) base64 (0.3.0) - bcrypt_pbkdf (1.1.1) - bcrypt_pbkdf (1.1.1-arm64-darwin) - bcrypt_pbkdf (1.1.1-x86_64-darwin) - bigdecimal (3.3.1) - concurrent-ruby (1.3.5) - connection_pool (2.5.4) - dotenv (3.1.8) + bcrypt_pbkdf (1.1.2) + bcrypt_pbkdf (1.1.2-arm64-darwin) + bcrypt_pbkdf (1.1.2-x86_64-darwin) + bigdecimal (4.0.1) + concurrent-ruby (1.3.6) + connection_pool (3.0.2) + dotenv (3.2.0) drb (2.2.3) ed25519 (1.4.0) - i18n (1.14.7) + i18n (1.14.8) concurrent-ruby (~> 1.0) - json (2.15.2) - kamal (2.8.2) + json (2.18.0) + kamal (2.10.1) activesupport (>= 7.0) base64 (~> 0.2) bcrypt_pbkdf (~> 1.0) @@ -39,26 +39,28 @@ GEM thor (~> 1.3) zeitwerk (>= 2.6.18, < 3.0) logger (1.7.0) - minitest (5.26.0) + minitest (6.0.1) + prism (~> 1.5) net-scp (4.1.0) net-ssh (>= 2.6.5, < 8.0.0) net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) net-ssh (7.3.0) ostruct (0.6.3) + prism (1.7.0) securerandom (0.4.1) - sshkit (1.24.0) + sshkit (1.25.0) base64 logger net-scp (>= 1.1.2) net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) ostruct - thor (1.4.0) + thor (1.5.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uri (1.1.0) - zeitwerk (2.7.3) + uri (1.1.1) + zeitwerk (2.7.4) PLATFORMS arm64-darwin @@ -69,4 +71,4 @@ DEPENDENCIES kamal BUNDLED WITH - 2.6.9 + 2.7.2 diff --git a/pkgs/by-name/ka/kamal/gemset.nix b/pkgs/by-name/ka/kamal/gemset.nix index 0e8be28100ba..c45208ba7ece 100644 --- a/pkgs/by-name/ka/kamal/gemset.nix +++ b/pkgs/by-name/ka/kamal/gemset.nix @@ -18,10 +18,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rzadiafj8llldqry9jjnzbw2rgavdlrqy0nddg8p2qcim7574jy"; + sha256 = "1bpxnr83z1x78h3jxvmga7vrmzmc8b4fic49h9jhzm6hriw2b148"; type = "gem"; }; - version = "8.1.1"; + version = "8.1.2"; }; base64 = { groups = [ "default" ]; @@ -38,50 +38,50 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04rb3rp9bdxn1y3qiflfpj7ccwb8ghrfbydh5vfz1l9px3fpg41g"; + sha256 = "1xjcp484qc4j4z42b087npgj50sd6yixchznp4z9p1k6rqilqhf2"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; bigdecimal = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a"; + sha256 = "19y406nx17arzsbc515mjmr6k5p59afprspa1k423yd9cp8d61wb"; type = "gem"; }; - version = "3.3.1"; + version = "4.0.1"; }; concurrent-ruby = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; + sha256 = "1aymcakhzl83k77g2f2krz07bg1cbafbcd2ghvwr4lky3rz86mkb"; type = "gem"; }; - version = "1.3.5"; + version = "1.3.6"; }; connection_pool = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02p7l47gvchbvnbag6kb4x2hg8n28r25ybslyvrr2q214wir5qg9"; + sha256 = "02ifws3c4x7b54fv17sm4cca18d2pfw1saxpdji2lbd1f6xgbzrk"; type = "gem"; }; - version = "2.5.4"; + version = "3.0.2"; }; dotenv = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hwjsddv666wpp42bip3fqx7c5qq6s8lwf74dj71yn7d1h37c4cy"; + sha256 = "17b1zr9kih0i3wb7h4yq9i8vi6hjfq07857j437a8z7a44qvhxg3"; type = "gem"; }; - version = "3.1.8"; + version = "3.2.0"; }; drb = { groups = [ "default" ]; @@ -109,20 +109,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf"; + sha256 = "1994i044vdmzzkyr76g8rpl1fq1532wf0sb21xg5r1ilj5iphmr8"; type = "gem"; }; - version = "1.14.7"; + version = "1.14.8"; }; json = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09zss44bw5sx8c619qy1ci611r1h5nfd1biyjnpxrl6jcvcy2s0h"; + sha256 = "01fmiz052cvnxgdnhb3qwcy88xbv7l3liz0fkvs5qgqqwjp0c1di"; type = "gem"; }; - version = "2.15.2"; + version = "2.18.0"; }; kamal = { dependencies = [ @@ -141,10 +141,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1j22m04xhrpbqlqaf658x401b3qj96ml7ai719xypj45pskdg4si"; + sha256 = "0h335ginqk2q1pbm59aq6ackby2rq38sqypwxld3pn1xqfsfrdsk"; type = "gem"; }; - version = "2.8.2"; + version = "2.10.1"; }; logger = { groups = [ "default" ]; @@ -157,14 +157,15 @@ version = "1.7.0"; }; minitest = { + dependencies = [ "prism" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0c1c9lr7h0bnf48xj5sylg2cs2awrb0hfxwimiz4yfl6kz87m0gm"; + sha256 = "1fslin1vyh60snwygx8jnaj4kwhk83f3m0v2j2b7bsg2917wfm3q"; type = "gem"; }; - version = "5.26.0"; + version = "6.0.1"; }; net-scp = { dependencies = [ "net-ssh" ]; @@ -208,6 +209,16 @@ }; version = "0.6.3"; }; + prism = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00silqnlzzm97gn21lm39q95hjn058waqky44j25r67p9drjy1hh"; + type = "gem"; + }; + version = "1.7.0"; + }; securerandom = { groups = [ "default" ]; platforms = [ ]; @@ -231,20 +242,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v4fc9yaqljwax370438p3ps59jpimvkkj1d5xsfk2kphkww35wm"; + sha256 = "0i37z4gk3r1752bv1sj4rdja1dhivn2xa1kk4wfizyb0vcy59in8"; type = "gem"; }; - version = "1.24.0"; + version = "1.25.0"; }; thor = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7"; + sha256 = "0wsy88vg2mazl039392hqrcwvs5nb9kq8jhhrrclir2px1gybag3"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; tzinfo = { dependencies = [ "concurrent-ruby" ]; @@ -262,19 +273,19 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09g6p7r8kl6ybhgm7xnpq1kcirw8z0bza5ihrjify979q5hj0fp2"; + sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; zeitwerk = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j"; + sha256 = "12zcvhzfnlghzw03czy2ifdlyfpq0kcbqcmxqakfkbxxavrr1vrb"; type = "gem"; }; - version = "2.7.3"; + version = "2.7.4"; }; } From 2177c0bc4123de1d109f8ea47a08dc86d0cc52e9 Mon Sep 17 00:00:00 2001 From: rczb Date: Thu, 15 Jan 2026 02:13:43 +0800 Subject: [PATCH 02/46] shen-sbcl: 39.2 -> 40 --- pkgs/by-name/sh/shen-sbcl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shen-sbcl/package.nix b/pkgs/by-name/sh/shen-sbcl/package.nix index 4c472eec7239..a8d61806c64d 100644 --- a/pkgs/by-name/sh/shen-sbcl/package.nix +++ b/pkgs/by-name/sh/shen-sbcl/package.nix @@ -7,11 +7,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "shen-sbcl"; - version = "39.2"; + version = "40"; src = fetchzip { url = "https://www.shenlanguage.org/Download/S${finalAttrs.version}.zip"; - hash = "sha256-V6op0G4aEdKifP6L0ho6cy1FPNax+0aE5ltWxT7Xniw="; + hash = "sha256-Ldz4NV+1Hf7FCDis+oeDt8mNuMe37jpaBMJlQ1XQaa0="; }; nativeBuildInputs = [ sbcl ]; @@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # remove interactive prompt during image creation substituteInPlace install.lsp \ - --replace-fail '(Y-OR-N-P "Load Shen Library? ")' '${ + --replace-fail '(Y-OR-N-P "Load Shen Standard Library? ")' '${ if installStandardLibrary then "T" else "NIL" }' ''; From 4bad8a38a4d029f09ee794d573446f610f7d27c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Jan 2026 01:25:55 +0000 Subject: [PATCH 03/46] python3Packages.apprise: 1.9.6 -> 1.9.7 --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 2560782f20fb..ba148c750a0f 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.9.6"; + version = "1.9.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Qga+nLVpSj0I3Y4Dk7u5s2ISrDp3acJjNiAFXnXGyu8="; + hash = "sha256-L3PMHgJk+xGf25t83oLo/eQKD1MayIXYxvDPD24TrsI="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' From 95110ed26d3298e9a4e03d0c2db4988a4aad5f38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Jan 2026 04:27:38 +0000 Subject: [PATCH 04/46] zapret: 72.8 -> 72.9 --- pkgs/by-name/za/zapret/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index 81fb3085425a..c9a1d137c738 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zapret"; - version = "72.8"; + version = "72.9"; src = fetchFromGitHub { owner = "bol-van"; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ''; tag = "v${finalAttrs.version}"; - hash = "sha256-W0rDCSdlBvcgXf/plYkJPORmZ+7t0qmQr4+Y17WLUp8="; + hash = "sha256-w2HpEoEAhdk1tOS8IM3K56FqpMW2VgqB+iwISCNB7n4="; }; buildInputs = [ From 82c63141ecab8b078a2ba0472357f396365ba78b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Jan 2026 10:28:11 +0100 Subject: [PATCH 05/46] python313Packages.apprise: migrate to finalAttrs --- pkgs/development/python-modules/apprise/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index ba148c750a0f..ff355afdcf64 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -21,13 +21,13 @@ testers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "apprise"; version = "1.9.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-L3PMHgJk+xGf25t83oLo/eQKD1MayIXYxvDPD24TrsI="; }; @@ -68,16 +68,16 @@ buildPythonPackage rec { passthru = { tests.version = testers.testVersion { package = apprise; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; }; meta = { description = "Push Notifications that work with just about every platform"; homepage = "https://github.com/caronc/apprise"; - changelog = "https://github.com/caronc/apprise/releases/tag/v${version}"; + changelog = "https://github.com/caronc/apprise/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "apprise"; }; -} +}) From 37c9e0a13d0a889db8a2810891d8b7d8861cb19f 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: Wed, 21 Jan 2026 19:40:32 +0700 Subject: [PATCH 06/46] =?UTF-8?q?ejabberd:=2025.10=20=E2=86=92=2026.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ej/ejabberd/package.nix | 4 ++-- pkgs/by-name/ej/ejabberd/rebar-deps.nix | 30 ++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index 7114fe139570..92c2732e6864 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -140,7 +140,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ejabberd"; - version = "25.10"; + version = "26.01"; nativeBuildInputs = [ makeWrapper @@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "processone"; repo = "ejabberd"; tag = finalAttrs.version; - hash = "sha256-dTu3feSOakSHdk+hMDvYQwog64O3e/z5NOsGM3Rq7WY="; + hash = "sha256-xhqH1hELosYC7dtHnyrlkCRlbgbM2SU7SLkowGVG9SI="; }; passthru.tests = { diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix index cc082f0cc89d..3d16f909dff9 100644 --- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix +++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix @@ -54,11 +54,11 @@ let }; xmpp = builder { name = "xmpp"; - version = "1.11.2"; + version = "1.12.0"; src = fetchHex { pkg = "xmpp"; - version = "1.11.2"; - sha256 = "sha256-u2gWROFePvwACKs6cXlE1nz2EaS340Q4KqY2dEe9UtI="; + version = "1.12.0"; + sha256 = "sha256-AUuuc2WfuiVncesAe8U0hhiscn3R0QuasVqf74cWIsg="; }; beamDeps = [ ezlib @@ -124,11 +124,11 @@ let }; p1_pgsql = builder { name = "p1_pgsql"; - version = "1.1.36"; + version = "1.1.38"; src = fetchHex { pkg = "p1_pgsql"; - version = "1.1.36"; - sha256 = "sha256-gryouJXIT0YA641gmjLLX91yp/W9k437KReeCMZD/Qk="; + version = "1.1.38"; + sha256 = ""; }; beamDeps = [ xmpp ]; }; @@ -144,21 +144,21 @@ let }; p1_mysql = builder { name = "p1_mysql"; - version = "1.0.26"; + version = "1.0.27"; src = fetchHex { pkg = "p1_mysql"; - version = "1.0.26"; - sha256 = "sha256-6hOAg/LFRxm5z1Sdv1gCooiwAZ6j5USbNUx0zAP6/ew="; + version = "1.0.27"; + sha256 = ""; }; beamDeps = [ ]; }; p1_acme = builder { name = "p1_acme"; - version = "1.0.29"; + version = "1.0.30"; src = fetchHex { pkg = "p1_acme"; - version = "1.0.29"; - sha256 = "sha256-CP049/vi3CiiN6obOLMGtzRVaVzIiBo93WoRt8Ufe8c="; + version = "1.0.30"; + sha256 = "sha256-KTXiCRa4BtOxFmlTpNkKaQ/YB4EJYUD+XKH2XVnr1oo="; }; beamDeps = [ base64url @@ -190,11 +190,11 @@ let }; jose = builder { name = "jose"; - version = "1.11.10"; + version = "1.11.12"; src = fetchHex { pkg = "jose"; - version = "1.11.10"; - sha256 = "sha256-DWzTb/i6F02ykUj8EStYQhhraKkM6fwrPsOv52WT5hQ="; + version = "1.11.12"; + sha256 = "sha256-MekrZT6SELaWdlzdiFQ3RX3hrdKpAR2S+M9j5GQbq3s="; }; beamDeps = [ ]; }; From 28299ca836c1d99b8259d83799bac08623e6e728 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 19 Jan 2026 14:55:51 +0100 Subject: [PATCH 07/46] alsa-lib-with-plugins: set pname and version --- pkgs/by-name/al/alsa-lib-with-plugins/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/al/alsa-lib-with-plugins/package.nix b/pkgs/by-name/al/alsa-lib-with-plugins/package.nix index 0eb4a9ca72e5..f61331f5b56c 100644 --- a/pkgs/by-name/al/alsa-lib-with-plugins/package.nix +++ b/pkgs/by-name/al/alsa-lib-with-plugins/package.nix @@ -15,6 +15,7 @@ let in runCommand "${alsa-lib.pname}-${alsa-lib.version}" { + inherit (alsa-lib) pname version; meta = { description = "Wrapper to ease access to ALSA plugins"; mainProgram = "aserver"; From 62f38a80e02dc7cf4a797785f8481b390863a944 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 02:51:41 +0100 Subject: [PATCH 08/46] gnuk: move to pkgs/by-name this shouldn't create any rebuilds --- .../{misc/gnuk/default.nix => by-name/gn/gnuk/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 3 insertions(+), 9 deletions(-) rename pkgs/{misc/gnuk/default.nix => by-name/gn/gnuk/package.nix} (94%) diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/by-name/gn/gnuk/package.nix similarity index 94% rename from pkgs/misc/gnuk/default.nix rename to pkgs/by-name/gn/gnuk/package.nix index 98eb9c12aef0..a21d33925323 100644 --- a/pkgs/misc/gnuk/default.nix +++ b/pkgs/by-name/gn/gnuk/package.nix @@ -2,8 +2,7 @@ lib, stdenv, fetchFromGitLab, - gcc-arm-embedded, - binutils-arm-embedded, + pkgsCross, makeWrapper, python3Packages, @@ -26,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - gcc-arm-embedded - binutils-arm-embedded + pkgsCross.arm-embedded.buildPackages.gcc + pkgsCross.arm-embedded.buildPackages.binutils makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40a578061d6f..261898b19782 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13108,11 +13108,6 @@ with pkgs; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; - gnuk = callPackage ../misc/gnuk { - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; - }; - helmfile-wrapped = helmfile.override { inherit (kubernetes-helm-wrapped.passthru) pluginsDir; }; From db8501edda65d0d5eb95301f379bae7aeefd5407 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 07:10:26 +0100 Subject: [PATCH 09/46] arx-libertatis: move to pkgs/by-name this shouldn't create any rebuilds --- .../default.nix => by-name/ar/arx-libertatis/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{games/arx-libertatis/default.nix => by-name/ar/arx-libertatis/package.nix} (94%) diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/by-name/ar/arx-libertatis/package.nix similarity index 94% rename from pkgs/games/arx-libertatis/default.nix rename to pkgs/by-name/ar/arx-libertatis/package.nix index 49a961d0c10a..4a31ab757b97 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/by-name/ar/arx-libertatis/package.nix @@ -16,8 +16,7 @@ optipng, imagemagick, withCrashReporter ? !stdenv.hostPlatform.isDarwin, - qtbase ? null, - wrapQtAppsHook ? null, + qt5, curl ? null, gdb ? null, }: @@ -49,7 +48,7 @@ stdenv.mkDerivation rec { imagemagick optipng ] - ++ optionals withCrashReporter [ wrapQtAppsHook ]; + ++ optionals withCrashReporter [ qt5.wrapQtAppsHook ]; buildInputs = [ zlib @@ -62,7 +61,7 @@ stdenv.mkDerivation rec { libepoxy ] ++ optionals withCrashReporter [ - qtbase + qt5.qtbase curl ] ++ optionals stdenv.hostPlatform.isLinux [ gdb ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 261898b19782..aa3dd3e4e2eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12179,8 +12179,6 @@ with pkgs; anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { }; ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { }); - arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; - beancount-ing-diba = callPackage ../applications/office/beancount/beancount-ing-diba.nix { inherit (python3Packages) beancount beangulp; }; From c85197c3438ab43848cc1c29fa26c62e2dbaf7c0 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 07:16:29 +0100 Subject: [PATCH 10/46] cockatrice: move to pkgs/by-name this shouldn't create any rebuilds --- .../co/cockatrice/package.nix} | 33 +++++++++---------- pkgs/top-level/all-packages.nix | 4 --- 2 files changed, 15 insertions(+), 22 deletions(-) rename pkgs/{games/cockatrice/default.nix => by-name/co/cockatrice/package.nix} (76%) diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/by-name/co/cockatrice/package.nix similarity index 76% rename from pkgs/games/cockatrice/default.nix rename to pkgs/by-name/co/cockatrice/package.nix index be79a61b87a2..e070035d344c 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/by-name/co/cockatrice/package.nix @@ -1,17 +1,14 @@ { lib, + qt5, fetchFromGitHub, - mkDerivation, cmake, - protobuf, - qtbase, - qtmultimedia, - qttools, - qtwebsockets, - wrapQtAppsHook, + protobuf_21, }: - -mkDerivation rec { +let + protobuf = protobuf_21; +in +qt5.mkDerivation rec { pname = "cockatrice"; version = "2025-04-03-Release-2.10.2"; @@ -22,17 +19,17 @@ mkDerivation rec { sha256 = "sha256-zXAK830SdGT3xN3ST8h9LLy/oWr4MH6TZf57gLfI0e8="; }; - buildInputs = [ - qtbase - qtmultimedia - protobuf - qttools - qtwebsockets - ]; - nativeBuildInputs = [ cmake - wrapQtAppsHook + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + qt5.qtbase + qt5.qtmultimedia + protobuf + qt5.qttools + qt5.qtwebsockets ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa3dd3e4e2eb..f7016f677632 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12193,10 +12193,6 @@ with pkgs; cataclysm-dda-git = cataclysmDDA.git.tiles; - cockatrice = libsForQt5.callPackage ../games/cockatrice { - protobuf = protobuf_21; - }; - construoBase = lowPrio ( callPackage ../games/construo { libGL = null; From 15ebb1a8d3a8723f135db048e4293b7ac7bd58ad Mon Sep 17 00:00:00 2001 From: Jason Odoom Date: Thu, 22 Jan 2026 01:19:20 -0500 Subject: [PATCH 11/46] raylib: 5.5 -> 5.5-unstable-2026-01-20 --- pkgs/by-name/ra/raylib/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix index 8f9b58282c63..93f993759b22 100644 --- a/pkgs/by-name/ra/raylib/package.nix +++ b/pkgs/by-name/ra/raylib/package.nix @@ -36,13 +36,13 @@ lib.checkListOfEnum "raylib: platform" __structuredAttrs = true; pname = "raylib"; - version = "5.5"; + version = "5.5-unstable-2026-01-20"; src = fetchFromGitHub { owner = "raysan5"; repo = "raylib"; - rev = finalAttrs.version; - hash = "sha256-J99i4z4JF7d6mJNuJIB0rHNDhXJ5AEkG0eBvvuBLHrY="; + rev = "c610d228a244f930ad53492604640f39584c66da"; + hash = "sha256-7Lhgqb7QJwz94M1ZxWgueTwIgSVclGCvHklZXGzoJgQ="; }; # autoPatchelfHook is needed for appendRunpaths @@ -83,7 +83,7 @@ lib.checkListOfEnum "raylib: platform" maintainers = [ lib.maintainers.diniamo ]; teams = [ lib.teams.ngi ]; platforms = lib.platforms.all; - changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG"; + changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.src.rev}/CHANGELOG"; }; }) ) From c87036564c25125780e2c59e31822ee44dca1474 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 19 Jan 2026 14:55:51 +0100 Subject: [PATCH 12/46] calamares-nixos: set pname --- pkgs/by-name/ca/calamares-nixos/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/calamares-nixos/package.nix b/pkgs/by-name/ca/calamares-nixos/package.nix index fdf2363a7807..bde11446a0e0 100644 --- a/pkgs/by-name/ca/calamares-nixos/package.nix +++ b/pkgs/by-name/ca/calamares-nixos/package.nix @@ -7,7 +7,7 @@ }: runCommand "calamares-wrapped" { - inherit (calamares) version meta; + inherit (calamares) pname version meta; nativeBuildInputs = [ makeWrapper ]; } From 509fcdb1a757aa25f4debc89e61a15bba62c7a45 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 19 Jan 2026 14:55:51 +0100 Subject: [PATCH 13/46] source-sans-pro: use pname instead of name --- pkgs/by-name/so/source-sans-pro/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/so/source-sans-pro/package.nix b/pkgs/by-name/so/source-sans-pro/package.nix index c5c930ef598d..fe0020d3b2dd 100644 --- a/pkgs/by-name/so/source-sans-pro/package.nix +++ b/pkgs/by-name/so/source-sans-pro/package.nix @@ -10,7 +10,7 @@ # with older documents/templates/etc. stdenvNoCC.mkDerivation rec { - name = "source-sans-pro-${version}"; + pname = "source-sans-pro"; version = "3.006"; src = fetchzip { From 95d074ab6da6b5a4714e301aaf51858a1f12d3f6 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 19 Jan 2026 14:55:51 +0100 Subject: [PATCH 14/46] libcsa: use pname instead of name --- pkgs/by-name/li/libcsa/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libcsa/package.nix b/pkgs/by-name/li/libcsa/package.nix index a63ca0f55ea0..4b4dfb8635b8 100644 --- a/pkgs/by-name/li/libcsa/package.nix +++ b/pkgs/by-name/li/libcsa/package.nix @@ -5,7 +5,7 @@ unstableGitUpdater, }: stdenv.mkDerivation (finalAttrs: { - name = "csa"; + pname = "csa"; version = "1.26-unstable-2024-03-22"; src = fetchFromGitHub { From 7685f83e6c4d859a8e3fadaf937c8f0512e01af4 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 19 Jan 2026 14:55:51 +0100 Subject: [PATCH 15/46] lib45d: use pname instead of name --- pkgs/by-name/li/lib45d/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/lib45d/package.nix b/pkgs/by-name/li/lib45d/package.nix index 26c1a86711c9..33dcb2aa08e9 100644 --- a/pkgs/by-name/li/lib45d/package.nix +++ b/pkgs/by-name/li/lib45d/package.nix @@ -5,7 +5,7 @@ lib, }: stdenv.mkDerivation (finalAttrs: { - name = "lib45d"; + pname = "lib45d"; version = "0.3.6"; src = fetchFromGitHub { owner = "45Drives"; From e2c9a650fbbe0aa7be3a45442a02cfa73a1df75c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 19 Jan 2026 14:55:51 +0100 Subject: [PATCH 16/46] autotier: use pname instead of name --- pkgs/by-name/au/autotier/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/au/autotier/package.nix b/pkgs/by-name/au/autotier/package.nix index c3d71559d920..5869026758de 100644 --- a/pkgs/by-name/au/autotier/package.nix +++ b/pkgs/by-name/au/autotier/package.nix @@ -13,7 +13,7 @@ installShellFiles, }: stdenv.mkDerivation (finalAttrs: { - name = "autotier"; + pname = "autotier"; version = "1.2.0"; src = fetchFromGitHub { owner = "45Drives"; From d9bb201fe4ced45c405c81547590e7ee83e2c7ac Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 07:31:40 +0100 Subject: [PATCH 17/46] construo: move to pkgs/by-name this shouldn't create any rebuilds --- .../co/construo/package.nix} | 16 ++++++++++------ pkgs/top-level/all-packages.nix | 14 ++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) rename pkgs/{games/construo/default.nix => by-name/co/construo/package.nix} (69%) diff --git a/pkgs/games/construo/default.nix b/pkgs/by-name/co/construo/package.nix similarity index 69% rename from pkgs/games/construo/default.nix rename to pkgs/by-name/co/construo/package.nix index 77c6d9b272f6..4cbf18d1abf3 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/by-name/co/construo/package.nix @@ -5,9 +5,12 @@ libX11, zlib, xorgproto, - libGL ? null, - libGLU ? null, - libglut ? null, + withLibGL ? !stdenv.hostPlatform.isDarwin, + libGL, + withLibGLU ? !stdenv.hostPlatform.isDarwin, + libGLU, + withLibglut ? !stdenv.hostPlatform.isDarwin, + libglut, }: stdenv.mkDerivation rec { @@ -24,9 +27,9 @@ stdenv.mkDerivation rec { zlib xorgproto ] - ++ lib.optional (libGL != null) libGL - ++ lib.optional (libGLU != null) libGLU - ++ lib.optional (libglut != null) libglut; + ++ lib.optional withLibGL libGL + ++ lib.optional withLibGLU libGLU + ++ lib.optional withLibglut libglut; preConfigure = '' substituteInPlace src/Makefile.in \ @@ -38,5 +41,6 @@ stdenv.mkDerivation rec { mainProgram = "construo.x11"; homepage = "http://fs.fsf.org/construo/"; license = lib.licenses.gpl3; + priority = 10; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7016f677632..ea050fde2cde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12193,16 +12193,10 @@ with pkgs; cataclysm-dda-git = cataclysmDDA.git.tiles; - construoBase = lowPrio ( - callPackage ../games/construo { - libGL = null; - libGLU = null; - libglut = null; - } - ); - - construo = construoBase.override { - inherit libGL libGLU libglut; + construoBase = construo.override { + withLibGL = false; + withLibGLU = false; + withLibglut = false; }; crawlTiles = callPackage ../by-name/cr/crawl/package.nix { From ae6b3ca429cb8e1fa8284ab84b10c4bfccedd019 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 07:39:22 +0100 Subject: [PATCH 18/46] curseofwar: move to pkgs/by-name this shouldn't create any rebuilds --- .../default.nix => by-name/cu/curseofwar/package.nix} | 7 ++++--- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) rename pkgs/{games/curseofwar/default.nix => by-name/cu/curseofwar/package.nix} (80%) diff --git a/pkgs/games/curseofwar/default.nix b/pkgs/by-name/cu/curseofwar/package.nix similarity index 80% rename from pkgs/games/curseofwar/default.nix rename to pkgs/by-name/cu/curseofwar/package.nix index a6f411ca53ce..42760add1d98 100644 --- a/pkgs/games/curseofwar/default.nix +++ b/pkgs/by-name/cu/curseofwar/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + withSDL ? false, ncurses, SDL, }: @@ -19,10 +20,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ncurses - SDL + (if withSDL then SDL else null) ]; - makeFlags = (lib.optionals (SDL != null) [ "SDL=yes" ]) ++ [ + makeFlags = (lib.optional withSDL "SDL=yes") ++ [ "PREFIX=$(out)" # force platform's cc on darwin, otherwise gcc is used "CC=${stdenv.cc.targetPrefix}cc" @@ -32,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Fast-paced action strategy game"; homepage = "https://a-nikolaev.github.io/curseofwar/"; license = lib.licenses.gpl3; - mainProgram = if SDL != null then "curseofwar-sdl" else "curseofwar"; + mainProgram = if withSDL then "curseofwar-sdl" else "curseofwar"; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea050fde2cde..c1511cad7e5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12203,8 +12203,10 @@ with pkgs; tileMode = true; }; - curseofwar = callPackage ../games/curseofwar { SDL = null; }; - curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; }; + curseofwar-sdl = curseofwar.override { + withSDL = true; + ncurses = null; + }; ddnet-server = ddnet.override { buildClient = false; }; From 1b86376d8886fcfb9815abfb2ffd1a0a9689307e Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 07:58:24 +0100 Subject: [PATCH 19/46] openttd{,-jgrpp,-grfcodec,nml}: move to pkgs/by-name this shouldn't create any rebuilds --- .../op/openttd-grfcodec/package.nix} | 0 .../op/openttd-jgrpp/package.nix} | 1 - .../nml.nix => by-name/op/openttd-nml/package.nix} | 0 .../default.nix => by-name/op/openttd/package.nix} | 3 ++- pkgs/top-level/all-packages.nix | 13 ------------- 5 files changed, 2 insertions(+), 15 deletions(-) rename pkgs/{games/openttd/grfcodec.nix => by-name/op/openttd-grfcodec/package.nix} (100%) rename pkgs/{games/openttd/jgrpp.nix => by-name/op/openttd-jgrpp/package.nix} (99%) rename pkgs/{games/openttd/nml.nix => by-name/op/openttd-nml/package.nix} (100%) rename pkgs/{games/openttd/default.nix => by-name/op/openttd/package.nix} (98%) diff --git a/pkgs/games/openttd/grfcodec.nix b/pkgs/by-name/op/openttd-grfcodec/package.nix similarity index 100% rename from pkgs/games/openttd/grfcodec.nix rename to pkgs/by-name/op/openttd-grfcodec/package.nix diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/by-name/op/openttd-jgrpp/package.nix similarity index 99% rename from pkgs/games/openttd/jgrpp.nix rename to pkgs/by-name/op/openttd-jgrpp/package.nix index e875fcf8956b..edb4f837ce72 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/by-name/op/openttd-jgrpp/package.nix @@ -2,7 +2,6 @@ fetchFromGitHub, openttd, zstd, - ... }: openttd.overrideAttrs (oldAttrs: rec { diff --git a/pkgs/games/openttd/nml.nix b/pkgs/by-name/op/openttd-nml/package.nix similarity index 100% rename from pkgs/games/openttd/nml.nix rename to pkgs/by-name/op/openttd-nml/package.nix diff --git a/pkgs/games/openttd/default.nix b/pkgs/by-name/op/openttd/package.nix similarity index 98% rename from pkgs/games/openttd/default.nix rename to pkgs/by-name/op/openttd/package.nix index 90a4948960e6..14a83510f6b0 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/by-name/op/openttd/package.nix @@ -8,6 +8,7 @@ SDL2, libpng, zlib, + zlib' ? zlib.override { static = true; }, xz, freetype, fontconfig, @@ -87,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 libpng xz - zlib + zlib' freetype fontconfig curl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1511cad7e5a..93df76c8b22c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12345,19 +12345,6 @@ with pkgs; openra = openraPackages.engines.release; - openttd = callPackage ../games/openttd { - zlib = zlib.override { - static = true; - }; - }; - openttd-jgrpp = callPackage ../games/openttd/jgrpp.nix { - zlib = zlib.override { - static = true; - }; - }; - openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { }; - openttd-nml = callPackage ../games/openttd/nml.nix { }; - openxray = callPackage ../games/openxray { # Builds with Clang, but hits an assertion failure unless GCC is used # https://github.com/OpenXRay/xray-16/issues/1224 From eaf317aa64cb2654d752d067d8d9e69354b8b4d4 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 08:02:19 +0100 Subject: [PATCH 20/46] openxray: move to pkgs/by-name this shouldn't create any rebuilds --- .../default.nix => by-name/op/openxray/package.nix} | 8 ++++++-- pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 6 insertions(+), 8 deletions(-) rename pkgs/{games/openxray/default.nix => by-name/op/openxray/package.nix} (93%) diff --git a/pkgs/games/openxray/default.nix b/pkgs/by-name/op/openxray/package.nix similarity index 93% rename from pkgs/games/openxray/default.nix rename to pkgs/by-name/op/openxray/package.nix index 51579c472311..2881f39126ca 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/by-name/op/openxray/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gccStdenv, fetchFromGitHub, gitUpdater, cmake, @@ -15,7 +15,11 @@ pcre, makeWrapper, }: - +let + # Builds with Clang, but hits an assertion failure unless GCC is used + # https://github.com/OpenXRay/xray-16/issues/1224 + stdenv = gccStdenv; +in stdenv.mkDerivation (finalAttrs: { pname = "openxray"; version = "2921-january-2025-rc1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93df76c8b22c..a9db1b475a7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12345,12 +12345,6 @@ with pkgs; openra = openraPackages.engines.release; - openxray = callPackage ../games/openxray { - # Builds with Clang, but hits an assertion failure unless GCC is used - # https://github.com/OpenXRay/xray-16/issues/1224 - stdenv = gccStdenv; - }; - papermcServers = callPackages ../games/papermc { }; papermc = papermcServers.papermc; From a556751ebb99011ab6ec786637aea5b18a8d27f4 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 08:05:12 +0100 Subject: [PATCH 21/46] pentobi: move to pkgs/by-name this shouldn't create any rebuilds --- .../pe/pentobi/package.nix} | 21 +++++++------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 16 deletions(-) rename pkgs/{games/pentobi/default.nix => by-name/pe/pentobi/package.nix} (85%) diff --git a/pkgs/games/pentobi/default.nix b/pkgs/by-name/pe/pentobi/package.nix similarity index 85% rename from pkgs/games/pentobi/default.nix rename to pkgs/by-name/pe/pentobi/package.nix index 657891db9af6..816a3901cd7a 100644 --- a/pkgs/games/pentobi/default.nix +++ b/pkgs/by-name/pe/pentobi/package.nix @@ -1,22 +1,15 @@ { lib, - mkDerivation, + qt5, appstream, fetchFromGitHub, cmake, - gettext, - libxslt, librsvg, itstool, - qtbase, - qtquickcontrols2, - qtsvg, - qttools, - qtwebview, docbook_xsl, }: -mkDerivation rec { +qt5.mkDerivation rec { version = "20.0"; pname = "pentobi"; @@ -30,14 +23,14 @@ mkDerivation rec { nativeBuildInputs = [ cmake docbook_xsl - qttools + qt5.qttools ]; buildInputs = [ appstream - qtbase - qtsvg - qtquickcontrols2 - qtwebview + qt5.qtbase + qt5.qtsvg + qt5.qtquickcontrols2 + qt5.qtwebview itstool librsvg ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9db1b475a7a..4456a23934ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12349,8 +12349,6 @@ with pkgs; papermc = papermcServers.papermc; - pentobi = libsForQt5.callPackage ../games/pentobi { }; - pokerth = libsForQt5.callPackage ../games/pokerth { protobuf = protobuf_21; }; From 40391446cde76d109cf9ec530a3992b4b8a23108 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 08:09:18 +0100 Subject: [PATCH 22/46] pokerth: move to pkgs/by-name this shouldn't create any rebuilds --- .../po/pokerth/package.nix} | 16 +++++++--------- pkgs/top-level/all-packages.nix | 9 +-------- 2 files changed, 8 insertions(+), 17 deletions(-) rename pkgs/{games/pokerth/default.nix => by-name/po/pokerth/package.nix} (94%) diff --git a/pkgs/games/pokerth/default.nix b/pkgs/by-name/po/pokerth/package.nix similarity index 94% rename from pkgs/games/pokerth/default.nix rename to pkgs/by-name/po/pokerth/package.nix index 9f2df261d8e2..39b70fbd9f18 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/by-name/po/pokerth/package.nix @@ -1,10 +1,8 @@ { lib, - mkDerivation, + qt5, fetchFromGitHub, fetchpatch, - qmake, - qtbase, SDL, SDL_mixer, boost181, @@ -12,18 +10,18 @@ gsasl, libgcrypt, libircclient, - protobuf, + protobuf_21, sqlite, - wrapQtAppsHook, tinyxml, target ? "client", }: let boost = boost181; + protobuf = protobuf_21; in -mkDerivation rec { +qt5.mkDerivation rec { pname = "pokerth-${target}"; version = "1.1.2"; @@ -62,8 +60,8 @@ mkDerivation rec { ''; nativeBuildInputs = [ - qmake - wrapQtAppsHook + qt5.qmake + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -75,7 +73,7 @@ mkDerivation rec { libgcrypt libircclient protobuf - qtbase + qt5.qtbase sqlite tinyxml ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4456a23934ab..7b779e18478d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12349,14 +12349,7 @@ with pkgs; papermc = papermcServers.papermc; - pokerth = libsForQt5.callPackage ../games/pokerth { - protobuf = protobuf_21; - }; - - pokerth-server = libsForQt5.callPackage ../games/pokerth { - target = "server"; - protobuf = protobuf_21; - }; + pokerth-server = pokerth.override { target = "server"; }; inherit (import ../games/quake3 pkgs.callPackage) quake3wrapper From 4d83050a1f80f6fab8f741c02294cc47c4c1fbce Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 08:20:44 +0100 Subject: [PATCH 23/46] authelia: move to pkgs/by-name this shouldn't create any rebuilds --- ci/OWNERS | 2 +- .../authelia/default.nix => by-name/au/authelia/package.nix} | 4 +++- pkgs/{servers => by-name/au}/authelia/sources.nix | 0 pkgs/{servers => by-name/au}/authelia/update.sh | 0 pkgs/{servers => by-name/au}/authelia/web.nix | 0 pkgs/top-level/all-packages.nix | 4 ---- 6 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/{servers/authelia/default.nix => by-name/au/authelia/package.nix} (98%) rename pkgs/{servers => by-name/au}/authelia/sources.nix (100%) rename pkgs/{servers => by-name/au}/authelia/update.sh (100%) rename pkgs/{servers => by-name/au}/authelia/web.nix (100%) diff --git a/ci/OWNERS b/ci/OWNERS index 93fc4a0f2745..adbef188a8f8 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -504,7 +504,7 @@ pkgs/development/interpreters/elixir/ @NixOS/beam pkgs/development/interpreters/lfe/ @NixOS/beam # Authelia -pkgs/servers/authelia/ @06kellyjac @dit7ya @nicomem +pkgs/by-name/au/authelia/ @06kellyjac @dit7ya @nicomem # OctoDNS pkgs/by-name/oc/octodns/ @anthonyroussel diff --git a/pkgs/servers/authelia/default.nix b/pkgs/by-name/au/authelia/package.nix similarity index 98% rename from pkgs/servers/authelia/default.nix rename to pkgs/by-name/au/authelia/package.nix index 8674cc2b00da..c4a5275c7e69 100644 --- a/pkgs/servers/authelia/default.nix +++ b/pkgs/by-name/au/authelia/package.nix @@ -6,7 +6,7 @@ pnpmConfigHook, pnpm, fetchFromGitHub, - buildGoModule, + buildGo124Module, installShellFiles, callPackage, nixosTests, @@ -22,6 +22,8 @@ }: let + buildGoModule = buildGo124Module; + inherit (import ./sources.nix { inherit fetchFromGitHub; }) pname version diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/by-name/au/authelia/sources.nix similarity index 100% rename from pkgs/servers/authelia/sources.nix rename to pkgs/by-name/au/authelia/sources.nix diff --git a/pkgs/servers/authelia/update.sh b/pkgs/by-name/au/authelia/update.sh similarity index 100% rename from pkgs/servers/authelia/update.sh rename to pkgs/by-name/au/authelia/update.sh diff --git a/pkgs/servers/authelia/web.nix b/pkgs/by-name/au/authelia/web.nix similarity index 100% rename from pkgs/servers/authelia/web.nix rename to pkgs/by-name/au/authelia/web.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b779e18478d..8ff117dd491b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1450,10 +1450,6 @@ with pkgs; arpack-mpi = arpack.override { useMpi = true; }; - authelia = callPackage ../servers/authelia { - buildGoModule = buildGo124Module; - }; - authentik-outposts = recurseIntoAttrs (callPackages ../by-name/au/authentik/outposts.nix { }); autoflake = with python3.pkgs; toPythonApplication autoflake; From 4a4b14536d4b4819ab124ccf985bbfbc39719eb6 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 08:25:11 +0100 Subject: [PATCH 24/46] code-server: move to pkgs/by-name this shouldn't create any rebuilds --- .../co}/code-server/build-vscode-nogit.patch | 0 .../default.nix => by-name/co/code-server/package.nix} | 6 +++--- .../co}/code-server/remove-node-download.patch | 0 pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{servers => by-name/co}/code-server/build-vscode-nogit.patch (100%) rename pkgs/{servers/code-server/default.nix => by-name/co/code-server/package.nix} (99%) rename pkgs/{servers => by-name/co}/code-server/remove-node-download.patch (100%) diff --git a/pkgs/servers/code-server/build-vscode-nogit.patch b/pkgs/by-name/co/code-server/build-vscode-nogit.patch similarity index 100% rename from pkgs/servers/code-server/build-vscode-nogit.patch rename to pkgs/by-name/co/code-server/build-vscode-nogit.patch diff --git a/pkgs/servers/code-server/default.nix b/pkgs/by-name/co/code-server/package.nix similarity index 99% rename from pkgs/servers/code-server/default.nix rename to pkgs/by-name/co/code-server/package.nix index 2494fa1e5e11..a6fbb49d73d2 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/by-name/co/code-server/package.nix @@ -13,7 +13,7 @@ yarn, python3, esbuild, - nodejs, + nodejs_20, node-gyp, libsecret, xorg, @@ -27,7 +27,7 @@ let system = stdenv.hostPlatform.system; - python = python3; + nodejs = nodejs_20; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ ]; @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs yarn' - python + python3 pkg-config makeWrapper git diff --git a/pkgs/servers/code-server/remove-node-download.patch b/pkgs/by-name/co/code-server/remove-node-download.patch similarity index 100% rename from pkgs/servers/code-server/remove-node-download.patch rename to pkgs/by-name/co/code-server/remove-node-download.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ff117dd491b..acf58b40a899 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11850,10 +11850,6 @@ with pkgs; vscode-generic = ../applications/editors/vscode/generic.nix; }; - code-server = callPackage ../servers/code-server { - nodejs = nodejs_20; - }; - kiro = callPackage ../by-name/ki/kiro/package.nix { vscode-generic = ../applications/editors/vscode/generic.nix; }; From 61b1f141c6d481741abfd50f2dc6f90bc17819b1 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 08:27:57 +0100 Subject: [PATCH 25/46] deconz: move to pkgs/by-name this shouldn't create any rebuilds --- .../default.nix => by-name/de/deconz/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{servers/deconz/default.nix => by-name/de/deconz/package.nix} (95%) diff --git a/pkgs/servers/deconz/default.nix b/pkgs/by-name/de/deconz/package.nix similarity index 95% rename from pkgs/servers/deconz/default.nix rename to pkgs/by-name/de/deconz/package.nix index d7ea9aeb32e7..e50f106b63a2 100644 --- a/pkgs/servers/deconz/default.nix +++ b/pkgs/by-name/de/deconz/package.nix @@ -2,11 +2,9 @@ stdenv, lib, fetchurl, - wrapQtAppsHook, + qt5, dpkg, autoPatchelfHook, - qtserialport, - qtwebsockets, openssl, libredirect, makeWrapper, @@ -28,12 +26,12 @@ stdenv.mkDerivation rec { dpkg autoPatchelfHook makeWrapper - wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ - qtserialport - qtwebsockets + qt5.qtserialport + qt5.qtwebsockets openssl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acf58b40a899..9a9c2d369631 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8575,8 +8575,6 @@ with pkgs; dcnnt = python3Packages.callPackage ../servers/dcnnt { }; - deconz = qt5.callPackage ../servers/deconz { }; - dict = callPackage ../servers/dict { flex = flex_2_5_35; libmaa = callPackage ../servers/dict/libmaa.nix { }; From 0ba4ce499384e5488ff2107816d6f0fbab805d5f Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 08:31:14 +0100 Subject: [PATCH 26/46] diod: move to pkgs/by-name this shouldn't create any rebuilds --- .../diod/default.nix => by-name/di/diod/package.nix} | 6 ++++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/{servers/diod/default.nix => by-name/di/diod/package.nix} (96%) diff --git a/pkgs/servers/diod/default.nix b/pkgs/by-name/di/diod/package.nix similarity index 96% rename from pkgs/servers/diod/default.nix rename to pkgs/by-name/di/diod/package.nix index 32c9af05dd7b..bbc3c89e6e1d 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/by-name/di/diod/package.nix @@ -5,12 +5,14 @@ autoreconfHook, pkg-config, munge, - lua, + lua5_1, libcap, perl, ncurses, }: - +let + lua = lua5_1; +in stdenv.mkDerivation rec { pname = "diod"; version = "1.1.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a9c2d369631..3dafa553e1c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8584,8 +8584,6 @@ with pkgs; dictDBCollector = callPackage ../servers/dict/dictd-db-collector.nix { }; - diod = callPackage ../servers/diod { lua = lua5_1; }; - dodgy = with python3Packages; toPythonApplication dodgy; prosody = callPackage ../servers/xmpp/prosody { From 9606b30ecd97e7acc8396ee0d89580055c5aab32 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 10:04:40 +0100 Subject: [PATCH 27/46] felix{,_remoteshell}: move to pkgs/by-name this shouldn't create any rebuilds --- .../felix/default.nix => by-name/fe/felix/package.nix} | 0 .../fe/felix_remoteshell/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 deletions(-) rename pkgs/{servers/felix/default.nix => by-name/fe/felix/package.nix} (100%) rename pkgs/{servers/felix/remoteshell.nix => by-name/fe/felix_remoteshell/package.nix} (100%) diff --git a/pkgs/servers/felix/default.nix b/pkgs/by-name/fe/felix/package.nix similarity index 100% rename from pkgs/servers/felix/default.nix rename to pkgs/by-name/fe/felix/package.nix diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/by-name/fe/felix_remoteshell/package.nix similarity index 100% rename from pkgs/servers/felix/remoteshell.nix rename to pkgs/by-name/fe/felix_remoteshell/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dafa553e1c6..86fc01636272 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8591,10 +8591,6 @@ with pkgs; withExtraLuaPackages = _: [ ]; }; - felix = callPackage ../servers/felix { }; - - felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { }; - inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 From 042481f972ac5caacc937a02ef79e01236459565 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 10:05:06 +0100 Subject: [PATCH 28/46] gpm: move to pkgs/by-name this shouldn't create any rebuilds --- pkgs/{servers/gpm/default.nix => by-name/gp/gpm/package.nix} | 2 +- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) rename pkgs/{servers/gpm/default.nix => by-name/gp/gpm/package.nix} (98%) diff --git a/pkgs/servers/gpm/default.nix b/pkgs/by-name/gp/gpm/package.nix similarity index 98% rename from pkgs/servers/gpm/default.nix rename to pkgs/by-name/gp/gpm/package.nix index 7552e6fbf13c..3ab2e882b896 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/by-name/gp/gpm/package.nix @@ -10,7 +10,7 @@ texinfo, fetchpatch, pkgsStatic, - withNcurses ? true, + withNcurses ? false, ncurses, }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86fc01636272..de165ae87e6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9276,10 +9276,6 @@ with pkgs; fuse2 = lowPrio (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fusePackages.fuse_2); fuse3 = fusePackages.fuse_3; - gpm = callPackage ../servers/gpm { - withNcurses = false; # Keep curses disabled for lack of value - }; - gpm-ncurses = gpm.override { withNcurses = true; }; btop-cuda = btop.override { cudaSupport = true; }; From cd91697cd34ca7d731c8ede3a537fa62289c8414 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 10:11:13 +0100 Subject: [PATCH 29/46] hockeypuck{,-web}: move to pkgs/by-name this shouldn't create any rebuilds --- .../ho/hockeypuck-web/package.nix} | 9 +++------ .../ho/hockeypuck/package.nix} | 17 +++++++++++------ pkgs/servers/hockeypuck/sources.nix | 16 ---------------- pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 14 insertions(+), 32 deletions(-) rename pkgs/{servers/hockeypuck/web.nix => by-name/ho/hockeypuck-web/package.nix} (75%) rename pkgs/{servers/hockeypuck/server.nix => by-name/ho/hockeypuck/package.nix} (59%) delete mode 100644 pkgs/servers/hockeypuck/sources.nix diff --git a/pkgs/servers/hockeypuck/web.nix b/pkgs/by-name/ho/hockeypuck-web/package.nix similarity index 75% rename from pkgs/servers/hockeypuck/web.nix rename to pkgs/by-name/ho/hockeypuck-web/package.nix index 42fdaf5bff7f..d267bba0f1f4 100644 --- a/pkgs/servers/hockeypuck/web.nix +++ b/pkgs/by-name/ho/hockeypuck-web/package.nix @@ -1,17 +1,14 @@ { stdenv, lib, - fetchFromGitHub, + hockeypuck, nixosTests, }: -let - sources = (import ./sources.nix) { inherit fetchFromGitHub; }; -in stdenv.mkDerivation { - pname = "${sources.pname}-web"; + pname = "hockeypuck-web"; - inherit (sources) version src; + inherit (hockeypuck) version src; dontBuild = true; # We should just copy the web templates diff --git a/pkgs/servers/hockeypuck/server.nix b/pkgs/by-name/ho/hockeypuck/package.nix similarity index 59% rename from pkgs/servers/hockeypuck/server.nix rename to pkgs/by-name/ho/hockeypuck/package.nix index ad5254df27bd..a79bbf3f1186 100644 --- a/pkgs/servers/hockeypuck/server.nix +++ b/pkgs/by-name/ho/hockeypuck/package.nix @@ -5,11 +5,16 @@ nixosTests, }: -let - sources = (import ./sources.nix) { inherit fetchFromGitHub; }; -in -buildGoModule { - inherit (sources) pname version src; +buildGoModule (finalAttrs: { + pname = "hockeypuck"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "hockeypuck"; + repo = "hockeypuck"; + rev = finalAttrs.version; + sha256 = "0da3ffbqck0dr7d89gy2yillp7g9a4ziyjlvrm8vgkkg2fs8dlb1"; + }; modRoot = "src/hockeypuck/"; vendorHash = null; @@ -23,4 +28,4 @@ buildGoModule { license = lib.licenses.agpl3Plus; maintainers = [ ]; }; -} +}) diff --git a/pkgs/servers/hockeypuck/sources.nix b/pkgs/servers/hockeypuck/sources.nix deleted file mode 100644 index b504cd331410..000000000000 --- a/pkgs/servers/hockeypuck/sources.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ fetchFromGitHub }: - -let - pname = "hockeypuck"; - version = "2.1.0"; -in -{ - inherit version pname; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - sha256 = "0da3ffbqck0dr7d89gy2yillp7g9a4ziyjlvrm8vgkkg2fs8dlb1"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de165ae87e6e..eb5a59d5c51b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2799,10 +2799,6 @@ with pkgs; lua = lua5; }; - hockeypuck = callPackage ../servers/hockeypuck/server.nix { }; - - hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { }; - host = bind.host; hotdoc = python3Packages.callPackage ../development/tools/hotdoc { }; From 2946c169c2edf965a319bcc126ffb8558a82509c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Jan 2026 13:25:57 +0000 Subject: [PATCH 30/46] surrealdb: 2.4.1 -> 2.5.0 --- pkgs/by-name/su/surrealdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 07ecf04cee85..66cf38a78947 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "surrealdb"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; tag = "v${finalAttrs.version}"; - hash = "sha256-woItGD998p8EWerkrWESqGON0HQp7Vrbl/kiQi+IT7g="; + hash = "sha256-SDzj/viDcuGbJ8HM0/KXBOjpc5vnreobTx0U3eNeKo8="; }; - cargoHash = "sha256-RbmhhJ+bJcCM8h2mkc2dK2Xlm+izESXwvbNvxuVC7vg="; + cargoHash = "sha256-alxRXeeeIxi9lb5sIOU15nCD6A/B3ba5iouOTKRTe+w="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From f9dbf575ad93a290aa7e57c7a3640211a5166073 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jan 2026 15:26:13 +0100 Subject: [PATCH 31/46] python313Packages.apprise: update homepage --- pkgs/development/python-modules/apprise/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index ff355afdcf64..92de3b4620c8 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -74,7 +74,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Push Notifications that work with just about every platform"; - homepage = "https://github.com/caronc/apprise"; + homepage = "https://appriseit.com/"; changelog = "https://github.com/caronc/apprise/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ getchoo ]; From 14a3259748f78ee2bba31914b27f4881a4346d14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Jan 2026 16:39:41 +0000 Subject: [PATCH 32/46] python3Packages.getjump: 2.8.0 -> 2.10.0 --- pkgs/development/python-modules/getjump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/getjump/default.nix b/pkgs/development/python-modules/getjump/default.nix index ef3e6ecaf2e7..8b660ca4caaf 100644 --- a/pkgs/development/python-modules/getjump/default.nix +++ b/pkgs/development/python-modules/getjump/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "getjump"; - version = "2.8.0"; + version = "2.10.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-FfAwPCbj+0wL+Lgk17peco/ogrsaa6Js+Ay5fqgPUPw="; + hash = "sha256-AX8WffzcqBYqo8DzXXbhfqOMd7U5VpWx4MTKhUXLJeQ="; }; pythonRelaxDeps = [ From 815af37160b733c793cafda2842c21b3e7a0a009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 23 Jan 2026 00:42:47 +0100 Subject: [PATCH 33/46] vauilwarden: build webvault explicitly on hydra to better notice when it fails --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c49df86f211..6a16bedc4916 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13424,6 +13424,7 @@ with pkgs; vaultwarden-sqlite = vaultwarden; vaultwarden-mysql = vaultwarden.override { dbBackend = "mysql"; }; vaultwarden-postgresql = vaultwarden.override { dbBackend = "postgresql"; }; + vaultwarden-webvault = vaultwarden.webvault; vimUtils = callPackage ../applications/editors/vim/plugins/utils/vim-utils.nix { }; From 9f7bebd71817b3dcaedc2fe39174c3d54e0aae55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Jan 2026 23:45:03 +0000 Subject: [PATCH 34/46] s7: 11.7-unstable-2026-01-15 -> 11.7-unstable-2026-01-22 --- pkgs/by-name/s7/s7/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 38a10985155c..01b48689760a 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.7-unstable-2026-01-15"; + version = "11.7-unstable-2026-01-22"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "6a37e688266eb5bcea0959b297b352fcaa75976c"; - hash = "sha256-rTocm8AADnDoeMas4/cwQBv7LTMUgo2+SvNwR3oWNXA="; + rev = "583c1eeb8e154b4c87f095a146cfde91b0c7570c"; + hash = "sha256-+rgYv8D4w/xK/UgZzO+YZU1VgaaDR9fXcz0bheygrt0="; }; buildInputs = From 81fd95f9fd4db21fdf954c445fcc4db396415e5b Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 23 Jan 2026 01:44:33 +0100 Subject: [PATCH 35/46] mysql-workbench: 8.0.45 -> 8.0.46 --- pkgs/by-name/my/mysql-workbench/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/my/mysql-workbench/package.nix b/pkgs/by-name/my/mysql-workbench/package.nix index 42973cbfee3e..5f9a3c7ca033 100644 --- a/pkgs/by-name/my/mysql-workbench/package.nix +++ b/pkgs/by-name/my/mysql-workbench/package.nix @@ -53,11 +53,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mysql-workbench"; - version = "8.0.45"; + version = "8.0.46"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-00sswmBIBtNmxMrJBDqzOhPLErXuXGs634JRHML/aKE="; + hash = "sha256-sP7GYSagPpcBhmdCynvQsxJexe54Bgu6RI7apCSb9TE="; }; patches = [ From 12086a49193963fc76a0ebc1fd1475b22e1715a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Jan 2026 00:58:08 +0000 Subject: [PATCH 36/46] watchlog: 1.250.0 -> 1.252.0 --- pkgs/by-name/wa/watchlog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix index 17d045889bb6..2879d4b75ca4 100644 --- a/pkgs/by-name/wa/watchlog/package.nix +++ b/pkgs/by-name/wa/watchlog/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "watchlog"; - version = "1.250.0"; + version = "1.252.0"; src = fetchFromGitLab { owner = "kevincox"; repo = "watchlog"; rev = "v${version}"; - hash = "sha256-a8x1fEYuHZu2Z/CE835HEqkNr7Mtbdtuq1vDRKfEl5U="; + hash = "sha256-ZDT98pxtpoEenJPwz4Ws2kkTqJ0lTWvxv3LfjBsCvZo="; }; - cargoHash = "sha256-b+xuMUt9btrfKLUluxtSFXdFKtOHmKVV0m1fPM5cNRA="; + cargoHash = "sha256-n1Pzuyf9EKHgvHqVlOO6bZNcD4KMHSh3jN9REtLulck="; meta = { description = "Easier monitoring of live logs"; From d86dfcb78d9125293f7639a8b56bdc73d9e0aaab Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 20 Jan 2026 18:43:43 -0600 Subject: [PATCH 37/46] nufmt: 0-unstable-2025-06-19 -> 0-unstable-2025-12-29 Signed-off-by: Austin Horstman --- pkgs/by-name/nu/nufmt/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index 0a7985e14636..c195c54be827 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -7,26 +7,29 @@ }: rustPlatform.buildRustPackage { pname = "nufmt"; - version = "0-unstable-2025-06-19"; + version = "0-unstable-2025-12-29"; src = fetchFromGitHub { owner = "nushell"; repo = "nufmt"; - rev = "35962223fbd4c1a924b4ccfb8c7ad81fe2863b86"; - hash = "sha256-2WgqKQBZRMqUyWq0qm+d8TUT/iAQ1LZjhllBKqimp+Q="; + rev = "c03e166babe7b77f1a80a7916ab1e8e2437bba06"; + hash = "sha256-VZiRmo9/jxAFCSr2bHrf89qb6o1Obwt2+O3NrIrokZo="; }; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - cargoHash = "sha256-KDXC2/1GcJL6qH+L/FzzQCA7kJigtKOfxVDLv5qXYao="; + cargoHash = "sha256-BpKhgF3LUQRL1mNCR5Iq4/Q+eRaOf+JgQCuUfloRhzk="; # NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/35962223fbd4c1a924b4ccfb8c7ad81fe2863b86 postPatch = '' substituteInPlace tests/main.rs --replace-fail \ 'const TEST_BINARY: &str = "target/debug/nufmt";' \ 'const TEST_BINARY: &str = "target/${stdenv.hostPlatform.rust.rustcTarget}/release/nufmt";' + substituteInPlace tests/ground_truth.rs --replace-fail \ + 'const TEST_BINARY: &str = "target/debug/nufmt";' \ + 'const TEST_BINARY: &str = "target/${stdenv.hostPlatform.rust.rustcTarget}/release/nufmt";' ''; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; From eb73dd2a18e8b0d3334c5355924151779699328d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Jan 2026 01:22:39 +0000 Subject: [PATCH 38/46] edmarketconnector: 6.0.2 -> 6.1.0 --- pkgs/by-name/ed/edmarketconnector/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ed/edmarketconnector/package.nix b/pkgs/by-name/ed/edmarketconnector/package.nix index dbf80a4205c8..15aac51508ca 100644 --- a/pkgs/by-name/ed/edmarketconnector/package.nix +++ b/pkgs/by-name/ed/edmarketconnector/package.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "edmarketconnector"; - version = "6.0.2"; + version = "6.1.0"; src = fetchFromGitHub { owner = "EDCD"; repo = "EDMarketConnector"; tag = "Release/${finalAttrs.version}"; - hash = "sha256-/Te7PTM/t+uN5v1DDa7zgQsVcy4CDMRSxvPqt1OwcW4="; + hash = "sha256-MBbm6537HEYKql42//EzEy1Iwi6W3rX/4hFYrRVaAbw="; }; nativeBuildInputs = [ makeWrapper ]; From 3e37adc195aa59085602493d1ac4eafbc625d2ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Jan 2026 01:28:33 +0000 Subject: [PATCH 39/46] netatalk: 4.4.0 -> 4.4.1 --- pkgs/by-name/ne/netatalk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netatalk/package.nix b/pkgs/by-name/ne/netatalk/package.nix index 92a206755b81..8d5d37e5858f 100644 --- a/pkgs/by-name/ne/netatalk/package.nix +++ b/pkgs/by-name/ne/netatalk/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netatalk"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz"; - hash = "sha256-GMoy3Gwl57o1KFlLeEN58BOIj6mED/xHjNH+9VUTglw="; + hash = "sha256-j8qwvzs5zYqU/j7nqCZMYABRWjrzd9o0FmlmCasTMW0="; }; nativeBuildInputs = [ From ae53baf979ef072cc52cd6fceac6efcaaebc50d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Jan 2026 02:53:38 +0000 Subject: [PATCH 40/46] python3Packages.publicsuffixlist: 1.0.2.20260117 -> 1.0.2.20260121 --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 6d7128a5a390..69ea1c5ee429 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,12 +11,12 @@ buildPythonPackage (finalAttrs: { pname = "publicsuffixlist"; - version = "1.0.2.20260117"; + version = "1.0.2.20260121"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-JOESMNtP5Nfmi7QyA/gL9Sf2FMBiWn3CdJ17BETYWOU="; + hash = "sha256-3CjU0m330GWrQksBe7d9W8PZfAIyzZ80MlDNewgWC78="; }; postPatch = '' From d04b7ca6b17a7bf1334c45fd1fcc3160ea6ad941 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Jan 2026 03:14:07 +0000 Subject: [PATCH 41/46] archipelago: 0.6.5 -> 0.6.6 --- pkgs/by-name/ar/archipelago/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/archipelago/package.nix b/pkgs/by-name/ar/archipelago/package.nix index 8c751b6909d9..896c6224ab90 100644 --- a/pkgs/by-name/ar/archipelago/package.nix +++ b/pkgs/by-name/ar/archipelago/package.nix @@ -17,10 +17,10 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "archipelago"; - version = "0.6.5"; + version = "0.6.6"; src = fetchurl { url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${finalAttrs.version}/Archipelago_${finalAttrs.version}_linux-x86_64.AppImage"; - hash = "sha256-06EFpnMMz+yqqHDuUDw9AMBd0a0Ay7oVkzD4mna7XeM="; + hash = "sha256-mJ0bPBBou3BRqEW5QierjD0ohDBQ9J0jnoV4TCf9XOM="; }; dontUnpack = true; From 5e1b797a817f8abffcf943c94f8ecbc626e0dbc9 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 22 Jan 2026 22:36:09 -0500 Subject: [PATCH 42/46] incus-ui-canonical: 0.19.0 -> 0.19.1 --- pkgs/by-name/in/incus-ui-canonical/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix index 45d18b3dff1d..8cbe264e6ca8 100644 --- a/pkgs/by-name/in/incus-ui-canonical/package.nix +++ b/pkgs/by-name/in/incus-ui-canonical/package.nix @@ -20,14 +20,14 @@ let in stdenv.mkDerivation rec { pname = "incus-ui-canonical"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "zabbly"; repo = "incus-ui-canonical"; # only use tags prefixed by incus- they are the tested fork versions tag = "incus-${version}"; - hash = "sha256-d9L/6GtSBqa/H+KgK0iheNvS2BFazNWKGA94Lv99kr8="; + hash = "sha256-S/X/knSin3DRfpFGl4uvYtVJrozrBfiN8cfFH/RO10U="; }; offlineCache = fetchYarnDeps { From 160fbbd9d9abe56769d67c5676f0cc95b7546041 Mon Sep 17 00:00:00 2001 From: DamareonC Date: Thu, 22 Jan 2026 21:47:38 -0600 Subject: [PATCH 43/46] railway-wallet: 5.22.4 -> 5.24.13 --- pkgs/by-name/ra/railway-wallet/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/railway-wallet/package.nix b/pkgs/by-name/ra/railway-wallet/package.nix index d49aaec2096a..d21f4a4149b4 100644 --- a/pkgs/by-name/ra/railway-wallet/package.nix +++ b/pkgs/by-name/ra/railway-wallet/package.nix @@ -5,11 +5,11 @@ }: appimageTools.wrapType2 rec { pname = "railway-wallet"; - version = "5.22.4"; + version = "5.24.13"; src = fetchurl { - url = "https://github.com/Railway-Wallet/Railway-Wallet/releases/download/v${version}/Railway-v${version}-linux-x86_64.AppImage"; - hash = "sha256-ikVDbUQOAx1626qtmzObu5Uzppz/PZPTPB4/LWoWZmI="; + url = "https://github.com/Railway-Wallet/Railway-Wallet/releases/download/v${version}/Railway.linux.x86_64.AppImage"; + hash = "sha256-e1itj0wxlX2WqyDynxBeLi06bzxwz2/cR9RuOfCLxF8="; }; meta = { From d262d00199206415c239f55024d24f25d5a2c072 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 13 Nov 2025 17:04:33 +0900 Subject: [PATCH 44/46] lima: 1.2.2 -> 2.0.1 Diff: https://github.com/lima-vm/lima/compare/v1.2.2...v2.0.1 Release: https://github.com/lima-vm/lima/releases/tag/v2.0.1 2.0.0 replaced a call to the external pkill command with an internal function. This change conflicts with the current nixpkgs patch, so we must remove the patch to prevent a build error. Updates: a9b8ff8c8cae79f4f849840895a85b9f7af55545 2.0.0: Replace a pkill call: https://github.com/lima-vm/lima/commit/75079f679b196d06904de2a63c5add3948706e2f 2.0.1: Adds graceful shutdown support: https://github.com/lima-vm/lima/commit/e769391e72d5bc0438b16fcf5cf622a85cb4bc42 --- doc/release-notes/rl-2605.section.md | 2 ++ pkgs/by-name/li/lima/package.nix | 6 ------ pkgs/by-name/li/lima/source.nix | 6 +++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index eba4e051f8cd..b3a9039d0e12 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -72,6 +72,8 @@ - `forgejo` has been updated to major version 14. For more information, see the [release blog post](https://forgejo.org/2026-01-release-v14-0/) and [full release notes](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.0.md) +- `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default. + - `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/. - `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0). diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix index 55c4f1f44327..d0ac229e876c 100644 --- a/pkgs/by-name/li/lima/package.nix +++ b/pkgs/by-name/li/lima/package.nix @@ -4,7 +4,6 @@ buildGoModule, callPackage, installShellFiles, - procps, qemu, darwin, makeWrapper, @@ -41,11 +40,6 @@ buildGoModule (finalAttrs: { substituteInPlace Makefile \ --replace-fail 'codesign -f -v --entitlements vz.entitlements -s -' 'codesign -f --entitlements vz.entitlements -s -' \ --replace-fail 'rm -rf _output vendor' 'rm -rf _output' - '' - # fixed upstream, remove when version >=2.0.0 - + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - substituteInPlace pkg/networks/usernet/recoincile.go \ - --replace-fail '/usr/bin/pkill' '${lib.getExe' procps "pkill"}' ''; # It attaches entitlements with codesign and strip removes those, diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix index 133ad36dd22d..0002b5045139 100644 --- a/pkgs/by-name/li/lima/source.nix +++ b/pkgs/by-name/li/lima/source.nix @@ -3,7 +3,7 @@ }: let - version = "1.2.2"; + version = "2.0.1"; in { inherit version; @@ -12,8 +12,8 @@ in owner = "lima-vm"; repo = "lima"; tag = "v${version}"; - hash = "sha256-bIYF/bsOMuWTkjD6fe6by220/WQGL+VWEBXmUzyXU98="; + hash = "sha256-GPrx4pvD6AxYIvAS+Mz8gFZ/Z7HeFFoHh3LOtAJ9bhI="; }; - vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os="; + vendorHash = "sha256-dA6zdrhN73Y8InlrCEdHgYwe5xbUlvKx0IMis2nWgWE="; } From e7c610b4da22b4fa498584ef0f1d25a8f571cb42 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 24 Nov 2025 23:36:04 +0900 Subject: [PATCH 45/46] lima: 2.0.1 -> 2.0.2 Diff: https://github.com/lima-vm/lima/compare/v2.0.1...v2.0.2 Release: https://github.com/lima-vm/lima/releases/tag/v2.0.2 --- pkgs/by-name/li/lima/source.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix index 0002b5045139..e03d087ea50a 100644 --- a/pkgs/by-name/li/lima/source.nix +++ b/pkgs/by-name/li/lima/source.nix @@ -3,7 +3,7 @@ }: let - version = "2.0.1"; + version = "2.0.2"; in { inherit version; @@ -12,8 +12,8 @@ in owner = "lima-vm"; repo = "lima"; tag = "v${version}"; - hash = "sha256-GPrx4pvD6AxYIvAS+Mz8gFZ/Z7HeFFoHh3LOtAJ9bhI="; + hash = "sha256-MWNvHHyf2qZxt83D22tTKR6EXAeAgcoXE1YjXHc9SwQ="; }; - vendorHash = "sha256-dA6zdrhN73Y8InlrCEdHgYwe5xbUlvKx0IMis2nWgWE="; + vendorHash = "sha256-fCqAf0buqA6GajP7SIsVPyKM3jY2n9CbS5hpa3dsWbc="; } From 645c4c608fe3f99c31387c019a2a8ae111f645f1 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 25 Dec 2025 09:21:35 +0000 Subject: [PATCH 46/46] lima: 2.0.2 -> 2.0.3 Diff: https://github.com/lima-vm/lima/compare/v2.0.2...v2.0.3 Release: https://github.com/lima-vm/lima/releases/tag/v2.0.3 --- pkgs/by-name/li/lima/source.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix index e03d087ea50a..215f72966a26 100644 --- a/pkgs/by-name/li/lima/source.nix +++ b/pkgs/by-name/li/lima/source.nix @@ -3,7 +3,7 @@ }: let - version = "2.0.2"; + version = "2.0.3"; in { inherit version; @@ -12,8 +12,8 @@ in owner = "lima-vm"; repo = "lima"; tag = "v${version}"; - hash = "sha256-MWNvHHyf2qZxt83D22tTKR6EXAeAgcoXE1YjXHc9SwQ="; + hash = "sha256-NoHNmJ6z7eZTzjl8ps3wFY2e68FcoBsu5ZhE0NXt95g="; }; - vendorHash = "sha256-fCqAf0buqA6GajP7SIsVPyKM3jY2n9CbS5hpa3dsWbc="; + vendorHash = "sha256-SeLYVQI+ZIbR9qVaNyF89VUvXdfv1M5iM+Cbas6e2E0="; }