Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'

39 files changed, 49 insertions, 50 deletions

diff --git a/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix b/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix
index f727728943bd..75beddcd22ca 100644
--- a/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.6.0";
-  name = "papi-${version}";
+  pname = "papi";
 
   src = fetchurl {
     url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz";
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix
index 2ee9144b316d..367fc635c8b9 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "htslib";
   version = "1.9";
 
   src = fetchurl {
-    url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2";
+    url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2";
     sha256 = "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0";
   };
 
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix
index 22bcc56c82ab..e6c58b96e5c7 100644
--- a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
-  name = "mirtk-${version}";
+  pname = "mirtk";
 
   src = fetchFromGitHub {
     owner = "BioMedIA";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix
index 4668839ebb9c..d43331464067 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "QuadProgpp-${version}";
+  pname = "QuadProgpp";
   version = "4b6bd65f09fbff99c172a86d6e96ca74449b323f";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix
index 05373cd1cbda..36576de05631 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix
@@ -7,7 +7,8 @@ let
   version = "3.7.0";
 in
 stdenv.mkDerivation {
-  name = "arpack-${version}";
+  pname = "arpack";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "opencollab";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix
index 286be260052b..9c412f93d137 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation rec {
-  name = "blas-${version}";
+  pname = "blas";
   version = "3.8.0";
 
   src = fetchurl {
-    url = "http://www.netlib.org/blas/${name}.tgz";
+    url = "http://www.netlib.org/blas/${pname}-${version}.tgz";
     sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm";
   };
 
diff --git a/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix
index 16850fb1665e..bc276b9923c8 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.5";
-  name = "brial-${version}";
+  pname = "brial";
 
   src = fetchFromGitHub {
     owner = "BRiAl";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix
index 4746f77a2164..d22858d64d0c 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -61,7 +61,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "caffe2-${version}";
+  pname = "caffe2";
   version = "0.8.1";
   src = fetchFromGitHub {
     owner = "caffe2";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix
index 537fcb93a87e..52c775c9a0d0 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix
@@ -5,8 +5,6 @@ in let
   # SuiteSparse must use the same openblas
   suitesparse = suitesparse_.override { inherit openblas; };
 in stdenv.mkDerivation rec {
-
-  name = "${pname}-${version}";
   pname = "cholmod-extra";
   version = "1.2.0";
 
diff --git a/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
index 40dbfc53e2cb..8a474e06e556 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "clblas-${version}";
+  pname = "clblas";
   version = "2.12";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix
index 2441aff9fa30..5193c2db5c5b 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.21";
-  name = "cliquer-${version}";
+  pname = "cliquer";
 
   # autotoolized version of the original cliquer
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix b/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix
index 645a865eb955..77973a954494 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "ecos-${version}";
+  pname = "ecos";
   version = "2.0.6";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix
index 4ae5ea522555..a93ede63a263 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix
@@ -30,7 +30,8 @@ let
   version = "2017.1.0";
 
   dijitso = pythonPackages.buildPythonPackage {
-    name = "dijitso-${version}";
+    pname = "dijitso";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz";
       sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg";
@@ -54,7 +55,8 @@ let
   };
 
   fiat = pythonPackages.buildPythonPackage {
-    name = "fiat-${version}";
+    pname = "fiat";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz";
       sha256 = "156ybz70n4n7p88q4pfkvbmg1xr2ll80inzr423mki0nml0q8a6l";
@@ -72,7 +74,8 @@ let
   };
 
   ufl = pythonPackages.buildPythonPackage {
-    name = "ufl-${version}";
+    pname = "ufl";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz";
       sha256 = "13ysimmwad429fjjs07j1fw1gq196p021j7mv66hwrljyh8gm1xg";
@@ -90,7 +93,8 @@ let
   };
 
   ffc = pythonPackages.buildPythonPackage {
-    name = "ffc-${version}";
+    pname = "ffc";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz";
       sha256 = "1cw7zsrjms11xrfg7x9wjd90x3w4v5s1wdwa18xqlycqz7cc8wr0";
@@ -109,7 +113,8 @@ let
   };
 
   instant = pythonPackages.buildPythonPackage {
-    name = "instant-${version}";
+    pname = "instant";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/instant/downloads/instant-${version}.tar.gz";
       sha256 = "1rsyh6n04w0na2zirfdcdjip8k8ikb8fc2x94fq8ylc3lpcnpx9q";
@@ -125,7 +130,8 @@ let
 
 in
 stdenv.mkDerivation {
-  name = "dolfin-${version}";
+  pname = "dolfin";
+  inherit version;
   src = fetchurl {
     url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz";
     sha256 = "14hfb5q6rz79zmy742s2fiqkb9j2cgh5bsg99v76apcr84nklyds";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix
index 2891429c8578..6fd16535459a 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   version = "1.0";
   pname = "flintqs";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "sagemath";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix
index 30453086d457..1995fb9c85de 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, openblas, gfortran }:
 
 stdenv.mkDerivation rec {
-  name = "ipopt-${version}";
+  pname = "ipopt";
   version = "3.12.13";
 
   src = fetchurl {
diff --git a/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix
index 51fbd9f14cb4..0f23f08145e9 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   version = "1.23";
   pname = "lcalc";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available
diff --git a/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix b/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix
index be650f3c3ce8..c8f1138d69ff 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "libbraiding-${version}";
+  pname = "libbraiding";
 
   src = fetchFromGitHub {
     owner = "miguelmarco";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix b/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix
index e96ee475d7d2..a2c0dd4fa177 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.02r5";
-  name = "llibhomfly-${version}";
+  pname = "llibhomfly";
 
   src = fetchFromGitHub {
     owner = "miguelmarco";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
index 46538d0022e7..2e5bb5e371f5 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -12,7 +12,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "liblapack-${version}";
+  pname = "liblapack";
+  inherit version;
   src = fetchurl {
     url = "http://www.netlib.org/lapack/lapack-${version}.tar.gz";
     sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix
index 3cf5c3619a9e..b0cfbca5aa33 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix
@@ -1,7 +1,6 @@
 {stdenv, fetchurl, gmp}:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "lrs";
   version = "7.0";
 
diff --git a/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix b/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix
index b9ee1e2a10d7..b8c4fa671484 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "20140914";
-  name = "m4ri-${version}";
+  pname = "m4ri";
 
   src = fetchFromBitbucket {
     owner = "malb";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix
index 23fc03655cf3..6a664b1dffff 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "20150908";
-  name = "m4rie-${version}";
+  pname = "m4rie";
 
   src = fetchFromBitbucket {
     owner = "malb";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix
index 8444d88809af..d036e39d01ae 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix
@@ -5,7 +5,8 @@ with stdenv.lib;
 let version = "2.0.2";
 
 in stdenv.mkDerivation {
-  name = "magma-${version}";
+  pname = "magma";
+  inherit version;
   src = fetchurl {
     url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz";
     sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
index d967bbf8c3e1..f8d392691ab2 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
@@ -86,13 +86,13 @@ let
   mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");
 in
 stdenv.mkDerivation rec {
-  name = "openblas-${version}";
-  version = "0.3.6";
+  pname = "openblas";
+  version = "0.3.7";
   src = fetchFromGitHub {
     owner = "xianyi";
     repo = "OpenBLAS";
     rev = "v${version}";
-    sha256 = "12vg0g3s4m49fr8z04j15yrgscqnaaflnkckjbffqxnrf90fcav1";
+    sha256 = "0vs1dlzyla02wajpkfzz8x3lfpgmwiaaizq2nmdjbkzkb7jnxhhz";
   };
 
   inherit blas64;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
index 01b0faf89f90..6fc96623a33c 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "openlibm-${version}";
+  pname = "openlibm";
   version = "0.6.0";
   src = fetchurl {
     url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix
index 2dd63ebfc854..c6e065320a26 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -4,7 +4,7 @@
 , pythonProtobuf }:
 
 stdenv.mkDerivation rec {
-  name = "or-tools-${version}";
+  pname = "or-tools";
   version = "v7.0";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix
index ca35ce2f4134..3a9ef7704596 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "parmetis-${version}";
+  pname = "parmetis";
   version = "4.0.3";
 
   src = fetchurl {
diff --git a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
index ac8129c9032f..c2eda9dac48b 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
@@ -6,7 +6,7 @@
 , python }:
 
 stdenv.mkDerivation rec {
-  name = "petsc-${version}";
+  pname = "petsc";
   version = "3.8.4";
 
   src = fetchurl {
diff --git a/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix b/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix
index 7394fb9e1b41..e7dfaecf1de0 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   pname = "planarity";
   version = "3.0.0.5";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "graph-algorithms";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
index 3eee63dbf4f6..faa219044bd3 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "primesieve-${version}";
+  pname = "primesieve";
   version = "7.4";
 
   nativeBuildInputs = [cmake];
diff --git a/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix b/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix
index fda54fe44ab1..66c573245db1 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   pname = "rankwidth";
   version = "0.7";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sageupstream/rw/rw-${version}.tar.gz";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix b/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix
index 624885c501aa..207406388e0e 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   pname = "rubiks";
   version = "20070912";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix
index b4c6574d13a6..14277c8c6318 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -4,7 +4,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "scalapack-${version}";
+  pname = "scalapack";
   version = "2.0.2";
 
   src = fetchurl {
diff --git a/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix
index f9d1a84b1f03..51a72585c0cf 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
-  name = "scs-${version}";
+  pname = "scs";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix
index 7e71eafef697..48de128edc53 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix
@@ -5,7 +5,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "4.2.1";
-  name = "suitesparse-${version}";
+  pname = "suitesparse";
   src = fetchurl {
     url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ;
     sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix b/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix
index 9938a3096a02..570c98144856 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.2.1";
-  name = "superlu-${version}";
+  pname = "superlu";
 
   src = fetchurl {
     url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_${version}.tar.gz";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
index 2e543abd411b..e67f61599b57 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.023.5";
-  name = "sympow-${version}";
+  pname = "sympow";
 
   src = fetchFromGitLab {
     group = "rezozer";
diff --git a/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix b/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix
index ad4d4c017376..4ee6f6cb9927 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix
@@ -10,7 +10,6 @@
 stdenv.mkDerivation rec {
   version = "0.9.1";
   pname = "zn_poly";
-  name = "${pname}-${version}";
 
   # sage has picked up the maintenance (bug fixes and building, not development)
   # from the original, now unmaintained project which can be found at
diff --git a/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix b/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix
index 5f2263d821d0..640eefbd7336 100644
--- a/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix
@@ -2,11 +2,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ispike-${version}";
+  pname = "ispike";
   version = "2.1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ispike/${name}.tar.gz";
+    url = "mirror://sourceforge/ispike/${pname}-${version}.tar.gz";
     sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp";
   };