Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
159
Issues
159
List
Board
Labels
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
haskell-gargantext
Commits
4028238e
Verified
Commit
4028238e
authored
Oct 08, 2024
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flake] update to 9.4.8
parent
5660aec0
Pipeline
#6790
failed with stages
in 7 minutes and 30 seconds
Changes
2
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
274 additions
and
192 deletions
+274
-192
flake.lock
flake.lock
+229
-159
flake.nix
flake.nix
+45
-33
No files found.
flake.lock
View file @
4028238e
This diff is collapsed.
Click to expand it.
flake.nix
View file @
4028238e
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
# to follow haskell.nix's nixpkgs pinned version,
# to follow haskell.nix's nixpkgs pinned version,
# but it may be a few months old, so pin it here instead.
# but it may be a few months old, so pin it here instead.
#nixpkgs.follows = "haskell-nix/nixpkgs";
#nixpkgs.follows = "haskell-nix/nixpkgs";
nixpkgs
.
url
=
"github:NixOS/nixpkgs"
;
nixpkgs
.
url
=
"github:NixOS/nixpkgs
/nixos-24.05
"
;
haskell-nix
.
inputs
.
nixpkgs
.
follows
=
"nixpkgs"
;
haskell-nix
.
inputs
.
nixpkgs
.
follows
=
"nixpkgs"
;
# Convenient Nix Flake utilities, like flake-utils.lib.eachSystem.
# Convenient Nix Flake utilities, like flake-utils.lib.eachSystem.
...
@@ -61,25 +61,30 @@
...
@@ -61,25 +61,30 @@
# 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=303-master-refactoring"
;
flake
=
false
;
};
gargantext-prelude
=
{
url
=
"git+https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude.git?ref=303-master-refactoring"
;
flake
=
false
;
};
haskell-igraph
=
{
url
=
"git+https://gitlab.iscpif.fr/gargantext/haskell-igraph.git"
;
flake
=
false
;
};
haskell-igraph
=
{
url
=
"git+https://gitlab.iscpif.fr/gargantext/haskell-igraph.git"
;
flake
=
false
;
};
haskell-throttle
=
{
url
=
"git+https://gitlab.iscpif.fr/gargantext/haskell-throttle"
;
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
;
};
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
;
};
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
;
};
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
# WARNING: using the more-exports branch
servant-job
=
{
url
=
"github:alpmestan/servant-job/more-exports"
;
flake
=
false
;
};
servant-job
=
{
url
=
"github:adinapoli/servant-job"
;
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
;
};
toml-parser
=
{
url
=
"git+https://github.com/glguy/toml-parser/toml-parser-2.0.1.0"
;
flake
=
false
;
};
};
};
# For printing the available outputs:
# For printing the available outputs:
...
@@ -134,7 +139,7 @@
...
@@ -134,7 +139,7 @@
./cabal.project.freeze
./cabal.project.freeze
./devops
./devops
./ekg-assets
./ekg-assets
./gargantext-cors-settings.toml
#
./gargantext-cors-settings.toml
./gargantext.cabal
./gargantext.cabal
./test-data
./test-data
(
fileFilter
(
file
:
lib
.
any
file
.
hasExt
[
"hs"
])
./bench
)
(
fileFilter
(
file
:
lib
.
any
file
.
hasExt
[
"hs"
])
./bench
)
...
@@ -213,17 +218,20 @@
...
@@ -213,17 +218,20 @@
nix/haskell.nix/patches/accelerate-arithmetic/0001-remove-test-using-removed-realBandedGramian.patch
nix/haskell.nix/patches/accelerate-arithmetic/0001-remove-test-using-removed-realBandedGramian.patch
];
];
"https://github.com/alpmestan/hmatrix.git"
=
inputs
.
hmatrix
;
"https://github.com/alpmestan/hmatrix.git"
=
inputs
.
hmatrix
;
"https://github.com/a
lpmestan
/servant-job.git"
=
inputs
.
servant-job
;
"https://github.com/a
dinapoli
/servant-job.git"
=
inputs
.
servant-job
;
"https://github.com/alpmestan/sparse-linear.git"
=
inputs
.
sparse-linear
;
"https://github.com/alpmestan/sparse-linear.git"
=
inputs
.
sparse-linear
;
"https://github.com/chessai/eigen.git"
=
inputs
.
eigen
;
"https://github.com/chessai/eigen.git"
=
inputs
.
eigen
;
"https://github.com/delanoe/data-time-segment.git"
=
inputs
.
data-time-segment
;
"https://github.com/delanoe/data-time-segment.git"
=
inputs
.
data-time-segment
;
"https://github.com/adinapoli/http-reverse-proxy.git"
=
inputs
.
http-reverse-proxy
;
"https://github.com/delanoe/patches-map"
=
inputs
.
patches-map
;
"https://github.com/delanoe/patches-map"
=
inputs
.
patches-map
;
"https://gitlab.iscpif.fr/gargantext/opaleye-textsearch.git"
=
inputs
.
opaleye-textsearch
;
"https://gitlab.iscpif.fr/gargantext/opaleye-textsearch.git"
=
inputs
.
opaleye-textsearch
;
"https://github.com/robstewart57/rdf4h.git"
=
inputs
.
rdf4h
;
"https://github.com/robstewart57/rdf4h.git"
=
inputs
.
rdf4h
;
"https://github.com/fpringle/servant-routes.git"
=
inputs
.
servant-routes
;
"https://gitlab.iscpif.fr/amestanogullari/accelerate-utility.git"
=
inputs
.
accelerate-utility
;
"https://gitlab.iscpif.fr/amestanogullari/accelerate-utility.git"
=
inputs
.
accelerate-utility
;
"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
;
...
@@ -234,8 +242,12 @@
...
@@ -234,8 +242,12 @@
"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/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://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
;
# TODO tag used in cabal.project
"https://github.com/glguy/toml-parser/toml-parser-2.0.1.0"
=
inputs
.
toml-parser
;
};
};
# Default project configuration.
# Default project configuration.
...
@@ -426,33 +438,33 @@
...
@@ -426,33 +438,33 @@
# $ bat result
# $ bat result
# Note that there may be false positives
# Note that there may be false positives
# and that some file location may be wrong.
# and that some file location may be wrong.
weeder
=
{
#
weeder = {
packages
=
ps
:
#
packages = ps:
haskellLib
.
selectProjectPackages
ps
//
#
haskellLib.selectProjectPackages ps //
lib
.
getAttrs
[
#
lib.getAttrs [
"crawlerArxiv"
#
"crawlerArxiv"
"crawlerHAL"
#
"crawlerHAL"
"crawlerIsidore"
#
"crawlerIsidore"
"crawlerPubMed"
#
"crawlerPubMed"
"epo-api-client"
#
"epo-api-client"
"gargantext-graph"
#
"gargantext-graph"
"gargantext-prelude"
#
"gargantext-prelude"
]
#
]
ps
;
#
ps;
# See https://github.com/ocharles/weeder?tab=readme-ov-file#configuration-options
#
# See https://github.com/ocharles/weeder?tab=readme-ov-file#configuration-options
settings
=
{
#
settings = {
roots
=
[
#
roots = [
"^Main.main$"
#
"^Main.main$"
# Automatically generated by Cabal
#
# Automatically generated by Cabal
"^Paths_.*"
#
"^Paths_.*"
];
#
];
root-instances
=
[
#
root-instances = [
];
#
];
# Consider all instances of type classes as roots.
#
# Consider all instances of type classes as roots.
type-class-roots
=
true
;
#
type-class-roots = true;
unused-types
=
true
;
#
unused-types = true;
};
#
};
};
#
};
# Make some variables available to all project modules
# Make some variables available to all project modules
_module
.
specialArgs
=
{
_module
.
specialArgs
=
{
...
@@ -468,7 +480,7 @@
...
@@ -468,7 +480,7 @@
# project modules
# project modules
(
import
nix/haskell.nix/modules/gargantext.nix
)
(
import
nix/haskell.nix/modules/gargantext.nix
)
(
import
nix/haskell.nix/modules/weeder.nix
)
#
(import nix/haskell.nix/modules/weeder.nix)
];
];
projectFlake
=
project
.
flake
{
};
projectFlake
=
project
.
flake
{
};
...
@@ -485,7 +497,7 @@
...
@@ -485,7 +497,7 @@
# For building a component of this project:
# For building a component of this project:
# $ nix -L build .#gargantext:exe:gargantext-phylo-profile
# $ nix -L build .#gargantext:exe:gargantext-phylo-profile
packages
=
projectFlake
.
packages
//
{
packages
=
projectFlake
.
packages
//
{
weeder-analysis
=
project
.
args
.
weeder
.
analysis
;
#
weeder-analysis = project.args.weeder.analysis;
};
};
# For entering the default development shell:
# For entering the default development shell:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment