treewide: Fix packages using name where they should use pname

6 years ago · b0e9fc131c
parent 320c9c10de
commit b0e9fc131c
27 changed files with 31 additions and 31 deletions
--- a/pkgs/applications/altcoins/mist.nix
+++ b/pkgs/applications/altcoins/mist.nix
@ -2,7 +2,7 @@

 let
  version = "0.11.1";
-  name = "mist";
+  pname = "mist";

  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";

@ -26,7 +26,7 @@ let
  };

  mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation {
-    inherit name version meta;
+    inherit pname version meta;

    src = {
      i686-linux = fetchurl {
--- a/pkgs/applications/audio/cadence/default.nix
+++ b/pkgs/applications/audio/cadence/default.nix
@ -10,7 +10,7 @@

 stdenv.mkDerivation rec {
  version = "0.9.0";
-  name = "cadence";
+  pname = "cadence";

  src = fetchurl {
    url = "https://github.com/falkTX/Cadence/archive/v${version}.tar.gz";
--- a/pkgs/applications/graphics/vimiv/default.nix
+++ b/pkgs/applications/graphics/vimiv/default.nix
@ -6,7 +6,7 @@
 }:

 python3Packages.buildPythonApplication rec {
-  name = "vimiv";
+  pname = "vimiv";
  version = "0.7.3";

  src = fetchFromGitHub {
--- a/pkgs/applications/misc/omegat.nix
+++ b/pkgs/applications/misc/omegat.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  version = "4.1.5.2";
-  name = "omegat";
+  pname = "omegat";

  src = fetchurl {  # their zip has repeated files or something, so no fetchzip
    url = mirror://sourceforge/project/omegat/OmegaT%20-%20Latest/OmegaT%204.1.5%20update%202/OmegaT_4.1.5_02_Beta_Without_JRE.zip;
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@ -69,7 +69,7 @@ let rpath = lib.makeLibraryPath [


 in stdenv.mkDerivation rec {
-    name = "brave";
+    pname = "brave";
    version = "0.25.2";

    src = fetchurl {
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@ -65,7 +65,7 @@ in rec {

  mx = stdenv.mkDerivation rec {
    version = "5.192.0";
-    name = "mx";
+    pname = "mx";
    src = fetchFromGitHub {
      owner  = "graalvm";
      repo   = "mx";
--- a/pkgs/development/libraries/elf-header/default.nix
+++ b/pkgs/development/libraries/elf-header/default.nix
@ -12,7 +12,7 @@ let
 in

 stdenvNoCC.mkDerivation {
-  name = "elf-header";
+  pname = "elf-header";
  inherit (libc) version;

  src = null;
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/pkgs/development/libraries/igraph/default.nix
@ -3,12 +3,12 @@
  flex, yacc, zlib, libxml2 }:

 stdenv.mkDerivation rec {
-  name = "igraph";
+  pname = "igraph";
  version = "0.7.1";

  src = fetchFromGitHub {
    owner = "igraph";
-    repo = name;
+    repo = pname;
    rev = version;
    sha256 = "1wsy0r511gk069il6iqjs27q8cjvqz20gf0a7inybx1bw84845z8";
  };
--- a/pkgs/development/libraries/libsignal-protocol-c/default.nix
+++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, openssl }:

 stdenv.mkDerivation rec {
-  name = "libsignal-protocol-c";
+  pname = "libsignal-protocol-c";
  version = "2.3.2";

  src = fetchFromGitHub {
--- a/pkgs/development/libraries/libxl/default.nix
+++ b/pkgs/development/libraries/libxl/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "libxl";
+  pname = "libxl";
  version = "3.8.1";

  src = fetchurl {
-    url = "http://www.libxl.com/download/${name}-lin-${version}.tar.gz";
+    url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz";
    sha256 = "1zdbahhyhr70s8hygwp43j9z4zmglyrr782hkcm1078yvkr2f2fm";
  };

--- a/pkgs/development/libraries/yojimbo/default.nix
+++ b/pkgs/development/libraries/yojimbo/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:

 stdenv.mkDerivation rec {
-  name = "yojimbo";
+  pname = "yojimbo";
  version = "1.1";

  src = fetchFromGitHub {
--- a/pkgs/development/python-modules/pyinputevent/default.nix
+++ b/pkgs/development/python-modules/pyinputevent/default.nix
@ -4,7 +4,7 @@
 }:

 buildPythonPackage rec {
-  name = "pyinputevent";
+  pname = "pyinputevent";
  version = "2016-10-18";

  src = fetchFromGitHub {
--- a/pkgs/development/python-modules/pymaging/default.nix
+++ b/pkgs/development/python-modules/pymaging/default.nix
@ -4,7 +4,7 @@
 }:

 buildPythonPackage rec {
-  name = "pymaging";
+  pname = "pymaging";
  version = "unstable-2016-11-16";

  src = fetchFromGitHub {
--- a/pkgs/development/python-modules/pymaging_png/default.nix
+++ b/pkgs/development/python-modules/pymaging_png/default.nix
@ -5,7 +5,7 @@
 }:

 buildPythonPackage rec {
-  name = "pymaging-png";
+  pname = "pymaging-png";
  version = "unstable-2016-11-16";

  src = fetchFromGitHub {
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ b/pkgs/development/python-modules/rbtools/default.nix
@ -7,7 +7,7 @@
 }:

 buildPythonPackage rec {
-  name = "rbtools";
+  pname = "rbtools";
  version = "0.7.2";
  disabled = isPy3k;

--- a/pkgs/development/python-modules/repocheck/default.nix
+++ b/pkgs/development/python-modules/repocheck/default.nix
@ -4,7 +4,7 @@
 }:

 buildPythonPackage rec {
-  name = "repocheck";
+  pname = "repocheck";
  version = "2015-08-05";

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

 buildPythonPackage rec {
-  name = "Snapper-GUI";
+  pname = "Snapper-GUI";
  version = "0.1";

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

 buildPythonPackage {
-  name = "svg2tikz";
+  pname = "svg2tikz";
  version = "1.0.0";
  disabled = ! isPy27;

--- a/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/pkgs/development/python-modules/urwidtrees/default.nix
@ -5,7 +5,7 @@
 }:

 buildPythonPackage rec {
-  name = "urwidtrees";
+  pname = "urwidtrees";
  version  = "1.0";

  src = fetchFromGitHub {
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@ -29,7 +29,7 @@ let
  v8 = v8_3_16_14;

  rainbow_rake = buildRubyGem {
-    name = "rake";
+    pname = "rake";
    gemName = "rake";
    source.sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
    type = "gem";
--- a/pkgs/development/tools/icr/default.nix
+++ b/pkgs/development/tools/icr/default.nix
@ -2,7 +2,7 @@
 , openssl, readline }:

 stdenv.mkDerivation rec {
-  name = "icr";
+  pname = "icr";
  version = "0.5.0";

  src = fetchFromGitHub {
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@ -3,12 +3,12 @@
 with lib;

 stdenv.mkDerivation rec {
-  name = "kubectx";
+  pname = "kubectx";
  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "ahmetb";
-    repo = "${name}";
+    repo = pname;
    rev = "v${version}";
    sha256 = "1507g8sm73mqfsxl3fabmj37pk9l4jddsdi4qlpf0ixhk3z1lfkg";
  };
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@ -82,7 +82,7 @@ let
  };
 };
 typeshed = stdenv.mkDerivation {
-  name = "typeshed";
+  pname = "typeshed";
  version = pyre-version;
  src = fetchFromGitHub {
    owner = "python";
--- a/pkgs/development/tools/scry/default.nix
+++ b/pkgs/development/tools/scry/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, crystal, shards, which }:

 stdenv.mkDerivation rec {
-  name = "scry";
+  pname = "scry";
  # 0.7.1 doesn't work with crystal > 0.25
  version = "0.7.1.20180919";

--- a/pkgs/servers/web-apps/fileshelter/default.nix
+++ b/pkgs/servers/web-apps/fileshelter/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt3, libconfig, pkgconfig } :

 stdenv.mkDerivation rec {
-  name = "fileshelter";
+  pname = "fileshelter";
  version = "3.0.0";

  src = fetchFromGitHub {
--- a/pkgs/tools/misc/hid-listen/default.nix
+++ b/pkgs/tools/misc/hid-listen/default.nix
@ -1,6 +1,6 @@
 { stdenv, fetchzip }:
 stdenv.mkDerivation rec {
-  name = "hid-listen";
+  pname = "hid-listen";
  version = "1.01";

  src = fetchzip {
--- a/pkgs/tools/networking/quickserve/default.nix
+++ b/pkgs/tools/networking/quickserve/default.nix
@ -12,7 +12,7 @@ let
  };
  wrappedPython = python3.withPackages (_: [ threaded_servers ]);
 in stdenv.mkDerivation {
-  name = "quickserve";
+  pname = "quickserve";
  version = "2018";

  unpackPhase = ":";