diff options
Diffstat (limited to 'pkgs/development/tools/haskell')
| -rw-r--r-- | pkgs/development/tools/haskell/hyper-haskell/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/development/tools/haskell/ihaskell/wrapper.nix | 5 |
2 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index 6b1399046166..2b3fb76903e5 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,35 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, jshon, electron_3 +{ lib, stdenvNoCC, fetchFromGitHub, jshon, electron_10 , runtimeShell, hyper-haskell-server, extra-packages ? [] }: let binPath = lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); - electron = electron_3; -in stdenv.mkDerivation rec { + electron = electron_10; +in stdenvNoCC.mkDerivation rec { pname = "hyper-haskell"; - version = "0.1.0.2"; + version = "0.2.3.0"; src = fetchFromGitHub { owner = "HeinrichApfelmus"; repo = "hyper-haskell"; rev = "v${version}"; - sha256 = "1k38h7qx12z7463z8466pji0nwfkp4qkg7q83kns2mzmwmw5jnmb"; + sha256 = "1nmkry4wh6a2dy98fcs81mq2p7zhxp1k0f4m3szr6fm3j1zwrd43"; }; propagatedBuildInputs = extra-packages; - buildCommand = '' + dontBuild = true; + + installPhase = '' mkdir -p $out/bin $out/share/hyper-haskell/worksheets $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/mime/packages # Electron app - cp -R $src/app $out + cp -R app $out # Desktop Launcher - cp $src/resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop - cp $src/resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg - cp $src/resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml + cp resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop + cp resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg + cp resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml # install example worksheets with backend set to nix - for worksheet in "$src/worksheets/"*.hhs; do + for worksheet in "worksheets/"*.hhs; do ${jshon}/bin/jshon -e settings -s nix -i packageTool -p < $worksheet > $out/share/hyper-haskell/worksheets/`basename $worksheet` done diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 875d5a8a4a8d..4a8482314108 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -2,9 +2,8 @@ let ihaskellEnv = ghcWithPackages (self: [ self.ihaskell - (haskell.lib.doJailbreak self.ihaskell-blaze) - (haskell.lib.doJailbreak self.ihaskell-diagrams) - (haskell.lib.doJailbreak self.ihaskell-display) + self.ihaskell-blaze + self.ihaskell-diagrams ] ++ packages self); ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} |