Commit e7b40f36 authored by Vaibhav Sagar's avatar Vaibhav Sagar

release.nix: '--enable-executable-dynamic' no longer appears to be necessary

parent 7c69a6c4
...@@ -31,16 +31,12 @@ let ...@@ -31,16 +31,12 @@ let
haskellPackages = nixpkgs.haskell.packages."${compiler}".override (old: { haskellPackages = nixpkgs.haskell.packages."${compiler}".override (old: {
overrides = nixpkgs.lib.composeExtensions (old.overrides or (_: _: {})) (self: super: { overrides = nixpkgs.lib.composeExtensions (old.overrides or (_: _: {})) (self: super: {
ihaskell = nixpkgs.haskell.lib.overrideCabal ( ihaskell = nixpkgs.haskell.lib.overrideCabal (
self.callCabal2nix "ihaskell" ihaskell-src {}) (drv: { self.callCabal2nix "ihaskell" ihaskell-src {}) (_drv: {
preCheck = '' preCheck = ''
export HOME=$TMPDIR/home export HOME=$TMPDIR/home
export PATH=$PWD/dist/build/ihaskell:$PATH export PATH=$PWD/dist/build/ihaskell:$PATH
export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH
''; '';
configureFlags = (drv.configureFlags or []) ++ [
# otherwise the tests are agonisingly slow and the kernel times out
"--enable-executable-dynamic"
];
doHaddock = false; doHaddock = false;
}); });
ghc-parser = self.callCabal2nix "ghc-parser" ghc-parser-src {}; ghc-parser = self.callCabal2nix "ghc-parser" ghc-parser-src {};
...@@ -50,16 +46,17 @@ let ...@@ -50,16 +46,17 @@ let
static-canvas = nixpkgs.haskell.lib.doJailbreak super.static-canvas; static-canvas = nixpkgs.haskell.lib.doJailbreak super.static-canvas;
} // displays self); } // displays self);
}); });
ihaskellExe = nixpkgs.haskell.lib.justStaticExecutables haskellPackages.ihaskell;
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);
ihaskellWrapperSh = nixpkgs.writeShellScriptBin "ihaskell-wrapper" '' ihaskellWrapperSh = nixpkgs.writeShellScriptBin "ihaskell-wrapper" ''
export PATH="${nixpkgs.lib.makeBinPath ([ ihaskellEnv jupyterlab ] ++ systemPackages nixpkgs)}''${PATH:+:}$PATH" export PATH="${nixpkgs.lib.makeBinPath ([ ihaskellEnv jupyterlab ] ++ systemPackages nixpkgs)}''${PATH:+:}$PATH"
exec ${haskellPackages.ihaskell}/bin/ihaskell "$@" exec ${ihaskellExe}/bin/ihaskell "$@"
''; '';
ihaskellGhcLib = nixpkgs.writeShellScriptBin "ihaskell" '' ihaskellGhcLib = nixpkgs.writeShellScriptBin "ihaskell" ''
${haskellPackages.ihaskell}/bin/ihaskell -l $(${ihaskellEnv}/bin/ghc --print-libdir) "$@" ${ihaskellExe}/bin/ihaskell -l $(${ihaskellEnv}/bin/ghc --print-libdir) "$@"
''; '';
kernelFile = { kernelFile = {
...@@ -110,6 +107,7 @@ nixpkgs.buildEnv { ...@@ -110,6 +107,7 @@ nixpkgs.buildEnv {
passthru = { passthru = {
inherit haskellPackages; inherit haskellPackages;
inherit ihaskellExe;
inherit ihaskellEnv; inherit ihaskellEnv;
inherit jupyterlab; inherit jupyterlab;
inherit ihaskellWrapperSh; inherit ihaskellWrapperSh;
......
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