From 323437cd6d959e98f0b1995f3d6184d5979fcbcb Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Fri, 26 Dec 2025 10:35:53 -0500 Subject: [PATCH] lice: migrate to by-name, modernize Signed-off-by: Ethan Carter Edwards --- .../li/lice/package.nix} | 18 ++++++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/{tools/misc/lice/default.nix => by-name/li/lice/package.nix} (53%) diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/by-name/li/lice/package.nix similarity index 53% rename from pkgs/tools/misc/lice/default.nix rename to pkgs/by-name/li/lice/package.nix index fb54089a231a..70cab7d98f00 100644 --- a/pkgs/tools/misc/lice/default.nix +++ b/pkgs/by-name/li/lice/package.nix @@ -1,24 +1,26 @@ { lib, - buildPythonPackage, + python3Packages, fetchPypi, - setuptools, - pytestCheckHook, }: -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "lice"; version = "0.6"; - format = "setuptools"; + pyproject = true; + # github is missing tags src = fetchPypi { inherit pname version; - sha256 = "0skyyirbidknfdzdvsjga8zb4ar6xpd5ilvz11dfm2a9yxh3d59d"; + hash = "sha256-LZU2YPdJiepaCH/TWNrtJiuyPlJP6t1+c3a2uHL0fmo="; }; - propagatedBuildInputs = [ setuptools ]; + build-system = [ python3Packages.setuptools ]; + + dependencies = [ python3Packages.setuptools ]; # pkg_resources + + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; - nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Print license based on selection and user options"; homepage = "https://github.com/licenses/lice"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02ee980f3aab..2e91648dcb92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13836,8 +13836,6 @@ with pkgs; } ); - lice = python3Packages.callPackage ../tools/misc/lice { }; - mysql-workbench = callPackage ../by-name/my/mysql-workbench/package.nix ( let mysql = mysql80;