From 6c55f5479d65d99b8dc8f0bdc0ea2a5a8096e15d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 10 Mar 2018 08:58:27 +0100 Subject: [PATCH] progressbar: move to own file and fix homepage --- .../python-modules/progressbar/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +---------------- 2 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/progressbar/default.nix diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix new file mode 100644 index 000000000000..18dfa693f5b5 --- /dev/null +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "progressbar"; + version = "2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "dfee5201237ca0e942baa4d451fee8bf8a54065a337fabe7378b8585aeda56a3"; + }; + + # invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/progressbar; + description = "Text progressbar library for python"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa7417663159..6cc10a224e01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13984,24 +13984,7 @@ in { }; }; - progressbar = buildPythonPackage (rec { - name = "progressbar-2.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/progressbar/${name}.tar.gz"; - sha256 = "dfee5201237ca0e942baa4d451fee8bf8a54065a337fabe7378b8585aeda56a3"; - }; - - # invalid command 'test' - doCheck = false; - - meta = { - homepage = http://code.google.com/p/python-progressbar/; - description = "Text progressbar library for python"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ domenkozar ]; - }; - }); + progressbar = callPackage ../development/python-modules/progressbar {}; progressbar2 = callPackage ../development/python-modules/progressbar2 { };