Skip to content

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

[flake] update packages, also in cabal.project

parent b6656416
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 14 deletions
cabal.project
View file @ c3d69d96
...@@ -130,8 +130,8 @@ source-repository-package ...@@ -130,8 +130,8 @@ source-repository-package
source-repository-package source-repository-package
type: git type: git
location: https://github.com/haskell-github-trust/ekg-json location: https://github.com/haskell-github-trust/ekg-json.git
tag: bd0592818882f9cf34d2991d01f7dcb3d8bca309 tag: 72df79ce1735d48731766d5b6ba7450a22ed8390
-- NOTE(adn) This forks binds to nng. -- NOTE(adn) This forks binds to nng.
source-repository-package source-repository-package
...@@ -151,21 +151,21 @@ source-repository-package ...@@ -151,21 +151,21 @@ source-repository-package
source-repository-package source-repository-package
type: git type: git
location: https://gitlab.iscpif.fr/gargantext/haskell-pgmq location: https://gitlab.iscpif.fr/gargantext/haskell-pgmq.git
tag: 1dd92f0aa8e9f8096064e5656c336e562680f4e3 tag: 1dd92f0aa8e9f8096064e5656c336e562680f4e3
source-repository-package source-repository-package
type: git type: git
location: https://gitlab.iscpif.fr/gargantext/haskell-bee location: https://gitlab.iscpif.fr/gargantext/haskell-bee.git
tag: 4a9c709613554eed0189b486de2126c18797088c tag: 99e4eb2a0ea8db3828074eae90bdbfc43dd87cca
subdir: haskell-bee/ subdir: haskell-bee/
haskell-bee-pgmq/ haskell-bee-pgmq/
haskell-bee-tests/ haskell-bee-tests/
source-repository-package source-repository-package
type: git type: git
location: https://gitlab.iscpif.fr/gargantext/haskell-throttle location: https://gitlab.iscpif.fr/gargantext/haskell-throttle.git
tag: 02f5ed9ee2d6cce45161addf945b88bc6adf9059 tag: e0d9a8b32afde9652dd99e99df611a8c2a88f2e9
allow-newer: MissingH:base allow-newer: MissingH:base
, *:base , *:base
......
flake.nix
View file @ c3d69d96
...@@ -64,19 +64,21 @@ ...@@ -64,19 +64,21 @@
# WARNING: unmerged commit # WARNING: unmerged commit
# See https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude/merge_requests/13 # See https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude/merge_requests/13
gargantext-prelude = { url = "git+https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude.git?ref=master"; flake = false; }; gargantext-prelude = { url = "git+https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude.git?ref=master"; flake = false; };
haskell-bee = { url = "git+https://gitlab.iscpif.fr/gargantext/haskell-bee.git"; flake = false; };
haskell-igraph = { url = "git+https://gitlab.iscpif.fr/gargantext/haskell-igraph.git?rev=9f8a2f4a014539826a4eab3215cc70c0813f20cb"; flake = false; }; haskell-igraph = { url = "git+https://gitlab.iscpif.fr/gargantext/haskell-igraph.git?rev=9f8a2f4a014539826a4eab3215cc70c0813f20cb"; flake = false; };
haskell-throttle = { url = "git+https://gitlab.iscpif.fr/gargantext/haskell-throttle"; flake = false; }; haskell-pgmq = { url = "git+https://gitlab.iscpif.fr/gargantext/haskell-pgmq.git"; flake = false; };
haskell-throttle = { url = "git+https://gitlab.iscpif.fr/gargantext/haskell-throttle.git"; flake = false; };
hlcm = { url = "git+https://gitlab.iscpif.fr/gargantext/hlcm.git"; flake = false; }; hlcm = { url = "git+https://gitlab.iscpif.fr/gargantext/hlcm.git"; flake = false; };
# WARNING: using the alp/imap-static branch # WARNING: using the alp/imap-static branch
hmatrix = { url = "github:alpmestan/hmatrix/alp/imap-static"; flake = false; }; hmatrix = { url = "github:alpmestan/hmatrix/alp/imap-static"; flake = false; };
hsinfomap = { url = "git+https://gitlab.iscpif.fr/gargantext/haskell-infomap.git"; flake = false; }; hsinfomap = { url = "git+https://gitlab.iscpif.fr/gargantext/haskell-infomap.git"; flake = false; };
http-reverse-proxy = { url = "github:adinapoli/http-reverse-proxy"; flake = false; }; http-reverse-proxy = { url = "github:adinapoli/http-reverse-proxy?ref=adinapoli/bump-redirect-counts"; flake = false; };
iso639 = { url = "git+https://gitlab.iscpif.fr/gargantext/iso639.git"; flake = false; }; iso639 = { url = "git+https://gitlab.iscpif.fr/gargantext/iso639.git"; flake = false; };
# WARNING: fork of https://github.com/llvm-hs/llvm-hs # WARNING: fork of https://github.com/llvm-hs/llvm-hs
# using adinapoli/llvm-12-ghc-947-compat branch # using adinapoli/llvm-12-ghc-947-compat branch
# Tracked in: https://gitlab.iscpif.fr/gargantext/haskell-gargantext/issues/318 # Tracked in: https://gitlab.iscpif.fr/gargantext/haskell-gargantext/issues/318
#llvm-hs = { url = "github:adinapoli/llvm-hs/adinapoli/llvm-12-ghc-947-compat"; flake = false; }; #llvm-hs = { url = "github:adinapoli/llvm-hs/adinapoli/llvm-12-ghc-947-compat"; flake = false; };
nanomsg-haskell = { url = "git+https://github.com/garganscript/nanomsg-haskell"; flake = false; }; nanomsg-haskell = { url = "github:adinapoli/nanomsg-haskell?ref=support-nng"; flake = false; };
opaleye-textsearch = { url = "git+https://gitlab.iscpif.fr/gargantext/opaleye-textsearch.git?allRefs=1"; flake = false; }; opaleye-textsearch = { url = "git+https://gitlab.iscpif.fr/gargantext/opaleye-textsearch.git?allRefs=1"; flake = false; };
openalex = { url = "git+https://gitlab.iscpif.fr/gargantext/crawlers/openalex.git"; flake = false; }; openalex = { url = "git+https://gitlab.iscpif.fr/gargantext/crawlers/openalex.git"; flake = false; };
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; };
...@@ -201,7 +203,8 @@ ...@@ -201,7 +203,8 @@
removePackageYaml = src: pkgs.symlinkJoin { removePackageYaml = src: pkgs.symlinkJoin {
name = "removePackageYaml-patched"; name = "removePackageYaml-patched";
paths = [ src ]; paths = [ src ];
postBuild = "rm $out/package.yaml"; #postBuild = "rm $out/package.yaml";
postBuild = "";
# Preserve rev for the inputMap # Preserve rev for the inputMap
passthru.rev = src.rev; passthru.rev = src.rev;
}; };
...@@ -215,7 +218,8 @@ ...@@ -215,7 +218,8 @@
{ {
#"https://github.com/AccelerateHS/accelerate-llvm.git" = inputs.accelerate-llvm; #"https://github.com/AccelerateHS/accelerate-llvm.git" = inputs.accelerate-llvm;
"https://github.com/AccelerateHS/accelerate.git" = inputs.accelerate; "https://github.com/AccelerateHS/accelerate.git" = inputs.accelerate;
"https://github.com/MercuryTechnologies/ekg-json.git" = inputs.ekg-json; #"https://github.com/MercuryTechnologies/ekg-json.git" = inputs.ekg-json;
"https://github.com/haskell-github-trust/ekg-json.git" = inputs.ekg-json;
"https://github.com/boolexpr/boolexpr.git" = inputs.boolexpr; "https://github.com/boolexpr/boolexpr.git" = inputs.boolexpr;
#"https://github.com/adinapoli/llvm-hs.git" = inputs.llvm-hs; #"https://github.com/adinapoli/llvm-hs.git" = inputs.llvm-hs;
#"https://github.com/alpmestan/accelerate-arithmetic.git" = applyPatches "accelerate-arithmetic" [ #"https://github.com/alpmestan/accelerate-arithmetic.git" = applyPatches "accelerate-arithmetic" [
...@@ -235,18 +239,20 @@ ...@@ -235,18 +239,20 @@
"https://gitlab.iscpif.fr/gargantext/crawlers/arxiv-api.git" = inputs.crawlerArxiv; "https://gitlab.iscpif.fr/gargantext/crawlers/arxiv-api.git" = inputs.crawlerArxiv;
"https://gitlab.iscpif.fr/gargantext/crawlers/epo-proxy-api.git" = inputs.epo-api-client; "https://gitlab.iscpif.fr/gargantext/crawlers/epo-proxy-api.git" = inputs.epo-api-client;
"https://gitlab.iscpif.fr/gargantext/crawlers/hal.git" = inputs.crawlerHAL; "https://gitlab.iscpif.fr/gargantext/crawlers/hal.git" = inputs.crawlerHAL;
"https://gitlab.iscpif.fr/gargantext/haskell-throttle" = inputs.haskell-throttle;
"https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git" = removePackageYaml inputs.crawlerIsidore; "https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git" = removePackageYaml inputs.crawlerIsidore;
"https://gitlab.iscpif.fr/gargantext/crawlers/istex.git" = removePackageYaml inputs.crawlerISTEX; "https://gitlab.iscpif.fr/gargantext/crawlers/istex.git" = removePackageYaml inputs.crawlerISTEX;
"https://gitlab.iscpif.fr/gargantext/crawlers/openalex.git" = inputs.openalex; "https://gitlab.iscpif.fr/gargantext/crawlers/openalex.git" = inputs.openalex;
"https://gitlab.iscpif.fr/gargantext/crawlers/pubmed.git" = inputs.crawlerPubMed; "https://gitlab.iscpif.fr/gargantext/crawlers/pubmed.git" = inputs.crawlerPubMed;
"https://gitlab.iscpif.fr/gargantext/gargantext-graph.git" = inputs.gargantext-graph; "https://gitlab.iscpif.fr/gargantext/gargantext-graph.git" = inputs.gargantext-graph;
"https://gitlab.iscpif.fr/gargantext/haskell-bee.git" = inputs.haskell-bee;
"https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude" = removePackageYaml inputs.gargantext-prelude; "https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude" = removePackageYaml inputs.gargantext-prelude;
"https://gitlab.iscpif.fr/gargantext/haskell-igraph.git" = inputs.haskell-igraph; "https://gitlab.iscpif.fr/gargantext/haskell-igraph.git" = inputs.haskell-igraph;
"https://gitlab.iscpif.fr/gargantext/haskell-infomap.git" = inputs.hsinfomap; "https://gitlab.iscpif.fr/gargantext/haskell-infomap.git" = inputs.hsinfomap;
"https://gitlab.iscpif.fr/gargantext/haskell-pgmq.git" = inputs.haskell-pgmq;
"https://gitlab.iscpif.fr/gargantext/haskell-throttle.git" = inputs.haskell-throttle;
"https://gitlab.iscpif.fr/gargantext/hlcm.git" = inputs.hlcm; "https://gitlab.iscpif.fr/gargantext/hlcm.git" = inputs.hlcm;
"https://gitlab.iscpif.fr/gargantext/iso639.git" = inputs.iso639; "https://gitlab.iscpif.fr/gargantext/iso639.git" = inputs.iso639;
"https://github.com/garganscript/nanomsg-haskell" = inputs.nanomsg-haskell; "https://github.com/adinapoli/nanomsg-haskell" = inputs.nanomsg-haskell;
"https://gitlab.iscpif.fr/gargantext/patches-class.git" = inputs.patches-class; "https://gitlab.iscpif.fr/gargantext/patches-class.git" = inputs.patches-class;
"https://gitlab.iscpif.fr/gargantext/servant-xml-conduit.git" = inputs.servant-xml-conduit; "https://gitlab.iscpif.fr/gargantext/servant-xml-conduit.git" = inputs.servant-xml-conduit;
......
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