From 65bb4ce47be6308b8a1074d80ecde4ec44121503 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Fri, 14 Mar 2014 23:43:41 +0100 Subject: [PATCH 1/2] haskell-wai-websockets: add version 2.1.0 --- .../haskell/wai-websockets/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/wai-websockets/default.nix diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix new file mode 100644 index 00000000000..4b4038fd411 --- /dev/null +++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix @@ -0,0 +1,22 @@ +{ cabal, blazeBuilder, caseInsensitive, conduit, fileEmbed +, httpTypes, ioStreams, network, text, transformers, wai +, waiAppStatic, warp, websockets +}: + +cabal.mkDerivation (self: { + pname = "wai-websockets"; + version = "2.1.0"; + sha256 = "094imqhkn4ghifgp2qhs4hnby3zzdd84fhmyvvy7igcpz1rmll7a"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + blazeBuilder caseInsensitive conduit fileEmbed httpTypes ioStreams + network text transformers wai waiAppStatic warp websockets + ]; + meta = { + homepage = "http://github.com/yesodweb/wai"; + description = "Provide a bridge betweeen WAI and the websockets package"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 672b8ffe594..99754abbaa2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2570,6 +2570,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x waiTest = callPackage ../development/libraries/haskell/wai-test {}; + waiWebsockets = callPackage ../development/libraries/haskell/wai-websockets {}; + warp = callPackage ../development/libraries/haskell/warp {}; warpTls = callPackage ../development/libraries/haskell/warp-tls {}; From fa9335e441ad47a8bc5348d8574e3d38f0ec8e21 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Fri, 14 Mar 2014 23:45:21 +0100 Subject: [PATCH 2/2] haskell-leveldb-haskell: add version 0.3.0 --- .../haskell/leveldb-haskell/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/leveldb-haskell/default.nix diff --git a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix new file mode 100644 index 00000000000..becd68ba915 --- /dev/null +++ b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix @@ -0,0 +1,21 @@ +{ cabal, async, dataDefault, filepath, leveldb, resourcet +, transformers +}: + +cabal.mkDerivation (self: { + pname = "leveldb-haskell"; + version = "0.3.0"; + sha256 = "0hdxn6v7fzc0wlpkymlci60m2584h6fn78bxdnv2q18ra03r3ygs"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async dataDefault filepath resourcet transformers + ]; + extraLibraries = [ leveldb ]; + meta = { + homepage = "http://github.com/kim/leveldb-haskell"; + description = "Haskell bindings to LevelDB"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 99754abbaa2..5df1eb4c074 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1590,6 +1590,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x lenses = callPackage ../development/libraries/haskell/lenses {}; + leveldbHaskell = callPackage ../development/libraries/haskell/leveldb-haskell {}; + libffi = callPackage ../development/libraries/haskell/libffi { libffi = pkgs.libffi; };