From 6a238d4b3edebfc878e470d2a62e00d7337d2dd8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 26 Sep 2015 16:40:07 +0200 Subject: [PATCH] coq-ext-lib: c2c71a2a -> 0.9.0 & 1.0.0-beta2 --- .../coq-modules/coq-ext-lib/default.nix | 21 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index b9939a2e7f4..8282f52c678 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -1,14 +1,21 @@ -{stdenv, fetchgit, coq}: +{ stdenv, fetchFromGitHub, coq }: + +let param = + if coq.coq-version == "8.4" + then { version = "0.9.0"; sha256 = "1n3bk003vvbghbrxkhal6drnc0l65jv9y77wd56is3jw9xgiif0w"; } + else { version = "1.0.0-beta2"; sha256 = "0rdh6jsag174576nvra6m2g44fvmlbz4am5wcashj45bq30021sa"; }; +in stdenv.mkDerivation rec { - name = "coq-ext-lib-${coq.coq-version}-${version}"; - version = "c2c71a2a"; + name = "coq${coq.coq-version}-coq-ext-lib-${version}"; + inherit (param) version; - src = fetchgit { - url = git://github.com/coq-ext-lib/coq-ext-lib.git; - rev = "c2c71a2a90ac87f2ceb311a6da53a6796b916816"; - sha256 = "01sihw3nmvvpc8viwyr01qnqifdcmlg016034xmrfmv863yp8c4g"; + src = fetchFromGitHub { + owner = "coq-ext-lib"; + repo = "coq-ext-lib"; + rev = "v${param.version}"; + inherit (param) sha256; }; buildInputs = [ coq.ocaml coq.camlp5 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f535ee5e0f5..1fc3058b427 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14306,6 +14306,8 @@ let coq = coq_8_5; + coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; + mathcomp = callPackage ../development/coq-modules/mathcomp { }; ssreflect = callPackage ../development/coq-modules/ssreflect { };