Fix Duckling via text16-compat

cabal.project

@@ -173,7 +173,12 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/adinapoli/duckling.git
-    tag: d84d64d79cbdd2efb874cbb1bc804ac013e848e2
+    tag: 23603a832117e5352d5b0fb9bb1110228324b35a
+
+source-repository-package
+    type: git
+    location: https://github.com/adinapoli/text16-compat.git
+    tag: 85533b5d597e6fc5498411b4bcfc76380ec80d71
 
 allow-older: *
 allow-newer: *

nix/overlays/ghc947.nix

@@ -207,8 +207,8 @@ stdenv.mkDerivation (rec {
   ] ++ (if stdenv.isDarwin
            then [ # Reverts the linking behavior of GHC to not resolve `-libc++` to `c++`.
                     (fetchpatch {
-                      url = "https://gist.githubusercontent.com/adinapoli/bf722db15f72763bf79dff13a3104b6f/raw/21e4fe65e71e721aece563b0c39be6ba1ace5b28/ghc947-macOS-loadArchive-fix.patch";
-                      sha256 = "sha256-0rWN6nGIVlB65QBGX3PaHPQFCitGGC8wTJg8kPJu5KQ=";
+                      url = "https://gist.githubusercontent.com/adinapoli/bf722db15f72763bf79dff13a3104b6f/raw/362da0aa3db5c530e0d276183ba68569f216d65a/ghc947-macOS-loadArchive-fix.patch";
+                      sha256 = "sha256-0tHrkWRKFWUewj3uIA0DujVCXo1qgX2lA5p0MIsAHYs=";
                     })
                 ]
            else []);

nix/pkgs.nix

@@ -3,7 +3,7 @@
 rec {
   inherit pkgs;
   ghc947 = pkgs.callPackage ./overlays/ghc947.nix {
-      stdenv = pkgs.clang12Stdenv;
+      stdenv = pkgs.gccStdenv;
       bootPkgs = pkgs.haskell.packages.ghc8107;
       inherit (pkgs.buildPackages.python3Packages) sphinx;
       # Need to use apple's patched xattr until
@@ -110,7 +110,7 @@ rec {
     graphviz
     clang_12
     llvm_12
-    gcc7
+    gcc12
     igraph_0_10_4
     libpqxx
     libsodium
@@ -121,11 +121,11 @@ rec {
   shellHook = ''
     export LD_LIBRARY_PATH="${pkgs.gfortran7.cc.lib}:${libPaths}:$LD_LIBRARY_PATH"
     export LIBRARY_PATH="${pkgs.gfortran7.cc.lib}:${libPaths}"
-    export PATH="${pkgs.clang_12}/bin:$PATH"
-    export NIX_CC="${pkgs.clang_12}"
-    export CC="${pkgs.clang_12}/bin/clang"
+    export PATH="${pkgs.gccStdenv}/bin:$PATH"
+    export NIX_CC="${pkgs.gccStdenv}"
+    export CC="${pkgs.gccStdenv}/bin/gcc"
   '';
-  shell = pkgs.mkShell.override { stdenv = pkgs.clang12Stdenv; } {
+  shell = pkgs.mkShell.override { stdenv = pkgs.gccStdenv; } {
     name = "gargantext-shell";
     buildInputs = hsBuildInputs ++ nonhsBuildInputs;
     inherit shellHook;

stack.yaml

@@ -110,7 +110,9 @@ extra-deps:
   commit: 91928b5d7f9342e9865dde0d94862792d2b88779
   # Temporary fork of duckling
 - git: https://github.com/adinapoli/duckling.git
-  commit: d84d64d79cbdd2efb874cbb1bc804ac013e848e2
+  commit: 23603a832117e5352d5b0fb9bb1110228324b35a
+- git: https://github.com/adinapoli/text16-compat.git
+  commit: 85533b5d597e6fc5498411b4bcfc76380ec80d71
   # Others dependencies (using stack resolver)
 - HSvm-0.1.1.3.22
 - KMP-0.2.0.0@sha256:6dfbac03ef00ebd9347234732cb86a40f62ab5a80c0cc6bedb8eb51766f7df28,2562