diff options
author | Peter Simons <simons@cryp.to> | 2012-02-09 14:38:01 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2012-02-09 14:38:01 +0000 |
commit | 24ff52e62e637d62cc6c28f526ac7626d60b69e3 (patch) | |
tree | 8c5027e64932356b1b0b3d8fda634afe3590b23c /pkgs | |
parent | 3a4595d6798c7f9e3eeb81bdb7f4d8828c4d456d (diff) |
haskell-json: dropped obsolete version 0.4.4
svn path=/nixpkgs/trunk/; revision=32161
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/haskell/json/0.4.4.nix | 17 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/json/default.nix (renamed from pkgs/development/libraries/haskell/json/0.5.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 |
3 files changed, 1 insertions, 20 deletions
diff --git a/pkgs/development/libraries/haskell/json/0.4.4.nix b/pkgs/development/libraries/haskell/json/0.4.4.nix deleted file mode 100644 index a318cf3c5ee1a..0000000000000 --- a/pkgs/development/libraries/haskell/json/0.4.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, mtl, parsec, syb }: - -cabal.mkDerivation (self: { - pname = "json"; - version = "0.4.4"; - sha256 = "102qmz55b2mgcca3q1c2pkcr6hz7kmpldad3f6blhmp1cz15f081"; - buildDepends = [ mtl parsec syb ]; - 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.5.nix b/pkgs/development/libraries/haskell/json/default.nix index a748c2b4f5872..a748c2b4f5872 100644 --- a/pkgs/development/libraries/haskell/json/0.5.nix +++ b/pkgs/development/libraries/haskell/json/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6bcd3516449ff..8f429052eb50a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -927,9 +927,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); WebBitsHtml = self.WebBitsHtml_1_0_1; }; - json_0_4_4 = callPackage ../development/libraries/haskell/json/0.4.4.nix {}; - json_0_5 = callPackage ../development/libraries/haskell/json/0.5.nix {}; - json = self.json_0_4_4; + json = callPackage ../development/libraries/haskell/json {}; jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {}; |