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

Merge pull request #31395 from vaibhavsagar/cleanup-ihaskell-wrapper

Browse Source 
ihaskell/wrapper.nix: unify ihaskellEnv and ihaskell
This commit is contained in:
Peter Simons 2017-11-27 20:49:22 +01:00 committed by GitHub
commit e7f4979270
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, ihaskell, jupyter, packages }: { stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }:
let let
ihaskellEnv = ghcWithPackages (self: [ ihaskellEnv = ghcWithPackages (self: [
self.ihaskell self.ihaskell
@ -9,8 +9,8 @@ let
ihaskellSh = writeScriptBin "ihaskell-notebook" '' ihaskellSh = writeScriptBin "ihaskell-notebook" ''
#! ${stdenv.shell} #! ${stdenv.shell}
export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
export PATH="${stdenv.lib.makeBinPath ([ ihaskell ihaskellEnv jupyter ])}" export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}"
${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook
''; '';
in in
buildEnv { buildEnv {

2
pkgs/top-level/all-packages.nix
View File

@ -2727,7 +2727,7 @@ with pkgs;
ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
inherit (haskellPackages) ihaskell ghcWithPackages; inherit (haskellPackages) ghcWithPackages;
jupyter = python3.withPackages (ps: [ ps.jupyter ps.notebook ]); jupyter = python3.withPackages (ps: [ ps.jupyter ps.notebook ]);