12 files changed, 38 insertions, 26 deletions
diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix
index 3799f2c9212..1b87b508b6a 100644
--- a/pkgs/development/compilers/aldor/default.nix
+++ b/pkgs/development/compilers/aldor/default.nix
@@ -2,7 +2,8 @@
 , autoconf, automake, libtool, jdk, perl }:
 
 stdenv.mkDerivation {
-  name = "aldor-1.2.0";
+  pname = "aldor";
+  version = "1.2.0";
 
   src = fetchgit {
     url = "https://github.com/pippijn/aldor";
diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix
index 8f560ef6198..55a35176e7b 100644
--- a/pkgs/development/compilers/aliceml/default.nix
+++ b/pkgs/development/compilers/aliceml/default.nix
@@ -1,7 +1,8 @@
 {lib, stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }:
 
 stdenv.mkDerivation {
-  name = "aliceml-1.4-7d44dc8e";
+  pname = "aliceml";
+  version = "1.4-7d44dc8e";
 
   src = fetchgit {
     url = "https://github.com/aliceml/aliceml";
diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix
index 9d360780053..30fd5f52d11 100644
--- a/pkgs/development/compilers/avra/default.nix
+++ b/pkgs/development/compilers/avra/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, autoconf, automake }:
 stdenv.mkDerivation rec {
-  name = "avra-1.3.0";
+  pname = "avra";
+  version = "1.3.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/avra/${name}.tar.bz2";
+    url = "mirror://sourceforge/avra/avra-${version}.tar.bz2";
     sha256 = "04lp0k0h540l5pmnaai07637f0p4zi766v6sfm7cryfaca3byb56";
   };
 
diff --git a/pkgs/development/compilers/bupc/default.nix b/pkgs/development/compilers/bupc/default.nix
index 9b3a291a1a0..94256ed4373 100644
--- a/pkgs/development/compilers/bupc/default.nix
+++ b/pkgs/development/compilers/bupc/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perl, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "berkeley_upc-2.22.0";
+  pname = "berkeley_upc";
+  version = "2.22.0";
 
   src = fetchurl {
-    url = "http://upc.lbl.gov/download/release/${name}.tar.gz";
+    url = "http://upc.lbl.gov/download/release/berkeley_upc-${version}.tar.gz";
     sha256 = "041l215x8z1cvjcx7kwjdgiaf9rl2d778k6kiv8q09bc68nwd44m";
   };
 
diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix
index c52ffa0bafd..a41f836e10c 100644
--- a/pkgs/development/compilers/cmdstan/default.nix
+++ b/pkgs/development/compilers/cmdstan/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, python3, runtimeShell }:
 
-stdenv.mkDerivation {
-  name = "cmdstan-2.17.1";
+stdenv.mkDerivation rec {
+  pname = "cmdstan";
+  version = "2.17.1";
 
   src = fetchurl {
-    url = "https://github.com/stan-dev/cmdstan/releases/download/v2.17.1/cmdstan-2.17.1.tar.gz";
+    url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz";
     sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j";
   };
 
diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
index 454156c2d28..195f0c0e36f 100644
--- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
+++ b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
@@ -1,9 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "meta-build-env-0.1";
+stdenv.mkDerivation rec {
+  pname = "meta-build-env";
+  version = "0.1";
+
   src = fetchurl {
-    url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz";
+    url = "http://www.meta-environment.org/releases/meta-build-env-${version}.tar.gz";
     sha256 = "1imn1gaan4fv73v8w3k3lgyjzkcn7bdp69k6hlz0vqdg17ysd1x3";
   };
 
diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix
index 1710fb986ea..23c75ae28bb 100644
--- a/pkgs/development/compilers/mezzo/default.nix
+++ b/pkgs/development/compilers/mezzo/default.nix
@@ -12,7 +12,8 @@ assert check-ocaml-version "4";
 
 stdenv.mkDerivation {
 
-  name = "mezzo-0.0.m8";
+  pname = "mezzo";
+  version = "0.0.m8";
 
   src = fetchFromGitHub {
     owner = "protz";
diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix
index 45b2454259f..1ffc85a6ada 100644
--- a/pkgs/development/compilers/opendylan/default.nix
+++ b/pkgs/development/compilers/opendylan/default.nix
@@ -2,7 +2,8 @@
 {lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
 
 stdenv.mkDerivation {
-  name = "opendylan-2016.1pre";
+  pname = "opendylan";
+  version = "2016.1pre";
 
   src = fetchgit {
     url = "https://github.com/dylan-lang/opendylan";
diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix
index f47086b1ca2..50603919b8b 100644
--- a/pkgs/development/compilers/stalin/default.nix
+++ b/pkgs/development/compilers/stalin/default.nix
@@ -1,7 +1,8 @@
 { fetchurl, lib, stdenv, ncompress, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "stalin-0.11";
+  pname = "stalin";
+  version = "0.11";
 
   src = fetchurl {
     url = "ftp://ftp.ecn.purdue.edu/qobi/stalin.tar.Z";
@@ -22,16 +23,16 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/share/emacs/site-lisp"
     cp stalin.el "$out/share/emacs/site-lisp"
 
-    mkdir -p "$out/doc/${name}"
-    cp README "$out/doc/${name}"
+    mkdir -p "$out/doc/stalin-${version}"
+    cp README "$out/doc/stalin-${version}"
 
-    mkdir -p "$out/share/${name}/include"
-    cp "include/"* "$out/share/${name}/include"
+    mkdir -p "$out/share/stalin-${version}/include"
+    cp "include/"* "$out/share/stalin-${version}/include"
 
     substituteInPlace "$out/bin/stalin" \
-      --replace "$PWD/include/stalin" "$out/share/${name}/include/stalin"
+      --replace "$PWD/include/stalin" "$out/share/stalin-${version}/include/stalin"
     substituteInPlace "$out/bin/stalin" \
-      --replace "$PWD/include" "$out/share/${name}/include"
+      --replace "$PWD/include" "$out/share/stalin-${version}/include"
   '';
 
   meta = {
diff --git a/pkgs/development/embedded/arduino/ino/default.nix b/pkgs/development/embedded/arduino/ino/default.nix
index 822cfb0e361..e25a7b83e9c 100644
--- a/pkgs/development/embedded/arduino/ino/default.nix
+++ b/pkgs/development/embedded/arduino/ino/default.nix
@@ -2,11 +2,11 @@
 , avrdude, arduino-core }:
 
 python2Packages.buildPythonApplication rec {
-  name = "ino-0.3.6";
-  namePrefix = "";
+  pname = "ino";
+  version = "0.3.6";
 
   src = fetchurl {
-    url = "mirror://pypi/i/ino/${name}.tar.gz";
+    url = "mirror://pypi/i/ino/ino-${version}.tar.gz";
     sha256 = "0k6lzfcn55favbj0w4afrvnmwyskf7bgzg9javv2ycvskp35srwv";
   };
 
diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix
index c3fa6a645e0..56d37dd4e94 100644
--- a/pkgs/development/interpreters/ceptre/default.nix
+++ b/pkgs/development/interpreters/ceptre/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchgit, mlton }:
 
 stdenv.mkDerivation {
-  name = "ceptre-2016-11-27";
+  pname = "ceptre";
+  version = "unstable-2016-11-27";
 
   src = fetchgit {
     url = "https://github.com/chrisamaphone/interactive-lp";
diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix
index 6dcb8bd27c5..ce44624497d 100644
--- a/pkgs/development/interpreters/scsh/default.nix
+++ b/pkgs/development/interpreters/scsh/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchgit, autoreconfHook, scheme48 }:
 
 stdenv.mkDerivation {
-  name = "scsh-0.7pre";
+  pname = "scsh";
+  version = "0.7pre";
 
   src = fetchgit {
     url = "git://github.com/scheme/scsh.git";