From 71658b3af0c60caad692329d6ebcd4a7aab1e040 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 31 Dec 2021 16:20:03 -0500
Subject: [PATCH] more packaging fixes

---
 default.nix | 6 ++++++
 setup.cfg   | 4 ++++
 shell.nix   | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index 5166f55..18dba97 100644
--- a/default.nix
+++ b/default.nix
@@ -53,11 +53,17 @@ in
       #   this another way, dependencies have undetected dependencies, easier
       #   to just use the wheel.
       collections-extended = "wheel";
+      # same as collections-extended
+      isort = "wheel";
 
       # From nixpkgs or sdist, fails with
       # cp: cannot stat 'benchmark/': No such file or directory
       # cp: cannot stat 'tests/': No such file or directory
       tomli = "wheel";
+
+      # repo re-org or something?
+      # find: ‘hypothesis-6.32.1/hypothesis-python’: No such file or directory
+      hypothesis = "wheel";
     };
   in
     rec {
diff --git a/setup.cfg b/setup.cfg
index 65fd066..fe4b45c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -53,6 +53,10 @@ install_requires =
     # install cross-platform.
     colorama
 
+    # Python 3 transition
+    six
+    future
+
 [options.extras_require]
 test = coverage; fixtures; testtools; hypothesis
 
diff --git a/shell.nix b/shell.nix
index 5f5d648..023fc1b 100644
--- a/shell.nix
+++ b/shell.nix
@@ -6,7 +6,7 @@ let
   inherit (tests) pkgs;
 in
 pkgs.mkShell {
-  packages = [
+  buildInputs = [
     tests.python
     tests.lint-python
     pkgs.niv
-- 
GitLab