From 1711fcc6770ee0069948fd250b17b4c91a45c5aa Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 4 Feb 2026 08:49:32 -0600 Subject: [PATCH] gnome-extensions-cli: migrate to by-name, use pep517 & finalAttrs --- .../gn/gnome-extensions-cli/package.nix} | 34 ++++++++----------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 15 insertions(+), 21 deletions(-) rename pkgs/{desktops/gnome/misc/gnome-extensions-cli/default.nix => by-name/gn/gnome-extensions-cli/package.nix} (68%) diff --git a/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix b/pkgs/by-name/gn/gnome-extensions-cli/package.nix similarity index 68% rename from pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix rename to pkgs/by-name/gn/gnome-extensions-cli/package.nix index c30d5281ed2f..374c556816b9 100644 --- a/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix +++ b/pkgs/by-name/gn/gnome-extensions-cli/package.nix @@ -1,32 +1,24 @@ { lib, fetchPypi, - buildPythonApplication, - poetry-core, - colorama, - packaging, - pydantic, - requests, - pygobject3, - tqdm, + python3Packages, gobject-introspection, wrapGAppsNoGuiHook, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "gnome-extensions-cli"; version = "0.10.8"; pyproject = true; src = fetchPypi { pname = "gnome_extensions_cli"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Tnf8BbW9u7d19ZtGTdMVHa6azbKekYRGOPEPNiB+y00="; }; nativeBuildInputs = [ gobject-introspection - poetry-core wrapGAppsNoGuiHook ]; @@ -35,13 +27,17 @@ buildPythonApplication rec { "packaging" ]; - propagatedBuildInputs = [ - colorama - packaging - pydantic - requests - pygobject3 - tqdm + build-system = [ + python3Packages.poetry-core + ]; + + dependencies = [ + python3Packages.colorama + python3Packages.packaging + python3Packages.pydantic + python3Packages.requests + python3Packages.pygobject3 + python3Packages.tqdm ]; pythonImportsCheck = [ @@ -55,4 +51,4 @@ buildPythonApplication rec { maintainers = with lib.maintainers; [ dylanmtaylor ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04233628ff37..3dfcf1a1a2ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12067,8 +12067,6 @@ with pkgs; gnome49Extensions ; - gnome-extensions-cli = python3Packages.callPackage ../desktops/gnome/misc/gnome-extensions-cli { }; - gnome-session-ctl = callPackage ../by-name/gn/gnome-session/ctl.nix { }; lomiri = recurseIntoAttrs (callPackage ../desktops/lomiri { });