[docker, nix] cabal2stack in nix now

README.md

@@ -274,9 +274,9 @@ When a development is needed on libraries (for instance, the HAL crawler in http
    2. When changes work and tests are OK, commit in repo `hal`
 2. When changes are commited / merged:
    1. Get the hash id, and edit `cabal.project` with the **new commit id**
-   2. run `./bin/update-project-dependencies`
+   2. run `nix-shell --run ./bin/update-project-dependencies`
       - get an error that sha256 don't match, so update the `./bin/update-project-dependencies` with new sha256 hash
-      - run again `./bin/update-project-dependencies` (to make sure it's a fixed point now)
+      - run again `nix-shell --run ./bin/update-project-dependencies` (to make sure it's a fixed point now)
 
 > Note: without `stack.yaml` we would have to only fix `cabal.project` -> `source-repository-package` commit id. Sha256 is there to make sure CI reruns the tests.
 

bin/install-cabal2stack

-#!/usr/bin/env bash
-
-set -euxo pipefail
-
-current_dir=$(basename "$PWD")
-
-if [ "$current_dir" == "bin" ]; then
-    source ./setup-ci-environment
-else
-    source ./bin/setup-ci-environment
-fi
-
-cabal --store-dir=$STORE_DIR v2-update "hackage.haskell.org,${INDEX_STATE}"
-
-# Install cabal2stack if it can't be found.
-if ! cabal2stack --help &> /dev/null
-then
-    echo "cabal2stack could not be found"
-    CURDIR=$PWD
-    git clone https://github.com/iconnect/cabal2stack.git cabal2stack-installer
-    cd cabal2stack-installer
-    cabal --store-dir=$STORE_DIR v2-install --allow-newer --index-state="${INDEX_STATE}" --overwrite-policy=always
-    cd $CURDIR
-    rm -rf cabal2stack-installer
-fi

bin/update-project-dependencies

@@ -6,12 +6,11 @@ current_dir=$(basename "$PWD")
 
 if [ "$current_dir" == "bin" ]; then
     source ./setup-ci-environment
-    ./install-cabal2stack
 else
     source ./bin/setup-ci-environment
-    ./bin/install-cabal2stack
 fi
 
+
 # README!
 # Every time you modify the `cabal.project`, you have to make sure to update
 # the `expected_cabal_project_hash` and `expected_cabal_project_freeze_hash`

devops/docker/Dockerfile

@@ -40,7 +40,6 @@ COPY ./nix/graphviz.nix                                /builds/gargantext/nix/gr
 COPY ./nix/igraph.nix                                  /builds/gargantext/nix/igraph.nix
 COPY ./nix/pinned-25.05.nix                            /builds/gargantext/nix/pinned-25.05.nix
 COPY ./bin/setup-ci-environment                        /builds/gargantext/bin/setup-ci-environment
-COPY ./bin/install-cabal2stack                         /builds/gargantext/bin/install-cabal2stack
 
 RUN set -o pipefail && \
     locale-gen en_US.UTF-8 && \
@@ -50,8 +49,7 @@ RUN set -o pipefail && \
     mkdir -p "/builds/gargantext/" && chmod 777 -R "/builds/gargantext" && \
     echo "source $HOME/.nix-profile/etc/profile.d/nix.sh" >> "$HOME/.bashrc" && \
     echo `which nix-env` && \
-    . $HOME/.bashrc && nix-env --version && \
-    cd /builds/gargantext && nix-shell --run "./bin/install-cabal2stack"
+    . $HOME/.bashrc && nix-env --version
 
 WORKDIR "/builds/gargantext/"
 

nix/cabal2stack.nix

+{ lib,
+  ghc,
+  haskellPackages,
+  fetchFromGitHub }:
+
+let
+  src = fetchFromGitHub {
+    repo = "cabal2stack";
+    owner = "iconnect";
+    rev = "e4960683f518ab4c964e7646706fe2a7e1bf751a";
+    hash = "sha256-KE9VUXFy9QfRmu/+DFcgxV/E6oPBAR7hRaFrSt93eeY=";
+  };
+in
+with haskellPackages;
+mkDerivation {
+  inherit src;
+  pname = "cabal2stack";
+  version = "0";
+  isExecutable = true;
+  executableHaskellDepends = [ base
+                               aeson
+                               cabal-plan
+                               HsYAML
+                               HsYAML-aeson
+                               optics-core
+                               optics-extra
+                               optparse-applicative
+                               transformers ];
+  patches = [
+    ./patches/cabal2stack.patch
+  ];
+  license = lib.licenses.bsd3;
+  mainProgram = "cabal2stack"; 
+}

nix/patches/cabal2stack.patch

+diff --git i/cabal2stack.cabal w/cabal2stack.cabal
+index 69767a2..92c4895 100644
+--- i/cabal2stack.cabal
++++ w/cabal2stack.cabal
+@@ -26,14 +26,14 @@ executable cabal2stack
+ 
+   -- boot dependencies
+   build-depends:
+-    , base          >=4.12     && <4.18
++    , base          >=4.12     && <5
+     , bytestring    ^>=0.10.8.2 || ^>=0.11.3.0
+     , containers    ^>=0.6.0.1
+     , directory     ^>=1.3.3.0
+     , filepath      ^>=1.4.2.1
+     , process       ^>=1.6.5.0
+     , text          >=1.2.3.0 && <2.1
+-    , transformers  ^>=0.5.6.2
++    , transformers  >=0.5.6.2 && < 0.7
+ 
+   -- other dependencies
+   build-depends:
+@@ -43,4 +43,4 @@ executable cabal2stack
+     , HsYAML-aeson          ^>=0.2.0.1
+     , optics-core           ^>=0.4
+     , optics-extra          ^>=0.4
+-    , optparse-applicative  ^>=0.17.0.0
++    , optparse-applicative  >=0.17.0.0 && < 0.20

nix/pkgs.nix

@@ -11,6 +11,8 @@ rec {
   igraph_0_10_4 = pkgs.callPackage ./igraph.nix {};
   corenlp = pkgs.callPackage ./corenlp.nix { };  # 4.5.8
   # corenlp454 = pkgs.callPackage ./corenlp.nix { version = "4.5.4"; hash = "sha256-SViN/2TcDQrL+3RwUhbCTJDxqffhiWjutZE4oj++aIw="; }
+
+  cabal2stack = pkgs.callPackage ./cabal2stack.nix { ghc = ghc966; };
   
   hsBuildInputs = [
     ghc966
@@ -23,6 +25,7 @@ rec {
     #haskell-language-server
     blas
     bzip2
+    cabal2stack
     corenlp
     curl
     czmq