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,11 +6,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "cgit-${version}";
+  pname = "cgit";
  version = "1.2.1";

  src = fetchurl {
-    url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
+    url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz";
    sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w";
  };

@@ -1,7 +1,7 @@
 { stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }:

 stdenv.mkDerivation rec {
-  name = "darcs-to-git-${version}";
+  pname = "darcs-to-git";
  version = "2015-06-04";

  src = fetchgit {
@@ -1,7 +1,7 @@
 {stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}:

 stdenv.mkDerivation rec {
-  name = "diff-so-fancy-${version}";
+  pname = "diff-so-fancy";
  version = "1.2.6";

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

 buildGoPackage rec {
-  name = "ghq-${version}";
+  pname = "ghq";
  version = "0.10.2";

  goPackagePath = "github.com/motemen/ghq";
@@ -1,7 +1,7 @@
 { stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }:

 buildPythonApplication rec {
-  name = "git-annex-metadata-gui-${version}";
+  pname = "git-annex-metadata-gui";
  version = "0.2.0";

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

 buildGoPackage rec {
-  name = "git-annex-remote-b2-${version}";
+  pname = "git-annex-remote-b2";
  version = "20151212-${stdenv.lib.strings.substring 0 7 rev}";
  rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rclone, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "git-annex-remote-rclone-${version}";
+  pname = "git-annex-remote-rclone";
  version = "0.6";
  rev = "v${version}";

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

 buildGoPackage rec {
-  name = "git-appraise-unstable-${version}";
+  pname = "git-appraise-unstable";
  version = "2018-02-26";
  rev = "2414523905939525559e4b2498c5597f86193b61";

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

 buildGoPackage rec {
-  name = "git-bug-${version}";
+  pname = "git-bug";
  version = "0.5.0";
  rev = "8d7a2c076a38c89085fd3191a2998efb659650c2";
  goPackagePath = "github.com/MichaelMure/git-bug";
@@ -3,7 +3,7 @@
 , pythonPackages }:

 stdenv.mkDerivation rec {
-  name = "git-bz-${version}";
+  pname = "git-bz";
  version = "3.2015-09-08";

  src = fetchgit {
@@ -4,7 +4,7 @@ let
  inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;

 in buildPythonApplication rec {
-  name = "git-cola-${version}";
+  pname = "git-cola";
  version = "3.4";

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

 stdenv.mkDerivation rec {
-  name = "git-extras-${version}";
+  pname = "git-extras";
  version = "4.7.0";

  src = fetchurl {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gitMinimal, python2Packages }:

 stdenv.mkDerivation rec {
-  name = "git-hub-${version}";
+  pname = "git-hub";
  version = "1.0.3";

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

 stdenv.mkDerivation rec {
-  name = "git-imerge-${version}";
+  pname = "git-imerge";
  version = "1.1.0";

  src = fetchFromGitHub {
@@ -3,7 +3,7 @@
 with stdenv.lib;

 stdenv.mkDerivation rec {
-  name = "git-octopus-${version}";
+  pname = "git-octopus";
  version = "1.4";

  installFlags = [ "prefix=$(out)" ];
@@ -1,7 +1,7 @@
 {stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}:

 stdenv.mkDerivation rec {
-  name = "git-open-${version}";
+  pname = "git-open";
  version = "2.0.0";

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

 stdenv.mkDerivation rec {
-  name = "git-radar-${version}";
+  pname = "git-radar";
  version = "0.6";

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

 stdenv.mkDerivation rec {
-  name = "git-remote-gcrypt-${version}";
+  pname = "git-remote-gcrypt";
  version = "1.2";
  rev = version;

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, git, gnused }:

 stdenv.mkDerivation rec {
-  name = "git-reparent-${version}";
+  pname = "git-reparent";
  version = "unstable-2017-09-03";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, git, coreutils }:

 stdenv.mkDerivation rec {
-  name = "git-secrets-${version}";
+  pname = "git-secrets";
  version = "1.3.0";

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

 stdenv.mkDerivation rec {
-  name = "git-stree-${version}";
+  pname = "git-stree";
  version = "0.4.5";

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

 stdenv.mkDerivation rec {
-  name = "git-sync-${version}";
+  pname = "git-sync";
  version = "20151024";

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

 stdenv.mkDerivation rec {
-  name = "git-test-${version}";
+  pname = "git-test";
  version = "1.0.4";

  src = fetchFromGitHub {
@@ -5,7 +5,6 @@ with pkgs.lib;
 stdenv.mkDerivation rec {
  pname = "gitflow";
  version = "1.12.2";
-  name = "${pname}-${version}";

  src = fetchFromGitHub {
    owner = "petervanderdoes";
@@ -5,12 +5,11 @@
 stdenv.mkDerivation rec {
  pname = "tig";
  version = "2.4.1";
-  name = "${pname}-${version}";

  src = fetchFromGitHub {
    owner = "jonas";
    repo = pname;
-    rev = name;
+    rev = "${pname}-${version}";
    sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd";
  };

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }:

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

  src = fetchFromGitHub {