diff options
author | Vaibhav Sagar <vaibhavsagar@gmail.com> | 2017-11-08 23:09:18 +0800 |
---|---|---|
committer | Vaibhav Sagar <vaibhavsagar@gmail.com> | 2017-11-08 23:19:16 +0800 |
commit | d341d28401920f26ae0328526e942762da6d250c (patch) | |
tree | 79002027b23a4ee403db94346bf23c32885cca97 | |
parent | 845aae9c1028a4e95a0ea300bda961056072b8d8 (diff) | |
download | nixlib-d341d28401920f26ae0328526e942762da6d250c.tar nixlib-d341d28401920f26ae0328526e942762da6d250c.tar.gz nixlib-d341d28401920f26ae0328526e942762da6d250c.tar.bz2 nixlib-d341d28401920f26ae0328526e942762da6d250c.tar.lz nixlib-d341d28401920f26ae0328526e942762da6d250c.tar.xz nixlib-d341d28401920f26ae0328526e942762da6d250c.tar.zst nixlib-d341d28401920f26ae0328526e942762da6d250c.zip |
ihaskell/wrapper.nix: unify ihaskellEnv and ihaskell
Having both `ihaskell` and `ihaskellEnv` is redundant, and might even cause problems if the two differ somehow.
-rw-r--r-- | pkgs/development/tools/haskell/ihaskell/wrapper.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 75ad33e72f63..73050280f17e 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, ihaskell, jupyter, packages }: +{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }: let ihaskellEnv = ghcWithPackages (self: [ self.ihaskell @@ -9,8 +9,8 @@ let ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" - export PATH="${stdenv.lib.makeBinPath ([ ihaskell ihaskellEnv jupyter ])}" - ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook + export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}" + ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook ''; in buildEnv { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04300e3507ea..d2e06d171f07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2687,7 +2687,7 @@ with pkgs; ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { - inherit (haskellPackages) ihaskell ghcWithPackages; + inherit (haskellPackages) ghcWithPackages; jupyter = python3.withPackages (ps: [ ps.jupyter ps.notebook ]); |