Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 51b04c1bf518cfb5053557491e99dc6ff64cc416
https://github.com/NixOS/nixpkgs/commit/51b04c1bf518cfb5053557491e99dc6ff64cc416
Author: Jesse Haber-Kucharsky <[email protected]>
Date: 2016-11-12 (Sat, 12 Nov 2016)
Changed paths:
M pkgs/tools/misc/aspcud/default.nix
R pkgs/tools/misc/clingo/default.nix
A pkgs/tools/misc/gringo/default.nix
A pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch
A pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch
M pkgs/top-level/all-packages.nix
Log Message:
-----------
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.
Commit: 58f0dcfeb10500dd811036036710d8d67bd325f9
https://github.com/NixOS/nixpkgs/commit/58f0dcfeb10500dd811036036710d8d67bd325f9
Author: Frederik Rietdijk <[email protected]>
Date: 2016-11-18 (Fri, 18 Nov 2016)
Changed paths:
M pkgs/tools/misc/aspcud/default.nix
R pkgs/tools/misc/clingo/default.nix
A pkgs/tools/misc/gringo/default.nix
A pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch
A pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge pull request #20365 from hakuch/fix_opam
clingo, gringo: Revert opam solver dependency changes
Compare: https://github.com/NixOS/nixpkgs/compare/60ded3f3632d...58f0dcfeb105_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
