diff --git a/pkgs/by-name/ge/gecode/package.nix b/pkgs/by-name/ge/gecode/package.nix index d07198f78125..d325f2501a3f 100644 --- a/pkgs/by-name/ge/gecode/package.nix +++ b/pkgs/by-name/ge/gecode/package.nix @@ -2,8 +2,8 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, bison, + cmake, flex, perl, gmp, @@ -12,30 +12,22 @@ enableGist ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gecode"; - version = "6.2.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "Gecode"; repo = "gecode"; - rev = "release-${version}"; - sha256 = "0b1cq0c810j1xr2x9y9996p894571sdxng5h74py17c6nr8c6dmk"; + tag = "release-${finalAttrs.version}"; + hash = "sha256-WhMN7QC+VQfvHUV1LLaW7I7fG++/fznh1ZDUY/Q8zD8="; }; - patches = [ - # https://github.com/Gecode/gecode/pull/74 - (fetchpatch { - name = "fix-const-weights-clang.patch"; - url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch"; - sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc"; - }) - ]; - enableParallelBuilding = true; dontWrapQtApps = true; nativeBuildInputs = [ bison + cmake flex ]; buildInputs = [ @@ -52,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/mi/minizinc/package.nix b/pkgs/by-name/mi/minizinc/package.nix index 4747ebe471fa..22ed68a2228d 100644 --- a/pkgs/by-name/mi/minizinc/package.nix +++ b/pkgs/by-name/mi/minizinc/package.nix @@ -13,22 +13,6 @@ zlib, }: -let - gecode_6_3_0 = gecode.overrideAttrs (_: { - version = "6.3.0"; - src = fetchFromGitHub { - owner = "gecode"; - repo = "gecode"; - rev = "f7f0d7c273d6844698f01cec8229ebe0b66a016a"; - hash = "sha256-skf2JEtNkRqEwfHb44WjDGedSygxVuqUixskTozi/5k="; - }; - patches = [ ]; - }); -in -let - gecode = gecode_6_3_0; -in - stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; version = "2.9.7";