From fac51533fa7b77946c98d4623a29bff4c4981086 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Mon, 23 Dec 2013 13:28:33 +0100 Subject: [PATCH 1/3] add haskellPackages.ioStreams --- .../libraries/haskell/io-streams/default.nix | 31 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/haskell/io-streams/default.nix diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix new file mode 100644 index 0000000000000..23444ab50bd9b --- /dev/null +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -0,0 +1,31 @@ +{ cabal, attoparsec, blazeBuilder, deepseq, filepath, HUnit, mtl +, network, primitive, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, text, time, transformers, vector, zlib +, zlibBindings +}: + +cabal.mkDerivation (self: { + pname = "io-streams"; + version = "1.1.2.2"; + sha256 = "1miq7sbvbsi6wi3siqr8w8d21v7x4axs0yrcd816xnjnjw19082j"; + buildDepends = [ + attoparsec blazeBuilder network primitive text time transformers + vector zlibBindings + ]; + + enableCheckPhase = false; + doCheck = false; + checkPhase = ""; + + testDepends = [ + attoparsec blazeBuilder deepseq filepath HUnit mtl network + primitive QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text time transformers vector zlib + zlibBindings + ]; + meta = { + description = "Simple, composable, and easy-to-use stream I/O"; + 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 a837314cee1db..a4ed36451a621 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1391,6 +1391,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ioStorage = callPackage ../development/libraries/haskell/io-storage {}; + ioStreams = callPackage ../development/libraries/haskell/io-streams {}; + iproute = callPackage ../development/libraries/haskell/iproute {}; irc = callPackage ../development/libraries/haskell/irc {}; From 893b4e22bd3ff48f7c5a37f03636cde0d2b94939 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Mon, 23 Dec 2013 13:31:35 +0100 Subject: [PATCH 2/3] add haskellPackages.websockets --- .../libraries/haskell/websockets/default.nix | 27 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/haskell/websockets/default.nix diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix new file mode 100644 index 0000000000000..7c557b86b889e --- /dev/null +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -0,0 +1,27 @@ +{ cabal, attoparsec, base64Bytestring, binary, blazeBuilder +, caseInsensitive, entropy, HUnit, ioStreams, mtl, network +, QuickCheck, random, SHA, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, text +}: + +cabal.mkDerivation (self: { + pname = "websockets"; + version = "0.8.1.1"; + sha256 = "0mgazf0s9sl53r5smidrfqcx7rq2v4kfm37f4f6mjrl656qxpbwd"; + buildDepends = [ + attoparsec base64Bytestring binary blazeBuilder caseInsensitive + entropy ioStreams mtl network random SHA text + ]; + + testDepends = [ + attoparsec base64Bytestring binary blazeBuilder caseInsensitive + entropy HUnit ioStreams mtl network QuickCheck random SHA + testFramework testFrameworkHunit testFrameworkQuickcheck2 text + ]; + meta = { + homepage = "http://jaspervdj.be/websockets"; + description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; + 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 a4ed36451a621..b4ef3e31553e9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2281,6 +2281,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x vcsRevision = callPackage ../development/libraries/haskell/vcs-revision {}; + websockets = callPackage ../development/libraries/haskell/websockets {}; + Vec = callPackage ../development/libraries/haskell/Vec {}; vect = callPackage ../development/libraries/haskell/vect {}; From 2df8b571b885c1042fa585ca226f148a1fb4bae4 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Mon, 23 Dec 2013 14:07:35 +0100 Subject: [PATCH 3/3] make ioStreams build on platform for ghc 742 --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b4ef3e31553e9..91c8f1078a288 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1391,7 +1391,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ioStorage = callPackage ../development/libraries/haskell/io-storage {}; - ioStreams = callPackage ../development/libraries/haskell/io-streams {}; + ioStreams = callPackage ../development/libraries/haskell/io-streams { + network = self.network_2_4_2_1; + }; iproute = callPackage ../development/libraries/haskell/iproute {};