diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-23 15:27:58 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-23 18:14:26 +0200 |
commit | ced21f5e1a1479e3b6ae5c218818790596f5a16f (patch) | |
tree | 41b23b3b4535b9755269e083f11969b3bfd40990 /pkgs/applications | |
parent | 8cfa9cc66c37fbb8a95cf6dbf2a4279bf9e32e08 (diff) | |
download | nixpkgs-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar nixpkgs-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.gz nixpkgs-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.bz2 nixpkgs-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.lz nixpkgs-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.xz nixpkgs-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.zst nixpkgs-ced21f5e1a1479e3b6ae5c218818790596f5a16f.zip |
pythonPackages: remove `name` attribute`
The `buildPython*` function computes name from `pname` and `version`. This change removes `name` attribute from all expressions in `pkgs/development/python-modules`. While at it, some other minor changes were made as well, such as replacing `fetchurl` calls with `fetchPypi`.
Diffstat (limited to 'pkgs/applications')
23 files changed, 52 insertions, 62 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 68315373a02..ce2f5a68879 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -4,7 +4,7 @@ }: python3Packages.buildPythonApplication rec { - name = "gpodder-${version}"; + pname = "gpodder"; version = "3.10.2"; format = "other"; diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index 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 00f58750408..558267239ef 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; |