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

treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
2019-08-15 13:41:18 +01:00
parent cff9e6429a
commit 46420bbaa3
4616 changed files with 5674 additions and 6081 deletions
@@ -6,7 +6,7 @@ assert sdlSupport -> (SDL != null);

 stdenv.mkDerivation rec {

-  name = "8086tiny-${version}";
+  pname = "8086tiny";
  version = "1.25";

  src = fetchurl {
@@ -2,7 +2,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "aqemu-${version}";
+  pname = "aqemu";
  version = "0.9.2";

  src = fetchFromGitHub {
@@ -18,11 +18,11 @@ assert curlSupport -> (curl != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {

-  name = "bochs-${version}";
+  pname = "bochs";
  version = "2.6.9";

  src = fetchurl {
-    url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz";
    sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf";
  };

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, iasl, flex, bison }:

 stdenv.mkDerivation rec {
-  name = "cbfstool-${version}";
+  pname = "cbfstool";
  version = "4.9";

  src = fetchurl {
@@ -3,7 +3,7 @@
 with lib;

 buildGoPackage rec {
-  name = "containerd-${version}";
+  pname = "containerd";
  version = "1.2.6";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
-  name = "distribution-${version}";
+  pname = "distribution";
  version = "2.6.2";
  rev = "v${version}";

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, p7zip }:
 stdenv.mkDerivation rec {
-  name = "win-virtio-${version}";
+  pname = "win-virtio";
  version = "0.1.141-1";

  phases = [ "buildPhase" "installPhase" ];
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, libelf, libpcap }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "dynamips";
  version = "0.2.21";

@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:

 buildGoPackage rec {
-  name    = "${pname}-${version}";
  pname   = "amazon-ecs-agent";
  version = "1.18.0";

@@ -4,7 +4,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "looking-glass-client-${version}";
+  pname = "looking-glass-client";
  version = "a12";

  src = fetchFromGitHub {
@@ -25,7 +25,7 @@ with lib; let
  };

  nvidia-container-runtime-hook = buildGoPackage rec {
-    name = "nvidia-container-runtime-hook-${version}";
+    pname = "nvidia-container-runtime-hook";
    version = "1.4.0";

    goPackagePath = "nvidia-container-runtime-hook";
@@ -46,7 +46,7 @@ with lib; let
  });

 in stdenv.mkDerivation rec {
-  name = "nvidia-docker-${version}";
+  pname = "nvidia-docker";
  version = "2.0.3";

  src = fetchFromGitHub {
@@ -12,7 +12,7 @@ with lib; let
  };

 in stdenv.mkDerivation rec {
-  name = "libnvidia-container-${version}";
+  pname = "libnvidia-container";
  version = "1.0.0";

  src = fetchFromGitHub {
@@ -5,7 +5,7 @@
  withX ? true }:

 stdenv.mkDerivation rec {
-  name = "open-vm-tools-${version}";
+  pname = "open-vm-tools";
  version = "10.3.10";

  src = fetchFromGitHub {
@@ -4,7 +4,7 @@
 }:

 buildGoPackage rec {
-  name = "podman-${version}";
+  pname = "podman";
  version = "1.4.4";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, perl, perlPackages }:

 stdenv.mkDerivation rec {
-  name = "remotebox-${version}";
+  pname = "remotebox";
  version = "2.6";

  src = fetchurl {
@@ -13,8 +13,8 @@ let

 in stdenv.mkDerivation rec {
  version = "1.30.0";
-  name = "rkt-${version}";
-  BUILDDIR="build-${name}";
+  pname = "rkt";
+  BUILDDIR="build-${pname}-${version}";

  src = fetchFromGitHub {
    owner = "coreos";
@@ -4,7 +4,7 @@
 with lib;

 buildGoPackage rec {
-  name = "runc-${version}";
+  pname = "runc";
  version = "1.0.0-rc8";

  src = fetchFromGitHub {
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {

-  name = "seabios-${version}";
+  pname = "seabios";
  version = "1.11.0";

  src = fetchurl {
-    url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz";
+    url = "http://code.coreboot.org/p/seabios/downloads/get/${pname}-${version}.tar.gz";
    sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2";
  };

@@ -14,7 +14,7 @@
 with lib;

 buildGoPackage rec {
-  name = "singularity-${version}";
+  pname = "singularity";
  version = "3.2.1";

  src = fetchFromGitHub {
@@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  version = "0.18.0";
-  name = "tini-${version}";
+  pname = "tini";

  src = fetchFromGitHub {
    owner = "krallin";
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, openssl, curl, SDL }:

 stdenv.mkDerivation rec {
-  name = "tinyemu-${version}";
+  pname = "tinyemu";
  version = "2018-09-23";
  src = fetchurl {
-    url = "https://bellard.org/tinyemu/${name}.tar.gz";
+    url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz";
    sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v";
  };
  buildInputs = [ openssl curl SDL ];
@@ -5,7 +5,7 @@
 }:

 mkDerivation rec {
-  name = "virt-manager-qt-${version}";
+  pname = "virt-manager-qt";
  version = "0.70.91";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, ocamlPackages, autoreconfHook }:

 stdenv.mkDerivation rec {
-  name = "virt-top-${version}";
+  pname = "virt-top";
  version = "2017-11-18-unstable";

  src = fetchgit {
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "virt-what-${version}";
+  pname = "virt-what";
  version = "1.19";

  src = fetchurl {
-    url = "https://people.redhat.com/~rjones/virt-what/files/${name}.tar.gz";
+    url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz";
    sha256 = "00nhwly5q0ps8yv9cy3c2qp8lfshf3s0kdpwiy5zwk3g77z96rwk";
  };

@@ -1,13 +1,12 @@
 { stdenv, fetchurl, glibc }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "vpcs";
  version = "0.8";

  src = fetchurl {
-    name = "${name}.tar.bz2";
-    url = "mirror://sourceforge/project/${pname}/${version}/${name}-src.tbz";
+    name = "${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz";
    sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw";
  };

@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }:
 stdenv.mkDerivation rec {
-  name = "x11docker-${version}";
+  pname = "x11docker";
  version = "6.0.0";
  src = fetchFromGitHub {
    owner = "mviereck";
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc, zlib }:

 stdenv.mkDerivation rec {
-  name    = "xhyve-${version}";
+  pname = "xhyve";
  version = "20190124";

  src = fetchurl {