summary refs log tree commit diff
path: root/pkgs/applications/science/astronomy
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/astronomy
parentcff9e6429a4341e924594f5e057b03ca8101b314 (diff)
downloadnixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar
nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.gz
nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.bz2
nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.lz
nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.xz
nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.zst
nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.zip
treewide: name -> pname (easy cases) (#66585)
treewide replacement of

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

to pname
Diffstat (limited to 'pkgs/applications/science/astronomy')
-rw-r--r--pkgs/applications/science/astronomy/astrolabe-generator/default.nix2
-rw-r--r--pkgs/applications/science/astronomy/gildas/default.nix2
-rw-r--r--pkgs/applications/science/astronomy/openspace/default.nix2
-rw-r--r--pkgs/applications/science/astronomy/stellarium/default.nix2
-rw-r--r--pkgs/applications/science/astronomy/xearth/default.nix4
5 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
index 3150d41ca9f..32d89866b5a 100644
--- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
+++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "astrolabe-generator-${version}";
+  pname = "astrolabe-generator";
   version = "3.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 9f65c63f7a6..968d8769caa 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -9,7 +9,7 @@ in
 stdenv.mkDerivation rec {
   srcVersion = "jul19a";
   version = "20190701_a";
-  name = "gildas-${version}";
+  pname = "gildas";
 
   src = fetchurl {
     # For each new release, the upstream developers of Gildas move the
diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix
index dc7c7c920a1..cfdd320d201 100644
--- a/pkgs/applications/science/astronomy/openspace/default.nix
+++ b/pkgs/applications/science/astronomy/openspace/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.11.1";
-  name    = "openspace-${version}";
+  pname = "openspace";
 
   src = fetchFromGitHub {
     owner  = "OpenSpace";
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index e3c66199f11..ecca9141d9f 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation rec {
-  name = "stellarium-${version}";
+  pname = "stellarium";
   version = "0.19.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix
index fef4ca1907f..e9fc0607998 100644
--- a/pkgs/applications/science/astronomy/xearth/default.nix
+++ b/pkgs/applications/science/astronomy/xearth/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, imake, gccmakedep, libXt, libXext }:
 
 stdenv.mkDerivation rec {
-  name = "xearth-${version}";
+  pname = "xearth";
   version = "1.1";
 
   src = fetchurl {
-    url = "http://xearth.org/${name}.tar.gz";
+    url = "http://xearth.org/${pname}-${version}.tar.gz";
     sha256 = "bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c";
   };