diff options
| author | Peter Simons <simons@cryp.to> | 2017-11-27 20:49:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 20:49:22 +0100 |
| commit | e7f4979270fc5a1ca02c398eece1d88c36758e04 (patch) | |
| tree | afb10f87058693332443f2a5fc51e4bae40af882 /pkgs | |
| parent | c0c503ca685f5a70390c8f2bb850e8b9690fab17 (diff) | |
| parent | d341d28401920f26ae0328526e942762da6d250c (diff) | |
| download | nixpkgs-e7f4979270fc5a1ca02c398eece1d88c36758e04.tar nixpkgs-e7f4979270fc5a1ca02c398eece1d88c36758e04.tar.gz nixpkgs-e7f4979270fc5a1ca02c398eece1d88c36758e04.tar.bz2 nixpkgs-e7f4979270fc5a1ca02c398eece1d88c36758e04.tar.lz nixpkgs-e7f4979270fc5a1ca02c398eece1d88c36758e04.tar.xz nixpkgs-e7f4979270fc5a1ca02c398eece1d88c36758e04.tar.zst nixpkgs-e7f4979270fc5a1ca02c398eece1d88c36758e04.zip | |
Merge pull request #31395 from vaibhavsagar/cleanup-ihaskell-wrapper
ihaskell/wrapper.nix: unify ihaskellEnv and ihaskell
Diffstat (limited to 'pkgs')
| -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 75ad33e72f6..73050280f17 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 09cc24316d2..69e56aa83a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2727,7 +2727,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 ]); |