Merge pull request #25631 from rht/master

Use consistent package naming for HEAD.nix files

5 files changed, 9 insertions, 7 deletions

diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
index 5d44173729db..0f6227a44a38 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchgit, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
 
 stdenv.mkDerivation (rec {
-  name = "ProofGeneral-HEAD";
+  name = "ProofGeneral-unstable-${version}";
+  version = "2017-03-13";
 
   src = fetchgit {
     url = "https://github.com/ProofGeneral/PG.git";
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 006a9f8fbc46..1bf2d4b0ef03 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -12,7 +12,7 @@ let
 
   commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
-  version = "8.1.20170106";
+  version = "2017-01-06";
   rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
 
   commonPreConfigure =  ''
@@ -29,7 +29,7 @@ let
   '';
 in stdenv.mkDerivation (rec {
   inherit version rev;
-  name = "ghc-${version}";
+  name = "ghc-unstable-${version}";
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix
index 591660f5c347..70f2b942e72c 100644
--- a/pkgs/development/compilers/ghcjs/head.nix
+++ b/pkgs/development/compilers/ghcjs/head.nix
@@ -1,7 +1,7 @@
 { fetchgit, fetchFromGitHub, bootPkgs }:
 
 bootPkgs.callPackage ./base.nix {
-  version = "0.2.020170323";
+  version = "2017-03-23";
 
   inherit bootPkgs;
 
diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix
index a92c14bdbff6..fe9f3307b7aa 100644
--- a/pkgs/development/coq-modules/fiat/HEAD.nix
+++ b/pkgs/development/coq-modules/fiat/HEAD.nix
@@ -2,8 +2,8 @@
 
 stdenv.mkDerivation rec {
 
-  name = "coq-fiat-${coq.coq-version}-${version}";
-  version = "20161024";
+  name = "coq-fiat-${coq.coq-version}-unstable-${version}";
+  version = "2016-10-24";
 
   src = fetchgit {
     url = "https://github.com/mit-plv/fiat.git";
diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index af1a3b4e095e..81ac75489baf 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -2,7 +2,8 @@
 , git, xorg, gnum4, libxcb, gperf }:
 
 stdenv.mkDerivation rec {
-  name = "xcb-util-cursor-0.1.1-3-gf03cc27";
+  name = "xcb-util-cursor-0.1.1-3-unstable-${version}";
+  version = "2017-04-05";
 
   src = fetchgit {
     url    = http://anongit.freedesktop.org/git/xcb/util-cursor.git;