diff --git a/pkgs/development/libraries/haskell/json/0.3.6.nix b/pkgs/development/libraries/haskell/json/0.3.6.nix deleted file mode 100644 index 5288659b541a..000000000000 --- a/pkgs/development/libraries/haskell/json/0.3.6.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "json"; - version = "0.3.6"; - sha256 = "05047879ed0c7a9aa168a981e238da94758281af3cb1a1f78a6427322b946fd7"; - buildDepends = [ parsec ]; - meta = { - description = "Support for serialising Haskell to and from JSON"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/json/0.4.4.nix b/pkgs/development/libraries/haskell/json/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/json/0.4.4.nix rename to pkgs/development/libraries/haskell/json/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e41b9b2328a0..8a16577521d8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -788,9 +788,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); WebBits = self.WebBits_1_0; }; - json_0_3_6 = callPackage ../development/libraries/haskell/json/0.3.6.nix {}; - json_0_4_4 = callPackage ../development/libraries/haskell/json/0.4.4.nix {}; - json = self.json_0_4_4; + json = callPackage ../development/libraries/haskell/json/default.nix {}; jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {}; @@ -1251,10 +1249,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {}; - CouchDB = callPackage ../development/libraries/haskell/CouchDB { - HTTP = self.HTTP_3001_1_5; - json = self.json_0_3_6; - }; + CouchDB = callPackage ../development/libraries/haskell/CouchDB {}; wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text {};