mirrors/IHaskell
1
0
Fork 0
mirror of https://github.com/IHaskell/IHaskell.git synced 2025-04-19 12:56:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

release.nix: refactor

Browse Source
This commit is contained in:
Vaibhav Sagar 2021-09-25 02:12:44 +10:00
parent 56682511b4
commit ea6c766d65
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
release.nix
View File

@ -74,7 +74,7 @@ let
};
ihaskellDataDir = ihaskellDataDirFunc ihaskellKernelSpec ihaskellLabextension;
ihaskellBuildEnvFunc = { ihaskellEnv, jupyterlab, sysPackages, ihaskellDataDir }: nixpkgs.buildEnv {
ihaskellBuildEnvFunc = { ihaskellEnv, jupyterlab, systemPackages, ihaskellDataDir }: nixpkgs.buildEnv {
name = "ihaskell-with-packages";
buildInputs = [ nixpkgs.makeWrapper ];
paths = [ ihaskellEnv jupyterlab ];
@ -82,7 +82,7 @@ let
for prg in $out/bin"/"*;do
if [[ -f $prg && -x $prg ]]; then
wrapProgram $prg \
--prefix PATH : "${nixpkgs.lib.makeBinPath ([ihaskellEnv] ++ sysPackages)}" \
--prefix PATH : "${nixpkgs.lib.makeBinPath ([ihaskellEnv] ++ (systemPackages nixpkgs))}" \
--prefix JUPYTER_PATH : "${ihaskellDataDir}"
fi
done
@ -92,21 +92,18 @@ let
inherit haskellPackages;
inherit ihaskellExe;
inherit ihaskellEnv;
inherit ihaskellLabextension;
inherit jupyterlab;
inherit ihaskellGhcLibFunc;
inherit ihaskellKernelFileFunc;
inherit ihaskellKernelSpecFunc;
inherit ihaskellLabextension;
inherit ihaskellDataDirFunc;
inherit ihaskellBuildEnvFunc;
};
};
ihaskellBuildEnv = ihaskellBuildEnvFunc {
inherit ihaskellEnv;
inherit jupyterlab;
inherit ihaskellDataDir;
sysPackages = systemPackages nixpkgs;
inherit ihaskellEnv jupyterlab ihaskellDataDir systemPackages;
};
in ihaskellBuildEnv