summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/science/robotics
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-08-15 12:41:18 +0000
committerJörg Thalheim <Mic92@users.noreply.github.com>2019-08-15 13:41:18 +0100
commit46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch)
tree46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/applications/science/robotics
parentcff9e6429a4341e924594f5e057b03ca8101b314 (diff)
treewide: name -> pname (easy cases) (#66585)
treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
Diffstat (limited to 'pkgs/applications/science/robotics')
-rw-r--r--pkgs/applications/science/robotics/apmplanner2/default.nix2
-rw-r--r--pkgs/applications/science/robotics/gazebo/default.nix4
-rw-r--r--pkgs/applications/science/robotics/qgroundcontrol/default.nix2
-rw-r--r--pkgs/applications/science/robotics/yarp/default.nix2
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix
index 69f355c7b843..678a2ada6d24 100644
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ b/pkgs/applications/science/robotics/apmplanner2/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "apmplanner2-${version}";
+ pname = "apmplanner2";
# TODO revert Qt511 to Qt5 in pkgs/top-level/all-packages.nix on next release
version = "2.0.27-rc1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix
index 98ccd92c4ee5..a3ebda463b91 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@@ -24,10 +24,10 @@
stdenv.mkDerivation rec {
inherit version;
- name = "gazebo-${version}";
+ pname = "gazebo";
src = fetchurl {
- url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2";
+ url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${pname}-${version}.tar.bz2";
sha256 = src-sha256;
};
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index eae5d3766d6d..1863757adbcf 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -6,7 +6,7 @@
}:
stdenv.mkDerivation rec {
- name = "qgroundcontrol-${version}";
+ pname = "qgroundcontrol";
version = "3.3.0";
qtInputs = [
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix
index 507481cddab2..d14c0bb0fe81 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/pkgs/applications/science/robotics/yarp/default.nix
@@ -2,7 +2,7 @@
}:
stdenv.mkDerivation rec {
- name = "yarp-${version}";
+ pname = "yarp";
version = "2.3.70.2";
src = fetchFromGitHub {
owner = "robotology";