{herotic,nile,gogdl}: migrate to pkgs/by-name (#400187)

pkgs/by-name/go/gogdl/package.nix

@@ -1,15 +1,12 @@
 {
   lib,
   writeScript,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  pythonOlder,
-  setuptools,
-  requests,
   cacert,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "gogdl";
   version = "1.1.2";
   format = "pyproject";
@@ -21,9 +18,9 @@ buildPythonApplication rec {
     hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0=";
   };
 
-  disabled = pythonOlder "3.8";
+  disabled = python3Packages.pythonOlder "3.8";
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     setuptools
     requests
   ];

pkgs/by-name/he/heroic-unwrapped/package.nix

@@ -7,7 +7,8 @@
   nodejs,
   python3,
   makeWrapper,
-  electron,
+  # Upstream uses EOL Electron 31.  Use next oldest version.
+  electron_33,
   vulkan-helper,
   gogdl,
   legendary-heroic,
@@ -15,6 +16,9 @@
   comet-gog,
 }:
 
+let
+  electron = electron_33;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "heroic-unwrapped";
   version = "2.16.1";

pkgs/by-name/ni/nile/package.nix

@@ -1,22 +1,14 @@
 {
   lib,
   gitUpdater,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  pythonOlder,
-  setuptools,
-  requests,
-  protobuf,
-  pycryptodome,
-  zstandard,
-  json5,
-  platformdirs,
 }:
 
 let
   version = "1.1.2";
 in
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "nile";
   inherit version;
   format = "pyproject";
@@ -28,9 +20,9 @@ buildPythonApplication {
     hash = "sha256-/C4b8wPKWHGgiheuAN7AvU+KcD5aj5i6KzgFSdTIkNI=";
   };
 
-  disabled = pythonOlder "3.8";
+  disabled = python3Packages.pythonOlder "3.8";
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     setuptools
     requests
     protobuf

pkgs/top-level/all-packages.nix

@@ -17023,13 +17023,6 @@ with pkgs;
     fteqcc
     ;
 
-  heroic-unwrapped = callPackage ../games/heroic {
-    # Upstream uses EOL Electron 31.  Use next oldest version.
-    electron = electron_33;
-  };
-
-  heroic = callPackage ../games/heroic/fhsenv.nix { };
-
   pmars-x11 = pmars.override { enableXwinGraphics = true; };
 
   vanillatd = callPackage ../by-name/va/vanillatd/package.nix { appName = "vanillatd"; };
@@ -17280,8 +17273,6 @@ with pkgs;
     libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
   };
 
-  gogdl = python3Packages.callPackage ../games/gogdl { };
-
   gscrabble = python3Packages.callPackage ../games/gscrabble { };
 
   gshogi = callPackage ../games/gshogi { };
@@ -17391,8 +17382,6 @@ with pkgs;
 
   nethack-x11 = callPackage ../games/nethack { x11Mode = true; };
 
-  nile = python3Packages.callPackage ../games/nile { };
-
   npush = callPackage ../games/npush { };
   run-npush = callPackage ../games/npush/run.nix { };