From 9f8ced3ab40ec343d4fded68d7767179cb49bcc5 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 10 Jan 2025 23:13:51 +0100
Subject: [PATCH] heptagon: unpin ocaml 4.14

---
 .../default.nix => by-name/he/heptagon/package.nix}       | 8 ++++++++
 pkgs/top-level/all-packages.nix                           | 4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)
 rename pkgs/{development/compilers/heptagon/default.nix => by-name/he/heptagon/package.nix} (83%)

diff --git a/pkgs/development/compilers/heptagon/default.nix b/pkgs/by-name/he/heptagon/package.nix
similarity index 83%
rename from pkgs/development/compilers/heptagon/default.nix
rename to pkgs/by-name/he/heptagon/package.nix
index 0bfdb702aaaf..be1b69a3a263 100644
--- a/pkgs/development/compilers/heptagon/default.nix
+++ b/pkgs/by-name/he/heptagon/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitLab,
   makeWrapper,
   ocamlPackages,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,6 +19,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-b4O48MQT3Neh8a1Z5wRgS701w6XrwpsbSMprlqTT+CE=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.inria.fr/synchrone/heptagon/-/commit/f10405e385ca25dc737727e0c210a44986929bf0.patch";
+      hash = "sha256-Sn55jEoRDYnEUg4SjuBDCNN4TNl2Dwn1fTjb9O8O1bo=";
+    })
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = with ocamlPackages; [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd1a3db79f56..57a4c19227c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6358,10 +6358,6 @@ with pkgs;
     inherit (emacs.pkgs.melpaStablePackages) irony;
   };
 
-  heptagon = callPackage ../development/compilers/heptagon {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_14;
-  };
-
   openjfx17 = openjfx;
   openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; };
   openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; };