From 1df300f0f37820d6f2e93ce56d43c1596db493e8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 17 Jul 2026 10:24:26 +0200
Subject: [PATCH 1/3] =?UTF-8?q?gecode:=206.2.0=20=E2=86=92=206.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ge/gecode/package.nix | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ge/gecode/package.nix b/pkgs/by-name/ge/gecode/package.nix
index d07198f78125..78fa99afcb21 100644
--- a/pkgs/by-name/ge/gecode/package.nix
+++ b/pkgs/by-name/ge/gecode/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   bison,
   flex,
   perl,
@@ -12,26 +11,17 @@
   enableGist ? true,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gecode";
-  version = "6.2.0";
+  version = "6.3.0";
 
   src = fetchFromGitHub {
     owner = "Gecode";
     repo = "gecode";
-    rev = "release-${version}";
-    sha256 = "0b1cq0c810j1xr2x9y9996p894571sdxng5h74py17c6nr8c6dmk";
+    tag = "release-${finalAttrs.version}";
+    hash = "sha256-i1geBYMO+edZJekKe/zO+kkgd/S4jSiSZnDLfSRlXwc=";
   };
 
-  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 = [
@@ -52,4 +42,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.all;
     maintainers = [ ];
   };
-}
+})

From ad0d10ea6e0d786815ca17200ba56bdbce5656cf Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 17 Jul 2026 10:33:03 +0200
Subject: [PATCH 2/3] minizinc: use default gecode

---
 pkgs/by-name/mi/minizinc/package.nix | 16 ----------------
 1 file changed, 16 deletions(-)

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";

From c79cf74bd25be6aa6e6fb4a31dfdddd1d4564a1e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 17 Jul 2026 10:50:40 +0200
Subject: [PATCH 3/3] =?UTF-8?q?gecode:=206.3.0=20=E2=86=92=206.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ge/gecode/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/gecode/package.nix b/pkgs/by-name/ge/gecode/package.nix
index 78fa99afcb21..d325f2501a3f 100644
--- a/pkgs/by-name/ge/gecode/package.nix
+++ b/pkgs/by-name/ge/gecode/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   bison,
+  cmake,
   flex,
   perl,
   gmp,
@@ -13,19 +14,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gecode";
-  version = "6.3.0";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "Gecode";
     repo = "gecode";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-i1geBYMO+edZJekKe/zO+kkgd/S4jSiSZnDLfSRlXwc=";
+    hash = "sha256-WhMN7QC+VQfvHUV1LLaW7I7fG++/fznh1ZDUY/Q8zD8=";
   };
 
   enableParallelBuilding = true;
   dontWrapQtApps = true;
   nativeBuildInputs = [
     bison
+    cmake
     flex
   ];
   buildInputs = [