diff options
| author | Jesse Haber-Kucharsky <jesse@haberkucharsky.com> | 2016-11-12 07:26:30 -0500 |
|---|---|---|
| committer | Jesse Haber-Kucharsky <jesse@haberkucharsky.com> | 2016-11-12 08:39:52 -0500 |
| commit | 51b04c1bf518cfb5053557491e99dc6ff64cc416 (patch) | |
| tree | 88df29a46e4429b02f24ca126b58d8dd66e3e1f8 /pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch | |
| parent | c2b4a0d2668fda88430e7067245fc63d977ea28c (diff) | |
| download | nixpkgs-51b04c1bf518cfb5053557491e99dc6ff64cc416.tar nixpkgs-51b04c1bf518cfb5053557491e99dc6ff64cc416.tar.gz nixpkgs-51b04c1bf518cfb5053557491e99dc6ff64cc416.tar.bz2 nixpkgs-51b04c1bf518cfb5053557491e99dc6ff64cc416.tar.lz nixpkgs-51b04c1bf518cfb5053557491e99dc6ff64cc416.tar.xz nixpkgs-51b04c1bf518cfb5053557491e99dc6ff64cc416.tar.zst nixpkgs-51b04c1bf518cfb5053557491e99dc6ff64cc416.zip | |
Revert opam solver dependency changes
- Reverts the change to the monolithic `clingo` package in favor of the previous split between `clasp` and `gringo` since `opam` works with the latter but not (for some reason) with the former. - Adds explicit non-support for Python in `gringo`. This is not necessary for opam. - Forces usage of the `std::to_string` functions in the C++ standard library instead of the incomplete alternative implementations inside of the `gringo` sources.
Diffstat (limited to 'pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch')
| -rw-r--r-- | pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch new file mode 100644 index 00000000000..b81eab4cd67 --- /dev/null +++ b/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch @@ -0,0 +1,11 @@ +--- 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> + |