From 8c6d838853271bc7bb1be720d8ec9089dd57d868 Mon Sep 17 00:00:00 2001 From: James Kay Date: Tue, 10 Apr 2018 12:30:31 +0100 Subject: [PATCH 1/3] pythonPackages.progressbar231: init at 2.3.1 --- .../python-modules/progressbar231/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/progressbar231/default.nix diff --git a/pkgs/development/python-modules/progressbar231/default.nix b/pkgs/development/python-modules/progressbar231/default.nix new file mode 100644 index 00000000000..f9825961754 --- /dev/null +++ b/pkgs/development/python-modules/progressbar231/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "progressbar231"; + version = "2.3.1"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0j0ifxk87xz3wkyacxaiqygghn27wwz6y5pj9k8j2yq7n33fbdam"; + }; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/progressbar231; + description = "Text progressbar library for python"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ce9bde2c97..6096497a6f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11480,6 +11480,8 @@ in { progressbar2 = callPackage ../development/python-modules/progressbar2 { }; + progressbar231 = callPackage ../development/python-modules/progressbar231 { }; + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; From 10863b0aa35da98cb217285b4805ec2c38e59894 Mon Sep 17 00:00:00 2001 From: James Kay Date: Tue, 10 Apr 2018 12:31:22 +0100 Subject: [PATCH 2/3] pythonPackages.progressbar33: init at 2.4 --- .../python-modules/progressbar33/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/progressbar33/default.nix diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/pkgs/development/python-modules/progressbar33/default.nix new file mode 100644 index 00000000000..f3b94436d45 --- /dev/null +++ b/pkgs/development/python-modules/progressbar33/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "progressbar33"; + version = "2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zvf6zs5hzrc03p9nfs4p16vhilqikycvv1yk0pxn8s07fdhvzji"; + }; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/progressbar33; + description = "Text progressbar library for python"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6096497a6f7..2ff548d561b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11482,6 +11482,8 @@ in { progressbar231 = callPackage ../development/python-modules/progressbar231 { }; + progressbar33 = callPackage ../development/python-modules/progressbar33 { }; + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; From 0b919d47657af0f0cfe60cdd1c2a1c379242c4cd Mon Sep 17 00:00:00 2001 From: James Kay Date: Tue, 10 Apr 2018 12:33:07 +0100 Subject: [PATCH 3/3] pythonPackages.bitmath: init at 1.3.1.2 --- .../python-modules/bitmath/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/bitmath/default.nix diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix new file mode 100644 index 00000000000..bb2e6046886 --- /dev/null +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: + +buildPythonPackage rec { + pname = "bitmath"; + version = "1.3.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k8d1wmxqjc8cqzaixpxf45k6dl1kqhblr0g4wyjl0qa18q8wasd"; + }; + + checkInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ]; + + meta = with stdenv.lib; { + description = "Module for representing and manipulating file sizes with different prefix"; + homepage = https://github.com/tbielawa/bitmath; + license = licenses.mit; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ff548d561b..062729f12b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1003,6 +1003,8 @@ in { binwalk = self.binwalk_fun { }; binwalk-full = self.binwalk_fun { visualizationSupport = true; pyqtgraph = self.pyqtgraph; }; + bitmath = callPackage ../development/python-modules/bitmath { }; + caldavclientlibrary-asynk = buildPythonPackage rec { version = "asynkdev"; name = "caldavclientlibrary-asynk-${version}";