Skip to content

G
gargantext-ihaskell
Commit 77d41237 authored by Vaibhav Sagar's avatar Vaibhav Sagar
Browse files
Options

release{,-8.2}.nix: unify ihaskellEnv and ihaskell

parent 8585da78
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
release-8.2.nix
View file @ 77d41237
...@@ -96,14 +96,13 @@ let ...@@ -96,14 +96,13 @@ let
th-desugar = super.callHackage "th-desugar" "1.7" {}; th-desugar = super.callHackage "th-desugar" "1.7" {};
} // displays self; } // displays self;
}; };
ihaskell = haskellPackages.ihaskell;
ihaskellEnv = haskellPackages.ghcWithPackages (self: [ self.ihaskell ] ++ packages self); ihaskellEnv = haskellPackages.ghcWithPackages (self: [ self.ihaskell ] ++ packages self);
jupyter = nixpkgs.python3.withPackages (ps: [ ps.jupyter ps.notebook ]); jupyter = nixpkgs.python3.withPackages (ps: [ ps.jupyter ps.notebook ]);
ihaskellSh = nixpkgs.writeScriptBin "ihaskell-notebook" '' ihaskellSh = nixpkgs.writeScriptBin "ihaskell-notebook" ''
#! ${nixpkgs.stdenv.shell} #! ${nixpkgs.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="${nixpkgs.stdenv.lib.makeBinPath ([ ihaskell ihaskellEnv jupyter ] ++ systemPackages nixpkgs)}" export PATH="${nixpkgs.stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ] ++ systemPackages nixpkgs)}"
${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) --use-rtsopts="${rtsopts}" && ${jupyter}/bin/jupyter notebook ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) --use-rtsopts="${rtsopts}" && ${jupyter}/bin/jupyter notebook
''; '';
in in
nixpkgs.buildEnv { nixpkgs.buildEnv {
......
release.nix
View file @ 77d41237
...@@ -63,14 +63,13 @@ let ...@@ -63,14 +63,13 @@ let
ipython-kernel = self.callCabal2nix "ipython-kernel" ipython-kernel-src {}; ipython-kernel = self.callCabal2nix "ipython-kernel" ipython-kernel-src {};
} // displays self; } // displays self;
}; };
ihaskell = haskellPackages.ihaskell;
ihaskellEnv = haskellPackages.ghcWithPackages (self: [ self.ihaskell ] ++ packages self); ihaskellEnv = haskellPackages.ghcWithPackages (self: [ self.ihaskell ] ++ packages self);
jupyter = nixpkgs.python3.withPackages (ps: [ ps.jupyter ps.notebook ]); jupyter = nixpkgs.python3.withPackages (ps: [ ps.jupyter ps.notebook ]);
ihaskellSh = nixpkgs.writeScriptBin "ihaskell-notebook" '' ihaskellSh = nixpkgs.writeScriptBin "ihaskell-notebook" ''
#! ${nixpkgs.stdenv.shell} #! ${nixpkgs.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="${nixpkgs.stdenv.lib.makeBinPath ([ ihaskell ihaskellEnv jupyter ] ++ systemPackages nixpkgs)}" export PATH="${nixpkgs.stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ] ++ systemPackages nixpkgs)}"
${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) --use-rtsopts="${rtsopts}" && ${jupyter}/bin/jupyter notebook ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) --use-rtsopts="${rtsopts}" && ${jupyter}/bin/jupyter notebook
''; '';
in in
nixpkgs.buildEnv { nixpkgs.buildEnv {
......
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