From 4a3fc076e4f5a4169f67e8b4208245a3c190c45a Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Mon, 7 Nov 2022 00:38:41 +0100
Subject: clingcon: 5.0.0 -> 5.2.0 and fix build

---
 .../science/logic/potassco/clingcon.nix            |  8 ++------
 .../science/logic/potassco/clingcon_limits.patch   | 24 ----------------------
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/potassco/clingcon_limits.patch

(limited to 'pkgs/applications/science/logic')

diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix
index 2238e490a6034..e024ffb9364e9 100644
--- a/pkgs/applications/science/logic/potassco/clingcon.nix
+++ b/pkgs/applications/science/logic/potassco/clingcon.nix
@@ -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
   '';
diff --git a/pkgs/applications/science/logic/potassco/clingcon_limits.patch b/pkgs/applications/science/logic/potassco/clingcon_limits.patch
deleted file mode 100644
index 0343e10e21125..0000000000000
--- a/pkgs/applications/science/logic/potassco/clingcon_limits.patch
+++ /dev/null
@@ -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.
-- 
cgit 1.4.1