From a7e33a1a1e4656d8f47fa27280107d69f7ccd93e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jun 2016 17:08:18 +0200
Subject: [PATCH] cabal2nix: update to version 20160613-10-g57dddc7

---
 .../haskell-modules/configuration-common.nix  |  4 +-
 .../tools/haskell/cabal2nix/cabal2nix.nix     | 37 ---------------
 .../tools/haskell/cabal2nix/default.nix       | 45 +++++++++++++++++++
 .../cabal2nix/distribution-nixpkgs.nix        | 33 --------------
 .../tools/haskell/cabal2nix/hackage2nix.nix   | 36 ---------------
 5 files changed, 46 insertions(+), 109 deletions(-)
 delete mode 100644 pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
 create mode 100644 pkgs/development/tools/haskell/cabal2nix/default.nix
 delete mode 100644 pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
 delete mode 100644 pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 725c659f0f6..6c6864f0c4a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -654,9 +654,7 @@ self: super: {
   zlib = dontCheck super.zlib;
 
   # Override the obsolete version from Hackage with our more up-to-date copy.
-  cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {};
-  hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix { deepseq-generics = self.deepseq-generics_0_1_1_2; };
-  distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix { deepseq-generics = self.deepseq-generics_0_1_1_2; };
+  cabal2nix = self.callPackage ../tools/haskell/cabal2nix {};
 
   # https://github.com/ndmitchell/shake/issues/206
   # https://github.com/ndmitchell/shake/issues/267
diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
deleted file mode 100644
index 0586652ac41..00000000000
--- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ mkDerivation, ansi-wl-pprint, base, Cabal, containers
-, distribution-nixpkgs, language-nix, lens, optparse-applicative
-, pretty, pretty-show, stdenv, text, yaml
-, nix-prefetch-scripts, makeWrapper, fetchFromGitHub
-}:
-
-mkDerivation rec {
-  pname = "cabal2nix";
-  version = "20160613";
-  src = fetchFromGitHub {
-    owner = "nixos";
-    repo = "cabal2nix";
-    rev = "v${version}";
-    sha256 = "0cnc037qsmwwddws138z7w1aww0l9z5bg89dgh4vfxck29z84is9";
-  };
-  postUnpack = "sourceRoot+=/${pname}";
-  isLibrary = false;
-  isExecutable = true;
-  enableSharedExecutables = false;
-  executableHaskellDepends = [
-    ansi-wl-pprint base Cabal containers distribution-nixpkgs
-    language-nix lens optparse-applicative pretty pretty-show text yaml
-  ];
-  executableToolDepends = [ makeWrapper ];
-  postInstall = ''
-    exe=$out/libexec/${pname}-${version}/${pname}
-    install -D $out/bin/${pname} $exe
-    rm -rf $out/{bin,lib,share}
-    makeWrapper $exe $out/bin/${pname} --prefix PATH ":" "${nix-prefetch-scripts}/bin"
-    mkdir -p $out/share/bash-completion/completions
-    $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${pname}
-  '';
-  homepage = "https://github.com/nixos/cabal2nix#readme";
-  description = "Convert Cabal files into Nix build instructions";
-  license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ peti ];
-}
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
new file mode 100644
index 00000000000..3e6c9019f6d
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -0,0 +1,45 @@
+{ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
+, containers, deepseq, directory, distribution-nixpkgs, fetchFromGitHub
+, filepath, hackage-db, language-nix, lens, monad-par
+, monad-par-extras, mtl, optparse-applicative, pretty, process, SHA
+, split, stackage-types, stdenv, text, time, transformers
+, utf8-string, yaml, makeWrapper, nix-prefetch-scripts
+}:
+mkDerivation rec {
+  pname = "cabal2nix";
+  version = "20160613-10-g57dddc7";
+  src = fetchFromGitHub {
+    owner = "nixos";
+    repo = "cabal2nix";
+    rev = "v${version}";
+    sha256 = "1nlybd4im80dwq70wqa5k4lji5g353cn6aqiz4v3x4v3fpn2i3qb";
+  };
+  isExecutable = true;
+  enableSharedExecutables = false;
+  libraryHaskellDepends = [
+    aeson ansi-wl-pprint base bytestring Cabal containers deepseq
+    directory distribution-nixpkgs filepath hackage-db language-nix
+    lens optparse-applicative pretty process SHA split text
+    transformers yaml
+  ];
+  executableHaskellDepends = [
+    aeson ansi-wl-pprint base bytestring Cabal containers deepseq
+    directory distribution-nixpkgs filepath hackage-db language-nix
+    lens monad-par monad-par-extras mtl optparse-applicative pretty
+    process SHA split stackage-types text time transformers utf8-string
+    yaml
+  ];
+  executableToolDepends = [ makeWrapper ];
+  postInstall = ''
+    exe=$out/libexec/${pname}-${version}/${pname}
+    install -D $out/bin/${pname} $exe
+    rm -rf $out/{bin,lib,share}
+    makeWrapper $exe $out/bin/${pname} --prefix PATH ":" "${nix-prefetch-scripts}/bin"
+    mkdir -p $out/share/bash-completion/completions
+    $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${pname}
+  '';
+  homepage = "https://github.com/nixos/cabal2nix#readme";
+  description = "Convert Cabal files into Nix build instructions";
+  license = stdenv.lib.licenses.bsd3;
+  maintainers = [stdenv.lib.maintainers.peti];
+}
diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
deleted file mode 100644
index 32dc8e38788..00000000000
--- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
-, deepseq-generics, directory, doctest, filepath, hackage-db
-, hashable, hspec, language-nix, lens, pretty, process, QuickCheck
-, SHA, split, stdenv, text, transformers, unordered-containers
-, utf8-string, yaml, fetchFromGitHub
-}:
-
-mkDerivation rec {
-  pname = "distribution-nixpkgs";
-  version = "1";
-  src = fetchFromGitHub {
-    owner = "nixos";
-    repo = "cabal2nix";
-    rev = "v20160613";
-    sha256 = "0cnc037qsmwwddws138z7w1aww0l9z5bg89dgh4vfxck29z84is9";
-  };
-  postUnpack = "sourceRoot+=/${pname}";
-  libraryHaskellDepends = [
-    aeson base bytestring Cabal containers deepseq-generics directory
-    filepath hackage-db hashable language-nix lens pretty process SHA
-    split text transformers unordered-containers utf8-string yaml
-  ];
-  testHaskellDepends = [
-    aeson base bytestring Cabal containers deepseq deepseq-generics
-    directory doctest filepath hackage-db hashable hspec language-nix
-    lens pretty process QuickCheck SHA split text transformers
-    unordered-containers utf8-string yaml
-  ];
-  homepage = "https://github.com/nixos/cabal2nix#readme";
-  description = "Data types and functions to manipulate the Nixpkgs distribution";
-  license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ peti ];
-}
diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
deleted file mode 100644
index 95c5309d036..00000000000
--- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, Cabal, containers
-, deepseq-generics, directory, distribution-nixpkgs, filepath
-, language-nix, lens, monad-par, monad-par-extras, mtl
-, optparse-applicative, pretty, SHA, split, stackage-types, stdenv
-, text, time, utf8-string, yaml, fetchFromGitHub
-}:
-
-mkDerivation rec {
-  pname = "hackage2nix";
-  version = "20160613";
-  src = fetchFromGitHub {
-    owner = "nixos";
-    repo = "cabal2nix";
-    rev = "v${version}";
-    sha256 = "0cnc037qsmwwddws138z7w1aww0l9z5bg89dgh4vfxck29z84is9";
-  };
-  postUnpack = "sourceRoot+=/${pname}";
-  isLibrary = false;
-  isExecutable = true;
-  enableSharedExecutables = false;
-  executableHaskellDepends = [
-    aeson base bytestring Cabal containers deepseq-generics directory
-    distribution-nixpkgs filepath language-nix lens monad-par
-    monad-par-extras mtl optparse-applicative pretty SHA split
-    stackage-types text time utf8-string yaml
-  ];
-  postInstall = ''
-    exe=$out/bin/${pname}
-    mkdir -p $out/share/bash-completion/completions
-    $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${pname}
-  '';
-  homepage = "https://github.com/nixos/cabal2nix#readme";
-  description = "Convert Cabal files into Nix build instructions";
-  license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ peti ];
-}