ihaskell: re-enable
This commit is contained in:
parent
9e241d0c3f
commit
eece8755d1
|
@ -207,7 +207,7 @@
|
||||||
ripple-data-api = 186;
|
ripple-data-api = 186;
|
||||||
mediatomb = 187;
|
mediatomb = 187;
|
||||||
rdnssd = 188;
|
rdnssd = 188;
|
||||||
# ihaskell = 189; # unused
|
ihaskell = 189;
|
||||||
i2p = 190;
|
i2p = 190;
|
||||||
lambdabot = 191;
|
lambdabot = 191;
|
||||||
asterisk = 192;
|
asterisk = 192;
|
||||||
|
@ -484,7 +484,7 @@
|
||||||
#ripple-data-api = 186; #unused
|
#ripple-data-api = 186; #unused
|
||||||
mediatomb = 187;
|
mediatomb = 187;
|
||||||
#rdnssd = 188; # unused
|
#rdnssd = 188; # unused
|
||||||
# ihaskell = 189; # unused
|
ihaskell = 189;
|
||||||
i2p = 190;
|
i2p = 190;
|
||||||
lambdabot = 191;
|
lambdabot = 191;
|
||||||
asterisk = 192;
|
asterisk = 192;
|
||||||
|
|
|
@ -304,7 +304,7 @@
|
||||||
./services/misc/gogs.nix
|
./services/misc/gogs.nix
|
||||||
./services/misc/gollum.nix
|
./services/misc/gollum.nix
|
||||||
./services/misc/gpsd.nix
|
./services/misc/gpsd.nix
|
||||||
#./services/misc/ihaskell.nix
|
./services/misc/ihaskell.nix
|
||||||
./services/misc/irkerd.nix
|
./services/misc/irkerd.nix
|
||||||
./services/misc/jackett.nix
|
./services/misc/jackett.nix
|
||||||
./services/misc/logkeys.nix
|
./services/misc/logkeys.nix
|
||||||
|
|
|
@ -1,27 +1,28 @@
|
||||||
{ stdenv, writeScriptBin, makeWrapper, buildEnv, ghcWithPackages, ihaskell, ipython, packages }:
|
{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, ihaskell, jupyter, packages }:
|
||||||
let
|
let
|
||||||
ihaskellEnv = ghcWithPackages (self: [
|
ihaskellEnv = ghcWithPackages (self: [
|
||||||
self.ihaskell
|
self.ihaskell
|
||||||
self.ihaskell-blaze
|
(haskell.lib.doJailbreak self.ihaskell-blaze)
|
||||||
self.ihaskell-diagrams
|
(haskell.lib.doJailbreak self.ihaskell-diagrams)
|
||||||
self.ihaskell-display
|
(haskell.lib.doJailbreak self.ihaskell-display)
|
||||||
] ++ packages self);
|
] ++ packages self);
|
||||||
ihaskellSh = writeScriptBin "ihaskell-notebook" ''
|
ihaskellSh = writeScriptBin "ihaskell-notebook" ''
|
||||||
#! ${stdenv.shell}
|
#! ${stdenv.shell}
|
||||||
export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
|
export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
|
||||||
export PATH="${stdenv.lib.makeBinPath [ ihaskell ihaskellEnv ipython ]}"
|
export PATH="${stdenv.lib.makeBinPath ([ ihaskell ihaskellEnv jupyter ])}"
|
||||||
${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell
|
${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook
|
||||||
'';
|
'';
|
||||||
profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar";
|
|
||||||
in
|
in
|
||||||
buildEnv {
|
buildEnv {
|
||||||
name = "ihaskell-with-packages";
|
name = "ihaskell-with-packages";
|
||||||
paths = [ ihaskellEnv ipython ];
|
buildInputs = [ makeWrapper ];
|
||||||
|
paths = [ ihaskellEnv jupyter ];
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
. "${makeWrapper}/nix-support/setup-hook"
|
ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/
|
||||||
ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/.
|
|
||||||
for prg in $out/bin"/"*;do
|
for prg in $out/bin"/"*;do
|
||||||
wrapProgram $prg --set PYTHONPATH "$(echo ${ipython}/lib/*/site-packages)"
|
if [[ -f $prg && -x $prg ]]; then
|
||||||
|
wrapProgram $prg --set PYTHONPATH "$(echo ${jupyter}/lib/*/site-packages)"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -2684,15 +2684,13 @@ with pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
# ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
|
ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
|
||||||
# inherit (haskellPackages) ihaskell ghcWithPackages;
|
inherit (haskellPackages) ihaskell ghcWithPackages;
|
||||||
|
|
||||||
# ipython = python3.buildEnv.override {
|
jupyter = python3.withPackages (ps: [ ps.jupyter ps.notebook ]);
|
||||||
# extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ];
|
|
||||||
# };
|
|
||||||
|
|
||||||
# packages = config.ihaskell.packages or (self: []);
|
packages = config.ihaskell.packages or (self: []);
|
||||||
# };
|
};
|
||||||
|
|
||||||
imapproxy = callPackage ../tools/networking/imapproxy { };
|
imapproxy = callPackage ../tools/networking/imapproxy { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue