From c06b8b5988f8ab08cd874ef404f4a55116ceaafb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Jun 2019 14:07:57 +0200
Subject: [PATCH] haskell-ci: update to latest git version

Drop un-referenced "multi-ghc-travis" directory.
---
 .../haskell-modules/configuration-common.nix  |  8 ++---
 .../haskell/multi-ghc-travis/default.nix      | 29 -------------------
 2 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/development/tools/haskell/multi-ghc-travis/default.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 621c5239312..233438b963e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1262,14 +1262,14 @@ self: super: {
   # The latest release version is ancient. You really need this tool from git.
   haskell-ci = generateOptparseApplicativeCompletion "haskell-ci"
     (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) {
-      version = "20190307-git";
+      version = "20190625-git";
       src = pkgs.fetchFromGitHub {
         owner = "haskell-CI";
         repo = "haskell-ci";
-        rev = "2baceb59bc2f36e798ff9fb6e8865c449f01d3a2";
-        sha256 = "1wqhqajxni6h9rrj22xj6421d4m0gs8qk2glghpdp307ns5gr2j4";
+        rev = "260f967c6973dfb22ecc8061a1811a2ea4b79e01";
+        sha256 = "1mvn6pqa6wfcm4jxhlhm4l54pwrlgnz7vdrmkwabliwz4q0bzgqk";
       };
-  }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck]));
+  }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck exceptions temporary]));
 
   # Fix build with attr-2.4.48 (see #53716)
   xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
deleted file mode 100644
index 2d1ce7f8758..00000000000
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers
-, deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty
-, tasty-golden, transformers, fetchFromGitHub
-}:
-
-mkDerivation {
-  pname = "haskell-ci";
-  version = "0";
-  src = fetchFromGitHub {
-    owner = "haskell-CI";
-    repo = "haskell-ci";
-    rev = "18a7f5edcde360cea0740ff143eff1113ecda7d2";
-    sha256 = "00gxpxb5n1a1v562fd4cg1j92vwmd2zp00c2j60piyl8ppxxa115";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    base Cabal containers deepseq directory filepath ShellCheck
-    transformers
-  ];
-  executableHaskellDepends = [ base ];
-  testHaskellDepends = [
-    ansi-terminal base bytestring Diff directory filepath tasty
-    tasty-golden transformers
-  ];
-  homepage = "https://github.com/haskell-CI/haskell-ci";
-  description = "Script generator for Travis-CI";
-  license = stdenv.lib.licenses.bsd3;
-}