From 6acbb602567f31bc88f61915d203b49ee125054b Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 20 Apr 2025 09:50:45 +1200 Subject: [PATCH 1/3] gogdl: migrate to pkgs/by-name --- .../default.nix => by-name/go/gogdl/package.nix} | 11 ++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 9 deletions(-) rename pkgs/{games/gogdl/default.nix => by-name/go/gogdl/package.nix} (90%) diff --git a/pkgs/games/gogdl/default.nix b/pkgs/by-name/go/gogdl/package.nix similarity index 90% rename from pkgs/games/gogdl/default.nix rename to pkgs/by-name/go/gogdl/package.nix index 08161f7f3c1f..267a40076442 100644 --- a/pkgs/games/gogdl/default.nix +++ b/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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e90a4b4ccfe..8b87df10003c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17287,8 +17287,6 @@ with pkgs; libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; }; - gogdl = python3Packages.callPackage ../games/gogdl { }; - gscrabble = python3Packages.callPackage ../games/gscrabble { }; gshogi = callPackage ../games/gshogi { }; From 9a111f3bf704ebf39eade5325aa49214fdd6bfe2 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 20 Apr 2025 09:51:23 +1200 Subject: [PATCH 2/3] nile: migrate to pkgs/by-name --- .../default.nix => by-name/ni/nile/package.nix} | 16 ++++------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 14 deletions(-) rename pkgs/{games/nile/default.nix => by-name/ni/nile/package.nix} (80%) diff --git a/pkgs/games/nile/default.nix b/pkgs/by-name/ni/nile/package.nix similarity index 80% rename from pkgs/games/nile/default.nix rename to pkgs/by-name/ni/nile/package.nix index aa24289ba070..9362ace93a0d 100644 --- a/pkgs/games/nile/default.nix +++ b/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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b87df10003c..6da35dd1f4a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17396,8 +17396,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 { }; From de13f429d73f2ad17b8628cec1b3f9aacc3c4ccf Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 20 Apr 2025 09:51:45 +1200 Subject: [PATCH 3/3] heroic: migrate to pkgs/by-name --- .../he/heroic-unwrapped}/fix-non-steam-shortcuts.patch | 0 .../he/heroic-unwrapped/package.nix} | 6 +++++- .../heroic/fhsenv.nix => by-name/he/heroic/package.nix} | 0 pkgs/top-level/all-packages.nix | 7 ------- 4 files changed, 5 insertions(+), 8 deletions(-) rename pkgs/{games/heroic => by-name/he/heroic-unwrapped}/fix-non-steam-shortcuts.patch (100%) rename pkgs/{games/heroic/default.nix => by-name/he/heroic-unwrapped/package.nix} (97%) rename pkgs/{games/heroic/fhsenv.nix => by-name/he/heroic/package.nix} (100%) diff --git a/pkgs/games/heroic/fix-non-steam-shortcuts.patch b/pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch similarity index 100% rename from pkgs/games/heroic/fix-non-steam-shortcuts.patch rename to pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch diff --git a/pkgs/games/heroic/default.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix similarity index 97% rename from pkgs/games/heroic/default.nix rename to pkgs/by-name/he/heroic-unwrapped/package.nix index d04a3418037f..f6ac7868637f 100644 --- a/pkgs/games/heroic/default.nix +++ b/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"; diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/by-name/he/heroic/package.nix similarity index 100% rename from pkgs/games/heroic/fhsenv.nix rename to pkgs/by-name/he/heroic/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6da35dd1f4a3..045ae0e16037 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17030,13 +17030,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"; };