diff options
author | Peter Simons <simons@cryp.to> | 2012-10-24 16:43:12 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2012-10-24 16:43:26 +0200 |
commit | d48aea2118b0604364ab38a5d28c7a255fc7f670 (patch) | |
tree | 003ae9f7cb1f318fda10a75e3b22ff3d7a4b2671 | |
parent | b96362486756188b8e1a6c41b2af55e427b080d9 (diff) | |
download | nixlib-d48aea2118b0604364ab38a5d28c7a255fc7f670.tar nixlib-d48aea2118b0604364ab38a5d28c7a255fc7f670.tar.gz nixlib-d48aea2118b0604364ab38a5d28c7a255fc7f670.tar.bz2 nixlib-d48aea2118b0604364ab38a5d28c7a255fc7f670.tar.lz nixlib-d48aea2118b0604364ab38a5d28c7a255fc7f670.tar.xz nixlib-d48aea2118b0604364ab38a5d28c7a255fc7f670.tar.zst nixlib-d48aea2118b0604364ab38a5d28c7a255fc7f670.zip |
Fix haskellPackackages_ghc742_pedantic package set, which was broken by an earlier commit.
-rw-r--r-- | pkgs/development/libraries/haskell/HTTP/4000.2.5.nix | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/async/2.0.1.3.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 6 |
3 files changed, 34 insertions, 2 deletions
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix new file mode 100644 index 000000000000..f345e7c98e1c --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, network, parsec }: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.2.5"; + sha256 = "03ij1zkykc438x2r1szz6ddvfhrjywlx61nrz377srcpbdmhxpb7"; + buildDepends = [ mtl network parsec ]; + meta = { + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix new file mode 100644 index 000000000000..a0da6384e958 --- /dev/null +++ b/pkgs/development/libraries/haskell/async/2.0.1.3.nix @@ -0,0 +1,15 @@ +{ cabal, stm }: + +cabal.mkDerivation (self: { + pname = "async"; + version = "2.0.1.3"; + sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh"; + buildDepends = [ stm ]; + meta = { + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 863413d5eb9a..583e927d6462 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -155,13 +155,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_2012_4_0_0 = self : { inherit (self) cabal ghc; - async = self.async_2_0_1_4; + async = self.async_2_0_1_3; cgi = self.cgi_3001_1_7_4; fgl = self.fgl_5_4_2_4; GLUT = self.GLUT_2_1_2_1; haskellSrc = self.haskellSrc_1_0_1_5; html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_6; + HTTP = self.HTTP_4000_2_5; HUnit = self.HUnit_1_2_5_1; mtl = self.mtl_2_1_2; network = self.network_2_3_1_0; @@ -461,6 +461,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); AspectAG = callPackage ../development/libraries/haskell/AspectAG {}; + async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {}; async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {}; async = self.async_2_0_1_4; @@ -914,6 +915,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; + HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; HTTP_4000_2_6 = callPackage ../development/libraries/haskell/HTTP/4000.2.6.nix {}; HTTP = self.HTTP_4000_2_6; |