pkgs/applications: rename name to pname&version part 2

7 files changed, 52 insertions, 30 deletions

diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix
index 02c4c134f92e9..6ce03008d3a98 100644
--- a/pkgs/applications/science/math/csdp/default.nix
+++ b/pkgs/applications/science/math/csdp/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, blas, gfortran, lapack }:
 
-stdenv.mkDerivation {
-  name = "csdp-6.1.1";
+stdenv.mkDerivation rec {
+  pname = "csdp";
+  version = "6.1.1";
 
   src = fetchurl {
-    url = "https://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz";
+    url = "https://www.coin-or.org/download/source/Csdp/Csdp-${version}.tgz";
     sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05";
   };
 
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index 58b2a617bd63f..808d89ef96361 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -1,5 +1,13 @@
-{ lib, stdenv, fetchurl, ocamlPackages, makeWrapper
-, libGLU, libGL, freeglut, mpfr, gmp
+{ lib
+, stdenv
+, fetchurl
+, ocamlPackages
+, makeWrapper
+, libGLU
+, libGL
+, freeglut
+, mpfr
+, gmp
 , pkgsHostTarget
 }:
 
@@ -7,24 +15,32 @@ let
   inherit (pkgsHostTarget.targetPackages.stdenv) cc;
 in
 
-stdenv.mkDerivation {
-  name = "glsurf-3.3.1";
+stdenv.mkDerivation rec {
+  pname = "glsurf";
+  version = "3.3.1";
 
   src = fetchurl {
-    url = "https://raffalli.eu/~christophe/glsurf/glsurf-3.3.1.tar.gz";
+    url = "https://raffalli.eu/~christophe/glsurf/glsurf-${version}.tar.gz";
     sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
   };
 
   nativeBuildInputs = [
     makeWrapper
   ] ++ (with ocamlPackages; [
-    ocaml findlib
+    ocaml
+    findlib
   ]);
 
   buildInputs = [
-    freeglut libGL libGLU mpfr gmp
+    freeglut
+    libGL
+    libGLU
+    mpfr
+    gmp
   ] ++ (with ocamlPackages; [
-    camlp4 lablgl camlimages_4_2_4
+    camlp4
+    lablgl
+    camlimages_4_2_4
   ]);
 
   postPatch = ''
diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix
index 5c0de33a71ae1..3ddcd6206d688 100644
--- a/pkgs/applications/science/math/jags/default.nix
+++ b/pkgs/applications/science/math/jags/default.nix
@@ -1,9 +1,11 @@
-{lib, stdenv, fetchurl, gfortran, blas, lapack}:
+{ lib, stdenv, fetchurl, gfortran, blas, lapack }:
 
 stdenv.mkDerivation rec {
-  name = "JAGS-4.3.0";
+  pname = "JAGS";
+  version = "4.3.0";
+
   src = fetchurl {
-    url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz";
+    url = "mirror://sourceforge/mcmc-jags/JAGS-${version}.tar.gz";
     sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica";
   };
 
@@ -15,8 +17,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Just Another Gibbs Sampler";
-    license     = licenses.gpl2;
-    homepage    = "http://mcmc-jags.sourceforge.net";
+    license = licenses.gpl2;
+    homepage = "http://mcmc-jags.sourceforge.net";
     maintainers = [ maintainers.andres ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix
index 88db3c4b2e92c..90a7ada99504b 100644
--- a/pkgs/applications/science/math/mathematica/9.nix
+++ b/pkgs/applications/science/math/mathematica/9.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , coreutils
 , patchelf
 , requireFile
@@ -22,11 +23,11 @@ let
       throw "Mathematica requires i686-linux or x86_64 linux";
 in
 stdenv.mkDerivation rec {
-
-  name = "mathematica-9.0.0";
+  pname = "mathematica";
+  version = "9.0.0";
 
   src = requireFile {
-    name = "Mathematica_9.0.0_LINUX.sh";
+    name = "Mathematica_${version}_LINUX.sh";
     message = ''
       This nix expression requires that Mathematica_9.0.0_LINUX.sh is
       already part of the store. Find the file on your Mathematica CD
@@ -61,7 +62,7 @@ stdenv.mkDerivation rec {
 
   ldpath = lib.makeLibraryPath buildInputs
     + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux")
-      (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs);
+    (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs);
 
   phases = "unpackPhase installPhase fixupPhase";
 
diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix
index 588df51554ab9..6456608e7dbc1 100644
--- a/pkgs/applications/science/math/msieve/default.nix
+++ b/pkgs/applications/science/math/msieve/default.nix
@@ -1,10 +1,11 @@
-{lib, stdenv, fetchurl, zlib, gmp, ecm }:
+{ lib, stdenv, fetchurl, zlib, gmp, ecm }:
 
-stdenv.mkDerivation {
-  name = "msieve-1.53";
+stdenv.mkDerivation rec {
+  pname = "msieve";
+  version = "1.53";
 
   src = fetchurl {
-    url = "mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz";
+    url = "mirror://sourceforge/msieve/msieve/Msieve%20v${version}/msieve${lib.replaceStrings ["."] [""] version}_src.tar.gz";
     sha256 = "1d1vv7j4rh3nnxsmvafi73qy7lw7n3akjlm5pjl3m936yapvmz65";
   };
 
diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix
index d53236d8070cc..4545203dacca0 100644
--- a/pkgs/applications/science/math/perseus/default.nix
+++ b/pkgs/applications/science/math/perseus/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation {
-  name = "perseus-4-beta";
+  pname = "perseus";
   version = "4-beta";
   nativeBuildInputs = [ unzip ];
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     '';
     homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [erikryb];
+    maintainers = with lib.maintainers; [ erikryb ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/applications/science/math/ries/default.nix
index e46553d7b09ed..eb759723256db 100644
--- a/pkgs/applications/science/math/ries/default.nix
+++ b/pkgs/applications/science/math/ries/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchzip }:
-stdenv.mkDerivation {
-  name = "ries-2018-04-11";
+stdenv.mkDerivation rec {
+  pname = "ries";
+  version = "2018.04.11-1";
 
   # upstream does not provide a stable link
   src = fetchzip {
-    url = "https://salsa.debian.org/debian/ries/-/archive/debian/2018.04.11-1/ries-debian-2018.04.11-1.zip";
+    url = "https://salsa.debian.org/debian/ries/-/archive/debian/${version}/ries-debian-${version}.zip";
     sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842";
   };