alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

leo2: 1.6.2 → 1.7.0

Browse source 
Fix build with recent C++ compilers

Use a more recent OCaml (4.05)
This commit is contained in:
Vincent Laporte 2021-10-14 09:45:23 +02:00
parent b580b1fcdb
commit cafe9f88fc
No known key found for this signature in database
GPG key ID: EBD582ADDDB1F81F
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/applications/science/logic/leo2/default.nix
View file

@ -1,20 +1,31 @@
{ lib, stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }: { lib, stdenv, fetchurl, fetchpatch, makeWrapper, eprover, ocaml, camlp4, perl, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "leo2"; pname = "leo2";
version = "1.6.2"; version = "1.7.0";
src = fetchurl { src = fetchurl {
url = "https://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz"; url = "https://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz";
sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv"; sha256 = "sha256:1b2q7vsz6s9ighypsigqjm1mzjiq3xgnz5id5ssb4rh9zm190r82";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ eprover ocaml perl zlib ]; buildInputs = [ eprover ocaml camlp4 perl zlib ];
sourceRoot = "leo2/src"; patches = [ (fetchpatch {
url = "https://github.com/niklasso/minisat/commit/7eb6015313561a2586032574788fcb133eeaa19f.patch";
stripLen = 1;
extraPrefix = "lib/";
sha256 = "sha256:01ln7hi6nvvkqkhn9hciqizizz5qspvqffgksvgmzn9x7kdd9pnh";
})
];
preConfigure = "patchShebangs configure"; preConfigure = ''
cd src
patchShebangs configure
substituteInPlace Makefile.pre \
--replace '+camlp4' "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4"
'';
buildFlags = [ "opt" ]; buildFlags = [ "opt" ];

2
pkgs/top-level/all-packages.nix
View file

@ -31153,7 +31153,7 @@ with pkgs;
mathlibtools = with python3Packages; toPythonApplication mathlibtools; mathlibtools = with python3Packages; toPythonApplication mathlibtools;
leo2 = callPackage ../applications/science/logic/leo2 leo2 = callPackage ../applications/science/logic/leo2
{ ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; }; { inherit (ocaml-ng.ocamlPackages_4_05) ocaml camlp4; };
leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {}; leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {};