gringo: remove at 4.5.4

The gringo binary is part of the clingo package
This commit is contained in:
Vincent Laporte 2022-11-24 22:31:36 +01:00 committed by Robert Schütz
parent 3265a24b79
commit b41229b19d
6 changed files with 4 additions and 84 deletions

View File

@ -5,7 +5,7 @@
, catch2
, clasp
, cmake
, gringo
, clingo
, re2c
}:
@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ boost clasp gringo re2c ];
buildInputs = [ boost clasp clingo re2c ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DASPCUD_GRINGO_PATH=${gringo}/bin/gringo"
"-DASPCUD_GRINGO_PATH=${clingo}/bin/gringo"
"-DASPCUD_CLASP_PATH=${clasp}/bin/clasp"
];

View File

@ -1,57 +0,0 @@
{ lib, stdenv, fetchurl,
bison, re2c, sconsPackages,
libcxx, libcxxabi
}:
stdenv.mkDerivation rec {
pname = "gringo";
version = "4.5.4";
src = fetchurl {
url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz";
sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41";
};
buildInputs = [ bison re2c sconsPackages.scons_3_1_2 ];
patches = [
./gringo-4.5.4-cmath.patch
./gringo-4.5.4-to_string.patch
];
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace ./SConstruct \
--replace \
"env['CXX'] = 'g++'" \
"env['CXX'] = '$CXX'"
substituteInPlace ./SConstruct \
--replace \
"env['CPPPATH'] = []" \
"env['CPPPATH'] = ['${lib.getDev libcxx}/include/c++/v1']"
substituteInPlace ./SConstruct \
--replace \
"env['LIBPATH'] = []" \
"env['LIBPATH'] = ['${lib.getLib libcxx}/lib', '${lib.getLib libcxxabi}/lib']"
'' + ''
sed '1i#include <limits>' -i libgringo/gringo/{control,term}.hh
'';
buildPhase = ''
scons WITH_PYTHON= --build-dir=release
'';
installPhase = ''
mkdir -p $out/bin
cp build/release/gringo $out/bin/gringo
'';
meta = with lib; {
description = "Converts input programs with first-order variables to equivalent ground programs";
homepage = "http://potassco.sourceforge.net/";
platforms = platforms.all;
maintainers = [ maintainers.hakuch ];
license = licenses.gpl3Plus;
};
}

View File

@ -1,11 +0,0 @@
--- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400
+++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400
@@ -22,6 +22,8 @@
#include "gringo/logger.hh"
#include "gringo/graph.hh"
+#include <cmath>
+
namespace Gringo {
// {{{ definition of Defines

View File

@ -1,11 +0,0 @@
--- gringo/libgringo/gringo/bug.hh~ 2014-03-10 12:19:26.000000000 -0400
+++ gringo/libgringo/gringo/bug.hh 2016-11-12 07:51:55.288563663 -0500
@@ -32,7 +32,7 @@
#define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) std::make_move_iterator(_Iter)
#define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) std::make_move_iterator(_Iter)
-#ifdef MISSING_STD_TO_STRING
+#if 0
#include <sstream>

View File

@ -584,6 +584,7 @@ mapAliases ({
grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22
gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05
gringo = clingo; # added 2022-11-27
gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16
gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16
gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16

View File

@ -4281,8 +4281,6 @@ with pkgs;
grim = callPackage ../tools/graphics/grim { };
gringo = callPackage ../tools/misc/gringo { };
grit = callPackage ../tools/misc/grit { };
grobi = callPackage ../tools/X11/grobi { };