various: remove by-name overrides (part 2)

pkgs/by-name/gu/guile-xcb/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  guile,
+  guile_2_2,
   pkg-config,
   texinfo,
 }:
@@ -24,13 +24,13 @@ stdenv.mkDerivation {
     pkg-config
   ];
   buildInputs = [
-    guile
+    guile_2_2
     texinfo
   ];
 
   configureFlags = [
-    "--with-guile-site-dir=$(out)/${guile.siteDir}"
-    "--with-guile-site-ccache-dir=$(out)/${guile.siteCcacheDir}"
+    "--with-guile-site-dir=$(out)/${guile_2_2.siteDir}"
+    "--with-guile-site-ccache-dir=$(out)/${guile_2_2.siteCcacheDir}"
   ];
 
   makeFlags = [
@@ -42,6 +42,6 @@ stdenv.mkDerivation {
     description = "XCB bindings for Guile";
     license = lib.licenses.gpl3Plus;
     maintainers = [ ];
-    platforms = guile.meta.platforms;
+    platforms = guile_2_2.meta.platforms;
   };
 }

pkgs/by-name/li/libkazv/package.nix

@@ -8,7 +8,7 @@
   cryptopp,
   immer,
   lager,
-  libcpr,
+  libcpr_1_10_5,
   libhttpserver,
   libmicrohttpd,
   nlohmann_json,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     cryptopp
     immer
     lager
-    libcpr
+    libcpr_1_10_5
     libhttpserver
     libmicrohttpd
     olm

pkgs/by-name/ns/nsxiv/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitea,
   giflib,
-  imlib2,
+  imlib2Full,
   libXft,
   libexif,
   libwebp,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     giflib
-    imlib2
+    imlib2Full
     libXft
     libexif
     libwebp

pkgs/by-name/pe/pekwm/package.nix

@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  awk,
+  gawk,
   cmake,
-  grep,
+  gnugrep,
   libXext,
   libXft,
   libXinerama,
@@ -14,7 +14,7 @@
   libpng,
   pkg-config,
   runtimeShell,
-  sed,
+  gnused,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   cmakeFlags = [
-    "-DAWK=${lib.getBin awk}/bin/awk"
-    "-DGREP=${lib.getBin grep}/bin/grep"
-    "-DSED=${lib.getBin sed}/bin/sed"
+    "-DAWK=${lib.getBin gawk}/bin/awk"
+    "-DGREP=${lib.getBin gnugrep}/bin/grep"
+    "-DSED=${lib.getBin gnused}/bin/sed"
     "-DSH=${runtimeShell}"
   ];
 

pkgs/by-name/re/renpy/package.nix

@@ -12,7 +12,7 @@
   libpng,
   makeWrapper,
   pkg-config,
-  python3,
+  python312,
   SDL2,
   stdenv,
   versionCheckHook,
@@ -21,7 +21,7 @@
 }:
 
 let
-  python = python3;
+  python = python312;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "renpy";

pkgs/by-name/ri/ricochet-refresh/package.nix

@@ -4,7 +4,8 @@
   fetchFromGitHub,
   qt5,
   openssl,
-  protobuf,
+  # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178
+  protobuf_21,
   pkg-config,
   cmake,
 }:
@@ -35,12 +36,12 @@ stdenv.mkDerivation (finalAttrs: {
     ])
     ++ [
       openssl
-      protobuf
+      protobuf_21
     ];
 
   nativeBuildInputs = [
     pkg-config
-    protobuf
+    protobuf_21
     cmake
     qt5.wrapQtAppsHook
   ];

pkgs/by-name/sh/shadps4/package.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  gcc14Stdenv,
   fetchFromGitHub,
 
   nixosTests,
@@ -54,7 +54,8 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+# relies on std::sinf & co, which was broken in GCC until GCC 14: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79700
+gcc14Stdenv.mkDerivation (finalAttrs: {
   pname = "shadps4";
   version = "0.13.0";
 

pkgs/by-name/si/sile/package.nix

@@ -13,7 +13,7 @@
   luarocks,
 
   # buildInputs
-  lua,
+  luajit,
   harfbuzz,
   icu,
   fontconfig,
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     # build time we would fail to build since we only provide it at test time.
     "PDFINFO=false"
   ]
-  ++ lib.optionals (!lua.pkgs.isLuaJIT) [
+  ++ lib.optionals (!luajit.pkgs.isLuaJIT) [
     "--without-luajit"
   ];
 
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Use this passthru variable to add packages to your lua environment. Use
     # something like this in your development environment:
     #
-    # myLuaEnv = lua.withPackages (
+    # myLuaEnv = luajit.withPackages (
     #  ps: lib.attrVals (sile.passthru.luaPackages ++ [
     #    "lua-cjson"
     #    "lua-resty-http"
@@ -142,13 +142,13 @@ stdenv.mkDerivation (finalAttrs: {
       "ldoc"
       # NOTE: Add lua packages here, to change the luaEnv also read by `flake.nix`
     ]
-    ++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [
+    ++ lib.optionals (lib.versionOlder luajit.luaversion "5.2") [
       "bit32"
     ]
-    ++ lib.optionals (lib.versionOlder lua.luaversion "5.3") [
+    ++ lib.optionals (lib.versionOlder luajit.luaversion "5.3") [
       "compat53"
     ];
-    luaEnv = lua.withPackages (ps: lib.attrVals finalAttrs.finalPackage.passthru.luaPackages ps);
+    luaEnv = luajit.withPackages (ps: lib.attrVals finalAttrs.finalPackage.passthru.luaPackages ps);
 
     # Copied from Makefile.am
     tests.test = lib.optionalAttrs (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) (

pkgs/top-level/all-packages.nix

@@ -780,10 +780,6 @@ with pkgs;
     propagatedBuildInputs = [ dieHook ];
   } ../build-support/setup-hooks/shorten-perl-shebang.sh;
 
-  sile = callPackage ../by-name/si/sile/package.nix {
-    lua = luajit;
-  };
-
   singularity-tools = callPackage ../build-support/singularity-tools { };
 
   srcOnly = callPackage ../build-support/src-only { };
@@ -1315,11 +1311,6 @@ with pkgs;
     withWayland = true;
   };
 
-  shadps4 = callPackage ../by-name/sh/shadps4/package.nix {
-    # relies on std::sinf & co, which was broken in GCC until GCC 14: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79700
-    stdenv = gcc14Stdenv;
-  };
-
   winetricks = callPackage ../applications/emulators/wine/winetricks.nix { };
 
   zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };
@@ -2024,8 +2015,6 @@ with pkgs;
 
   psrecord = python3Packages.callPackage ../tools/misc/psrecord { };
 
-  renpy = callPackage ../by-name/re/renpy/package.nix { python3 = python312; };
-
   remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };
 
   ropgadget = with python3Packages; toPythonApplication ropgadget;
@@ -5702,10 +5691,6 @@ with pkgs;
 
   guile = guile_3_0;
 
-  guile-xcb = callPackage ../by-name/gu/guile-xcb/package.nix {
-    guile = guile_2_2;
-  };
-
   msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { };
 
   msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { };
@@ -9905,10 +9890,6 @@ with pkgs;
 
   polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { };
 
-  ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix {
-    protobuf = protobuf_21; # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178
-  };
-
   scheherazade-new = scheherazade.override {
     version = "4.400";
   };
@@ -11216,12 +11197,6 @@ with pkgs;
 
   parsec-bin = callPackage ../applications/misc/parsec/bin.nix { };
 
-  pekwm = callPackage ../by-name/pe/pekwm/package.nix {
-    awk = gawk;
-    grep = gnugrep;
-    sed = gnused;
-  };
-
   pdfpc = callPackage ../applications/misc/pdfpc {
     inherit (gst_all_1)
       gstreamer
@@ -11460,10 +11435,6 @@ with pkgs;
     imlib2 = imlib2Full;
   };
 
-  nsxiv = callPackage ../by-name/ns/nsxiv/package.nix {
-    imlib2 = imlib2Full;
-  };
-
   dropbox = callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { };
@@ -13599,10 +13570,6 @@ with pkgs;
     fltk = fltk_1_3;
   };
 
-  libkazv = callPackage ../by-name/li/libkazv/package.nix {
-    libcpr = libcpr_1_10_5;
-  };
-
   libpostalWithData = callPackage ../by-name/li/libpostal/package.nix {
     withData = true;
   };