Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gargantext-ihaskell
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
gargantext-ihaskell
Commits
e7b40f36
Commit
e7b40f36
authored
Sep 14, 2021
by
Vaibhav Sagar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
release.nix: '--enable-executable-dynamic' no longer appears to be necessary
parent
7c69a6c4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
release.nix
release.nix
+5
-7
No files found.
release.nix
View file @
e7b40f36
...
...
@@ -31,16 +31,12 @@ let
haskellPackages
=
nixpkgs
.
haskell
.
packages
.
"
${
compiler
}
"
.
override
(
old
:
{
overrides
=
nixpkgs
.
lib
.
composeExtensions
(
old
.
overrides
or
(
_
:
_
:
{}))
(
self
:
super
:
{
ihaskell
=
nixpkgs
.
haskell
.
lib
.
overrideCabal
(
self
.
callCabal2nix
"ihaskell"
ihaskell-src
{})
(
drv
:
{
self
.
callCabal2nix
"ihaskell"
ihaskell-src
{})
(
_
drv
:
{
preCheck
=
''
export HOME=$TMPDIR/home
export PATH=$PWD/dist/build/ihaskell:$PATH
export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH
''
;
configureFlags
=
(
drv
.
configureFlags
or
[])
++
[
# otherwise the tests are agonisingly slow and the kernel times out
"--enable-executable-dynamic"
];
doHaddock
=
false
;
});
ghc-parser
=
self
.
callCabal2nix
"ghc-parser"
ghc-parser-src
{};
...
...
@@ -50,16 +46,17 @@ let
static-canvas
=
nixpkgs
.
haskell
.
lib
.
doJailbreak
super
.
static-canvas
;
}
//
displays
self
);
});
ihaskellExe
=
nixpkgs
.
haskell
.
lib
.
justStaticExecutables
haskellPackages
.
ihaskell
;
ihaskellEnv
=
haskellPackages
.
ghcWithPackages
packages
;
jupyterlab
=
nixpkgs
.
python3
.
withPackages
(
ps
:
[
ps
.
jupyterlab
]
++
pythonPackages
ps
);
ihaskellWrapperSh
=
nixpkgs
.
writeShellScriptBin
"ihaskell-wrapper"
''
export PATH="
${
nixpkgs
.
lib
.
makeBinPath
([
ihaskellEnv
jupyterlab
]
++
systemPackages
nixpkgs
)
}
''$
{PATH:+:}$PATH"
exec
${
haskellPackages
.
ihaskell
}
/bin/ihaskell "$@"
exec
${
ihaskellExe
}
/bin/ihaskell "$@"
''
;
ihaskellGhcLib
=
nixpkgs
.
writeShellScriptBin
"ihaskell"
''
${
haskellPackages
.
ihaskell
}
/bin/ihaskell -l $(
${
ihaskellEnv
}
/bin/ghc --print-libdir) "$@"
${
ihaskellExe
}
/bin/ihaskell -l $(
${
ihaskellEnv
}
/bin/ghc --print-libdir) "$@"
''
;
kernelFile
=
{
...
...
@@ -110,6 +107,7 @@ nixpkgs.buildEnv {
passthru
=
{
inherit
haskellPackages
;
inherit
ihaskellExe
;
inherit
ihaskellEnv
;
inherit
jupyterlab
;
inherit
ihaskellWrapperSh
;
...
...
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