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