aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/development/tools/minizinc/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/tools/minizinc/default.nix')
-rw-r--r--nixpkgs/pkgs/development/tools/minizinc/default.nix17
1 files changed, 13 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/tools/minizinc/default.nix b/nixpkgs/pkgs/development/tools/minizinc/default.nix
index 6dfe0f570f9..308343c1ec6 100644
--- a/nixpkgs/pkgs/development/tools/minizinc/default.nix
+++ b/nixpkgs/pkgs/development/tools/minizinc/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, flex, bison }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }:
let
- version = "2.2.3";
+ version = "2.4.3";
in
stdenv.mkDerivation {
pname = "minizinc";
@@ -11,10 +11,19 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "MiniZinc";
repo = "libminizinc";
- rev = "3d66971a0cad6edbe796f4dd940229d38e5bfe3d"; # tags on the repo are disappearing: See https://github.com/MiniZinc/libminizinc/issues/257
- sha256 = "1q31y9131aj2lsm34srm8i1s0271qcaaknzvym3r8awynm14saq5";
+ rev = version;
+ 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; {
homepage = "https://www.minizinc.org/";
description = "MiniZinc is a medium-level constraint modelling language.";