diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-04-13 22:16:48 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-04-13 22:16:48 +0300 |
| commit | 0420a532e9ac71d9e7f6107acf4fac8eaa4d14fe (patch) | |
| tree | cba8fb7cab629f3afa4d44b670b2a8fb436f8275 | |
| parent | b338187e71829bbf2c0a51bfd8db065864c62ab8 (diff) | |
| parent | 618b336808a320aa134b0ed730b1bcfbc6c3ce23 (diff) | |
| download | nixlib-0420a532e9ac71d9e7f6107acf4fac8eaa4d14fe.tar nixlib-0420a532e9ac71d9e7f6107acf4fac8eaa4d14fe.tar.gz nixlib-0420a532e9ac71d9e7f6107acf4fac8eaa4d14fe.tar.bz2 nixlib-0420a532e9ac71d9e7f6107acf4fac8eaa4d14fe.tar.lz nixlib-0420a532e9ac71d9e7f6107acf4fac8eaa4d14fe.tar.xz nixlib-0420a532e9ac71d9e7f6107acf4fac8eaa4d14fe.tar.zst nixlib-0420a532e9ac71d9e7f6107acf4fac8eaa4d14fe.zip | |
Merge pull request #14649 from vbgl/coq_8.5.1
Coq 8.5pl1
| -rw-r--r-- | pkgs/applications/science/logic/coq/8.5.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/coq-modules/coq-ext-lib/default.nix | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix index 104fb02fc450..1485626125d2 100644 --- a/pkgs/applications/science/logic/coq/8.5.nix +++ b/pkgs/applications/science/logic/coq/8.5.nix @@ -6,7 +6,7 @@ {stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: let - version = "8.5"; + version = "8.5pl1"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -23,8 +23,8 @@ stdenv.mkDerivation { inherit ocaml camlp5; src = fetchurl { - url = https://coq.inria.fr/distrib/V8.5/files/coq-8.5.tar.gz; - sha256 = "0gdfm6k5q1f8sz1xr9ijdkkvwqsb7v8prj21gmwv0z0yp6w2zac9"; + url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; + sha256 = "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 2eeb6b207b10..d35c062d6e4e 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchFromGitHub, coq }: let param = - if coq.coq-version == "8.4" - then { version = "0.9.0"; sha256 = "1n3bk003vvbghbrxkhal6drnc0l65jv9y77wd56is3jw9xgiif0w"; } - else { version = "0.9.0-beta3"; sha256 = "1dya0sqp5jjb2cl7cv2ry4gvcr359bkzzqcz0plknf3f1c5zrv0s"; }; + { + "8.4" = { version = "0.9.0"; sha256 = "1n3bk003vvbghbrxkhal6drnc0l65jv9y77wd56is3jw9xgiif0w"; }; + "8.5" = { version = "0.9.3"; sha256 = "05zff5mrkxpvcsw4gi8whjj5w0mdbqzjmb247lq5b7mry0bypwc5"; }; + }."${coq.coq-version}"; in stdenv.mkDerivation rec { |