From 7c1e5aa5a44b6533223d354fd63024f4a16a0848 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Thu, 7 Jul 2016 23:08:38 +0200
Subject: pull in custom version of Shellac from github

---
 default.nix | 48 +++++++++++++++++-------------------------------
 1 file changed, 17 insertions(+), 31 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 160dcc7..6e792e9 100644
--- a/default.nix
+++ b/default.nix
@@ -6,37 +6,23 @@ rec {
   # haskellPackages = pkgs.haskell.packages."${compilerName}";
   haskellPackages = pkgs.haskell.packages."${compilerName}".override {
     overrides = self: super: {
-      Shellac = pkgs.haskell.lib.appendPatch super.Shellac (pkgs.writeText "build.patch" ''
-        From 20e394aa3ea287fcaacde9c076c9f49929b28ece Mon Sep 17 00:00:00 2001
-        From: Gregor Kleen <gkleen@yggdrasil.li>
-        Date: Sat, 11 Jun 2016 22:06:36 +0200
-        Subject: [PATCH] Allow modification of state in beforePrompt
-
-        ---
-         src/System/Console/Shell/RunShell.hs | 6 ++++--
-         1 file changed, 4 insertions(+), 2 deletions(-)
-
-        diff --git a/src/System/Console/Shell/RunShell.hs b/src/System/Console/Shell/RunShell.hs
-        index 79ffb54..3e0b95b 100644
-        --- a/src/System/Console/Shell/RunShell.hs
-        +++ b/src/System/Console/Shell/RunShell.hs
-        @@ -217,9 +217,11 @@ shellLoop desc backend iss = loop
-            bst = backendState iss
- 
-            loop st = do
-        -        flushOutput backend bst
-        +     flushOutput backend bst
-        +     
-        +     runSh st (outputString backend bst) (beforePrompt desc) >>= loop' . fst
- 
-        -        runSh st (outputString backend bst) (beforePrompt desc)
-        +   loop' st = do
-                 setAttemptedCompletionFunction backend bst
-                  (completionFunction desc backend bst st)
- 
-        -- 
-        2.8.3
-      '');
+      Shellac = pkgs.stdenv.lib.overrideDerivation super.Shellac (oldAttrs: {
+        src = pkgs.fetchFromGitHub {
+          owner = "pngwjpgh";
+          repo = "shellac";
+          rev = "b88a92bace5106e7446bc81688d675994f829282";
+          sha256 = "1qpnbnclz1xwisg9wgs4yl8y0ral01pqy8jnq6g7z1xbc8p6qn0i";
+        };
+      });
+      Shellac-haskeline = pkgs.stdenv.lib.overrideDerivation super.Shellac-haskeline (oldAttrs: {
+        src = pkgs.fetchFromGitHub {
+          owner = "pngwjpgh";
+          repo = "shellac";
+          rev = "b88a92bace5106e7446bc81688d675994f829282";
+          sha256 = "1qpnbnclz1xwisg9wgs4yl8y0ral01pqy8jnq6g7z1xbc8p6qn0i";
+        };
+        unpackPhase = "cp -r $src/shellac-haskeline/. .";
+      });
     };
   };
   sequence = haskellPackages.callPackage ./sequence.nix {};
-- 
cgit v1.2.3