treewide: name -> pname (easy cases) (#66585)

treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname

32 files changed, 36 insertions, 39 deletions

diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index 647261a138f2..92db34417f47 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "argo-${version}";
+  pname = "argo";
   version = "2.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix
index bc9023a222f6..78be19cd81e5 100644
--- a/pkgs/applications/networking/cluster/chronos/default.nix
+++ b/pkgs/applications/networking/cluster/chronos/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, makeWrapper, fetchgit, curl, jdk, maven, nodejs, mesos }:
 
 stdenv.mkDerivation rec {
-  name = "chronos-${version}";
+  pname = "chronos";
   version = "286b2ccb8e4695f8e413406ceca85b60d3a87e22";
 
   src = fetchgit {
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,libexec/chronos}
-    cp target/chronos*.jar $out/libexec/chronos/${name}.jar
+    cp target/chronos*.jar $out/libexec/chronos/${pname}-${version}.jar
 
     makeWrapper ${jdk.jre}/bin/java $out/bin/chronos \
-      --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${name}.jar com.airbnb.scheduler.Main" \
+      --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${pname}-${version}.jar com.airbnb.scheduler.Main" \
       --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY"
   '';
 
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index 876630c559a5..115dc3835fc5 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "machine-${version}";
+  pname = "machine";
   version = "0.16.1";
 
   goPackagePath = "github.com/docker/machine";
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
index 181663513d3e..de122dd2a5a2 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }:
 
 buildGoPackage rec {
-  name = "docker-machine-kvm-${version}";
+  pname = "docker-machine-kvm";
   version = "0.10.0";
 
   goPackagePath = "github.com/dhiltgen/docker-machine-kvm";
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
index d8fa1a04507a..36c26001afc8 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@@ -2,7 +2,6 @@
 
 buildGoPackage rec {
   pname = "docker-machine-kvm2";
-  name = "${pname}-${version}";
   version = minikube.version;
 
   goPackagePath = "k8s.io/minikube";
diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
index 6b0440eb84ae..1c2caff50d53 100644
--- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, Hypervisor, vmnet }:
 
 buildGoPackage rec {
-  name = "docker-machine-xhyve-${version}";
+  pname = "docker-machine-xhyve";
   version = "0.3.3";
 
   goPackagePath = "github.com/zchee/docker-machine-driver-xhyve";
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index c116e46684cd..b32862bb4d67 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "2.14.2";
-  name = "helm-${version}";
+  pname = "helm";
 
   src = fetchFromGitHub {
     owner = "helm";
diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix
index cd0ef728f83e..b9413577b104 100644
--- a/pkgs/applications/networking/cluster/heptio-ark/default.nix
+++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "heptio-ark-${version}";
+  pname = "heptio-ark";
   version = "0.10.0";
 
   goPackagePath = "github.com/heptio/ark";
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
index 5eaf1d13d618..7938265d1b8d 100644
--- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix
+++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "hetzner-kube-${version}";
+  pname = "hetzner-kube";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix
index 6274168b3da7..52abc3189903 100644
--- a/pkgs/applications/networking/cluster/kanif/default.nix
+++ b/pkgs/applications/networking/cluster/kanif/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.2";
-  name = "kanif-${version}";
+  pname = "kanif";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/26773/${pname}-${version}.tar.gz";
     sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879";
   };
 
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix
index 19194c2d0873..1a14e1ed273e 100644
--- a/pkgs/applications/networking/cluster/kompose/default.nix
+++ b/pkgs/applications/networking/cluster/kompose/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "kompose-${version}";
+  pname = "kompose";
   version = "1.18.0";
 
   goPackagePath = "github.com/kubernetes/kompose";
diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix
index 1e03efddc062..e38dc355d246 100644
--- a/pkgs/applications/networking/cluster/kontemplate/default.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name          = "kontemplate-${version}";
+  pname = "kontemplate";
   version       = "1.7.0";
   goPackagePath = "github.com/tazjin/kontemplate";
   goDeps        = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 190711e3096b..e4adabd75813 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -14,7 +14,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "kubernetes-${version}";
+  pname = "kubernetes";
   version = "1.14.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
index 171ce3d3a54d..ab8b7deae72d 100644
--- a/pkgs/applications/networking/cluster/kubetail/default.nix
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, lib, ... }:
 
 stdenv.mkDerivation rec {
-  name = "kubetail-${version}";
+  pname = "kubetail";
   version = "1.6.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 55a827f9cf92..982f36def691 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -22,7 +22,7 @@ let
 in
 
 buildGoPackage rec {
-  name = "kubeval-${version}";
+  pname = "kubeval";
   version = "0.7.3";
 
   goPackagePath = "github.com/garethr/kubeval";
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 49cac6d50635..72bd82be6c16 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, makeWrapper, jdk, mesos, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "marathon-${version}";
+  pname = "marathon";
   version = "1.4.2";
 
   src = fetchurl {
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,libexec/marathon}
-    cp target/scala-*/marathon*.jar $out/libexec/marathon/${name}.jar
+    cp target/scala-*/marathon*.jar $out/libexec/marathon/${pname}-${version}.jar
 
     makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \
-      --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \
+      --add-flags "-Xmx512m -jar $out/libexec/marathon/${pname}-${version}.jar" \
       --set "MESOS_NATIVE_JAVA_LIBRARY" "$MESOS_NATIVE_JAVA_LIBRARY"
     '';
 
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 8cff2494bf8f..0ffc7a1fb6f0 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -26,13 +26,13 @@ let
 
 in stdenv.mkDerivation rec {
   version = "1.4.1";
-  name = "mesos-${version}";
+  pname = "mesos";
 
   enableParallelBuilding = true;
   dontDisableStatic = true;
 
   src = fetchurl {
-    url = "mirror://apache/mesos/${version}/${name}.tar.gz";
+    url = "mirror://apache/mesos/${version}/${pname}-${version}.tar.gz";
     sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr";
   };
 
diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix
index 5551f635bc36..43e960d9403e 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@@ -11,7 +11,7 @@ let
   openshiftVersion = "v3.11.0";
 
 in buildGoPackage rec {
-  name = "minishift-${version}";
+  pname = "minishift";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index fec737ddb2ae..ce7b9beb4f8a 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "nomad-${version}";
+  pname = "nomad";
   version = "0.9.4";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index dd57add14af9..758786f586a6 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -21,7 +21,7 @@ let
   k8sgitMajor = "0";
   k8sgitMinor = "1";
 in buildGoPackage rec {
-  name = "openshift-origin-${version}";
+  pname = "openshift-origin";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix
index 618bea36de86..de0bb015852c 100644
--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "pachyderm-${version}";
+  pname = "pachyderm";
   version = "1.8.5";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix
index 052797db2f3f..0835d268cd79 100644
--- a/pkgs/applications/networking/cluster/ssm-agent/default.nix
+++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name    = "${pname}-${version}";
   pname   = "amazon-ssm-agent";
   version = "2.0.633.0";
 
diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix
index 3218e6a25b39..8e9e6691a79e 100644
--- a/pkgs/applications/networking/cluster/stern/default.nix
+++ b/pkgs/applications/networking/cluster/stern/default.nix
@@ -3,7 +3,7 @@
 let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in
 
 buildGoPackage rec {
-  name = "stern-${version}";
+  pname = "stern";
   version = "1.11.0";
 
   goPackagePath = "github.com/wercker/stern";
diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix
index c61896d89218..3423163f5902 100644
--- a/pkgs/applications/networking/cluster/taktuk/default.nix
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   version = "3.7.7";
-  name = "taktuk-${version}";
+  pname = "taktuk";
 
   buildInputs = [ perl ];
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/33412/${pname}-${version}.tar.gz";
     sha256 = "0w0h3ynlcxvq2nzm8hkj20g0805ww3vkw53g0qwj7wvp7p3gcvnr";
   };
 
diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix
index 2b39cebbbeb0..606cd0370aa2 100644
--- a/pkgs/applications/networking/cluster/terraform-docs/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix
@@ -1,6 +1,5 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
-  name = "${pname}-${version}";
   pname = "terraform-docs";
   version = "0.6.0";
 
diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix
index dd4a36807ea1..1bb8df88d010 100644
--- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub}:
 
 buildGoPackage rec {
-  name = "terraform-inventory-${version}";
+  pname = "terraform-inventory";
   version = "0.7-pre";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
index 2b2c3caba862..bb634a78e23c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 buildGoPackage rec {
-  name = "terraform-provider-ansible-${version}";
+  pname = "terraform-provider-ansible";
   version = "1.0.3";
 
   goPackagePath = "github.com/nbering/terraform-provider-ansible";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
index ae456185a80d..1aadbbc5ccd3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoModule }:
 buildGoModule rec {
-  name = "terraform-provider-elasticsearch-${version}";
+  pname = "terraform-provider-elasticsearch";
   version = "0.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
index 291698f3065f..4571d368991f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 buildGoPackage rec {
-  name = "terraform-provider-gandi-${version}";
+  pname = "terraform-provider-gandi";
   version = "1.0.0";
 
   goPackagePath = "github.com/tiramiseb/terraform-provider-gandi";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
index fddf13795f3e..06d7b8a9f073 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
@@ -11,7 +11,7 @@
 #
 
 buildGoPackage rec {
-  name = "terraform-provider-ibm-${version}";
+  pname = "terraform-provider-ibm";
   version = "0.11.1";
 
   goPackagePath = "github.com/terraform-providers/terraform-provider-ibm";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
index 96b5c8a0fa1f..23c4f4bfa8b3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
@@ -18,7 +18,7 @@
 # https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples
 
 buildGoPackage rec {
-  name = "terraform-provider-libvirt-${version}";
+  pname = "terraform-provider-libvirt";
   version = "0.5.1";
 
   goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 56c30df37c5b..ddeb5851037b 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
 
 buildGoPackage rec {
-  name = "terragrunt-${version}";
+  pname = "terragrunt";
   version = "0.17.4";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";