diff options
author | John Wiegley <johnw@newartisans.com> | 2018-03-23 22:09:06 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-23 22:09:06 -0700 |
commit | bee172501de3b4496ff81cc1621d307f167e9382 (patch) | |
tree | 408ecb83d11d1719f2e3d9a47d8781ee9d040ac6 /pkgs/applications/science | |
parent | 50d41bb624941dd151a6bf0fd4cb17f0b8d8a5e6 (diff) | |
parent | 6845b248d9c1f897609aa2e1a55302b0475351d4 (diff) | |
download | nixlib-bee172501de3b4496ff81cc1621d307f167e9382.tar nixlib-bee172501de3b4496ff81cc1621d307f167e9382.tar.gz nixlib-bee172501de3b4496ff81cc1621d307f167e9382.tar.bz2 nixlib-bee172501de3b4496ff81cc1621d307f167e9382.tar.lz nixlib-bee172501de3b4496ff81cc1621d307f167e9382.tar.xz nixlib-bee172501de3b4496ff81cc1621d307f167e9382.tar.zst nixlib-bee172501de3b4496ff81cc1621d307f167e9382.zip |
Merge pull request #37591 from vbgl/coq-88beta1
coq: init at 8.8+beta1
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index fb75a9dc6097..2c785472114a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -22,6 +22,7 @@ let "8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m"; "8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8"; "8.7.2" = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w"; + "8.8+beta1" = "19ipmx6bf8wjpk8y29hcginxk7hps4jh1bbihn5icx4qysm81165"; }."${version}"; coq-version = builtins.substring 0 3 version; camlp5 = ocamlPackages.camlp5_strict; @@ -37,7 +38,7 @@ self = stdenv.mkDerivation { inherit camlp5; inherit (ocamlPackages) ocaml; passthru = { - inherit (ocamlPackages) findlib; + inherit (ocamlPackages) findlib num; emacsBufferSetup = pkgs: '' ; Propagate coq paths to children (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") @@ -92,7 +93,7 @@ self = stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ] + buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.num ] ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk; postPatch = '' @@ -116,7 +117,6 @@ self = stdenv.mkDerivation { preConfigure = '' configureFlagsArray=( - -opt ${ideFlags} ) ''; |