Merge pull request #51340 from dtzWill/update/gecode-6.1

gecode: 6.0.0 -> 6.1.0, deps, Gist support
This commit is contained in:
Will Dietz 2018-12-15 17:45:07 -06:00 committed by GitHub
commit 3e62cdd72e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions

View File

@ -1,22 +1,26 @@
{ stdenv, fetchurl, perl }:
{ stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }:
stdenv.mkDerivation rec {
name = "gecode-${version}";
version = "6.0.0";
version = "6.1.0";
src = fetchurl {
url = "http://www.gecode.org/download/${name}.tar.gz";
sha256 = "0dp7bm6k790jx669y4jr0ffi5cdfpwsqm1ykj2c0zh56jsgs6hfs";
src = fetchFromGitHub {
owner = "Gecode";
repo = "gecode";
rev = "release-${version}";
sha256 = "1ijjy8ppx7djnkrkawsd00rmlf24qh1z13aap0h1azailw1pbrg4";
};
enableParallelBuilding = true;
buildInputs = [ perl ];
nativeBuildInputs = [ bison flex ];
buildInputs = [ perl gmp mpfr ]
++ stdenv.lib.optional enableGist qtbase;
meta = with stdenv.lib; {
license = licenses.mit;
homepage = http://www.gecode.org;
description = "Toolkit for developing constraint-based systems";
platforms = platforms.all;
maintainers = [ maintainers.manveru ];
maintainers = [ ];
};
}

View File

@ -9835,8 +9835,8 @@ in
gdbm = callPackage ../development/libraries/gdbm { };
gecode_3 = callPackage ../development/libraries/gecode/3.nix { };
gecode_4 = callPackage ../development/libraries/gecode { };
gecode = gecode_4;
gecode_6 = qt5.callPackage ../development/libraries/gecode { };
gecode = gecode_6;
gephi = callPackage ../applications/science/misc/gephi { };