From 7ac0a231949f23a716e379dfab5aed4d179acc4c Mon Sep 17 00:00:00 2001 From: Théo Zimmermann Date: Wed, 10 Oct 2018 16:24:24 +0200 Subject: prooftree: 0.12 -> 0.13 --- pkgs/applications/science/logic/prooftree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') 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 ]; -- cgit 1.4.1 From 2fdd38ed2df0f6df08154a8982c87d77b9ca7b18 Mon Sep 17 00:00:00 2001 From: Théo Zimmermann Date: Wed, 10 Oct 2018 17:27:19 +0200 Subject: camlp5_transitional: remove in favor of camlp5 (strict) --- pkgs/applications/science/logic/coq/default.nix | 7 +++---- pkgs/development/ocaml-modules/elpi/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- pkgs/top-level/coq-packages.nix | 3 +-- pkgs/top-level/ocaml-packages.nix | 16 ++++------------ 5 files changed, 11 insertions(+), 23 deletions(-) (limited to 'pkgs/applications') 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/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index db188a720b88..3eecb9b45b7d 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, camlp5_strict +{ stdenv, fetchFromGitHub, ocaml, findlib, camlp5 , ppx_tools_versioned, ppx_deriving, re }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ppx_tools_versioned ]; - propagatedBuildInputs = [ camlp5_strict ppx_deriving re ]; + propagatedBuildInputs = [ camlp5 ppx_deriving re ]; createFindlibDestdir = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7596a49bae29..f6db3528430e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21277,9 +21277,7 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = ocamlPackages.callPackage ../applications/science/logic/prooftree { - camlp5 = ocamlPackages.camlp5_strict; - }; + prooftree = ocamlPackages.callPackage ../applications/science/logic/prooftree { }; prover9 = callPackage ../applications/science/logic/prover9 { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 305d9ba351ba..ca367aeb0d1a 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -56,8 +56,7 @@ in rec { filterCoqPackages coq self; coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix { - inherit (ocamlPackages_4_02) ocaml findlib lablgtk; - camlp5 = ocamlPackages_4_02.camlp5_transitional; + inherit (ocamlPackages_4_02) ocaml findlib lablgtk camlp5; }; coq_8_5 = callPackage ../applications/science/logic/coq { ocamlPackages = ocamlPackages_4_05; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0840aa66100b..c9df0f908ee2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -88,15 +88,10 @@ let then callPackage ../development/tools/ocaml/camlp4 { } else null; - camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { }; + camlp5 = callPackage ../development/tools/ocaml/camlp5 { }; - camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 { - transitional = true; - }; - - camlp5_strict = camlp5_6_strict; - - camlp5_transitional = camlp5_6_transitional; + # Compatibility alias + camlp5_strict = camlp5; camlpdf = callPackage ../development/ocaml-modules/camlpdf { }; @@ -1042,10 +1037,7 @@ let enableX11 = config.unison.enableX11 or true; }; - hol_light = callPackage ../applications/science/logic/hol_light { - inherit num; - camlp5 = camlp5_strict; - }; + hol_light = callPackage ../applications/science/logic/hol_light { }; }; in (ocamlPackages.janeStreet // ocamlPackages); -- cgit 1.4.1