From 6acbb602567f31bc88f61915d203b49ee125054b Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 20 Apr 2025 09:50:45 +1200 Subject: [PATCH] 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 { };