diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-11 00:31:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 00:31:28 +0100 |
| commit | c45a6fa041d798755c87cc0092fdb3f0bb775f02 (patch) | |
| tree | 20e1335ec81caf475abadfcbafef99bb4a704815 /pkgs/applications | |
| parent | bde4483d1336333f7c0bcd099a110dd8954c539e (diff) | |
| parent | 2fdd38ed2df0f6df08154a8982c87d77b9ca7b18 (diff) | |
| download | nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.tar nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.tar.gz nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.tar.bz2 nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.tar.lz nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.tar.xz nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.tar.zst nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.zip | |
Merge pull request #48159 from Zimmi48/remove-camlp5-transitional
Remove camlp5 transitional
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/prooftree/default.nix | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 0ede4230aa6d..23f1ff85edf0 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -27,7 +27,6 @@ let "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; }."${version}"; coq-version = builtins.substring 0 3 version; - camlp5 = ocamlPackages.camlp5_strict; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" @@ -37,8 +36,8 @@ self = stdenv.mkDerivation { name = "coq-${version}"; passthru = { - inherit coq-version camlp5; - inherit (ocamlPackages) ocaml findlib num; + inherit coq-version; + inherit (ocamlPackages) ocaml camlp5 findlib num; emacsBufferSetup = pkgs: '' ; Propagate coq paths to children (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") @@ -93,7 +92,7 @@ self = stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.num ] + buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 num ]) ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk; postPatch = '' diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 2d5fcfd2d261..a88a84e3b0d1 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (rec { name = "prooftree-${version}"; - version = "0.12"; + version = "0.13"; src = fetchurl { url = "https://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz"; - sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m"; + sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh"; }; nativeBuildInputs = [ pkgconfig ]; |