diff options
| author | Daniël de Kok <me@danieldk.eu> | 2020-08-09 11:10:01 +0200 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-08-09 10:14:57 -0700 |
| commit | a81e873f4e6677e130531f89e326e1b30797e49c (patch) | |
| tree | b3e920f5142dc917873a6686991c1b1d4ff76ab2 /pkgs/development/tools/minizinc/default.nix | |
| parent | 5ce323abf2122475a872b57903b7d13c79b6a2ee (diff) | |
| download | nixpkgs-a81e873f4e6677e130531f89e326e1b30797e49c.tar nixpkgs-a81e873f4e6677e130531f89e326e1b30797e49c.tar.gz nixpkgs-a81e873f4e6677e130531f89e326e1b30797e49c.tar.bz2 nixpkgs-a81e873f4e6677e130531f89e326e1b30797e49c.tar.lz nixpkgs-a81e873f4e6677e130531f89e326e1b30797e49c.tar.xz nixpkgs-a81e873f4e6677e130531f89e326e1b30797e49c.tar.zst nixpkgs-a81e873f4e6677e130531f89e326e1b30797e49c.zip | |
minizinc: 2.2.3 -> 2.4.3, fix build
- Update minizinc to 2.4.3. - Fix build with newer Bison versions.
Diffstat (limited to 'pkgs/development/tools/minizinc/default.nix')
| -rw-r--r-- | pkgs/development/tools/minizinc/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 6dfe0f570f9..308343c1ec6 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/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."; |