diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-23 15:27:58 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-23 18:14:26 +0200 |
| commit | ced21f5e1a1479e3b6ae5c218818790596f5a16f (patch) | |
| tree | 41b23b3b4535b9755269e083f11969b3bfd40990 /pkgs | |
| parent | 8cfa9cc66c37fbb8a95cf6dbf2a4279bf9e32e08 (diff) | |
| download | nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.gz nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.bz2 nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.lz nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.xz nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.zst nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.zip | |
pythonPackages: remove `name` attribute`
The `buildPython*` function computes name from `pname` and `version`. This change removes `name` attribute from all expressions in `pkgs/development/python-modules`. While at it, some other minor changes were made as well, such as replacing `fetchurl` calls with `fetchPypi`.
Diffstat (limited to 'pkgs')
525 files changed, 386 insertions, 878 deletions
diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix index 3e315e2d1a75..ea0ce8cb5f30 100644 --- a/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/pkgs/applications/audio/dr14_tmeter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3Packages, pkgs }: python3Packages.buildPythonApplication rec { - name = "dr14_tmeter-${version}"; + pname = "dr14_tmeter"; version = "1.0.16"; disabled = !python3Packages.isPy3k; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 68315373a023..ce2f5a688793 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -4,7 +4,7 @@ }: python3Packages.buildPythonApplication rec { - name = "gpodder-${version}"; + pname = "gpodder"; version = "3.10.2"; format = "other"; diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index fae8d3e4b605..0434b00c7053 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, pythonPackages, gettext, klick}: pythonPackages.buildPythonApplication rec { - name = "gtklick-${version}"; - namePrefix = ""; + pname = "gtklick"; version = "0.6.4"; src = fetchurl { - url = "http://das.nasophon.de/download/${name}.tar.gz"; + url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; sha256 = "7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137"; }; diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index d0c3eab69154..2cb90081c68b 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "lastfmsubmitd-${version}"; - namePrefix = ""; + pname = "lastfmsubmitd"; version = "1.0.6"; src = fetchurl { diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix index fff166493339..d2ef7434c4db 100644 --- a/pkgs/applications/audio/lastwatch/default.nix +++ b/pkgs/applications/audio/lastwatch/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchgit, python2Packages }: python2Packages.buildPythonApplication rec { - name = "lastwatch-${version}"; - namePrefix = ""; + pname = "lastwatch"; version = "0.4.1"; src = fetchgit { diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix index cee3469e3f53..b9b840682d74 100644 --- a/pkgs/applications/audio/mimms/default.nix +++ b/pkgs/applications/audio/mimms/default.nix @@ -1,31 +1,31 @@ { fetchurl, stdenv, pythonPackages, libmms }: -let version = "3.2"; -in - pythonPackages.buildPythonApplication { - name = "mimms-${version}"; - src = fetchurl { - url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; - sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml"; - }; +pythonPackages.buildPythonApplication rec { + pname = "mimms"; + version = "3.2"; - postInstall = '' - wrapProgram $out/bin/mimms \ - --prefix LD_LIBRARY_PATH : ${libmms}/lib - ''; + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; + sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml"; + }; + + postInstall = '' + wrapProgram $out/bin/mimms \ + --prefix LD_LIBRARY_PATH : ${libmms}/lib + ''; - meta = { - homepage = https://savannah.nongnu.org/projects/mimms/; - license = stdenv.lib.licenses.gpl3; - description = "An mms (e.g. mms://) stream downloader"; + meta = { + homepage = https://savannah.nongnu.org/projects/mimms/; + license = stdenv.lib.licenses.gpl3; + description = "An mms (e.g. mms://) stream downloader"; - longDescription = '' - mimms is a program designed to allow you to download streams - using the MMS protocol and save them to your computer, as - opposed to watching them live. Similar functionality is - available in full media player suites such as Xine, MPlayer, - and VLC, but mimms is quick and easy to use and, for the time - being, remains a useful program. - ''; - }; - } + longDescription = '' + mimms is a program designed to allow you to download streams + using the MMS protocol and save them to your computer, as + opposed to watching them live. Similar functionality is + available in full media player suites such as Xine, MPlayer, + and VLC, but mimms is quick and easy to use and, for the time + being, remains a useful program. + ''; + }; +} diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index ad280d382d02..753a273a08cc 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -3,8 +3,7 @@ }: pythonPackages.buildPythonApplication rec { - name = "mopidy-${version}"; - + pname = "mopidy"; version = "2.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index e58cddd42942..e9c5198092d5 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-gmusic-${version}"; + pname = "mopidy-gmusic"; version = "2.0.0"; src = fetchurl { diff --git a/pkgs/applications/audio/mopidy/local-images.nix b/pkgs/applications/audio/mopidy/local-images.nix index 063821544aed..3e10904f3e69 100644 --- a/pkgs/applications/audio/mopidy/local-images.nix +++ b/pkgs/applications/audio/mopidy/local-images.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }: pythonPackages.buildPythonApplication rec { - name = "mopidy-local-images-${version}"; - + pname = "mopidy-local-images"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mopidy/local-sqlite.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix index 7aebc43dabbb..6d0cc370ff34 100644 --- a/pkgs/applications/audio/mopidy/local-sqlite.nix +++ b/pkgs/applications/audio/mopidy/local-sqlite.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-local-sqlite-${version}"; - + pname = "mopidy-local-sqlite"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index d2f525bffd1d..b0abefd7a1fd 100644 --- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-musicbox-webclient-${version}"; - + pname = "mopidy-musicbox-webclient"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix index 098812961649..0fda09fd5220 100644 --- a/pkgs/applications/audio/mopidy/soundcloud.nix +++ b/pkgs/applications/audio/mopidy/soundcloud.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-soundcloud-${version}"; - + pname = "mopidy-soundcloud"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix index 034a07bf027d..4b75af5ed579 100644 --- a/pkgs/applications/audio/mopidy/spotify-tunigo.nix +++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: pythonPackages.buildPythonApplication rec { - name = "mopidy-spotify-tunigo-${version}"; - + pname = "mopidy-spotify-tunigo"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 64b5ee629b33..9a6e1bef994c 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-spotify-${version}"; + pname = "mopidy-spotify"; version = "3.1.0"; src = fetchurl { diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index d3eb8539a19c..b8e22a41cabf 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-youtube-${version}"; - + pname = "mopidy-youtube"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 677c60399e52..26f35f258651 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,11 +1,10 @@ { stdenv, python2Packages, fetchurl, gettext, chromaprint }: let - version = "1.4.2"; pythonPackages = python2Packages; -in pythonPackages.buildPythonApplication { - name = "picard-${version}"; - namePrefix = ""; +in pythonPackages.buildPythonApplication rec { + pname = "picard"; + version = "1.4.2"; src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz"; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 00f58750408b..558267239ef8 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }: python2Packages.buildPythonApplication rec { - name = "puddletag-${version}"; + pname = "puddletag"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index e7073d0c95e9..f1a22bd839a0 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -8,7 +8,7 @@ let optionals = stdenv.lib.optionals; in python3.pkgs.buildPythonApplication rec { - name = "quodlibet${tag}-${version}"; + pname = "quodlibet${tag}"; version = "4.1.0"; # XXX, tests fail diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 55c3dfa92e30..a3d418cd4fe4 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -4,7 +4,7 @@ let inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2; in buildPythonApplication rec { - name = "sonata-${version}"; + pname = "sonata"; version = "1.7b1"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 49b08534cd8c..b0c834934f9c 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -3,7 +3,7 @@ with stdenv.lib; pythonPackages.buildPythonPackage rec { - name = "neovim-remote-${version}"; + pname = "neovim-remote"; version = "2.0.5"; disabled = !pythonPackages.isPy3k; diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index 0bcbad58b3a2..e806e63cdbf6 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -4,7 +4,7 @@ let pythonPackages = python2Packages; in pythonPackages.buildPythonApplication rec { version = "0.9.7"; - name = "nvpy-${version}"; + pname = "nvpy"; src = fetchurl { url = "https://github.com/cpbotha/nvpy/archive/v${version}.tar.gz"; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 1a0e6e54fb3e..34f6e4409a6d 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -4,7 +4,7 @@ }: buildPythonApplication rec { - name = "rednotebook-${version}"; + pname = "rednotebook"; version = "2.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 9984c0222a02..821a9e8083e1 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -3,7 +3,8 @@ , argyllcms, wxPython, numpy }: buildPythonPackage { - name = "displaycal-3.5.0.0"; + pname = "displaycal"; + version = "3.5.0.0"; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix index 9efcbbfa7d31..4e6c0f9214c2 100644 --- a/pkgs/development/python-modules/3to2/default.nix +++ b/pkgs/development/python-modules/3to2/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "3to2"; version = "1.1.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 8af07ece6873..5e108cd7dcf7 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -21,7 +21,6 @@ buildPythonPackage rec { pname = "APScheduler"; version = "3.5.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix index 049c020c5ab4..55b059cd7fa2 100644 --- a/pkgs/development/python-modules/Flask-PyMongo/default.nix +++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "Flask-PyMongo"; - name = "${pname}-${version}"; version = "0.5.2"; src = fetchPypi { diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix index cd9d8ee46d8a..72086a3487f3 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "FormEncode"; version = "1.3.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix index 0bacd8edb312..4f0a7d4aebc2 100644 --- a/pkgs/development/python-modules/GeoIP/default.nix +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -3,7 +3,6 @@ , geoip, nose}: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "GeoIP"; version = "1.3.2"; diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix index f9ce1fa026fe..a666cad1fc6d 100644 --- a/pkgs/development/python-modules/Pmw/default.nix +++ b/pkgs/development/python-modules/Pmw/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "Pmw"; version = "2.0.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index 61964eb7b060..29a792000e99 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -21,7 +21,6 @@ in buildPythonPackage rec { pname = "PyLD"; version = "0.7.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "digitalbazaar"; diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index 8ab846986f06..d05bd081e0db 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "Pygments"; version = "2.2.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index 41b92683b07a..ac19a7e7063c 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "ROPGadget"; version = "5.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index 8c70a0eb7e9f..30c820ec6c19 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -40,7 +40,6 @@ let libgpuarray_ = libgpuarray.override { inherit cudaSupport; }; in buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Theano"; version = "1.0.2"; diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index bc0472bc0053..0c4197f3b3d8 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -16,7 +16,6 @@ let in buildPythonPackage rec { pname = "Wand"; version = "0.4.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 7f0831eb7b03..be5ad2a5c1c5 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -1,7 +1,6 @@ {lib, buildPythonPackage, fetchPypi}: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "XlsxWriter"; version = "1.0.5"; diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix index 120d17e6709b..0ee617a1be6d 100644 --- a/pkgs/development/python-modules/aafigure/default.nix +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "aafigure"; version = "0.6"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 9558febec735..759ed2086fce 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "acme-tiny"; version = "2016-03-26"; - name = "${pname}-${version}"; src = fetchFromGitHub { sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g"; diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index ccf56c208f23..cd81a7facc22 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -18,7 +18,6 @@ buildPythonPackage rec { inherit (certbot) src version; pname = "acme"; - name = "${pname}-${version}"; propagatedBuildInputs = [ cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index 9d7b1148146c..114414e9c345 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "acoustics"; version = "0.1.2"; - name = "${pname}-${version}"; buildInputs = [ cython pytest ]; propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 36d49ad29af9..2172aa1165a6 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "actdiag"; version = "0.5.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 432158744bed..2f4c020eb974 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "adal"; version = "1.0.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 63db18e844e0..5962b309ee5c 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "aenum"; version = "2.1.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index 11409a11778f..ea3f26cd3155 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "agate-dbf"; version = "0.2.0"; diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index b39df3959fae..24287039abdc 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, agate, openpyxl, xlrd }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "agate-excel"; version = "0.2.2"; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 34de9ea06e9c..9d89433f1b90 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "agate-sql"; version = "0.5.3"; diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 8e480d4a3dfd..57a34268df86 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -3,7 +3,6 @@ leather, python-slugify }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "agate"; version = "1.6.1"; diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index 2dc86a2bfc3e..e1130ccd6935 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "aioamqp"; - name = "${pname}-${version}"; version = "0.11.0"; meta = { diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 37d75fd45c0f..50e70d87f9f5 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "aiodns"; version = "1.1.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index d0808a1cc310..572c18171d13 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "aiofiles"; version = "0.3.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index 5f30529bb815..a2a35f852a3d 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "alabaster"; version = "0.7.11"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 503ce5da4b52..3fcf0973e7ad 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -4,7 +4,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "alembic"; version = "0.9.9"; diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix index 1f539ef6d395..37f1e395d8de 100644 --- a/pkgs/development/python-modules/amqplib/default.nix +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "amqplib"; version = "0.6.1"; - name = "${pname}-${version}"; src = fetchurl { url = https://github.com/barryp/py-amqplib/archive/0.6.1.tar.gz; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index df8fae2a8d82..b8ee673e66bb 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "aniso8601"; version = "3.0.2"; - name = "${pname}-${version}"; meta = with stdenv.lib; { description = "Parses ISO 8601 strings."; diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index 26b182dfc08a..5960e7b41334 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "ansicolor"; version = "0.2.6"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index 84f2859d50c0..8f46a6f0b0f0 100644 --- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, buildPythonPackage, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage, isPy3k }: buildPythonPackage rec { + pname = "antlr4-python3-runtime"; version = "4.7.1"; - name = "antlr4-python3-runtime-${version}"; disabled = !isPy3k; - src = fetchurl { - url = "mirror://pypi/a/antlr4-python3-runtime/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1lrzmagawmavyw1n1z0qarvs2jmbnbv0p89dah8g7klj8hnbf9hv"; }; diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index f2e07eba0c46..213bc4f1eb91 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "apipkg"; version = "1.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix index 866c91f7c684..8716f007b87a 100644 --- a/pkgs/development/python-modules/appdirs/default.nix +++ b/pkgs/development/python-modules/appdirs/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "appdirs"; version = "1.4.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix index 1f0b95d87853..808ddc57096d 100644 --- a/pkgs/development/python-modules/area53/default.nix +++ b/pkgs/development/python-modules/area53/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "Area53"; version = "0.94"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index b13470b4c45b..28b88d3b46a0 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -2,7 +2,6 @@ coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "argcomplete"; version = "1.9.4"; diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix index cf7dea6cca75..943f129031e9 100644 --- a/pkgs/development/python-modules/args/default.nix +++ b/pkgs/development/python-modules/args/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "args"; version = "0.1.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 62b176fb59c6..fd89457ed310 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "asana"; version = "0.7.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "asana"; diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index 5f512fcd6f8b..2b627fe80ff1 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "asn1crypto"; version = "0.24.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index 9fb92b860a15..381a4a733146 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "astor"; version = "0.6.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 7cdc56e2553a..a7e7931d9d92 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -4,7 +4,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "astroid"; version = "1.6.5"; diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix index 30d75f92dc5b..d4c485e909ca 100644 --- a/pkgs/development/python-modules/audioread/default.nix +++ b/pkgs/development/python-modules/audioread/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "audioread"; - name = "${pname}-${version}"; version = "2.1.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index ac26daa13749..30479ce8266a 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -1,15 +1,14 @@ -{ stdenv, buildPythonPackage, fetchurl, isPy3k, isPy33, +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy33, unittest2, mock, pytest, trollius, asyncio, pytest-asyncio, futures, six, twisted, txaio, zope_interface }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "autobahn"; version = "18.6.1"; - src = fetchurl { - url = "mirror://pypi/a/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "2f41bfc512ec482044fa8cfa74182118dedd87e03b3494472d9ff1b5a1e27d24"; }; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 15950d38b53c..808eba12bb6f 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -1,12 +1,12 @@ -{ stdenv, buildPythonPackage, fetchurl, +{ stdenv, buildPythonPackage, fetchPypi, m2r, setuptools_scm, six, attrs }: + buildPythonPackage rec { version = "0.7.0"; pname = "Automat"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/A/Automat/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "cbd78b83fa2d81fe2a4d23d258e1661dd7493c9a50ee2f1a5b2cac61c1793b0e"; }; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 90d57b6c89d7..2af098692988 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "autopep8"; version = "1.3.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/pkgs/development/python-modules/backports_csv/default.nix index db7015f2f16e..322f9c6d793f 100644 --- a/pkgs/development/python-modules/backports_csv/default.nix +++ b/pkgs/development/python-modules/backports_csv/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "backports.csv"; version = "1.0.6"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/backports_tempfile/default.nix b/pkgs/development/python-modules/backports_tempfile/default.nix index 5a04b6afd678..c2dbb0e6fa80 100644 --- a/pkgs/development/python-modules/backports_tempfile/default.nix +++ b/pkgs/development/python-modules/backports_tempfile/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "backports.tempfile"; version = "1.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index e64f51fe7ca1..2125390d6715 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "backports.unittest_mock"; version = "1.3"; diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix index 6ad69b80b6d1..8b818398ec9e 100644 --- a/pkgs/development/python-modules/backports_weakref/default.nix +++ b/pkgs/development/python-modules/backports_weakref/default.nix @@ -7,7 +7,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "backports.weakref"; version = "1.0.post1"; src = fetchPypi { diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index 2e85a1017b6e..d14bf02cabf3 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "bap"; version = "1.3.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-python"; diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index 99c3346a4fbe..191f03426746 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -11,7 +11,6 @@ buildPythonPackage rec { pname = "bash_kernel"; version = "0.7.1"; - name = "${pname}-${version}"; format = "flit"; disabled = isPy27; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 83bb10631958..ff4b7fcb5317 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "bayespy"; version = "0.5.17"; - name = "${pname}-${version}"; # Python 2 not supported and not some old Python 3 because MPL doesn't support # them properly. diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 72800d2f6c29..ca22fab575ca 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPyPy, fetchurl +{ stdenv, buildPythonPackage, isPyPy, fetchPypi , cffi, pycparser, mock, pytest, py, six }: with stdenv.lib; @@ -6,10 +6,9 @@ with stdenv.lib; buildPythonPackage rec { version = "3.1.4"; pname = "bcrypt"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/b/bcrypt/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d"; }; buildInputs = [ pycparser mock pytest py ]; diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index fd8bddee14b6..6ae838265b18 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "beautifulsoup4"; version = "4.6.0"; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 722117ba6e83..a4a7b63b8a3f 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -7,7 +7,6 @@ buildPythonApplication rec { pname = "behave"; version = "1.2.6"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix index 9226fa1c5bf0..d9ddc8426426 100644 --- a/pkgs/development/python-modules/bitcoin-price-api/default.nix +++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "bitcoin-price-api"; version = "0.0.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index b012fd24aa01..dd85789c59e0 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -4,7 +4,6 @@ let ext = if stdenv.isDarwin then "dylib" else "so"; in buildPythonPackage rec { pname = "bitcoinlib"; version = "0.9.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "petertodd"; diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index f6c56646dcb9..8e54e3bbde72 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "bitstring"; version = "3.1.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/pkgs/development/python-modules/bkcharts/default.nix index f09a271faad1..270015a423ba 100644 --- a/pkgs/development/python-modules/bkcharts/default.nix +++ b/pkgs/development/python-modules/bkcharts/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "bkcharts"; version = "0.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index b9364d51d14a..784de33e7ade 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -2,7 +2,6 @@ , glibcLocales }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "blessed"; version = "1.15.0"; diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index b73bcfe8185d..9d2485711d0c 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -8,13 +8,12 @@ let cryptsetupWithPython = cryptsetup.override pyenable; in buildPythonPackage rec { pname = "blivet"; - name = "${pname}-${version}"; version = "0.67"; src = fetchFromGitHub { owner = "dwlehman"; repo = "blivet"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1gk94ghjrxfqnx53hph1j2s7qcv86fjz48is7l099q9c24rjv8ky"; }; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index cd9c5729611c..68b5abd906d9 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -10,7 +10,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "botocore"; version = "1.10.9"; diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 217a40bf7aa9..fc8dc784d029 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "branca"; version = "0.3.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 37e3fbea2cf6..a76b7b2611bd 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,12 +1,11 @@ -{ lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { version = "4.9.1"; pname = "breathe"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/b/breathe/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "76e1f3706efeda2610d9a8e7b421d2877ff0654a3fe6d3190a8686536111a684"; }; diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix index cd419039f339..5a9bae58bd6d 100644 --- a/pkgs/development/python-modules/browsermob-proxy/default.nix +++ b/pkgs/development/python-modules/browsermob-proxy/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "browsermob-proxy"; version = "0.8.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index b7b9820b7a98..6c50be65f4e9 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "BTrees"; version = "4.5.0"; - name = "${pname}-${version}"; buildInputs = [ transaction ]; propagatedBuildInputs = [ persistent zope_interface ]; diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 8f900c7b09c6..91b310a21790 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -1,12 +1,11 @@ -{ fetchurl, stdenv, buildPythonPackage }: +{ fetchPypi, stdenv, buildPythonPackage }: buildPythonPackage rec { pname = "zc.buildout"; version = "2.11.5"; - name = "${pname}-nix-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "537a22715d82362cddd811da08d11a31d30d5161ce7994b208bd85ebb348d122"; }; diff --git a/pkgs/development/python-modules/bz2file/default.nix b/pkgs/development/python-modules/bz2file/default.nix index 7abbc6cdbb0f..3bc9882585f6 100644 --- a/pkgs/development/python-modules/bz2file/default.nix +++ b/pkgs/development/python-modules/bz2file/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "bz2file"; version = "0.98"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cachetools/1.nix b/pkgs/development/python-modules/cachetools/1.nix index f527a7773736..05f3afe758a6 100644 --- a/pkgs/development/python-modules/cachetools/1.nix +++ b/pkgs/development/python-modules/cachetools/1.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, isPyPy }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "cachetools"; version = "2.1.0"; disabled = isPyPy; # a test fails diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 7f11e85752e5..de15ffaabc69 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, isPyPy }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "cachetools"; version = "2.1.0"; diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index c5d643da79d5..9751dcd2f3ed 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "CCColUtils"; version = "1.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index cd643806c3a7..724769422761 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -3,7 +3,6 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; version = "1.11.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix index aa4e5e47e728..16166d2db80e 100644 --- a/pkgs/development/python-modules/chai/default.nix +++ b/pkgs/development/python-modules/chai/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "chai"; version = "1.1.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix index 017088d2e330..c2815d876e34 100644 --- a/pkgs/development/python-modules/chainmap/default.nix +++ b/pkgs/development/python-modules/chainmap/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "chainmap"; version = "1.0.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 454a4f5f6ac7..c63fe87dedcd 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -3,7 +3,6 @@ }: buildPythonPackage rec { pname = "channels"; - name = "${pname}-${version}"; version = "2.1.2"; src = fetchPypi { diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix index c44989ab5b7e..f004e6d541c5 100644 --- a/pkgs/development/python-modules/characteristic/default.nix +++ b/pkgs/development/python-modules/characteristic/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "characteristic"; version = "14.3.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380"; diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix index fd5b27d00e4d..c54b962a8f6c 100644 --- a/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, six, cffi, nose }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "cld2-cffi"; version = "0.1.4"; diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix index 3ae8537c6c09..74d64d8390cf 100644 --- a/pkgs/development/python-modules/click-plugins/default.nix +++ b/pkgs/development/python-modules/click-plugins/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "click-plugins"; version = "1.0.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index 91b289e2ede7..c47a15d64bbc 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "cligj"; version = "0.4.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mapbox"; diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix index 7c2147a6431a..1ccb31d5120a 100644 --- a/pkgs/development/python-modules/colorlover/default.nix +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "colorlover"; version = "0.2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index c8ef038ec504..bcf67ab222d4 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}: buildPythonPackage rec { - name = "${pname}-${version}"; version = "0.11.4"; pname = "confluent-kafka"; diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index 50216c7ae1f1..4766a1285acd 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -1,12 +1,11 @@ -{ stdenv, buildPythonPackage, fetchurl +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "constantly"; - name = "${pname}-${version}"; version = "15.1.0"; - src = fetchurl { - url = "mirror://pypi/c/constantly/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0dgwdla5kfpqz83hfril716inm41hgn9skxskvi77605jbmp4qsq"; }; diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index a056ba450a88..a3ef5bce4d81 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "contextlib2"; version = "0.5.5"; - name = "${pname}-${version}"; src = fetchPypi rec { inherit pname version; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 8b85a0d94c5a..4d2a168f79cc 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "coverage"; version = "4.5.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix index 8d0e7a58e76a..a6c294456fa3 100644 --- a/pkgs/development/python-modules/csscompressor/default.nix +++ b/pkgs/development/python-modules/csscompressor/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "csscompressor"; version = "0.9.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index 832089c99c2f..885b31d716c2 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "cufflinks"; version = "0.13.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix index 7326f2cf3b4b..3d2205354044 100644 --- a/pkgs/development/python-modules/cycler/default.nix +++ b/pkgs/development/python-modules/cycler/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "cycler"; - name = "${pname}-${version}"; version = "0.10.0"; src = fetchPypi { diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 8ec7bb24a623..0d69edcf9cea 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -13,7 +13,6 @@ buildPythonPackage rec { pname = "dask"; version = "0.18.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index 4e8da39662e7..ab078c656e7e 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,6 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "python-dateutil"; version = "2.7.3"; diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix index facdd00edace..3f310a49a37e 100644 --- a/pkgs/development/python-modules/dbfread/default.nix +++ b/pkgs/development/python-modules/dbfread/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "dbfread"; version = "2.0.7"; diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index a0724c9ada59..f207683d2b0b 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -4,11 +4,10 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { pname = "dbus-python"; version = "1.2.4"; - name = "${pname}-${version}"; format = "other"; src = fetchurl { - url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz"; + url = "http://dbus.freedesktop.org/releases/dbus-python/${pname}-${version}.tar.gz"; sha256 = "1k7rnaqrk7mdkg0k6n2jn3d1mxsl7s3i07g5a8va5yvl3y3xdwg2"; }; diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix index 4f5d7a11bd8f..853beaf34a1c 100644 --- a/pkgs/development/python-modules/demjson/default.nix +++ b/pkgs/development/python-modules/demjson/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "demjson"; version = "2.2.4"; - name = "${pname}-${version}"; disabled = isPy36; src = fetchPypi { diff --git a/pkgs/development/python-modules/descartes/default.nix b/pkgs/development/python-modules/descartes/default.nix index 1407dd3d204d..996cd22e2633 100644 --- a/pkgs/development/python-modules/descartes/default.nix +++ b/pkgs/development/python-modules/descartes/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "descartes"; version = "1.1.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index bf2808745ecd..4fe8756c961b 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -1,9 +1,8 @@ -{ stdenv, pythonPackages }: +{ lib, buildPythonPackage, fetchPypi, requests, py, pytest }: -with pythonPackages;buildPythonPackage rec { +buildPythonPackage rec { pname = "devpi-common"; version = "3.2.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -17,7 +16,7 @@ with pythonPackages;buildPythonPackage rec { py.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/devpi/devpi; description = "Utilities jointly used by devpi-server and devpi-client"; license = licenses.mit; diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix index 7907f1ffac0b..062fb00e48b4 100644 --- a/pkgs/development/python-modules/diff-match-patch/default.nix +++ b/pkgs/development/python-modules/diff-match-patch/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "diff-match-patch"; - name = "${pname}-${version}"; version = "20121119"; meta = { diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 839a70bdbf11..5473d85b5765 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "dill"; version = "0.2.8.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix index f3d403d9f2c3..37d5fec85911 100644 --- a/pkgs/development/python-modules/discid/default.nix +++ b/pkgs/development/python-modules/discid/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "discid"; version = "1.1.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix index ae56fd5f7e59..ce414a09806a 100644 --- a/pkgs/development/python-modules/discogs_client/default.nix +++ b/pkgs/development/python-modules/discogs_client/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "discogs-client"; version = "2.2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix index db781af2a5de..e21e6270b91a 100644 --- a/pkgs/development/python-modules/distorm3/default.nix +++ b/pkgs/development/python-modules/distorm3/default.nix @@ -1,12 +1,12 @@ -{ stdenv, buildPythonPackage, fetchurl }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "distorm3"; version = "3.3.4"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/d/${pname}/${name}.zip"; + src = fetchPypi { + inherit pname version; + extension = "zip"; sha256 = "1bh9xdiz9mkf9lfffimfn3hgd0mh60y7wl1micgkxzpl7hnxrpd4"; }; diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index a1968550afcc..e49d8c6ff84c 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "django-allauth"; - name = "${pname}-${version}"; version = "0.36.0"; # no tests on PyPI diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index 591031912854..d575c1b674b0 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -3,7 +3,6 @@ }: buildPythonPackage rec { pname = "django-compat"; - name = "${pname}-${version}"; version = "1.0.14"; # the pypi packages don't include everything required for the tests diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 9d1161fca3b6..18fd685f3c2d 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "django-extensions"; version = "1.8.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "${pname}"; diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix index 5712ed4193fe..be153feb2a7c 100644 --- a/pkgs/development/python-modules/django-gravatar2/default.nix +++ b/pkgs/development/python-modules/django-gravatar2/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "django-gravatar2"; - name = "${pname}-${version}"; version = "1.4.2"; src = fetchPypi { diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index b2d28229d94b..e6cd5a3482fe 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "django-hijack-admin"; version = "2.1.5"; - name = "${pname}-${version}"; # the pypi packages don't include everything required for the tests src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index c9589f86993e..89147db63a88 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "django-ipware"; - name = "${pname}-${version}"; version = "2.1.0"; meta = { diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index b8b632e1a182..338af16b2e96 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "django-jinja"; - name = "${pname}-${version}"; version = "2.4.1"; meta = { diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix index af7af221b9b6..e2db26fe26bb 100644 --- a/pkgs/development/python-modules/django-multiselectfield/default.nix +++ b/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "django-multiselectfield"; - name = "${pname}-${version}"; version = "0.1.8"; src = fetchPypi { diff --git a/pkgs/development/python-modules/django-pglocks/default.nix b/pkgs/development/python-modules/django-pglocks/default.nix index 2207aa348ab0..b2ee7b6f6442 100644 --- a/pkgs/development/python-modules/django-pglocks/default.nix +++ b/pkgs/development/python-modules/django-pglocks/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "django-pglocks"; - name = "${pname}-${version}"; version = "1.0.2"; meta = { diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 1b54213e2af7..7037f23b071c 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "django-picklefield"; - name = "${pname}-${version}"; version = "1.0.0"; meta = { diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 3bf5e064c40c..19ef783fe759 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -1,14 +1,13 @@ -{ stdenv, buildPythonPackage, fetchurl, +{ stdenv, buildPythonPackage, fetchPypi, numpy, django_colorful, pillow, psycopg2, pyparsing, django, celery }: buildPythonPackage rec { version = "0.6"; pname = "django-raster"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/d/django-raster/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "9a0f8e71ebeeeb5380c6ca68e027e9de335f43bc15e89dd22e7a470c4eb7aeb8"; }; diff --git a/pkgs/development/python-modules/django-sampledatahelper/default.nix b/pkgs/development/python-modules/django-sampledatahelper/default.nix index 5bc0dc379dc2..e08c296e8076 100644 --- a/pkgs/development/python-modules/django-sampledatahelper/default.nix +++ b/pkgs/development/python-modules/django-sampledatahelper/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "django-sampledatahelper"; - name = "${pname}-${version}"; version = "0.4.1"; meta = { diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix index 41b532ea184f..831dbbc4a6c9 100644 --- a/pkgs/development/python-modules/django-sites/default.nix +++ b/pkgs/development/python-modules/django-sites/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "django-sites"; - name = "${pname}-${version}"; version = "0.9"; meta = { diff --git a/pkgs/development/python-modules/django-sr/default.nix b/pkgs/development/python-modules/django-sr/default.nix index 1f8f9f17d3d5..b8924b37bfd0 100644 --- a/pkgs/development/python-modules/django-sr/default.nix +++ b/pkgs/development/python-modules/django-sr/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "django-sr"; - name = "${pname}-${version}"; version = "0.0.4"; meta = { diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 7d73877b792c..545eba8360a7 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "Django"; - name = "${pname}-${version}"; version = "2.0.6"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix index 77fc708a50b4..35ac57062c75 100644 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "django-appconf"; version = "1.0.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index 1fbb4dbafe68..84d0404eb6d2 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "django_compressor"; version = "2.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index d2f8361bc7d6..4e256a38c86e 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -1,18 +1,18 @@ -{ stdenv, buildPythonPackage, python, fetchurl +{ stdenv, buildPythonPackage, python, fetchPypi , django_environ, mock, django, six , pytest, pytestrunner, pytest-django, setuptools_scm }: buildPythonPackage rec { pname = "django-guardian"; - name = "${pname}-${version}"; version = "1.4.9"; - src = fetchurl { - url = "mirror://pypi/d/django-guardian/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "c3c0ab257c9d94ce154b9ee32994e3cff8b350c384040705514e14a9fb7c8191"; }; - buildInputs = [ pytest pytestrunner pytest-django django_environ mock setuptools_scm ]; + checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; + buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ django six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 3cbf6d2ce713..3a362029c1ac 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "django-redis"; version = "4.9.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix index b6fcddd528f2..6b048db90e30 100644 --- a/pkgs/development/python-modules/django_tagging/default.nix +++ b/pkgs/development/python-modules/django_tagging/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "django-tagging"; version = "0.4.6"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 81f406c9ef2e..18372fc113aa 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,10 @@ -{ stdenv, buildPythonPackage, fetchurl, django }: +{ stdenv, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { version = "3.8.2"; pname = "djangorestframework"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9"; }; diff --git a/pkgs/development/python-modules/djmail/default.nix b/pkgs/development/python-modules/djmail/default.nix index d296e3ee9dd6..aaea8175f726 100644 --- a/pkgs/development/python-modules/djmail/default.nix +++ b/pkgs/development/python-modules/djmail/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "djmail"; - name = "${pname}-${version}"; version = "1.1.0"; meta = { diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index 177e697aab9f..01224515d926 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, openssl, makeWrapper, buildPythonApplication , pytest, dnspython }: -buildPythonApplication rec { - name = "${pname}-${version}"; - pname = "dkimpy"; +let majorversion = "0.6"; minorversion = "2"; +in buildPythonApplication rec { + pname = "dkimpy"; version = "${majorversion}.${minorversion}"; src = fetchurl { - url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${name}.tar.gz"; + url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${pname}-${version}.tar.gz"; sha256 = "1hagz8qk0v4ijfbcdq4z28bpgr2mkpr498z76i1vam2d50chmakl"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ openssl dnspython ]; patchPhase = '' diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 0548c5a1098e..cf37c9de4e09 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "dnspython"; version = "1.15.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index cb91014d6ef2..307496cc65ce 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -12,7 +12,6 @@ buildPythonPackage rec { pname = "doc8"; version = "0.8.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index bb9bc62d9405..88dc6b0fc750 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "dogpile.cache"; version = "0.6.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index 43c318fc7c3e..e45d651f3245 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "dpkt"; version = "1.9.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ds4drv/default.nix b/pkgs/development/python-modules/ds4drv/default.nix index d2de9f9f15bc..ccc5c574689c 100644 --- a/pkgs/development/python-modules/ds4drv/default.nix +++ b/pkgs/development/python-modules/ds4drv/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "ds4drv"; - name = "${pname}-${version}"; version = "0.5.1"; # PyPi only carries py3 wheel diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index fbe5c02771db..83b35dc8c89a 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - name = "${pname}-${version}"; version = "2.5"; meta = { diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix index 12e0f6934d9a..eb98cd18ef29 100644 --- a/pkgs/development/python-modules/easydict/default.nix +++ b/pkgs/development/python-modules/easydict/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "easydict"; version = "1.7"; diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index 9cb09e8f7208..b1026e8d446a 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "ed25519"; version = "1.4"; diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index cf03a02129d4..a0a619a39c84 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "email_validator"; version = "1.0.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index 2afcb2b2de5a..382dd5089153 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "emcee"; version = "2.2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index d7cce7b906b0..2c3b7cc05523 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "emoji"; - name = "${pname}-${version}"; version = "0.5.0"; src = fetchPypi { diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/pkgs/development/python-modules/enum-compat/default.nix index 6b1d2af357a4..29c8184bd4e8 100644 --- a/pkgs/development/python-modules/enum-compat/default.nix +++ b/pkgs/development/python-modules/enum-compat/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "enum-compat"; version = "0.0.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix index 60c92fe76fb2..d776bfd62aac 100644 --- a/pkgs/development/python-modules/enzyme/default.nix +++ b/pkgs/development/python-modules/enzyme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "enzyme"; version = "0.4.1"; diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index 231a52c9d7a7..742fdb83b72e 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "ephem"; - name = "${pname}-${version}"; version = "3.7.6.0"; src = fetchPypi { diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index 1f457235b6a3..814cac3c9e6e 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { version = "0.8.1"; pname = "ezdxf"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mozman"; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 7458ffc03d0e..c5ac67106a2f 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "feedgen"; version = "0.7.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index d5ce8f8afc2e..e20087e43ca0 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -1,12 +1,11 @@ -{ stdenv, buildPythonPackage, glibcLocales, fetchurl, six, pytz }: +{ stdenv, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }: buildPythonPackage rec { pname = "feedgenerator"; version = "1.9"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/f/feedgenerator/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "01mirwkm7xfx539hmvj7g9da1j51gw5lsx74dr0glizskjm5vq2s"; }; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 7ee4f77109b7..642111680b37 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "Fiona"; version = "1.7.12"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index 62741a787099..35bf7cb90df9 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "fixtures"; version = "3.0.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix index a657c25eed7c..f999bab89324 100644 --- a/pkgs/development/python-modules/flake8-blind-except/default.nix +++ b/pkgs/development/python-modules/flake8-blind-except/default.nix @@ -1,11 +1,10 @@ -{ lib, fetchurl, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "flake8-blind-except"; - name = "${pname}-${version}"; version = "0.1.1"; - src = fetchurl { - url = "mirror://pypi/f/flake8-blind-except/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "16g58mkr3fcn2vlfhp3rlahj93qswc7jd5qrqp748mc26dk3b8xc"; }; meta = { diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 0a006b77793b..944c7f7e1fd8 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -4,7 +4,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "flake8"; version = "3.5.0"; diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index 27d8f9c40c65..7f3b6367b6ee 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchurl, flask, webassets, flask_script, nose }: +{ lib, buildPythonPackage, fetchPypi, flask, webassets, flask_script, nose }: buildPythonPackage rec { - name = "Flask-Assets-${version}"; + pname = "Flask-Assets"; version = "0.12"; - src = fetchurl { - url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0"; }; diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index c46fce2fe757..b602fcfd4947 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, flask }: buildPythonPackage rec { - name = "${pname}-${version}"; version = "1.4.0"; pname = "Flask-Compress"; diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 2b66b0f85f46..e78fa2141b99 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -2,7 +2,6 @@ , nose, flask, six }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Flask-Cors"; version = "3.0.6"; diff --git a/pkgs/development/python-modules/flask-elastic/default.nix b/pkgs/development/python-modules/flask-elastic/default.nix index 4181d9647876..466bfb441219 100644 --- a/pkgs/development/python-modules/flask-elastic/default.nix +++ b/pkgs/development/python-modules/flask-elastic/default.nix @@ -1,13 +1,12 @@ -{ stdenv, buildPythonPackage, fetchurl +{ stdenv, buildPythonPackage, fetchPypi , flask, elasticsearch }: buildPythonPackage rec { pname = "Flask-Elastic"; - name = "${pname}-${version}"; version = "0.2"; - src = fetchurl { - url = "mirror://pypi/F/Flask-Elastic/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0hqkwff6z78aspkf1cf815qwp02g3ch1y9dhm5v2ap8vakyac0az"; }; diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix index cdc7cefff954..b95e694a232f 100644 --- a/pkgs/development/python-modules/flask-ldap-login/default.nix +++ b/pkgs/development/python-modules/flask-ldap-login/default.nix @@ -1,18 +1,17 @@ -{ stdenv, buildPythonPackage, fetchurl +{ stdenv, buildPythonPackage, fetchPypi , flask, flask_wtf, flask_testing, ldap , mock, nose }: buildPythonPackage rec { pname = "flask-ldap-login"; version = "0.3.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/f/flask-ldap-login/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "085rik7q8xrp5g95346p6jcp9m2yr8kamwb2kbiw4q0b0fpnnlgq"; }; - buildInputs = [ nose mock flask_testing ]; + checkInputs = [ nose mock flask_testing ]; propagatedBuildInputs = [ flask flask_wtf ldap ]; checkPhase = "nosetests -d"; diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index e2585262e58e..1a01666d799d 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "Flask-Login"; - name = "${pname}-${version}"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/flask-mail/default.nix b/pkgs/development/python-modules/flask-mail/default.nix index 99545a55ba39..a1732d3ccbfe 100644 --- a/pkgs/development/python-modules/flask-mail/default.nix +++ b/pkgs/development/python-modules/flask-mail/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "Flask-Mail"; - name = "${pname}-${version}"; version = "0.9.1"; meta = { diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index 6ac958d6435c..c523d7b963c8 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - name = "${pname}-${version}"; version = "0.9.0"; meta = { diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 71c4170d26cd..f4fc3cf3fa24 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -6,7 +6,6 @@ with stdenv.lib; buildPythonPackage rec { pname = "Flask-Migrate"; version = "2.2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/flask-oauthlib/default.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix index cacb16cb7bb7..2d34ce8583e6 100644 --- a/pkgs/development/python-modules/flask-oauthlib/default.nix +++ b/pkgs/development/python-modules/flask-oauthlib/default.nix @@ -3,7 +3,6 @@ , mock, nose}: buildPythonPackage rec { pname = "Flask-OAuthlib"; - name = "${pname}-${version}"; version = "0.9.3"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix index 1f41f7987631..cbdbd9892115 100644 --- a/pkgs/development/python-modules/flask-principal/default.nix +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchurl, flask, blinker, nose }: +{ lib, buildPythonPackage, fetchPypi, flask, blinker, nose }: buildPythonPackage rec { - name = "Flask-Principal-${version}"; + pname = "Flask-Principal"; version = "0.4.0"; - src = fetchurl { - url = "mirror://pypi/F/Flask-Principal/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0lwlr5smz8vfm5h9a9i7da3q1c24xqc6vm9jdywdpgxfbi5i7mpm"; }; diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index c54c015af123..579289fc7b58 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -4,7 +4,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Flask-RESTful"; version = "0.3.6"; diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix index a89f9979003b..d5028bca56cf 100644 --- a/pkgs/development/python-modules/flask-restplus/default.nix +++ b/pkgs/development/python-modules/flask-restplus/default.nix @@ -17,7 +17,6 @@ buildPythonPackage rec { pname = "flask-restplus"; version = "0.10.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index 5f843138eae0..04c083a32638 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -4,7 +4,6 @@ with stdenv.lib; buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Flask-Testing"; version = "0.7.1"; diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index a0b623c6b6ab..96828dcdce25 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, flask, wtforms, nose }: +{ stdenv, fetchPypi, buildPythonPackage, flask, wtforms, nose }: buildPythonPackage rec { pname = "Flask-WTF"; version = "0.14.2"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/F/Flask-WTF/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0dncc5as2k61b28k8kal5yh3prmv7zya1jz7kvci7ximzmfda52x"; }; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index b7372fa90328..67cd9aa457e9 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -2,7 +2,6 @@ , itsdangerous, click, werkzeug, jinja2, pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; version = "1.0.2"; pname = "Flask"; diff --git a/pkgs/development/python-modules/fn/default.nix b/pkgs/development/python-modules/fn/default.nix index d286459b1377..550c4a711013 100644 --- a/pkgs/development/python-modules/fn/default.nix +++ b/pkgs/development/python-modules/fn/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "fn"; - name = "${pname}-${version}"; version = "0.4.3"; meta = { diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix index 5c188dc5a9fd..155f866412e5 100644 --- a/pkgs/development/python-modules/funcsigs/default.nix +++ b/pkgs/development/python-modules/funcsigs/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "funcsigs"; version = "1.0.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix index c368913caae9..ba84d80dd0be 100644 --- a/pkgs/development/python-modules/future/default.nix +++ b/pkgs/development/python-modules/future/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "future"; version = "0.16.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 5186f7b25ea5..3faa6d914d25 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -12,7 +12,6 @@ buildPythonPackage rec { pname = "gensim"; - name = "${pname}-${version}"; version = "3.4.0"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix index 5dfd399ac7de..3a5fbe8433ce 100644 --- a/pkgs/development/python-modules/ghdiff/default.nix +++ b/pkgs/development/python-modules/ghdiff/default.nix @@ -1,17 +1,16 @@ -{ stdenv, buildPythonPackage, fetchurl +{ stdenv, buildPythonPackage, fetchPypi , zope_testrunner, six, chardet}: buildPythonPackage rec { pname = "ghdiff"; version = "0.4"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/g/ghdiff/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "17mdhi2sq9017nq8rkjhhc87djpi5z99xiil0xz17dyplr7nmkqk"; }; - buildInputs = [ zope_testrunner ]; + checkInputs = [ zope_testrunner ]; propagatedBuildInputs = [ six chardet ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix index 01827fc87f59..0a8826934089 100644 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -3,8 +3,8 @@ }: buildPythonPackage rec { + pname = "gplaycli"; version = "3.21"; - name = "gplaycli-${version}"; src = fetchFromGitHub { owner = "matlink"; diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix index 485c5b5ef073..67f2e0bb1852 100644 --- a/pkgs/development/python-modules/grammalecte/default.nix +++ b/pkgs/development/python-modules/grammalecte/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "grammalecte"; version = "0.6.1"; - name = "${pname}-${version}"; src = fetchurl { url = "http://www.dicollecte.org/grammalecte/zip/Grammalecte-fr-v${version}.zip"; diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 57567a203ea7..7f2c7a582290 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -4,15 +4,14 @@ gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses, buildPythonPackage }: buildPythonPackage rec { + pname = "graph-tool"; format = "other"; version = "2.26"; - name = "${python.libPrefix}-graph-tool-${version}"; meta = with stdenv.lib; { description = "Python module for manipulation and statistical analysis of graphs"; homepage = https://graph-tool.skewed.de/; license = licenses.gpl3; - platforms = platforms.all; maintainers = [ stdenv.lib.maintainers.joelmo ]; }; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index b1d19e9f5091..bc855b5bc1cf 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -1,11 +1,14 @@ -{ fetchurl, stdenv, meson, ninja, pkgconfig, python, pygobject3 +{ buildPythonPackage, fetchurl, stdenv, meson, ninja, pkgconfig, python, pygobject3 , gst-plugins-base, ncurses }: -stdenv.mkDerivation rec { +let pname = "gst-python"; version = "1.14.0"; name = "${pname}-${version}"; +in buildPythonPackage rec { + inherit pname version; + format = "other"; src = fetchurl { urls = [ @@ -33,9 +36,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gst-plugins-base pygobject3 ]; - # Needed for python.buildEnv - passthru.pythonPath = []; - meta = { homepage = https://gstreamer.freedesktop.org; diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix index 3c85898ffbf9..d95d0880adfb 100644 --- a/pkgs/development/python-modules/guessit/2.0.nix +++ b/pkgs/development/python-modules/guessit/2.0.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "guessit"; version = "3.0.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index fa68994ace96..90395b3b2a92 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "guessit"; version = "3.0.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/gurobipy/darwin.nix b/pkgs/development/python-modules/gurobipy/darwin.nix index 65bec7d8b12e..3bd3b3b2a329 100644 --- a/pkgs/development/python-modules/gurobipy/darwin.nix +++ b/pkgs/development/python-modules/gurobipy/darwin.nix @@ -1,7 +1,8 @@ { fetchurl, python, xar, cpio, cctools, insert_dylib }: assert python.pkgs.isPy27 && python.ucsEncoding == 2; python.pkgs.buildPythonPackage - { name = "gurobipy-7.5.2"; + { pname = "gurobipy"; + version = "7.5.2"; src = fetchurl { url = "http://packages.gurobi.com/7.5/gurobi7.5.2_mac64.pkg"; sha256 = "10zgn8741x48xjdiknj59x66mwj1azhihi1j5a1ajxi2n5fsak2h"; diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/pkgs/development/python-modules/gurobipy/linux.nix index d78eff0b47a0..8afe6379dc7c 100644 --- a/pkgs/development/python-modules/gurobipy/linux.nix +++ b/pkgs/development/python-modules/gurobipy/linux.nix @@ -5,7 +5,8 @@ let utf = else if python.ucsEncoding == 4 then "32" else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}"; in python.pkgs.buildPythonPackage - { name = "gurobipy-7.5.2"; + { pname = "gurobipy"; + version = "7.5.2"; src = fetchurl { url = "http://packages.gurobi.com/7.5/gurobi7.5.2_linux64.tar.gz"; sha256 = "13i1dl22lnmg7z9mb48zl3hy1qnpwdpr0zl2aizda0qnb7my5rnj"; diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 08cd1943eff6..015ad38d0c14 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -2,7 +2,6 @@ , enum34, hpack, hyperframe }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "h2"; version = "3.0.1"; diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix index bb200139496d..aa8c051aed3c 100644 --- a/pkgs/development/python-modules/hglib/default.nix +++ b/pkgs/development/python-modules/hglib/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "python-hglib"; version = "2.6.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 212fd5c957df..d06cc89ff1f6 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -1,7 +1,6 @@ { stdenv, libusb1, udev, fetchPypi, buildPythonPackage, cython }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "hidapi"; version = "0.7.99.post21"; diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index 27d4b8a15b81..9fa28126452a 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -1,12 +1,11 @@ -{ stdenv , fetchurl , buildPythonPackage , sphinx }: +{ stdenv, fetchPypi, buildPythonPackage, sphinx }: buildPythonPackage rec { pname = "hieroglyph"; version = "1.0.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/h/hieroglyph/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "8e137f0b1cd60c47b870011089790d3c8ddb74fcf409a75ddf2c7f2516ff337c"; }; @@ -21,7 +20,6 @@ buildPythonPackage rec { homepage = https://github.com/nyergler/hieroglyph/; license = licenses.bsd3; maintainers = with maintainers; [ juliendehos ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index 8df4b3813c41..538b75c3dd02 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "htmlmin"; version = "0.1.12"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "50c1ef4630374a5d723900096a961cff426dff46b48f34d194a81bbe14eca178"; diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix index 0e4ae14acd76..3bd61ec8afae 100644 --- a/pkgs/development/python-modules/httpserver/default.nix +++ b/pkgs/development/python-modules/httpserver/default.nix @@ -1,7 +1,6 @@ { lib, fetchPypi, buildPythonPackage, docopt, pythonOlder }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "httpserver"; version = "1.1.0"; diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 37f491a550f3..bbd4760bdf89 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "hupper"; version = "1.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix index 6574de1be63f..b72544611833 100644 --- a/pkgs/development/python-modules/hypchat/default.nix +++ b/pkgs/development/python-modules/hypchat/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "hypchat"; version = "0.21"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index 91e00a7a1461..70c50c1f6637 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -1,6 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "hyperframe"; version = "5.1.0"; diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index f70cc9d69452..149b07d63e3b 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "ijson"; version = "2.3"; diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index a5d7b2b711eb..a97a98b207a5 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -1,16 +1,15 @@ -{ stdenv, buildPythonPackage, fetchurl }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "incremental"; version = "17.5.0"; - src = fetchurl { - url = "mirror://pypi/i/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/twisted/treq; description = "Incremental is a small library that versions your Python projects"; license = licenses.mit; diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix index d6ddadea9ca0..82b5880f4658 100644 --- a/pkgs/development/python-modules/intelhex/default.nix +++ b/pkgs/development/python-modules/intelhex/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "intelhex"; version = "2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index ff077bd1b01e..a8e270bd1c09 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "internetarchive"; version = "1.7.2"; - name = "${pname}-${version}"; # Can't use pypi, data files for tests missing src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix index 5cf3c9e9db06..ee81c40febc8 100644 --- a/pkgs/development/python-modules/interruptingcow/default.nix +++ b/pkgs/development/python-modules/interruptingcow/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "interruptingcow"; version = "0.8"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index feccdff683e7..47cb354a7fe9 100644 --- a/pkgs/development/python-modules/intervaltree/default.nix +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { version = "2.1.0"; pname = "intervaltree"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 3f09975d66be..9d4392583be5 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -14,7 +14,6 @@ buildPythonPackage rec { pname = "ipykernel"; version = "4.8.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 4b3481d7528e..665d08980dca 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -17,7 +17,6 @@ buildPythonPackage rec { pname = "ipyparallel"; version = "6.2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/pkgs/development/python-modules/ipython_genutils/default.nix index 503ccb37d57e..0f3504780c2b 100644 --- a/pkgs/development/python-modules/ipython_genutils/default.nix +++ b/pkgs/development/python-modules/ipython_genutils/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "ipython_genutils"; version = "0.2.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 67d7d551522d..e65de4ee3ad0 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -15,7 +15,6 @@ buildPythonPackage rec { pname = "ipywidgets"; version = "7.2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix index f44bb7caf3d5..fe6382f6fb63 100644 --- a/pkgs/development/python-modules/iso-639/default.nix +++ b/pkgs/development/python-modules/iso-639/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchurl, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "iso-639"; version = "0.4.5"; - src = fetchurl { - url = "mirror://pypi/i/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/noumar/iso639; description = "ISO 639 library for Python"; license = licenses.agpl3; diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index 4d9792ebbb82..21d098eb31b4 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "iso3166"; version = "0.8"; diff --git a/pkgs/development/python-modules/jabberbot/default.nix b/pkgs/development/python-modules/jabberbot/default.nix index 9161f3f6f0b8..6c04e6945de1 100644 --- a/pkgs/development/python-modules/jabberbot/default.nix +++ b/pkgs/development/python-modules/jabberbot/default.nix @@ -1,13 +1,12 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchurl, xmpppy }: +{ stdenv, buildPythonPackage, isPy3k, fetchPypi, xmpppy }: buildPythonPackage rec { pname = "jabberbot"; version = "0.16"; - name = "${pname}-${version}"; disabled = isPy3k; - src = fetchurl { - url = "mirror://pypi/j/jabberbot/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1qr7c5p9a0nzsvri1djnd5r3d7ilh2mdxvviqn1s2hcc70rha65d"; }; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 7d652b2943a9..9522d2099f8b 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "jedi"; version = "0.12.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index eedbed250a12..c24a5fa77bfe 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -12,7 +12,6 @@ buildPythonPackage rec { pname = "joblib"; - name = "${pname}-${version}"; version = "0.11"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 19b1eeefa534..bb3e8cf17f61 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchurl, buildPythonApplication, EditorConfig, pytest, six }: +{ lib, fetchPypi, buildPythonApplication, EditorConfig, pytest, six }: buildPythonApplication rec { pname = "jsbeautifier"; version = "1.7.5"; - name = "${pname}-${version}"; propagatedBuildInputs = [ six ]; buildInputs = [ EditorConfig pytest ]; - src = fetchurl { - url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "78eb1e5c8535484f0d0b588aca38da3fb5e0e34de2d1ab53c077e71c55757473"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://jsbeautifier.org"; description = "JavaScript unobfuscator and beautifier."; license = licenses.mit; diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix index 16be096f2bae..3a6d69cc829f 100644 --- a/pkgs/development/python-modules/jsmin/default.nix +++ b/pkgs/development/python-modules/jsmin/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "jsmin"; version = "2.2.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index ceb697adcaf8..52fc3bd5e043 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "jsonpatch"; version = "1.23"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index 6209c2593a7a..17a1102bda8e 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "jsonref"; version = "0.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index b331279042c0..bd3b6b6f769f 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -4,7 +4,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "jsonrpclib-pelix"; version = "0.3.1"; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index cd29d7b5d310..1d8eab79688a 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -2,7 +2,6 @@ , nose, mock, vcversioner, functools32 }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "jsonschema"; version = "2.6.0"; diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index 4b0444e40d44..6a350d59be6d 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -4,7 +4,6 @@ , zlib }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Jug"; version = "1.6.7"; buildInputs = [ nose numpy ]; diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index b0bb887229eb..26b52c41c23a 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,7 +12,6 @@ buildPythonPackage rec { pname = "jupyter_console"; version = "5.2.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index 403f7c047d56..c934d24dab7b 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -12,7 +12,6 @@ buildPythonPackage rec { pname = "jupyter_core"; version = "4.4.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index bdd06b8b7cee..db0fda6584c6 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - name = "${pname}-${version}"; version = "1.4.3"; pname = "kafka-python"; diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index 0863cd79f46e..19169e88b125 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -1,7 +1,6 @@ { stdenv, kaitaistruct, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "kaitaistruct"; version = "0.8"; diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index 9ea6840c4d2c..540542da10eb 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -2,7 +2,6 @@ , ecdsa , mnemonic, protobuf, hidapi, trezor }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "keepkey"; version = "4.0.0"; diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index 04b9e9235750..b07dd4abd0d2 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -1,16 +1,15 @@ -{ lib, buildPythonPackage, fetchurl, pkgs, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, keyutils, pytestrunner }: buildPythonPackage rec { pname = "keyutils"; version = "0.5"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/k/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10"; }; - buildInputs = [ pkgs.keyutils pytestrunner ]; + checkInputs = [ keyutils pytestrunner ]; doCheck = false; diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index b4b6c48201bd..2e8abf0da525 100644 --- a/pkgs/development/python-modules/kitchen/default.nix +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "kitchen"; version = "1.2.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index f2073a48c589..86e677a03374 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -3,11 +3,10 @@ buildPythonPackage rec { pname = "koji"; version = "1.13.0"; - name = "${pname}-${version}"; format = "other"; src = fetchurl { - url = "https://releases.pagure.org/koji/${name}.tar.bz2"; + url = "https://releases.pagure.org/koji/${pname}-${version}.tar.bz2"; sha256 = "18b18rcbdqqw33g7h20hf5bpbci2ixdi05yda1fvpv30c1kkzd8w"; }; diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index f6b12cae001c..98cc3a42074c 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "leather"; version = "0.3.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index dfd5d5dfde9f..47eea033f6e7 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -3,7 +3,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "ledgerblue"; version = "0.1.17"; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 757a171d8381..e606d84ede4f 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -3,7 +3,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "libagent"; version = "0.9.8"; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index cf556a790033..4a937ac94f09 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,21 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, python, cmake, sip, protobuf }: +{ stdenv, lib, buildPythonPackage, fetchFromGitHub +, python, cmake, sip, protobuf, pythonOlder }: -if lib.versionOlder python.version "3.4.0" -then throw "libArcus not supported for interpreter ${python.executable}" -else - -stdenv.mkDerivation rec { +buildPythonPackage rec { pname = "libarcus"; - name = "${pname}-${version}"; version = "3.3.0"; - + src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; sha256 = "0mln8myvfl7rq2p4g1vadvlykckd8490jijag4xa5hhj3w3p19bk"; }; - + + disabled = pythonOlder "3.4.0"; + propagatedBuildInputs = [ sip protobuf ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix index b27dbc2935af..aed76728d7e4 100644 --- a/pkgs/development/python-modules/libasyncns/default.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "libasyncns-python"; - name = "${pname}-${version}"; version = "0.7.1"; src = fetchurl { diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index 06bc294a9d7e..a8acb4dc9696 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "libnacl"; version = "1.6.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "saltstack"; diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index a88a60976110..e5a03f783551 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "libsexy"; - name = "${pname}-${version}"; version = "0.1.9"; format = "other"; diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index 26dfda613f75..256cf107c86b 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "line_profiler"; version = "2.1.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/linuxfd/default.nix b/pkgs/development/python-modules/linuxfd/default.nix index 16a397136726..e5b8fe6f34c4 100644 --- a/pkgs/development/python-modules/linuxfd/default.nix +++ b/pkgs/development/python-modules/linuxfd/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "linuxfd"; version = "1.4.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix index fa9067fa0fee..5c7c7e970c32 100644 --- a/pkgs/development/python-modules/livereload/default.nix +++ b/pkgs/development/python-modules/livereload/default.nix @@ -11,7 +11,6 @@ buildPythonPackage rec { pname = "livereload"; version = "2.5.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "lepture"; diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index 9ad9ddb433f0..c9b9b4896139 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "lmtpd"; version = "6.0.0"; diff --git a/pkgs/development/python-modules/logfury/default.nix b/pkgs/development/python-modules/logfury/default.nix index d9ce51eed1ee..a52f194b8bea 100644 --- a/pkgs/development/python-modules/logfury/default.nix +++ b/pkgs/development/python-modules/logfury/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "logfury"; - name = "${pname}-${version}"; version = "0.1.2"; src = fetchPypi { diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index f64c309cc35b..6d3b81488b95 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "logilab-common"; version = "1.4.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix index 8f7229a4c0f0..aa26f21820b7 100644 --- a/pkgs/development/python-modules/logilab/constraint.nix +++ b/pkgs/development/python-modules/logilab/constraint.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "logilab-constraint"; version = "0.6.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 9ec291439cef..823c86818738 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -2,7 +2,6 @@ mistune, docutils } : buildPythonPackage rec { pname = "m2r"; - name = "${pname}-${version}"; version = "0.1.14"; src = fetchPypi { diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index b3c43836e42d..4a96ce8ad051 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -15,7 +15,6 @@ buildPythonPackage rec { pname = "marionette-harness"; version = "4.5.0"; - name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix index 766e419e514c..5d52b52ac7f2 100644 --- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix +++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "manifestparser"; version = "1.1"; - name = "${pname}-${version}"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index 49f25e96bdca..d27637874af8 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "marionette_driver"; version = "2.7.0"; - name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix index 0e404f69caa5..ccd0eb6cc9f8 100644 --- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix +++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "mozcrash"; version = "1.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 3f7218a276d7..8569d9287ac8 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "mozdevice"; version = "1.0.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix index d32733036918..7bd14f2d10ca 100644 --- a/pkgs/development/python-modules/marionette-harness/mozfile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "mozfile"; version = "1.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix index ca489929d3a1..1d1be733f998 100644 --- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix +++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "mozhttpd"; version = "0.7"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix index 0e24ab09de67..1515c050a3f0 100644 --- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "mozinfo"; version = "0.9"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix index 45fba9761e5d..a6561d3e07ac 100644 --- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix +++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "moznetwork"; version = "0.27"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix index 80b13d94a2d9..c1e534432607 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "mozprocess"; version = "0.26"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index 0ff0461c558d..c94acdd3ba5a 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "mozprofile"; version = "1.1.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index 5e5144e25402..e9f6177cfa1b 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -14,7 +14,6 @@ buildPythonPackage rec { pname = "mozrunner"; version = "7.0.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix index ad2be9b1923b..d1c799c95dee 100644 --- a/pkgs/development/python-modules/marionette-harness/moztest.nix +++ b/pkgs/development/python-modules/marionette-harness/moztest.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "moztest"; version = "0.8"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix index 729f110858c8..c9eb12bd52b4 100644 --- a/pkgs/development/python-modules/marionette-harness/mozversion.nix +++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "mozversion"; version = "1.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 2b576cd3b056..f49b2630b6c7 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -1,12 +1,12 @@ -{ stdenv, buildPythonPackage, fetchurl }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "markdown2"; version = "2.3.5"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/m/markdown2/${name}.zip"; + src = fetchPypi { + inherit pname version; + extension = "zip"; sha256 = "8bb9a24eb2aa02f1427aabe46483f0f0215ab18c8a345315ae8e2ee3c3a09c03"; }; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index c07340987975..f7efeb725928 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - name = "${pname}-${version}"; version = "0.14.0"; meta = { diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index fa218d821cfc..242244726e52 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "marshmallow"; - name = "${pname}-${version}"; version = "2.15.3"; meta = { diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 46f85b654c72..794124ef3bfa 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pycairo, backports_functools_lru_cache +{ stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32 , enableGhostscript ? false, ghostscript ? null, gtk3 @@ -23,10 +23,9 @@ assert enableQt -> pyqt4 != null; buildPythonPackage rec { version = "2.2.2"; pname = "matplotlib"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "4dc7ef528aad21f22be85e95725234c5178c0f938e2228ca76640e5e84d8cde8"; }; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index d0b01f94b45f..34ec95b866f5 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "matrix-client"; version = "0.2.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 63625b3e3b4a..ee615a035a8c 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "mccabe"; version = "0.6.1"; diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix index 5a348e5288c4..b0cdbd60c3e2 100644 --- a/pkgs/development/python-modules/meliae/default.nix +++ b/pkgs/development/python-modules/meliae/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "meliae"; version = "0.4.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname; diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 7ab4a1842634..04a0f99314b1 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "mistune"; version = "0.8.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index ad1443024178..182bbf3f0758 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -1,12 +1,11 @@ -{ lib, fetchurl, buildPythonPackage, pbkdf2 }: +{ lib, fetchPypi, buildPythonPackage, pbkdf2 }: buildPythonPackage rec { pname = "mnemonic"; version = "0.18"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/m/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "02a7306a792370f4a0c106c2cf1ce5a0c84b9dbd7e71c6792fdb9ad88a727f1d"; }; diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index 83fa05d4b1cb..b5f5c1379bcf 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -3,7 +3,6 @@ , decorator }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "moretools"; version = "0.1.8"; diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index d4750f252ad0..1b4ad50c781f 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "mpi4py"; version = "3.0.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix index 85a5d1f36222..62c5282b335b 100644 --- a/pkgs/development/python-modules/mplleaflet/default.nix +++ b/pkgs/development/python-modules/mplleaflet/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "mplleaflet"; version = "0.0.5"; - name = "${pname}-${version}"; propagatedBuildInputs = [ jinja2 six ]; diff --git a/pkgs/development/python-modules/mpyq/default.nix b/pkgs/development/python-modules/mpyq/default.nix index 2be1c34c01c8..5660e1b0dc5c 100644 --- a/pkgs/development/python-modules/mpyq/default.nix +++ b/pkgs/development/python-modules/mpyq/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "mpyq"; version = "0.2.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index 8edd8429d0d4..f568e53c5730 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "multipledispatch"; version = "0.5.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index c0b8b90bd089..dfa87c843ff2 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -23,7 +23,6 @@ buildPythonPackage rec { pname = "nbconvert"; version = "5.3.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 71a140e53255..adfb3da7c683 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -13,7 +13,6 @@ buildPythonPackage rec { pname = "nbformat"; version = "4.4.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix index df6c774bfbe1..c0485eef4d3d 100644 --- a/pkgs/development/python-modules/nbmerge/default.nix +++ b/pkgs/development/python-modules/nbmerge/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "nbmerge"; version = "unstable-2017-10-23"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jbn"; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index e45c69aa3954..696796740f8b 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -1,10 +1,11 @@ -{ stdenv, buildPythonPackage, fetchzip, pyopenssl }: +{ stdenv, buildPythonPackage, fetchzip, pyopenssl, python }: -buildPythonPackage rec { +let pname = "nbxmpp"; version = "0.6.6"; name = "${pname}-${version}"; - +in buildPythonPackage rec { + inherit pname version; # Tests aren't included in PyPI tarball. src = fetchzip { name = "${name}.tar.bz2"; @@ -18,7 +19,7 @@ buildPythonPackage rec { checkPhase = '' # Disable tests requiring networking echo "" > test/unit/test_xmpp_transports_nb2.py - python test/runtests.py + ${python.executable} test/runtests.py ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index d30e030a0498..9645e54f7ec1 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { version = "3.2.5"; pname = "nltk"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/nose-exclude/default.nix b/pkgs/development/python-modules/nose-exclude/default.nix index d9ec2f85fa25..7eb6b6cc0474 100644 --- a/pkgs/development/python-modules/nose-exclude/default.nix +++ b/pkgs/development/python-modules/nose-exclude/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "nose-exclude"; version = "0.5.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nose_warnings_filters/default.nix b/pkgs/development/python-modules/nose_warnings_filters/default.nix index db53a34a57f3..34aed962eaed 100644 --- a/pkgs/development/python-modules/nose_warnings_filters/default.nix +++ b/pkgs/development/python-modules/nose_warnings_filters/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "nose_warnings_filters"; version = "0.1.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix index 03890f712afc..e4bbe0fb4302 100644 --- a/pkgs/development/python-modules/ntlm-auth/default.nix +++ b/pkgs/development/python-modules/ntlm-auth/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "ntlm-auth"; version = "1.0.3"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jborean93"; diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index d05284b62dd4..2ec5066e5fc4 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "numpy-stl"; - name = "${pname}-${version}"; version = "2.4.1"; src = fetchPypi { diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix index 858b5ae594ae..a0262c775954 100644 --- a/pkgs/development/python-modules/numtraits/default.nix +++ b/pkgs/development/python-modules/numtraits/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "numtraits"; version = "0.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index 37790b6eaf8a..161272ce1a73 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "odfpy"; version = "1.3.6"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix index 3b5fa1f531a2..2bde7b174d33 100644 --- a/pkgs/development/python-modules/ofxclient/default.nix +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -3,7 +3,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; version = "2.0.3"; pname = "ofxclient"; diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/pkgs/development/python-modules/ofxhome/default.nix index 3d412e1409c8..518c34951fce 100644 --- a/pkgs/development/python-modules/ofxhome/default.nix +++ b/pkgs/development/python-modules/ofxhome/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { - name = "${pname}-${version}"; version = "0.3.3"; pname = "ofxhome"; diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index 23b470ed90ff..e85ac88d0d58 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "olefile"; version = "0.45.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix index a4adc1f2a6f6..7b5622cfeefb 100644 --- a/pkgs/development/python-modules/onkyo-eiscp/default.nix +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "onkyo-eiscp"; version = "1.2.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix index 6b50a2c96866..e0eb1ac8d796 100644 --- a/pkgs/development/python-modules/openidc-client/default.nix +++ b/pkgs/development/python-modules/openidc-client/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "openidc-client"; version = "0.6.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 0ad105a5158b..7b8f46021408 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "openpyxl"; version = "2.5.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pafy/default.nix b/pkgs/development/python-modules/pafy/default.nix index a1b5c77b2d10..75a16f5c53be 100644 --- a/pkgs/development/python-modules/pafy/default.nix +++ b/pkgs/development/python-modules/pafy/default.nix @@ -1,6 +1,5 @@ { lib, buildPythonPackage, youtube-dl, fetchPypi }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pafy"; version = "0.5.4"; diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix index 02b8211a256d..2c0a2c44f6eb 100644 --- a/pkgs/development/python-modules/pandas/0.17.1.nix +++ b/pkgs/development/python-modules/pandas/0.17.1.nix @@ -28,7 +28,6 @@ let in buildPythonPackage rec { pname = "pandas"; version = "0.17.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index 7d228f0af6ac..b6cec2150a9e 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "paperspace"; version = "0.0.11"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 4d96798bfae3..18cc23338bf6 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "parse"; version = "1.8.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index dd96214ca863..7f3bc9cf4821 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "parso"; version = "0.2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index ae07942be127..764319a1a0d7 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pbr"; version = "4.0.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix index 9f61619e12bc..2c1250f34a3e 100644 --- a/pkgs/development/python-modules/pep257/default.nix +++ b/pkgs/development/python-modules/pep257/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchurl, pytest, mock }: buildPythonPackage rec { pname = "pep257"; - name = "${pname}-${version}"; version = "0.7.0"; src = fetchurl { diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index ced7a0163d52..0116212ad9ea 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "pexpect"; version = "4.6.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 29d1866d4ea2..b797e6e76a0b 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "phonenumbers"; version = "8.9.8"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/phpserialize/default.nix b/pkgs/development/python-modules/phpserialize/default.nix index 48ea9bd6980f..0ddeb99f10b1 100644 --- a/pkgs/development/python-modules/phpserialize/default.nix +++ b/pkgs/development/python-modules/phpserialize/default.nix @@ -1,7 +1,6 @@ {lib, buildPythonPackage, fetchPypi}: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "phpserialize"; version = "1.3"; diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix index c4aa8dcf16c9..b5460e8b6080 100644 --- a/pkgs/development/python-modules/piexif/default.nix +++ b/pkgs/development/python-modules/piexif/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, pillow }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "piexif"; version = "1.0.13"; diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix index 219ae4d70079..5cb1e9027a90 100644 --- a/pkgs/development/python-modules/pika-pool/default.nix +++ b/pkgs/development/python-modules/pika-pool/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "pika-pool"; version = "0.1.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index e9a0acac1cba..44399f34bda1 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "Pillow"; version = "5.1.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 4ca6d0e08d10..c16c8d3f7509 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -4,7 +4,6 @@ , python }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "plac"; version = "0.9.6"; diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 336a098c3a36..3f90e6b2da7d 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "plaster_pastedeploy"; version = "0.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 75c0bdc00f16..8c3de8bd0351 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "plaster"; version = "1.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 136f518beaaf..6a1993e1fd17 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,7 +11,6 @@ buildPythonPackage rec { pname = "plotly"; version = "2.7.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index fa1e75f6af87..c4b884e1d3dc 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, pytest, tox }: buildPythonPackage rec { - name = "${pname}-${version}"; version = "0.7"; pname = "pluginbase"; diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index cd4a79104eb8..5269ecd5d8b4 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "plumbum"; version = "1.6.6"; - name = "${pname}-${version}"; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index bfe5d2f202df..1ac8afc8cfb1 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "plyfile"; version = "0.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix index b45c8d96fc47..bb8e0ed8ce58 100644 --- a/pkgs/development/python-modules/podcastparser/default.nix +++ b/pkgs/development/python-modules/podcastparser/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "podcastparser"; version = "0.6.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "gpodder"; diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index 3e753ab7e06b..a4538b260fde 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "portpicker"; version = "1.2.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index e5ed9edc4f96..5e169306b2f1 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "premailer"; - name = "${pname}-${version}"; version = "3.2.0"; meta = { diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index d82408e620ea..ba1537a02c87 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -7,7 +7,6 @@ , python }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "preshed"; version = "1.0.0"; diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix index f2373e4702f9..3d99d9530f38 100644 --- a/pkgs/development/python-modules/proboscis/default.nix +++ b/pkgs/development/python-modules/proboscis/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "proboscis"; version = "1.2.6.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index 59aec94ff90e..69a2f47d05ff 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - name = "${pname}-${version}"; version = "1.0.15"; src = fetchPypi { diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 801936d906c8..5f6c23beb028 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "psd-tools"; - name = "${pname}-${version}"; version = "1.4"; meta = { diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index a2ce8b698b72..7fbdfb7c33eb 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "psutil"; version = "5.4.6"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index efe4e9df6724..564946c579a9 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "py"; version = "1.5.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index bae2d393685f..ab83e54fd824 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "py3exiv2"; version = "0.3.0"; - name = "${pname}-${version}"; disabled = !(isPy3k); src = fetchPypi { diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index 1b1f758d9413..11fe98c664ee 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "scrypt"; version = "0.8.6"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyaes/default.nix b/pkgs/development/python-modules/pyaes/default.nix index 6104e72a37bc..5ca837cdee48 100644 --- a/pkgs/development/python-modules/pyaes/default.nix +++ b/pkgs/development/python-modules/pyaes/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pyaes"; version = "1.6.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index b8dcae16da85..35c0d5233005 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, pyasn1, isPyPy }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pyasn1-modules"; version = "0.2.1"; disabled = isPyPy; diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index 09015e7d04ad..c1b133a0ab7d 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pyasn1"; version = "0.4.3"; diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/pkgs/development/python-modules/pyblake2/default.nix index 2de46c0d1ed1..e106ee3f3f18 100644 --- a/pkgs/development/python-modules/pyblake2/default.nix +++ b/pkgs/development/python-modules/pyblake2/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "pyblake2"; version = "1.1.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix index b1ee59a5cd4a..3791efc0e2e4 100644 --- a/pkgs/development/python-modules/pycassa/default.nix +++ b/pkgs/development/python-modules/pycassa/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pycassa"; version = "1.11.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index e6c7a85aaf28..32ef1d547b0b 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pycodestyle"; version = "2.3.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 51ad4a5a5184..b4ef42cb22ab 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, python, buildPythonPackage, gmp }: +{ stdenv, fetchPypi, python, buildPythonPackage, gmp }: buildPythonPackage rec { version = "3.6.2"; pname = "pycryptodome"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "b19ed0f7752a0b1ec65834c9acb02ba64a812990854e318d32a619c709b14a69"; }; diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 6135cd75f24a..aa838bc928ea 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "pycryptodomex"; - name = "${pname}-${version}"; version = "3.6.2"; meta = { diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index eb7459b07792..2774a363f85e 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -23,7 +23,6 @@ in buildPythonPackage rec { pname = "pycuda"; version = "2017.1.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix index 058f8b6b8873..27b2d237cfcd 100644 --- a/pkgs/development/python-modules/pydbus/default.nix +++ b/pkgs/development/python-modules/pydbus/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pydbus"; version = "0.6.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 98d4b33939a2..e21b876be04e 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "pydot"; version = "1.2.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index 5b5df40be6a4..28a76da4bd96 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, scipy, ffmpeg-full }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pydub"; version = "0.22.1"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index a7430c94b480..28c74487c966 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, numpy, cython }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pyemd"; version = "0.5.1"; diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix index 5d11b716a2f8..3384e981ff07 100644 --- a/pkgs/development/python-modules/pyexiv2/default.nix +++ b/pkgs/development/python-modules/pyexiv2/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, python, exiv2, scons, boost }: +{ stdenv, buildPythonPackage, fetchurl, python, exiv2, scons, boost }: -stdenv.mkDerivation rec { +buildPythonPackage rec { pname = "pyexiv2"; version = "0.3.2"; - name = "${pname}-${version}"; - + format = "other"; + src = fetchurl { - url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${name}.tar.bz2"; + url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${pname}-${version}.tar.bz2"; sha256 = "09r1ga6kj5cnmrldpkqzvdhh7xi7aad9g4fbcr1gawgsd9y13g0a"; }; @@ -23,5 +23,7 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; + # Likely needs an older boost which does not have `boost_pythonXY` but `boost_python`. + broken = true; # 2018-06-23 }; } diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index 9308a7467366..ede8e965db94 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { version = "0.7.5"; pname = "pyfiglet"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index b1f1619d9100..06b027dd59a8 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pyflakes"; version = "1.6.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index a33eefa48ec4..5a4a81f13acc 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "pygame"; - name = "${pname}-${version}"; version = "1.9.3"; src = fetchurl { diff --git a/pkgs/development/python-modules/pygeoip/default.nix b/pkgs/development/python-modules/pygeoip/default.nix index a0a92ffc287e..0b0e8f55fa7f 100644 --- a/pkgs/development/python-modules/pygeoip/default.nix +++ b/pkgs/development/python-modules/pygeoip/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "pygeoip"; version = "0.3.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 3f05aa7b7896..72e09bf98f92 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, libgit2, six, cffi }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pygit2"; version = "0.26.4"; diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/pkgs/development/python-modules/pygpgme/default.nix index 85bf262837f7..3571e89bd333 100644 --- a/pkgs/development/python-modules/pygpgme/default.nix +++ b/pkgs/development/python-modules/pygpgme/default.nix @@ -4,11 +4,10 @@ buildPythonPackage rec { version = "0.3"; pname = "pygpgme"; - name = "${pname}-${version}"; disabled = isPyPy; src = fetchurl { - url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "5fd887c407015296a8fd3f4b867fe0fcca3179de97ccde90449853a3dfb802e1"; }; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index e6ab3512797d..7ba62c4f2eb4 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -2,7 +2,6 @@ , pkgconfig, doctest-ignore-unicode, mock, nose }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pygraphviz"; version = "1.3.1"; diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index 6b1eebd95c44..f452d0599362 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -5,7 +5,6 @@ buildPythonApplication rec { pname = "PyHamcrest"; version = "1.9.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyjwkest/default.nix b/pkgs/development/python-modules/pyjwkest/default.nix index 563c0a092843..4460105f6174 100644 --- a/pkgs/development/python-modules/pyjwkest/default.nix +++ b/pkgs/development/python-modules/pyjwkest/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "pyjwkest"; - name = "${pname}-${version}"; version = "1.4.0"; meta = { diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index dc726fe928fa..89ae2f37d10f 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pylast"; version = "2.3.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index 47499e4ae188..4f286cc5c419 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { version = "1.5.2"; pname = "pylibmc"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index f6aec993c3c7..859a17e156b0 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -2,7 +2,6 @@ pytest, pytestrunner, mccabe, configparser, backports_functools_lru_cache }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pylint"; version = "1.9.2"; diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix index db8584c4f9e5..79bb6dbd9a2b 100644 --- a/pkgs/development/python-modules/pylru/default.nix +++ b/pkgs/development/python-modules/pylru/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchurl }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "pylru-${version}"; + pname = "pylru"; version = "1.0.9"; - src = fetchurl { - url = "mirror://pypi/p/pylru/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi"; }; diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index ae89d4dfe204..ad1f656eb145 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, isPy3k, buildPythonPackage }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pyobjc"; version = "4.2.2"; diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index d8d61c56c357..ae1133fc0bed 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pyodbc"; version = "4.0.23"; - name = "${pname}-${version}"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index f751a8bfbb2d..51500281abb6 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pyparsing"; - name = "${pname}-${version}"; version = "2.2.0"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index 0e134f9d84a2..4cc7f1493f8b 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Pyphen"; version = "0.9.4"; diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 30dbbdba5a57..a16819cab348 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -9,7 +9,6 @@ buildPythonPackage (rec { pname = "pyproj"; version = "1.9.5.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix index a95c67b96d29..299fba098d9d 100644 --- a/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/pkgs/development/python-modules/pyramid_beaker/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pyramid_beaker"; version = "0.8"; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index fad9f872add8..e9c48cbb8b40 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,12 +1,11 @@ -{stdenv, buildPythonPackage, fetchurl}: +{stdenv, buildPythonPackage, fetchPypi}: buildPythonPackage rec { pname = "pyroute2"; version = "0.5.2"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "42bf74495d95a0196a74dd171357f660175aba2bfc23f9b5f63e3830ccbef9ac"; }; diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index fba7a0b27dd9..ab9c93b9b010 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { version = "0.7.2"; pname = "pyrr"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 72782c1c0291..3290fb74fa18 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchurl, buildPythonPackage, swig, pcsclite, PCSC }: +{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: buildPythonPackage rec { version = "1.9.7"; pname = "pyscard"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/p/pyscard/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "412c74c83e7401566e9d3d7b8b5ca965e74582a1f33179b3c1fabf1da73ebf80"; }; - patchPhase = '' + postPatch = '' sed -e 's!"libpcsclite\.so\.1"!"${pcsclite}/lib/libpcsclite.so.1"!' \ -i smartcard/scard/winscarddll.c ''; diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix index 95ab0f339b06..05503cd4ad81 100644 --- a/pkgs/development/python-modules/pyserial/default.nix +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pyserial"; version="3.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pysha3/default.nix b/pkgs/development/python-modules/pysha3/default.nix index 4df98623e118..d459be25a86e 100644 --- a/pkgs/development/python-modules/pysha3/default.nix +++ b/pkgs/development/python-modules/pysha3/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pysha3"; version = "1.0.2"; - name = "${pname}-${version}"; disabled = pythonOlder "2.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index ea38c096ee1b..f03cab5c1938 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { version = "1.2.12"; pname = "pyshp"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 226108ad5a5b..288b141d32e8 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -3,7 +3,6 @@ # This derivation provides a Python module and should therefore be called via `python-packages.nix`. buildPythonPackage rec { pname = "pyside"; - name = "${pname}-${version}"; version = "1.2.4"; format = "other"; diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index a6e0ce47f112..9ad65dc76e0f 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -3,9 +3,9 @@ # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. let pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]); -in stdenv.mkDerivation rec { pname = "pyside-generatorrunner"; version = "0.6.16"; +in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index c588bac69ccf..43ae52338af7 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -3,7 +3,6 @@ # This derivation provides a Python module and should therefore be called via `python-packages.nix`. # Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77 buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pyside-shiboken"; version = "1.2.4"; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index 5acd33d07d2d..a56899f8d0b3 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "pyside-tools"; version = "0.2.15"; - name = "${pname}-${version}"; format = "other"; src = fetchurl { diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index b2d204e9b9b4..0f915d9a2523 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { version = "1.0.15.8"; pname = "pysmbc"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix index 6903b6c7a0c0..c4ebaf160fa6 100644 --- a/pkgs/development/python-modules/pyspf/default.nix +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchurl, pydns }: +{ lib, buildPythonPackage, fetchPypi, pydns }: buildPythonPackage rec { - name = "pyspf-${version}"; + pname = "pyspf"; version = "2.0.12"; - src = fetchurl { - url = "mirror://sourceforge/pymilter/pyspf/${name}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la"; }; diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index 5f0084a36b65..a5a0104490aa 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -17,7 +17,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pyspread"; version = "1.1.2"; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index 147e9773fbf7..882aed18c591 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -7,7 +7,6 @@ buildPythonApplication rec { pname = "pysrt"; - name = "${pname}-${version}"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index c31cd2ab6f63..70a6546189b3 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, py, pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pytest-datafiles"; version = "1.0"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 0bd59bc85acd..db17d60b6280 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -4,7 +4,6 @@ }: buildPythonPackage rec { pname = "pytest-django"; - name = "${pname}-${version}"; version = "3.1.2"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pytest-expect/default.nix b/pkgs/development/python-modules/pytest-expect/default.nix index b23ae051ad8d..557446b5adcc 100644 --- a/pkgs/development/python-modules/pytest-expect/default.nix +++ b/pkgs/development/python-modules/pytest-expect/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , lib -, fetchurl +, fetchPypi , pytest , u-msgpack-python , six @@ -9,10 +9,9 @@ buildPythonPackage rec { pname = "pytest-expect"; version = "1.1.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "36b4462704450798197d090809a05f4e13649d9cba9acdc557ce9517da1fd847"; }; diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 4d04fa61f232..14eb3a74d577 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "pytest-forked"; version = "0.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index c98370ed9389..3db802e6e3d9 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "pytest-localserver"; - name = "${pname}-${version}"; version = "0.4.1"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pytest-pep257/default.nix b/pkgs/development/python-modules/pytest-pep257/default.nix index 1509d80feb1a..0ff8890a6fbd 100644 --- a/pkgs/development/python-modules/pytest-pep257/default.nix +++ b/pkgs/development/python-modules/pytest-pep257/default.nix @@ -1,12 +1,11 @@ -{ stdenv, buildPythonPackage, fetchurl, pytest, pep257 }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, pep257 }: buildPythonPackage rec { pname = "pytest-pep257"; - name = "${pname}-${version}"; version = "0.0.5"; - src = fetchurl { - url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w"; }; diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 6e8742ec2b8e..1decbeb643d6 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "pytest-quickcheck"; version = "0.8.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index d1e40e5037e3..93aecbafdf35 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "pytest-timeout"; version = "1.3.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix index 753250315a36..78cd02897f9a 100644 --- a/pkgs/development/python-modules/pytest-warnings/default.nix +++ b/pkgs/development/python-modules/pytest-warnings/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pytest-warnings"; version = "0.3.0"; diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix index d90b7fa740dc..91def55c5e44 100644 --- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix +++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchurl }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "python-axolotl-curve25519-${version}"; + pname = "python-axolotl-curve25519"; version = "0.1"; - src = fetchurl { - url = "mirror://pypi/p/python-axolotl-curve25519/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5"; }; diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix index 71c456875bcf..1fff6bb76086 100644 --- a/pkgs/development/python-modules/python-axolotl/default.nix +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchurl, python-axolotl-curve25519, protobuf, pycrypto }: +{ lib, buildPythonPackage, fetchPypi, python-axolotl-curve25519, protobuf, pycrypto }: buildPythonPackage rec { - name = "python-axolotl-${version}"; + pname = "python-axolotl"; version = "0.1.39"; - src = fetchurl { - url = "mirror://pypi/p/python-axolotl/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs"; }; diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix index d2941e4c572b..94cdd8029baa 100644 --- a/pkgs/development/python-modules/python-editor/default.nix +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { version = "1.0.3"; pname = "python-editor"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix index a8faadffc112..872fffb7576a 100644 --- a/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -7,7 +7,6 @@ let in buildPythonPackage rec { pname = "Python-fontconfig"; version = "0.5.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-openid/default.nix b/pkgs/development/python-modules/python-openid/default.nix index f25a89c65d44..44ce20383b44 100644 --- a/pkgs/development/python-modules/python-openid/default.nix +++ b/pkgs/development/python-modules/python-openid/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "python-openid"; - name = "${pname}-${version}"; version = "2.2.5"; src = fetchPypi { diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix index 1e3f627ab0b9..24a21959b8c9 100644 --- a/pkgs/development/python-modules/python-simple-hipchat/default.nix +++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -2,7 +2,6 @@ , unzip }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "python-simple-hipchat"; version = "0.4.0"; diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index c0a398a3399d..9c8cc68af3d0 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, unidecode, regex, isPy3k }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "python-slugify"; version = "1.2.5"; diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index f5ce3a156266..88a2dd2abbf1 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -1,11 +1,10 @@ -{ lib, fetchurl, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "python-sql"; - name = "${pname}-${version}"; version = "0.9"; - src = fetchurl { - url = "mirror://pypi/p/python-sql/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "07b51cc1c977ef5480fe671cae5075ad4b68a6fc67f4569782e06f012456d35c"; }; meta = { diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 8e68570c5bfe..c991ce613fcd 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,13 +1,12 @@ -{ lib, fetchurl, buildPythonPackage, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, isPy3k }: buildPythonPackage rec { version = "1.9"; pname = "python-stdnum"; - name = "${pname}-${version}"; # Failing tests and dependency issue on Py3k disabled = isPy3k; - src = fetchurl { - url = "mirror://pypi/p/python-stdnum/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "d587a520182f9d8aef7659cca429f4382881589c8883a0a55322b2f94970bdb3"; }; meta = { diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index 326151a4843f..ba5a527fdb08 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "python-uinput"; version = "0.11.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix index 2365918c7e48..77181fa4ae54 100644 --- a/pkgs/development/python-modules/python3-openid/default.nix +++ b/pkgs/development/python-modules/python3-openid/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "python3-openid"; - name = "${pname}-${version}"; version = "3.1.0"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix index 7c8d51f2f43e..fd8012a24d32 100644 --- a/pkgs/development/python-modules/pythonix/default.nix +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, ninja, boost, meson, pkgconfig, nix, isPy3k }: +{ stdenv, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkgconfig, nix, isPy3k }: - -stdenv.mkDerivation rec { - name = "pythonix-${version}"; +buildPythonPackage rec { + pname = "pythonix"; version = "0.1.4"; + format = "other"; src = fetchFromGitHub { owner = "Mic92"; diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index 66dc7dda835e..ac48fe1c240f 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pytimeparse"; version = "1.1.8"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index b0ac4e070935..c29b9f575859 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -27,7 +27,6 @@ let in buildPythonPackage rec { version = "0.4.0"; pname = "pytorch"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "pytorch"; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 046424af608e..b0a4505555a5 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -1,14 +1,13 @@ -{ lib, fetchurl, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , six, systemd, pytest, mock, hypothesis, docutils }: buildPythonPackage rec { pname = "pyudev"; - name = "${pname}-${version}"; version = "0.21.0"; - src = fetchurl { - url = "mirror://pypi/p/pyudev/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9"; }; diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index 6ba6794bfd13..c54711bb6c84 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pyusb"; version = "1.0.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix index c228e44f893f..15cb474f5fe9 100644 --- a/pkgs/development/python-modules/pywebdav/default.nix +++ b/pkgs/development/python-modules/pywebdav/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "PyWebDAV"; version = "0.9.8"; - name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index 10150259ef5c..3bdc5efaaa53 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -12,7 +12,6 @@ buildPythonPackage rec { pname = "pywinrm"; version = "0.3.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix index d22ba51fc3b8..20666010f9aa 100644 --- a/pkgs/development/python-modules/pyzufall/default.nix +++ b/pkgs/development/python-modules/pyzufall/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, python, buildPythonPackage, nose, future, coverage }: +{ stdenv, fetchPypi, python, buildPythonPackage, nose, future, coverage }: buildPythonPackage rec { pname = "PyZufall"; version = "0.13.2"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1jffhi20m82fdf78bjhncbdxkfzcskrlipxlrqq9741xdvrn14b5"; }; @@ -14,7 +13,7 @@ buildPythonPackage rec { # https://github.com/nose-devs/nose/issues/1037 doCheck = false; - buildInputs = [ nose coverage ]; + checkInputs = [ nose coverage ]; propagatedBuildInputs = [ future ]; checkPhase = '' diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 16d66a6db217..5b35acc0404e 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,7 +15,6 @@ buildPythonPackage rec { pname = "qtconsole"; version = "4.3.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix index afa1895e5404..4d80a4075646 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "radicale_infcloud"; - name = "${pname}-${version}"; version = "2017-07-27"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix index 1042b8de98ed..0f870a5ab7a1 100644 --- a/pkgs/development/python-modules/ramlfications/default.nix +++ b/pkgs/development/python-modules/ramlfications/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "ramlfications"; version = "0.1.9"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index c2c8c926432a..83edfa4f1d27 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -8,7 +8,6 @@ assert !useUnrar -> libarchive != null; buildPythonPackage rec { pname = "rarfile"; - name = "${pname}-${version}"; version = "3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix index 9347cd55cf38..53a8e046b55b 100644 --- a/pkgs/development/python-modules/rcssmin/default.nix +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "rcssmin"; version = "1.0.6"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index cf15d8dbc1fc..565e6ef5bbf4 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "rebulk"; version = "0.9.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index e03bd3536271..2078a04be063 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "recommonmark"; - name = "${pname}-${version}"; version = "0.4.0"; src = fetchPypi { diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 87700d8edc43..de2683595e5f 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "redis"; version = "2.10.6"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 7899f86a8cb8..e8e18face079 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchPypi , buildPythonPackage , sphinx , pytestcov @@ -13,15 +13,14 @@ buildPythonPackage rec { pname = "reikna"; - name = "${pname}-${version}"; version = "0.6.8"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "34d92786237bef9ab5d37d78f01c155d0dcd1fc24df7782af9498a9f1786890c"; }; - buildInputs = [ sphinx pytestcov pytest ]; + checkInputs = [ sphinx pytestcov pytest ]; propagatedBuildInputs = [ Mako numpy funcsigs ] ++ stdenv.lib.optional withCuda pycuda diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 5c5f2578fbf1..dbc28263b06d 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -1,11 +1,10 @@ -{ lib, fetchurl, buildPythonPackage, genshi, lxml, python_magic }: +{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python_magic }: buildPythonPackage rec { pname = "relatorio"; - name = "${pname}-${version}"; version = "0.8.0"; - src = fetchurl { - url = "mirror://pypi/r/relatorio/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "bddf85d029c5c85a0f976d73907e14e4c3093065fe8527170c91abf0218546d9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index 83a3590518c6..d2fcef3e169d 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { version = "1.0.0"; pname = "requests-oauthlib"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index 809c8d3c96df..f865f6b8aed9 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "requests-toolbelt"; version = "0.8.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix index 51f194a79cf8..12cbae543ce2 100644 --- a/pkgs/development/python-modules/requests_ntlm/default.nix +++ b/pkgs/development/python-modules/requests_ntlm/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "requests_ntlm"; version = "1.1.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/pkgs/development/python-modules/requestsexceptions/default.nix index 87af0e78b183..55b320955351 100644 --- a/pkgs/development/python-modules/requestsexceptions/default.nix +++ b/pkgs/development/python-modules/requestsexceptions/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "requestsexceptions"; version = "1.4.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index af1f28d6d72d..b8626524b54f 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -12,7 +12,6 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; version = "1.1.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index 08930ed4d460..d80872622bce 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "restview"; - name = "${pname}-${version}"; version = "2.9.1"; src = fetchPypi { diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index e95699360e94..11792f4296af 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "rfc3986"; version = "1.1.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index d502ad75566c..d9c879181765 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, rpmextract, python, wirelesstools, gettext}: +{stdenv, buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}: -stdenv.mkDerivation rec { +buildPythonPackage rec { pname = "rhpl"; version = "0.218"; - name = "${pname}-${version}"; + format = "other"; src = fetchurl { url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm; diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index 24adf830699c..0ec53528df2e 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "rjsmin"; version = "1.0.12"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 582a4f6138af..9fcced49b925 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "robotsuite"; version = "2.0.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix index fac0780982db..616927531a56 100644 --- a/pkgs/development/python-modules/rocket-errbot/default.nix +++ b/pkgs/development/python-modules/rocket-errbot/default.nix @@ -1,11 +1,11 @@ -{ lib, fetchurl, fetchpatch, buildPythonPackage }: +{ lib, fetchPypi, fetchpatch, buildPythonPackage }: buildPythonPackage rec { - name = "rocket-errbot-${version}"; + pname = "rocket-errbot"; version = "1.2.5"; - src = fetchurl { - url = "mirror://pypi/r/rocket-errbot/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "181y1wqjvlry5xdzbliajvrxvswzh3myh795jnj1pm92r5grqzda"; }; diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix index 105119522287..3f36eb730ce3 100644 --- a/pkgs/development/python-modules/root_numpy/default.nix +++ b/pkgs/development/python-modules/root_numpy/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "root_numpy"; version = "4.7.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rootpy/default.nix b/pkgs/development/python-modules/rootpy/default.nix index e9061b0a6a33..8384510468a4 100644 --- a/pkgs/development/python-modules/rootpy/default.nix +++ b/pkgs/development/python-modules/rootpy/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "rootpy"; version = "1.0.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index 912b3fd6ab06..b0a761567f2d 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "rply"; - name = "${pname}-${version}"; version = "0.7.5"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/s2clientprotocol/default.nix b/pkgs/development/python-modules/s2clientprotocol/default.nix index 3c24a7e522d0..5fbf4b6fab2c 100644 --- a/pkgs/development/python-modules/s2clientprotocol/default.nix +++ b/pkgs/development/python-modules/s2clientprotocol/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "s2clientprotocol"; version = "3.19.1.58600.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 19ddbca4d03a..2441cadfc0bf 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -2,7 +2,6 @@ , chardet, lmtpd, pythondaemon, six, jinja2, mock }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "salmon-mail"; version = "3.0.1"; diff --git a/pkgs/development/python-modules/sampledata/default.nix b/pkgs/development/python-modules/sampledata/default.nix index b6beb3ec8875..fcc27e3c4dbe 100644 --- a/pkgs/development/python-modules/sampledata/default.nix +++ b/pkgs/development/python-modules/sampledata/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "sampledata"; - name = "${pname}-${version}"; version = "0.3.7"; meta = { diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix index 340c8d002b72..bbdc4d90b288 100644 --- a/pkgs/development/python-modules/sarge/default.nix +++ b/pkgs/development/python-modules/sarge/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchurl }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "sarge-${version}"; + pname = "sarge"; version = "0.1.4"; - src = fetchurl { - url = "mirror://pypi/s/sarge/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar"; }; diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix index 521f68db1cc6..9aa2269c9575 100644 --- a/pkgs/development/python-modules/scandir/default.nix +++ b/pkgs/development/python-modules/scandir/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchurl }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "scandir-${version}"; + pname = "scandir"; version = "1.7"; - src = fetchurl { - url = "mirror://pypi/s/scandir/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 ="0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj"; }; diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 2b40dfd42482..d68f38aa4bb5 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "schema"; version = "0.6.8"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index f33acc79a2bb..7f9da65d2b66 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -1,40 +1,39 @@ -{ stdenv, buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore, +{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, mock, pytest, botocore, testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - version = "1.5.0"; - pname = "Scrapy"; - name = "${pname}-${version}"; + version = "1.5.0"; + pname = "Scrapy"; - buildInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; - propagatedBuildInputs = [ - six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher - ]; + checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; + propagatedBuildInputs = [ + six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher + ]; - # Scrapy is usually installed via pip where copying all - # permissions makes sense. In Nix the files copied are owned by - # root and readonly. As a consequence scrapy can't edit the - # project templates. - patches = [ ./permissions-fix.patch ]; + # Scrapy is usually installed via pip where copying all + # permissions makes sense. In Nix the files copied are owned by + # root and readonly. As a consequence scrapy can't edit the + # project templates. + patches = [ ./permissions-fix.patch ]; - LC_ALL="en_US.UTF-8"; + LC_ALL="en_US.UTF-8"; - checkPhase = '' - py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py ${lib.optionalString stdenv.isDarwin "--ignore=tests/test_utils_iterators.py"} - # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3 - # Ignore iteration test, because lxml can't find encodings on darwin https://bugs.launchpad.net/lxml/+bug/707396 - ''; + checkPhase = '' + py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py ${lib.optionalString stdenv.isDarwin "--ignore=tests/test_utils_iterators.py"} + # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3 + # Ignore iteration test, because lxml can't find encodings on darwin https://bugs.launchpad.net/lxml/+bug/707396 + ''; - src = fetchurl { - url = "mirror://pypi/S/Scrapy/${name}.tar.gz"; - sha256 = "31a0bf05d43198afaf3acfb9b4fb0c09c1d7d7ff641e58c66e36117f26c4b755"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "31a0bf05d43198afaf3acfb9b4fb0c09c1d7d7ff641e58c66e36117f26c4b755"; + }; - meta = with lib; { - description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; - homepage = http://scrapy.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ drewkett ]; - platforms = platforms.unix; - }; + meta = with lib; { + description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; + homepage = http://scrapy.org/; + license = licenses.bsd3; + maintainers = with maintainers; [ drewkett ]; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 20ad32b32613..cc6fed43a42a 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "seaborn"; version = "0.8.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "6702978b903d0284446e935916b980dfebae4063c18ad8eb6e8f9e76d0257eae"; diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index 9b64ce811ef7..98bbef174ae7 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "secretstorage"; version = "2.3.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mitya57"; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 21aa41d80053..f92362ff8afb 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "semver"; version = "2.7.9"; diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index 610a75fa3176..b627322307dc 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "serpy"; - name = "${pname}-${version}"; version = "0.3.1"; meta = { diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index 1d9274610dad..1cef1510ccf5 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { - name = "serversyncstorage-${version}"; + pname = "serversyncstorage"; version = "1.6.11"; disabled = !isPy27; @@ -30,7 +30,7 @@ buildPythonPackage rec { sha256 = "197gj2jfs2c6nzs20j37kqxwi91wabavxnfm4rqmrjwhgqjwhnm0"; }; - buildInputs = [ testfixtures unittest2 webtest ]; + checkInputs = [ testfixtures unittest2 webtest ]; propagatedBuildInputs = [ pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql pymysqlsa umemcache WSGIProxy requests pybrowserid diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index 137457e33c12..1420428e9736 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, pip }: buildPythonPackage rec { pname = "setuptools_scm"; - name = "${pname}-${version}"; version = "2.1.0"; src = fetchPypi { diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 6f10cfdf3ba3..52101b3482f9 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -4,7 +4,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Shapely"; version = "1.6.4.post1"; diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix index e3f65b6660c2..d059d720f8bd 100644 --- a/pkgs/development/python-modules/simanneal/default.nix +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "simanneal"; version = "0.4.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "perrygeo"; diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index 8e637a673b1f..b3377e75f67b 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -1,11 +1,10 @@ -{ lib, fetchurl, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "simpleeval"; - name = "${pname}-${version}"; version = "0.9.5"; - src = fetchurl { - url = "mirror://pypi/s/simpleeval/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0sda13bqg9l4j17iczmfanxbzsg6fm9aw8i3crzsjfxx51rwj1i3"; }; meta = { diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index ccec686142ff..b42be465a3b4 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "simplejson"; version = "3.15.0"; - name = "${pname}-${version}"; doCheck = !stdenv.isDarwin; src = fetchPypi { diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 77857df0764f..0503e2ef04fe 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -3,11 +3,10 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec { pname = "sip"; version = "4.19.6"; - name = "${pname}-${version}"; format = "other"; src = fetchurl { - url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/pyqt/sip/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "0nlj0zbvmzliyhhspqwf2bjvcnpq4agx4s47php7ishv32p2gnlx"; }; diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix index c6444224104f..7f437ec59c11 100644 --- a/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/pkgs/development/python-modules/sleekxmpp/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, buildPythonPackage, dns, pyasn1 }: +{ stdenv, fetchPypi, buildPythonPackage, dns, pyasn1 }: buildPythonPackage rec { - name = "sleekxmpp-${version}"; + pname = "sleekxmpp"; version = "1.3.1"; propagatedBuildInputs = [ dns pyasn1 ]; @@ -10,8 +10,8 @@ buildPythonPackage rec { ./dnspython-ip6.patch ]; - src = fetchurl { - url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1krkhkvj8xw5a6c2xlf7h1rg9xdcm9d8x2niivwjahahpvbl6krr"; }; diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index 64c683147536..9a3afc3fb4b8 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, tornado }: +{ stdenv, fetchPypi, buildPythonPackage, tornado }: buildPythonPackage rec { pname = "snakeviz"; - name = "${pname}-${version}"; version = "0.4.1"; - src = fetchurl { - url = "mirror://pypi/s/snakeviz/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "18vsaw1wmf903fg21zkk6a9b49gj47g52jm5h52g4iygngjhpx79"; }; diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix index eff799e0d014..36d6ada49b87 100644 --- a/pkgs/development/python-modules/sockjs-tornado/default.nix +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchurl, tornado }: +{ lib, buildPythonPackage, fetchPypi, tornado }: buildPythonPackage rec { - name = "sockjs-tornado-${version}"; + pname = "sockjs-tornado"; version = "1.0.3"; - src = fetchurl { - url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; }; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 050a59c6e926..6d467a57c604 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "sounddevice"; - name = "${pname}-${version}"; version = "0.3.9"; src = fetchPypi { diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index 2d591eef7233..d9a67454fe6a 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchurl, spacy }: let buildModelPackage = { pname, version, sha256, license }: buildPythonPackage { - name = "${pname}-${version}"; inherit pname version; src = fetchurl { diff --git a/pkgs/development/python-modules/spambayes/default.nix b/pkgs/development/python-modules/spambayes/default.nix index 3386fdd1e2a3..19d5cb154931 100644 --- a/pkgs/development/python-modules/spambayes/default.nix +++ b/pkgs/development/python-modules/spambayes/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, isPy3k, fetchPypi, bsddb3, pydns, lockfile }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "spambayes"; version = "1.1b2"; diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix index 2efb23c80864..3ddfdab50aa2 100644 --- a/pkgs/development/python-modules/sphinx-testing/default.nix +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "sphinx-testing"; version = "0.7.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index 2d778017a07a..cb3d76e6a741 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "sphinxcontrib-websupport"; version = "1.1.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index e8492843254b..211419f86b1b 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - name = "${pname}-${version}"; version = "1.2.8"; src = fetchPypi { diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index c3780e6a7c7d..bc2218f7deec 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "sqlmap"; version = "1.2.6"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index b3beb404e754..ba26ba5e651c 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -14,7 +14,6 @@ buildPythonPackage rec { pname = "statsmodels"; version = "0.9.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 9639ce961948..e7745cf86252 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "stevedore"; version = "1.28.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index 1d3438032af7..3d2b2337be4c 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -2,11 +2,10 @@ buildPythonPackage rec { pname = "PyStringTemplate"; - name = "${pname}-${version}"; version = "3.2b1"; src = fetchurl { - url = "http://www.stringtemplate.org/download/${name}.tar.gz"; + url = "http://www.stringtemplate.org/download/${pname}-${version}.tar.gz"; sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml"; }; diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 0788ddaeec62..0da11909de9d 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchPypi , buildPythonApplication , guessit , babelfish @@ -20,11 +20,10 @@ buildPythonApplication rec { pname = "subliminal"; - name = "${pname}-${version}"; version = "2.0.5"; - src = fetchurl { - url = "mirror://pypi/s/subliminal/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1dzv5csjcwgz69aimarx2c6606ckm2gbn4x2mzydcqnyai7sayhl"; }; diff --git a/pkgs/development/python-modules/subprocess32/default.nix b/pkgs/development/python-modules/subprocess32/default.nix index e3fae7179c83..c6fe0975c3aa 100644 --- a/pkgs/development/python-modules/subprocess32/default.nix +++ b/pkgs/development/python-modules/subprocess32/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "subprocess32"; version = "3.5.2"; - name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/syncserver/default.nix b/pkgs/development/python-modules/syncserver/default.nix index e050bcf54043..3c650bd60dda 100644 --- a/pkgs/development/python-modules/syncserver/default.nix +++ b/pkgs/development/python-modules/syncserver/default.nix @@ -16,7 +16,7 @@ }: buildPythonPackage rec { - name = "syncserver-${version}"; + pname = "syncserver"; version = "1.6.0"; disabled = ! isPy27; @@ -31,9 +31,4 @@ buildPythonPackage rec { cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver serversyncstorage configparser ]; - - meta = { - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; } diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index cc0336218341..b042108d088e 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchurl, python, buildPythonPackage +{ stdenv, fetchPypi, python, buildPythonPackage , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc }: buildPythonPackage rec { version = "3.4.4"; pname = "tables"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/t/tables/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "bdc5c073712af2a43babd139c4855fc99496bb2c3f3f5d1b4770a985e6f9ce29"; }; @@ -31,7 +30,7 @@ buildPythonPackage rec { # github issue: # https://github.com/PyTables/PyTables/issues/269 checkPhase = '' - ${python}/bin/${python.executable} <<EOF + ${python.interpreter} <<EOF import sysconfig import sys import os diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 1ac6c4a54d07..c56a5d7889f6 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -3,7 +3,6 @@ , six, pytz}: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "tempora"; version = "1.9"; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index a767120ddf32..0d8085395736 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -15,7 +15,6 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; version = "1.7.0"; - name = "${pname}-${version}"; format = "wheel"; src = fetchPypi ({ diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 8d2d6fa9c14c..8163243eb0a4 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -124,7 +124,6 @@ let in buildPythonPackage rec { pname = "tensorflow"; inherit version; - name = "${pname}-${version}"; src = pkg; diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 4ffe8ec735c6..d42430248216 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -23,7 +23,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "textacy"; version = "0.6.1"; diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index e4ed824d2302..0ffaf315d54b 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { version = "3.9.2"; pname = "thespian"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix index 6161b0492be6..b55c42cfa561 100644 --- a/pkgs/development/python-modules/tiros/default.nix +++ b/pkgs/development/python-modules/tiros/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "tiros"; - name = "${pname}-${version}"; version = "1.0.44"; src = fetchPypi { diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index d6929caf2bd3..e25d871f978d 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "titlecase"; - name = "${pname}-${version}"; version = "0.12.0"; src = fetchPypi { diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index 86dfe5d7f893..829d7bcfcb2b 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchurl, python, buildPythonPackage +{ stdenv, fetchPypi, python, buildPythonPackage , requests }: buildPythonPackage rec { pname = "todoist-python"; version = "7.0.17"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/t/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0gs4vlvvmkz627ybswj0l6m3c8dyrqgfqjlawbc8d9rkx88srkr2"; }; diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix index af7acbc0218e..c6efe5ba2397 100644 --- a/pkgs/development/python-modules/tokenserver/default.nix +++ b/pkgs/development/python-modules/tokenserver/default.nix @@ -16,7 +16,7 @@ }: buildPythonPackage rec { - name = "tokenserver-${version}"; + pname = "tokenserver"; version = "1.2.27"; src = fetchgit { @@ -26,11 +26,8 @@ buildPythonPackage rec { }; doCheck = false; - buildInputs = [ testfixtures ]; + checkInputs = [ testfixtures ]; propagatedBuildInputs = [ cornice mozsvc pybrowserid tokenlib pymysql umemcache hawkauthlib alembic pymysqlsa paste boto ]; - meta = { - platforms = stdenv.lib.platforms.all; - }; } diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 0fc14024903e..eb79149196b0 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec{ pname = "toolz"; version = "0.9.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index fb93339dfbf8..87fa393ce5e3 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -12,7 +12,6 @@ buildPythonPackage rec { pname = "tqdm"; version = "4.23.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 8cc1332b473f..0f18c6693869 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -14,7 +14,6 @@ buildPythonPackage rec { pname = "traitlets"; version = "4.3.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index afb35b579731..f42a4a02be80 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { - name = "${pname}-${version}"; pname = "transaction"; version = "2.2.1"; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 3144e8e4de98..90d8003bb346 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -3,7 +3,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "treq"; version = "17.8.0"; diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 3a6b5f62e4f5..9a6a3c39eec1 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -3,7 +3,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "trezor"; version = "0.9.1"; diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index 8f0fbbd6dfbf..097e691f7c18 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -1,25 +1,23 @@ -{ stdenv, buildPythonPackage, fetchurl, isPy3k, pythonPackages }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }: buildPythonPackage rec { pname = "twill"; version = "1.8.0"; - name = "${pname}-${version}"; disabled = isPy3k; - src = fetchurl { - url = "mirror://pypi/t/twill/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "d63e8b09aa4f6645571c70cd3ba47a911abbae4d7baa4b38fc7eb72f6cfda188"; }; - propagatedBuildInputs = with pythonPackages; [ nose ]; + checkInputs = [ nose ]; doCheck = false; # pypi package comes without tests, other homepage does not provide all verisons - meta = with stdenv.lib; { + meta = with lib; { homepage = http://twill.idyll.org/; - description = "a simple scripting language for Web browsing"; + description = "A simple scripting language for Web browsing"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 9cb3a09d363e..dfcce835e658 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -11,7 +11,6 @@ buildPythonPackage rec { pname = "twine"; version = "1.11.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 4a23a1b88cba..b11ba5b491b9 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchurl +, fetchPypi , python , zope_interface , incremental @@ -13,11 +13,10 @@ }: buildPythonPackage rec { pname = "Twisted"; - name = "${pname}-${version}"; version = "18.4.0"; - src = fetchurl { - url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; + src = fetchPypi { + inherit pname version; sha256 = "a4cc164a781859c74de47f17f0e85f4bce8a3321a9d0892c015c8f80c4158ad9"; }; diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 0a073cca0c51..0cfc8c3e14a9 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "typed-ast"; version = "1.1.0"; - name = "${pname}-${version}"; src = fetchPypi{ inherit pname version; sha256 = "57fe287f0cdd9ceaf69e7b71a2e94a24b5d268b35df251a88fef5cc241bf73aa"; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 0af8c47e35cb..611eeba8ae03 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -7,7 +7,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "typeguard"; version = "2.1.4"; diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 1c61d0afab3b..3bb75fb2ac29 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -2,7 +2,6 @@ , tzlocal, pytz }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "tzlocal"; version = "1.5.1"; diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index cbb3f9bfa8f8..aed68f3ad59d 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , lib -, fetchurl +, fetchPypi , glibcLocales , python }: @@ -8,10 +8,9 @@ buildPythonPackage rec { pname = "u-msgpack-python"; version = "2.5.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "7ff18ae3721fa75571f9329c08f7c0120416a6ae36194bd8674f65b3b78d0702"; }; diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix index c0748b6b53b2..235f33da5994 100644 --- a/pkgs/development/python-modules/ukpostcodeparser/default.nix +++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "UkPostcodeParser"; version = "1.1.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index d90ada606321..07d974ae86fb 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, nose, numpy }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "uncertainties"; version = "3.0.2"; diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 3cffe3804900..1b98b8adf732 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, glibcLocales }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Unidecode"; version = "1.0.22"; diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix index 89496e00e568..d7a8e6eaf04d 100644 --- a/pkgs/development/python-modules/unifi/default.nix +++ b/pkgs/development/python-modules/unifi/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "unifi"; version = "1.2.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 34ff3a30b787..e7e559234f66 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -1,7 +1,6 @@ {lib, fetchPypi, buildPythonPackage, six}: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "unittest-xml-reporting"; version = "2.2.0"; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 0917c5ab6eef..7be8f01f23c8 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -1,13 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus, doxygen, gettext }: +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, cmake +, pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }: -if lib.versionOlder python.version "3.5.0" -then throw "Uranium not supported for interpreter ${python.executable}" -else - -stdenv.mkDerivation rec { +buildPythonPackage rec { version = "3.3.0"; pname = "uranium"; - name = "${pname}-${version}"; + format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; @@ -16,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1rg0l2blndnbdfcgkjc2r29cnjdm009rz8lnc225ilh9d7w1srbb"; }; + disabled = pythonOlder "3.5.0"; + buildInputs = [ python gettext ]; propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ]; nativeBuildInputs = [ cmake doxygen ]; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 6f8563ff155d..a575a86d1f6b 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "urllib3"; version = "1.23"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index b76a1475bbfb..c49b82f6ca02 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -3,7 +3,6 @@ buildPythonPackage (rec { pname = "urwid"; version = "1.3.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index c47c67b9f657..ab4ce1be2b1a 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -17,7 +17,6 @@ buildPythonPackage rec { pname = "vcrpy"; version = "1.12.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix index 4274abf3b329..ffe184e263ab 100644 --- a/pkgs/development/python-modules/vcversioner/default.nix +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "vcversioner"; version = "2.16.0.0"; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 8bd1cfd089e6..1813ae587c1a 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "vega"; version = "1.3.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index bf5a09a24187..0e0a169d5523 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "vine"; version = "1.1.4"; - name = "${pname}-${version}"; disable = pythonOlder "2.7"; diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix index e18e9f87acd3..6fc50b81803f 100644 --- a/pkgs/development/python-modules/virtkey/default.nix +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -1,9 +1,11 @@ { lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xextproto, xproto }: -buildPythonPackage rec { - name = "virtkey-${version}"; +let majorVersion = "0.63"; - version = "${majorVersion}.0"; + minorVersion = "0"; +in buildPythonPackage rec { + pname = "virtkey"; + version = "${majorVersion}.${minorVersion}"; src = fetchurl { url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index b53d3759cd8b..75557cf895a5 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "virtualenv"; version = "16.0.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 589f8de99ee5..a8661fd3a985 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -1,12 +1,12 @@ -{ fetchurl, boost, zlib, clang, ncurses, pythonPackages, lib }: +{ lib, buildPythonPackage, fetchPypi, python, boost, zlib, clang, ncurses +, pytest, docutils, pygments, numpy, scipy, scikitlearn }: -pythonPackages.buildPythonPackage rec { +buildPythonPackage rec { pname = "vowpalwabbit"; - name = "${pname}-${version}"; version = "8.5.0"; - src = fetchurl{ - url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz"; + src = fetchPypi{ + inherit pname version; sha256 = "0b517371fc64f1c728a0af42a31fa93def27306e9b4d25d6e5fd01bcff1b7304"; }; # vw tries to write some explicit things to home @@ -15,13 +15,13 @@ pythonPackages.buildPythonPackage rec { export HOME=$PWD ''; - buildInputs = with pythonPackages; [ boost.dev zlib.dev clang ncurses pytest docutils pygments ]; - propagatedBuildInputs = with pythonPackages; [ numpy scipy scikitlearn ]; + buildInputs = [ boost.dev zlib.dev clang ncurses pytest docutils pygments ]; + propagatedBuildInputs = [ numpy scipy scikitlearn ]; checkPhase = '' # check-manifest requires a git clone, not a tarball # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*" - python setup.py check -mrs + ${python.interpreter} setup.py check -mrs ''; meta = with lib; { diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix index a5a7957e8ec1..f4863eec8f1b 100644 --- a/pkgs/development/python-modules/webassets/default.nix +++ b/pkgs/development/python-modules/webassets/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchurl, pyyaml, nose, jinja2, mock, pytest }: +{ lib, buildPythonPackage, fetchPypi, pyyaml, nose, jinja2, mock, pytest }: buildPythonPackage rec { - name = "webassets-${version}"; + pname = "webassets"; version = "0.12.1"; - src = fetchurl { - url = "mirror://pypi/w/webassets/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7"; }; diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix index edd0a364ea14..c4ab0dd59cad 100644 --- a/pkgs/development/python-modules/webencodings/default.nix +++ b/pkgs/development/python-modules/webencodings/default.nix @@ -1,20 +1,19 @@ { buildPythonPackage , lib -, fetchurl +, fetchPypi , pytest }: buildPythonPackage rec { pname = "webencodings"; version = "0.5.1"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; checkPhase = '' py.test webencodings/tests.py diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 99de3ff35911..8b2584a16d32 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -1,17 +1,15 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , pythonOlder }: -let +buildPythonPackage rec { pname = "websockets"; version = "5.0.1"; -in buildPythonPackage rec { - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "a49d315db5a7a19d55422e1678e8a1c3b9661d7296bef3179fa620cf80b12674"; }; diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 58be98f183b6..9496d51bfc1e 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -3,7 +3,6 @@ , pytest, requests, glibcLocales }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Werkzeug"; version = "0.14.1"; diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 65bc41856f79..f8868f02c2c2 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { pname = "wheel"; version = "0.31.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index 7e2a571b1bba..d0a226e9ebdb 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Whoosh"; version = "2.7.4"; src = fetchPypi { diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index cae05c74268f..5af9119508a4 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - name = "${pname}-${version}"; version = "3.2.1"; src = fetchPypi { diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index d468955e27da..b2ce75c43c3a 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "wptserve"; version = "1.4.0"; - name = "${pname}-${version}"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index f5a83a7bc029..3d81fe532aba 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -2,7 +2,6 @@ , cherrypy, gevent, tornado }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "ws4py"; version = "0.5.1"; diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 217c823afe57..9b53c180397d 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -1,6 +1,4 @@ { stdenv -, lib -, pkgs , buildPythonPackage , nose , scipy @@ -8,15 +6,14 @@ }: buildPythonPackage rec { - name = "xgboost-${version}"; - + pname = "xgboost"; inherit (xgboost) version src meta; propagatedBuildInputs = [ scipy ]; checkInputs = [ nose ]; postPatch = let - libname = if stdenv.isDarwin then "libxgboost.dylib" else "libxgboost.so"; + libname = "libxgboost.${stdenv.hostPlatform.extensions.sharedLibrary}"; in '' cd python-package diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index 82364ee1d1c4..5de0348e00e9 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -1,21 +1,19 @@ { buildPythonPackage -, fetchurl -, fetchpatch +, fetchPypi , nose , lib }: buildPythonPackage rec { pname = "xlwt"; - name = "${pname}-${version}"; version = "1.3.0"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; checkPhase = '' nosetests -v ''; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 7a091eb09f76..29830adb5ede 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,12 +1,11 @@ -{ lib, fetchurl, buildPythonPackage, intervaltree, pyflakes, requests, lxml }: +{ lib, fetchPypi, buildPythonPackage, intervaltree, pyflakes, requests, lxml }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "xml2rfc"; version = "2.9.8"; - src = fetchurl { - url = "mirror://pypi/x/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1img6941wvwpk71q3vi9526bfjbh949k4lphrvdwlcf4igwy435m"; }; diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index 944118870b67..ec725564f2b2 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchurl, isPy3k }: buildPythonPackage rec { pname = "xmpp.py"; - name = "${pname}-${version}"; version = "0.5.0rc1"; patches = [ ./ssl.patch ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 859bd62f998c..e27abba413d1 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "yamllint"; version = "1.9.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index c8ba29fd8acd..3ed7fa640500 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "yapf"; version = "0.22.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/yenc/default.nix b/pkgs/development/python-modules/yenc/default.nix index 7f9f3b6467af..3c51d00ec148 100644 --- a/pkgs/development/python-modules/yenc/default.nix +++ b/pkgs/development/python-modules/yenc/default.nix @@ -6,12 +6,9 @@ , isPy3k }: -let +buildPythonPackage rec{ pname = "yenc"; version = "0.4.0"; -in buildPythonPackage { - name = "${pname}-${version}"; - src = fetchurl { url = "https://bitbucket.org/dual75/yenc/get/${version}.tar.gz"; sha256 = "0zkyzxgq30mbrzpnqam4md0cb09d5falh06m0npc81nnlhcghkp7"; diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix index 6e05b6ced043..fe7f0cf466e1 100644 --- a/pkgs/development/python-modules/yolk/default.nix +++ b/pkgs/development/python-modules/yolk/default.nix @@ -4,7 +4,6 @@ with lib; buildPythonApplication rec { pname = "yolk"; - name = "${pname}-${version}"; version = "0.4.3"; src = fetchurl { diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index a69f50c8c795..5f02f091b506 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "zc.lockfile"; version = "1.3.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 6923f876ff21..f8f933b96abb 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "ZConfig"; version = "3.2.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index ccc49db9bc3c..418fcebaefd5 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -23,11 +23,9 @@ , tornado }: -let +buildPythonPackage rec { pname = "zeep"; version = "3.0.0"; -in buildPythonPackage { - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index f3dbf70eecfc..06c5fe3a1be0 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "zeroconf"; version = "0.20.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index d72752a59884..8fc15c5da6fa 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -3,7 +3,6 @@ , pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "zetup"; version = "0.2.43"; diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix index 2929afed1cd3..2148dcc4b802 100644 --- a/pkgs/development/python-modules/zipfile36/default.nix +++ b/pkgs/development/python-modules/zipfile36/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "zipfile36"; version = "0.1.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zipstream/default.nix b/pkgs/development/python-modules/zipstream/default.nix index aac2bceeb15d..4d5fabe7fca0 100644 --- a/pkgs/development/python-modules/zipstream/default.nix +++ b/pkgs/development/python-modules/zipstream/default.nix @@ -1,17 +1,15 @@ -{ lib, buildPythonPackage, fetchurl, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: -let +buildPythonPackage rec { pname = "zipstream"; version = "1.1.4"; -in buildPythonPackage rec { - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/z/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; meta = { description = "A zip archive generator"; diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 25ab7dcd31ad..9aab2ba9e844 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -18,7 +18,6 @@ buildPythonPackage rec { pname = "ZODB"; version = "5.4.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 9ce53223f655..c3f41d281c66 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "zodbpickle"; version = "1.0.1"; - name = "${pname}-${version}"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 src = fetchPypi { diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index a63713ef043e..77075c36b222 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "zope.interface"; version = "4.5.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix index 4f34d7d02883..8287c05f743b 100644 --- a/pkgs/development/python-modules/zxcvbn-python/default.nix +++ b/pkgs/development/python-modules/zxcvbn-python/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "zxcvbn-python"; version = "4.4.24"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 673b22c401cd..232f51f7dcb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -149,7 +149,6 @@ in { setuptools = toPythonModule (callPackage ../development/python-modules/setuptools { }); vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { - pythonPackages = self; boost = pkgs.boost160; }; @@ -363,7 +362,7 @@ in { pydocstyle = callPackage ../development/python-modules/pydocstyle { }; - pyexiv2 = disabledIf isPy3k (callPackage ../development/python-modules/pyexiv2 {}); + pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 {})); py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; @@ -6909,7 +6908,7 @@ in { keyring = callPackage ../development/python-modules/keyring { }; - keyutils = callPackage ../development/python-modules/keyutils { }; + keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; kiwisolver = callPackage ../development/python-modules/kiwisolver { }; @@ -11255,7 +11254,7 @@ in { pyls-isort = callPackage ../development/python-modules/pyls-isort {}; pyudev = callPackage ../development/python-modules/pyudev { - inherit (pkgs) fetchurl systemd; + inherit (pkgs) systemd; }; pynmea2 = callPackage ../development/python-modules/pynmea2 {}; |