From 814b63e93e2aac4e9f4116735fb290bad4756ed8 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 6 Feb 2022 21:45:05 +0100
Subject: treewide: rename name to pname&version

---
 pkgs/development/tools/haskell/hyper-haskell/server.nix   | 3 ++-
 pkgs/development/tools/misc/direvent/default.nix          | 4 ++--
 pkgs/development/tools/misc/distcc/default.nix            | 4 ++--
 pkgs/development/tools/misc/kconfig-frontends/default.nix | 5 ++---
 pkgs/development/tools/misc/patchelf/unstable.nix         | 2 +-
 pkgs/development/tools/misc/premake/3.nix                 | 9 +++------
 pkgs/development/tools/misc/premake/default.nix           | 9 +++------
 7 files changed, 15 insertions(+), 21 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/pkgs/development/tools/haskell/hyper-haskell/server.nix
index 47a9c550fa8b..b8e5aa281eaa 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/server.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix
@@ -3,7 +3,8 @@
 let
 hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self);
 in stdenv.mkDerivation {
-  name = "hyper-haskell-server-with-packages-${hyperHaskellEnv.version}";
+  pname = "hyper-haskell-server-with-packages";
+  version = hyperHaskellEnv.version;
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/development/tools/misc/direvent/default.nix
index cf2a52276038..2763a1eaa21a 100644
--- a/pkgs/development/tools/misc/direvent/default.nix
+++ b/pkgs/development/tools/misc/direvent/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "direvent-${version}";
+  pname = "direvent";
   version = "5.2";
 
   src = fetchurl {
-    url = "mirror://gnu/direvent/${name}.tar.gz";
+    url = "mirror://gnu/direvent/direvent-${version}.tar.gz";
     sha256 = "0m9vi01b1km0cpknflyzsjnknbava0s1n6393b2bpjwyvb6j5613";
   };
 
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index 6de12a84522e..f5fb8e8eeb1a 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -6,10 +6,10 @@
 }:
 
 let
-  name    = "distcc";
+  pname = "distcc";
   version = "2021-03-11";
   distcc = stdenv.mkDerivation {
-    name = "${name}-${version}";
+    inherit pname version;
     src = fetchFromGitHub {
       owner = "distcc";
       repo = "distcc";
diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix
index ae757f0d80d6..03044fe5c444 100644
--- a/pkgs/development/tools/misc/kconfig-frontends/default.nix
+++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix
@@ -1,13 +1,12 @@
 { lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, python3, bash }:
 
 stdenv.mkDerivation rec {
-  basename = "kconfig-frontends";
+  pname = "kconfig-frontends";
   version = "4.11.0.1";
-  name = "${basename}-${version}";
 
   src = fetchurl {
     sha256 = "1xircdw3k7aaz29snf96q2fby1cs48bidz5l1kkj0a5gbivw31i3";
-    url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz";
+    url = "http://ymorin.is-a-geek.org/download/kconfig-frontends/kconfig-frontends-${version}.tar.xz";
   };
 
   nativeBuildInputs = [ bison flex gperf pkg-config ];
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index 740015dbe984..e62805867504 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-${version}";
+  pname = "patchelf";
   version = "2021-11-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix
index 28894743dd65..c05581f5591a 100644
--- a/pkgs/development/tools/misc/premake/3.nix
+++ b/pkgs/development/tools/misc/premake/3.nix
@@ -1,14 +1,11 @@
 {lib, stdenv, fetchurl, unzip}:
 
-let baseName = "premake";
+stdenv.mkDerivation rec {
+  pname = "premake";
   version  = "3.7";
-in
-
-stdenv.mkDerivation {
-  name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sourceforge/premake/${baseName}-src-${version}.zip";
+    url = "mirror://sourceforge/sourceforge/premake/premake-src-${version}.zip";
     sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
   };
 
diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix
index 192a7746203b..35c651f4a18c 100644
--- a/pkgs/development/tools/misc/premake/default.nix
+++ b/pkgs/development/tools/misc/premake/default.nix
@@ -1,14 +1,11 @@
 { lib, stdenv, fetchurl, unzip }:
 
-let baseName = "premake";
+stdenv.mkDerivation rec {
+  pname = "premake";
   version  = "4.3";
-in
-
-stdenv.mkDerivation {
-  name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${baseName}/${baseName}-${version}-src.zip";
+    url = "mirror://sourceforge/premake/premake-${version}-src.zip";
     sha256 = "1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn";
   };
 
-- 
cgit 1.4.1