summary refs log tree commit diff
path: root/pkgs/development/tools/build-managers
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-08-13 21:52:01 +0000
committervolth <volth@volth.com>2019-08-17 10:54:38 +0000
commitc814d72b517bb201c8bbbfc64e386c7023352886 (patch)
tree3a7b3bb7326a2087a34e5333aa8dbc367ec2deb1 /pkgs/development/tools/build-managers
parentfe9a3e3e63fa59c8014d454b0efd3231bdd19350 (diff)
downloadnixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar
nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.gz
nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.bz2
nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.lz
nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.xz
nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.zst
nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.zip
treewide: name -> pname
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r--pkgs/development/tools/build-managers/apache-ant/1.9.nix3
-rw-r--r--pkgs/development/tools/build-managers/apache-ant/default.nix3
-rw-r--r--pkgs/development/tools/build-managers/apache-maven/default.nix5
-rw-r--r--pkgs/development/tools/build-managers/bazel/default.nix3
-rw-r--r--pkgs/development/tools/build-managers/gnumake/4.2/default.nix3
-rw-r--r--pkgs/development/tools/build-managers/rebar/default.nix3
6 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
index 8816a005ca0..0a86aaeb6ca 100644
--- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
@@ -3,7 +3,8 @@
 let version = "1.9.6"; in
 
 stdenv.mkDerivation {
-  name = "ant-${version}";
+  pname = "ant";
+  inherit version;
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index b6c2702485b..8d1e09eeb33 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -3,7 +3,8 @@
 let version = "1.10.2"; in
 
 stdenv.mkDerivation {
-  name = "ant-${version}";
+  pname = "ant";
+  inherit version;
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index cde6ea2f7a8..ef339e658c1 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -4,12 +4,13 @@ assert jdk != null;
 
 let version = "3.6.1"; in
 stdenv.mkDerivation rec {
-  name = "apache-maven-${version}";
+  pname = "apache-maven";
+  inherit version;
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz";
+    url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz";
     sha256 = "1rv97g9qr6sifl88rxbsqnz5i79m6ifs36srri08j3y3k5dc6a15";
   };
 
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 1007f4df8ca..df8ccfc0e4a 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -121,7 +121,8 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "bazel-${version}";
+  pname = "bazel";
+  inherit version;
 
   meta = with lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index 47f800c67be..b543565758c 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -6,7 +6,8 @@ let
   version = "4.2.1";
 in
 stdenv.mkDerivation {
-  name = "gnumake-${version}";
+  pname = "gnumake";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://gnu/make/make-${version}.tar.bz2";
diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index 98cd7e136d2..0b858f6f20d 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -5,7 +5,8 @@ let
   version = "2.5.1";
 in
 stdenv.mkDerivation {
-  name = "rebar-${version}";
+  pname = "rebar";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";