From c55ca3fd0b376fc4892e8a6b24691878b22a5a75 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 May 2015 18:29:46 +0200
Subject: [PATCH] cabal2nix: update to version 20150531

This update adds support for bash completion.
---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index d14e22726145..7c36390b91eb 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,16 +2,17 @@
 , deepseq, deepseq-generics, directory, doctest, filepath, gitMinimal
 , hackage-db, hspec, lens, monad-par, monad-par-extras, mtl, pretty
 , process, QuickCheck, regex-posix, SHA, split, stdenv, transformers
-, utf8-string, cartel, nix-prefetch-scripts, makeWrapper
+, utf8-string, cartel, nix-prefetch-scripts, optparse-applicative
+, makeWrapper
 }:
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150525";
+  version = "20150531";
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "a7998916868af0d09882468b3e43f5854082860f";
-    sha256 = "07bz2z4ramrs2dmvvf6a82fliq51m61c11vmhkkz31nr09l25k6y";
+    rev = "513a5fce6cfabe0b062424f6deb191a12f7e2187";
+    sha256 = "1j4x85cqj823d9swi473b4i9rz9wlm9m7c1il73h02dq5i67wida";
     deepClone = true;
   };
   isExecutable = true;
@@ -21,6 +22,7 @@ mkDerivation rec {
     aeson base bytestring Cabal containers deepseq-generics directory
     filepath hackage-db lens monad-par monad-par-extras mtl pretty
     process regex-posix SHA split transformers utf8-string cartel
+    optparse-applicative
   ];
   testDepends = [
     aeson base bytestring Cabal containers deepseq deepseq-generics
@@ -35,6 +37,8 @@ mkDerivation rec {
     install -D $out/bin/cabal2nix $exe
     rm -rf $out/{bin,lib,share}
     makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin"
+    mkdir -p $out/share/bash-completion/completions
+    $exe --bash-completion-script $out/bin/cabal2nix >$out/share/bash-completion/completions/cabal2nix
   '';
   homepage = "http://github.com/NixOS/cabal2nix/";
   description = "Convert Cabal files into Nix build instructions";