From d4f7bf9c2983bf1a793c0fd5b4ea82a04bb8efca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Sep 2015 14:17:45 +0200
Subject: [PATCH] cabal2nix: re-generate the build files to make sure all
 dependencies are listed correctly

Fixes https://github.com/NixOS/cabal2nix/issues/203.
---
 pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix   | 9 ++++-----
 .../tools/haskell/cabal2nix/distribution-nixpkgs.nix     | 6 +++---
 pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix | 4 ++--
 .../development/tools/haskell/cabal2nix/language-nix.nix | 8 ++++----
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
index 537e427f66c..006f8eb1f98 100644
--- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
@@ -1,6 +1,6 @@
-{ mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs
-, language-nix, lens, optparse-applicative, pretty
-, pretty-show, stdenv, fetchFromGitHub, nix-prefetch-scripts, makeWrapper
+{ mkDerivation, ansi-wl-pprint, base, Cabal, containers
+, distribution-nixpkgs, fetchFromGitHub, language-nix, lens
+, optparse-applicative, pretty, pretty-show, stdenv
 }:
 
 mkDerivation rec {
@@ -18,8 +18,7 @@ mkDerivation rec {
   enableSharedExecutables = false;
   executableHaskellDepends = [
     ansi-wl-pprint base Cabal containers distribution-nixpkgs
-    language-nix lens optparse-applicative
-    pretty pretty-show
+    language-nix lens optparse-applicative pretty pretty-show
   ];
   executableToolDepends = [ makeWrapper ];
   postInstall = ''
diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
index 3262008e25a..0fcf9b3979d 100644
--- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
@@ -1,7 +1,7 @@
 { mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
-, deepseq-generics, directory, doctest, filepath, hackage-db, hspec
-, language-nix, lens, pretty, process, SHA, split, stdenv
-, transformers, utf8-string, fetchFromGitHub
+, deepseq-generics, directory, doctest, fetchFromGitHub, filepath
+, hackage-db, hspec, language-nix, lens, pretty, process, SHA
+, split, stdenv, transformers, utf8-string
 }:
 
 mkDerivation rec {
diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
index 28a767e31f0..6ef1c5a03f4 100644
--- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
@@ -1,6 +1,6 @@
 { mkDerivation, base, Cabal, containers, distribution-nixpkgs
-, filepath, language-nix, lens, monad-par, monad-par-extras, mtl
-, optparse-applicative, pretty, stdenv, fetchFromGitHub
+, fetchFromGitHub, filepath, language-nix, lens, monad-par
+, monad-par-extras, mtl, optparse-applicative, pretty, stdenv
 }:
 
 mkDerivation rec {
diff --git a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
index ea282d75101..d8c0d9071bc 100644
--- a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
@@ -1,5 +1,5 @@
-{ mkDerivation, base, deepseq, doctest, lens, pretty, regex-posix
-, stdenv, fetchFromGitHub, QuickCheck
+{ mkDerivation, base, deepseq, doctest, fetchFromGitHub, lens
+, pretty, QuickCheck, regex-posix, stdenv
 }:
 
 mkDerivation rec {
@@ -13,10 +13,10 @@ mkDerivation rec {
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [
-    base deepseq lens pretty regex-posix
+    base deepseq doctest lens pretty QuickCheck regex-posix
   ];
   testHaskellDepends = [
-    base deepseq doctest lens pretty regex-posix QuickCheck
+    base deepseq doctest lens pretty QuickCheck regex-posix
   ];
   homepage = "https://github.com/nixos/cabal2nix#readme";
   description = "Data types and useful functions to represent and manipulate the Nix language";