clingcon: 5.0.0 -> 5.2.0 and fix build
This commit is contained in:
parent
f54c651ba5
commit
4a3fc076e4
|
@ -7,19 +7,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clingcon";
|
||||
version = "5.0.0";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "potassco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1g2xkz9nsgqnrw3fdf5jchl16f0skj5mm32va61scc2yrchll166";
|
||||
sha256 = "sha256-wZfTneoQSqEnLAVE8WyPh9EABmOEhDgRm6yWAF1T7Nk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./clingcon_limits.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp ${catch2}/include/catch2/catch.hpp libclingcon/tests/catch.hpp
|
||||
'';
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
diff --git i/libclingcon/clingcon/base.hh w/libclingcon/clingcon/base.hh
|
||||
index 2d449fe..0b5fa17 100644
|
||||
--- i/libclingcon/clingcon/base.hh
|
||||
+++ w/libclingcon/clingcon/base.hh
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <clingo.hh>
|
||||
#include <optional>
|
||||
#include <forward_list>
|
||||
+#include <limits>
|
||||
|
||||
//! @file clingcon/base.hh
|
||||
//! Basic data types.
|
||||
diff --git i/libclingcon/clingcon/util.hh w/libclingcon/clingcon/util.hh
|
||||
index df4cddd..308259e 100644
|
||||
--- i/libclingcon/clingcon/util.hh
|
||||
+++ w/libclingcon/clingcon/util.hh
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <map>
|
||||
#include <cstdlib>
|
||||
#include <stdexcept>
|
||||
+#include <limits>
|
||||
|
||||
//! @file clingcon/util.hh
|
||||
//! Very general utility functions.
|
|
@ -3447,7 +3447,7 @@ with pkgs;
|
|||
|
||||
clingo = callPackage ../applications/science/logic/potassco/clingo.nix { };
|
||||
|
||||
clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { stdenv = gcc10StdenvCompat; };
|
||||
clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { };
|
||||
|
||||
clprover = callPackage ../applications/science/logic/clprover/clprover.nix { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue