Commit 739b7f2f authored by Vaibhav Sagar's avatar Vaibhav Sagar

release.nix: use functions to make passthru more useful

parent 7818a979
...@@ -50,11 +50,13 @@ let ...@@ -50,11 +50,13 @@ let
ihaskellEnv = haskellPackages.ghcWithPackages packages; ihaskellEnv = haskellPackages.ghcWithPackages packages;
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ] ++ pythonPackages ps); jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ] ++ pythonPackages ps);
ihaskellGhcLib = nixpkgs.writeShellScriptBin "ihaskell" '' ihaskellGhcLibFunc = exe: env: nixpkgs.writeShellScriptBin "ihaskell" ''
${ihaskellExe}/bin/ihaskell -l $(${ihaskellEnv}/bin/ghc --print-libdir) "$@" ${exe}/bin/ihaskell -l $(${env}/bin/ghc --print-libdir) "$@"
''; '';
ihaskellGhcLib = ihaskellGhcLibFunc ihaskellExe ihaskellEnv;
kernelFile = {
ihaskellKernelFileFunc = ihaskellGhcLib: rtsopts: {
display_name = "Haskell"; display_name = "Haskell";
argv = [ argv = [
"${ihaskellGhcLib}/bin/ihaskell" "${ihaskellGhcLib}/bin/ihaskell"
...@@ -66,26 +68,28 @@ let ...@@ -66,26 +68,28 @@ let
]; ];
language = "haskell"; language = "haskell";
}; };
ihaskellKernelFile = ihaskellKernelFileFunc ihaskellGhcLib rtsopts;
ihaskellKernelSpec = nixpkgs.runCommand "ihaskell-kernel" {} '' ihaskellKernelSpecFunc = ihaskellKernelFile: nixpkgs.runCommand "ihaskell-kernel" {} ''
export kerneldir=$out/kernels/haskell export kerneldir=$out/kernels/haskell
mkdir -p $kerneldir mkdir -p $kerneldir
cp ${./html}/* $kerneldir cp ${./html}/* $kerneldir
echo '${builtins.toJSON kernelFile}' > $kerneldir/kernel.json echo '${builtins.toJSON ihaskellKernelFile}' > $kerneldir/kernel.json
''; '';
ihaskellKernelSpec = ihaskellKernelSpecFunc ihaskellKernelFile;
ihaskellLabextension = nixpkgs.runCommand "ihaskell-labextension" {} '' ihaskellLabextension = nixpkgs.runCommand "ihaskell-labextension" {} ''
mkdir -p $out/labextensions/ mkdir -p $out/labextensions/
ln -s ${./jupyterlab-ihaskell/labextension} $out/labextensions/jupyterlab-ihaskell ln -s ${./jupyterlab-ihaskell/labextension} $out/labextensions/jupyterlab-ihaskell
''; '';
ihaskellDataDir = nixpkgs.buildEnv { ihaskellDataDirFunc = ihaskellKernelSpec: ihaskellLabextension: nixpkgs.buildEnv {
name = "ihaskell-data-dir"; name = "ihaskell-data-dir";
paths = [ ihaskellKernelSpec ihaskellLabextension ]; paths = [ ihaskellKernelSpec ihaskellLabextension ];
}; };
ihaskellDataDir = ihaskellDataDirFunc ihaskellKernelSpec ihaskellLabextension;
in ihaskellBuildEnvFunc = { ihaskellEnv, jupyterlab, sysPackages, ihaskellDataDir }: nixpkgs.buildEnv {
nixpkgs.buildEnv {
name = "ihaskell-with-packages"; name = "ihaskell-with-packages";
buildInputs = [ nixpkgs.makeWrapper ]; buildInputs = [ nixpkgs.makeWrapper ];
paths = [ ihaskellEnv jupyterlab ]; paths = [ ihaskellEnv jupyterlab ];
...@@ -93,7 +97,7 @@ nixpkgs.buildEnv { ...@@ -93,7 +97,7 @@ nixpkgs.buildEnv {
for prg in $out/bin"/"*;do for prg in $out/bin"/"*;do
if [[ -f $prg && -x $prg ]]; then if [[ -f $prg && -x $prg ]]; then
wrapProgram $prg \ wrapProgram $prg \
--prefix PATH : "${nixpkgs.lib.makeBinPath ([ihaskellEnv] ++ systemPackages nixpkgs)}" \ --prefix PATH : "${nixpkgs.lib.makeBinPath ([ihaskellEnv] ++ sysPackages)}" \
--prefix JUPYTER_PATH : "${ihaskellDataDir}" --prefix JUPYTER_PATH : "${ihaskellDataDir}"
fi fi
done done
...@@ -104,8 +108,20 @@ nixpkgs.buildEnv { ...@@ -104,8 +108,20 @@ nixpkgs.buildEnv {
inherit ihaskellExe; inherit ihaskellExe;
inherit ihaskellEnv; inherit ihaskellEnv;
inherit jupyterlab; inherit jupyterlab;
inherit ihaskellKernelSpec; inherit ihaskellGhcLibFunc;
inherit ihaskellKernelFileFunc;
inherit ihaskellKernelSpecFunc;
inherit ihaskellLabextension; inherit ihaskellLabextension;
inherit ihaskellDataDirFunc;
inherit ihaskellBuildEnvFunc;
};
};
ihaskellBuildEnv = ihaskellBuildEnvFunc {
inherit ihaskellEnv;
inherit jupyterlab;
inherit ihaskellDataDir; inherit ihaskellDataDir;
sysPackages = systemPackages nixpkgs;
}; };
}
in ihaskellBuildEnv
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment