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

ihaskell: cleanup wrapper and service

Browse Source
This commit is contained in:
Edward Tjörnhammar 2015-04-15 22:59:07 +02:00
parent f7737355d4
commit dfc8e5ab05
2 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/misc/ihaskell.nix
View File

@ -68,9 +68,8 @@ in
after = [ "network.target" ]; after = [ "network.target" ];
serviceConfig = { serviceConfig = {
User = config.users.extraUsers.ihaskell.name; User = config.users.extraUsers.ihaskell.name;
Group = config.users.extraUsers.ihaskell.name; Group = config.users.extraGroups.ihaskell.name;
Restart = "always"; ExecStart = "${pkgs.stdenv.shell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\"";
ExecStart = "${ihaskell}/bin/IHaskell notebook";
}; };
}; };
}; };

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

@ -1,4 +1,4 @@
{ stdenv, buildEnv, ghcWithPackages, makeWrapper, ihaskell, ipython, packages }: { stdenv, writeScriptBin, buildEnv, ghcWithPackages, ihaskell, ipython, packages }:
let let
ihaskellEnv = ghcWithPackages (self: [ ihaskellEnv = ghcWithPackages (self: [
self.ihaskell self.ihaskell
@ -6,30 +6,18 @@ let
self.ihaskell-diagrams self.ihaskell-diagrams
self.ihaskell-display self.ihaskell-display
] ++ packages self); ] ++ packages self);
ihaskellSh = writeScriptBin "ihaskell-notebook" ''
#!/bin/sh
export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin"
${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell
'';
profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar"; profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar";
drv = buildEnv { in
name = "ihaskell-with-packages"; buildEnv {
paths = [ ihaskellEnv ipython ]; name = "ihaskell-with-packages";
postBuild = '' paths = [ ihaskellEnv ipython ];
tar xf ${ihaskell.src} ${profile} postBuild = ''
mkdir -p $out/share/`dirname ${profile}` ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/.
mkdir profile '';
cd profile }
tar xf ../${profile}
for cfg in ipython_*config.py;do
sed -i -e "1iexe = '${ihaskell}/bin/IHaskell'" $cfg
done
tar cf $out/share/${profile} .
wrapProgram "$out/bin/IHaskell" \
--prefix PATH : "${ihaskellEnv}/bin:${ipython}/bin" \
--set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \
--set PROFILE_TAR "$out/share/${profile}" \
--set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] \
&& mkdir -p \$PROFILE_DIR \
&& tar xf \$PROFILE_TAR -C \$PROFILE_DIR \
; [ -d \$PROFILE_DIR ] && for cfg in \$PROFILE_DIR/ipython_*config.py;do \
sed -i -e '/.*exe.*IHaskell.*/d' \$cfg; sed -i -e \"1iexe = '${ihaskell}/bin/IHaskell'\" \$cfg;done )" \
--set GHC_PACKAGE_PATH "\$(echo $out/lib/*/package.conf.d| tr ' ' ':'):" \
'';
};
in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })