diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e733fe8088c..1545e49130a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -757,7 +757,6 @@ self: super: {
   # 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 {};
-  lens-construction-helper = self.callPackage ../tools/haskell/cabal2nix/lens-construction-helper.nix {};
   language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {};
   distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {};
 
diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
index c12cd2cfce2..537e427f66c 100644
--- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
@@ -1,16 +1,16 @@
 { mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs
-, language-nix, lens, lens-construction-helper, optparse-applicative, pretty
+, language-nix, lens, optparse-applicative, pretty
 , pretty-show, stdenv, fetchFromGitHub, nix-prefetch-scripts, makeWrapper
 }:
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150824-66-gd281a60";
+  version = "20180903";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+    sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;
@@ -18,7 +18,7 @@ mkDerivation rec {
   enableSharedExecutables = false;
   executableHaskellDepends = [
     ansi-wl-pprint base Cabal containers distribution-nixpkgs
-    language-nix lens lens-construction-helper optparse-applicative
+    language-nix lens optparse-applicative
     pretty pretty-show
   ];
   executableToolDepends = [ makeWrapper ];
diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
index d879ea051e8..3262008e25a 100644
--- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
@@ -1,30 +1,28 @@
 { mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
 , deepseq-generics, directory, doctest, filepath, hackage-db, hspec
-, language-nix, lens, lens-construction-helper, pretty, process
-, SHA, split, stdenv, transformers, utf8-string, fetchFromGitHub
+, language-nix, lens, pretty, process, SHA, split, stdenv
+, transformers, utf8-string, fetchFromGitHub
 }:
 
 mkDerivation rec {
   pname = "distribution-nixpkgs";
-  version = "20150824-66-gd281a60";
+  version = "20180903";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+    sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [
     aeson base bytestring Cabal containers deepseq deepseq-generics
     directory doctest filepath hackage-db hspec language-nix lens
-    lens-construction-helper pretty process SHA split transformers
-    utf8-string
+    pretty process SHA split transformers utf8-string
   ];
   testHaskellDepends = [
     aeson base bytestring Cabal containers deepseq deepseq-generics
     directory doctest filepath hackage-db hspec language-nix lens
-    lens-construction-helper pretty process SHA split transformers
-    utf8-string
+    pretty process SHA split transformers utf8-string
   ];
   homepage = "https://github.com/nixos/cabal2nix#readme";
   description = "Convert Cabal files into Nix build instructions";
diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
index 5345fe5f413..28a767e31f0 100644
--- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
@@ -5,12 +5,12 @@
 
 mkDerivation rec {
   pname = "hackage2nix";
-  version = "20150824-66-gd281a60";
+  version = "20180903";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+    sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;
diff --git a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
index a9e02f25449..ea282d75101 100644
--- a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
@@ -1,20 +1,22 @@
-{ mkDerivation, base, data-default-class, deepseq-generics, lens
-, lens-construction-helper, pretty, regex-posix, stdenv, fetchFromGitHub
+{ mkDerivation, base, deepseq, doctest, lens, pretty, regex-posix
+, stdenv, fetchFromGitHub, QuickCheck
 }:
 
 mkDerivation rec {
   pname = "language-nix";
-  version = "20150824-66-gd281a60";
+  version = "20180903";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+    sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [
-    base data-default-class deepseq-generics lens
-    lens-construction-helper pretty regex-posix
+    base deepseq lens pretty regex-posix
+  ];
+  testHaskellDepends = [
+    base deepseq doctest lens pretty regex-posix QuickCheck
   ];
   homepage = "https://github.com/nixos/cabal2nix#readme";
   description = "Data types and useful functions to represent and manipulate the Nix language";
diff --git a/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix b/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix
deleted file mode 100644
index 0508795486f..00000000000
--- a/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ mkDerivation, base, data-default-class, fetchFromGitHub, lens, stdenv }:
-
-mkDerivation rec {
-  pname = "lens-construction-helper";
-  version = "20150824-66-gd281a60";
-  src = fetchFromGitHub {
-    owner = "nixos";
-    repo = "cabal2nix";
-    rev = "v${version}";
-    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
-  };
-  postUnpack = "sourceRoot+=/${pname}";
-  libraryHaskellDepends = [ base data-default-class lens ];
-  homepage = "https://github.com/nixos/cabal2nix#readme";
-  description = "Use data-default to create default instances of various types";
-  license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ simons ];
-}