2 files changed, 60 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/2.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/2.nix
new file mode 100644
index 000000000000..36764e64b860
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/2.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pyparsing
+, six
+, pytestCheckHook
+, pretend
+, flit-core
+}:
+
+# We keep 20.4 because it uses setuptools instead of flit-core
+# which requires Python 3 to build a universal wheel.
+
+buildPythonPackage rec {
+  pname = "packaging";
+  version = "20.4";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8";
+  };
+
+  propagatedBuildInputs = [ pyparsing six ];
+
+  checkInputs = [
+    pytestCheckHook
+    pretend
+  ];
+
+  # Prevent circular dependency
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Core utilities for Python packages";
+    homepage = "https://github.com/pypa/packaging";
+    license = [ licenses.bsd2 licenses.asl20 ];
+    maintainers = with maintainers; [ bennofs ];
+  };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/default.nix
index abe58d03ef37..061e8edaac6f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/default.nix
@@ -1,18 +1,33 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pyparsing, six, pytest, pretend }:
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pyparsing
+, six
+, pytestCheckHook
+, pretend
+, flit-core
+}:
 
 buildPythonPackage rec {
   pname = "packaging";
-  version = "20.4";
+  version = "20.7";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8";
+    sha256 = "Ba87uF0yA3fbKBzyVKsFDhp+vL9UEGhamkB+GKH4EjY=";
   };
 
+  nativeBuildInputs = [
+    flit-core
+  ];
+
   propagatedBuildInputs = [ pyparsing six ];
 
-  checkInputs = [ pytest pretend ];
+  checkInputs = [
+    pytestCheckHook
+    pretend
+  ];
 
   checkPhase = ''
     py.test tests