Merge pull request #25631 from rht/master
Use consistent package naming for HEAD.nix files
This commit is contained in:
commit
87e7faa937
@ -1,7 +1,8 @@
|
|||||||
{ stdenv, fetchgit, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
|
{ stdenv, fetchgit, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
|
||||||
|
|
||||||
stdenv.mkDerivation (rec {
|
stdenv.mkDerivation (rec {
|
||||||
name = "ProofGeneral-HEAD";
|
name = "ProofGeneral-unstable-${version}";
|
||||||
|
version = "2017-03-13";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/ProofGeneral/PG.git";
|
url = "https://github.com/ProofGeneral/PG.git";
|
||||||
|
@ -12,7 +12,7 @@ let
|
|||||||
|
|
||||||
commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
|
commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
|
||||||
|
|
||||||
version = "8.1.20170106";
|
version = "2017-01-06";
|
||||||
rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
|
rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
|
||||||
|
|
||||||
commonPreConfigure = ''
|
commonPreConfigure = ''
|
||||||
@ -29,7 +29,7 @@ let
|
|||||||
'';
|
'';
|
||||||
in stdenv.mkDerivation (rec {
|
in stdenv.mkDerivation (rec {
|
||||||
inherit version rev;
|
inherit version rev;
|
||||||
name = "ghc-${version}";
|
name = "ghc-unstable-${version}";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "git://git.haskell.org/ghc.git";
|
url = "git://git.haskell.org/ghc.git";
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{ fetchgit, fetchFromGitHub, bootPkgs }:
|
{ fetchgit, fetchFromGitHub, bootPkgs }:
|
||||||
|
|
||||||
bootPkgs.callPackage ./base.nix {
|
bootPkgs.callPackage ./base.nix {
|
||||||
version = "0.2.020170323";
|
version = "2017-03-23";
|
||||||
|
|
||||||
inherit bootPkgs;
|
inherit bootPkgs;
|
||||||
|
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
name = "coq-fiat-${coq.coq-version}-${version}";
|
name = "coq-fiat-${coq.coq-version}-unstable-${version}";
|
||||||
version = "20161024";
|
version = "2016-10-24";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/mit-plv/fiat.git";
|
url = "https://github.com/mit-plv/fiat.git";
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
, git, xorg, gnum4, libxcb, gperf }:
|
, git, xorg, gnum4, libxcb, gperf }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
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 {
|
src = fetchgit {
|
||||||
url = http://anongit.freedesktop.org/git/xcb/util-cursor.git;
|
url = http://anongit.freedesktop.org/git/xcb/util-cursor.git;
|
||||||
|
Loading…
Reference in New Issue
Block a user