diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-09-07 16:19:46 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-09-07 16:19:46 +0200 |
commit | b1be46e9327dee77ecaeecaaa024151d5bc9b140 (patch) | |
tree | a471d9cfccf4f5409256ded618ff99b46d57307a /pkgs/development/libraries/haskell | |
parent | 0cf8a74e82f25cc6f5b94f50358f1bfbfb379e89 (diff) | |
parent | af96f91a1283a31b8185b50731169f085a6cb467 (diff) | |
download | nixlib-b1be46e9327dee77ecaeecaaa024151d5bc9b140.tar nixlib-b1be46e9327dee77ecaeecaaa024151d5bc9b140.tar.gz nixlib-b1be46e9327dee77ecaeecaaa024151d5bc9b140.tar.bz2 nixlib-b1be46e9327dee77ecaeecaaa024151d5bc9b140.tar.lz nixlib-b1be46e9327dee77ecaeecaaa024151d5bc9b140.tar.xz nixlib-b1be46e9327dee77ecaeecaaa024151d5bc9b140.tar.zst nixlib-b1be46e9327dee77ecaeecaaa024151d5bc9b140.zip |
Merge branch 'master' into x-updates
Diffstat (limited to 'pkgs/development/libraries/haskell')
66 files changed, 452 insertions, 162 deletions
diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.0.nix b/pkgs/development/libraries/haskell/Cabal/1.18.0.nix new file mode 100644 index 000000000000..6e0d3074bdb3 --- /dev/null +++ b/pkgs/development/libraries/haskell/Cabal/1.18.0.nix @@ -0,0 +1,26 @@ +{ cabal, deepseq, extensibleExceptions, filepath, HUnit, QuickCheck +, regexPosix, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, time +}: + +cabal.mkDerivation (self: { + pname = "Cabal"; + version = "1.18.0"; + sha256 = "1nxvkfkjkyxsa4nbrwl59r84j63qh2qx4cbd3vnr6vvdnflbix8f"; + buildDepends = [ deepseq filepath time ]; + testDepends = [ + extensibleExceptions filepath HUnit QuickCheck regexPosix + testFramework testFrameworkHunit testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "http://www.haskell.org/cabal/"; + description = "A framework for packaging Haskell software"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix new file mode 100644 index 000000000000..99ab741be492 --- /dev/null +++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix @@ -0,0 +1,18 @@ +{ cabal, cairo, Chart, colour, dataDefaultClass, mtl, operational +, time +}: + +cabal.mkDerivation (self: { + pname = "Chart-cairo"; + version = "1.0"; + sha256 = "0z5qhsq9v5sd32d18gl09svxic8n6s65v4nyq04zcp76219mhp55"; + buildDepends = [ + cairo Chart colour dataDefaultClass mtl operational time + ]; + meta = { + homepage = "https://github.com/timbod7/haskell-chart/wiki"; + description = "Cairo backend for Charts"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix index dd6c54cf6b89..d97fdc21f035 100644 --- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix +++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix @@ -1,14 +1,10 @@ -{ cabal, cairo, Chart, colour, dataAccessor, dataAccessorTemplate -, gtk, mtl, time -}: +{ cabal, cairo, Chart, ChartCairo, colour, gtk, mtl, time }: cabal.mkDerivation (self: { pname = "Chart-gtk"; - version = "0.17"; - sha256 = "1i411kdpz75azyhfaryazr0bpij5xcl0y82m9a7k23w8mhybqwc7"; - buildDepends = [ - cairo Chart colour dataAccessor dataAccessorTemplate gtk mtl time - ]; + version = "1.0"; + sha256 = "06i53922hdc7dvh2a76ccvwrwfhvhji0ya8j4f2lddg5zckvp3yj"; + buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ]; meta = { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Utility functions for using the chart library with GTK"; diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index dafa834e4d43..0d9dd690758e 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -1,13 +1,11 @@ -{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, mtl -, time -}: +{ cabal, colour, dataDefaultClass, lens, mtl, operational, time }: cabal.mkDerivation (self: { pname = "Chart"; - version = "0.17"; - sha256 = "1ip1a61ryypwfzj6dc6n6pl92rflf7lqf1760ppjyg05q5pn6qxg"; + version = "1.0"; + sha256 = "137njda84vxrj3pk12bmkf11wh8fj89nxpz067wrycrgw9xy5rd3"; buildDepends = [ - cairo colour dataAccessor dataAccessorTemplate mtl time + colour dataDefaultClass lens mtl operational time ]; meta = { homepage = "https://github.com/timbod7/haskell-chart/wiki"; diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index 9eefaaef84a0..8df2209ffbf7 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.3.3"; - sha256 = "04d2nd2hcbglw8blwhi3d32vazdxnvs9s52788qyllgm7gmay6a5"; + version = "0.10.3.4"; + sha256 = "1xgnzivphnzb4yf31406yg5fjycrfypwrlxi2s8lfzgja8m1l7h5"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { homepage = "https://github.com/phonohawk/HsOpenSSL"; - description = "(Incomplete) OpenSSL binding for Haskell"; + description = "Partial OpenSSL binding for Haskell"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix new file mode 100644 index 000000000000..b7b8b6336e65 --- /dev/null +++ b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix @@ -0,0 +1,13 @@ +{ cabal, mtl, syb }: + +cabal.mkDerivation (self: { + pname = "Strafunski-StrategyLib"; + version = "5.0.0.3"; + sha256 = "1s7410dfzkqd9j8n5g92pvh9rwglngj3ca9ipcr6xsq0n6yhs51y"; + buildDepends = [ mtl syb ]; + meta = { + description = "Library for strategic programming"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index 53f1514bcb6d..bc428ab1dc45 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { hashtables languageCQuote mainlandPretty mtl SafeSemaphore srcloc text transformers unorderedContainers ]; + jailbreak = true; meta = { homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 3c4135feb724..bcb202c64d07 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -5,15 +5,15 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.6.1.0"; - sha256 = "16hjwcybmgmk1sg8x02r9bxisx4gl61rlq8w2zsxfgkxwjpfhkbx"; + version = "0.6.2.0"; + sha256 = "1f7bzgwl9pm5a79gr3a8wxh7dyz4k2508d0bw4l0mbjgv6r7s4an"; buildDepends = [ attoparsec blazeBuilder deepseq dlist hashable mtl syb text time unorderedContainers vector ]; testDepends = [ attoparsec QuickCheck testFramework testFrameworkQuickcheck2 text - time + time unorderedContainers vector ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/bindings-DSL/default.nix b/pkgs/development/libraries/haskell/bindings-DSL/default.nix index 9d6e8d1a04d5..d333a2877497 100644 --- a/pkgs/development/libraries/haskell/bindings-DSL/default.nix +++ b/pkgs/development/libraries/haskell/bindings-DSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bindings-DSL"; - version = "1.0.16"; - sha256 = "1sly88585f94dsnhyw6nagnr4jfjixnn61my85x05987flf325px"; + version = "1.0.17"; + sha256 = "1203n6wzdp21hd7zdhvhppxhkz4xr3qykwkb8j5mb2s4kijx01bn"; meta = { homepage = "http://bitbucket.org/mauricio/bindings-dsl"; description = "FFI domain specific language, on top of hsc2hs"; diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.nix new file mode 100644 index 000000000000..fb3a9d271011 --- /dev/null +++ b/pkgs/development/libraries/haskell/case-insensitive/1.1.nix @@ -0,0 +1,17 @@ +{ cabal, deepseq, hashable, HUnit, testFramework +, testFrameworkHunit, text +}: + +cabal.mkDerivation (self: { + pname = "case-insensitive"; + version = "1.1"; + sha256 = "1likcqdlhbbk78s887n5g9a4jjxxyh46hj4wc7l7snf6f9ygd5lj"; + buildDepends = [ deepseq hashable text ]; + testDepends = [ HUnit testFramework testFrameworkHunit text ]; + meta = { + homepage = "https://github.com/basvandijk/case-insensitive"; + description = "Case insensitive string comparison"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index e27f203306e2..5fc5905ebb92 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -1,11 +1,15 @@ -{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }: +{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck +, securemem, testFramework, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "cipher-aes"; - version = "0.1.8"; - sha256 = "171mj9abm0x9bg6mf225mhb25i7xh4v5la5866llb1qrrpvsk1xf"; + version = "0.2.5"; + sha256 = "1ayypdfn2nnxp595dpyivmzw2jc4iyjz2in3z7ldccx36gn5j6b3"; + buildDepends = [ byteable cryptoCipherTypes securemem ]; testDepends = [ - QuickCheck testFramework testFrameworkQuickcheck2 + byteable cryptoCipherTests cryptoCipherTypes QuickCheck + testFramework testFrameworkQuickcheck2 ]; meta = { homepage = "http://github.com/vincenthz/hs-cipher-aes"; diff --git a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix new file mode 100644 index 000000000000..af8114c6d028 --- /dev/null +++ b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix @@ -0,0 +1,20 @@ +{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck +, securemem, testFramework, testFrameworkQuickcheck2, vector +}: + +cabal.mkDerivation (self: { + pname = "cipher-blowfish"; + version = "0.0.1"; + sha256 = "0bz8jd65idcalyzcbmgz16hr6y5mnw7mckk5yvrm9k19cr6mwq52"; + buildDepends = [ byteable cryptoCipherTypes securemem vector ]; + testDepends = [ + byteable cryptoCipherTests cryptoCipherTypes QuickCheck + testFramework testFrameworkQuickcheck2 + ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-cipher"; + description = "Blowfish cipher"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cipher-camellia/default.nix b/pkgs/development/libraries/haskell/cipher-camellia/default.nix new file mode 100644 index 000000000000..6d29792ea337 --- /dev/null +++ b/pkgs/development/libraries/haskell/cipher-camellia/default.nix @@ -0,0 +1,20 @@ +{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck +, securemem, testFramework, testFrameworkQuickcheck2, vector +}: + +cabal.mkDerivation (self: { + pname = "cipher-camellia"; + version = "0.0.1"; + sha256 = "11narl4h77v7317hdqy8zxhym3k7xrmw97yfwh0vr8k1y5dkiqh3"; + buildDepends = [ byteable cryptoCipherTypes securemem vector ]; + testDepends = [ + byteable cryptoCipherTests cryptoCipherTypes QuickCheck + testFramework testFrameworkQuickcheck2 + ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-cipher"; + description = "Camellia block cipher primitives"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cipher-des/default.nix b/pkgs/development/libraries/haskell/cipher-des/default.nix new file mode 100644 index 000000000000..588a28f3a258 --- /dev/null +++ b/pkgs/development/libraries/haskell/cipher-des/default.nix @@ -0,0 +1,20 @@ +{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck +, securemem, testFramework, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "cipher-des"; + version = "0.0.3"; + sha256 = "1gcpwfxrlgwl34yy7k3vhpmcrmyiirbmz40zssk2lv6cfrylc4z7"; + buildDepends = [ byteable cryptoCipherTypes securemem ]; + testDepends = [ + byteable cryptoCipherTests cryptoCipherTypes QuickCheck + testFramework testFrameworkQuickcheck2 + ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-cipher"; + description = "DES and 3DES primitives"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 6cb8d26bd39a..00df46640e15 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,14 +1,15 @@ { cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi -, entropy, hspec, HUnit, QuickCheck, skein, tagged, transformers +, cryptoRandom, entropy, hspec, HUnit, QuickCheck, skein, tagged +, transformers }: cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.9.0.2"; - sha256 = "0vl310nickavp8wkaad1wfnvm8gfsg9jcfw3rgjz7698avynv3ni"; + version = "0.9.0.3"; + sha256 = "0w7mkyrd8gx5d6mcqprn7ll05414vm2j5fbyi6pj9cxd2m4qc9b1"; buildDepends = [ - base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein - tagged + base64Bytestring cereal cipherAes cprngAes cryptoApi cryptoRandom + entropy skein tagged ]; testDepends = [ cereal hspec HUnit QuickCheck transformers ]; meta = { diff --git a/pkgs/development/libraries/haskell/cmdtheline/default.nix b/pkgs/development/libraries/haskell/cmdtheline/default.nix new file mode 100644 index 000000000000..c49093f68596 --- /dev/null +++ b/pkgs/development/libraries/haskell/cmdtheline/default.nix @@ -0,0 +1,19 @@ +{ cabal, filepath, HUnit, parsec, testFramework, testFrameworkHunit +, transformers +}: + +cabal.mkDerivation (self: { + pname = "cmdtheline"; + version = "0.2.3"; + sha256 = "1jwbr34xgccjbz6nm58bdsg1vqyv87rh45yia5j36vlfbaclyb04"; + buildDepends = [ filepath parsec transformers ]; + testDepends = [ + filepath HUnit parsec testFramework testFrameworkHunit transformers + ]; + meta = { + homepage = "http://github.com/eli-frey/cmdtheline"; + description = "Declarative command-line option parsing and documentation library"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index 4f2aa58b7d29..fb6d2ff456b8 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -1,12 +1,10 @@ -{ cabal, cipherAes, cryptoApi, cryptoRandomApi, entropy, random }: +{ cabal, byteable, cipherAes, cryptoRandom, random }: cabal.mkDerivation (self: { pname = "cprng-aes"; - version = "0.3.4"; - sha256 = "0k1zh4nw30qgdrkgn6x6zfbpp129f9cparzyqsdqfbf44j0mf2rw"; - buildDepends = [ - cipherAes cryptoApi cryptoRandomApi entropy random - ]; + version = "0.5.1"; + sha256 = "1bw76y2krcshimvwzph76d69bdfaxfi21w4dxfslmqm78knlls47"; + buildDepends = [ byteable cipherAes cryptoRandom random ]; meta = { homepage = "http://github.com/vincenthz/hs-cprng-aes"; description = "Crypto Pseudo Random Number Generator using AES in counter mode"; diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index af6985cd9ede..eba1b906d5b9 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -1,15 +1,15 @@ -{ cabal, cryptoRandomApi, HUnit, QuickCheck, testFramework +{ cabal, byteable, cryptoRandom, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, vector }: cabal.mkDerivation (self: { pname = "crypto-numbers"; - version = "0.1.3"; - sha256 = "115lgnay3ly5r53flh3v5jygqks0rg1i8qmbvrqf9nkmnmw6a5x1"; - buildDepends = [ cryptoRandomApi vector ]; + version = "0.2.0"; + sha256 = "1s4q9qqb7qb0shaxmhhxixsnhgwn2h6nxxblkfqqqvkdiwis278j"; + buildDepends = [ cryptoRandom vector ]; testDepends = [ - cryptoRandomApi HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 vector + byteable cryptoRandom HUnit QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 vector ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-numbers"; diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index 47e8dc179ae3..a4f98e5a2a1a 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -1,17 +1,17 @@ -{ cabal, cryptohash, cryptoNumbers, cryptoPubkeyTypes -, cryptoRandomApi, HUnit, QuickCheck, testFramework +{ cabal, byteable, cryptohash, cryptoNumbers, cryptoPubkeyTypes +, cryptoRandom, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.1.4"; - sha256 = "13ah3ip6gdv7b1zz5qwi7515a3k8pp3l0jr1kq4q2a0vqy24gkn1"; + version = "0.2.1"; + sha256 = "06cb2h9c3r1ycgcw7scc191gbr86qi8pxil07207n5fccq3vpjys"; buildDepends = [ - cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi + byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom ]; testDepends = [ - cryptohash cryptoNumbers cryptoRandomApi HUnit QuickCheck + byteable cryptohash cryptoNumbers cryptoRandom HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; meta = { diff --git a/pkgs/development/libraries/haskell/crypto-random/default.nix b/pkgs/development/libraries/haskell/crypto-random/default.nix new file mode 100644 index 000000000000..583e9e5805b3 --- /dev/null +++ b/pkgs/development/libraries/haskell/crypto-random/default.nix @@ -0,0 +1,14 @@ +{ cabal, securemem, vector }: + +cabal.mkDerivation (self: { + pname = "crypto-random"; + version = "0.0.5"; + sha256 = "1wvbbqqfqaylq9w8pyiz243d06ivh982mhb2ci5yhjl06vqv2gk3"; + buildDepends = [ securemem vector ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-random"; + description = "Simple cryptographic random related types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 0f99ccdfe389..57d0e2483f86 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,20 +1,14 @@ -{ cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi, cryptohash -, entropy, primitive, QuickCheck, testFramework -, testFrameworkQuickcheck2, vector +{ cabal, cipherAes, cipherBlowfish, cipherCamellia, cipherDes +, cipherRc4, cryptoCipherTypes }: cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.5.2"; - sha256 = "0ffd3w2hvi1zbhgk0xvgbnlfzzwijbrs5b9b4g2vc5p69wkv24zr"; - isLibrary = true; - isExecutable = true; + version = "0.6.1"; + sha256 = "1qa0s7mr1a3nv4ppyk8wr57rxbfc2qpw9rq26pfziwnpin5k2j3x"; buildDepends = [ - cereal cipherAes cipherRc4 cpu cryptoApi primitive vector - ]; - testDepends = [ - cryptoApi cryptohash entropy QuickCheck testFramework - testFrameworkQuickcheck2 vector + cipherAes cipherBlowfish cipherCamellia cipherDes cipherRc4 + cryptoCipherTypes ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-cipher"; diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 03fee5bac928..d598b3639339 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -1,12 +1,12 @@ -{ cabal, byteable, cereal, cryptoApi, HUnit, QuickCheck, tagged -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +{ cabal, byteable, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.9.1"; - sha256 = "164j43dja91k2cssh0s2dw9riibijl02bap9mn8jn1h6vjb6w9z0"; - buildDepends = [ byteable cereal cryptoApi tagged ]; + version = "0.10.0"; + sha256 = "0szvx1dxf16chlksmp08g9qxy7f87w6hspigwbw78aygc3q9mzaq"; + buildDepends = [ byteable ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/final/default.nix b/pkgs/development/libraries/haskell/final/default.nix new file mode 100644 index 000000000000..632261741187 --- /dev/null +++ b/pkgs/development/libraries/haskell/final/default.nix @@ -0,0 +1,14 @@ +{ cabal, stm, transformers }: + +cabal.mkDerivation (self: { + pname = "final"; + version = "0.1"; + sha256 = "189vby5ym6hcjpz6y9chlgkyzl8wnndqkhzk7s7qy8mksr3g66f9"; + buildDepends = [ stm transformers ]; + meta = { + homepage = "http://github.com/errge/final"; + description = "utility to add extra safety to monadic returns"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 93230af44118..b90944816d68 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "2.0.3"; - sha256 = "0f0n4cqpspad3ygw89rp8wj1gxb7mv5zrd8938zm1rn2mimihggr"; + version = "3.0.0"; + sha256 = "1ll2vn4vv4k7jaah0ngr2ml381cpprqy9ndqpf8cn44m5xd9qn6p"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 511b1b70f289..6154ed6c9a77 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { aeson attoparsec caseInsensitive conduit dataDefault failure HTTP httpConduit httpTypes network text time unorderedContainers vector ]; + jailbreak = true; meta = { homepage = "https://github.com/fpco/github"; description = "Access to the Github API, v3"; diff --git a/pkgs/development/libraries/haskell/groups/default.nix b/pkgs/development/libraries/haskell/groups/default.nix new file mode 100644 index 000000000000..a03094970706 --- /dev/null +++ b/pkgs/development/libraries/haskell/groups/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "groups"; + version = "0.3.0.0"; + sha256 = "07swv09l98fxh563w1x8n8xzgh9q7n9dbx4gx3i77kwi72vmxl8x"; + meta = { + description = "Haskell 98 groups"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index f3f2562a0735..a594ce878803 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -26,6 +26,9 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 text time ]; doCheck = false; + patchPhase = '' + sed -i -e 's|cryptohash.*,|cryptohash,|' hakyll.cabal + ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix index 8cf1accca9c7..3512bce96118 100644 --- a/pkgs/development/libraries/haskell/hint/default.nix +++ b/pkgs/development/libraries/haskell/hint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hint"; - version = "0.3.3.6"; - sha256 = "080wnds99lg9p4n2h9d4bpgvk73yzc3im2ysn1r8f3nqai4b2can"; + version = "0.3.3.7"; + sha256 = "1aba9dfkxlpmvbvllw4qnlrd300vnr0ismkn3kva1pv1cay5pifk"; buildDepends = [ extensibleExceptions filepath ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl random utf8String diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 38ee62dd5af3..c0b05ea82e0a 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.20"; - sha256 = "0sff230qc9lk3kqr9azg399fsaybwqpic9pj52jyw61ffasnl2dd"; + version = "4.2.21"; + sha256 = "167iw0rp37c1bixmaa5l06c943h33b457symllh8rcbmf880z09i"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,7 +19,6 @@ cabal.mkDerivation (self: { testDepends = [ conduit hspec hspecExpectations HUnit systemFileio transformers ]; - doCheck = false; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index 1d823d6f8404..e9822f758297 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hsemail"; - version = "1.7.6"; - sha256 = "0v4c6ljrzc7680i85wyxq7fkfs2j00941ps3rn8r16x3x2r8di04"; + version = "1.7.7"; + sha256 = "16wqrpzi5njv26za1rckn74jsqmyswndb6k38yz1567h1y4w7ai5"; buildDepends = [ mtl parsec ]; testDepends = [ doctest hspec parsec ]; meta = { diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix index 4aaa5fe5e953..789ff5d7b2a4 100644 --- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hspec-expectations"; - version = "0.3.2"; - sha256 = "0962wlngqck0wc7mcby9bzci1s8d9a91vsm39rnab5wifhc2c6xi"; + version = "0.3.3"; + sha256 = "0sg7wkgr9qmwv0bki1q8wvl5jrlsvn0c7sd2qpqp3cccdhwj9c5k"; buildDepends = [ HUnit ]; testDepends = [ hspec HUnit markdownUnlit silently ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index 374dd9eaf677..ff6c0f204d70 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.7.0"; - sha256 = "0a1s7pkymn41kk8gp5i7v141vq5yx857rma1l2xffs9lh4qalnq8"; + version = "1.7.1"; + sha256 = "08g327jnv7alamabxafhsv7ssisgymgsf91khr73zja5x8idfkxc"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index d7925b41816a..0c9783c9a9c9 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.7.0"; - sha256 = "0cw24vmns06z5308wva9bb5czs9i5wm6qdhymgiyl2i47ibxp5bj"; + version = "1.7.1"; + sha256 = "0fc8phc36876f8qydc5iwz3i7nri0n6b4dlxv0w4rcxgv9hp7ls0"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index eb7f1a0d468a..6d6ac6b3fd0e 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.9.4.3"; - sha256 = "0lmshqv1ybim4201nb9wskyhg4fnslbm4ymvlmhn5zx0nwd777p9"; + version = "1.9.4.5"; + sha256 = "04b459x60dspd827k6ccikkm4j0cl7phcprvsdcqbc78yjf7vqpg"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 9be23188db40..c44e489519ca 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.2.0"; - sha256 = "01kqf9c2yr3x5jwzyn44gs76fbffpacxs2j89aa902l0rz6l8ral"; + version = "0.2.1"; + sha256 = "1f1087igr4kisb3z3lxznb85sfhzr2s08am1za3jg8cgffmrais8"; buildDepends = [ blazeBuilder caseInsensitive classyPrelude conduit dataDefault httpConduit httpTypes liftedBase monadControl network diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index c4c064fbf811..b0b68eec434e 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.8.0"; - sha256 = "14d1gzgwhinkwx3lmc6hvqj6ivjrvy4m6fm2walnyk1zv24zli75"; + version = "0.8.1"; + sha256 = "07hxxlhgnwsvjr2dzqbswwwkjxwsc0pk6shpkvzgclrsyn3xrg7p"; buildDepends = [ blazeBuilder caseInsensitive text ]; testDepends = [ blazeBuilder hspec QuickCheck text ]; meta = { diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix new file mode 100644 index 000000000000..ba0f2ce1a3a9 --- /dev/null +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -0,0 +1,21 @@ +{ cabal, distributive, doctest, filepath, hashable, lens +, reflection, semigroupoids, semigroups, simpleReflect, tagged +, transformers, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "linear"; + version = "1.2"; + sha256 = "0mna8k6plq0akki5j5zjk1xk1hgks1076q1h5s14v87d0h45wlrh"; + buildDepends = [ + distributive hashable reflection semigroupoids semigroups tagged + transformers unorderedContainers vector + ]; + testDepends = [ doctest filepath lens simpleReflect ]; + meta = { + homepage = "http://github.com/ekmett/linear/"; + description = "Linear Algebra"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix index 22018087226e..346e1c6a428d 100644 --- a/pkgs/development/libraries/haskell/miniutter/default.nix +++ b/pkgs/development/libraries/haskell/miniutter/default.nix @@ -1,11 +1,12 @@ -{ cabal, HUnit, minimorph, testFramework, testFrameworkHunit, text +{ cabal, binary, HUnit, minimorph, testFramework +, testFrameworkHunit, text }: cabal.mkDerivation (self: { pname = "miniutter"; - version = "0.4.0"; - sha256 = "1l275aad8svrqp22jv9s0mmlam7wbdlf6m4m97658rm8ks4j2mbx"; - buildDepends = [ minimorph text ]; + version = "0.4.2"; + sha256 = "00027aqxa0631v3n1jsv4aj9kf39s5yivi3dl573s5nj0wibj008"; + buildDepends = [ binary minimorph text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { homepage = "https://github.com/Mikolaj/miniutter"; diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix index 4d0b9fcabeb7..53785f45c221 100644 --- a/pkgs/development/libraries/haskell/mmap/default.nix +++ b/pkgs/development/libraries/haskell/mmap/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mmap"; - version = "0.5.8"; - sha256 = "17zsb95ynyrqj51h4jxi9glsih4vq33hbxycgw13z5fivv261m7y"; + version = "0.5.9"; + sha256 = "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index 12c65deb4453..2d269fc7a92b 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.4.1"; - sha256 = "1r1ywqy3igcmmwxjy4fjqdnf8m4zqbc8l0nj43h2xwrl86lhfym9"; + version = "1.4.1.1"; + sha256 = "1c9980x3i0jgacgz7mx65l5nyp3h83mqp9b52pzxq90lix6xnwhi"; buildDepends = [ binary bson cryptohash liftedBase monadControl mtl network parsec random randomShuffle text transformersBase diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index 2025ceaffe50..a9a2b07e81b9 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -1,10 +1,10 @@ -{ cabal, semigroupoids, semigroups }: +{ cabal, groupoids, groups, semigroupoids, semigroups }: cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.3.1.0"; - sha256 = "0nxdkx0j67nb41ingp1yl0appfx64ikf5709f48469qbaf3pgax3"; - buildDepends = [ semigroupoids semigroups ]; + version = "0.3.2.0"; + sha256 = "0yhb55v0a2221xbpbm8jiqzqvps0lab5n8iakpq69ndr2l0d2r3x"; + buildDepends = [ groupoids groups semigroupoids semigroups ]; meta = { description = "Various extra monoid-related definitions and utilities"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 77c81362d244..555435d3c583 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -1,10 +1,10 @@ -{ cabal, explicitException, utf8String }: +{ cabal, utf8String }: cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.18.0.0"; - sha256 = "1wgnpsnzjsspjvg5srjrzr4mqxhyisidkjj26cangxlhmb88rlwi"; - buildDepends = [ explicitException utf8String ]; + version = "0.22.0.0"; + sha256 = "1fswkgrn8mc92lrzmrxhv6hbgch2lqdvmjn88k4ajqc0gpmpb750"; + buildDepends = [ utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; description = "Combinators to build command line parsers"; diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index 2b1a56940447..bfb96e304802 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -1,15 +1,15 @@ -{ cabal, aeson, certificate, conduit, cryptoApi, cryptoRandomApi -, network, networkConduit, pem, systemFileio, systemFilepath, tls -, tlsExtra, transformers +{ cabal, aeson, certificate, conduit, cprngAes, cryptoApi +, cryptoRandomApi, network, networkConduit, pem, systemFileio +, systemFilepath, tls, tlsExtra, transformers }: cabal.mkDerivation (self: { pname = "network-conduit-tls"; - version = "1.0.1"; - sha256 = "0h2svqllm85vambssq0j4ghx2b44cjg0kj04bamp72ly22mcg9d6"; + version = "1.0.1.1"; + sha256 = "0v5rspcjhd2vid5i74dy1sdcvci7dlr88sgr0v9vjp4gcyb29qlj"; buildDepends = [ - aeson certificate conduit cryptoApi cryptoRandomApi network - networkConduit pem systemFileio systemFilepath tls tlsExtra + aeson certificate conduit cprngAes cryptoApi cryptoRandomApi + network networkConduit pem systemFileio systemFilepath tls tlsExtra transformers ]; meta = { diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix index 59a0d77d67cf..3a9531488bb4 100644 --- a/pkgs/development/libraries/haskell/network-multicast/default.nix +++ b/pkgs/development/libraries/haskell/network-multicast/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network-multicast"; - version = "0.0.8"; - sha256 = "0jsbp8z2a69x5h6dc3b16wdxs0shv6438mnf5mg0jxq7xddbhph8"; + version = "0.0.10"; + sha256 = "092v4ba6mrl5ykx2fscclcsc5dbnq99hbn93sc2mjnnr8c9r0n5x"; buildDepends = [ network ]; meta = { description = "Simple multicast library"; diff --git a/pkgs/development/libraries/haskell/operational/default.nix b/pkgs/development/libraries/haskell/operational/default.nix new file mode 100644 index 000000000000..f059f86d68ff --- /dev/null +++ b/pkgs/development/libraries/haskell/operational/default.nix @@ -0,0 +1,16 @@ +{ cabal, mtl, random }: + +cabal.mkDerivation (self: { + pname = "operational"; + version = "0.2.2.1"; + sha256 = "1w4bln8mj4hw5i40amah570p77wimxfpn7l2mmjk9z07zavx1rv2"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl random ]; + meta = { + homepage = "http://haskell.org/haskellwiki/Operational"; + description = "Implementation of difficult monads made easy with operational semantics"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index a3ffd276c2c6..53e6066f968c 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "postgresql-libpq"; - version = "0.8.2.3"; - sha256 = "08l3va5v8ppajgl8ywmzjdvd6v2vhqfj0y55mb1jxkdpvkd5hckl"; + version = "0.8.2.4"; + sha256 = "1dqb4pnsvd6378rhmlhi151sin06wfm9sx12m3ir9x0j5ppb5sx6"; extraLibraries = [ postgresql ]; meta = { homepage = "http://github.com/lpsmith/postgresql-libpq"; diff --git a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix new file mode 100644 index 000000000000..08c2f6556e28 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix @@ -0,0 +1,14 @@ +{ cabal, regexBase, regexTdfa }: + +cabal.mkDerivation (self: { + pname = "regex-compat-tdfa"; + version = "0.95.1.2"; + sha256 = "0b7pp5xq4ybgji5shz5v1a91y6wwzila3vjiyq4nma0xj3njy802"; + buildDepends = [ regexBase regexTdfa ]; + meta = { + homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa"; + description = "Unicode Support version of Text.Regex, using regex-tdfa"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/rosezipper/default.nix b/pkgs/development/libraries/haskell/rosezipper/default.nix new file mode 100644 index 000000000000..3c25392e7c94 --- /dev/null +++ b/pkgs/development/libraries/haskell/rosezipper/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "rosezipper"; + version = "0.2"; + sha256 = "1g6ppa8cappdbq9923lsac504dfjh0ks64gbm6qbihrc34f4zavc"; + meta = { + description = "Generic zipper implementation for Data.Tree"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 4a89019906f9..6b8fc7eda284 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "1.0.3"; - sha256 = "15vzydywhwjdgybabvv6lfk1vjs7blvs3k2apwxjdjh2q7jmgkam"; + version = "1.0.6"; + sha256 = "0jdh618k66bhiwrxb9i2yckxz0w3cpc7q15ilz49lqjjpl86bndk"; buildDepends = [ cereal cryptoApi tagged ]; testDepends = [ cereal cryptoApi filepath hspec tagged ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index f2440ef250f9..52da653da3e3 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.4.0"; - sha256 = "08afaj4ln4nl7ymdixijzjx8hc7nnr70gz7avpzaanq5nrw0k054"; + version = "0.9.4.1"; + sha256 = "0yacbpd20y49jw1qkrm5r4qick0fhimgb07883bg1lp3ai4ysrk5"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator bytestringMmap caseInsensitive deepseq enumerator filepath hashable diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index c11dfe4f398f..7bf332811a99 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.9.3.3"; - sha256 = "1n50xyhg4rva7ifv70825177606q87ip7f9p5kf94i9kci0kmlig"; + version = "0.9.3.4"; + sha256 = "0i95gf7wpf0gyns4rnl1wp2f53cwfmjg0qb8jxpynwklvsm6zf88"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator MonadCatchIOTransformers mtl network diff --git a/pkgs/development/libraries/haskell/syz/default.nix b/pkgs/development/libraries/haskell/syz/default.nix new file mode 100644 index 000000000000..67e6bc58436a --- /dev/null +++ b/pkgs/development/libraries/haskell/syz/default.nix @@ -0,0 +1,14 @@ +{ cabal, syb }: + +cabal.mkDerivation (self: { + pname = "syz"; + version = "0.2.0.0"; + sha256 = "1m5395937yyxsa1bmlfn1dxa1jr15yjhlz9s15bpwapshcd8119y"; + buildDepends = [ syb ]; + meta = { + homepage = "http://www.cs.indiana.edu/~adamsmd/papers/scrap_your_zippers/"; + description = "Scrap Your Zippers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index b9f403bcc3d0..37030681e340 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.2"; - sha256 = "1shd4bl0wb67abs7vv3cagvpinkz2348fh7fdh3rq8l5g1jflp8q"; + version = "0.3"; + sha256 = "0sgc0529sqhj0b75a4mkdw0bkx56ynyl4msmi8hd20jvv5wnzyi6"; buildDepends = [ ansiTerminal mtl optparseApplicative regexPosix stm tagged ]; diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix index ebcd608eb6a6..43791413a7f9 100644 --- a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "test-framework-th-prime"; - version = "0.0.5"; - sha256 = "0lsxnbckh88cq38azml86szdcvx3rhs3is13ib4z0ryfqnv4hhpl"; + version = "0.0.6"; + sha256 = "11fk7sk644ky8f22imrfqk8yx07050vy9szha0pnkkjk9i3bqfcq"; buildDepends = [ cpphs haskellSrcExts testFramework ]; meta = { description = "Template Haskell for test framework"; diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix new file mode 100644 index 000000000000..1e372d8f5bae --- /dev/null +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -0,0 +1,22 @@ +{ cabal, attoparsec, deepseq, lens, QuickCheck +, random, text, time, transformers, vector +, vectorSpace +}: + +cabal.mkDerivation (self: { + pname = "thyme"; + version = "0.3.0.0"; + sha256 = "0nv8kp5ax0088z0d9y93xkv59v1i8wrrdprsj7bknk3yn0gd2gb3"; + buildDepends = [ + attoparsec deepseq lens QuickCheck random text time transformers + vector vectorSpace + ]; + # have some strange test depends + doCheck = false; + meta = { + homepage = "https://github.com/liyang/thyme"; + description = "A faster time library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 55b2582017c5..8c2a50255b1b 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -1,17 +1,16 @@ { cabal, certificate, cipherAes, cipherRc4, cryptohash -, cryptoPubkey, cryptoRandomApi, mtl, network, pem, text, time, tls -, vector +, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector }: cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.6.4"; - sha256 = "058ia1cabs7ribz287iqkkjvqpp2n7c219f3xc92fhm0qq00mh5n"; + version = "0.6.5"; + sha256 = "09b8wxg4k88gdzpbxhd2apf0x5y51zh2zbw2cvraffjnnfkgvzqc"; isLibrary = true; isExecutable = true; buildDepends = [ certificate cipherAes cipherRc4 cryptohash cryptoPubkey - cryptoRandomApi mtl network pem text time tls vector + cryptoRandom mtl network pem time tls vector ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 72e0976ceaff..569999149895 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,18 +1,17 @@ { cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey -, cryptoRandomApi, mtl, network, QuickCheck, testFramework +, cryptoRandom, mtl, network, QuickCheck, testFramework , testFrameworkQuickcheck2, time }: cabal.mkDerivation (self: { pname = "tls"; - version = "1.1.2"; - sha256 = "1vg1mnz6cxxgs48pbpjp4hwyvsysxyzvjfy4p1vd23lwc32cdjqg"; + version = "1.1.4"; + sha256 = "0fq6hnc3j54kkzlvcvhskjrj740p44y65fggnj3m4kgfiwjphw5p"; buildDepends = [ - cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl - network + cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network ]; testDepends = [ - cereal certificate cprngAes cryptoPubkey cryptoRandomApi mtl + cereal certificate cprngAes cryptoPubkey cryptoRandom mtl QuickCheck testFramework testFrameworkQuickcheck2 time ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index 2aa30d8823ec..65115ef9a98f 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -1,14 +1,16 @@ { cabal, binary, criterion, cryptohash, deepseq, HUnit, maccatcher -, mersenneRandomPure64, QuickCheck, random, time +, mersenneRandomPure64, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, time }: cabal.mkDerivation (self: { pname = "uuid"; - version = "1.2.13"; - sha256 = "0y9r71iqvabmvyrglw42g37skgisyknkv3pkfih2qfrfkk75zw0s"; + version = "1.2.14"; + sha256 = "13r2yzhb9nj1h6wfy7w9k59d27z9iza5r4apmf72zby2fi9vdnwy"; buildDepends = [ binary cryptohash maccatcher random time ]; testDepends = [ criterion deepseq HUnit mersenneRandomPure64 QuickCheck random + testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 6039e7424772..f73633b4f248 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vault"; - version = "0.2.0.4"; - sha256 = "1a63rarksp4waj64b9kv8q77wbhdnsnxahkixl1klp25hkp8aan3"; + version = "0.3.0.0"; + sha256 = "1lvv2sw5j48jbxniw55bxq88dhn46l7lk0blv2cnaf1vw6wms4m8"; buildDepends = [ hashable unorderedContainers ]; meta = { homepage = "https://github.com/HeinrichApfelmus/vault"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 74ec00c58fdd..ec0612ae1170 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,17 +1,19 @@ { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup -, cereal, cryptoConduit, cryptohash, fileEmbed, hspec, httpDate -, httpTypes, mimeTypes, network, systemFileio, systemFilepath, text -, time, transformers, unixCompat, wai, waiTest +, cereal, cryptoApi, cryptoConduit, cryptohashCryptoapi, fileEmbed +, hspec, httpDate, httpTypes, mimeTypes, network, systemFileio +, systemFilepath, text, time, transformers, unixCompat, wai +, waiTest }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.1.3"; - sha256 = "0h6m1an3srkvyaz50w16v2mhjyfdqbqq2d7ng3yhrrmb1fyvhas1"; + version = "1.3.1.4"; + sha256 = "1457643xkigqnacg1fw25jp9kjqiy55d22ll8fml07bxs37hlr63"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal - cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes - systemFileio systemFilepath text time transformers unixCompat wai + cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate + httpTypes mimeTypes systemFileio systemFilepath text time + transformers unixCompat wai ]; testDepends = [ hspec httpDate httpTypes mimeTypes network text time transformers diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 270ca004c491..917000364c35 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.4.3"; - sha256 = "19vj47awkazn6h4kf37f4sp4g8lhm125wjqnp1wa1wa8zlndp8wy"; + version = "1.3.4.4"; + sha256 = "0x7nm3vrp1jhcdvcspdpgpgm12rcafng81f9kq9c01z5270myg2f"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 9b3b1083bc00..425d5237a713 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.4.0.1"; - sha256 = "1d08mp7dpf8iw50yjysr5p7fc9jgdcwql943p9c11x35n2ks6z2n"; + version = "1.4.0.2"; + sha256 = "0mmnl2zn3jsa5yan58kf2d7cvc343cld0l8mydb9qnq4if2kq94q"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index 5655ed9d8a10..dd1404e02fd2 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp-tls"; - version = "1.4.1.3"; - sha256 = "0g26cw86kjg61agplqskhjb41ywcydyfzb46pjjc38g77xlcm2wx"; + version = "1.4.1.4"; + sha256 = "1w6i26r5xjjc594h53q07bad835ryg3k6vmbzf5d59xngfvm7b9k"; buildDepends = [ certificate conduit cprngAes cryptocipher cryptoRandomApi network networkConduit pem tls tlsExtra transformers wai warp diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 2134077e61ab..c96e7bfd7383 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.9.1"; - sha256 = "0s8jrgn9pxqkjvdbgvrxd0bnclkhn3hix2mff66hqpx8x4znh0zv"; + version = "1.3.9.2"; + sha256 = "0l4iq7dl7iv9sf0bj52g577x9i84miscfr27b2vm8g8n6306jr77"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpAttoparsec httpTypes liftedBase network networkConduit diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix index 66c1f645267a..80f092ce2fda 100644 --- a/pkgs/development/libraries/haskell/xmlhtml/default.nix +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmlhtml"; - version = "0.2.1"; - sha256 = "1nqkjbhpzr7zxpjvlxy6pync6zyarvjblcxg8igq75dyzk7qhafg"; + version = "0.2.3"; + sha256 = "0yg56rj8ylnaawqx3h54g0dlayql87h40anbp7lccnl70pzbk6c7"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers ]; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index d341434345bd..c4aba1ddfeb2 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,21 +1,21 @@ { cabal, base64Bytestring, cereal, conduit, cryptoConduit -, cryptohash, dataDefault, fileEmbed, hspec, httpTypes +, cryptohashCryptoapi, dataDefault, fileEmbed, hspec, httpTypes , shakespeareCss, systemFileio, systemFilepath, text, transformers , unixCompat, wai, waiAppStatic, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.0"; - sha256 = "18fkphk8qzshm5r0ivdvllmbmvl5q6m84zsf1g0fmridqz2xywjz"; + version = "1.2.0.1"; + sha256 = "1ij0j1m9j6l63rl4zdfik36a3sb3k0zpqjg85sgis6wdqr18gsi5"; buildDepends = [ - base64Bytestring cereal conduit cryptoConduit cryptohash + base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi dataDefault fileEmbed httpTypes shakespeareCss systemFileio systemFilepath text transformers unixCompat wai waiAppStatic yesodCore ]; testDepends = [ - base64Bytestring cereal conduit cryptoConduit cryptohash + base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi dataDefault fileEmbed hspec httpTypes shakespeareCss systemFileio systemFilepath text transformers unixCompat wai waiAppStatic yesodCore |