Skip to content

G
gargantext-graph
Commit 2cc9f625 authored by Alfredo Di Napoli's avatar Alfredo Di Napoli
Browse files
Options

Support for GHC 9.4.7

parent 588e104f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3345 additions and 40 deletions
.gitignore
View file @ 2cc9f625
.stack-work/
*~
*lock
dist-newstyle
cabal.project 0 → 100644
View file @ 2cc9f625
-- Generated by stack2cabal
index-state: 2023-11-23T20:05:40Z
with-compiler: ghc-9.4.7
packages:
./
source-repository-package
type: git
location: https://github.com/AccelerateHS/accelerate.git
tag: 334d05519436bb7f20f9926ec76418f5b8afa359
source-repository-package
type: git
location: https://github.com/alpmestan/accelerate-arithmetic.git
tag: a110807651036ca2228a76507ee35bbf7aedf87a
source-repository-package
type: git
location: https://github.com/alpmestan/hmatrix.git
tag: b9fca8beee0f23c17a6b2001ec834d071709e6e7
subdir: packages/base
source-repository-package
type: git
location: https://github.com/alpmestan/sparse-linear.git
tag: bc6ca8058077b0b5702ea4b88bd4189cfcad267a
subdir: sparse-linear
source-repository-package
type: git
location: https://gitlab.iscpif.fr/amestanogullari/accelerate-utility.git
tag: a3875fe652d3bb5acb522674c22c6c814c1b4ad0
source-repository-package
type: git
location: https://gitlab.iscpif.fr/gargantext/haskell-igraph.git
tag: 9f8a2f4a014539826a4eab3215cc70c0813f20cb
source-repository-package
type: git
location: https://github.com/chessai/eigen.git
tag: 1790fdf9138970dde0dbabf8b270698145a4a88c
allow-older: *
allow-newer: *
package gargantext-graph
ghc-options: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack
package hmatrix
ghc-options: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack
package sparse-linear
ghc-options: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack
cabal.project.freeze 0 → 100644
View file @ 2cc9f625
This source diff could not be displayed because it is too large. You can view the blob instead.
gargantext-graph.cabal
View file @ 2cc9f625
......@@ -58,13 +58,13 @@ library
, containers
, eigen
, fgl
, haskell-igraph >=0.6.0
, haskell-igraph >=0.10.4
, hmatrix
, lens
, pretty-simple
, protolude
, reflection
, singletons
, singletons >= 3.0
, sparse-linear
, string-conversions
, text
......@@ -96,14 +96,14 @@ test-suite gargantext-graph-test
, eigen
, fgl
, gargantext-graph
, haskell-igraph >=0.6.0
, haskell-igraph >=0.10.4
, hmatrix
, hspec
, lens
, pretty-simple
, protolude
, reflection
, singletons
, singletons >= 3.0
, sparse-linear
, string-conversions
, text
......
nix/overlays/ghc947.nix 0 → 100644
View file @ 2cc9f625
This diff is collapsed.
nix/pinned-23.05.nix 0 → 100644
View file @ 2cc9f625
import (builtins.fetchGit {
name = "nixos-23.05";
url = "https://github.com/nixos/nixpkgs";
ref = "refs/heads/nixos-23.05";
rev = "4ecab3273592f27479a583fb6d975d4aba3486fe";
})
nix/pkgs.nix
View file @ 2cc9f625
{ pkgs ? import ./pinned-22.05.nix {} }:
{ pkgs ? import ./pinned-23.05.nix {} }:
rec {
stdenv = pkgs.clang12Stdenv;
inherit pkgs;
ghc = pkgs.haskell.compiler.ghc8104;
ghc947 = pkgs.callPackage ./overlays/ghc947.nix {
bootPkgs = pkgs.haskell.packages.ghc8107;
inherit (pkgs.buildPackages.python3Packages) sphinx;
# Need to use apple's patched xattr until
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (pkgs.buildPackages.darwin) xattr autoSignDarwinBinariesHook;
buildTargetLlvmPackages = pkgs.pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12;
targetCC = pkgs.clang12Stdenv.cc;
};
cabal_install_3_10_1_0 = pkgs.haskell.lib.compose.justStaticExecutables pkgs.haskell.packages.ghc927.cabal-install;
igraph_0_10_4 = pkgs.igraph.overrideAttrs (finalAttrs: previousAttrs: {
version = "0.10.4";
nativeBuildInputs = previousAttrs.nativeBuildInputs or [] ++ [ pkgs.clang_12 ];
src = pkgs.fetchFromGitHub {
owner = "igraph";
repo = "igraph";
rev = "0.10.4";
hash = "sha256-LsTOxUktGZcp46Ec9QH3+9C+VADMYTZZCjKF1gp36xk=";
};
postPatch = ''
echo "0.10.4" > IGRAPH_VERSION
'';
outputs = [ "out" "doc" ];
buildInputs = [
pkgs.arpack
pkgs.blas
pkgs.glpk
pkgs.gmp
pkgs.lapack
pkgs.libxml2
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"
];
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
'';
});
hsBuildInputs = [
ghc
pkgs.cabal-install
ghc947
cabal_install_3_10_1_0
];
nonhsBuildInputs = with pkgs; [
bzip2
......@@ -16,29 +86,36 @@ rec {
gsl
#haskell-language-server
hlint
igraph
libffi
liblapack
lapack
lzma
pcre
pkgconfig
pkg-config
postgresql
xz
zlib
blas
gfortran7
# gfortran7.cc.lib
expat
icu
graphviz
llvm_9
];
llvm_12
clang_12
libpqxx
libsodium
igraph_0_10_4
] ++ ( 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.clang_12}/bin:$PATH"
export NIX_CC="${pkgs.clang_12}"
export CC="${pkgs.clang_12}/bin/clang"
'';
shell = pkgs.mkShell {
shell = pkgs.mkShell.override {stdenv = pkgs.clang12Stdenv; } {
name = "gargantext-shell";
buildInputs = hsBuildInputs ++ nonhsBuildInputs;
inherit shellHook;
......
shell.nix 0 → 100644
View file @ 2cc9f625
{ pkgs ? import ./nix/pkgs.nix {} }:
let
myBuildInputs = [ ];
in
pkgs.pkgs.mkShell {
name = pkgs.shell.name;
LOCALE_ARCHIVE = if pkgs.pkgs.stdenv.isLinux then "${pkgs.pkgs.glibcLocales}/lib/locale/locale-archive" else "";
#home.sessionVariables.LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
shellHook = pkgs.shell.shellHook;
buildInputs = pkgs.shell.buildInputs ++ myBuildInputs;
}
stack.yaml
View file @ 2cc9f625
resolver:
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/28.yaml
resolver: lts-21.17
flags:
accelerate:
debug: false
......@@ -8,26 +7,14 @@ skip-ghc-check: true
packages:
- .
docker:
enable: false
#enable: true
repo: 'cgenie/stack-build:lts-18.18-garg'
#repo: 'cgenie/nixos-stack:latest'
skip-ghc-check: true
nix:
enable: false
add-gc-roots: true
shell-file: nix/stack-shell.nix
allow-newer: true
extra-deps:
- git: https://github.com/alpmestan/haskell-igraph.git
commit: 9f55eb36639c8e0965c8bc539a57738869f33e9a
- git: https://github.com/alpmestan/accelerate.git
commit: 640b5af87cea94b61c7737d878e6f7f2fca5c015
- git: https://gitlab.iscpif.fr/gargantext/haskell-igraph.git
# 0.10.4-rc2
commit: 9f8a2f4a014539826a4eab3215cc70c0813f20cb
- git: https://github.com/AccelerateHS/accelerate.git
commit: 334d05519436bb7f20f9926ec76418f5b8afa359
- git: https://gitlab.iscpif.fr/amestanogullari/accelerate-utility.git
commit: a3875fe652d3bb5acb522674c22c6c814c1b4ad0
- git: https://github.com/alpmestan/sparse-linear.git
......@@ -40,15 +27,11 @@ extra-deps:
- packages/base
- git: https://github.com/alpmestan/accelerate-arithmetic.git
commit: a110807651036ca2228a76507ee35bbf7aedf87a
- eigen-3.3.7.0@sha256:7c24a86426b238e02ba0ac2179cc44997518b443a13828ed7a791fe49a6dffa5,82060
- git: https://github.com/chessai/eigen.git
commit: 1790fdf9138970dde0dbabf8b270698145a4a88c
- vector-0.12.3.0
ghc-options:
hmatrix: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack
sparse-linear: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack
gargantext-graph: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack
ghc-options:
hmatrix: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack
sparse-linear: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack
gargantext-graph: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack
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