various: move to pkgs/by-name (#482587)

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

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 ];

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

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 = {

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

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;
   };
 }

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;
   };

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
   ];
 

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";

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
   ];
 

pkgs/by-name/gp/gpm/package.nix

@@ -10,7 +10,7 @@
   texinfo,
   fetchpatch,
   pkgsStatic,
-  withNcurses ? true,
+  withNcurses ? false,
   ncurses,
 }:
 

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
 

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 = [ ];
   };
-}
+})

pkgs/by-name/op/openttd-jgrpp/package.nix

@@ -2,7 +2,6 @@
   fetchFromGitHub,
   openttd,
   zstd,
-  ...
 }:
 
 openttd.overrideAttrs (oldAttrs: rec {

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

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";

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
   ];

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
   ];

pkgs/servers/hockeypuck/sources.nix

@@ -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";
-  };
-}

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;
@@ -2798,10 +2794,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 { };
@@ -8587,8 +8579,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 { };
@@ -8598,8 +8588,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 {
@@ -8607,10 +8595,6 @@ with pkgs;
     withExtraLuaPackages = _: [ ];
   };
 
-  felix = callPackage ../servers/felix { };
-
-  felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { };
-
   inherit (callPackages ../servers/firebird { })
     firebird_4
     firebird_3
@@ -9341,10 +9325,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; };
@@ -11904,10 +11884,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;
   };
@@ -12229,8 +12205,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;
   };
@@ -12245,28 +12219,20 @@ with pkgs;
 
   cataclysm-dda-git = cataclysmDDA.git.tiles;
 
-  cockatrice = libsForQt5.callPackage ../games/cockatrice {
-    protobuf = protobuf_21;
-  };
-
-  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 {
     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; };
 
@@ -12399,39 +12365,11 @@ 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
-    stdenv = gccStdenv;
-  };
-
   papermcServers = callPackages ../games/papermc { };
 
   papermc = papermcServers.papermc;
 
-  pentobi = libsForQt5.callPackage ../games/pentobi { };
-
-  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
@@ -13150,11 +13088,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;
   };