From f5e50b74a0d797dec009c9f41a712b11f1b55c04 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 10 Dec 2024 20:08:40 +0000 Subject: [PATCH 1/4] treewide: rename python3Packages.debian -> python3Packages.python-debian --- pkgs/by-name/mi/microsoft-edge/update.py | 2 +- pkgs/by-name/sn/snapcraft/package.nix | 2 +- pkgs/development/python-modules/craft-archives/default.nix | 2 ++ .../python-modules/{debian => python-debian}/default.nix | 0 pkgs/development/python-modules/reuse/default.nix | 4 ++-- pkgs/development/tools/click/default.nix | 4 ++-- pkgs/tools/misc/diffoscope/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 9 files changed, 12 insertions(+), 9 deletions(-) rename pkgs/development/python-modules/{debian => python-debian}/default.nix (100%) diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py index c9a048d504c8..e0d007c12f17 100755 --- a/pkgs/by-name/mi/microsoft-edge/update.py +++ b/pkgs/by-name/mi/microsoft-edge/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian common-updater-scripts +#! nix-shell -i python3 -p python3Packages.packaging python3Packages.python-debian common-updater-scripts import base64 import textwrap diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 93469dd546ef..963dcdb21e64 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -82,7 +82,7 @@ python3Packages.buildPythonApplication rec { craft-platforms craft-providers craft-store - debian + python-debian docutils jsonschema launchpadlib diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index f401b5fb5294..c0d72355263d 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -8,6 +8,7 @@ overrides, pydantic, setuptools, + python-debian, setuptools-scm, tabulate, pytest-check, @@ -44,6 +45,7 @@ buildPythonPackage rec { overrides pydantic tabulate + python-debian ]; pythonImportsCheck = [ "craft_archives" ]; diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/python-debian/default.nix similarity index 100% rename from pkgs/development/python-modules/debian/default.nix rename to pkgs/development/python-modules/python-debian/default.nix diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix index 19ce6386b45e..2048406fd23f 100644 --- a/pkgs/development/python-modules/reuse/default.nix +++ b/pkgs/development/python-modules/reuse/default.nix @@ -14,7 +14,7 @@ binaryornot, boolean-py, click, - debian, + python-debian, jinja2, license-expression, tomlkit, @@ -56,7 +56,7 @@ buildPythonPackage rec { binaryornot boolean-py click - debian + python-debian jinja2 license-expression tomlkit diff --git a/pkgs/development/tools/click/default.nix b/pkgs/development/tools/click/default.nix index b703b2a4eb63..97950147254c 100644 --- a/pkgs/development/tools/click/default.nix +++ b/pkgs/development/tools/click/default.nix @@ -3,7 +3,7 @@ fetchFromGitLab, buildPythonApplication, autoreconfHook, - debian, + python-debian, perl, vala, pkg-config, @@ -78,7 +78,7 @@ buildPythonApplication { ]; propagatedBuildInputs = [ - debian + python-debian pygobject3 setuptools ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index b71bf958f32b..e7ff78a8a542 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -190,7 +190,7 @@ python.pkgs.buildPythonApplication rec { ] ++ (with python.pkgs; [ argcomplete - debian + python-debian defusedxml jsbeautifier jsondiff diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7c18c3d69dd2..5d188743792e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -136,6 +136,7 @@ mapAliases ({ d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30 dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24 dateutil = python-dateutil; # added 2021-07-03 + debian = python-debian; # added 2024-12-10 deep_merge = throw "deep_merge has been removed, since it is no longer maintained and may be broken."; # added 2023-10-09 demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 descartes = throw "descartes has been removed, since it is abandoned and broken"; # added 2023-06-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 635c2d2ac947..e8b241bfcd40 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3058,8 +3058,6 @@ self: super: with self; { deap = callPackage ../development/python-modules/deap { }; - debian = callPackage ../development/python-modules/debian { }; - debianbts = callPackage ../development/python-modules/debianbts { }; debian-inspector = callPackage ../development/python-modules/debian-inspector { }; @@ -9362,6 +9360,8 @@ self: super: with self; { python-bugzilla = callPackage ../development/python-modules/python-bugzilla { }; + python-debian = callPackage ../development/python-modules/python-debian { }; + python-hcl2 = callPackage ../development/python-modules/python-hcl2 { }; python-lorem = callPackage ../development/python-modules/python-lorem { }; From 800a740ea8437feec6c4814fe25318f6112e4e5c Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 10 Dec 2024 17:45:54 +0000 Subject: [PATCH 2/4] python3Packages.craft-archives: 2.0.0 -> 2.0.2 --- .../python-modules/craft-archives/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index c0d72355263d..efa3965a4128 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -5,12 +5,12 @@ nix-update-script, launchpadlib, lazr-restfulclient, + lazr-uri, overrides, pydantic, - setuptools, python-debian, + distro, setuptools-scm, - tabulate, pytest-check, pytest-mock, pytestCheckHook, @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "craft-archives"; - version = "2.0.0"; + version = "2.0.2"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-archives"; rev = "refs/tags/${version}"; - hash = "sha256-BrKyOdfbwt9qU5Bt/kX/+GgxH7LCFmmFg4mevBWVp2I="; + hash = "sha256-1HEz4d1WLQDDHga7X+V/37n8E7JK/k0z+UDeNEiLOHs="; }; postPatch = '' @@ -40,11 +40,12 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; dependencies = [ + distro launchpadlib lazr-restfulclient + lazr-uri overrides pydantic - tabulate python-debian ]; From 778e494d9eb13e5e9270181ffb46c11ba3ff5258 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 10 Dec 2024 17:50:30 +0000 Subject: [PATCH 3/4] python3Packages.craft-parts: 2.1.3 -> 2.1.4 --- pkgs/development/python-modules/craft-parts/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index 2edba40f9465..bececc2a50de 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -9,7 +9,6 @@ pyyaml, requests, requests-unixsocket, - urllib3, pytestCheckHook, pytest-check, pytest-mock, @@ -25,7 +24,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "2.1.3"; + version = "2.1.4"; pyproject = true; @@ -33,7 +32,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; rev = "refs/tags/${version}"; - hash = "sha256-ouvl4mIDIWHWp84E1I41g/XnP22kCV55CqsVLit5yb4="; + hash = "sha256-z0Om1/0Y6fDFHXB0GKFelmYwNwTH7loTtRjXtmjsjkY="; }; patches = [ ./bash-path.patch ]; @@ -53,7 +52,6 @@ buildPythonPackage rec { pyyaml requests requests-unixsocket - urllib3 ]; pythonImportsCheck = [ "craft_parts" ]; From e6c72076b497a6361b43876f17c121efe7fb86c9 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 10 Dec 2024 19:49:56 +0000 Subject: [PATCH 4/4] rockcraft: add tabulate to check inputs --- pkgs/by-name/ro/rockcraft/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix index aff67bc26408..4b544879a611 100644 --- a/pkgs/by-name/ro/rockcraft/package.nix +++ b/pkgs/by-name/ro/rockcraft/package.nix @@ -42,6 +42,7 @@ python3Packages.buildPythonApplication rec { pytest-mock pytest-subprocess pytestCheckHook + tabulate ] ++ [ dpkg ];