commit dfc8e5ab05e5bb555000f9af0d58309671dccf4f · pyrox.dev/nixpkgs

+2 -3

nixos/modules/services/misc/ihaskell.nix

···

       68
       68
        
             after = [ "network.target" ];

     

       69
       69
        
             serviceConfig = {

     

       70
       70
        
               User = config.users.extraUsers.ihaskell.name;

     

       71
       71
       -
               Group = config.users.extraUsers.ihaskell.name;

     

       72
       72
       -
               Restart = "always";

     

       73
       73
       -
               ExecStart = "${ihaskell}/bin/IHaskell notebook";

     

       71
       71
       +
               Group = config.users.extraGroups.ihaskell.name;

     

       72
       72
       +
               ExecStart = "${pkgs.stdenv.shell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\"";

     

       74
       73
        
             };

     

       75
       74
        
           };

     

       76
       75
        
         };

+15 -27

pkgs/development/tools/haskell/ihaskell/wrapper.nix

···

       1
       1
       -
       { stdenv, buildEnv, ghcWithPackages, makeWrapper, ihaskell, ipython, packages }:

     

       1
       1
       +
       { stdenv, writeScriptBin, buildEnv, ghcWithPackages, ihaskell, ipython, packages }:

     

       2
       2
        
       let

     

       3
       3
        
         ihaskellEnv = ghcWithPackages (self: [

     

       4
       4
        
           self.ihaskell

     
···

       6
       6
        
           self.ihaskell-diagrams

     

       7
       7
        
           self.ihaskell-display

     

       8
       8
        
         ] ++ packages self);

     

       9
       9
       +
         ihaskellSh = writeScriptBin "ihaskell-notebook" ''

     

       10
       10
       +
           #!/bin/sh

     

       11
       11
       +
           export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"

     

       12
       12
       +
           export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin"

     

       13
       13
       +
           ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell

     

       14
       14
       +
         '';

     

       9
       15
        
         profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar";

     

       10
       10
       -
         drv = buildEnv {

     

       11
       11
       -
           name = "ihaskell-with-packages";

     

       12
       12
       -
           paths = [ ihaskellEnv ipython ];

     

       13
       13
       -
           postBuild = ''

     

       14
       14
       -
           tar xf ${ihaskell.src} ${profile}

     

       15
       15
       -
           mkdir -p $out/share/`dirname ${profile}`

     

       16
       16
       -
           mkdir profile

     

       17
       17
       -
           cd profile

     

       18
       18
       -
           tar xf ../${profile}

     

       19
       19
       -
           for cfg in ipython_*config.py;do

     

       20
       20
       -
             sed -i -e "1iexe = '${ihaskell}/bin/IHaskell'" $cfg

     

       21
       21
       -
           done

     

       22
       22
       -
           tar cf $out/share/${profile} .

     

       23
       23
       -
           wrapProgram "$out/bin/IHaskell" \

     

       24
       24
       -
             --prefix PATH : "${ihaskellEnv}/bin:${ipython}/bin" \

     

       25
       25
       -
             --set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \

     

       26
       26
       -
             --set PROFILE_TAR "$out/share/${profile}" \

     

       27
       27
       -
             --set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] \

     

       28
       28
       -
                 && mkdir -p \$PROFILE_DIR \

     

       29
       29
       -
                 && tar xf \$PROFILE_TAR -C \$PROFILE_DIR \

     

       30
       30
       -
                 ; [ -d \$PROFILE_DIR ] && for cfg in \$PROFILE_DIR/ipython_*config.py;do \

     

       31
       31
       -
                   sed -i -e '/.*exe.*IHaskell.*/d' \$cfg; sed -i -e \"1iexe = '${ihaskell}/bin/IHaskell'\" \$cfg;done )" \

     

       32
       32
       -
             --set GHC_PACKAGE_PATH "\$(echo $out/lib/*/package.conf.d| tr ' ' ':'):" \

     

       33
       33
       -
           '';

     

       34
       34
       -
         };

     

       35
       35
       -
       in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
     

       16
       16
       +
       in

     

       17
       17
       +
       buildEnv {

     

       18
       18
       +
         name = "ihaskell-with-packages";

     

       19
       19
       +
         paths = [ ihaskellEnv ipython ];

     

       20
       20
       +
         postBuild = ''

     

       21
       21
       +
           ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/.

     

       22
       22
       +
         '';

     

       23
       23
       +
       }