alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #112514 from esclear/update-minizinc-minizincide

Browse source 
minizinc, minizincide: 2.4.3 -> 2.5.3
This commit is contained in:
Sandro 2021-02-10 14:39:10 +01:00 committed by GitHub
parent d6bde915a6 9da3fd6a09
commit b12406efc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/development/tools/minizinc/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }:
{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }:
let
version = "2.4.3";
version = "2.5.3";
in
stdenv.mkDerivation {
pname = "minizinc";
@ -12,28 +12,9 @@ stdenv.mkDerivation {
owner = "MiniZinc";
repo = "libminizinc";
rev = version;
sha256 = "0mahf621zwwywimly5nd6j39j7qr48k5p7zwpfqnjq4wn010mbf8";
sha256 = "1kc65sxkc64pr560qaaznc44jnlvq7pbpzwijad410lpcnna5byg";
};
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";
})
(fetchpatch {
name = "bison-3.7-compat-1.patch";
url = "https://github.com/MiniZinc/libminizinc/commit/8d4dcf302e78231f7c2665150e8178cacd06f91c.patch";
sha256 = "1wgciyrqijv7b4wqha94is5skji8j7b9wq6fkdsnsimfd3xpxhqw";
})
(fetchpatch {
name = "bison-3.7-compat-2.patch";
url = "https://github.com/MiniZinc/libminizinc/commit/952ffda0bd23dc21f83d3e3f080ea5b3a414e8e0.patch";
sha256 = "0cnsfqw0hwm7rmazqnb99725rm2vdwab75vdpr5x5l3kjwsn76rj";
})
];
meta = with lib; {
homepage = "https://www.minizinc.org/";
description = "A medium-level constraint modelling language";

11
pkgs/development/tools/minizinc/ide.nix
View file

@ -1,19 +1,20 @@
{ lib, stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }:
{ lib, mkDerivation, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, minizinc }:
let
version = "2.4.3";
version = "2.5.3";
in
stdenv.mkDerivation {
mkDerivation {
pname = "minizinc-ide";
inherit version;
nativeBuildInputs = [ qmake makeWrapper ];
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtwebengine qtwebkit ];
src = fetchFromGitHub {
owner = "MiniZinc";
repo = "MiniZincIDE";
rev = version;
sha256 = "0dfqh73rnp00336pyr1hlgl1wb4m2kh28zvdkamjgml60gmg6wdr";
sha256 = "1c80ilb1xbgzfadgal668h2zsaiv62il1jnljizrisgb7pszzyzw";
fetchSubmodules = true;
};
sourceRoot = "source/MiniZincIDE";