Merge pull request #26 from Infinisil/master

Update nixpkgs, stack2nix and HIE

cabal-helper-revision.diff

@@ -0,0 +1,6 @@
+6077,6078c6077,6078
+<            revision = "1";
+<            editedCabalFile = "10by3n3nl6lx14asm6p8yc7bqwb4qlszf6m545jvv8scyf4nrj2g";
+---
+>            revision = "0";
+>            editedCabalFile = "1mf041pzdhrksfbw4vianrlhm674z3p09mpbvq4kqrr9hymp3kxd";

default.nix

@@ -22,16 +22,21 @@ let
   jse = pkgs.haskell.lib.justStaticExecutables;
 in with pkgs; rec {
  stack2nix = import (pkgs.fetchFromGitHub {
-   owner = "sectore";
+   # https://github.com/input-output-hk/stack2nix/pull/120
+   owner = "nh2";
    repo = "stack2nix";
-   rev = "4e4141d1f4a4626030f11bdf7623ccc7640f7b08";
-   sha256 = "1v5pm770pmalxwvf6ddg196m17ga5lj30r1xq2sdd7fi330k0i27";
+   rev = "b8668e17d5b3c5035bd88720c637ae1d333c2ebe";
+   sha256 = "0dv6xy89qyrhw3yxl8qvh72skgglpvx9h5ynmhb1j8nrnxv2y5vs";
  }) { inherit pkgs; };
- hies = runCommandNoCC "hies" {} ''
+ hies = runCommandNoCC "hies" {
+   buildInputs = [ makeWrapper ];
+ } ''
    mkdir -p $out/bin
    ln -s ${hie80}/bin/hie $out/bin/hie-8.0
    ln -s ${hie82}/bin/hie $out/bin/hie-8.2
    ln -s ${hie84}/bin/hie $out/bin/hie-8.4
+   makeWrapper ${hie84}/bin/hie-wrapper $out/bin/hie-wrapper \
+     --prefix PATH : $out/bin
  '';
  hie80 = jse hie80Pkgs.haskell-ide-engine;
  hie82 = jse (import ./ghc-8.2.nix { inherit pkgs; }).haskell-ide-engine;