From f8b1ace1d75478b4a130364402503a2d68af3828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 7 Jul 2011 21:40:33 +0000 Subject: [PATCH] Added warp plus dependencies. svn path=/nixpkgs/trunk/; revision=27649 --- .../libraries/haskell/http-types/default.nix | 14 ++++++++++++++ .../haskell/simple-sendfile/default.nix | 14 ++++++++++++++ .../libraries/haskell/unix-compat/default.nix | 4 ++-- .../libraries/haskell/wai/default.nix | 14 ++++++++++++++ .../libraries/haskell/warp/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 ++++++++ 6 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/http-types/default.nix create mode 100644 pkgs/development/libraries/haskell/simple-sendfile/default.nix create mode 100644 pkgs/development/libraries/haskell/wai/default.nix create mode 100644 pkgs/development/libraries/haskell/warp/default.nix diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix new file mode 100644 index 00000000000..d8ee2cab1d4 --- /dev/null +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -0,0 +1,14 @@ +{cabal, blazeBuilder, caseInsensitive, text}: + +cabal.mkDerivation (self : { + pname = "http-types"; + version = "0.6.5"; + sha256 = "1z2y219170n6rrmmffkg8xa450xzl42zpwahv7m71bxlz4cvxjc1"; + propagatedBuildInputs = [blazeBuilder caseInsensitive text]; + meta = { + description = "Generic HTTP types for Haskell (for both client and server code)"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix new file mode 100644 index 00000000000..c3a455a5475 --- /dev/null +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -0,0 +1,14 @@ +{cabal, network}: + +cabal.mkDerivation (self : { + pname = "simple-sendfile"; + version = "0.1.2"; + sha256 = "08w5ria2x41j85z1126kddi918zdqrwmr4vwqczgzh9kdi49wv8j"; + propagatedBuildInputs = [network]; + meta = { + description = "Cross platform library for the sendfile system call"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix index c0d3940d318..aee31438d10 100644 --- a/pkgs/development/libraries/haskell/unix-compat/default.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "unix-compat"; - version = "0.2.1.1"; - sha256 = "11bh29rq3g4qqvxc72wbip85vc3m91lafa85086izpqkkpnl4pxh"; + version = "0.2.1.3"; + sha256 = "12645n23b7b86w3fllg3vl39pvbxazqx9rflgnhc6qrlfklkyxxd"; meta = { description = "Portable POSIX-compatibility layer"; license = "BSD"; diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix new file mode 100644 index 00000000000..48eb38e3bae --- /dev/null +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -0,0 +1,14 @@ +{cabal, blazeBuilder, enumerator, network, httpTypes, text, transformers}: + +cabal.mkDerivation (self : { + pname = "wai"; + version = "0.4.0"; + sha256 = "1xp03g3q967rpgas896a5j3y7hjiir4ny0qlwmaj5ki61zivjsln"; + propagatedBuildInputs = [blazeBuilder enumerator network httpTypes text transformers]; + meta = { + description = "Web Application Interface"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix new file mode 100644 index 00000000000..38e94d0277f --- /dev/null +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -0,0 +1,18 @@ +{cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive, enumerator, + httpTypes, network, simpleSendfile, transformers, unixCompat, wai}: + +cabal.mkDerivation (self : { + pname = "warp"; + version = "0.4.1.1"; + sha256 = "0qck4mpg4p6v2yx2r6qchqd3lvsn8n5ys6xsm11hhznc2r50aayh"; + propagatedBuildInputs = [ + blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator + httpTypes network simpleSendfile transformers unixCompat wai + ]; + meta = { + description = "A fast, light-weight web server for WAI applications"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b987afcdb94..fac80af01c7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -618,6 +618,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); httpdShed = callPackage ../development/libraries/haskell/httpd-shed {}; + httpTypes = callPackage ../development/libraries/haskell/http-types {}; + HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {}; HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {}; HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; @@ -840,6 +842,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); sendfile = callPackage ../development/libraries/haskell/sendfile {}; + simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; + smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; @@ -967,6 +971,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mtl = self.mtl2; }; + wai = callPackage ../development/libraries/haskell/wai {}; + + warp = callPackage ../development/libraries/haskell/warp {}; + WebBits = callPackage ../development/libraries/haskell/WebBits { parsec = self.parsec2; };