From ae1e9f500cdcfa17f961f843c9b5c3280a71edfc Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaum.bouchard@gmail.com>
Date: Sun, 21 Dec 2025 15:10:32 +0400
Subject: [PATCH] chore: update to real ghc 9.14

---
 flake.lock | 23 +++++++++++------------
 flake.nix  | 46 +++++++++++++++++++++++++---------------------
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/flake.lock b/flake.lock
index 221e75a..4565b88 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,27 +20,26 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763811872,
-        "narHash": "sha256-qN03zMKGAJsCzwS8zmhFG+2SQuF1Sdk+KVGuJ4V/3Ko=",
-        "owner": "guibou",
+        "lastModified": 1766499526,
+        "narHash": "sha256-GluPLcowfFXYHjbPKt9GNVy4JnLumCtiwTtoHcIedJw=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "10f4fa4b05cae48dee180d5dbd80e8fba0fc7227",
+        "rev": "cf5212a83824dc74ace7bad3705efdccf6a462b7",
         "type": "github"
       },
       "original": {
-        "owner": "guibou",
-        "ref": "ghc-914",
+        "owner": "nixos",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1754340878,
-        "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
+        "lastModified": 1761236834,
+        "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cab778239e705082fe97bb4990e0d24c50924c04",
+        "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
         "type": "github"
       },
       "original": {
@@ -77,11 +76,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1760120816,
-        "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=",
+        "lastModified": 1766000401,
+        "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "761ae7aff00907b607125b2f57338b74177697ed",
+        "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index bc3ff42..a75ef89 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "PyF";
 
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.nixpkgs.url = "github:guibou/nixpkgs/ghc-914";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs";
   inputs.treefmt-nix.url = "github:numtide/treefmt-nix";
 
   nixConfig.extra-substituters = [ "https://guibou.cachix.org" ];
@@ -11,12 +11,11 @@
   ];
 
   outputs =
-    {
-      self,
-      nixpkgs,
-      flake-utils,
-      treefmt-nix,
-      ...
+    { self
+    , nixpkgs
+    , flake-utils
+    , treefmt-nix
+    , ...
     }:
     flake-utils.lib.eachDefaultSystem (
       system:
@@ -73,22 +72,27 @@
 
           pyf_910 = pyfBuilder haskell.packages.ghc910;
           pyf_912 = pyfBuilder haskell.packages.ghc912;
-          pyf_914 = pyfBuilder haskell.packages.ghc914;
+          pyf_914 = pyfBuilder
+            (haskell.packages.ghc914.override {
+              overrides = self: super:
+              {
+                call-stack = haskell.lib.dontCheck super.call-stack;
+              };});
 
-          default = pyfBuilder haskellPackages;
-        };
+              default = pyfBuilder haskellPackages;
+            };
 
-        formatter = treefmtEval.config.build.wrapper;
+            formatter = treefmtEval.config.build.wrapper;
 
-        devShells = (builtins.mapAttrs (name: value: value.shell) packages) // {
-          treesitter = pkgs.mkShell {
-            buildInputs = [
-              pkgs.tree-sitter
-              pkgs.nodejs
-            ];
+          devShells = (builtins.mapAttrs (name: value: value.shell) packages) // {
+            treesitter = pkgs.mkShell {
+              buildInputs = [
+                pkgs.tree-sitter
+                pkgs.nodejs
+              ];
+            };
+            default = packages.default.shell_hls;
           };
-          default = packages.default.shell_hls;
-        };
+        }
+          );
       }
-    );
-}