treewide: removed name from a few pythonpackages defining pname and version

6 years ago · 0415710a5d
parent 4b391934e9
commit 0415710a5d
23 changed files with 2 additions and 26 deletions
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/applications/audio/pithos/default.nix
@ -4,7 +4,6 @@
 pythonPackages.buildPythonApplication rec {
  pname = "pithos";
  version = "1.1.2";
-  name = "${pname}-${version}";

  src = fetchFromGitHub {
    owner = pname;
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/pkgs/applications/graphics/dosage/default.nix
@ -1,7 +1,6 @@
 { stdenv, pythonPackages, fetchFromGitHub }:

 pythonPackages.buildPythonApplication rec {
-  name = "${pname}-${version}";
  pname = "dosage";
  version = "2018.04.08";
  PBR_VERSION = version;
--- a/pkgs/applications/misc/jrnl/default.nix
+++ b/pkgs/applications/misc/jrnl/default.nix
@ -7,7 +7,6 @@ with python.pkgs;
 buildPythonApplication rec {
  pname = "jrnl";
  version = "1.9.8";
-  name = "${pname}-${version}";
  disabled = isPy3k;

  src = fetchPypi {
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@ -3,7 +3,6 @@
 with python3Packages;

 buildPythonApplication rec {
-  name = "${pname}-${version}";
  pname = "khal";
  version = "0.9.9";

--- a/pkgs/applications/misc/tzupdate/default.nix
+++ b/pkgs/applications/misc/tzupdate/default.nix
@ -4,7 +4,6 @@ let
  inherit (python.pkgs) buildPythonApplication fetchPypi requests;
 in
 buildPythonApplication rec {
-  name = "${pname}-${version}";
  pname = "tzupdate";
  version = "1.2.0";

--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@ -6,7 +6,6 @@ in
 buildPythonApplication rec {
  pname = "fava";
  version = "1.7";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
@ -26,4 +25,3 @@ buildPythonApplication rec {
    maintainers = with stdenv.lib.maintainers; [ ];
  };
 }
-
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@ -4,7 +4,6 @@ nose, shouldbe, gss, krb5Full, which, darwin }:
 buildPythonPackage rec {
  pname = "gssapi";
  version = "1.4.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/html5-parser/default.nix
+++ b/pkgs/development/python-modules/html5-parser/default.nix
@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "html5-parser";
  version = "0.4.5";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/markdownsuperscript/default.nix
+++ b/pkgs/development/python-modules/markdownsuperscript/default.nix
@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "MarkdownSuperscript";
  version = "2.0.0";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@ -6,7 +6,6 @@

 buildPythonPackage rec {
  pname = "pelican";
-  name = "${pname}-${version}";
  version = "3.7.1";
  disabled = isPy26;

--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@ -7,7 +7,6 @@
 buildPythonPackage rec {
  pname = "persistent";
  version = "4.2.4.2";
-  name = "${pname}-${version}";

  propagatedBuildInputs = [ zope_interface ];

--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@ -6,7 +6,6 @@
 buildPythonPackage rec {
  version = pycryptodome.version;
  pname = "pycrypto";
-  name = "${pname}-${version}";

  # Cannot build wheel otherwise (zip 1980 issue)
  SOURCE_DATE_EPOCH=315532800;
--- a/pkgs/development/python-modules/pyfftw/default.nix
+++ b/pkgs/development/python-modules/pyfftw/default.nix
@ -4,7 +4,6 @@
 buildPythonPackage rec {
  version = "0.10.4";
  pname = "pyFFTW";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/requests_download/default.nix
+++ b/pkgs/development/python-modules/requests_download/default.nix
@ -7,7 +7,6 @@
 buildPythonPackage rec {
  pname = "requests_download";
  version = "0.1.1";
-  name = "${pname}-${version}";

  format = "wheel";

--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@ -7,7 +7,6 @@
 buildPythonPackage rec {
  pname = "scikit-learn";
  version = "0.19.1";
-  name = "${pname}-${version}";
  disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534

  src = fetchPypi {
--- a/pkgs/development/python-modules/smart_open/default.nix
+++ b/pkgs/development/python-modules/smart_open/default.nix
@ -13,7 +13,6 @@

 buildPythonPackage rec {
  pname = "smart_open";
-  name = "${pname}-${version}";
  version = "1.5.7";

  src = fetchPypi {
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@ -25,7 +25,6 @@
 }:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "Sphinx";
  version = "1.7.4";
  src = fetchPypi {
@ -70,4 +69,4 @@ buildPythonPackage rec {
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ nand0p ];
  };
-}
+}
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@ -4,7 +4,6 @@
 in python3Packages.buildPythonApplication rec {
  version = "0.46.1";
  pname = "meson";
-  name = "${pname}-${version}";

  src = python3Packages.fetchPypi {
    inherit pname version;
--- a/pkgs/development/tools/flootty/default.nix
+++ b/pkgs/development/tools/flootty/default.nix
@ -7,7 +7,6 @@ in
 buildPythonApplication rec {
  pname = "Flootty";
  version = "3.2.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/pkgs/development/tools/misc/gdbgui/default.nix
@ -3,7 +3,6 @@ let
  deps = import ./requirements.nix { inherit pkgs; };
 in
 python27Packages.buildPythonApplication rec {
-  name = "${pname}-${version}";
  pname = "gdbgui";
  version = "0.11.1.2";

--- a/pkgs/development/tools/misc/lit/default.nix
+++ b/pkgs/development/tools/misc/lit/default.nix
@ -3,7 +3,6 @@
 python2.pkgs.buildPythonApplication rec {
  pname = "lit";
  version = "0.5.1";
-  name = "${pname}-${version}";

  src = python2.pkgs.fetchPypi {
    inherit pname version;
--- a/pkgs/tools/admin/mycli/default.nix
+++ b/pkgs/tools/admin/mycli/default.nix
@ -7,7 +7,6 @@ with python.pkgs;
 buildPythonApplication rec {
  pname = "mycli";
  version = "1.6.0";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/pkgs/tools/misc/bepasty/default.nix
@ -10,7 +10,6 @@ with python.pkgs;
 buildPythonPackage rec {
  pname = "bepasty";
  version = "0.4.0";
-  name = "${pname}-${version}";

  propagatedBuildInputs = [
    flask
@ -39,4 +38,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = [ lib.maintainers.makefu ];
  };
-}
+}