diff options
531 files changed, 899 insertions, 1393 deletions
diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix index 3e315e2d1a7..ea0ce8cb5f3 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 678ea529dc4..571f0a925ad 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.3"; format = "other"; diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index fae8d3e4b60..0434b00c705 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 d0c3eab6915..2cb90081c68 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 fff16649333..d2ef7434c4d 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 cee3469e3f5..b9b840682d7 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 ad280d382d0..753a273a08c 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 e58cddd4294..e9c5198092d 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 063821544ae..3e10904f3e6 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 7aebc43dabb..6d0cc370ff3 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 d2f525bffd1..b0abefd7a1f 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 09881296164..0fda09fd522 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 034a07bf027..4b75af5ed57 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 64b5ee629b3..9a6e1bef994 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 d3eb8539a19..b8e22a41cab 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 677c60399e5..26f35f25865 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 69c79c76c8d..e96b6f1909a 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 e7073d0c95e..f1a22bd839a 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 55c3dfa92e3..a3d418cd4fe 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 49b08534cd8..b0c834934f9 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 0bcbad58b3a..e806e63cdbf 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 1a0e6e54fb3..34f6e4409a6 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 9984c0222a0..821a9e8083e 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/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 184cfcdce3e..327cb4372c8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "60.0.2"; + version = "61.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ach/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ach/firefox-61.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "68e9831e3814f7bce96365a88c1fb00d1955ea0e45f67a698ad0ec7f193684a9fb1ef0b145e212215cc5028c2065232badc27db328aa20a20d558bf1464eff1a"; + sha512 = "d12d3e2a826ac5a7bfc229897b717d68ad3b862d0f9cf9e9b1f776ec2fd7bdc2b3d84a91bce46d99b9ba60259ad0c25dc4a5f0a83bf56d579d93e186521f103f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/af/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/af/firefox-61.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "26985220e2fb20110ed9e71382290554eb279505471952f0557e69aaca64b6c7602b0d405c3ba0f4ac451963d4727f62f2cb525f9fe279e5380f5e146352288b"; + sha512 = "6ffb7b77ae3fa5bde851344f8e6e7f865ec0556348bfbf2c946f504cc748ead24f864e9e356ef08ae09dbd892b9070b22c30bccf4b7ba8700a61188167769043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/an/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/an/firefox-61.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "68a80541f18686b3060b49dad145775436fa318ab5ed18229d6e6e9a807dd4de777326595b214cfd31dc8a482f48798ddb5eae1a4433ca54236bc8d98898c90e"; + sha512 = "1756b3350042cce59293f1fa09d96b37e0616b21740ed4e181df27bd7b36c9d83a4da5771bb9884a2dfb272e79d91d81a02cfca19c52219e56ab0e9683245cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ar/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ar/firefox-61.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "0579222cde4a1ffb006c7322aba80556bcda4eaf592302cc2af52d178f90dfbeefb021e1097ea992eb3dde1c03b43145831a0dae325523abe2b5ef72da9cea1c"; + sha512 = "8c36e5812256dc7267fab6f87146576af04a864c2ccdafd86b91fc73739f0cfe629695e2b9c10e34d6d712e72878da188a8cc8ce3616aa3e9a95b65f13d26b91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/as/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/as/firefox-61.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "27cb434d6c9b2eda3ca08daa2d89a7b1f81815f7605984fe6ed4803196beb7eee844e79c1064a71cfcf5e3b113606a76b557c2bef54064410ecdaf732ccdfe30"; + sha512 = "2fa112bce2f0f4431a15d08974ec7c2e5773feaa47c03196f65718670c7d7abdcae740d6f6644480d0ed1d8423e1110ba147f3596ecbd1a1852f24e4930d935c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ast/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ast/firefox-61.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "9eeee72b3bd390f8e7978dfe0b8f03d0b5745197d50ca85f764c64a0bccc7a95db872dab3416f73f44ac9c9e1cc6a096f7a2154b2e8f6e4fcb0ceab48598e7ec"; + sha512 = "e95de31719a0441547e6d7cc5aa3e3f758e3406513e56ba8cf1793acdd8d7d3fc0e7f47267c0113fc50595f30c46b5277fffa8a738800befcba842832f3060ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/az/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/az/firefox-61.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "dc94785cf955366ba94cce3bb6435a1aa635cbf65e4cd8cb6ac5330470d84d2349b6ff22b9d3b6d6b5a47c4bcd53f9f615913ea476a7555b196c5c39b5adb808"; + sha512 = "80cb9f870291e60b6e03f95c96c586cb76572de01965306daef00e9131fe39c56dde7061e2dd3e167a0afcb2a81a04e311fe4bcbab4d5349098e655ea172f81b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/be/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/be/firefox-61.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "79af55191ede8277e94482823e9a54ff0f6f3448c6b0753742977feaac66301ca7d368ffe2ac8b63ae1ea053ee9f9a1ed3228c3ce644bbdf9853cdda7b278830"; + sha512 = "546d82add8ba20cb06bb3b7ab8d8196bbfa96cb7e9abed6bd8597ccaa90ecc90e19e463e3e9810d5dcd95cffd7e11cc3bd47eeb255e3070b25dc52a57f3f26ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/bg/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/bg/firefox-61.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d286cd0e6b40a9b71caad4c86892484fce60f57fb6ce946fd63179336181bdac9fedb4a92bcd19a5ded08a21dff256d005cb08d13bf3728aed5e663f5a1220de"; + sha512 = "e3a9994bc1d85f1dcce078eb483c5213848fa722a049bcdf22206b4fd4498233452a33eb50670e297383c699c1237bbcb704f37b611d1fa6bf4013bfb397916a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/bn-BD/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/bn-BD/firefox-61.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "8d0c40bdfc4d191bdc3a4f5900217259c89cad292fd053878b6c4c98407ba0582ada5abdd3839b225f063fc4cdff13c96cc61609478b9f8a18a1c88b5d271605"; + sha512 = "9f22c3af1425cb64175bd2c6d824c967886d56572e7e182dc25f69cbe76f880a0d804ea7e49240f60fa559aa68b696ab6765263dab1c953612a4071ec9902781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/bn-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/bn-IN/firefox-61.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "c3a05e4a932b19841fadb04b20dda770077cff4b45543b2b3d8a78f092e856843941f070eb338455b22b04d6683161fee1b65b1b432de4dafac987b40d91cdec"; + sha512 = "a95f9f39add0b45e4db012484265a84d972e8319f3bca387d5bcaed85f31e39997aca7742001cacdb19445097fabef8a34b67f56b93d86b49e8723e040daf793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/br/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/br/firefox-61.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ce729cfe0ee8b308aac5252b74c562a57e0d6ab63b9971b7345e1695e95b1946d2e621d686cfa0d64e44e3e591a15d1357b91928c1376816cd8e34293d16091f"; + sha512 = "c12d971e521d0edd972f9c191242eb699942969b61fb46b4222fb583f5e25f1d5b36f87305ac1042de15f260a46c58bf35a83e1554ea0c9b3a23744183c2e9f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/bs/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/bs/firefox-61.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "05559ec50f02f4a2865c65dc315f80c28c83b3091d38cba68f58f3dc461d8f15dc4c597f8f9e851cda79e2d8398afa905b8249822b55c9af3f92b65bb7cd4c13"; + sha512 = "69b76469c757be20b0015e22e7e53880e32c9ad9c30170d4296131d9c7fa66e063b2c1ac2ef2b1ba8b6aff09b3989224109496353ccf01c8de1184ccbff8376e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ca/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ca/firefox-61.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "45d7ac493bcd7f9950041e66e9f3146814dc624facfab77a5f1efd601b8725e400297b319fbe440f8578f5c5e02dfdf56dece55fdd3ebda10512f0e74ba8cc03"; + sha512 = "896fde21c49fb75064e0c1efaa7a771b5141f1409cb57faebc6d3c10c3e90ad8ea8161687209c3d00722b728be1d8b664fbbfec0585633229ed69bf62c53afe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/cak/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/cak/firefox-61.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "d96b4cb7dc50b01ff35cfd4c5921ab91d045410a38cf251cba3ea5236f9e4823e872b292dc1b1528cfc0249b93ed43f40ff6d6356bbde6daf560e6b8a8eed2e3"; + sha512 = "82efee3f1f23df2a8b923fdb8486703b124ced86c17de279a621d747dd8038af2a7e4af35b42d2c76abe2a8afc4cd21f9d4216fd75b02695b0563dc0dd655aef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/cs/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/cs/firefox-61.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "d7a511b8fb9fcbaf484eb9723fed9b82003539458010ee46526951aa9378e2c93c96811b14812fc8bde4a615e8524cc48c17beca20f185f666351b794e6d6026"; + sha512 = "c5eb9a60e339e05c8c8b16ba57e3b13f662bb0af42044cd7c70c9f9fe5c4dda16492d03d557ef90ede48b2b8a4e8845b0d3effd8ec85971e3855e8fce6675739"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/cy/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/cy/firefox-61.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "efccda54fc035a09af67144577e32e27e61b4ef619c46bd1a87b65a699a8427c2ed93b6044949740025ba46d0b937e50a73b57f5b378d442c56c7acba86a5752"; + sha512 = "63bd2eb6f2a0591327299887aa449a7d83a01217410c83c23f7dd551fc1abd7abf52e19cf2f3629ef04faf8a79babbfabd2089553e619c7217b1be9bc6490363"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/da/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/da/firefox-61.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "586828d3e81a355287fa3f2c9be5fb5f3a23b61a393089112921e9e6b239e630f45d6051f921307c21e1ad600a087bcd5ffabeccf5b5fab9041683f7cf9e0c42"; + sha512 = "cd366e8ae4669b167eec8a245935f1141961ea3d60fdc3e758fd69354c7c04cba68670dfaa1d27d7599dadcc29ed05d4f2aba0309ad80a19aee815b1b229de73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/de/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/de/firefox-61.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "6db7cc3f2a8e157faec6a27e0cf99be78ef957ffa92238ea60d3b65d41d403b3478b8fde7f27817b91285b7efb2e9b76be3ebdf40ef1ab886e8ddd3b8abde0d0"; + sha512 = "ed88364a9f4b2643ffe0170d6bd9d68f7b99c6ce1189a2d87350535eaeab6632891cdaf48794d82af5818affad5bff38701f5871e5894dba246e1cd525c8f98e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/dsb/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/dsb/firefox-61.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "397ef9d40697d2cd33cdb31afd08060623cfaf1dfc2445afc21ac667f8e90bd26dc1ec9693c6d40bc5aefe7a04606e702f6e6c6fabdb2c7517f0488c96ed004b"; + sha512 = "7f0b8637ecebe140ae46139b3f51502870eeb37b2b2483df8456b46a2a5e0512f141a9f57a49dd9354054cb2e6b617055516543d7617cae375ccf9b6d4e1516a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/el/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/el/firefox-61.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d7e4d7521624a0f4f13287aedb9289e0bbc601f6c199819e83fb71836e0a8d754b32f71cba835f4a71d00029fe8dfbf1d44ae120b8943356c39a9507f2cf482e"; + sha512 = "9f932ee9654f985c756151e806c29e9580de60bef44a72764c03c3738767201136018afcaa2b25b65ef7f9dec6213139de94e4de0a857dc40931697cf5cce2a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/en-GB/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/en-GB/firefox-61.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "e767e6c72fc29c0c7baf9abd956b6608dec7c8e7d2a45772a341d894e9076960a6e03adbafacd8ae7555a5db38940df570bb802035584be1e62e63d8bed5147a"; + sha512 = "2b6287f7e664316765eb51933c773a4bfb94fdee1f18923c7931534df50d99e1bed9c9c5debb19949151d39c6dde8550f6669a0d66008759282b792db8e0e5e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/en-US/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/en-US/firefox-61.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "58075442850d5e34a7eaa78e008a6f80321a09fbaa5bed698394659bc468d799d299ddad888b1def0d6b74899671e98e7aa918f247a57c42cd605b05276a9156"; + sha512 = "abe11590fb913c51bf66fb0865d6f8d93d9797993630feeb593cb44690134a57957800c6b9c7d986ea993884084450dc737ae7f3324430fe79bab2aedf082c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/en-ZA/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/en-ZA/firefox-61.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "422bc4d9695da1ed5c9269f9067d331d0b6c0849b12c61140e07bc7b475f121d07c97c0007f9e33e724451c63a25b9352326a6a321c3eea8506ab4a07ed67e74"; + sha512 = "0c047e120edc3595928bd5e9bfe0b301ab2530c33d302bf57a1443f9b1f3ed786a9298f5948dfe766b95ec18083c57302cb89e4da317e995c1320dbbe2f0b2e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/eo/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/eo/firefox-61.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d2f11b0d0f660305073570840975165a0900970fa63c28646eaba94709da0977229c3a77280d731ad98ef5c17e5d7ea230eb816c3248c25d4466afb9edaffe46"; + sha512 = "84130624312a12e208d3a944ae7fa117107528767fa997a10f97102d1154bfb2fe96d117d89deb2e7bb901c84cabfe711a4259ec90d22913b80b9821f10d1810"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/es-AR/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/es-AR/firefox-61.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "11a83e2ca6deb717659b845f850aaf3f0b90b4bf784ca8f2f095197c2c3c42c26c69488ab9dba3ce4b1bed4e89cacd8366ae9a3ce0cc96c02978c9bd6a55c3e5"; + sha512 = "256c9445729d14be034da2b1be1feaa7a9cbd89c32b96a3dff7d117747769355a95f2f9d8078003a65f784ab1dc434537ead393693c45de089187e0c5de6fb8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/es-CL/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/es-CL/firefox-61.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "2e1fdb10a04b771d8b29c9651a1984f1656ba54e7d8905bd625c9832093a69db054adba3a14ac28d92bd5706379757f2d9d66a03c57cce099ffd5d29b96d9379"; + sha512 = "bd6c81a0c4f99289dfedf741cef040d856881df8c110e2b60e10118cb363d9f2748cd31535584d41cce5657c6c3bce36a1d18e75afb962d83b6abe55ed843ac6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/es-ES/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/es-ES/firefox-61.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "879380e144dade8568e49f74ee1b9e14bed86549cf6f8f6b98e84d9db72829ea28c36ddf53804bf697f16f74a86153b7071fa1056bd568533846ff2f46cb0e9b"; + sha512 = "ddb6350782cc7a3750219ad2529b10c8bdfbde3f41277d388e08f78212613cf66fcba6c3fa5a678b64366dbc9288cde9dcfa6a929225f6f1c387df26f7360855"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/es-MX/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/es-MX/firefox-61.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "dd87e44a2d1fc27666710a1c16fc52f8b7e075cefd6ee9039bb092d9e4341542256f458695c7e6df6c0f7e9380f867845f68d9c62a2f961d84922f74e8bd26fc"; + sha512 = "eb84132a7dd0b1b3b1a9203293bfea5f550dd8fb222a113fe9ba13735d00a971b7c0d74d8fb7956aed378c36194751116695439701ba84293979d12ec5b4aa37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/et/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/et/firefox-61.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "1663bd14ab53722348ebb233aae275f291647c903c2756ac52bb4396bc0f946c0d9e851c0f88df32484f77d03404895ffa68ee0fc88955efc49c9693a1876102"; + sha512 = "1866fef138d6be7e2134d31539cbbe4e69c9e7f12517bd0df1c5d16f4b7831b0e6f0fb3c009a73d8f553c7e22cd65513c20c6b44a80dc5940ad12ddb922148e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/eu/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/eu/firefox-61.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "42ec88730a68821186a7b5f750631a03490fb7c77b6ee31e7090b4dbeb36abf02fecfe301ed31e41eb0959b31677c994a40997a713488aac8f4657db4dc497ca"; + sha512 = "371e04af308a689da5e7615661a338239e625ed01800577826858c42478e4ed4f91a0d58c16e9f58a331de61a4f26469ee1de16171ea148dfe1045385c880b16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/fa/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/fa/firefox-61.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "382c8b844ea58a7ea4a340ca209c7a1bf381c14373023cbfc10b60d7aba900a96c4b71128f59e5bfdddf03b3560e7d8b89bd5792b130341ba49274a051ebd041"; + sha512 = "6f75a0e6ec02f7e3346562aeb23e17240270a8980381dad504713f2d4af0ee1eb9b6514b66c80e171517deb435ba6c619ccbe022889713b7d8d19fbfcac15ec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ff/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ff/firefox-61.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "ba2fe6d770b7faf3922210b32f8a34d054a06c4640197b5d63fdee55905438aa4a75bb87666fdf106e03e4444727114caccca2a5dd9fb0fa20f475cecb903224"; + sha512 = "f92bcb8c3583b31c6c79baf76ebc2d5f989baa50f140f5f97a35bde3e565cb4c3bdded18b009423fe4abb4efe7167fc1918ed55d1c467bddbfaaef5da093afda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/fi/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/fi/firefox-61.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "0c7d80a8e04f693df8cd3e374d0a1fdb65b25615fb0cfd2a73b0f78257f8774057062493ad1224ebf852ddd3128e9bea945d9520be2c188089b86de36f169dd1"; + sha512 = "3b2cd406fea30bcad77d5de8127924aed78d28627dad1dd3b4b493c15e7c9a792b44500da8ce16fc4ab2b9f9d62f359aeedda332cebc4658e16b69c54aeac449"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/fr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/fr/firefox-61.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "cf798f34be131f30193ebfdc061edfc7a18b3793bf68b63d3d5c0b98b6208bca1173c3a785240f07f3c6cb1ca912e25043bfe407ad6eae30f480e4f9c8868f4b"; + sha512 = "ff9b2f6920b5d8b1914ab4e959eaadb3c9b4efa5f329e73b8a8a15f33102e415d39534b985ae11996efac6b6ee538f3273ca25d8c28764ea46bc6de43113a946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/fy-NL/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/fy-NL/firefox-61.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "0a2698c1740ab303a100e09f5d5ecb28eb042199cbb3705aa11f57aed331e5bf71cf8709d9c8ba4693b0fdb8fd9597006f961bd481ad2baef6ebe42c7c6cf32f"; + sha512 = "51c116df6e42b1b0e466d4a018d22791ae84935cd603a2ddf556d985874b1276f4762fe039e5ba73524fb5f9a25ebe9ce52d61dd73da49bf2539167f70a9dd37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ga-IE/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ga-IE/firefox-61.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "21ac54f135b1dae3f128a6e2fe8376384e951e64c019930cad82346a8d7b827e62e6caf62892194d0b3b7257d66bee9c4bfe4184c5cc146094f26c497f1066ef"; + sha512 = "6405edba8de9c822e27f372dcfbed9257313d0b34f8a23f2e999dc17222e94e5266d6711a60067f786cea4e010a1f30533308d535302cfc1937720e90bbb0b5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/gd/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/gd/firefox-61.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "19bf6f1905b8fa6b1efb0a4fc6dd35ae3dece610651abc8b927f0527ee0ce48074cddb840331b639069fda5509a7c0248d9862e45d318aebda4cfd747b966511"; + sha512 = "e35a04ff6aeb5c2ddfdd70ea75d52ab2f7699333613c1488ae0edcd2edcd2045db0031b89d96a7c934b5505a61d7429ac81b1f5739d0cc578c736d1ea26e027f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/gl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/gl/firefox-61.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "8ec3abe16c1af9419bf67c295b624483713332cc1de8363d99c383d6ade93b3778718f2572b00360a890aaa01a0e5104537277e616e2762d15a4736fd27bc2b2"; + sha512 = "b989804a3fa681f4f3ced106e14a420d6f27d091a6a3ed9ac771f750486b8c468e5a247d3e21fd5ad8bed8a463f0f1857c97be86fb4212ab7465dc8ab986657f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/gn/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/gn/firefox-61.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f5c2bedd34e595759aa9ea229576fd8590a4f777ef5826a2758273bb2b7c27aaad4fcf3e719f3b67237186b46528eeadbf8dd42e514b685e5f1b7ed2ad01df56"; + sha512 = "7b5b423364164b2d8061bc7df5074032acd57557a293c6fd269c6adbd3e82f1d2d18ed313764eec644d0ee3ae1eeddf3ce621fe67cce7e749c521c01908c9de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/gu-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/gu-IN/firefox-61.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e42965223cd29e97b1d13e242b640300d16b1234e8598fb3fd0cf2b3c572ed83284cec727ee189ab918c0d6e287c2682af56d6f44b332b6b8af6cce8dce2c936"; + sha512 = "3d5289e207219485353de36e7bcb2d1dd38aeb3700f80188d10cf0bc16e07e4a2dd98844063c93466a78c36660f5934c64cbf0b3fa73a7866c157e3b9c98aca0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/he/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/he/firefox-61.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "9d63b78a18612f28b9e9bb8f5ddd9df7c5a28ddb559d8145d04ad873e644814009e4d803a09025528833b9c59e93896be941ddfd403561dcb9adaec99ab3692e"; + sha512 = "ce3c739cfee7f58960cd6ebf727f9eaa2821a8cef52da4b9ef98507ee8187a6df9d8d5c950a8f3f54c077cf516633907f76f4e42af9cc72b7a3b423a2c38ed44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/hi-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/hi-IN/firefox-61.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "6631cf0c4c7520c2c9b06fe6998eeaff68b80940c7263ca1026a22a7f308709be1ab4fb7fc91873ee6be3d4d9b854bece812065247422a59089796e1929fdbb9"; + sha512 = "d743501572c5111b01e822eb6618f5aa7692c680ad8565165048e3d722a04f9b623cdbf85762d2fa02519774d8670a4f00fa9080d4b00ebb8c9226d6f6176dce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/hr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/hr/firefox-61.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "dce0bd4a071829106d675901a948948326f2aa2b7bde74314370241e3388a826fbe2b0fbcf7fe3b4bc91dc1291783ad04fdb7fc6fbabfdf75a79214d77d12e36"; + sha512 = "c0e9b42c49e723b2c25dffc4ed84ae34dd686db8752bbded98bdb609c6c58f872209fae93de638329d6aca1fbb521feb2a65ba0add897acba5f495e88f0ebc15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/hsb/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/hsb/firefox-61.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "27d82d26e0f64bc17d38116855871f27ed01c2869f853c546211cf5cf55f40730d04a536eeac2d61deb6a6bd4cb492311af289e05b30eb3f24a7415b6bdd11a8"; + sha512 = "b54f977a15202547aee13059d3620006788a553ff3781c8c3d81107c1693cb750a8b08a95e254629357e5b7b4926edf9f81f25e5bd06b6566bb2b8ca70aeefa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/hu/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/hu/firefox-61.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "e0ce9800431237dd5db846456d8430bf2a694b24291cdca3ebc87b6c7e2b34f04408490f32e44c8c0b68091f71e83e91139844d6a31223340c05f5d73bffd8ce"; + sha512 = "0d90d1b17eed1f1e33527e028107461ccd1195cc1b4658571bcc80ae8dcf91a4b0ba28fee4a5699579b02887d2ac5776e1d4e1b32c7b81fc13812c4c3e62379f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/hy-AM/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/hy-AM/firefox-61.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "46f37fac95294a3bb6fdb32d0f4e75c41afa0aca75d2de76045f4ab2bc9ed37f89fce12491ea5fa95bb95cc87c9e5d402be1b89937636c5139c81babaae19de1"; + sha512 = "6799fbb4a16ae2ce4eb14789968184e5c2875a9a47319f83093500b778a0785dc7f099c5cd349cdcd41249730caa9c73ce615d9d6bcd2ac49e02e921fbc039ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ia/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ia/firefox-61.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "ab31636a827ec54f309d30fa4a991dc56f24c4eadf305dc318f31c8074d64e057cdb02f657b5b164a58c9ef42fdeee9fd96fa5bd6644c8a003247dfdb6f6380d"; + sha512 = "60097e720a6a9a318119d76c3c6f8689938a4871c4cd74019ccb0d2f41755e9132b62be797b78ed23204d2e725a018f5bccd10d5e9484b16f207f362bb36ddbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/id/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/id/firefox-61.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "8e3a627bc5664d3899a968305818ada76446d3fc59eac235462875d49eb671c7abb9a381f92c1bdd5d31f0f01f948588b09643cb8faac4d7ec596c71262c7102"; + sha512 = "cf45ee3185f2e6433f5b571fa20432e680bf2a4fcc3b6ff5877056730af21c0188b563af7548465dc65b88bc2c7bf666f5102283d5afca8689e36e96a6b049c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/is/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/is/firefox-61.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "7d182df6343c0470888ff4def117ac60a719a3750dfa4728c5bb4b2e5098fc8bde959b2caf4d96d54b1d0b5d6ac32f553f70b28660351c8e0fb03b5612cd5487"; + sha512 = "0af4bbc5d00817407f049ebcd8906fcd3189e8fd31688af1cf7b7aed0d3e09a41a9e1975b23917df0aa83b551b290c095a994707ed98f1e40b0900fcb6312b9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/it/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/it/firefox-61.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "9b8429e135116f297a45b1fce0e2e9a57e133c3469d97201d1f5af51bd2073c17379494f3caafda39bead076edda3d0f834e67cda5fc6fef9baa5a77083e4449"; + sha512 = "1f1cf5b0ec8ae4909452a4110d205f6c5876108f9ebeecc7a7dd5e679854fcaae96059a57a57de7f9c37fc8322cfe6967903e10a2280dc3c2184e17d04d075be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ja/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ja/firefox-61.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "03fc2e537ed8e8ad35d345d0b41c1f42429ffff5c5bfcd53396f4f8e86722dfd17ba2656749fe56757d026389332c906d576152372a2a6b99f2259608250d2b5"; + sha512 = "2fe1fed228559c08ced184eb1bb8fbe404b11a7d21d8a12c7890959283a4472e45bd6feee789c545fa160ef1cf6e6d10c6728c62a50416598e418d4d84020546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ka/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ka/firefox-61.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4a97083ddd8884e2a57a16f2efc0938a85f5b55097962ee857630ebecf10237de24e7c0f59741da32e69af47b49f41bdb198fdfb4cddfa6c2a83ab139caea960"; + sha512 = "1319ecf7b9e0ddec898757430aaa45b5700ded401a35d6e3899d440be4fe49987e0157ffd219785386d521b3ffe20f865da9a9333fe543c309302ecc98b0742d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/kab/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/kab/firefox-61.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "bde834fabe3bd6fefe6cf819a30c650d868050a1d72353a0e6e370d90b46c71845ac20aefb0ad51c3a828d730a3b94ef9932ee80ad792e2bff003f31245ec465"; + sha512 = "12ef2ec41fefdffa61f7fb4dad46dffef322fafd25d513cf7bc5753170f771a5373cf79a3794f2ba9ccd84b6203453b8f68db11e09629851eae027d3b30bc394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/kk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/kk/firefox-61.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "8c154331e3b5e3a340f4fd36774f4f4ece2d4608800551de2ea77e9ad863582fe79819a147a14d99f456ac50bb3b5dfc4ffc75d97ddbf575b009f35ddb0c50f6"; + sha512 = "59098181301c756e62a6d661a48856a9d252797c459666897c0c74364586eeeb1a68ccb9a2a0d126b50c78634f17f06603843a4239a2bff018311bea30f093a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/km/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/km/firefox-61.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "17103daa05445ab59e030101521e02405352e1f026b51ee554cba1fa88cd2cece673d34f58deec55de3f55316782dbf64121248490689c576d04cc05a1b8d5c3"; + sha512 = "d394217642ad85b59b4d89f1571c477cf11d4ee02390b441a480409776ea44d59fd813ab3be6368f89d857b6607f37f06603a3842985c6577391d89ebb1b9437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/kn/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/kn/firefox-61.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "6baa49a08395761ed0979a34b8eb94c0b8011b956f74561253f1fa0a972a9c5de5c1f4ffe3317515ea80092684b9ea95817a6cff3783bf398c216f66ac032c9b"; + sha512 = "57833cf3cd49a518a8036943c026b02a980b296fd5ba9cf66cb72a5b4267837c05b65f30c4ce5e743557fe36af8d4bf659b8fba573b7046ab2ecd5f5b6009e81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ko/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ko/firefox-61.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "119a4829d184d034ca5fccbdc91627fc06670cea54282df77e87b362d172615ce445e37947a12948fe692e611e05a1b5ded785ce69df6c933e9a9cff234c9a81"; + sha512 = "52c5846a9255cbe18fbeb559e53f2c874139f5462e423dabccd45112df444b4317c62d4957584047eb7362c01b27131f6430fabddb4cdc907e3ed5fbffd92f3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/lij/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/lij/firefox-61.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "ee2b2a3b8e7805d7fe42aff4b9892348dda1ec422f70260095b155667bf2cb0bac3cb4c646319f2c567268a8aeee3c3c7f7998dc779cc00b24a28ea275d99461"; + sha512 = "310a7d9d80cd49a1a9b1e68b3ee52e79f77404c36b609ff50c50af51a4cbcbf346fbc46aed7d91cdc6cd80235f090c11d3863fb08c665276d5d6b86e5ec63d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/lt/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/lt/firefox-61.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "5d3fc60ca0a2d60b45a74718bb28c4a6bf8c92187bf1b5976b827e461af5944ef403d00e93e03ee06f9cf5cd57f40ca1a4d1041c95751d4cd1882c2bcedc92df"; + sha512 = "bd3c6ed1834b9b8331073cdafffbcb0aeee813df66a7c78caec1dc0298d24e14a1e74e1bdd8c7def8ab11578f2c30bbec9c60edf8359fc1d9d16a23b0c83189f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/lv/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/lv/firefox-61.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9072bec1c1f4c11a3c8bd21e6217122d08efe8547dff19e0addd5ac4fc56299225af583bba8d6779537b16c9a443219438fc90801b8e1e0c9d639a350f0243d2"; + sha512 = "3e03383df3286424ac5030aac90571dc3cb703ede6cdd6085027effc91153f3abc4cf258d6e642591f963884ee4e09f08203fc24bdae1297526e5a85ff913cbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/mai/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/mai/firefox-61.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "d7d989e9d0c274dfda2579c0e3cbba346ed42d6cfefb950d43a49a8c2ded83810de1eede4e894d6d440a4d03f2db239c92a30fd3ffa51232705f8b4cba31e0f6"; + sha512 = "f91928ffc49ee79a5b987d7fb7a2dec3fceb139e462cd5c12cfdfe668d78ff73576d7014eaed02881825f2fbcf20a6f3af2a5a3b3fd20cca25c02d1a50ed21fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/mk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/mk/firefox-61.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "924afa02079162cc4014f92b851089f8589a56336dc5fd2cbe62e2372c751792427fa0e592d173a74064bf5371807382ec34a6a6b798cbcc11ee1a36a9197d62"; + sha512 = "197eb5238bbe133ccac85e3a329aa27dc27a73c089aa6b191940a8817b8369bd0aab3c06cf7a00e597ba01b3cc2d53e0fe807a632cd6a45ef309eb57e2bbd104"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ml/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ml/firefox-61.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "3a1e5ac314136ac109b6a32db1a31e2d6a4b905e53095c867e219ae19b570774f3a5ce37a462e43bdf55175b867fd1cdfbddd81e4297f7423bf56fa2656bbff2"; + sha512 = "00a617df069c7038327d5b66bf309bb708b0207b9f0018e29e4da310a9f98a742966d77228b6aff2f401355ba95fdfeca8c765e03f604d9e6ec1f6cde3825bcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/mr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/mr/firefox-61.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "a99e311c5639651758142628bcfe50e0006192406896dd7aa18ae86dd9fe4602116235c19e28ea1a5c5623b8d361bcb7ac02b411318952c6c77b10b539aa314d"; + sha512 = "0264606e0626f715575fdb4cb283a69895364469bee18c9db5c385845398bc1042a7a7f5c0f42e7eb0f43f29e57dfc218489f74546a25ee054f1bc72463cbb4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ms/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ms/firefox-61.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "3803232c95c80362108a5bbaf5b9fd22618c483dfadab329db8d320919aea977f1cdad2d60d8add0e3b0f8eb3c8acb0c2e211b974ef775f1fa1c176d131a1e2c"; + sha512 = "6f75b318686eac3d60396ce12f082c9f756b1304ba14e58e402dab36c0e1678c871c05970c28c98b1deb39989c3fbedeb086d3d01d431a0f0451e68b2710d412"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/my/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/my/firefox-61.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "67adc587a51d48b3baf4727554dceb26364f14fffae8fa8d9311bf07846b54726112951f1773149689cc9326a559d9e1a55169eb1ea4fe5be6aa590b9d0a3185"; + sha512 = "f3767211c839a1a9c19b324fd6f612b0c3a97082f0d1953dffb7691ca3b30509e21ac222d2fe64a07213cca6e5737f7f7f708a2c67739a989e3d2f29042e9f44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/nb-NO/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/nb-NO/firefox-61.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "79979c32e08eb9a5f9b239569f7c8cd992b1efbe6da9236e3f9365111cce74213f4ab7f95f716bdf3029c28733f0939bbd9a6eb95a9cc76285c605895062bac0"; + sha512 = "d6e309e17bc4f5b0ee0a38efda7ab3bb98f4f7a8de2dc5fe29f5692051f5f01458d7bea2f5badf5b12f145e124ca4f2ad8df43533c486b810703790cf008afe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ne-NP/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ne-NP/firefox-61.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "8cbd0ed2f0df776eae187acc8f53d1b750fd46e43780d9adf8d31dfb7116ba11021b4b31c71637205927aa751436a20f2faf7545bd1573d210a6e7ab5da24257"; + sha512 = "d980cef31c2ad665e5bb982ac10feab3ac593fa9c2c9f0dd7444e387e45633615211e095c785560bafbf4211b865d47193129b21aa491d60f8123847a68ccac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/nl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/nl/firefox-61.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "f0912f2e0765499baba808d340502fc463441b8b61fdc803088fae9c74cf13a27d5ce91af8b6d2fda542d560042ea3d58abedf42c7eabc4ea6536684859c6747"; + sha512 = "249091007017ceda78d9a2ee2dcfaa3d0d3b14aa1aa215c676295b139529d38d99dbcc568bd570013d97fedb8fe2d5068668a730597e84c2b25dc51b90c6dd6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/nn-NO/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/nn-NO/firefox-61.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "995c0f9329260083030972f55fd8d9dc32441f91b647ac2a2b38dc8dba179504beefaf4726af2f73a07b0fc142e1b33589e60c67a88796ec47f101a55f015a96"; + sha512 = "0337179a7a53e756b613ef71131758462bc87e9b0b4d21b0c9e07ba5d690975c3b17c8dd620a35dc88c92e6bef9ec85865ee41b93fa4b43e88710629c13ebdbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/oc/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/oc/firefox-61.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "2d34652d6a56441ed9709ef0191bd252621b14102a7155e2b6d8cab85c4c084a6f9fa336a32991cf329b4ee3c86b3d3dd1ee23c98428170a12d4247a1d06c096"; + sha512 = "e5cab6074d88f98c5bbf77fcd1fdf5d2e6d40547ef91044b05e1e3fcc5aad8de038d787b7fcd6835277cb093ceaa7847d95efa103c7f91f00df27b7803a9a4d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/or/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/or/firefox-61.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "bf74dafd4428103e68b34e5ef4b92befccc2b56b7a92f0d8e0fc8deb03a916efffb62fe4e99431f5708a6fd76cd989bf603c954fef3f7a67e86b2959d2753e68"; + sha512 = "64a70c23b4ab9b1333636a692b122299d55744754af1a8c1f0b6d1ca666ef84072e06dab1cb1e078deda053354b737a09eb55c59bd0ae35592d5d6bab3b29f51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/pa-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/pa-IN/firefox-61.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f68daf5975093eb806325f543154e3238c3c2b30c9c4d9be4ce69710bd648212cb66be8cae7d4dc032fdb347c51f8e45634598389f1ae3be0c71d30fb470c135"; + sha512 = "7021b3bcd548e9aedee4b5e75356173a4752a7995bb4ce29a8a6201bd008ae94b3c1553f70c618d15cebb505026c899e7e8b6c00bb37337a215773b2da9ae518"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/pl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/pl/firefox-61.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "15374f8179f3fc589fde99deeb3ed473de8d84de22b23a1f94f396204897c65be1e32c712f778404c2eed424e87a92370a8d0c96dcfc65e41b96efece65adfb1"; + sha512 = "83d88e5a560b3a0ff895f7142204b21582279db353bce066e1995982709072ae019457e0f5cf5c6b12f5a5ce714889aec6d93846227c5cc38d1969915116e5c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/pt-BR/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/pt-BR/firefox-61.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "2d6b73fffbbe446e36b880b13b22bc1bd0a2412011492763f358ff2f8ad443fc6e2e13ef96fbcae2c6dd79da6d4ac65e94274c0bf9f12d77bb35610406571e04"; + sha512 = "21c6a36b72f592ee2d8d945825956594e96d230af244c53e89ec77fd169e01c65e4372a7b2680a45ca4678e72713e7580d17706b9b86b21223abdd1418461651"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/pt-PT/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/pt-PT/firefox-61.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "60e7955064ca76af41ad750ae6026095d0b6eceef085764bc98a98767346f2ed3220d299d26929ba6f52e831475cfa1805c04ce6c111f8c18a1a72ebcb8d2ed3"; + sha512 = "c7e41676f19646e25d887c10943401625ee1322d5558ab51354b9777eba505e7dd87d4a0d2c893ccb7a91da60d456c7ed5c9058ccd73d9e82db612412541af21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/rm/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/rm/firefox-61.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8d83ad0e764694e1dad897f0505ea6ee143fd4a6aa99c44b9b33d51c624e24d1e6e217b760f487405bffad5f4626f22bf2233706c9c4579551cf8c89b06cc1a3"; + sha512 = "302aca19a36b1890747eb0044f9e5d657e20aff495c46b93df65729a5ae250aaa2ba41327812cca7ef795182e89fdf4b2256bba7ead285ab37d701fc12201498"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ro/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ro/firefox-61.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "1d2c5671fb18d34d9bd10efc8be7b37d7ddd30fd383f5abdb77213b3a60a6ea1d704c8dce1dc52e446e3bdf7a4e13910d52de6e378a33607fd30f39c7f05c258"; + sha512 = "3a966eae5da20ebc984c79703f0cb855267c41e3fe044bb414c6813c6e5ac2083c02578a58db93f6c7d0e223de75c075b13bf551562ccc977ad108bce824fc03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ru/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ru/firefox-61.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "296e4545d7763140417e3e7811f4d6baa82656fe09fcfae6251d4499a82558b5a7d18230c317cd97fb4cf324574f21997179b4072721761f1084a358167a35e1"; + sha512 = "8856d26b29c45a72863d7861dc6d80fb8320b799bbe9a4a1dd95e19f97c5757eb913f4e2ea98f0cc37af67b3f084fad3c4060fef91afe1f34852b243484a8158"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/si/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/si/firefox-61.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "7dfdfb6762002596aaa59f20e080cbf62ee91e5ce5fdd01bc13a31535c573657cbae106080b4a0e1276d45c47c28140cbd74316fa1e74b6d70a8267c405405a8"; + sha512 = "238df6400ccba0241d5cdee493949f05e51f7b2c079473d2ffe80279978b433ac365974aacd8ccfa14652db568d0acc2d9ebcc142990c8529a9e86607a3932d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/sk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/sk/firefox-61.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b1900128dd080b8e90e0c2100d785c011e9a035372910964b3af28337e3280aa8f764b18897c13a2ffe19e2bd0874529b40174ba8f274f88a4d043cb8c36e5b3"; + sha512 = "ac8d6f14992af14ce7fb5c056d68f2f76397a148d596566851a2b1482fa587b357004fd29a4ad8c93c44b521a38a0afe4d7d4014b3e61441139240210c8de0cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/sl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/sl/firefox-61.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "093aa2ff706482696258bb10a890a0ab72d887f020a2925463acd0990af84d831b35c3a3934ece503e53f228a2980d3529b936a6fe496040633c14c0fc0e6474"; + sha512 = "b1e2c9346a8dda2a4d36231e77af8871f9730877f9a52f22b653281416a31e50a0e3ab1b45d64f2e07b31f06d56f1f4209922bba6336f9c4b00a62c7988b6b96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/son/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/son/firefox-61.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "25d73d62ffcbccd85d81791522614c176db531cfa0f6836fc57dab2ec86a3b05032e1cf7b00ac7d70408cba63c35e4e86e199cd04fe488318492c2caa37983c0"; + sha512 = "9558645ab44832c4f304a1e58e0923ae588df993a18c427cb5d613c7af12769c84ee41068aac730b51ea905722819f0a075a870cfbfe10803c671ad2f4f5c529"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/sq/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/sq/firefox-61.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "c67e29f65bdd0f9a72f0639d19b706391e4a0d56440f3692a5a8afd0dfe86ccdfcb4c326e5b54642ff3302a4b0b4a762a7f430c6371a93fe66cb727b65a5fdee"; + sha512 = "0b4c0fa3070f0f1ebf3a1da7b4bc7a5abfddd4ca25914ee1a41c23069f4869d7291e536ba4ac42dfed16e0eef489d09d20a8ef9e923aa6c0aebfb85dd48055e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/sr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/sr/firefox-61.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "eae557a85e5e0b20476176af094ff982c6c60769572022fa14faf22e25f6bec666aadabc10ffa7f90aba440cd94a5c09b8e72aabb228451d3bbd1e600f89454f"; + sha512 = "8fbecf2e4d1e8c539a25b283a1526d9d431c26c764bc7aa80bcdaf800b0128097c2923127b8bc21c2039af21aa5cea376c176eb507a6eba49e3111f9dc3f0ff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/sv-SE/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/sv-SE/firefox-61.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "b153121ff96e9e8a86498e8aa78f826817cee24f9ccd72a8ec7450add844f61a6695f8b77c8852b9f3f96da80e5942ab65dd969a28ab55c4fdd0412b136dd7bf"; + sha512 = "1b90753de839a5083657017b54d92f2c103ffc2f6fd6bd414695c2302a474ce17652c290b5440a853ebfbef4e558057de4b0fb8584ea146301aef6fe9406d264"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ta/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ta/firefox-61.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "e10827d43a9ddf6b6b1ea5b64d7c926ea3301f677bd2331d933e9b9802d1916302aefe64a150e153b1bd68a5550f06e3e4bbfe7897e13bc619494a7d73b983fe"; + sha512 = "2c8678367889a365193eabcdc1feb62a3f451880026cc92ac1b3fc1fa617f24478f273fe17780bc3f08241c956b264ad797fd9874c2da9867bc9f712301c2ec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/te/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/te/firefox-61.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "733f5df11ce22c674b3cdd81134932e1f267931c7e1a1b363e4240c8e9e348dadab8f2728c0c55a08e43f3e1960d4949c57a674bcd7462546fa96582902cebe6"; + sha512 = "33f7e3f5fd241c1d64144c9bed3937dd0802e058cebd315251d583dde24d4ebc7744481706d9dfbb227c626c99656a2c83cd61c3b4510514be86369b43aa243f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/th/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/th/firefox-61.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "2cca4fd4d3d1427f35b96d7adfffa899d1aff349f404458c00539a44506c016cdb8410ed1f759a0b8c3ad96d1b5d115ee6d2cac09a8c45ada12abda710e61e0b"; + sha512 = "21eb20dcdc9a3a1525435f6312e62acea9d23624191ddb1bf50309cc1006b89c59969bef403a3e9ba68b54cfe435b0d3c46e0775f8b21f59caeb45dcd1bc23f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/tr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/tr/firefox-61.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "cf5bfd757efb74339126a5e412c7f4c9d44c1590ea3516ca138d3044bb765d6ecb5d700ea4ba3b1f1035f798d1eee29e14c1e71ba0be17da15edcce307740fba"; + sha512 = "9ef5a65aeb0ec9ac74eeb0bdb9c44702bfc111ac983b79ffc774366a38cf1579bf0ae34e20cfa2abddb6105e4d426c3fbcc9eb1575ca74fe3863877634df29e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/uk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/uk/firefox-61.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "54b532c38324fb4d8140a48305397aba97cfcf7d4cca9835046c6cafe2da1a206de82dbc0c3c7caec7f37e4363422443d39c6dec5633db9039f2bc04aa456bfa"; + sha512 = "47cb53aa15be19e325305b5d953d97839afcc92ee2ac53893dc44a91decf15cfe81f11594aa60346a3879734895425a22a7e0600b392b9b57364c58f769aa55b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ur/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ur/firefox-61.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "02e14dfc408e70cb22fef6fffaac8c88d38d305de04c882e9ecb0f1f25c272ce7d9bee77b8c988cfefe2b52a3a6ff592638c327810a1aa3b70b1865fa94e522e"; + sha512 = "02ac956c4894129befd3e8e9105e93d94552e9c9b22215bedd2e8f3ffe786ce499b426ff0c5d0c95daf38c03df6ecb0ced4a5f09a62ffdfb2301eeb68bdf0400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/uz/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/uz/firefox-61.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "0e2d467f53c3276ce96e974e22681981392437741b72cdc11b486f28896c95f1f86d48a6661803d6143d160656e0b566f2304b25ebac587cd657749022193353"; + sha512 = "30d150c4e8304fa4dea1776b5aa738053a3d9c67f6fc2e0342ff186b802f6bc90113b14e5646598a64ae0884f615b41ff7761bacf066db7813391ed5bd51eed2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/vi/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/vi/firefox-61.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "5bd6d080d82d897ae2b48a636143ea7f502f473b6738180a51207dabf57fb9e440aca16f13d1c190aa623adfed3ec61d5839f918ddf43be83b6989d10ddaa418"; + sha512 = "8d8649718bcc413e7b6ce64960127b7a101fd715b8a682c328ffddae93056a697f855551e1a6955927299df91a577d0bf20400b3ba99546f4160daa6ab9b303e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/xh/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/xh/firefox-61.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "9865055d2f4f841ac84acdbe7c3d839e245599511f075292825e3076ec01ac28b7863c3ba90802fec98a940dc8bd892d9d77cc420e4257cf0885f1020f70d89a"; + sha512 = "9ea7022d4651ea8dba8ce8f8a7e364dc9f98f7a04c99549d360d4626910a30dd241284d5200ac021e8a52505b4db9787d21a64cd1c9590938fbd08d2273a95b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/zh-CN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/zh-CN/firefox-61.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "85a313bfa3faba33f25fe469a59c3f4eb21ffc5f1de524ef4db0e6fa4ca7e9d22dc359592646ceeefb11fdb50649fbe9fb852c2f9afc7ee1ff2d971f2f587313"; + sha512 = "2b87767733ce162cfd4ca5967e51eb77b5424add8d4e1dae55a874b7f5b622ecb3edf4a0d97632bae197b425d0e49eb97f491c09b4a366a370d3f451ddb8cb2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/zh-TW/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/zh-TW/firefox-61.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "361b5b6680819e9c34e35921e95676dbb91d461d24c8d046b5369ff31796ea5d713de08114b2e34b0c06ae6f182c042bd51c58eaf7dbfbeeb26f5a0e12ab0d39"; + sha512 = "7bfe215523e9967b85bdd278bc55986b9be9ec9ef9ca2050e08e105bb0e880999e43877e1ba903438517d86123686985e7d528c80d2500d32162b8c996b86128"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ach/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ach/firefox-61.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "47795903b41b7580991c0a5bdc51c9e6675955d4831cd15a75a97853eaf428bfe111f9c4268433564884583e5251510e5cad14e09d7be009791a03a0dcbef8ba"; + sha512 = "b55f452c559280bfdd4a2a0b8c36c83a52d69bd890a1f2fcdd4b2c6ce88ba4ba230bb17019a8c343a10a3fa0ff258653c6f8bf7ec9650c1ad39af95b2a06f0c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/af/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/af/firefox-61.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "1a833d81c580e26a337f7471bdc4df4bf2f4966705e18c09cc07d4da54208bf94f77b2a0abdb6b81f1e175acb902cb61317aed313af9e374f2b2e6c57e4c1f2f"; + sha512 = "1048fac8c053eb535bda40b971a2523a2c5cc26bea10b318e5f7957dba4df0563d894f300e95649b42e142031a8b1d93d8557038db999ec349e5757ae33b3a56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/an/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/an/firefox-61.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "72be8c1502c3e5c610d3e09d557ddae5dc74a9d16b8b6a2458f2cfb3e1e1d04e86404e53427a0ec9de37f7fb35a3a1e12a8f308ea80c527c7203e111710cfc09"; + sha512 = "e536f03f3cfc2301e65d01c820daed33fb86bd788f929ccc3c2227a9e824b421fb73aece207aeb43234514a0220f2797346b5d3d5d9c097b0935d3febca3728d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ar/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ar/firefox-61.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "6b332c3933b875cbbb93f337470b51f59d8039c0d15028e3f3f9da87c5d540ba6df194d704deb9e3caa5b31fca9d9f35e75d2fde94d56890c542055133341285"; + sha512 = "19a74e97b365e6d29f10676dc677a14c206dc36f16fcb24c3202def09158b29eabed0f0dce97951db427d9b590e5836006ce0e84a7a897669bd0f8912a84fac1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/as/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/as/firefox-61.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "65f3267e3d3d1abd89db670027ebfbf8daa73b3ae29d80ebab904bdec746d2934221ad8f8c20867671ea709252b69287399f2560fc8f08f78c0693f288daec20"; + sha512 = "c1f85672c207cd9daa53309d47388fd53b22d4c6fa38a10b18cb7e3843befb23f2bd76f8754b15c4486ee4c71243e51ecc0d1baddb4ed956a736cf0226b774b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ast/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ast/firefox-61.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "c242edbe7b54803085e9ebc8194bbcf0679905dc0546944a02dfd1bfd8c3dcfa455111b433bda497dc901f4916d34164e1645bb07a2b60c5b36721d7592a374f"; + sha512 = "545aad447cb458a55d2f0d7930303ec5f1f82ff5a48350e8a78090fb4549f376ddd4eaf241d76efe4422de95e1f23110cfd6ec44f15baf769213f2eff3121089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/az/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/az/firefox-61.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a1a8639450e2c15348bbfdc26d8f2625231a3002465e44fe8a4027f1f5d0518e5b1f46a3d37ec9e091628d7222cc447b7b6017680c39922adc2e0bd3e89b1d84"; + sha512 = "24d7eda6f2e688181c5740913232a340675a463f3efcb5382201c0415ae2b98b67f15ec5a00e0b724f6aa8ef278a64373a2f9e5a7c51f9b9a1207796da0f1fee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/be/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/be/firefox-61.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "4aded5865bb90684fe5e6b4e99176865449181b07001d8af83225231f89efe25f6c0a13bc15bab54e746c822c44e0bf4a8d21e667a944f7f42348b015a9ccd8c"; + sha512 = "3e6f4c16359e6456b11e9fee4f9380dc02080aded96b3a578a157893d54900a5d48525037fcc49b8ade8c9f8d9210a8f434505d91e3f319323ec1f4cf68e6045"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/bg/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/bg/firefox-61.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b044c84cd726a5955f9436599102af13f30f637505bf1ed309213ba37c887f1d06bdb902a37a415f73d98c126b41661fbf4ee17c5a3c5dc1e7ce4a24b40f61e1"; + sha512 = "4147ea78056b274952b6f8a13f5564421693b05b416d4d70d55d1143c68b0f7c3d025b5ca90690c19d6cb31f1e55af6e428c3c704f4d98c541b77c04434178c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/bn-BD/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/bn-BD/firefox-61.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "efe45227912af62be3f34fb24ed8d5a428c5ac90ec08e88e5469ceb3a812994c56ff8cafc3095256123adb9c9ec48b397de8ba13cc026ed7e33b0c8cc73e40f0"; + sha512 = "19bd3b44b02fe2e5ec37529ad2b40b84f251ad379a60e8164c225cf79b4f8efbd4bbac924ef61403ccb2539a72ecbfe2236a373a027e95f55e70cc9922d089bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/bn-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/bn-IN/firefox-61.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "2e19b119cab38130823555d66178a4cbadb74d91e45206529d151b289557916f9bcceb267990b00c116810d1ca8bf8d7de69bfb27bc71e829a61dc314d8e80cf"; + sha512 = "7774e9dcb85cdc4f91b9ccce87057884ecb982c7c934e579a13657666e86c2e997c64d1d8a61d6c44347af270e28568490f2624841b7fb6bcbd9e08cf637cac8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/br/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/br/firefox-61.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "953922e625bad5f64471b87ba8eb646d3db6790594cf79ff0cbeda6a5bf88ec93ea793599704c6dc4e08d433c2aee4930ae345a002e015183c19d0d0c9261b9e"; + sha512 = "9639a3a13b1fc7cbb7625c17efd7eb6c2f8c12423eb293fb83039203f3f6918c54213f0c73bde33d4e439ed46f8f6d3c049e6bba13498bbac17e3df122885d33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/bs/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/bs/firefox-61.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "84b0cdef75a3043de34851d74a2e8cb5229bc2d6482beae51917ae4122231cac9e9e7756009654adb47eee673cd2aae251f836a66067eaa08cc2853275517fea"; + sha512 = "286390d67836cbacb06db4541b6283db7d2fe7b430afae8a46a7aa45e3dd366049af34b67eb35889c2baf875c39671240009883e68ab511b66971eb81df337ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ca/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ca/firefox-61.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "9e1f5d10e6d73576c634b749e90e7d787dd0d74d1260a9dcf24b9744d08f89174ce4f5240f8347e4b8d6fba74a8a7b48b2acf98269636830d04d345046c5aa4a"; + sha512 = "a1695ea94759b0d998216b4b28d27669656279fb1e42eea46b9b6008964e5dc384547d9c3b6e85f5ebbf2051b3536d0a98c042cbc8d648265a8047666bcc7f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/cak/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/cak/firefox-61.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "fc7d14aba77866645e56b8f1407a9aa8eb129bb4243ebefbb69c131a2b8f8c6f2ba5d12c82af0f44a0f24f2d25ea68c5e6418e5691629cca02f65e0d481b3711"; + sha512 = "c00086b8c3fc4344d53c5abe1ec3226fe897b853d75dbf8b1aa735efee368507665fd5c4f4d5f1e4a29daef3b02d11910b3e1cee948fcb22386c90e3df8221dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/cs/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/cs/firefox-61.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "8998b61aaffece4ac65475d97f1d2ee1427b5e9162368d5aaa2ce1c1fb44ba1e306251aa256b8e3b6561dbc07ba1861f33d99a272f0eecd58a9c382be7d19088"; + sha512 = "55cd108a1a64a31eb4ed6cf5f57644563fcf318674ea9c179ea29e05ab5cb6ba9e021fa2af2a4a6d3fd447a2540cea3d096eb2b5f004b79c40948c82cee369a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/cy/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/cy/firefox-61.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "2f4c2ed89e5d5a916002712854f0ced27ae19c99ab7167ea3e6b03283b587899d80092e0de853e890fdb16f61f3a51f89565d65ed7d59486d34fd80e1141c062"; + sha512 = "3364ab70285b4c48f61c05b98e0702afc2c58318f63ba40fe32247eeab7737d1978eeaa99128254adeea2af855917e40e5212724372b3a095cefecb142fe6a5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/da/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/da/firefox-61.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "6c878c5e1f4dfa4e513703ab31ab56192cfc6634bb13118826b1db3d5848b512cecf988ec1e9aa7a43d5530325f4ca3cd2af908491b3143d646f0f559c231c02"; + sha512 = "c97fcf7c6d278c8de051962cf35c2b63bc106488655de5dfc4ded6b17e80bde1cd51dfbe3922e6a3cb1af331cc2a442c17d19d340d58a7a5459c85df47b27a35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/de/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/de/firefox-61.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8b3720e6c9e8b096785763aea4657cfbe7f8ba3e3bf245a66ea5d50d4c6150a2c3985303306fd3899b19f9296297adedae834bfc295141c7282ad5671cde96da"; + sha512 = "a5f05018d94248740368575939847f8935a8a6e95ed5958747fd8e7ecad1cf54a83494f234aab8adb23cdcf08a118c1cdded3491a52784deeff31fdaf46eb60d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/dsb/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/dsb/firefox-61.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "4cd36f313fc95288cf3b691f8dc1db891c80c0fd61359d208f9d2734c67586e9b2001fa167a37804ef96bab35318f78415596a7b43c42c9c77ab08e76c45f36c"; + sha512 = "b28049cfb85884a22cc9e9c73f1673cacb6e057ee74d9095c42d44b9215da4323f724850edd8c49cb1ee76bc90a5b741bc21d6310790b866ffd5caedfc3e5eb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/el/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/el/firefox-61.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "193402a98b08cefce18d412ac0d0f950307a4ee58f00e9b4e685b82b8bdfdcf14e3ac6dc5d9cb2a2afdb81221ce1b2c5ddcaa2df90eeb6412ef13afc1db702b8"; + sha512 = "fae6e42a0ccf05a35333810085d7100874bad3d09574a16214ec8ea408db5232d77431411db27d261a35463a5b21e102a18f34b1f872262e891db3471c5b6240"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/en-GB/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/en-GB/firefox-61.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "861405ba50462d0b4535ebeb053af0c999c1c5bc525ed57bbb2172334bce4b315b0abeef92adc8cd0cd92ca16ab527500f7fb5027656d8b14f6f682733ab257b"; + sha512 = "07debc36dbfc6ab656f023eebf91d53184d7bc0a8d0bc2d2986214ff2d305bfb2338ad90bf7f5be4c18f667f06eefc2457cdd9eba17c3289a2c6e4a6f571890f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/en-US/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/en-US/firefox-61.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "0838d4a6fa9151992e84227a06e40793ce832cc78761ecdc4b5a6ca2d73aa3bc63ff89f50d56a0ead39f53f2586ca9e889f251b6e18dec814e351bf2e10a80f1"; + sha512 = "e9c3c173fc5321e728eff82ede9bd6e216b08cf56a053c2634c2c17e24f0469d04a48d58657d5685256befee4b0d46ca395a1d651f2d81b5068c229fd2354cb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/en-ZA/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/en-ZA/firefox-61.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "574336acbba05e99120e7ad89bb3c756273a87dc713992ac25c2e2c82cb0e6c3fda0db5224f595ef1ad34e27e3777842bc92cb5c50a763585d75e8f03dfd9c28"; + sha512 = "12c766fac7a9837737d326cdeeafcbfe3adbdee5b26785654784cdc18afc513b03ef8974cca992892e524d134711707f676326a56a1188c8c7de7e8e042b8e8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/eo/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/eo/firefox-61.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "b47678bbefc275cb8e45f779691c2c0b3854bb585818f1c682011cc6519db65f130e5e525e6a03682dec25025fbd2b55d54981ea3bdacc877ecdd084aea4563e"; + sha512 = "8c22fddac2e1337e2cb3b237938534290ef0196480673655388445a8757c7f13bbc2a9e9f75496c8c8d4a92f19e1024c32e466fab39334126cffafe93fa00bd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/es-AR/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/es-AR/firefox-61.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "ec3fe28cd5ab8a3e89ef41dc69dcc43299205fcd7b40f00aaa8abe14f1640967ae17cf9ae1532aab98026b0dc95ba252091a605509a6d2c589fab89a0568c746"; + sha512 = "37f125a048051f1a01e6d027e28f1f5e08e1dae5146e5f1421ca5a5f84e482fad634ff554f40447013a4ac70dbd5a9b059e36c8f33ccaa832197ee4da1d0c713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/es-CL/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/es-CL/firefox-61.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "800bc8202782eece7dc580e25a8b4927c1d25afc229ab4dcadf17ef22a6f4a7364faae6b94e6f42c6c64c8e4ce6b7002d6d7fdcb24d26a66c7d01dfeb792b0af"; + sha512 = "832e69fe756963ae72f7f8aa65a980d5cf0d5319ec3bae4db54cad4f4ec15624bd8b6b2ae6a07ef18d62e3ad2d9476e0acc4ea9bcc25cb4ff0d571029b5d8b6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/es-ES/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/es-ES/firefox-61.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "8f12e56ee683e437929d0d8332addfc302351eb5af1aee86ee7c99552145f58f7a2657b1c5ba855150793099ee15aa1c2d64b3b9dc43dc94ed2ea63405da20df"; + sha512 = "7e57cd5e46f6100421bbfb411fc45e9d2e020f0ec79489983ada935f5f942b9acfcd691324627300e3d43f42967520cf0776a34555e924d9a02e7b50eee1baa5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/es-MX/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/es-MX/firefox-61.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "ad8baab24975aad8179e2352fd41ba6833d66bd4898c3cda4399952275ab64ba55733997a1d4d3d27e409a41771da224661bd771f07b0f628f7779a437fddb0b"; + sha512 = "da380a51b5576e8fe3c151fc1ac540bcd89b5707d249d9b243f1a131eeea5f1ff6cb6fad0529ff4c5081568cfc599dc55a8ad65ca0b703026c3668035360c1ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/et/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/et/firefox-61.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "ce6edb6e5995308f129683e66fe6ac8b13c8aa53de6b04e4890e462f046b1bc8c143553d6673464f8a06fddd4c8087ce150d2b3944b34042160ae1f88546130e"; + sha512 = "59bd6a5f13805ef3ccfb4d2cdbdd621396f92230ba42194e68204433810eb833237c1fcc9de15cd5ed24e603dbee507c9859752a757a5dfb297cf81d10cdb301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/eu/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/eu/firefox-61.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ab1909d7b4b98e45540c8020b098e83a368991fb29321fbb0529bdb2e7f5f3dd3f77f2959be0b337ea321a235cd5196f9b11eaf552f958bc11cb7ad5178f9c44"; + sha512 = "f8bb906499e04d07c928e54d87e8214e8722ded45da26e3405a8b142b0c741f4c8747bab56d569efb639cab2fd70b2abbaf9535540b21dd04aaed0ed6b54053f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/fa/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/fa/firefox-61.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "5f638eb2d1724d09a4aab1e2498dc4d9f0d4dcb5233a7b18f2d55b35a4177d6b24a8531d951384b220399fc4ff21a784dbb81f15e631d4842cf38a80038fe4bb"; + sha512 = "34ac128479b5a4954b9bf5b2e7fbb0e3ec2de1f6c406552b79451ebd91bae81c9cc2f0e54d49c95a2700e8a41030b8bb83b87026b95460363dd41fb749c85e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ff/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ff/firefox-61.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "cdf22582e20445050c345d52c9f5775c0a24bad1d58695ba17393aff540a1228d62edc0bbe7dbca92b2e5e973369b660154ba87c56864df06f327e989af6838c"; + sha512 = "555c84d4285c407b181a93253fcad60de4b81027587a5459324084fabc9d64f12aeba5cf351eb24b8b58b3af952968885b11c9149afcd4751998eba67658ed2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/fi/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/fi/firefox-61.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "81d32de0d3e685b0591609211a99d955d1621797126f67a8da0a97ea8592f10156bb734fb04b1f69e6463734cfa95a3203e8bfd9c872c769315069a37ae99fd5"; + sha512 = "4fbb79c547596aa161b1fd7a50720b33076339044441494fd0abf3558e6463415ebd3e95abaa45f719c2d285f56f1b765d0505df634333e0c2fd672dcbf999c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/fr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/fr/firefox-61.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "0fb48cb32013307a3c4b7d5b8c55ccfb7aac43461b59ac477972008548298d10e38716cc90ee8f7acd65f0b1e3338ebc4cabb5cd6deac7b10a48627fd3ea1040"; + sha512 = "64d436bc82d271cba04f66d827ca15aeec3073f6aaab78173f947ea0a07d199edaac33218b7238b4fc655b311b3009d104eba4fb52cca676d4c54d2ddcd1c90a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/fy-NL/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/fy-NL/firefox-61.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "a21caa506e164a3f94938d619474357ec1de4ed7cdd8b4c67ee19393145d505edee38bf1bdbd16e051fe38b93ee0bbfedf6c7d05d98b8cc9b3b7672d9b158f5e"; + sha512 = "9ef9fcee6cb1d043886d8ffba36e196e4f0c223c5f59002ff2f4ac01d01ad87132d2b07c7608a75907dd8d189c44ddfca236a505d7b9c152a03ba4b7400e8c7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ga-IE/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ga-IE/firefox-61.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "28691393cfd33fce28c50746b2c28b7774997fe081a99ccc72009145d0de8cf9d96ac51964ec0771cbe80084a28c793e8c0d82000b3d9d6cb49fddca68f669ee"; + sha512 = "ecd79f7b47d6bf21fbfec408f3d6460b3fc34347566c2d595ede4c17e775a4c0211db8f74cf8436222e23f08145ec58146a5ffeff22b579f9cd2eb771861bd0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/gd/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/gd/firefox-61.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2d9c360ef849818d9e7e971cd091fa02ba594b287a7d8ba15dc08868577bc64bcc8ce9d74be4e0f3a8114aef8e7beff4d4382ffb2df8958512f87dc5de9d1ebb"; + sha512 = "6396eb98645e81684a588e9c34e29687571bdfba34bffc162268b3664d69d523c7fe7b69d35b47d0c86aa869350be27dc6085b727df58f7b570a9fa529103f0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/gl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/gl/firefox-61.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5de56badcbd8f57fe3ae322445bb48684b684d1d714aa5a6225ae512677f10ff91146d1b3a947f31c49247fa47563b14497cef956d4a0cc852f7753d7ea71a39"; + sha512 = "5caa6d474245da2eabb8799503faad658b1a130a95b11fedd1f54c3cf7b6d9999ba1d803524650c59465a786a2fb1e216a0ee98547779def53ed89aad2da01fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/gn/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/gn/firefox-61.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d7221acd23f9371c6e802af6f8ac4c90933b58a24183247274251aaed5bd6dfe393205c07618b59b765c2988762978522bb03178fc7868eaf9eb0cb34b6456fb"; + sha512 = "445cbd58627db87fe0dc2fce58aced67f89ed3edc4aa93ed35e060a9ce3b7ae82d22fa2ebcbb79835771344debca460c7ec7079e43e7e998f4c895daf1f3935c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/gu-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/gu-IN/firefox-61.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "79c9501dc94fd32642862a5dff4c8bacbb450b29bc85ce6f072e65ec369ce43714aecb1f847b24335970fb0b9c9d27646b353c2bcdfe2a537df3b461c79c2d53"; + sha512 = "44883c3740ab0ab410d69478209b47e1c03191ee877df05d43647ffa8c5475b7ddf6a34892f6f029b336d7c4ac32a9423b3f88bd5375654a334d3d535759bd79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/he/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/he/firefox-61.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6dd09c5cd1767726cc4112e499163d868f472fd93902d3d0079ed5e82598c94242944bc9451f5c6c8bce0d5c338870300052e10595c7c1614c1f239ef9f8d419"; + sha512 = "cfe2db71c2a042ea48c4901d61d2aa1b2d14609a3faefe803aede20eaf47339c64fca90234d3f13a888430a049f65c55a20b8fbd19d6581183a82e3f91b5c1a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/hi-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/hi-IN/firefox-61.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "0ca10d1d30ffeb595dc8182fe29b26c554b9daf8d24ee294fa9a08cd326c1dbdb3c90a12b10aefb973da9f44e9056ab49b25fec11eaa81ffb6639c71be50b16c"; + sha512 = "31f04c96b1cb36b6ce37135aec21ddf412ec952743f387a0ef6e7b5e3392aa81983dfc67123648b234bb90fd3934e056868b494b85e8281c98051c899c5667e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/hr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/hr/firefox-61.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "3ec45a85761e7c6b0805d0ea8769ab2a6793214a910cb808ee5ef0f7024ad7820607c0d2daa005628318abed609c445fc795b876a8d9bd2ea6cc15e386220805"; + sha512 = "e4f638e7d59ec7a4e6200c055c0a5361e46fc42abe586a4c3888dcb2bab5cc6b69f72feebd2e0660401b17cf3ae83c80216e91b5d81b39b35da04f8d4c03f105"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/hsb/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/hsb/firefox-61.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "25594b1b0f7db9650f8f14174b686bf753a52f9a0f8065ed57d180bfc77d3bff3cc5d5d6ca80ed68544302e7ba57c46decdb375bca0231f7ada63796bb1c076b"; + sha512 = "fdfeda959afac64305c1303d4e1dc978698beba6430e9393be06d1fa245eedf15a2e6f90a25413f056f2465720793196f09223ea120ca297ab96da0cd857f93a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/hu/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/hu/firefox-61.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "c1e28b2ffd1141cfe9f10dea4067afd7785f3b5ac2a0ce0f0cfc53aa6d202f829365c14815d97d65c77b4e22d0caa358c541f9ae8c36764087a3a7db22d03a4a"; + sha512 = "b7706bd5727beaa73b4b4198f810aac05ce66ebdf00246616c7a8530e6ec33efeea643d3053787501016d0aa1833317381f6c378e6deaf72833dfab450f78472"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/hy-AM/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/hy-AM/firefox-61.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "70bfe9318fc3bc993f8ec8949db3bc1b58a20c8f6850da35a2c99076b5770c4edf54f8e527337558dc8f01a3c9725c6c2706159f570a9968f26bf2eb9b5d8318"; + sha512 = "1e3c07231bce9ee33f1341e9687607499f12af11e3145446f0955cec8d4b64186826fb53a34d9d0177b7112d748a1faefb30020e010c6a25e00d43e96e5b6607"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ia/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ia/firefox-61.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3e7b3920911f48fb0a81921a41dd7c62b0c65b94e5b21e4c5e6df96d0061d328649459183abd0d4c927764b86797ae64d65020d7f2db620007d7e16e235771bb"; + sha512 = "fe0e909ec0f9a62b907fa09ddf26e3cfeefbe5c666b94b96f6d9c355e8e343bd067a3d2c731567a09d3225618ee661c03969e97aa47fe0cf83b5811de0b562fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/id/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/id/firefox-61.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ccf32223bdf491481688a38e1532c42885525db9a727722f6a0a203dccfc3d3e77a010a1d5d34dbf30d2c30f74aef894268d4945b7a12293b79447b542477e16"; + sha512 = "b2a48287863a6e4d21e33d1c5a55fc3ebdcb999bf6ba10a1316f452cbec2d8e19b09a53dda9421fde294816d6eafd8c51201088672dda28e3552e9b16aa9ac66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/is/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/is/firefox-61.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "15579492f3b431b6871cecef270888273b9bb54eb59975379fc2d9af1310b26dbf0fd198bd0a83e2e3df068a908828f0c9e35d27a53c3a91b946140d8b43b63a"; + sha512 = "a10ea717a13380b248ace95ceb70e9204b163da87edacc944e349028899387cc627485af2ed3f755d2b01458cdb0935dc98f61ef523f6949579ff9b425f8711f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/it/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/it/firefox-61.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "a9cfd0c8d01a068a83ae1c5b8068aa88dfbeffe343cf6ffb80ac4a5ebd70304fb4123303f16f57dff3988abd558f182aa67185283c49e7e281d4da13862a4bd0"; + sha512 = "fa2e38fe6b52b5e86430ab2aee2e060c2055711897946c43b9b4bf59cdb1b35c8e44a0bdaf6015a6ed77511cf20eead5a84d474d54881c6a1750a87d485acefe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ja/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ja/firefox-61.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "6869eb392e8121c97142179073d2b119d8bfb3a596a143b0657ad8c4f93f766e08c1f4f248b5e501eb7ca071eb32ff49ac1450d7ac81e106c6529bf56d531e91"; + sha512 = "2bf34410b84ae51f203753433c4897807940b08dd8c3a9318255055e948ac63dab63573acb2564a71de965a30d7fd652b5812afe9f1f2f59a2f20c0b8e233d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ka/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ka/firefox-61.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f364df168243ddbb311b109ede41fb62b047d1048b16211155183fe0b3f1921d2b069e6194e0734fc0f24835831ecefd4986634d3c11e4da362ecab10f63114a"; + sha512 = "598f36e8030e97354d196eb55e475977b71097b320d320595e3b2eda4f08760da5b517d4caa96df6971ca0dbcbff7e2565fe1b9f431d30dea37641fc3064106c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/kab/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/kab/firefox-61.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "866ea971d180d0f2b9dca2bae7c8a83f9f1e455ab28f05b47d4586c3cc4d5476a8fd83409cdc3b609b2377b2d98d23ec1345dee4c560125c69338986a95897f0"; + sha512 = "43c56e804aaab89e12b357f04fc6f41e5346f8759e2d541c0381c4a54f978e4175827148f756ab71d72e03b4d0218e55ede6c0b8c6a315a7b8482f0dacd68575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/kk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/kk/firefox-61.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "9e846ef6bdfbdb4b28ca4cbf0134441642a18f017a8fc517c20079558c0d114bd91978e48d087c591e748ccfca8aafa7d0c4e636e668c94bdb30e88521800ae7"; + sha512 = "5eed91145d14a0294199419f8e1fcaaaabb111d24ac83ef8813425565be50a27211c012311925e521e46a5e4ae65048bb9362786437232d9a34dbf758dc97232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/km/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/km/firefox-61.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "ca93997adbce2a9668e4330a26769e01d683b6a41c43dd987d296d824785fb5346c16405506dd026ee00563029d9a48417aa160f9acb8c72e941c5aca33aa487"; + sha512 = "9e62e485fbd255e2c7020fd86297350f6118111e44b01430377b685040e966e019035ddc848013c20c7b0dfe7650fdec8837d3315723d85a631476049297c435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/kn/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/kn/firefox-61.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "591edfcd032e824266fb0424be8a78bd28c70f54db3ba80e33dc1f457e478c42ac8c0f3567ce8a0555e26300e00a34bc74799151fa0b7db75ca1c663a9d42663"; + sha512 = "a9f743f7dea565a2db242119cfb949adb15d4d15c255286cf233b017b6a07ac6392fffabb14036891d95561d889a69ef6653246ff9db786eacbc388485f662ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ko/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ko/firefox-61.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "bfa982f8c26ce1e250d161a4b551af9a9caf24a9161369e98ee5008e00caa593b75375672b5e6a20c3e53dade495b19760464946307985548faa23849adc3231"; + sha512 = "cec6994457dae483feb64988472b8350e879b6b4a779c90aabd995b45c80a7c94907f626e8129718341ea8bbed6d0d2944a7a5a0e13ec761c2f7546b17df7af1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/lij/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/lij/firefox-61.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9bcd9838cb300fe9d9022506ba33a69fcbb56faab21aab9772b203d93cf5e675cdd243b3359971ee9bf4b005144af46429a87e14024486d34d4c40d93b9d1f90"; + sha512 = "25121a21334bb480863e05a9077819461e2838b3fd27037a898a84edb23301f763cf8f63366bd74028d762ff113c1e07d979f5b2264cb1dcb09838d8189fd010"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/lt/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/lt/firefox-61.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "bb29197b64fb02099e78e3e1a4ebafbffb6c3f5e8993abbe955988388cfdd1a9b2aaf85380c01e27e73d4ac304ed983186b961c30dff3742562e0bf16b5d3782"; + sha512 = "fd7054de958d020db5a4b1544a9a1b10bd9a8967fd46a33a7dfa83558d427f74d0d7ae583b9e6fe955fbddbeac0caf392e2d64d4f0b73604e25a98355c18bcfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/lv/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/lv/firefox-61.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "8abadf90fe91dc5b28a883b06f7baa672479a3068b0113c6852ca6bce73c7df93857d0499481717cf3ca67ce42c8386797c6f119da1e9f7922e1bd51010edd98"; + sha512 = "5e05821560b53fb398ac2bbdc40f917782e0df144662d938043cf07224ebea326c3cf9777178caa18b9f4a25419f773cefecef2285cbd86c05ad07025005dc4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/mai/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/mai/firefox-61.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "11221d95a3295d260d98308b7107fecb5cff9d2a183d47834eaaef54cd0798f792ffb266d3c5bd6b636a9d4010713239222053027edc3c667aa6a66c687d7b9f"; + sha512 = "eaf5ee6af04a945192081dea1cb7ae6dee5edae8ae6970196e2ed5c2defd5a0c78da90996f9a02e0d6f32911135153191c61aa3b8366cc4e859f6aacf31f333a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/mk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/mk/firefox-61.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "c22a6866443a6414690e822991551fd5b6324bb8f46e79f10dcca7ff782ac78e620c4010d0ce9f58d622b84ceffeba39304cdc6fbfadd4587602bd7ffff07cae"; + sha512 = "07e87f94b52a8a025035a821a07d2df40ba13b5cd8fbaf819876a25726e7f9f760eb7b12434df55de7669b65d1d8c14ab9d92112a4136d60b6607fc003dcea30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ml/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ml/firefox-61.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "c8c1b1d59e086a72604a1c0e29e3e461400d30df32c1ea25a9ab93b4399ee81171c6d69909d81aaae7ecf035e97fed9c01f0f70076472b1a575d73bf0549c095"; + sha512 = "2656b70d128ba1c1ce447988bd413a624ce77f95b0eae29b5396efe2ce3f28409271a3f1b7680eb4216b5007cd59d6a3daff4aae7ef2a318afb9ce4281ed2e51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/mr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/mr/firefox-61.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "c5c27cf8ca4d17787d8a04d3d8717be10f6e9dc34c3a21e8735964feca4a1691a0121969cb2cac390a26c7c0b2d2f92ee30178cb2ab8e78a680d0538ce2bfff7"; + sha512 = "6ecfd0bf6efcbc9f58ea8e90b1e32199abd63033fbf588a0017e699133813d9c4b8acd33c52e287c554e0e503adef52e5ded7e20a5f0cb15b63518b765367731"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ms/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ms/firefox-61.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "32ab67c932acf0b590208073ff979cfe106bd145dfb8587bdd1a05346f72d3bb1145d89ec15c896c5b778af1de347408b78ca2db7aa97874f09e4d9df380cf77"; + sha512 = "85c696e7f2cd2df1805a0277e660338b0b05ae46646541322db306bf62d9707c7f3435714cb5a489a06f5c026b75d6c585900e680f5ca7598b48d5ddfe3063c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/my/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/my/firefox-61.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "464b6c86338813edad14e475e98d4c949d4ace87466993095fde6555c17d518e3a29e933912ab46170336803d21739dd606d29e33ffd4935c8442f8e2ce805ca"; + sha512 = "35f627848e9bbd54f644ac823480d454e3728849d408a9b8a594af768d44d6014d3b8b68ed93106674fa8ac7c6f106a36df4128fbf3b5f959d10f5440cd34575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/nb-NO/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/nb-NO/firefox-61.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "67161cfeb83ecad1711c3debff0bda66a6dff009b41f3f54553db7fe1b7300f938db6943bab64a8cca1da43f1802da6744969fc2f69132039e76bfedc8121850"; + sha512 = "d61ffe332b396f639155694d1eb88bf467dbfae2f2ba776aade52c983ea0226371f3555cd5d4c63becb499e5c7e48dae9a864d00d17951a6caab0c65462759dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ne-NP/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ne-NP/firefox-61.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "402aadebb20816fc03418a2be1c48b2e4deac3405b0ad12e9c59ddeeaf9c2fc7140d904bd88670ffc7fbf736ed00b762f963a5c640f42fe1fb7333c51928dcea"; + sha512 = "93287f46f6f0c2ddf1385197b36246f41af757c5857e27a8d7a1efdb7dd15d4b6a139c24aefd52aea2c7593175e512466887caf9388990046683a1976e017856"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/nl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/nl/firefox-61.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "54bb6529777cfc9767120ccbf1ce9664184a86b4701fb101a8e3de6fa3dba3bd8b72459f703ae40fd4d4bd10e031d98d1e15f9e35c05bf60af4434b41e9545d8"; + sha512 = "69f1ed3ede79de978e2b2c73482105dbff59963587ca12e56a832f652888f4527b4cbdd1ced9c85f128fcef3efb5c345875796e8ae8324520f9ac3411767ff5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/nn-NO/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/nn-NO/firefox-61.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "a5dd42fade8f41331c3ad9c2bcc32285da8395f0d3e86f503fcb260b37d1e626971aa34652e0b560b80efbaef18c40a735ba4bdecf1d5ad949c9d18661023daf"; + sha512 = "c8db50dbf58b1384a7a826664046f3338b013bc7456d597f99c04ec8b2664e624ec8a0e1c7fb99eb905e7068d69cbff3cb34713c17b25a4b8dd5de0f66fc194d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/oc/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/oc/firefox-61.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "46ab7215df1645d03a690011762be1a476b04a1f4f5d3e547f2f4d48c6f64ba38444b83be943b8f8fef62f84dbcd98115c36980150cbf83d86225226040cb5b7"; + sha512 = "7562a6df9db11cac7a69042b2b22bb770ccf61d4796c0c47892bb66ef41bf04c48ea87afa2cc4e5210ebf0ad1383a8c901d487434b50ab6f6177b7b561921983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/or/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/or/firefox-61.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "91ca8c4b451a2d6bd75dfc5b530e7ccb790bc91c3d04f0da6993fa16ff5c8a5f8b8a74f7876b08131df44221f024aa08d58b4579f67e8d12e0d5be20883fbc06"; + sha512 = "58021fadbf4732639fde5f9503dbf93fc60052bd0de5a9d49a8831afa3b67518ed6c50d1508778f9f5297b3c0587081ba4c2c88dd74c6004fce85a48d7b13eb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/pa-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/pa-IN/firefox-61.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "f85da93963692bff4f17edd06246bd3ede76c7f66086966e90765b349e98f82ed1f658cad95ce1248fa9bc729b9b8b7df86bdc048ef0eee3fd273681b6f40e62"; + sha512 = "4a37afef80ccb50c20191b6a780e435df21453886abde2a0895159b3e54a3b415741167b5afb6842cea629bfd28139fecd2e6fcdbd711038719b1fcf9692fa9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/pl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/pl/firefox-61.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "00515cef6d86aea1c4c4c431928b0eaace34896c737f9e806a0f6afd6d5dc710fe021da689ed9db6032aea67d6a7221dc4d7e77050cf8a43981b685fbefe36f4"; + sha512 = "115c886f16e2b179bba110e4b21fdc0822d78441d0a481d402d8eee3aa6735756d18b24c036dbe3ff7535f796903bd1fb063db4bf7fe9c92dcd7292474f9a339"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/pt-BR/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/pt-BR/firefox-61.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "21c7a2dab5140350d1bbc152283570f8e00f917c282ee90a9ada6b9f5f8019ef7771b32b147d96aed297b621279b2cff3cb521fc53dce28797defe8f1ef3fe1b"; + sha512 = "2ceaf9a65ee7ed871869fa9cb8a979ec63a3bfc7da0689b8ac72422d5e0947787e8f65299d6d343514c620e6dd30d7762e08705827c9a411f2273dbb4a1f4c2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/pt-PT/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/pt-PT/firefox-61.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "db33d53d2917b7a04756cdf70770dfcaa6b8b6e9f427e8a68e977871c7b1735a837668310eac9ad1d7e9c4f53e906a4d4b36b3d87368ebc793e092295cb11721"; + sha512 = "76dd6725a86e89a58aebd8238160ca61017ec8b350538d9952eb6be88d0fa75dbe5de4795a98a6a51739f24734701d4cb82d7a55f46dc12e0b8ad6895ed0fe10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/rm/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/rm/firefox-61.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "a22582c2eb28b85c3607bd71c69611d710679fce2889b98c5a56b1bf3f086edd9d7f063b87cc1b7cd4467331e2e8ba38bf003af80d98fc0a2fc828c3b253d01e"; + sha512 = "fd4293256397e979f67b7592fd64e2c568f9d543cd934d3140218802ee681894513729a536f197b5991b859e3c054917393a09bb746f1fcef51072008bf65112"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ro/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ro/firefox-61.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "116e904c566c0b744876262545c9ef300bf48a70ec39378aeb961229aa13e37a1c78d68b39bf3c138090101e75ad793c83f428a14dab0f3c186718d3f5f2a883"; + sha512 = "39fc8a9188c3aa2d28376c544ecb5c902a63faa385e426816ffd9186c3329b4a544d541e4115a1d04f6596cceea8dfd910f797dd4c826ce9d9dc070bac8bc027"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ru/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ru/firefox-61.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "54c9561ef96fb69d8dd7b067e51fafab2d15e186c71192689f161b7370e2816cc42894fdf4f16829725cbe79e3456c3159f0c8cd9524c6c3c1c3d0f98dae9191"; + sha512 = "65f4214495fda917b5f3530d7e675d932f444fdf78c2f5f6e5888277c66915ef32bf612cb05b2afec20b69f089e536e394568d1834638cb1a468cfed74da7c46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/si/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/si/firefox-61.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ffdc8cd3e78b002ebfea0d77508a785a183a2aee8dc82390d68b12e4d43bba8104b9b31d355758c8d729da4b5b9ff095995da11409fae799b4648e85e1cc2fb7"; + sha512 = "512d86b68cc323035a941ba884f7586693c72b70d5bbd62da1d64bb7e9696bf7ae3bc15800c7e7e8ff20cfefb3276c7b322c7c1ccc535b43803a6238c597e19a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/sk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/sk/firefox-61.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "e4701fde9df51ae565a9a2383a8e16f723aa804f1f2b0195f055556f733004b1e86978c43398e2673658306dc3fe60c03e360f62a7da5a368f15f5d587724308"; + sha512 = "82d379c83d37f3bb826cfabeb0a4419d184b51fec59642c8851b3535ede97dfa81326330b78aa62b8a6c45e2b201bdce542086f811bbcb98b26bdbe592d01633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/sl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/sl/firefox-61.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e41b1d96ae7587f5290337b4334367473cb43ff6aa5930e64cb1d10214c53e75dc3cd108a82125b2faa0f6de4df2e694ba53c94738cebfdc88cf75081ca9b24c"; + sha512 = "5d51e8fbfa4022e21cd78c0249e38909bd7d9d1d9cada358198ba76868035e357eea8470b9b914ea32f5d041be1b049e2004f158f31c48d9c442c397383f77a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/son/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/son/firefox-61.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "68bb8f49c522dded8735a6f8441a872f12463250e5c0e4630168717dce47fee9e4700afc5e8a31cb2f03173eb0298162edf6feb6cd2be77a2b4de4f2d796bd52"; + sha512 = "719b6d8295d4af45313a37113abd347da4b4bfbf6ca8487c6cbbc62c4e903e63f40aff66d3976d1606a14283c6c5bed389f01e10e3469dba3d9961b9ad316e55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/sq/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/sq/firefox-61.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ddf584e9ecda9fe2ef5628c659dfc7033422fbce93c89efdca5628eadd45ebf505cbdb3e75bb915624347bc29dfa0a463d1a219ecdb7d4e6fe2c77c2d6d8138c"; + sha512 = "2472eaefba5e51daa530420190dbcc2dac6e0339f8581011dd6885228f7069756ab280437bd803abb010f071dffebc4b48c5e9686fcc452b7a8040b9dd5093ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/sr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/sr/firefox-61.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "e5c99851e05b27217afc50a5bdbaac42f873292b9b1a84e3e8513d680f00154b701a70e0478884158b04786829c7f818bc35e4016dc5125875f0a1abdb46322a"; + sha512 = "356bd43b3971cbb151b7cba8b481830e101cb6627900bde5598a942583ca1f5b5b1c13286710b5525b17fb01252e069e6786067f68a0f009e3396efe683e2cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/sv-SE/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/sv-SE/firefox-61.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "464ace4c70f5e49afce830e045cb178f0aaec18dd89b77a67c68afcd7f45cd28c7b957a11cda861b322839c2ff89186ff1c1a72318c26c3f37ac24245ec6fe40"; + sha512 = "f4eaddf14567f1e5a783e8ba7c4898603ded65734bf733c51e5105fae94df567bb4fbb600e103192362fac36e64fc6970cc711b87bd806318ab7926af05c93cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ta/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ta/firefox-61.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "a7d7fa0c8209843ebb828885cef9307a1789ceb4db0658cfd4cb6e56d076a35d49616780961930b6b1db3673bf2911fec895f51dff273174ae639cf4d1fe66e5"; + sha512 = "7325970571cacfb11cd71d8944399c7b2d56ca5303126442ab8f6477c9cfa808eca7a3573ae11f3ff6993b0e071c5ebc315eb898986a11d53fe1e1508542d906"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/te/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/te/firefox-61.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "db0c7ff33692523ddd9b220d0de9f99e8482bf4461f6b4b49fe541b7678655dea28d578ad1099b748751203bf5acdc9437c84094338fc8cdc1a5fdb97a629918"; + sha512 = "a74bd52ddeb2ecd403a5d415f80cf3b456b71c4fffaa86f72911ad40afe13d9e4a9a723b3f8bbd99e542ea0fd3e5d1e85a5575a74357c4f9b7beca509fc76da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/th/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/th/firefox-61.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "56261fea968b32fb84a1ffeffb25e6cece838087ec0f9a3764b87a2d307ab8fb23f269faff67a4586c85182ba171c1810d8a070d6ee74d348d855cca8845ac0d"; + sha512 = "6764c0967665bead96ec5d887ad41a8c3e846d39fbff9d49cae6655066e992826adbd20770842a649b360675e2614015275490567aa328b98c63f593281d1899"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/tr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/tr/firefox-61.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "eacc87cadf7f6b75caa70740e90be2ba31cfd52c2e328bc4e9e7a5b8cf489a441573ba8294519fa81443418d2fa6150e7912c1115c26748654f58a0a368fa2c7"; + sha512 = "11bd142d434008755d047b851014b71d237a1b031e2df99e2c4d9c92b9e126fd268c73f88b94107fcdedbddfa1ec79a05f33f3e05ba7a939e51a9f2275557b56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/uk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/uk/firefox-61.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "be21d5d297ca1f1dc8e26ad01c92671a3b9c059448288b887eff025f2d3f2bf8d286bd9414d23abe3ca77809d001aeb2a415432807b1f2d47315335d23e31239"; + sha512 = "4cd391146d3d28a4fb1a44b2c0a12126e1f0211024a93868b87d53a1f2595b781c41bef5ba83784f6b0c23f3549f7e3c2d7c6763f96719000277af0071b6c04e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ur/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ur/firefox-61.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "5511ef18b96bbbff93bf18c9cbeb2bcc502a2f07e35a32927827d4fced3695672975b4f776f76e5c5c1a4aa657c6732bc25bb720e3dede1268a91c8a733297cd"; + sha512 = "afe67297a149755388a9889addfbf52b0a65c738b02d629c143588bade9944bfde503d3a5e08c44e4de8dd5ee7b42750041603f1f27fdfef037adfd9c6af0c38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/uz/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/uz/firefox-61.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "88292030b13663e8cdd34d4164de670842468e697de38ca7183405f762c1d042353aaf3b0c2a7e05c2fb00694ddae426131c7d997659cacddb9a488f828eebec"; + sha512 = "193e93702158822127c4cd5baa648d66eabbfc67bd02231c2261e5d0ae2db416576f3ddbac1f395eb880feb07f04360e340d1372fe71d4c3793109017e6c186d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/vi/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/vi/firefox-61.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "ec40fe4059a9a6b68a62d805cf991cbe68bc4a11bc8a391828fad86ba99f6b0ae49ae4d570dc60101ee269be47c9a31b25c525f3b865582b9b8e368bcb9408d8"; + sha512 = "dadc73668a7a810f60d4bc829f7b27a3061a289a0ff9c8692e1626f1d4afac61405ac828132b9cf9318149c342986dada06f9e7dfdcbf84e8408dc2db42c93b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/xh/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xh/firefox-61.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "22b5e517485f0f84f8d4bda8157d55f52e18a5e59a0f054b061eb3a9cd61389dccc9d90c65f973bd451c82a9119ff4c0337f38f69db4889e88707f3c9c7216cc"; + sha512 = "7b9c7f218dd31fe680b52d3ebd6740b7473be69a770266bedf663fce8831b270584878037bdccef6b6f536ff35f5eda6c28310966b49c77dd8ce59c02b25031b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/zh-CN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/zh-CN/firefox-61.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "6bf2308be0c3c701cbaa19f31ad2ba2c574e3c27eddd5cfee1cf42db267db21d0b1ffcd9d87ac7d430a800581d60c09d98b121359c01b4a31b1354d348ad8905"; + sha512 = "38ce127e44eaf06ecb83e9e8a8c8d5df6ce2add352ab37a70105a91e43cec7e2ed027945313ffc35e9d2704341e452fac060469421b15d692a52553d972d64c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/zh-TW/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/zh-TW/firefox-61.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "9e7eca205c77c73dea4ff79cdff1f7ce8a83f87453fd1b421dc8bb684693569c602a74995cf2fd2c6a98f5f920642b395312b5c3a1eba49b9b5aa170c21c9f2e"; + sha512 = "a324d24f47a6d256474b85a4d11a200e877432b0f2bc423d464e5ff0fb7ddf93ade5c3314c64b58973523debead663ddb202d7b86171594f5f5ebe0bd36b057a"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 9a3da430714..0531ec8d94e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,13 +1,14 @@ { pname, version, updateScript ? null -, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? [], overrides ? {}, meta +, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? [] +, overrides ? {}, extraNativeBuildInputs ? [], meta , isTorBrowserLike ? false }: -{ lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL +{ lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx -, cairo, icu, libpng, jemalloc +, cairo, icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages , debugBuild ? false @@ -80,22 +81,22 @@ stdenv.mkDerivation (rec { nspr libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx /* cairo */ - icu libpng jemalloc + libevent libstartup_notification libvpx /* cairo */ + icu libpng jemalloc glib ] ++ lib.optionals (!isTorBrowserLike) [ nss ] - + ++ lib.optional (lib.versionOlder version "61") hunspell ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ] ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport kerberos; - NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = - [ autoconf213 which gnused pkgconfig perl python cargo rustc ] - ++ lib.optional gtk3Support wrapGAppsHook; + [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] + ++ lib.optional gtk3Support wrapGAppsHook ++ extraNativeBuildInputs; preConfigure = '' # remove distributed configuration files @@ -113,7 +114,7 @@ stdenv.mkDerivation (rec { cxxLib=$( echo -n ${gcc}/include/c++/* ) archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) - test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml + test -f layout/style/ServoBindings.toml && sed -i -e '/"-DRUST_BINDGEN"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml '' + lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, @@ -134,7 +135,6 @@ stdenv.mkDerivation (rec { "--with-system-png" # needs APNG support "--with-system-icu" "--enable-system-ffi" - "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" #"--enable-system-cairo" @@ -148,6 +148,7 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}" ] + ++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell" ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ # on i686-linux: --with-libclang-path is not available in this configuration "--with-libclang-path=${llvmPackages.libclang}/lib" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4e7d35f105c..f49bfa96318 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }: +{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch, python3 }: let @@ -6,10 +6,6 @@ let nixpkgsPatches = [ ./env_var_for_system_dir.patch - - # this one is actually an omnipresent bug - # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 - ./fix-pa-context-connect-retval.patch ]; firefox60_aarch64_skia_patch = fetchpatch { @@ -24,15 +20,17 @@ rec { firefox = common rec { pname = "firefox"; - version = "60.0.2"; + version = "61.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2my4v8al3swwbiqcp3a5y89imly6apc2p9q0cbkhbiz0sqylc0l02jh0qp95migmik56m4prwqdi81kgqs7cw5r2np3mm6sc1b45mkg"; + sha512 = "0ww2j5gxr7h142lfi0xvckvd7vmnha72j8c0wyyqmmp1rr341f10vfd0hvawiagik4ih6dz8h5pmkl67zdnwqc3z75vwnci20ajlg2s"; }; patches = nixpkgsPatches ++ [ ./no-buildconfig.patch - ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch; + ]; + + extraNativeBuildInputs = [ python3 ]; meta = { description = "A web browser built from Firefox source tree"; @@ -47,13 +45,17 @@ rec { firefox-esr-52 = common rec { pname = "firefox-esr"; - version = "52.8.1esr"; + version = "52.9.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "a4883550fdf62e66b10f1de7416d3614a2cb0ce3a004d9a79ecc37a726794d7bbdb0a6767faab4ea97278d2192462597551fc13b7e9a9c38d043c2879d51095a"; + sha512 = "bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9"; }; - patches = nixpkgsPatches; + patches = nixpkgsPatches ++ [ + # this one is actually an omnipresent bug + # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 + ./fix-pa-context-connect-retval.patch + ]; meta = firefox.meta // { description = "A web browser built from Firefox Extended Support Release source tree"; @@ -66,14 +68,18 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - version = "60.0.2esr"; + version = "60.1.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "0vbilh4iwqfzkj598zbgkmwbkxh4bia8gn7p9x6xd7yvhb6708p4dfkkbg61hdh3bddyaxx1zd0wi8qxfxbrx19mc6k9dpc6xz52iy1"; + sha512 = "2bg7zvkpy1x2ryiazvk4nn5m94v0addbhrcrlcf9djnqjf14rp5q50lbiymhxxz0988vgpicsvizifb8gb3hi7b8g17rdw6438ddhh6"; }; patches = nixpkgsPatches ++ [ ./no-buildconfig.patch + + # this one is actually an omnipresent bug + # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 + ./fix-pa-context-connect-retval.patch ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch; meta = firefox.meta // { diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 31081d69a27..5387272a2f0 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.36.4"; + version = "3.38"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_36_4_RTM/src/${name}.tar.gz"; - sha256 = "0si4g5bnhzkxy2f7rnaw86jfdzni5gvc7svxcf7ms8n97nrrdpik"; + url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz"; + sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c"; }; buildInputs = [ perl zlib sqlite ] diff --git a/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch b/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch index 5a1c6746e60..af7dc0db7e5 100644 --- a/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch +++ b/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch @@ -2,21 +2,10 @@ diff --git a/lib/CatalystX/Script/Server/Starman.pm b/lib/CatalystX/Script/Serve index 670bd74..7b3bd2e 100644 --- a/lib/CatalystX/Script/Server/Starman.pm +++ b/lib/CatalystX/Script/Server/Starman.pm -@@ -9,7 +9,7 @@ our $VERSION = '0.02'; +@@ -9,5 +9,5 @@ our $VERSION = '0.02'; extends 'Catalyst::Script::Server'; -has '+fork' => ( default => 1, init_arg => undef ); +has '+fork' => ( default => 1 ); - has [qw/ keepalive restart restart_delay restart_regex restart_directory/] => ( init_arg => undef, is => 'ro' ); - -@@ -70,7 +70,7 @@ CatalystX::Script::Server::Starman - Replace the development server with Starman - - -d --debug force debug mode - -f --fork handle each request in a new process -- (defaults to false) -+ (defaults to true) - -? --help display this help and exits - -h --host host (defaults to all) - -p --port port (defaults to 3000) diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix index 9efcbbfa7d3..4e6c0f9214c 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 8af07ece687..5e108cd7dcf 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 049c020c5ab..55b059cd7fa 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 cd9d8ee46d8..72086a3487f 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 0bacd8edb31..4f0a7d4aebc 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 f9ce1fa026f..a666cad1fc6 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 61964eb7b06..29a792000e9 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 8ab846986f0..d05bd081e0d 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 41b92683b07..ac19a7e7063 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 8c70a0eb7e9..30c820ec6c1 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 bc0472bc005..0c4197f3b3d 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 7f0831eb7b0..be5ad2a5c1c 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 120d17e6709..0ee617a1be6 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 9558febec73..759ed2086fc 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 ccf56c208f2..cd81a7facc2 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 9d7b1148146..114414e9c34 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 36d49ad29af..2172aa1165a 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 432158744be..2f4c020eb97 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 63db18e844e..5962b309ee5 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 11409a11778..ea3f26cd315 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 b39df3959fa..24287039abd 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 34de9ea06e9..9d89433f1b9 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 8e480d4a3df..57a34268df8 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 2dc86a2bfc3..e1130ccd693 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 37d75fd45c0..50e70d87f9f 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 d0808a1cc31..572c18171d1 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 5f30529bb81..a2a35f852a3 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 503ce5da4b5..3fcf0973e7a 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 1f539ef6d39..37f1e395d8d 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 df8fae2a8d8..b8ee673e66b 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 26b182dfc08..5960e7b4133 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 84f2859d50c..8f46a6f0b0f 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 f2e07eba0c4..213bc4f1eb9 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 866c91f7c68..8716f007b87 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 1f0b95d8785..808ddc57096 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 b13470b4c45..28b88d3b46a 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 cf7dea6cca7..943f129031e 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 62b176fb59c..fd89457ed31 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 5f512fcd6f8..2b627fe80ff 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 9fb92b860a1..381a4a73314 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 7cdc56e2553..a7e7931d9d9 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 30d75f92dc5..d4c485e909c 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 ac26daa1374..30479ce8266 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 15950d38b53..808eba12bb6 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 90d57b6c89d..2af09869298 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 db7015f2f16..322f9c6d793 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 5a04b6afd67..c2dbb0e6fa8 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 e64f51fe7ca..2125390d671 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 6ad69b80b6d..8b818398ec9 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 2e85a1017b6..d14bf02cabf 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 99c3346a4fb..191f0342674 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 83bb1063195..ff4b7fcb531 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 72800d2f6c2..ca22fab575c 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 fd8bddee14b..6ae838265b1 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 722117ba6e8..a4a7b63b8a3 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 9226fa1c5bf..d9ddc842642 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 b012fd24aa0..dd85789c59e 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 f6c56646dcb..8e54e3bbde7 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 f09a271faad..270015a423b 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 b9364d51d14..784de33e7ad 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 b73bcfe8185..9d2485711d0 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 cd9c5729611..68b5abd906d 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 217a40bf7aa..fc8dc784d02 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 37e3fbea2cf..a76b7b2611b 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 cd419039f33..5a9bae58bd6 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 372f16bec74..c031c872da3 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -10,7 +10,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 8f900c7b09c..91b310a2179 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 7abbc6cdbb0..3bc9882585f 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 f527a777373..05f3afe758a 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 7f11e85752e..de15ffaabc6 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 c5d643da79d..9751dcd2f3e 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 cd643806c3a..72476942276 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 aa4e5e47e72..16166d2db80 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 017088d2e33..c2815d876e3 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 454a4f5f6ac..c63fe87dedc 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 c44989ab5b7..f004e6d541c 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 fd5b27d00e4..c54b962a8f6 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 3ae8537c6c0..74d64d8390c 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 91b289e2ede..c47a15d64bb 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 7c2147a6431..1ccb31d5120 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 c8ef038ec50..bcf67ab222d 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 50216c7ae1f..4766a1285ac 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 a056ba450a8..a3ef5bce4d8 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 8b85a0d94c5..4d2a168f79c 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 8d0e7a58e76..a6c294456fa 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 832089c99c2..885b31d716c 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 7326f2cf3b4..3d220535404 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 8ec7bb24a62..0d69edcf9ce 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 4e8da39662e..ab078c656e7 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 facdd00edac..3f310a49a37 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 a0724c9ada5..f207683d2b0 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 4f5d7a11bd8..853beaf34a1 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 1407dd3d204..996cd22e263 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 bf2808745ec..4fe8756c961 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 7907f1ffac0..062fb00e48b 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 839a70bdbf1..5473d85b576 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 f3d403d9f2c..37d5fec8591 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 ae56fd5f7e5..ce414a09806 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 db781af2a5d..e21e6270b91 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 a1968550afc..e49d8c6ff84 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 59103191285..d575c1b674b 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 9d1161fca3b..18fd685f3c2 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 5712ed4193f..be153feb2a7 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 b2d28229d94..e6cd5a3482f 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 c9589f86993..89147db63a8 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 b8b632e1a18..338af16b2e9 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 af7af221b9b..e2db26fe26b 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 2207aa348ab..b2ee7b6f644 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 1b54213e2af..7037f23b071 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 3bf5e064c40..19ef783fe75 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 5bc0dc379dc..e08c296e807 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 41b532ea184..831dbbc4a6c 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 1f8f9f17d3d..b8924b37bfd 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 7d73877b792..545eba8360a 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 77fc708a50b..35ac57062c7 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 1fbb4dbafe6..84d0404eb6d 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 d2f8361bc7d..4e256a38c86 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 3cbf6d2ce71..3a362029c1a 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 b6fcddd528f..6b048db90e3 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 81f406c9ef2..18372fc113a 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 d296e3ee9dd..aaea8175f72 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 177e697aab9..01224515d92 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 0548c5a1098..cf37c9de4e0 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 cb91014d6ef..307496cc65c 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 bb9bc62d940..88dc6b0fc75 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 43c318fc7c3..e45d651f324 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 d2de9f9f15b..ccc5c574689 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 fbe5c02771d..83b35dc8c89 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 12e0f6934d9..eb98cd18ef2 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 9cb09e8f720..b1026e8d446 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 cf03a02129d..a0a619a39c8 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 2afcb2b2de5..382dd508915 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 d7cce7b906b..2c3b7cc0552 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 6b1d2af357a..29c8184bd4e 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 60c92fe76fb..d776bfd62aa 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 231a52c9d7a..742fdb83b72 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 1f457235b6a..814cac3c9e6 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 7458ffc03d0..c5ac67106a2 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 d5ce8f8afc2..e20087e43ca 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 7ee4f77109b..642111680b3 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 62741a78709..35bf7cb90df 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 a657c25eed7..f999bab8932 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 0a006b77793..944c7f7e1fd 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 27d8f9c40c6..7f3b6367b6e 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 c46fce2fe75..b602fcfd494 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 2b66b0f85f4..e78fa2141b9 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 4181d964787..466bfb44121 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 cdc7cefff95..b95e694a232 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 e2585262e58..1a01666d799 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 99545a55ba3..a1732d3ccbf 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 6ac958d6435..c523d7b963c 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 71c4170d26c..f4fc3cf3fa2 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 cacb16cb7bb..2d34ce8583e 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 1f41f798763..cbdbd989211 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 ec7e65aa4e4..a57823a0987 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 a89f9979003..d5028bca56c 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 5f843138eae..04c083a3263 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 a0b623c6b6a..96828dcdce2 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 b7372fa9032..67cd9aa457e 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 d286459b137..550c4a71101 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 5c188dc5a9f..155f866412e 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 c368913caae..ba84d80dd0b 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 5186f7b25ea..3faa6d914d2 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 5dfd399ac7d..3a5fbe8433c 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 01827fc87f5..0a882693408 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 485c5b5ef07..67f2e0bb185 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 57567a203ea..7f2c7a58229 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 b1d19e9f509..bc855b5bc1c 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 3c85898ffbf..d95d0880adf 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 fa68994ace9..90395b3b2a9 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 65bec7d8b12..3bd3b3b2a32 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 d78eff0b47a..8afe6379dc7 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 08cd1943eff..015ad38d0c1 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 bb200139496..aa8c051aed3 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 212fd5c957d..d06cc89ff1f 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 27d4b8a15b8..9fa28126452 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 8df4b3813c4..538b75c3dd0 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 0e4ae14acd7..3bd61ec8afa 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 37f491a550f..bbd4760bdf8 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 6574de1be63..b7254461183 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 91e00a7a146..70c50c1f663 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 f70cc9d6945..149b07d63e3 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 a5d7b2b711e..a97a98b207a 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 d6ddadea9ca..82b5880f465 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 ff077bd1b01..a8e270bd1c0 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 5cf3c9e9db0..ee81c40febc 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 feccdff683e..47cb354a7fe 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 3f09975d66b..9d4392583be 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 4b3481d7528..665d08980dc 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 503ccb37d57..0f3504780c2 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 67d7d551522..e65de4ee3ad 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 f44bb7caf3d..fe6382f6fb6 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 4d9792ebbb8..21d098eb31b 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 9161f3f6f0b..6c04e6945de 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 7d652b2943a..9522d2099f8 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 1b61863d37a..65d1f4f6822 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 19b1eeefa53..bb3e8cf17f6 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 16be096f2ba..3a6d69cc829 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 ceb697adcaf..52fc3bd5e04 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 6209c2593a7..17a1102bda8 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 b331279042c..bd3b6b6f769 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 cd29d7b5d31..1d8eab79688 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 4b0444e40d4..6a350d59be6 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 b0bb887229e..26b52c41c23 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 403f7c047d5..c934d24dab7 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 bdd06b8b7ce..db0fda6584c 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 0863cd79f46..19169e88b12 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 9ea6840c4d2..540542da10e 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 04b9e923575..b07dd4abd0d 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 b4b6c48201b..2e8abf0da52 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 f2073a48c58..86e677a0337 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 f6b12cae001..98cc3a42074 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 dfd5d5dfde9..47eea033f6e 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 757a171d838..e606d84ede4 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 cf556a79003..4a937ac94f0 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 b27dbc2935a..aed76728d7e 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 06bc294a9d7..a8acb4dc969 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 a88a6097611..e5a03f78355 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 26dfda613f7..256cf107c86 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 16a39713672..e5b8fe6f34c 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 fa9067fa0fe..5c7c7e970c3 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 9ad9ddb433f..c9b9b489613 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 d9ce51eed1e..a52f194b8be 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 f64c309cc35..6d3b81488b9 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 8f7229a4c0f..aa26f21820b 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 9ec291439ce..823c8681873 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 b3c43836e42..4a96ce8ad05 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 766e419e514..5d52b52ac7f 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 49f25e96bdc..d27637874af 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 0e404f69caa..ccd0eb6cc9f 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 3f7218a276d..8569d9287ac 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 d3273303691..7bd14f2d10c 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 ca489929d3a..1d1be733f99 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 0e24ab09de6..1515c050a3f 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 45fba9761e5..a6561d3e07a 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 80b13d94a2d..c1e53443260 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 0ff0461c558..c94acdd3ba5 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 5e5144e2540..e9f6177cfa1 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 ad2be9b1923..d1c799c95de 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 729f110858c..c9eb12bd52b 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 2b576cd3b05..f49b2630b6c 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 c0734098797..f7efeb72592 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 fa218d821cf..242244726e5 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 46f85b654c7..794124ef3bf 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 d0b01f94b45..34ec95b866f 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 63625b3e3b4..ee615a035a8 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 5a348e5288c..b0cdbd60c3e 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 7ab4a184263..04a0f99314b 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 ad144302417..182bbf3f075 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 83fa05d4b1c..b5f5c1379bc 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 d4750f252ad..1b4ad50c781 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 85a5d1f3622..62c5282b335 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 2be1c34c01c..5660e1b0dc5 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 8edd8429d0d..f568e53c573 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 c0b8b90bd08..dfa87c843ff 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 71a140e5325..adfb3da7c68 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 df6c774bfbe..c0485eef4d3 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 e45c69aa395..696796740f8 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 d30e030a049..9645e54f7ec 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 d9ec2f85fa2..7eb6b6cc047 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 db53a34a57f..34aed962eae 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 03890f712af..e4bbe0fb430 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 d05284b62dd..2ec5066e5fc 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 858b5ae594a..a0262c77595 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 37790b6eaf8..161272ce1a7 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 3b5fa1f531a..2bde7b174d3 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 3d412e1409c..518c34951fc 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 23b470ed90f..e85ac88d0d5 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 a4adc1f2a6f..7b5622cfeef 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 6b50a2c9686..e0eb1ac8d79 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 0ad105a5158..7b8f4602140 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 a1b5c77b2d1..75a16f5c53b 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 02b8211a256..2c0a2c44f6e 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 7d228f0af6a..b6cec2150a9 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 4d96798bfae..18cc23338bf 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 dd96214ca86..7f3bc9cf482 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 ae07942be12..764319a1a0d 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 9f61619e12b..2c1250f34a3 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 ced7a0163d5..0116212ad9e 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 29d1866d4ea..b797e6e76a0 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 48ea9bd6980..0ddeb99f10b 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 c4aa8dcf16c..b5460e8b608 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 219ae4d7007..5cb1e9027a9 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 e9a0acac1cb..44399f34bda 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 4ca6d0e08d1..c16c8d3f750 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 336a098c3a3..3f90e6b2da7 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 75c0bdc00f1..8c3de8bd035 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 136f518beaa..6a1993e1fd1 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 fa1e75f6af8..c4b884e1d3d 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 cd4a79104eb..5269ecd5d8b 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 bfe5d2f202d..1ac8afc8cfb 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 b45c8d96fc4..bb8e0ed8ce5 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 3e753ab7e06..a4538b260fd 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 e5ed9edc4f9..5e169306b2f 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 d82408e620e..ba1537a02c8 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 f2373e4702f..3d99d9530f3 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 59aec94ff90..69a2f47d05f 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 801936d906c..5f6c23beb02 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 a2ce8b698b7..7fbdfb7c33e 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 efe4e9df672..564946c579a 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 bae2d393685..ab83e54fd82 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 1b1f758d941..11fe98c664e 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 6104e72a37b..5ca837cdee4 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 b8dcae16da8..35c0d523300 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 09015e7d04a..c1b133a0ab7 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 2de46c0d1ed..e106ee3f3f1 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 b1ee59a5cd4..3791efc0e2e 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 e6c7a85aaf2..32ef1d547b0 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 51ad4a5a518..b4ef42cb22a 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 6135cd75f24..aa838bc928e 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 eb7459b0779..2774a363f85 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 058f8b6b887..27b2d237cfc 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 98d4b33939a..e21b876be04 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 5b5df40be6a..28a76da4bd9 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 a7430c94b48..28c74487c96 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 5d11b716a2f..3384e981ff0 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 9308a746736..ede8e965db9 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 b1f1619d910..06b027dd59a 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 a33eefa48ec..5a4a81f13ac 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 a0a92ffc287..0b0e8f55fa7 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 3f05aa7b789..72e09bf98f9 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 85bf262837f..3571e89bd33 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 e6ab3512797..7ba62c4f2eb 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 6b1eebd95c4..f452d059936 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 563c0a09284..4460105f617 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 dc726fe928f..89ae2f37d10 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 47499e4ae18..4f286cc5c41 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 c8bd85d5fed..cd112f7c4e9 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 db8584c4f9e..79bb6dbd9a2 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 ae89d4dfe20..ad1f656eb14 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 d8d61c56c35..ae1133fc0be 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 f751a8bfbb2..51500281abb 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 0e134f9d84a..4cc7f1493f8 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 30dbbdba5a5..a16819cab34 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 a95c67b96d2..299fba098d9 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 fad9f872add..e9c48cbb8b4 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 fba7a0b27dd..ab9c93b9b01 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 72782c1c029..3290fb74fa1 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 e8de912c375..508104d3312 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 4df98623e11..d459be25a86 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 ea38c096ee1..f03cab5c193 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 226108ad5a5..288b141d32e 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 a6e0ce47f11..9ad65dc76e0 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 c588bac69cc..43ae52338af 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 5acd33d07d2..a56899f8d0b 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 b2d204e9b9b..0f915d9a252 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 6903b6c7a0c..c4ebaf160fa 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 5f0084a36b6..a5a0104490a 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 147e9773fbf..882aed18c59 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 c31cd2ab6f6..70a6546189b 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 0bd59bc85ac..db17d60b628 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 b23ae051ad8..557446b5adc 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 4d04fa61f23..14eb3a74d57 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 c98370ed938..3db802e6e3d 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 1509d80feb1..0ff8890a6fb 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 6e8742ec2b8..1decbeb643d 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 ee62188d505..cca3279482b 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 753250315a3..78cd02897f9 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 d90b7fa740d..91def55c5e4 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 71c456875bc..1fff6bb7608 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 d2941e4c572..94cdd8029ba 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 a8faadffc11..872fffb7576 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 fee511991d2..b70d9a1f082 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 1e3f627ab0b..24a21959b8c 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 c0a398a3399..9c8cc68af3d 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 f5ce3a15626..88a2dd2abbf 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 2ffb28482f4..381ecec996d 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 326151a4843..ba5a527fdb0 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 2365918c7e4..77181fa4ae5 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 7c8d51f2f43..fd8012a24d3 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 66dc7dda835..ac48fe1c240 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 16e7d8a4049..18162d105ac 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 046424af608..b0a4505555a 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 6ba6794bfd1..c54711bb6c8 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 c228e44f893..15cb474f5fe 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 10150259ef5..3bdc5efaaa5 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 d22ba51fc3b..20666010f9a 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 16d66a6db21..5b35acc0404 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 afa1895e540..4d80a407564 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 1042b8de98e..0f870a5ab7a 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 c2c8c926432..83edfa4f1d2 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 9347cd55cf3..53a8e046b55 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 cf15d8dbc1f..565e6ef5bbf 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 e03bd353627..2078a04be06 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 87700d8edc4..de2683595e5 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 7899f86a8cb..e8e18face07 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 5c5f2578fbf..dbc28263b06 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 83a3590518c..d2fcef3e169 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 809c8d3c96d..f865f6b8aed 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 51f194a79cf..12cbae543ce 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 87af0e78b18..55b32095535 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 af1f28d6d72..b8626524b54 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 0769517db71..e8a8b9dd637 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 e95699360e9..11792f4296a 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 d502ad75566..d9c87918176 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 24adf830699..0ec53528df2 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 582a4f6138a..9fcced49b92 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 fac0780982d..616927531a5 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 10511952228..3f36eb730ce 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 e9061b0a6a3..8384510468a 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 912b3fd6ab0..b0a761567f2 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 3c24a7e522d..5fbf4b6fab2 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 7b06c2277cd..ed358213492 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 b6beb3ec887..fcc27e3c4db 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 340c8d002b7..bbdc4d90b28 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 521f68db1cc..9aa2269c957 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 2b40dfd4248..d68f38aa4bb 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 35eff76bbf0..1c03e381bdc 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 = https://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 = https://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 20ad32b3261..cc6fed43a42 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 9b64ce811ef..98bbef174ae 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 21aa41d8005..f92362ff8af 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 610a75fa317..b627322307d 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 1d9274610da..1cef1510ccf 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 137457e33c1..1420428e973 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 6f10cfdf3ba..52101b3482f 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 e3f65b6660c..d059d720f8b 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 8e637a673b1..b3377e75f67 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 ccec686142f..b42be465a3b 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 77857df0764..0503e2ef04f 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 c6444224104..7f437ec59c1 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 64c68314753..9a3afc3fb4b 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 ad7916856d1..b8b67f708e6 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 050a59c6e92..6d467a57c60 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 2d591eef723..d9a67454fe6 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 3386fdd1e2a..19d5cb15493 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 2efb23c8086..3ddfdab50aa 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 2d778017a07..cb3d76e6a74 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 e8492843254..211419f86b1 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 c3780e6a7c7..bc2218f7dee 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 b3beb404e75..ba26ba5e651 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 9639ce96194..e7745cf8625 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 1d3438032af..3d2b2337be4 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 0788ddaeec6..0da11909de9 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 e3fae7179c8..c6fe0975c3a 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 e050bcf5404..3c650bd60dd 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 cc033621834..b042108d088 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 1ac6c4a54d0..c56a5d7889f 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 a767120ddf3..0d808539573 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 8d2d6fa9c14..8163243eb0a 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 4ffe8ec735c..d4243024821 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 e4ed824d230..0ffaf315d54 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 6161b0492be..b55c42cfa56 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 d6929caf2bd..e25d871f978 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 86dfe5d7f89..829d7bcfcb2 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 af7acbc0218..c6efe5ba239 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 2a3da903b54..0fea8f1ab75 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 fb93339dfbf..87fa393ce5e 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 8cc1332b473..0f18c669386 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 afb35b57973..f42a4a02be8 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 3144e8e4de9..90d8003bb34 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 3a6b5f62e4f..9a6a3c39eec 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 8f0fbbd6dfb..097e691f7c1 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 9cb3a09d363..dfcce835e65 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 6c679bc9cf4..6d72e234ddc 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 0a073cca0c5..0cfc8c3e14a 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 0af8c47e35c..611eeba8ae0 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 1c61d0afab3..3bb75fb2ac2 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 cbb3f9bfa8f..aed68f3ad59 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 c0748b6b53b..235f33da599 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 081108634c2..38c46bd11fa 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 3cffe380490..1b98b8adf73 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 89496e00e56..d7a8e6eaf04 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 34ff3a30b78..e7e559234f6 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 0917c5ab6ee..7be8f01f23c 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 6f8563ff155..a575a86d1f6 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 b76a1475bbf..c49b82f6ca0 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 c47c67b9f65..ab4ce1be2b1 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 4274abf3b32..ffe184e263a 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 8bd1cfd089e..1813ae587c1 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 bf5a09a2418..0e0a169d552 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 e18e9f87acd..6fc50b81803 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 b53d3759cd8..75557cf895a 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 589f8de99ee..a8661fd3a98 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 147668da376..a8a4e474f53 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 edd0a364ea1..c4ab0dd59ca 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 99de3ff3591..8b2584a16d3 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 58be98f183b..9496d51bfc1 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 65bc41856f7..f8868f02c2c 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 b0350da63fa..cf3fce18c14 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 cae05c74268..5af9119508a 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 d468955e27d..b2ce75c43c3 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 f5a83a7bc02..3d81fe532ab 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 217c823afe5..9b53c180397 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 82364ee1d1c..5de0348e00e 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 7a091eb09f7..29830adb5ed 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 944118870b6..ec725564f2b 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 859bd62f998..e27abba413d 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 c8ba29fd8ac..3ed7fa64050 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 7f9f3b6467a..3c51d00ec14 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 6e05b6ced04..fe7f0cf466e 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 916a6882a17..c51f5ebf049 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 6923f876ff2..f8f933b96ab 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 ccc49db9bc3..418fcebaefd 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 f3dbf70eecf..06c5fe3a1be 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 d72752a5988..8fc15c5da6f 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 2929afed1cd..2148dcc4b80 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 aac2bceeb15..4d5fabe7fca 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 25ab7dcd31a..9aab2ba9e84 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 9ce53223f65..c3f41d281c6 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 a63713ef043..77075c36b22 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 4f34d7d0288..8287c05f743 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/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 675c27c23e1..e5fa5cbd6a1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -477,10 +477,10 @@ let self = _self // overrides; _self = with self; { }; ArchiveTar = buildPerlPackage rec { - name = "Archive-Tar-2.26"; + name = "Archive-Tar-2.28"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "01246ffbadb6e76a04a32bf689894cf56ef9d34d58101ff1c51af8f6f1ef5843"; + sha256 = "2e9144f6c96f6d3d76cd14f4e871e8defc4542cdd39245a16fca29090648a70d"; }; meta = { description = "Manipulates TAR archives"; @@ -489,15 +489,16 @@ let self = _self // overrides; _self = with self; { }; ArchiveTarWrapper = buildPerlPackage rec { - name = "Archive-Tar-Wrapper-0.24"; + name = "Archive-Tar-Wrapper-0.27"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.24.tar.gz; - sha256 = "0wlc4xc7xfmfwrcrliiv4jv9zh24nj8286hma2hmmm5l8qcqlvh7"; + url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.27.tar.gz; + sha256 = "0ll0p8yh54yb9y9ykaf60icj3frs0lndwz3k4k4ql9fywx40mcck"; }; propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; meta = { description = "API wrapper around the 'tar' utility"; }; + buildInputs = [ TestSimple13 ]; }; ArchiveZip = buildPerlPackage { @@ -1686,10 +1687,10 @@ let self = _self // overrides; _self = with self; { }; CatalystXScriptServerStarman = buildPerlPackage { - name = "CatalystX-Script-Server-Starman-0.02"; + name = "CatalystX-Script-Server-Starman-0.03"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/CatalystX-Script-Server-Starman-0.02.tar.gz; - sha256 = "0h02mpkc4cmi3jpvcd7iw7xyzx55bqvvl1qkf967gqkvpklm0qx5"; + url = mirror://cpan/authors/id/A/AB/ABRAXXA/CatalystX-Script-Server-Starman-0.03.tar.gz; + sha256 = "08jvibq4v8xjj0c3cr93h0w8w0c88ajwjn37xjy7ygxl9krlffp6"; }; patches = [ # See Nixpkgs issues #16074 and #17624 @@ -2192,10 +2193,10 @@ let self = _self // overrides; _self = with self; { }; ClassLoad = buildPerlPackage rec { - name = "Class-Load-0.24"; + name = "Class-Load-0.25"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "0bb983da46c146534fc77a556d6e40d925142f2eb43103534025ee545265ca36"; + sha256 = "2a48fa779b5297e56156380e8b32637c6c58decb4f4a7f3c7350523e11275f8f"; }; buildInputs = [ TestFatal TestNeeds ]; propagatedBuildInputs = [ DataOptList PackageStash ]; @@ -2438,10 +2439,10 @@ let self = _self // overrides; _self = with self; { }; ConfigAutoConf = buildPerlPackage rec { - name = "Config-AutoConf-0.316"; + name = "Config-AutoConf-0.317"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.316.tar.gz; - sha256 = "0xxrdg12ig9fcsk0dws50hzfar4a8dsw1pimq6xf14lllrclnvwf"; + url = mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.317.tar.gz; + sha256 = "1qcwib4yaml5z2283qy5khjcydyibklsnk8zrk9wzdzc5wnv5r01"; }; propagatedBuildInputs = [ CaptureTiny ]; meta = { @@ -2865,10 +2866,10 @@ let self = _self // overrides; _self = with self; { }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.58"; + name = "CPAN-Perl-Releases-3.62"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "1v56gj1032p5hbmlvg0nakrah7rhwin17ak06fpnyjn5lacyy753"; + sha256 = "1w4xxb2fypsxrrmdhnznmskm0y9i10hkwgi60lwizlyhb9ck8bzb"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; @@ -2878,10 +2879,10 @@ let self = _self // overrides; _self = with self; { }; CPANPLUS = buildPerlPackage rec { - name = "CPANPLUS-0.9174"; + name = "CPANPLUS-0.9176"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "1ahddfs9jc2z3h7z6lkf9ppmrgw2kjnzcpbrhvwq3rlpxa9xshhq"; + sha256 = "09fypxwd13fraarq6qznmw04n1zh2f2ykdz037jmzm4m2ic8n8xc"; }; propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ]; meta = { @@ -3183,10 +3184,10 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.060"; + name = "CryptX-0.061"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "8fab3d34fd4892349151fa4220e582d05baed8444613afa8e75e961385a6af69"; + sha256 = "26729d8d4f711fd83f9b728ad8227e8986343e23fa37cbe58564645ce5d3f8c2"; }; meta = { description = "Crypto toolkit"; @@ -3616,10 +3617,10 @@ let self = _self // overrides; _self = with self; { }; DateManip = buildPerlPackage rec { - name = "Date-Manip-6.71"; + name = "Date-Manip-6.72"; src = fetchurl { url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz"; - sha256 = "1v998nvj81av6w3cvfc80ya91k61zdv9nx9mw9skg3ifc8qycwzv"; + sha256 = "19jdm73kqbv1biw4v8bdzy5qr2xvqdrfz8lxgg59445ljjfxvx1q"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' @@ -3873,10 +3874,10 @@ let self = _self // overrides; _self = with self; { }; DateTimeLocale = buildPerlPackage rec { - name = "DateTime-Locale-1.20"; + name = "DateTime-Locale-1.22"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "998f034234441932c82a4598fa49a14f346d6e981d1d2d91a179913a9f81b898"; + sha256 = "757b3915c6b2aac89462c52fed36543f27dfb66abc98c895523d2ab95da65f94"; }; buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ]; propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler ScalarListUtils Specio namespaceautoclean ]; @@ -3984,10 +3985,10 @@ let self = _self // overrides; _self = with self; { }; DevelChecklib = buildPerlPackage rec { - name = "Devel-CheckLib-1.12"; + name = "Devel-CheckLib-1.13"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATTN/${name}.tar.gz"; - sha256 = "0lcmpp5spa6rx3b0lv8lzj55hxl72g332lngnhqhmp22aimvw2m9"; + sha256 = "1a19qkwxwz3wqb16cdabymfbf9kiydiifw90nd5srpq5hy8gvb94"; }; buildInputs = [ IOCaptureOutput MockConfig ]; }; @@ -4384,18 +4385,18 @@ let self = _self // overrides; _self = with self; { }; DevelHide = buildPerlPackage rec { - name = "Devel-Hide-0.0009"; + name = "Devel-Hide-0.0010"; src = fetchurl { url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; - sha256 = "1phnzbw58v6551nhv6sg86m72nx9w5j4msh1hg4jvkakkq5w9pki"; + sha256 = "10jyv9nmv513hs75rls5yx2xn82513xnnhjir3dxiwgb1ykfyvvm"; }; }; DevelNYTProf = buildPerlPackage rec { - name = "Devel-NYTProf-6.05"; + name = "Devel-NYTProf-6.06"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; - sha256 = "b2a9f8b49afb9be8d087ddb50ef77a53f3796481b37eb5a965e1d4055445db1c"; + sha256 = "a14227ca79f1750b92cc7b8b0a5806c92abc4964a21a7fb100bd4907d6c4be55"; }; propagatedBuildInputs = [ FileWhich JSONMaybeXS ]; meta = { @@ -4963,10 +4964,10 @@ let self = _self // overrides; _self = with self; { }; EmailAddressXS = buildPerlPackage rec { - name = "Email-Address-XS-1.03"; + name = "Email-Address-XS-1.04"; src = fetchurl { - url = mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.03.tar.gz; - sha256 = "1knf1i9rr20bpzscbvaqsqjgw51pnnga4zlnkgsvw7jpqh4cyj6i"; + url = mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.04.tar.gz; + sha256 = "0gjrrl81z3sfwavgx5kwjd87gj44mlnbbqsm3dgdv1xllw26spwr"; }; meta = { description = "Parse and format RFC 2822 email addresses and groups"; @@ -5128,10 +5129,10 @@ let self = _self // overrides; _self = with self; { }; EmailSimple = buildPerlPackage rec { - name = "Email-Simple-2.214"; + name = "Email-Simple-2.216"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "b2f02b37441ea60efbddebbd675017d26bb767e9a4de3e0fc30b5410a1416b92"; + sha256 = "d85f63cd1088d11311103676a8cf498fff564a201b538de52cd753b5e5ca8bd4"; }; propagatedBuildInputs = [ EmailDateFormat ]; meta = { @@ -5987,7 +5988,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1ipbh63bkh1r2gy5g7q4bzhki8j29mm1jkhbv60p9vwsdys5s91a"; }; doCheck = false; # Failed test 'desktop file is the right one' - buildInputs = [ FileBaseDir ]; + buildInputs = [ FileBaseDir FileDesktopEntry ]; }; FileMMagic = buildPerlPackage rec { @@ -6114,10 +6115,10 @@ let self = _self // overrides; _self = with self; { }; FileShareDir = buildPerlPackage { - name = "File-ShareDir-1.104"; + name = "File-ShareDir-1.112"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.104.tar.gz; - sha256 = "1bqwhk3qfg60bkpi5b83bh93sng8jx20i3ka5sixc0prrppjidh7"; + url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.112.tar.gz; + sha256 = "196vf98l6pasrpdcpd840321fknknhyidhsm1y5ifx74lrk5ac7q"; }; propagatedBuildInputs = [ ClassInspector ]; meta = { @@ -6335,10 +6336,10 @@ let self = _self // overrides; _self = with self; { }; ForksSuper = buildPerlPackage { - name = "Forks-Super-0.93"; + name = "Forks-Super-0.94"; src = fetchurl { - url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.93.tar.gz; - sha256 = "1blkhi3kpkqv6dlnbxz5r9j9lbr58vag3aa2c9yqpkqk59hivbgg"; + url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.94.tar.gz; + sha256 = "145nj2wsymr5vr93ikrakjx3dd07q63fxb1bq7lkiranm9974v8s"; }; doCheck = false; meta = { @@ -6721,7 +6722,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AG/AGROLMS/${name}.tar.gz"; sha256 = "1mkhwxjjlhr58pd770i9gnf7zy7jj092iv6jfbnb8bvnc5xjr3vx"; }; - buildInputs = [ TestPod ]; propagatedBuildInputs = [ pkgs.krb5Full.dev ]; meta = { maintainers = [ maintainers.limeytexan ]; @@ -6868,11 +6868,11 @@ let self = _self // overrides; _self = with self; { }; }; - HashMoreUtils = buildPerlModule rec { - name = "Hash-MoreUtils-0.05"; + HashMoreUtils = buildPerlPackage rec { + name = "Hash-MoreUtils-0.06"; src = fetchurl { url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz"; - sha256 = "5e9c8458457eb18315a5669e3bef68488cd5ed8c2220011ac7429ff983288ab1"; + sha256 = "db9a8fb867d50753c380889a5e54075651b5e08c9b3b721cb7220c0883547de8"; }; meta = { description = "Provide the stuff missing in Hash::Util"; @@ -7396,10 +7396,10 @@ let self = _self // overrides; _self = with self; { }; HTTPMessage = buildPerlPackage rec { - name = "HTTP-Message-6.16"; + name = "HTTP-Message-6.18"; src = fetchurl { url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz"; - sha256 = "46790ae127946d5cfea5a1e05c1b9f4a045a7c5094fe81f086bbf3341290ebd0"; + sha256 = "d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112"; }; buildInputs = [ TryTiny ]; propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; @@ -7793,13 +7793,13 @@ let self = _self // overrides; _self = with self; { }; }; - IOSocketInet6 = buildPerlPackage rec { + IOSocketInet6 = buildPerlModule rec { name = "IO-Socket-INET6-2.72"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "1fqypz6qa5rw2d5y2zq7f49frwra0aln13nhq5gi514j2zx21q45"; }; - propagatedBuildInputs = [Socket6]; + propagatedBuildInputs = [ Socket6 ]; doCheck = false; }; @@ -8180,7 +8180,7 @@ let self = _self // overrides; _self = with self; { sha256 = "77c182a98528f1714d82afc548d5b3b4dc93e67069128bb9b9413f24cf07248b"; }; buildInputs = [ TestMockGuard TestRequires ]; - propagatedBuildInputs = [ JSON ]; + propagatedBuildInputs = [ JSON ModuleRuntime ]; meta = { homepage = https://github.com/xaicron/p5-JSON-WebToken; description = "JSON Web Token (JWT) implementation"; @@ -8721,10 +8721,10 @@ let self = _self // overrides; _self = with self; { }; LocaleTextDomainOOUtil = buildPerlPackage rec { - name = "Locale-TextDomain-OO-Util-3.008"; + name = "Locale-TextDomain-OO-Util-4.001"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-3.008.tar.gz; - sha256 = "1kj633apv20ah5nazjlig4w25l021lvmlb6a6fhwrixis08mdqxb"; + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-4.001.tar.gz; + sha256 = "1bzh9bnm9lnjc63nrlcc03gz660lvgmvy4yphrv2yyr5829bpr7z"; }; propagatedBuildInputs = [ namespaceautoclean ]; buildInputs = [ TestDifferences TestException TestNoWarnings ]; @@ -8965,10 +8965,10 @@ let self = _self // overrides; _self = with self; { }; LWP = buildPerlPackage rec { - name = "libwww-perl-6.33"; + name = "libwww-perl-6.34"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.33.tar.gz; - sha256 = "97417386f11f007ae129fe155b82fd8969473ce396a971a664c8ae6850c69b99"; + url = mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-6.34.tar.gz; + sha256 = "260363fd4204c0ddf7cd76f7b70e22beb3b5186e4c346f250a59288b52dc114c"; }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; meta = with stdenv.lib; { @@ -10063,10 +10063,10 @@ let self = _self // overrides; _self = with self; { }; }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-7.82"; + name = "Mojolicious-7.84"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "70c5f211ba81982752eae189ca7aea0ea14fb7534449114d0a3d47d96c0d05c4"; + sha256 = "7461a27e8e8665b436a60c708cf6ce4164b84dfb1b2435480a65597085d26ebc"; }; meta = { homepage = https://mojolicious.org/; @@ -11214,10 +11214,10 @@ let self = _self // overrides; _self = with self; { }; NetCIDR = buildPerlPackage { - name = "Net-CIDR-0.18"; + name = "Net-CIDR-0.19"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.18.tar.gz; - sha256 = "c3df7ea8d42b2d8ec328c187329c5f8c4db6a2470873f61e3d0dd91430ef1427"; + url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.19.tar.gz; + sha256 = "855bf4662062de1a85aba3b0e4c82665d7107873a43836f3c03e7f260dd89f3e"; }; meta = { description = "Manipulate IPv4/IPv6 netblocks in CIDR notation"; @@ -12593,10 +12593,10 @@ let self = _self // overrides; _self = with self; { }; PPIxRegexp = buildPerlModule rec { - name = "PPIx-Regexp-0.059"; + name = "PPIx-Regexp-0.060"; src = fetchurl { url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; - sha256 = "f2464c449d9cb21866f8adc7b5299d1f611cef5322b9d885ec55790243458635"; + sha256 = "885e172bbfde54c240bdfd6013fc6e1b76bdd19c211901d2128f3873938ff377"; }; propagatedBuildInputs = [ PPI ]; meta = { @@ -15553,10 +15553,10 @@ let self = _self // overrides; _self = with self; { }; TestPAUSEPermissions = buildPerlPackage rec { - name = "Test-PAUSE-Permissions-0.06"; + name = "Test-PAUSE-Permissions-0.07"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Test-PAUSE-Permissions-0.06.tar.gz; - sha256 = "1rspdxwfr1mxjrpcsd4asd5q1qpmiyw0sm7g008yy1gsz6i2yl88"; + url = mirror://cpan/authors/id/S/SK/SKAJI/Test-PAUSE-Permissions-0.07.tar.gz; + sha256 = "0gh7f67g1y30yggmwj1pq6xgrx3cfjibj2378nl3gilvyaxw2w2m"; }; propagatedBuildInputs = [ ConfigIdentity PAUSEPermissions ParseLocalDistribution ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; @@ -15998,10 +15998,10 @@ let self = _self // overrides; _self = with self; { Testuseok = TestSimple; TestWarn = buildPerlPackage { - name = "Test-Warn-0.34"; + name = "Test-Warn-0.35"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.34.tar.gz; - sha256 = "1zzqfl47l3y3agwplnxl9ypcpph0qjj12sspk1y0x10ygkn12yl1"; + url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.35.tar.gz; + sha256 = "1ialnc0q5277p7v01mvk7nljw8qx5qr5wiqzhmvbz8y87jb11r14"; }; propagatedBuildInputs = [ SubUplevel ]; meta = { @@ -16112,10 +16112,10 @@ let self = _self // overrides; _self = with self; { }; TestYAML = buildPerlPackage rec { - name = "Test-YAML-1.06"; + name = "Test-YAML-1.07"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "0hxrfs7p9hqkhvv5nhk2hd3kh32smwng4nz47b8xf4iw2q1n2dr7"; + url = mirror://cpan/authors/id/T/TI/TINITA/Test-YAML-1.07.tar.gz; + sha256 = "0pwrrnwi1qaiy3c5522vy0kzncxc9g02r4b056wqqaa69w1hsc0z"; }; buildInputs = [ TestBase ]; }; @@ -16467,15 +16467,16 @@ let self = _self // overrides; _self = with self; { }; TextSimpleTable = buildPerlPackage { - name = "Text-SimpleTable-2.04"; + name = "Text-SimpleTable-2.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.04.tar.gz; - sha256 = "14sjmdcy7s73sk740g3ccmzmwhwd52x5ay3bjmibjlql1cag70ld"; + url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.05.tar.gz; + sha256 = "1akcv3iq4y6mjc88p0j9yvv6g0g5cnc9nvzxnmsswnx5si7v5am5"; }; meta = { description = "Simple eyecandy ASCII tables"; license = stdenv.lib.licenses.artistic2; }; + propagatedBuildInputs = [ UnicodeLineBreak ]; }; TextSoundex = buildPerlPackage { @@ -16818,6 +16819,7 @@ let self = _self // overrides; _self = with self; { description = "Ordered hashes for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; /* test fails on some machines */ }; TieRefHash = buildPerlPackage { @@ -16896,18 +16898,18 @@ let self = _self // overrides; _self = with self; { }; TimeHiRes = buildPerlPackage rec { - name = "Time-HiRes-1.9753"; + name = "Time-HiRes-1.9758"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9753.tar.gz; - sha256 = "05a9xhn8y0f679kg8n0n3ng4mk6sd7isihqbbhfh29nxkkwxbgqg"; + url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9758.tar.gz; + sha256 = "07jbydcdzpjm6i4nidci0rlklx4kla210fsl6zishw0yq5di9yjv"; }; }; TimeLocal = buildPerlPackage { - name = "Time-Local-1.25"; + name = "Time-Local-1.28"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.25.tar.gz; - sha256 = "1ae9c51d777ac44a3ebc154dc625ba24d7c0cde6a8b6dba87b46d0777889fef2"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.28.tar.gz; + sha256 = "9278b9e5cc99dcbb0fd27a43e914828b59685601edae082889b5ee7266afe10e"; }; meta = { description = "Efficiently compute time from local and GMT time"; @@ -17966,10 +17968,10 @@ let self = _self // overrides; _self = with self; { }; YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.69"; + name = "YAML-LibYAML-0.70"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz"; - sha256 = "06msvj3vmjszl5zj1k7g47ll0kkds9gdb5sky0q27lh4zw1vlj33"; + sha256 = "1lqgal20v79ij68jhrpg57vxsv4sdahgmqdv88vg0388y776n95j"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4677062428..6b4cd429a00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -150,7 +150,6 @@ in { setuptools = toPythonModule (callPackage ../development/python-modules/setuptools { }); vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { - pythonPackages = self; boost = pkgs.boost160; }; @@ -366,7 +365,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 { }; @@ -6920,7 +6919,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 { }; @@ -11257,7 +11256,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 {}; |