From c9c86d8b64bc2e1b22d9d45ca3bf92a6ccaa8974 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 9 Feb 2026 19:02:09 -0600 Subject: [PATCH] linode-cli: migrate to by-name --- .../li/linode-cli/package.nix} | 31 +++++++------------ .../li}/linode-cli/remove-update-check.patch | 0 .../li}/linode-cli/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 11 insertions(+), 22 deletions(-) rename pkgs/{tools/virtualization/linode-cli/default.nix => by-name/li/linode-cli/package.nix} (84%) rename pkgs/{tools/virtualization => by-name/li}/linode-cli/remove-update-check.patch (100%) rename pkgs/{tools/virtualization => by-name/li}/linode-cli/update.sh (100%) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/by-name/li/linode-cli/package.nix similarity index 84% rename from pkgs/tools/virtualization/linode-cli/default.nix rename to pkgs/by-name/li/linode-cli/package.nix index 831e8dbf2440..6f1a01b9bb3f 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/by-name/li/linode-cli/package.nix @@ -1,19 +1,10 @@ { stdenv, - buildPythonApplication, - colorclass, fetchPypi, fetchurl, installShellFiles, lib, - linode-metadata, - openapi3, - packaging, - pyyaml, - requests, - rich, - setuptools, - terminaltables, + python3Packages, }: let @@ -28,7 +19,7 @@ let in -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "linode-cli"; version = "5.56.2"; pyproject = true; @@ -56,15 +47,15 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; propagatedBuildInputs = [ - colorclass - linode-metadata - pyyaml - requests - setuptools - terminaltables - rich - openapi3 - packaging + python3Packages.colorclass + python3Packages.linode-metadata + python3Packages.pyyaml + python3Packages.requests + python3Packages.setuptools + python3Packages.terminaltables + python3Packages.rich + python3Packages.openapi3 + python3Packages.packaging ]; doInstallCheck = true; diff --git a/pkgs/tools/virtualization/linode-cli/remove-update-check.patch b/pkgs/by-name/li/linode-cli/remove-update-check.patch similarity index 100% rename from pkgs/tools/virtualization/linode-cli/remove-update-check.patch rename to pkgs/by-name/li/linode-cli/remove-update-check.patch diff --git a/pkgs/tools/virtualization/linode-cli/update.sh b/pkgs/by-name/li/linode-cli/update.sh similarity index 100% rename from pkgs/tools/virtualization/linode-cli/update.sh rename to pkgs/by-name/li/linode-cli/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4579e14b233f..beb49b3822c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12869,8 +12869,6 @@ with pkgs; chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing { }; - linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli { }; - phonetisaurus = callPackage ../development/libraries/phonetisaurus { # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70 openfst = openfst.overrideAttrs rec {