Skip to content

haskell-gargantext
haskell-gargantext
Verified Commit 1e5ba9b9 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski
Browse files
Options

GHC 9.6.4 - doesn't compile...

parent d7a70fd4
Pipeline #7199 failed with stages
          in 12 minutes and 13 seconds
          Expand all Hide whitespace changes
          Inline Side-by-side
          Showing with 154 additions and 741 deletions
          cabal.project
          View file @ 1e5ba9b9
          -- Generated by stack2cabal
          -- index-state: 2023-12-10T10:34:46Z
          index-state: 2024-09-12T03:02:26Z
          -- index-state: 2024-09-12T03:02:26Z
          index-state: 2025-01-10T04:07:23Z
          with-compiler: ghc-9.4.8
          with-compiler: ghc-9.6.4
          optimization: 2
          packages:
          ......@@ -34,10 +35,17 @@ source-repository-package
          source-repository-package
          type: git
          location: https://github.com/adinapoli/llvm-hs.git
          tag: 7533a9ccd3bfe77141745f6b61039a26aaf5c83b
          location: https://github.com/noahmartinwilliams/llvm-hs
          tag: 5a564c2f1feab7044f280d7f679afdf5efea63b8
          subdir: llvm-hs
          llvm-hs-pure
          llvm-hs-pure
          -- source-repository-package
          -- type: git
          -- location: https://github.com/adinapoli/llvm-hs.git
          -- tag: 7533a9ccd3bfe77141745f6b61039a26aaf5c83b
          -- subdir: llvm-hs
          -- llvm-hs-pure
          source-repository-package
          type: git
          ......@@ -56,10 +64,10 @@ source-repository-package
          tag: bc6ca8058077b0b5702ea4b88bd4189cfcad267a
          subdir: sparse-linear
          source-repository-package
          type: git
          location: https://github.com/chessai/eigen.git
          tag: 1790fdf9138970dde0dbabf8b270698145a4a88c
          -- source-repository-package
          -- type: git
          -- location: https://github.com/chessai/eigen.git
          -- tag: 1790fdf9138970dde0dbabf8b270698145a4a88c
          source-repository-package
          type: git
          ......@@ -114,12 +122,12 @@ source-repository-package
          source-repository-package
          type: git
          location: https://gitlab.iscpif.fr/gargantext/gargantext-graph.git
          tag: 588e104fe7593210956610cab0041fd16584a4ce
          tag: cfb5d1b6715eb3ccb1e573049b46fa44c3c99e56
          source-repository-package
          type: git
          location: https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude
          tag: bb15d828d5ef36eeaa84cccb00598b585048c88e
          tag: 214b31a2db46de5a2cac24231a3c07a1c4c3fab9
          source-repository-package
          type: git
          ......@@ -144,7 +152,7 @@ source-repository-package
          source-repository-package
          type: git
          location: https://gitlab.iscpif.fr/gargantext/patches-class.git
          tag: 3668d28607867a88b2dfc62158139b3cfd629ddb
          tag: a591716220cfcabffa24eb29cbaa2517023642af
          source-repository-package
          type: git
          ......@@ -207,12 +215,28 @@ allow-newer: MissingH:base
          , servant-xml-conduit:bytestring
          , servant-xml-conduit:servant
          , stemmer:base
          -- 9.6.4
          , bytestring:*
          , crawlerHAL:mtl
          -- , eigen:primitive
          -- , eigen:transformers
          , epo-api-client:aeson
          , epo-api-client:http-client-tls
          , gargantext:aeson
          , gargantext:template-haskell
          -- , singletons-th:base
          -- , singletons-th:template-haskell
          -- , singletons-th:th-desugar
          , text:*
          , *
          allow-older: aeson:hashable
          , crawlerHAL:servant-client
          , haskell-bee:stm
          , haskell-bee-tests:stm
          , haskell-throttle:time
          , hsparql:rdf4h
          , *
          package gargantext
          ghc-options: -fwrite-ide-info
          ......
          cabal.project.freeze deleted 100644 → 0
          View file @ d7a70fd4
          This diff is collapsed.
          gargantext.cabal
          View file @ 1e5ba9b9
          ......@@ -483,7 +483,7 @@ library
          build-depends:
          KMP ^>= 0.2.0.0
          , MissingH ^>= 1.6.0.1
          , MonadRandom ^>= 0.6
          , MonadRandom ^>= 0.6.1
          , QuickCheck ^>= 2.14.2
          , accelerate ^>= 1.3.0.0
          , accelerate-llvm-native ^>= 1.3.0.0
          ......@@ -576,7 +576,7 @@ library
          , protolude ^>= 0.3.3
          , quickcheck-instances ^>= 0.3.25.2
          , rake ^>= 0.0.1
          , random ^>= 1.2.1
          , random ^>= 1.3.0
          , rdf4h >= 5.1.0 && < 6
          , regex
          , replace-attoparsec ^>= 1.5.0.0
          ......@@ -600,8 +600,8 @@ library
          , servant-websockets >= 2.0.0 && < 2.1
          , servant-xml-conduit ^>= 0.1.0.4
          , shelly >= 1.9 && < 2
          , singletons ^>= 3.0.2
          , singletons-th >= 3.1 && < 3.2
          , singletons ^>= 3.0.4
          , singletons-th >= 3.5 && < 3.6
          , smtp-mail >= 0.3.0.0
          , stemmer == 0.5.2
          , stm >= 2.5.1.0 && < 2.6
          ......@@ -677,7 +677,7 @@ executable gargantext
          , gargantext
          , gargantext-prelude
          , haskell-bee
          , MonadRandom ^>= 0.6
          , MonadRandom ^>= 0.6.1
          , monad-logger ^>= 0.3.36
          , optparse-applicative
          , postgresql-simple >= 0.6.4 && <= 0.7.0.0
          ......@@ -719,7 +719,7 @@ common testDependencies
          , hspec-wai-json
          , http-client ^>= 0.7.14
          -- important: 0.3.6.1 uses cryptonite, while > uses crypton
          , http-client-tls == 0.3.6.1
          , http-client-tls > 0.3.6.1
          , http-types
          , lens >= 5.2.2 && < 5.3
          , monad-control >= 1.0.3 && < 1.1
          ......
          nix/pkgs.nix
          View file @ 1e5ba9b9
          { pkgs ? import ./pinned-23.11.nix {} }:
          { pkgs ? import ./pinned-24.05.nix {} }:
          rec {
          inherit pkgs;
          ghc948 = if pkgs.stdenv.isDarwin
          then pkgs.haskell.compiler.ghc948.overrideAttrs (finalAttrs: previousAttrs: {
          ghc964 = if pkgs.stdenv.isDarwin
          then pkgs.haskell.compiler.ghc964.overrideAttrs (finalAttrs: previousAttrs: {
          patches = previousAttrs.patches ++ [
          # Reverts the linking behavior of GHC to not resolve `-libc++` to `c++`.
          (pkgs.fetchpatch {
          ......@@ -12,24 +12,25 @@ rec {
          })
          ];
          })
          else pkgs.haskell.compiler.ghc948;
          cabal_install_3_10_2_1 = pkgs.haskell.lib.compose.justStaticExecutables pkgs.haskell.packages.ghc948.cabal-install;
          graphviz_dev = pkgs.graphviz.overrideAttrs (finalAttrs: previousAttrs: {
          version = "11.0.0~dev";
          src = pkgs.fetchFromGitLab {
          owner = "graphviz";
          repo = "graphviz";
          rev = "f3ec849249ef9cb824feb7f97449d7159e1dcb4e"; # head as of 2024-03-25, see gargantext#329
          hash = "sha256-s86IqWz6zeKbcRqpV3cVQBVviHbhUSX1U8GVuJBfjC4=";
          };
          });
          else pkgs.haskell.compiler.ghc964;
          cabal_install_3_10_2_1 = pkgs.haskell.lib.compose.justStaticExecutables pkgs.haskell.packages.ghc964.cabal-install;
          # graphviz_dev = pkgs.graphviz.overrideAttrs (finalAttrs: previousAttrs: {
          # version = "11.0.0~dev";
          # src = pkgs.fetchFromGitLab {
          # owner = "graphviz";
          # repo = "graphviz";
          # rev = "f3ec849249ef9cb824feb7f97449d7159e1dcb4e"; # head as of 2024-03-25, see gargantext#329
          # hash = "sha256-s86IqWz6zeKbcRqpV3cVQBVviHbhUSX1U8GVuJBfjC4=";
          # };
          # });
          graphviz_dev = pkgs.graphviz;
          graphviz = graphviz_dev.overrideAttrs (finalAttrs: previousAttrs: {
          # Increase the YY_BUF_SIZE, see https://gitlab.iscpif.fr/gargantext/haskell-gargantext/issues/290#note_9015
          patches = [
          (pkgs.fetchpatch {
          url = "https://gist.githubusercontent.com/adinapoli/e93ca7b1d714d27f4af537716b03e3bb/raw/b9cc297c3465878da2d18ee92a3f9b8273923493/graphviz-yy-buf-size.patch";
          sha256 = "sha256-8Q3tf37iYaPV50P+Vf/n263ordECiu5eKwONCy3ynV8=";
          })
          # (pkgs.fetchpatch {
          # url = "https://gist.githubusercontent.com/adinapoli/e93ca7b1d714d27f4af537716b03e3bb/raw/b9cc297c3465878da2d18ee92a3f9b8273923493/graphviz-yy-buf-size.patch";
          # sha256 = "sha256-8Q3tf37iYaPV50P+Vf/n263ordECiu5eKwONCy3ynV8=";
          # })
          ];
          });
          ......@@ -37,115 +38,118 @@ rec {
          # version = "1.8.0";
          # });
          igraph_0_10_4 = pkgs.igraph.overrideAttrs (finalAttrs: previousAttrs: {
          version = "0.10.4";
          # igraph_0_10_4 = pkgs.igraph.overrideAttrs (finalAttrs: previousAttrs: {
          # version = "0.10.4";
          nativeBuildInputs = previousAttrs.nativeBuildInputs or [] ++ [ pkgs.clang_12 ];
          # nativeBuildInputs = previousAttrs.nativeBuildInputs or [] ++ [ pkgs.clang_12 ];
          src = pkgs.fetchFromGitHub {
          owner = "igraph";
          repo = "igraph";
          rev = "0.10.4";
          hash = "sha256-LsTOxUktGZcp46Ec9QH3+9C+VADMYTZZCjKF1gp36xk=";
          };
          # src = pkgs.fetchFromGitHub {
          # owner = "igraph";
          # repo = "igraph";
          # rev = "0.10.4";
          # hash = "sha256-LsTOxUktGZcp46Ec9QH3+9C+VADMYTZZCjKF1gp36xk=";
          # };
          postPatch = ''
          echo "0.10.4" > IGRAPH_VERSION
          '';
          # postPatch = ''
          # echo "0.10.4" > IGRAPH_VERSION
          # '';
          outputs = [ "out" "doc" ];
          # outputs = [ "out" "doc" ];
          buildInputs = [
          pkgs.arpack
          pkgs.blas
          pkgs.glpk
          pkgs.gmp
          pkgs.lapack
          pkgs.libxml2
          pkgs.nanomsg
          pkgs.plfit
          ] ++ pkgs.lib.optionals pkgs.stdenv.cc.isClang [
          pkgs.llvmPackages.openmp
          ];
          # buildInputs = [
          # pkgs.arpack
          # pkgs.blas
          # pkgs.glpk
          # pkgs.gmp
          # pkgs.lapack
          # pkgs.libxml2
          # pkgs.nanomsg
          # pkgs.plfit
          # ] ++ pkgs.lib.optionals pkgs.stdenv.cc.isClang [
          # pkgs.llvmPackages.openmp
          # ];
          cmakeFlags = [
          "-DIGRAPH_USE_INTERNAL_BLAS=OFF"
          "-DIGRAPH_USE_INTERNAL_LAPACK=OFF"
          "-DIGRAPH_USE_INTERNAL_ARPACK=OFF"
          "-DIGRAPH_USE_INTERNAL_GLPK=OFF"
          "-DIGRAPH_USE_INTERNAL_GMP=OFF"
          "-DIGRAPH_USE_INTERNAL_PLFIT=OFF"
          "-DIGRAPH_GLPK_SUPPORT=ON"
          "-DIGRAPH_GRAPHML_SUPPORT=OFF"
          "-DIGRAPH_OPENMP_SUPPORT=ON"
          "-DIGRAPH_ENABLE_LTO=AUTO"
          "-DIGRAPH_ENABLE_TLS=ON"
          "-DBUILD_SHARED_LIBS=ON"
          ];
          # cmakeFlags = [
          # "-DIGRAPH_USE_INTERNAL_BLAS=OFF"
          # "-DIGRAPH_USE_INTERNAL_LAPACK=OFF"
          # "-DIGRAPH_USE_INTERNAL_ARPACK=OFF"
          # "-DIGRAPH_USE_INTERNAL_GLPK=OFF"
          # "-DIGRAPH_USE_INTERNAL_GMP=OFF"
          # "-DIGRAPH_USE_INTERNAL_PLFIT=OFF"
          # "-DIGRAPH_GLPK_SUPPORT=ON"
          # "-DIGRAPH_GRAPHML_SUPPORT=OFF"
          # "-DIGRAPH_OPENMP_SUPPORT=ON"
          # "-DIGRAPH_ENABLE_LTO=AUTO"
          # "-DIGRAPH_ENABLE_TLS=ON"
          # "-DBUILD_SHARED_LIBS=ON"
          # ];
          postInstall = ''
          mkdir -p "$out/share"
          cp -r doc "$out/share"
          '';
          # postInstall = ''
          # mkdir -p "$out/share"
          # cp -r doc "$out/share"
          # '';
          postFixup = previousAttrs.postFixup + ''
          CUR_DIR=$PWD
          cd "$out/include/igraph" && cp *.h ../
          cd $CUR_DIR
          '';
          # postFixup = previousAttrs.postFixup + ''
          # CUR_DIR=$PWD
          # cd "$out/include/igraph" && cp *.h ../
          # cd $CUR_DIR
          # '';
          });
          # });
          hsBuildInputs = [
          ghc948
          ghc964
          cabal_install_3_10_2_1
          pkgs.haskellPackages.alex
          pkgs.haskellPackages.happy
          pkgs.haskellPackages.pretty-show
          ];
          nonhsBuildInputs = with pkgs; [
          # nng180
          #haskell-language-server
          blas
          bzip2
          clang_16
          curl
          czmq
          docker-compose
          expat
          gcc13
          gfortran13
          git
          gmp
          graphviz
          gsl
          #haskell-language-server
          hlint
          libffi
          icu
          igraph
          #igraph_0_10_4
          lapack
          libffi
          libpqxx
          libsodium
          libxml2
          llvm_16
          lzma
          nanomsg
          pcre
          pkg-config
          postgresql
          xz
          zlib
          blas
          gfortran7
          expat
          icu
          graphviz
          clang_12
          llvm_12
          gcc12
          igraph_0_10_4
          libpqxx
          libsodium
          nanomsg
          # nng180
          zeromq
          curl
          zlib
          ] ++ ( lib.optionals stdenv.isDarwin [
          darwin.apple_sdk.frameworks.Accelerate
          ]);
          libPaths = pkgs.lib.makeLibraryPath nonhsBuildInputs;
          shellHook = ''
          export LD_LIBRARY_PATH="${pkgs.gfortran7.cc.lib}:${libPaths}:$LD_LIBRARY_PATH"
          export LIBRARY_PATH="${pkgs.gfortran7.cc.lib}:${libPaths}"
          export PATH="${pkgs.gccStdenv}/bin:$PATH"
          export NIX_CC="${pkgs.gccStdenv}"
          export CC="${pkgs.gccStdenv}/bin/gcc"
          export LD_LIBRARY_PATH="${pkgs.gfortran7.cc.lib}:${pkgs.stdenv.cc.cc.lib}:${libPaths}:$LD_LIBRARY_PATH"
          export LIBRARY_PATH="${pkgs.gfortran7.cc.lib}:${pkgs.stdenv.cc.cc.lib}:${libPaths}"
          export PATH="${pkgs.stdenv.cc}/bin:$PATH"
          export NIX_CC="${pkgs.stdenv.cc}"
          export CC="${pkgs.stdenv.cc}/bin/gcc"
          '';
          shell = pkgs.mkShell.override { stdenv = pkgs.gccStdenv; } {
          shell = pkgs.mkShell.override { stdenv = pkgs.stdenv; } {
          name = "gargantext-shell";
          buildInputs = hsBuildInputs ++ nonhsBuildInputs;
          inherit shellHook;
          ......
          stack.yaml
          View file @ 1e5ba9b9
          "allow-newer": true
          "extra-deps":
          - connection-0.3.1@sha256:3dcbf2f10d1677d339267d6dacb38a24913622edf42b05f75a73f381610ddbfc,1563
          #- cprng-aes-0.6.1@sha256:964851f00ee700ec6b0f5e32a045cf8aed5fb776881756f8f2199899cfd3241a,2241
          #- crypto-random-0.0.9@sha256:57c806042d8bc0e012b85e6135cd55f4db9e4cc45c7b1c080bd006ceefb1ad47,1698
          - cryptonite-0.30
          - smtp-mail-0.5.0.0@sha256:3056eab06ddeaa47b4f5748107d16b43883421899f90fc7dfef561ea23149d33,1390
          - "JuicyPixels-3.3.9"
          - "KMP-0.2.0.0"
          - "OneTuple-0.4.2"
          ......@@ -172,14 +177,16 @@
          git: "https://github.com/adinapoli/http-reverse-proxy.git"
          subdirs:
          - .
          - commit: 7533a9ccd3bfe77141745f6b61039a26aaf5c83b
          git: "https://github.com/adinapoli/llvm-hs.git"
          subdirs:
          - "llvm-hs"
          - commit: 7533a9ccd3bfe77141745f6b61039a26aaf5c83b
          git: "https://github.com/adinapoli/llvm-hs.git"
          subdirs:
          - "llvm-hs-pure"
          - "llvm-hs-9.0.1"
          - "llvm-hs-pure-9.0.0"
          # - commit: 7533a9ccd3bfe77141745f6b61039a26aaf5c83b
          # git: "https://github.com/adinapoli/llvm-hs.git"
          # subdirs:
          # - "llvm-hs"
          # - commit: 7533a9ccd3bfe77141745f6b61039a26aaf5c83b
          # git: "https://github.com/adinapoli/llvm-hs.git"
          # subdirs:
          # - "llvm-hs-pure"
          - commit: a110807651036ca2228a76507ee35bbf7aedf87a
          git: "https://github.com/alpmestan/accelerate-arithmetic.git"
          subdirs:
          ......@@ -504,7 +511,7 @@ flags:
          "template-haskell": true
          "llvm-hs":
          debug: false
          "llvm-with-rtti": false
          #"llvm-with-rtti": false
          "shared-llvm": true
          lzma:
          pkgconfig: true
          ......@@ -709,5 +716,5 @@ flags:
          standalone: true
          packages:
          - .
          resolver: "lts-21.25"
          resolver: "lts-22.43"
          "system-ghc": true
          Markdown is supported
          0% or
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment