From 38f3ca749f9179d60c812ce57931f72c6e399aed Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 22 Oct 2025 13:50:35 -0500 Subject: [PATCH] various: migrate python3Packages to by-name --- .../aw/aws-mfa/package.nix} | 10 ++++----- .../fu/fusesoc/package.nix} | 15 ++++--------- .../git-annex-remote-googledrive/package.nix} | 15 ++++--------- .../gi/gita/package.nix} | 8 +++---- .../mp/mpy-utils/package.nix} | 8 +++---- .../ne/networkd-notify/package.nix} | 8 +++---- .../pa/pass-git-helper/package.nix} | 15 +++++-------- .../si/silver-platter/package.nix} | 15 ++++--------- pkgs/top-level/all-packages.nix | 22 ------------------- 9 files changed, 30 insertions(+), 86 deletions(-) rename pkgs/{tools/admin/aws-mfa/default.nix => by-name/aw/aws-mfa/package.nix} (86%) rename pkgs/{tools/package-management/fusesoc/default.nix => by-name/fu/fusesoc/package.nix} (78%) rename pkgs/{applications/version-management/git-annex-remote-googledrive/default.nix => by-name/gi/git-annex-remote-googledrive/package.nix} (80%) rename pkgs/{applications/version-management/gita/default.nix => by-name/gi/gita/package.nix} (88%) rename pkgs/{tools/misc/mpy-utils/default.nix => by-name/mp/mpy-utils/package.nix} (82%) rename pkgs/{tools/networking/networkd-notify/default.nix => by-name/ne/networkd-notify/package.nix} (92%) rename pkgs/{applications/version-management/pass-git-helper/default.nix => by-name/pa/pass-git-helper/package.nix} (77%) rename pkgs/{applications/version-management/silver-platter/default.nix => by-name/si/silver-platter/package.nix} (86%) diff --git a/pkgs/tools/admin/aws-mfa/default.nix b/pkgs/by-name/aw/aws-mfa/package.nix similarity index 86% rename from pkgs/tools/admin/aws-mfa/default.nix rename to pkgs/by-name/aw/aws-mfa/package.nix index 69b2a5a56622..722dd410729a 100644 --- a/pkgs/tools/admin/aws-mfa/default.nix +++ b/pkgs/by-name/aw/aws-mfa/package.nix @@ -1,13 +1,11 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, fetchpatch, - setuptools, - boto3, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "aws-mfa"; version = "0.0.12"; pyproject = true; @@ -28,11 +26,11 @@ buildPythonApplication rec { }) ]; - build-system = [ + build-system = with python3Packages; [ setuptools ]; - dependencies = [ + dependencies = with python3Packages; [ boto3 ]; diff --git a/pkgs/tools/package-management/fusesoc/default.nix b/pkgs/by-name/fu/fusesoc/package.nix similarity index 78% rename from pkgs/tools/package-management/fusesoc/default.nix rename to pkgs/by-name/fu/fusesoc/package.nix index d0bc6297d8fc..edbffdc3f641 100644 --- a/pkgs/tools/package-management/fusesoc/default.nix +++ b/pkgs/by-name/fu/fusesoc/package.nix @@ -1,19 +1,12 @@ { - buildPythonPackage, + python3Packages, fetchPypi, lib, iverilog, verilator, gnumake, - edalize, - fastjsonschema, - pyparsing, - pyyaml, - simplesat, - ipyxact, - setuptools-scm, }: -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "fusesoc"; version = "2.2.1"; format = "setuptools"; @@ -23,9 +16,9 @@ buildPythonPackage rec { hash = "sha256-M36bXBgY8hR33AVDlHoH8PZJG2Bi0KOEI07IMns7R4w="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = with python3Packages; [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ edalize fastjsonschema pyparsing diff --git a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix b/pkgs/by-name/gi/git-annex-remote-googledrive/package.nix similarity index 80% rename from pkgs/applications/version-management/git-annex-remote-googledrive/default.nix rename to pkgs/by-name/gi/git-annex-remote-googledrive/package.nix index 0802769513e3..0911145b906b 100644 --- a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix +++ b/pkgs/by-name/gi/git-annex-remote-googledrive/package.nix @@ -1,17 +1,10 @@ { lib, - annexremote, - buildPythonApplication, - drivelib, + python3Packages, fetchPypi, - gitpython, - humanfriendly, - tenacity, - setuptools, - distutils, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-annex-remote-googledrive"; version = "1.3.2"; pyproject = true; @@ -21,9 +14,9 @@ buildPythonApplication rec { sha256 = "0rwjcdvfgzdlfgrn1rrqwwwiqqzyh114qddrbfwd46ld5spry6r1"; }; - build-system = [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ annexremote drivelib gitpython diff --git a/pkgs/applications/version-management/gita/default.nix b/pkgs/by-name/gi/gita/package.nix similarity index 88% rename from pkgs/applications/version-management/gita/default.nix rename to pkgs/by-name/gi/gita/package.nix index 9eff4a03486b..58e01af67a53 100644 --- a/pkgs/applications/version-management/gita/default.nix +++ b/pkgs/by-name/gi/gita/package.nix @@ -1,13 +1,11 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - pyyaml, - setuptools, installShellFiles, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { version = "0.16.6.1"; format = "setuptools"; pname = "gita"; @@ -19,7 +17,7 @@ buildPythonApplication rec { owner = "nosarthur"; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ pyyaml setuptools ]; diff --git a/pkgs/tools/misc/mpy-utils/default.nix b/pkgs/by-name/mp/mpy-utils/package.nix similarity index 82% rename from pkgs/tools/misc/mpy-utils/default.nix rename to pkgs/by-name/mp/mpy-utils/package.nix index 03002933433a..a79791bdfdc0 100644 --- a/pkgs/tools/misc/mpy-utils/default.nix +++ b/pkgs/by-name/mp/mpy-utils/package.nix @@ -1,13 +1,11 @@ { stdenv, lib, - buildPythonApplication, + python3Packages, fetchPypi, - fusepy, - pyserial, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mpy-utils"; version = "0.1.13"; format = "setuptools"; @@ -17,7 +15,7 @@ buildPythonApplication rec { hash = "sha256-die8hseaidhs9X7mfFvV8C8zn0uyw08gcHNqmjl+2Z4="; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ fusepy pyserial ]; diff --git a/pkgs/tools/networking/networkd-notify/default.nix b/pkgs/by-name/ne/networkd-notify/package.nix similarity index 92% rename from pkgs/tools/networking/networkd-notify/default.nix rename to pkgs/by-name/ne/networkd-notify/package.nix index 316ef60a5672..cc3a0d7b35b0 100644 --- a/pkgs/tools/networking/networkd-notify/default.nix +++ b/pkgs/by-name/ne/networkd-notify/package.nix @@ -1,15 +1,13 @@ { lib, fetchFromGitLab, - buildPythonApplication, - dbus-python, - pygobject3, + python3Packages, systemd, wirelesstools, wrapGAppsNoGuiHook, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "networkd-notify"; version = "unstable-2022-11-29"; # There is no setup.py, just a single Python script. @@ -26,7 +24,7 @@ buildPythonApplication rec { wrapGAppsNoGuiHook ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ dbus-python pygobject3 ]; diff --git a/pkgs/applications/version-management/pass-git-helper/default.nix b/pkgs/by-name/pa/pass-git-helper/package.nix similarity index 77% rename from pkgs/applications/version-management/pass-git-helper/default.nix rename to pkgs/by-name/pa/pass-git-helper/package.nix index 1267fc3d2516..5552ad500974 100644 --- a/pkgs/applications/version-management/pass-git-helper/default.nix +++ b/pkgs/by-name/pa/pass-git-helper/package.nix @@ -1,15 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - pyxdg, - pytestCheckHook, - pytest-cov-stub, - pytest-mock, - setuptools, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pass-git-helper"; version = "4.0.0"; pyproject = true; @@ -21,15 +16,15 @@ buildPythonApplication rec { sha256 = "sha256-SAMndgcxBa7wymXbOwRGcoogFfzpFFIZ0tF4NSCXpjw="; }; - build-system = [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; - dependencies = [ pyxdg ]; + dependencies = with python3Packages; [ pyxdg ]; env.HOME = "$TMPDIR"; pythonImportsCheck = [ "passgithelper" ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-cov-stub pytest-mock diff --git a/pkgs/applications/version-management/silver-platter/default.nix b/pkgs/by-name/si/silver-platter/package.nix similarity index 86% rename from pkgs/applications/version-management/silver-platter/default.nix rename to pkgs/by-name/si/silver-platter/package.nix index e99884ebe5a8..4834f13ab601 100644 --- a/pkgs/applications/version-management/silver-platter/default.nix +++ b/pkgs/by-name/si/silver-platter/package.nix @@ -1,24 +1,17 @@ { - buildPythonApplication, + python3Packages, lib, stdenv, fetchFromGitHub, pkg-config, - setuptools, - setuptools-rust, rustPlatform, cargo, rustc, - breezy, - dulwich, - jinja2, libiconv, openssl, - pyyaml, - ruamel-yaml, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "silver-platter"; version = "0.5.20"; pyproject = true; @@ -35,7 +28,7 @@ buildPythonApplication rec { hash = "sha256-hZQfzaLvHSN/hGR5vn+/2TRH6GwDTTp+UcnePXY7JlM="; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ setuptools breezy dulwich @@ -44,7 +37,7 @@ buildPythonApplication rec { ruamel-yaml ]; nativeBuildInputs = [ - setuptools-rust + python3Packages.setuptools-rust rustPlatform.cargoSetupHook cargo rustc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f7d72bf5914..21cdad1be483 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1083,12 +1083,6 @@ with pkgs; mkosi-full = mkosi.override { withQemu = true; }; - mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { }; - - networkd-notify = python3Packages.callPackage ../tools/networking/networkd-notify { - systemd = pkgs.systemd; - }; - ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; @@ -1217,8 +1211,6 @@ with pkgs; forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; - gita = python3Packages.callPackage ../applications/version-management/gita { }; - github-cli = gh; git-annex-metadata-gui = @@ -1236,10 +1228,6 @@ with pkgs; ; }; - git-annex-remote-googledrive = - python3Packages.callPackage ../applications/version-management/git-annex-remote-googledrive - { }; - git-credential-manager = callPackage ../applications/version-management/git-credential-manager { }; gitRepo = git-repo; @@ -1255,14 +1243,8 @@ with pkgs; ; }; - pass-git-helper = - python3Packages.callPackage ../applications/version-management/pass-git-helper - { }; - qgit = qt6Packages.callPackage ../applications/version-management/qgit { }; - silver-platter = python3Packages.callPackage ../applications/version-management/silver-platter { }; - svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/svn-all-fast-export { }; @@ -1324,8 +1306,6 @@ with pkgs; firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; - fusesoc = python3Packages.callPackage ../tools/package-management/fusesoc { }; - gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; @@ -1547,8 +1527,6 @@ with pkgs; autoflake = with python3.pkgs; toPythonApplication autoflake; - aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { }; - azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; # Derivation's result is not used by nixpkgs. Useful for validation for