diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix new file mode 100644 index 000000000000..ad940556ec56 --- /dev/null +++ b/pkgs/development/libraries/haskell/exceptions/default.nix @@ -0,0 +1,21 @@ +{ cabal, mtl, QuickCheck, testFramework, testFrameworkQuickcheck2 +, transformers +}: + +cabal.mkDerivation (self: { + pname = "exceptions"; + version = "0.3.2"; + sha256 = "0c1d78wm8is9kyv26drbx3f1sq2bfcq5m6wfw2qzwgalb3z2kxlw"; + buildDepends = [ mtl transformers ]; + testDepends = [ + mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers + ]; + meta = { + homepage = "http://github.com/ekmett/exceptions/"; + description = "Extensible optionally-pure exceptions"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; + doCheck = false; # https://github.com/ekmett/exceptions/issues/18 +}) diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix new file mode 100644 index 000000000000..385700ca8633 --- /dev/null +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -0,0 +1,20 @@ +{ cabal, bifunctors, comonad, comonadsFd, comonadTransformers +, distributive, mtl, semigroupoids, semigroups, transformers +}: + +cabal.mkDerivation (self: { + pname = "free"; + version = "3.4.1"; + sha256 = "09yfkmnmhwwq22fsm1f4li4h13c3bqnh274z8jpgw0hrcnssh0rk"; + buildDepends = [ + bifunctors comonad comonadsFd comonadTransformers distributive mtl + semigroupoids semigroups transformers + ]; + meta = { + homepage = "http://github.com/ekmett/free/"; + description = "Monads for free"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix new file mode 100644 index 000000000000..72d8c8af8c89 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-simple/default.nix @@ -0,0 +1,15 @@ +{ cabal, exceptions, network, transformers }: + +cabal.mkDerivation (self: { + pname = "network-simple"; + version = "0.3.0"; + sha256 = "046nbgdwazbqffcim1gxry1mf35yg41g52zdk86h9whhiwjzlywz"; + buildDepends = [ exceptions network transformers ]; + meta = { + homepage = "https://github.com/k0001/network-simple"; + description = "Simple network sockets usage patterns"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix new file mode 100644 index 000000000000..156b89244ee6 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix @@ -0,0 +1,19 @@ +{ cabal, aeson, attoparsec, pipes, pipesAttoparsec, pipesParse +, transformers +}: + +cabal.mkDerivation (self: { + pname = "pipes-aeson"; + version = "0.2.0"; + sha256 = "12y5dywrhx3mvmlq26bc1cwybnclqbf91zvlz5ig2pi01ji3q94y"; + buildDepends = [ + aeson attoparsec pipes pipesAttoparsec pipesParse transformers + ]; + meta = { + homepage = "https://github.com/k0001/pipes-aeson"; + description = "Encode and decode JSON streams using Aeson and Pipes"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix new file mode 100644 index 000000000000..50f169928db5 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix @@ -0,0 +1,22 @@ +{ cabal, attoparsec, HUnit, mmorph, pipes, pipesParse, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +, transformers +}: + +cabal.mkDerivation (self: { + pname = "pipes-attoparsec"; + version = "0.3.0"; + sha256 = "1jsgssfs0ndn8aayc0rxyb4vlp2fny8npmnvym7v1yhp2qv84c7b"; + buildDepends = [ attoparsec pipes pipesParse text transformers ]; + testDepends = [ + attoparsec HUnit mmorph pipes pipesParse QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 text transformers + ]; + meta = { + homepage = "https://github.com/k0001/pipes-attoparsec"; + description = "Attoparsec and Pipes integration"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix index 970321bf2862..3a14619d2662 100644 --- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix +++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix @@ -1,13 +1,15 @@ -{ cabal, pipes, stm }: +{ cabal, async, pipes, stm }: cabal.mkDerivation (self: { pname = "pipes-concurrency"; - version = "1.2.1"; - sha256 = "036cn6pafqpf2811iigablks3zk747bnzji9ykrgwhpja427vlbl"; + version = "2.0.0"; + sha256 = "1f9l6qlaf8dyldzwaavj3k5akm74ycga5j173ypdna3pv0jbzfrk"; buildDepends = [ pipes stm ]; + testDepends = [ async pipes stm ]; meta = { description = "Concurrency for the pipes ecosystem"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix new file mode 100644 index 000000000000..89c67fb79ca2 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-network/default.nix @@ -0,0 +1,17 @@ +{ cabal, network, networkSimple, pipes, pipesSafe, transformers }: + +cabal.mkDerivation (self: { + pname = "pipes-network"; + version = "0.6.0"; + sha256 = "1jfj5bmpvf9vvq86jz8hbhzzjawchri90vx11fxcbz2ckks673k9"; + buildDepends = [ + network networkSimple pipes pipesSafe transformers + ]; + meta = { + homepage = "https://github.com/k0001/pipes-network"; + description = "Use network sockets together with the pipes library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix index 2a5e62926b92..2584e001c4f7 100644 --- a/pkgs/development/libraries/haskell/pipes-parse/default.nix +++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix @@ -1,13 +1,14 @@ -{ cabal, pipes }: +{ cabal, free, pipes, transformers }: cabal.mkDerivation (self: { pname = "pipes-parse"; - version = "1.0.0"; - sha256 = "0fk39a6d0ik5ghwyj6yyi9d0cj2sp22812fin7amcxcafrplf88w"; - buildDepends = [ pipes ]; + version = "2.0.0"; + sha256 = "092y0a4lvll451gnbz6ddrqgh22bd69wi00c0zd8s0hmf2f53y0s"; + buildDepends = [ free pipes transformers ]; meta = { description = "Parsing infrastructure for the pipes ecosystem"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/pipes-safe/default.nix b/pkgs/development/libraries/haskell/pipes-safe/default.nix index 09c58f0a0179..fd722c0fb05a 100644 --- a/pkgs/development/libraries/haskell/pipes-safe/default.nix +++ b/pkgs/development/libraries/haskell/pipes-safe/default.nix @@ -1,13 +1,14 @@ -{ cabal, pipes, transformers }: +{ cabal, exceptions, pipes, transformers }: cabal.mkDerivation (self: { pname = "pipes-safe"; - version = "1.2.0"; - sha256 = "0ki9i9378j8kgw5dd91b38r686pcr9fl2vf9dfgfshia072ppggj"; - buildDepends = [ pipes transformers ]; + version = "2.0.0"; + sha256 = "1g7ha6x87qyk3f9vrl0djzdvaq80q4q6hh7lya4kgm3cbz00a0yv"; + buildDepends = [ exceptions pipes transformers ]; meta = { description = "Safety for the pipes ecosystem"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix new file mode 100644 index 000000000000..171b8c90b561 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-zlib/default.nix @@ -0,0 +1,15 @@ +{ cabal, pipes, transformers, zlib, zlibBindings }: + +cabal.mkDerivation (self: { + pname = "pipes-zlib"; + version = "0.3.0"; + sha256 = "15d475rxziazxlbcbm8snik45z88kk7gxbxrpv4070bwylh3z0wc"; + buildDepends = [ pipes transformers zlib zlibBindings ]; + meta = { + homepage = "https://github.com/k0001/pipes-zlib"; + description = "Zlib compression and decompression for Pipes streams"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix index 87c173850f9b..a78028416076 100644 --- a/pkgs/development/libraries/haskell/pipes/default.nix +++ b/pkgs/development/libraries/haskell/pipes/default.nix @@ -1,13 +1,14 @@ -{ cabal, mmorph, transformers }: +{ cabal, mmorph, mtl, transformers, void }: cabal.mkDerivation (self: { pname = "pipes"; - version = "3.3.0"; - sha256 = "1bgznfv7hxqwj5f7vkm8d41phw63bl2swzr0wrz0pcqxlr42likb"; - buildDepends = [ mmorph transformers ]; + version = "4.0.0"; + sha256 = "0zsz739hjmfirwv9sacibpikwz48l006g95m8da1rqk5p1yyr2lm"; + buildDepends = [ mmorph mtl transformers void ]; meta = { description = "Compositional pipelines"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8947945abb4c..d6497b49ff03 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -938,6 +938,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {}; + exceptions = callPackage ../development/libraries/haskell/exceptions { + QuickCheck = self.QuickCheck_2_5_1_1; + }; + explicitException = callPackage ../development/libraries/haskell/explicit-exception {}; executablePath = callPackage ../development/libraries/haskell/executable-path {}; @@ -986,6 +990,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x forceLayout = callPackage ../development/libraries/haskell/force-layout {}; + free = callPackage ../development/libraries/haskell/free {}; + fsnotify = callPackage ../development/libraries/haskell/fsnotify {}; gamma = callPackage ../development/libraries/haskell/gamma {}; @@ -1520,6 +1526,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x networkProtocolXmpp = callPackage ../development/libraries/haskell/network-protocol-xmpp {}; + networkSimple = callPackage ../development/libraries/haskell/network-simple { }; + networkTransport = callPackage ../development/libraries/haskell/network-transport {}; networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {}; @@ -1623,12 +1631,20 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pipes = callPackage ../development/libraries/haskell/pipes {}; + pipesAeson = callPackage ../development/libraries/haskell/pipes-aeson {}; + + pipesAttoparsec = callPackage ../development/libraries/haskell/pipes-attoparsec {}; + pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {}; + pipesNetwork = callPackage ../development/libraries/haskell/pipes-network {}; + pipesParse = callPackage ../development/libraries/haskell/pipes-parse {}; pipesSafe = callPackage ../development/libraries/haskell/pipes-safe {}; + pipesZlib = callPackage ../development/libraries/haskell/pipes-zlib {}; + polyparse = callPackage ../development/libraries/haskell/polyparse {}; poolConduit = callPackage ../development/libraries/haskell/pool-conduit {};