diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix deleted file mode 100644 index a901ce774c56..000000000000 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pythonPackages }: - -buildPythonPackage rec { - name = "mygpoclient-1.7"; - - src = fetchurl { - url = "https://thp.io/2010/mygpoclient/${name}.tar.gz"; - sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e"; - }; - - buildInputs = with pythonPackages; [ nose minimock ]; - - checkPhase = '' - nosetests - ''; - - meta = { - description = "A gpodder.net client library"; - longDescription = '' - The mygpoclient library allows developers to utilize a Pythonic interface - to the gpodder.net web services. - ''; - homepage = "https://thp.io/2010/mygpoclient/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.skeidel ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a20438ae340d..584fedb47250 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7872,7 +7872,7 @@ let muparser = callPackage ../development/libraries/muparser { }; - mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + mygpoclient = pythonPackages.mygpoclient; mygui = callPackage ../development/libraries/mygui {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5257702dbb1b..9ea72de19bf2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10189,6 +10189,36 @@ in modules // { }; }); + mygpoclient = buildPythonPackage rec { + name = "mygpoclient-${version}"; + version = "1.7"; + + src = pkgs.fetchurl { + url = "https://thp.io/2010/mygpoclient/${name}.tar.gz"; + sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e"; + }; + + buildInputs = with self; [ nose minimock ]; + + checkPhase = '' + nosetests + ''; + + disabled = isPy3k; + + meta = { + description = "A gpodder.net client library"; + longDescription = '' + The mygpoclient library allows developers to utilize a Pythonic interface + to the gpodder.net web services. + ''; + homepage = https://thp.io/2010/mygpoclient/; + license = with licenses; [ gpl3 ]; + platforms = with platforms; [ linux darwin ]; + maintainers = with maintainers; [ skeidel ]; + }; + }; + plover = buildPythonPackage rec { name = "plover-${version}"; version = "2.5.8";