[flake] this can be run and built now

However, develop still doesn't work well
parent e3e6bda7
Pipeline #7715 failed with stages
in 15 minutes and 29 seconds
...@@ -151,7 +151,9 @@ source-repository-package ...@@ -151,7 +151,9 @@ source-repository-package
source-repository-package source-repository-package
type: git type: git
location: https://github.com/fpringle/servant-routes.git location: https://github.com/fpringle/servant-routes.git
tag: 16509b30012b7585ab776df31d70ef384050dbdc tag: 20d17c16b543a846e8f592c3a19ba8d5ad4f5d23
-- tag: 16509b30012b7585ab776df31d70ef384050dbdc
-- subdir: servant-routes/
source-repository-package source-repository-package
type: git type: git
...@@ -171,6 +173,8 @@ source-repository-package ...@@ -171,6 +173,8 @@ source-repository-package
location: https://gitlab.iscpif.fr/gargantext/haskell-throttle.git location: https://gitlab.iscpif.fr/gargantext/haskell-throttle.git
tag: e0d9a8b32afde9652dd99e99df611a8c2a88f2e9 tag: e0d9a8b32afde9652dd99e99df611a8c2a88f2e9
constraints: llvm-hs < 0
allow-newer: MissingH:base allow-newer: MissingH:base
, *:base , *:base
, *:bytestring , *:bytestring
......
...@@ -1127,15 +1127,16 @@ ...@@ -1127,15 +1127,16 @@
"servant-routes": { "servant-routes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1714815254, "lastModified": 1748367044,
"narHash": "sha256-B9Ok0gwagyOUlCiz6gO1NtTwIx6oxqqDJC+TUx7xNco=", "narHash": "sha256-TwsGvPW35oT0eCDKXdCYYHlEvZartrGd1kZI9T3kc30=",
"owner": "fpringle", "owner": "fpringle",
"repo": "servant-routes", "repo": "servant-routes",
"rev": "16509b30012b7585ab776df31d70ef384050dbdc", "rev": "20d17c16b543a846e8f592c3a19ba8d5ad4f5d23",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "fpringle", "owner": "fpringle",
"ref": "v0.1.1.0",
"repo": "servant-routes", "repo": "servant-routes",
"type": "github" "type": "github"
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# nix build .#gargantext:lib:gargantext # nix build .#gargantext:lib:gargantext
# nix build .#gargantext:exe:gargantext # nix build .#gargantext:exe:gargantext
# For any input, one can: # For any input, one can:
# Update to the latest commit: # Update to the latest commit:
# nix flake lock --update-input nixpkgs # nix flake lock --update-input nixpkgs
...@@ -88,8 +88,7 @@ ...@@ -88,8 +88,7 @@
patches-class = { url = "git+https://gitlab.iscpif.fr/gargantext/patches-class.git"; flake = false; }; patches-class = { url = "git+https://gitlab.iscpif.fr/gargantext/patches-class.git"; flake = false; };
patches-map = { url = "github:delanoe/patches-map"; flake = false; }; patches-map = { url = "github:delanoe/patches-map"; flake = false; };
rdf4h = { url = "github:robstewart57/rdf4h"; flake = false; }; rdf4h = { url = "github:robstewart57/rdf4h"; flake = false; };
# WARNING: using the more-exports branch servant-routes = { url = "github:fpringle/servant-routes?ref=v0.1.1.0"; flake = false; };
servant-routes = { url = "github:fpringle/servant-routes"; flake = false; };
servant-xml-conduit = { url = "git+https://gitlab.iscpif.fr/gargantext/servant-xml-conduit"; flake = false; }; servant-xml-conduit = { url = "git+https://gitlab.iscpif.fr/gargantext/servant-xml-conduit"; flake = false; };
# WARNING: using the alp/static branch # WARNING: using the alp/static branch
sparse-linear = { url = "github:alpmestan/sparse-linear/alp/static"; flake = false; }; sparse-linear = { url = "github:alpmestan/sparse-linear/alp/static"; flake = false; };
...@@ -288,9 +287,9 @@ ...@@ -288,9 +287,9 @@
packages.nanomsg-haskell.components.library = { packages.nanomsg-haskell.components.library = {
libs = [ libs = [
( pkgs.nng.overrideAttrs (old: { (pkgs.nng.overrideAttrs (old: {
cmakeFlags = (old.cmakeFlags or []) ++ [ "-DNNG_ENABLE_TLS=OFF" ]; cmakeFlags = (old.cmakeFlags or [ ]) ++ [ "-DNNG_ENABLE_TLS=OFF" ];
}) ) }))
]; ];
}; };
...@@ -543,18 +542,18 @@ ...@@ -543,18 +542,18 @@
}; };
# For garg-test-hspec # For garg-test-hspec
coreNLP = pkgs.callPackage ./nix/corenlp.nix {}; coreNLP = pkgs.callPackage ./nix/corenlp.nix { };
# # Avoid recompiling openjdk due to any overlay used in the common pkgs. # # Avoid recompiling openjdk due to any overlay used in the common pkgs.
# let pkgs = import inputs.nixpkgs { inherit system; }; in # let pkgs = import inputs.nixpkgs { inherit system; }; in
# inputs.flake-utils.lib.mkApp { # inputs.flake-utils.lib.mkApp {
# drv = pkgs.writeShellApplication { # drv = pkgs.writeShellApplication {
# name = "coreNLP"; # name = "coreNLP";
# text = '' # text = ''
# set -x # set -x
# exec ${pkgs.openjdk}/bin/java -mx4g -cp '${inputs.coreNLP}/*' edu.stanford.nlp.pipeline.StanfordCoreNLPServer -port 9000 -timeout 15000 # exec ${pkgs.openjdk}/bin/java -mx4g -cp '${inputs.coreNLP}/*' edu.stanford.nlp.pipeline.StanfordCoreNLPServer -port 9000 -timeout 15000
# ''; # '';
# }; # };
# }; # };
}; };
# For running all checks (very slow): # For running all checks (very slow):
......
...@@ -616,7 +616,7 @@ library ...@@ -616,7 +616,7 @@ library
, servant-conduit >= 0.15 && < 0.17 , servant-conduit >= 0.15 && < 0.17
, servant-ekg ^>= 0.3.1 , servant-ekg ^>= 0.3.1
, servant-openapi3 >= 2.0.1.6 , servant-openapi3 >= 2.0.1.6
, servant-routes < 0.2 , servant-routes
, servant-server >= 0.18.3 && < 0.21 , servant-server >= 0.18.3 && < 0.21
, servant-swagger ^>= 1.2 , servant-swagger ^>= 1.2
, servant-swagger-ui ^>= 0.3.5.3.5.0 , servant-swagger-ui ^>= 0.3.5.3.5.0
...@@ -710,7 +710,7 @@ executable gargantext ...@@ -710,7 +710,7 @@ executable gargantext
, servant >= 0.20.1 && < 0.21 , servant >= 0.20.1 && < 0.21
, servant-auth , servant-auth
, servant-client-core >= 0.20 && < 0.21 , servant-client-core >= 0.20 && < 0.21
, servant-routes < 0.2 , servant-routes
, servant-websockets >= 2.0.0 && < 2.1 , servant-websockets >= 2.0.0 && < 2.1
, shelly , shelly
, split >= 0.2.3.4 , split >= 0.2.3.4
...@@ -930,8 +930,8 @@ benchmark garg-bench ...@@ -930,8 +930,8 @@ benchmark garg-bench
Paths_gargantext Paths_gargantext
build-depends: base build-depends: base
, accelerate , accelerate
, accelerate-llvm-native -- , accelerate-llvm-native
, hmatrix -- , hmatrix
, massiv , massiv
, deepseq , deepseq
, gargantext , gargantext
......
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