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

treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
2019-08-15 12:41:18 +00:00
parent cff9e6429a
commit 46420bbaa3
4616 changed files with 5674 additions and 6081 deletions
--- a/pkgs/shells/any-nix-shell/default.nix
+++ b/pkgs/shells/any-nix-shell/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "any-nix-shell-${version}";
+  pname = "any-nix-shell";
  version = "1.1.0";

  src = fetchFromGitHub {
--- a/pkgs/shells/bash/bash-completion/default.nix
+++ b/pkgs/shells/bash/bash-completion/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "bash-completion-${version}";
+  pname = "bash-completion";
  version = "2.8";

  src = fetchurl {
-    url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/scop/bash-completion/releases/download/${version}/${pname}-${version}.tar.xz";
    sha256 = "0kgmflrr1ga9wfk770vmakna3nj46ylb5ky9ipd0v2k9ymq5a7y0";
  };

--- a/pkgs/shells/bash/nix-bash-completions/default.nix
+++ b/pkgs/shells/bash/nix-bash-completions/default.nix
@@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  version = "0.6.7";
-  name = "nix-bash-completions-${version}";
+  pname = "nix-bash-completions";

  src = fetchFromGitHub {
    owner = "hedning";
--- a/pkgs/shells/dgsh/default.nix
+++ b/pkgs/shells/dgsh/default.nix
@@ -4,7 +4,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "dgsh-unstable-${version}";
+  pname = "dgsh-unstable";
  version = "2017-02-05";

  src = fetchFromGitHub {
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -88,7 +88,7 @@ let
  '';

  fish = stdenv.mkDerivation rec {
-    name = "fish-${version}";
+    pname = "fish";
    version = "3.0.2";

    etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
@@ -96,7 +96,7 @@ let
    src = fetchurl {
      # There are differences between the release tarball and the tarball github packages from the tag
      # Hence we cannot use fetchFromGithub
-      url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${name}.tar.gz";
+      url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz";
      sha256 = "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl";
    };

--- a/pkgs/shells/fish/fish-foreign-env/default.nix
+++ b/pkgs/shells/fish/fish-foreign-env/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnused, bash, coreutils }:

 stdenv.mkDerivation rec {
-  name = "fish-foreign-env-${version}";
+  pname = "fish-foreign-env";
  version = "git-20170324";

  src = fetchFromGitHub {
--- a/pkgs/shells/ksh/default.nix
+++ b/pkgs/shells/ksh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }:

 stdenv.mkDerivation rec {
-  name = "ksh-${version}";
+  pname = "ksh";
  version = "93v";

  src = fetchFromGitHub {
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "mksh-${version}";
+  pname = "mksh";
  version = "57";

  src = fetchurl {
--- a/pkgs/shells/oh/default.nix
+++ b/pkgs/shells/oh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:

 buildGoPackage rec {
-  name = "oh-${version}";
+  pname = "oh";
  version = "20160522-${stdenv.lib.strings.substring 0 7 rev}";
  rev = "0daaf4081475fb9d6b3801c85019bdd57b2ee9b4";

--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx"
                       (if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]);
 in
 stdenv.mkDerivation rec {
-  name = "powershell-${version}";
+  pname = "powershell";
  version = "6.2.2";

  src = fetchzip {
--- a/pkgs/shells/rc/default.nix
+++ b/pkgs/shells/rc/default.nix
@@ -5,7 +5,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "rc-${version}";
+  pname = "rc";
  version = "1.7.4";

  src = fetchurl {
--- a/pkgs/shells/rssh/default.nix
+++ b/pkgs/shells/rssh/default.nix
@@ -5,11 +5,11 @@
 { stdenv, fetchurl, openssh, rsync, cvs }:

 stdenv.mkDerivation rec {
-  name = "rssh-${version}";
+  pname = "rssh";
  version = "2.3.4";

  src = fetchurl {
-    url = "mirror://sourceforge/rssh/rssh/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/rssh/rssh/${version}/${pname}-${version}.tar.gz";
    sha256 = "f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9";
  };

--- a/pkgs/shells/tcsh/default.nix
+++ b/pkgs/shells/tcsh/default.nix
@@ -2,14 +2,14 @@
 , ncurses }:

 stdenv.mkDerivation rec {
-  name = "tcsh-${version}";
+  pname = "tcsh";
  version = "6.21.00";

  src = fetchurl {
    urls = [
-      "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${name}.tar.gz"
-      "ftp://ftp.astron.com/pub/tcsh/${name}.tar.gz"
-      "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz"
+      "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz"
+      "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz"
+      "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz"
    ];
    sha256 = "0wp9cqkzdj5ahfyg9bn5z1wnyblqyv9vz4sc5aqmj7rp91a34f64";
  };
--- a/pkgs/shells/zsh/antigen/default.nix
+++ b/pkgs/shells/zsh/antigen/default.nix
@@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  version = "2.2.3";
-  name = "antigen-${version}";
+  pname = "antigen";

  src = fetchurl {
    url = "https://github.com/zsh-users/antigen/releases/download/v${version}/antigen.zsh";
--- a/pkgs/shells/zsh/gradle-completion/default.nix
+++ b/pkgs/shells/zsh/gradle-completion/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:

 stdenv.mkDerivation rec {
-  name = "gradle-completion-${version}";
+  pname = "gradle-completion";
  version = "1.4.1";

  src = fetchFromGitHub {
--- a/pkgs/shells/zsh/grml-zsh-config/default.nix
+++ b/pkgs/shells/zsh/grml-zsh-config/default.nix
@@ -4,7 +4,7 @@
 with lib;

 stdenv.mkDerivation rec {
-  name = "grml-zsh-config-${version}";
+  pname = "grml-zsh-config";
  version = "0.16.0";

  src = fetchFromGitHub {
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,7 +5,7 @@

 stdenv.mkDerivation rec {
  version = "2019-08-07";
-  name = "oh-my-zsh-${version}";
+  pname = "oh-my-zsh";
  rev = "40fafe0f59371d1a9d83b83c614acfd1d740aabb";

  src = fetchgit { inherit rev;
--- a/pkgs/shells/zsh/spaceship-prompt/default.nix
+++ b/pkgs/shells/zsh/spaceship-prompt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:

 stdenv.mkDerivation rec{
-  name = "spaceship-prompt-${version}";
+  pname = "spaceship-prompt";
  version = "3.7.1";

  src = fetchFromGitHub {
--- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix
+++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
@@ -3,7 +3,7 @@
 # To make use of this derivation, use the `programs.zsh.enableAutoSuggestions` option

 stdenv.mkDerivation rec {
-  name = "zsh-autosuggestions-${version}";
+  pname = "zsh-autosuggestions";
  version = "0.6.3";

  src = fetchFromGitHub {
--- a/pkgs/shells/zsh/zsh-command-time/default.nix
+++ b/pkgs/shells/zsh/zsh-command-time/default.nix
@@ -10,7 +10,7 @@

 stdenv.mkDerivation rec {
  version = "2018-04-30";
-  name = "zsh-command-time-${version}";
+  pname = "zsh-command-time";

  src = fetchFromGitHub {
    owner = "popstas";
--- a/pkgs/shells/zsh/zsh-completions/default.nix
+++ b/pkgs/shells/zsh/zsh-completions/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub}:

 stdenv.mkDerivation rec {
-  name = "zsh-completions-${version}";
+  pname = "zsh-completions";
  version = "0.30.0";

  src = fetchFromGitHub {
--- a/pkgs/shells/zsh/zsh-history-substring-search/default.nix
+++ b/pkgs/shells/zsh/zsh-history-substring-search/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:

 stdenv.mkDerivation rec {
-  name = "zsh-history-substring-search-${version}";
+  pname = "zsh-history-substring-search";
  version = "1.0.1";

  src = fetchFromGitHub {
--- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
@@ -4,7 +4,7 @@
 # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";`

 stdenv.mkDerivation rec {
-  name = "powerlevel9k-${version}";
+  pname = "powerlevel9k";
  version = "2017-11-10";
  src = fetchFromGitHub {
    owner = "bhilburn";
--- a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
+++ b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
@@ -4,7 +4,7 @@

 stdenv.mkDerivation rec {
  version = "0.6.0";
-  name = "zsh-syntax-highlighting-${version}";
+  pname = "zsh-syntax-highlighting";

  src = fetchFromGitHub {
    owner = "zsh-users";