JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ihaskell: re-enable

Browse Source
This commit is contained in:
Vaibhav Sagar 2017-11-06 14:29:56 +08:00 committed by Robin Gloster
parent 9e241d0c3f
commit eece8755d1
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/misc/ids.nix
View File

@ -207,7 +207,7 @@
ripple-data-api = 186;
mediatomb = 187;
rdnssd = 188;
# ihaskell = 189; # unused
ihaskell = 189;
i2p = 190;
lambdabot = 191;
asterisk = 192;
@ -484,7 +484,7 @@
#ripple-data-api = 186; #unused
mediatomb = 187;
#rdnssd = 188; # unused
# ihaskell = 189; # unused
ihaskell = 189;
i2p = 190;
lambdabot = 191;
asterisk = 192;

2
nixos/modules/module-list.nix
View File

@ -304,7 +304,7 @@
./services/misc/gogs.nix
./services/misc/gollum.nix
./services/misc/gpsd.nix
#./services/misc/ihaskell.nix
./services/misc/ihaskell.nix
./services/misc/irkerd.nix
./services/misc/jackett.nix
./services/misc/logkeys.nix

23
pkgs/development/tools/haskell/ihaskell/wrapper.nix
View File

@ -1,27 +1,28 @@
{ stdenv, writeScriptBin, makeWrapper, buildEnv, ghcWithPackages, ihaskell, ipython, packages }:
{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, ihaskell, jupyter, packages }:
let
ihaskellEnv = ghcWithPackages (self: [
self.ihaskell
self.ihaskell-blaze
self.ihaskell-diagrams
self.ihaskell-display
(haskell.lib.doJailbreak self.ihaskell-blaze)
(haskell.lib.doJailbreak self.ihaskell-diagrams)
(haskell.lib.doJailbreak self.ihaskell-display)
] ++ packages self);
ihaskellSh = writeScriptBin "ihaskell-notebook" ''
#! ${stdenv.shell}
export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
export PATH="${stdenv.lib.makeBinPath [ ihaskell ihaskellEnv ipython ]}"
${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell
export PATH="${stdenv.lib.makeBinPath ([ ihaskell ihaskellEnv jupyter ])}"
${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook
'';
profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar";
in
buildEnv {
name = "ihaskell-with-packages";
paths = [ ihaskellEnv ipython ];
buildInputs = [ makeWrapper ];
paths = [ ihaskellEnv jupyter ];
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
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
'';
}

12
pkgs/top-level/all-packages.nix
View File

@ -2684,15 +2684,13 @@ with pkgs;
};
# ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
# inherit (haskellPackages) ihaskell ghcWithPackages;
ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
inherit (haskellPackages) ihaskell ghcWithPackages;
# ipython = python3.buildEnv.override {
# extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ];
# };
jupyter = python3.withPackages (ps: [ ps.jupyter ps.notebook ]);
# packages = config.ihaskell.packages or (self: []);
# };
packages = config.ihaskell.packages or (self: []);
};
imapproxy = callPackage ../tools/networking/imapproxy { };