Commit 2ffd7ada authored by Alfredo Di Napoli's avatar Alfredo Di Napoli Committed by Alfredo Di Napoli

fix(deps): upgrade to NNG, allegedly fixes flaky tests

parent f48e7130
...@@ -16,8 +16,8 @@ fi ...@@ -16,8 +16,8 @@ fi
# with the `sha256sum` result calculated on the `cabal.project` and # with the `sha256sum` result calculated on the `cabal.project` and
# `cabal.project.freeze`. This ensures the files stay deterministic so that CI # `cabal.project.freeze`. This ensures the files stay deterministic so that CI
# cache can kick in. # cache can kick in.
expected_cabal_project_hash="0ce011cd483078936fe3385b3e0c90231774fd2ac05bfb9f4c646345a0208d66" expected_cabal_project_hash="963418e37a17d4bb67d4b885613144b36d290f612eea80355e82abc7e76b450c"
expected_cabal_project_freeze_hash="cd52143d3a9d285360b59c6371d3e258552c1bc115bd612024db3de1f7593ff7" expected_cabal_project_freeze_hash="cd52143d3a9d285360b59c6371d3e258552c1bc115bd612024db3de1f7593ff7"
cabal --store-dir=$STORE_DIR v2-build --dry-run cabal --store-dir=$STORE_DIR v2-build --dry-run
......
...@@ -132,12 +132,12 @@ source-repository-package ...@@ -132,12 +132,12 @@ source-repository-package
location: https://github.com/haskell-github-trust/ekg-json location: https://github.com/haskell-github-trust/ekg-json
tag: bd0592818882f9cf34d2991d01f7dcb3d8bca309 tag: bd0592818882f9cf34d2991d01f7dcb3d8bca309
-- FIXME(adn) Compat-shim while we wait for upstream to catch-up -- NOTE(adn) This forks binds to nng.
source-repository-package source-repository-package
type: git type: git
location: https://github.com/garganscript/nanomsg-haskell location: https://github.com/adinapoli/nanomsg-haskell
tag: 5868db564d7d3c4568ccd11c852292b834d26c55 tag: 2d69707bf639be2055e3228dab38cc4f2a658111
source-repository-package source-repository-package
type: git type: git
location: https://github.com/adinapoli/http-reverse-proxy.git location: https://github.com/adinapoli/http-reverse-proxy.git
......
...@@ -11,6 +11,9 @@ rec { ...@@ -11,6 +11,9 @@ rec {
igraph_0_10_4 = pkgs.callPackage ./igraph.nix {}; igraph_0_10_4 = pkgs.callPackage ./igraph.nix {};
corenlp = pkgs.callPackage ./corenlp.nix { }; # 4.5.8 corenlp = pkgs.callPackage ./corenlp.nix { }; # 4.5.8
cabal2stack = pkgs.callPackage ./cabal2stack.nix { ghc = ghc966; }; cabal2stack = pkgs.callPackage ./cabal2stack.nix { ghc = ghc966; };
nng_notls = pkgs.nng.overrideAttrs (old: {
cmakeFlags = (old.cmakeFlags or []) ++ [ "-DNNG_ENABLE_TLS=OFF" ];
});
hsBuildInputs = [ hsBuildInputs = [
ghc966 ghc966
...@@ -42,7 +45,7 @@ rec { ...@@ -42,7 +45,7 @@ rec {
libffi libffi
libpqxx libpqxx
libsodium libsodium
nng nng_notls
nil # nix language server nil # nix language server
pcre pcre
pkg-config pkg-config
......
...@@ -48,7 +48,7 @@ with many users having updates. ...@@ -48,7 +48,7 @@ with many users having updates.
-} -}
gServer :: GargConfig -> IO () gServer :: HasCallStack => GargConfig -> IO ()
gServer cfg = do gServer cfg = do
withLogger log_cfg $ \ioLogger -> do withLogger log_cfg $ \ioLogger -> do
withSocket Pull $ \s -> do withSocket Pull $ \s -> do
...@@ -110,7 +110,7 @@ gServer cfg = do ...@@ -110,7 +110,7 @@ gServer cfg = do
-- | A static send timeout in microseconds. -- | A static send timeout in microseconds.
send_timeout_ns :: Int send_timeout_ns :: Int
send_timeout_ns = 100_00 send_timeout_ns = 50_000
-- | Sends the given payload ensure the send doesn't take more than the static -- | Sends the given payload ensure the send doesn't take more than the static
-- 'send_timeout_ns', logging a message if the timeouts kicks in. -- 'send_timeout_ns', logging a message if the timeouts kicks in.
...@@ -123,7 +123,7 @@ sendTimeout ioLogger sock payload = withFrozenCallStack $ do ...@@ -123,7 +123,7 @@ sendTimeout ioLogger sock payload = withFrozenCallStack $ do
Just () -> Just () ->
$(logLoc) ioLogger DEBUG $ "[central_exchange] message sent." $(logLoc) ioLogger DEBUG $ "[central_exchange] message sent."
notify :: GargConfig -> CEMessage -> IO () notify :: HasCallStack => GargConfig -> CEMessage -> IO ()
notify cfg ceMessage = withLogger log_cfg $ \ioLogger -> do notify cfg ceMessage = withLogger log_cfg $ \ioLogger -> do
Async.withAsync (pure ()) $ \_ -> do Async.withAsync (pure ()) $ \_ -> do
withSocket Push $ \s -> do withSocket Push $ \s -> do
......
...@@ -110,6 +110,10 @@ ...@@ -110,6 +110,10 @@
git: "https://github.com/adinapoli/http-reverse-proxy.git" git: "https://github.com/adinapoli/http-reverse-proxy.git"
subdirs: subdirs:
- . - .
- commit: 2d69707bf639be2055e3228dab38cc4f2a658111
git: "https://github.com/adinapoli/nanomsg-haskell"
subdirs:
- .
- commit: b9fca8beee0f23c17a6b2001ec834d071709e6e7 - commit: b9fca8beee0f23c17a6b2001ec834d071709e6e7
git: "https://github.com/alpmestan/hmatrix.git" git: "https://github.com/alpmestan/hmatrix.git"
subdirs: subdirs:
...@@ -134,10 +138,6 @@ ...@@ -134,10 +138,6 @@
git: "https://github.com/fpringle/servant-routes.git" git: "https://github.com/fpringle/servant-routes.git"
subdirs: subdirs:
- . - .
- commit: 5868db564d7d3c4568ccd11c852292b834d26c55
git: "https://github.com/garganscript/nanomsg-haskell"
subdirs:
- .
- commit: bd0592818882f9cf34d2991d01f7dcb3d8bca309 - commit: bd0592818882f9cf34d2991d01f7dcb3d8bca309
git: "https://github.com/haskell-github-trust/ekg-json" git: "https://github.com/haskell-github-trust/ekg-json"
subdirs: subdirs:
...@@ -355,7 +355,7 @@ flags: ...@@ -355,7 +355,7 @@ flags:
gargantext: gargantext:
"enable-benchmarks": false "enable-benchmarks": false
"no-phylo-debug-logs": true "no-phylo-debug-logs": true
"test-crypto": false "test-crypto": true
graphviz: graphviz:
"test-parsing": false "test-parsing": false
hashable: hashable:
......
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