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
7e7dab44
Verified
Commit
7e7dab44
authored
Oct 09, 2024
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flake] some updates for llvm
parent
8943dcb9
Pipeline
#6795
failed with stages
in 7 minutes and 23 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
14 deletions
+23
-14
flake.lock
flake.lock
+13
-12
flake.nix
flake.nix
+10
-2
No files found.
flake.lock
View file @
7e7dab44
...
...
@@ -53,12 +53,14 @@
"accelerate-llvm": {
"flake": false,
"locked": {
"lastModified": 1692704049,
"narHash": "sha256-7+FzD5d3UpSBGC5BQZHefVVrD0WnDAS1lS9HpVlBNaA=",
"owner": "AccelerateHS",
"repo": "accelerate-llvm",
"rev": "2b5d69448557e89002c0179ea1aaf59bb757a6e3",
"type": "github"
"allRefs": true,
"lastModified": 1726339652,
"narHash": "sha256-EXMfVFFUGAlwo3+E5krJIid8lMb5B2bGD0zRi+Jq9u4=",
"ref": "refs/heads/master",
"rev": "eb544e52e66509314c5efe9f9765c5e42d00c5a4",
"revCount": 2207,
"type": "git",
"url": "https://github.com/AccelerateHS/accelerate-llvm.git"
},
"original": {
"owner": "AccelerateHS",
...
...
@@ -880,16 +882,15 @@
"llvm-hs": {
"flake": false,
"locked": {
"lastModified": 1
704355366
,
"narHash": "sha256-
6iMGwdgUZx+yKhsgvZ1RJAB479l6HmbgHmy/YT7S6a
s=",
"owner": "
adinapoli
",
"lastModified": 1
691592473
,
"narHash": "sha256-
Mfb+sRrCWS29TSbfDOzvPOmz+5h2sAp79lyiGeYK5G
s=",
"owner": "
llvm-hs
",
"repo": "llvm-hs",
"rev": "
7533a9ccd3bfe77141745f6b61039a26aaf5c83b
",
"rev": "
e4b3cfa47e72f094ab109884f18acfc666b0fb7d
",
"type": "github"
},
"original": {
"owner": "adinapoli",
"ref": "adinapoli/llvm-12-ghc-947-compat",
"owner": "llvm-hs",
"repo": "llvm-hs",
"type": "github"
}
...
...
flake.nix
View file @
7e7dab44
...
...
@@ -71,7 +71,8 @@
# WARNING: fork of https://github.com/llvm-hs/llvm-hs
# using adinapoli/llvm-12-ghc-947-compat branch
# 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"; flake = false; };
llvm-hs
=
{
url
=
"github:llvm-hs/llvm-hs"
;
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
;
};
openalex
=
{
url
=
"git+https://gitlab.iscpif.fr/gargantext/crawlers/openalex.git"
;
flake
=
false
;
};
...
...
@@ -123,6 +124,7 @@
rawCabalProject
=
lib
.
readFile
./cabal.project
;
# haskell.nix's main entry point
# legacyPackages.x86_64-linux.project.args
project
=
pkgs
.
haskell-nix
.
cabalProject
'
[
({
config
,
pkgs
,
...
}:
{
name
=
"gargantext"
;
...
...
@@ -213,7 +215,8 @@
"https://github.com/AccelerateHS/accelerate.git"
=
inputs
.
accelerate
;
"https://github.com/MercuryTechnologies/ekg-json.git"
=
inputs
.
ekg-json
;
"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/llvm-hs/llvm-hs.git"
=
inputs
.
llvm-hs
;
"https://github.com/alpmestan/accelerate-arithmetic.git"
=
applyPatches
"accelerate-arithmetic"
[
nix/haskell.nix/patches/accelerate-arithmetic/0001-remove-test-using-removed-realBandedGramian.patch
];
...
...
@@ -267,6 +270,11 @@
configureFlags
=
[
"--extra-include-dirs=
${
pkgs
.
igraph
.
dev
}
/include/igraph"
];
};
packages
.
llvm-hs
.
components
.
library
=
{
libs
=
[
pkgs
.
llvm_15
pkgs
.
libxml2
];
};
# Link with OpenBLAS optimized libraries.
# WARNING: OpenBLAS must only be used by trusted code
# it is inherently unsuitable for security-conscious applications.
...
...
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