minizinc: 2.2.3 -> 2.4.3, fix build

- Update minizinc to 2.4.3.
- Fix build with newer Bison versions.
This commit is contained in:
Daniël de Kok 2020-08-09 11:10:01 +02:00 committed by Jon
parent 5ce323abf2
commit a81e873f4e

View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, flex, bison }: { stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }:
let let
version = "2.2.3"; version = "2.4.3";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "minizinc"; pname = "minizinc";
@ -11,10 +11,19 @@ stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MiniZinc"; owner = "MiniZinc";
repo = "libminizinc"; repo = "libminizinc";
rev = "3d66971a0cad6edbe796f4dd940229d38e5bfe3d"; # tags on the repo are disappearing: See https://github.com/MiniZinc/libminizinc/issues/257 rev = version;
sha256 = "1q31y9131aj2lsm34srm8i1s0271qcaaknzvym3r8awynm14saq5"; sha256 = "0mahf621zwwywimly5nd6j39j7qr48k5p7zwpfqnjq4wn010mbf8";
}; };
patches = [
# Fix build with newer Bison versions:
# https://github.com/MiniZinc/libminizinc/issues/389
(fetchpatch {
url = "https://github.com/MiniZinc/libminizinc/commit/d3136f6f198d3081943c17ac6890dbe14a81d112.diff";
sha256 = "1f4wxn9422ndgq6dd0vqdxm2313srm7gn9nh82aas2xijdxlmz2c";
})
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.minizinc.org/"; homepage = "https://www.minizinc.org/";
description = "MiniZinc is a medium-level constraint modelling language."; description = "MiniZinc is a medium-level constraint modelling language.";