From 62f38a80e02dc7cf4a797785f8481b390863a944 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 02:51:41 +0100 Subject: [PATCH 01/16] 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 02/16] 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 03/16] 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 d9bb201fe4ced45c405c81547590e7ee83e2c7ac Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 07:31:40 +0100 Subject: [PATCH 04/16] 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 05/16] 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 06/16] 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 07/16] 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 08/16] 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 09/16] 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 10/16] 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 11/16] 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 12/16] 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 13/16] 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 14/16] 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 15/16] 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 16/16] 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 { };