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 deleted file mode 100644 index c9cb8b4a5281..000000000000 --- a/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 e00e06561f02..0468ee6f84b1 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -13,6 +13,7 @@ , prettytable , idna }: + buildPythonPackage rec { pname = "tern"; version = "2.6.1"; @@ -22,14 +23,6 @@ buildPythonPackage rec { sha256 = "749c18ef493ebe3ac28624b2b26c6e38f77de2afd6a6579d2c92393d8fbdbd46"; }; - 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} '';