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
165
Issues
165
List
Board
Labels
Milestones
Merge Requests
9
Merge Requests
9
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
abacabda
Verified
Commit
abacabda
authored
1 month ago
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flake] some more fixes to try to get nix -L develop to work
parent
228dbfee
Pipeline
#7537
failed with stages
in 16 minutes and 18 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
20 deletions
+3
-20
flake.lock
flake.lock
+0
-17
flake.nix
flake.nix
+2
-2
gargantext.nix
nix/haskell.nix/modules/gargantext.nix
+1
-1
No files found.
flake.lock
View file @
abacabda
...
...
@@ -1119,28 +1119,11 @@
"patches-class": "patches-class",
"patches-map": "patches-map",
"rdf4h": "rdf4h",
"servant-job": "servant-job",
"servant-routes": "servant-routes",
"servant-xml-conduit": "servant-xml-conduit",
"sparse-linear": "sparse-linear"
}
},
"servant-job": {
"flake": false,
"locked": {
"lastModified": 1600676045,
"narHash": "sha256-nWfZBqu1h/8yFRIpcNLKfVmhcofY6JHbZPtWGME21hE=",
"owner": "adinapoli",
"repo": "servant-job",
"rev": "4ad71332ed549f0d15639cf58c49cd86af0bbf79",
"type": "github"
},
"original": {
"owner": "adinapoli",
"repo": "servant-job",
"type": "github"
}
},
"servant-routes": {
"flake": false,
"locked": {
...
...
This diff is collapsed.
Click to expand it.
flake.nix
View file @
abacabda
...
...
@@ -89,7 +89,6 @@
patches-map
=
{
url
=
"github:delanoe/patches-map"
;
flake
=
false
;
};
rdf4h
=
{
url
=
"github:robstewart57/rdf4h"
;
flake
=
false
;
};
# WARNING: using the more-exports branch
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
;
};
# WARNING: using the alp/static branch
...
...
@@ -229,7 +228,6 @@
# nix/haskell.nix/patches/accelerate-arithmetic/0001-remove-test-using-removed-realBandedGramian.patch
#];
"https://github.com/alpmestan/hmatrix.git"
=
inputs
.
hmatrix
;
"https://github.com/adinapoli/servant-job.git"
=
removePackageYaml
inputs
.
servant-job
;
"https://github.com/alpmestan/sparse-linear.git"
=
inputs
.
sparse-linear
;
"https://github.com/chessai/eigen.git"
=
inputs
.
eigen
;
"https://github.com/delanoe/data-time-segment.git"
=
inputs
.
data-time-segment
;
...
...
@@ -295,6 +293,8 @@
})
)
];
};
packages
.
llvm-hs
.
components
.
library
.
build-tools
=
lib
.
mkOverride
49
[
pkgs
.
llvmPackages_12
.
llvm
];
})
];
...
...
This diff is collapsed.
Click to expand it.
nix/haskell.nix/modules/gargantext.nix
View file @
abacabda
...
...
@@ -6,7 +6,7 @@
# Use `nix run` instead of `inputs.coreNLP` directly
# to avoid downloading it if not running garg-test-hspec
packages
.
gargantext
.
components
.
tests
.
garg-test-hspec
.
preCheck
=
''
export GARGANTEXT_CORENLP_SERVER="
${
pkgs
.
nix
Flakes
}
/bin/nix run .#coreNLP"
export GARGANTEXT_CORENLP_SERVER="
${
pkgs
.
nix
Versions
.
stable
}
/bin/nix run .#coreNLP"
''
;
packages
.
gargantext
.
components
.
tests
.
garg-test-hspec
.
testFlags
=
[
...
...
This diff is collapsed.
Click to expand it.
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