From b2534aa0cb31978b41c3dbb0fe11ffec02e91d9f Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 7 May 2021 11:05:41 -0700 Subject: [PATCH] python3.pkgs.tern: replace debut with debian-inspector debut was renamed to debian-inspector. I didn't realize at the time that these were two of the very same packages. --- ...-Replace-debut-with-debian-inspector.patch | 40 +++++++++++++++++++ .../python-modules/tern/default.nix | 12 +++++- 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch diff --git a/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch b/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch new file mode 100644 index 00000000000..c9cb8b4a528 --- /dev/null +++ b/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch @@ -0,0 +1,40 @@ +From d944d8fa6cb6d1667f3e4c4e0cff4c4b2a7c0a30 Mon Sep 17 00:00:00 2001 +From: Cole Helbling +Date: Fri, 7 May 2021 11:00:46 -0700 +Subject: [PATCH] Replace `debut` with `debian-inspector` + +--- + requirements.in | 2 +- + tern/analyze/common.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/requirements.in b/requirements.in +index edd90ab..5135841 100644 +--- a/requirements.in ++++ b/requirements.in +@@ -12,6 +12,6 @@ requests + stevedore + pbr + dockerfile-parse +-debut ++debian-inspector + regex + GitPython +diff --git a/tern/analyze/common.py b/tern/analyze/common.py +index 6962404..0f5e77d 100644 +--- a/tern/analyze/common.py ++++ b/tern/analyze/common.py +@@ -19,8 +19,8 @@ from tern.utils import cache + from tern.utils import constants + from tern.utils import general + from tern.utils import rootfs +-from debut import debcon +-from debut import copyright as debut_copyright ++from debian_inspector import debcon ++from debian_inspector import copyright as debut_copyright + + # global logger + logger = logging.getLogger(constants.logger_name) +-- +2.31.1 + diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 6247087dd67..7eb889c873a 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -7,7 +7,7 @@ , requests , stevedore , pbr -, debut +, debian-inspector , regex , GitPython , prettytable @@ -22,6 +22,14 @@ buildPythonPackage rec { sha256 = "606c62944991b2cbcccf3f5353be693305d6d7d318c3865b9ecca49dbeab2727"; }; + patches = [ + # debut was renamed to debian-inspector + # https://github.com/tern-tools/tern/pull/962 + # NOTE: Has to be in-tree because the upstream patch doesn't apply cleanly + # to the PyPi source. + ./0001-Replace-debut-with-debian-inspector.patch + ]; + preBuild = '' cp requirements.{in,txt} ''; @@ -36,7 +44,7 @@ buildPythonPackage rec { dockerfile-parse requests stevedore - debut + debian-inspector regex GitPython prettytable