From 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Thu, 15 Aug 2019 12:41:18 +0000
Subject: treewide: name -> pname (easy cases) (#66585)

treewide replacement of

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

to pname
---
 pkgs/shells/any-nix-shell/default.nix                    | 2 +-
 pkgs/shells/bash/bash-completion/default.nix             | 4 ++--
 pkgs/shells/bash/nix-bash-completions/default.nix        | 2 +-
 pkgs/shells/dgsh/default.nix                             | 2 +-
 pkgs/shells/fish/default.nix                             | 4 ++--
 pkgs/shells/fish/fish-foreign-env/default.nix            | 2 +-
 pkgs/shells/ksh/default.nix                              | 2 +-
 pkgs/shells/mksh/default.nix                             | 2 +-
 pkgs/shells/oh/default.nix                               | 2 +-
 pkgs/shells/powershell/default.nix                       | 2 +-
 pkgs/shells/rc/default.nix                               | 2 +-
 pkgs/shells/rssh/default.nix                             | 4 ++--
 pkgs/shells/tcsh/default.nix                             | 8 ++++----
 pkgs/shells/zsh/antigen/default.nix                      | 2 +-
 pkgs/shells/zsh/gradle-completion/default.nix            | 2 +-
 pkgs/shells/zsh/grml-zsh-config/default.nix              | 2 +-
 pkgs/shells/zsh/oh-my-zsh/default.nix                    | 2 +-
 pkgs/shells/zsh/spaceship-prompt/default.nix             | 2 +-
 pkgs/shells/zsh/zsh-autosuggestions/default.nix          | 2 +-
 pkgs/shells/zsh/zsh-command-time/default.nix             | 2 +-
 pkgs/shells/zsh/zsh-completions/default.nix              | 2 +-
 pkgs/shells/zsh/zsh-history-substring-search/default.nix | 2 +-
 pkgs/shells/zsh/zsh-powerlevel9k/default.nix             | 2 +-
 pkgs/shells/zsh/zsh-syntax-highlighting/default.nix      | 2 +-
 24 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'pkgs/shells')

diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix
index 21f40858ea2..d2b7a4929e1 100644
--- 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 {
diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix
index b5f600da8f7..0476cbd1f3f 100644
--- 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";
   };
 
diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix
index 5ac117cf1e5..affbd219958 100644
--- 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";
diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix
index c3c2da329a9..4fd88d3261b 100644
--- 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 {
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index df8b5d824f1..1ef3c4b6fd9 100644
--- 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";
     };
 
diff --git a/pkgs/shells/fish/fish-foreign-env/default.nix b/pkgs/shells/fish/fish-foreign-env/default.nix
index 445e961c649..b2aecdf6c14 100644
--- 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 {
diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix
index d16704b71d5..74e70feaa8d 100644
--- 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 {
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index 2115e17c332..9b48c5c68a1 100644
--- 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 {
diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix
index 2e200a74f7b..09a54c8a3b8 100644
--- 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";
 
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index a434ef7e4fb..a9b05110f34 100644
--- 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 {
diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix
index 298c4a1c32f..a8a7d4f6e77 100644
--- 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 {
diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix
index d061c888f60..ecefbff7d22 100644
--- 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";
   };
 
diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix
index 43dd8a40480..f13919e52e7 100644
--- 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";
   };
diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix
index cf22207ef09..c754d7bbe58 100644
--- 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";
diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix
index b9047a93a41..ed46a21325c 100644
--- 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 {
diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix
index 0051df7073b..2d7dd4f24aa 100644
--- 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 {
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 6afe6d286ee..61e60e97edd 100644
--- 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;
diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix
index 28b116523ac..4e089dd4d73 100644
--- 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 {
diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
index 6af1869da7e..4e00fee3d27 100644
--- 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 {
diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix
index c81c1ea46c5..3e403b62322 100644
--- 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";
diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix
index 726f2b7ad73..2ed4301e55a 100644
--- 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 {
diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/shells/zsh/zsh-history-substring-search/default.nix
index 42de7d48d83..b7521654667 100644
--- 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 {
diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
index 30c45ea3c9b..00e7612b17b 100644
--- 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";
diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
index b7b44098fd7..741587ef960 100644
--- 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";
-- 
cgit 1.4.1