From 9058cdef7d8435fd92fbee5990eaf11fe26dfc26 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 3 Aug 2023 07:42:56 -0700 Subject: [PATCH 1/2] python2.pkgs.backports-functools-lru-cache: init at 1.6.6 --- .../backports-functools-lru-cache/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python2-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python2-modules/backports-functools-lru-cache/default.nix diff --git a/pkgs/development/python2-modules/backports-functools-lru-cache/default.nix b/pkgs/development/python2-modules/backports-functools-lru-cache/default.nix new file mode 100644 index 000000000000..859bb6b8d91a --- /dev/null +++ b/pkgs/development/python2-modules/backports-functools-lru-cache/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "backports-functools-lru-cache"; + version = "1.6.6"; + format = "pyproject"; + + src = fetchPypi { + pname = "backports.functools_lru_cache"; + inherit version; + hash = "sha256-e3DnAbpNtYwO2GcanTORsKu5vRvCTU6Qw0gPS6r8wtw="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + # circular dependency: + # backports-functools-lru-cache -> pytest -> wc-width -> backports-functools-lru-cache + doCheck = false; + + pythonImportsCheck = [ + "backports.functools_lru_cache" + ]; + + meta = { + description = "Backport of functools.lru_cache"; + homepage = "https://github.com/jaraco/backports.functools_lru_cache"; + license = lib.licenses.mit; + }; +} + diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 1a19118678eb..c791f4359f63 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -7,6 +7,8 @@ self: super: with self; with super; { attrs = callPackage ../development/python2-modules/attrs { }; + backports-functools-lru-cache = callPackage ../development/python2-modules/backports-functools-lru-cache { }; + bootstrapped-pip = toPythonModule (callPackage ../development/python2-modules/bootstrapped-pip { }); cffi = callPackage ../development/python2-modules/cffi { inherit cffi; }; From 809de4d2107ce19971a8f577dbbb5436b3adcacc Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 3 Aug 2023 07:43:49 -0700 Subject: [PATCH 2/2] python2.pkgs.wcwidth: add missing python2 dependency --- pkgs/development/python2-modules/wcwidth/default.nix | 10 ++++++++++ pkgs/top-level/python2-packages.nix | 4 ++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/python2-modules/wcwidth/default.nix diff --git a/pkgs/development/python2-modules/wcwidth/default.nix b/pkgs/development/python2-modules/wcwidth/default.nix new file mode 100644 index 000000000000..8424fa462503 --- /dev/null +++ b/pkgs/development/python2-modules/wcwidth/default.nix @@ -0,0 +1,10 @@ +{ backports-functools-lru-cache +, wcwidth +}: + +wcwidth.overridePythonAttrs(oldAttrs: { + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ + backports-functools-lru-cache + ]; +}) + diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index c791f4359f63..7b36e82f99fb 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -83,6 +83,10 @@ with self; with super; { doCheck = false; # circular dependency with pytest }); + wcwidth = callPackage ../development/python2-modules/wcwidth { + inherit wcwidth; + }; + wheel = callPackage ../development/python2-modules/wheel { }; zeek = disabled super.zeek;