From fad96f62d0380336856bcf8a6328ad905e96dbef Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 14:27:48 -0400 Subject: [PATCH 1/2] 3to2: rename py3to2 to work with callPackage --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73e4e79a4bc..e1685dc8339 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -99,6 +99,8 @@ in { acoustics = callPackage ../development/python-modules/acoustics { }; + py3to2 = callPackage ../development/python-modules/3to2 { }; + # Left for backwards compatibility "3to2" = callPackage ../development/python-modules/3to2 { }; aenum = callPackage ../development/python-modules/aenum { }; From 6ac283b185b3d164b5dcc912fc4b20e7619aeb11 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 14 Sep 2017 14:28:29 -0400 Subject: [PATCH 2/2] arelle: add py3to2 as a buildInput --- pkgs/development/python-modules/arelle/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 32c020961f2..2cf14192d09 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -1,7 +1,7 @@ { gui ? true, buildPythonPackage, fetchFromGitHub, lib, sphinx_1_2, lxml, isodate, numpy, pytest, - tkinter ? null, + tkinter ? null, py3to2, ... }: let @@ -26,6 +26,7 @@ buildPythonPackage { buildInputs = [ sphinx_1_2 pytest + py3to2 ]; propagatedBuildInputs = [ lxml diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1685dc8339..ec4a6cbbb7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -101,7 +101,7 @@ in { py3to2 = callPackage ../development/python-modules/3to2 { }; # Left for backwards compatibility - "3to2" = callPackage ../development/python-modules/3to2 { }; + "3to2" = self.py3to2; aenum = callPackage ../development/python-modules/aenum { };