From c664157e7d64a9c2e5c5009f54f4fa9a71d25637 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 May 2012 10:23:20 +0000 Subject: Updated Haskell packages. - attoparsec: updated to version 0.10.2.0 - blaze-html: dropped obsolete version 0.4.3.4 - cairo: updated to version 0.12.3.1 - cryptocipher: updated to version 0.3.4 - file-embed: updated to version 0.0.4.4 - glib: updated to version 0.12.3.1 - gtk2hs-buildtools: updated to version 0.12.3.1 - gtksourceview2: updated to version 0.12.3.1 - hakyll: updated to version 3.3.0.0 - happstack-server: updated to version 7.0.2 - hjsmin: updated to version 0.1.2 - http-conduit: updated to version 1.4.1.7 - http-types: updated to version 0.6.11 - language-c-quote: updated to version 0.3.1.2 - parallel: added version 3.2.0.3 - regex-pcre: updated to version 0.94.3 - regex-posix: added version 0.95.2 - shakespeare-js: updated to version 1.0.0.3 - svgcairo: updated to version 0.12.1.1 - text: added version 0.11.2.1 - vty: updated to version 4.7.0.14 - warp: updated to version 1.2.1.1 - yaml: updated to version 0.7.0.2 - yesod-static: updated to version 1.0.0.3 svn path=/nixpkgs/trunk/; revision=34255 --- .../libraries/haskell/attoparsec/default.nix | 4 ++-- .../libraries/haskell/blaze-html/0.4.3.4.nix | 15 --------------- .../libraries/haskell/blaze-html/0.5.0.0.nix | 15 --------------- .../libraries/haskell/blaze-html/default.nix | 15 +++++++++++++++ .../libraries/haskell/cabal-macosx/default.nix | 1 + pkgs/development/libraries/haskell/cairo/default.nix | 4 ++-- .../libraries/haskell/cryptocipher/default.nix | 4 ++-- .../libraries/haskell/executable-path/default.nix | 1 + .../libraries/haskell/file-embed/default.nix | 4 ++-- pkgs/development/libraries/haskell/glib/default.nix | 4 ++-- .../libraries/haskell/gtk2hs-buildtools/0.12.1.nix | 18 ------------------ .../libraries/haskell/gtk2hs-buildtools/0.12.3.nix | 18 ------------------ .../libraries/haskell/gtk2hs-buildtools/default.nix | 18 ++++++++++++++++++ .../libraries/haskell/gtksourceview2/default.nix | 4 ++-- pkgs/development/libraries/haskell/hakyll/default.nix | 15 ++++++++------- .../libraries/haskell/happstack/happstack-server.nix | 4 ++-- pkgs/development/libraries/haskell/hjsmin/default.nix | 4 ++-- .../libraries/haskell/http-conduit/default.nix | 18 +++++++++--------- .../libraries/haskell/http-types/default.nix | 4 ++-- .../libraries/haskell/language-c-quote/default.nix | 4 ++-- .../libraries/haskell/parallel/3.2.0.3.nix | 14 ++++++++++++++ .../libraries/haskell/regex-pcre/default.nix | 7 +++++-- .../libraries/haskell/regex-posix/0.95.2.nix | 15 +++++++++++++++ .../libraries/haskell/shakespeare-js/default.nix | 4 ++-- .../libraries/haskell/svgcairo/default.nix | 4 ++-- pkgs/development/libraries/haskell/text/0.11.2.1.nix | 15 +++++++++++++++ pkgs/development/libraries/haskell/vty/default.nix | 4 ++-- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- .../libraries/haskell/yesod-static/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 19 ++++++++++--------- 31 files changed, 143 insertions(+), 125 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/blaze-html/0.4.3.4.nix delete mode 100644 pkgs/development/libraries/haskell/blaze-html/0.5.0.0.nix create mode 100644 pkgs/development/libraries/haskell/blaze-html/default.nix delete mode 100644 pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix delete mode 100644 pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix create mode 100644 pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix create mode 100644 pkgs/development/libraries/haskell/parallel/3.2.0.3.nix create mode 100644 pkgs/development/libraries/haskell/regex-posix/0.95.2.nix create mode 100644 pkgs/development/libraries/haskell/text/0.11.2.1.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index bc05f92b561f..6f923605b678 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.10.1.1"; - sha256 = "07zl85nkimpswlb4rxycisaphhyrlq4la2limxxi7sk21gyh88b0"; + version = "0.10.2.0"; + sha256 = "0hvkx63knhxdc06lkv2avz2dblbvn0hhvckfqyr22ls1qrpgz71c"; buildDepends = [ deepseq text ]; meta = { homepage = "https://github.com/bos/attoparsec"; diff --git a/pkgs/development/libraries/haskell/blaze-html/0.4.3.4.nix b/pkgs/development/libraries/haskell/blaze-html/0.4.3.4.nix deleted file mode 100644 index e3ec5167f367..000000000000 --- a/pkgs/development/libraries/haskell/blaze-html/0.4.3.4.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, blazeBuilder, text }: - -cabal.mkDerivation (self: { - pname = "blaze-html"; - version = "0.4.3.4"; - sha256 = "1xd8l28rriczd5zxgmjif393kjzqibrp68pfah0kknrjmc3ybn20"; - buildDepends = [ blazeBuilder text ]; - meta = { - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast HTML combinator library for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/blaze-html/0.5.0.0.nix b/pkgs/development/libraries/haskell/blaze-html/0.5.0.0.nix deleted file mode 100644 index c8b2eb06a321..000000000000 --- a/pkgs/development/libraries/haskell/blaze-html/0.5.0.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, blazeBuilder, blazeMarkup, text }: - -cabal.mkDerivation (self: { - pname = "blaze-html"; - version = "0.5.0.0"; - sha256 = "0cfvdf50jbm6w277jf69ac57nbkgkn2ifcp6r2amd3qdbmdgqkwj"; - buildDepends = [ blazeBuilder blazeMarkup text ]; - meta = { - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast HTML combinator library for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix new file mode 100644 index 000000000000..c8b2eb06a321 --- /dev/null +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -0,0 +1,15 @@ +{ cabal, blazeBuilder, blazeMarkup, text }: + +cabal.mkDerivation (self: { + pname = "blaze-html"; + version = "0.5.0.0"; + sha256 = "0cfvdf50jbm6w277jf69ac57nbkgkn2ifcp6r2amd3qdbmdgqkwj"; + buildDepends = [ blazeBuilder blazeMarkup text ]; + meta = { + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix index 45ca5b533a74..0f651e1eaae3 100644 --- a/pkgs/development/libraries/haskell/cabal-macosx/default.nix +++ b/pkgs/development/libraries/haskell/cabal-macosx/default.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "Cabal support for creating Mac OSX application bundles"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 46180b9a8276..183e0815f715 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cairo"; - version = "0.12.3"; - sha256 = "0kgy6907vs41ws51dwqv6lwvfnvmgd1mns12cxzsifmli1jglswd"; + version = "0.12.3.1"; + sha256 = "173pql0n51a9z46vzpwd9q67nblhb61qirynjra9vzydiy79bfwi"; buildDepends = [ mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 767891bf18ac..2864b0f74046 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.3.2"; - sha256 = "0nw7rwlnakdslzg4z6ik9hfylwnrbn103n677w0xr5b81wj19a5j"; + version = "0.3.4"; + sha256 = "12ndzvb9sa37yn118f9ixm3qka36x6whvmxc5wax97rfm7y49p6r"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/executable-path/default.nix b/pkgs/development/libraries/haskell/executable-path/default.nix index 839ea6bc112d..5c69969c20d2 100644 --- a/pkgs/development/libraries/haskell/executable-path/default.nix +++ b/pkgs/development/libraries/haskell/executable-path/default.nix @@ -10,5 +10,6 @@ cabal.mkDerivation (self: { description = "Finding out the full path of the executable"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index dbff3aa803a2..1ca06b356ecf 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "file-embed"; - version = "0.0.4.3"; - sha256 = "0iagibsab18czvam36si88swzf5sijm4phwy4za6gnn4z71nb9s6"; + version = "0.0.4.4"; + sha256 = "1czwa5vpafhvif4gv7bwa7hrxkrbrvvybgyjckd0hdpl6bpd4nhp"; meta = { homepage = "https://github.com/snoyberg/file-embed"; description = "Use Template Haskell to embed file contents directly"; diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 4183ac45f70e..86ce395f1ff2 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "glib"; - version = "0.12.3"; - sha256 = "1hv7wnxsjzlr2bchl8ir967iv9qjzlv9lnlyvrilagzafr7nximb"; + version = "0.12.3.1"; + sha256 = "1k5s1d05kv0amvkjr644pqvicvmcgr5fffsz0xyljbj5jk4iv0py"; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ glib ]; diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix deleted file mode 100644 index 782e3fc9444c..000000000000 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, alex, filepath, happy, random }: - -cabal.mkDerivation (self: { - pname = "gtk2hs-buildtools"; - version = "0.12.1"; - sha256 = "003d48q8q6ji4axa69bh0sp95fic19cgw3hwigsjbl46qgh6n9gl"; - isLibrary = false; - isExecutable = true; - buildDepends = [ filepath random ]; - buildTools = [ alex happy ]; - meta = { - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Tools to build the Gtk2Hs suite of User Interface libraries"; - license = self.stdenv.lib.licenses.gpl2; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix deleted file mode 100644 index a9b5efe58779..000000000000 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, alex, filepath, happy, random }: - -cabal.mkDerivation (self: { - pname = "gtk2hs-buildtools"; - version = "0.12.3"; - sha256 = "1129p2b0hvmin7zpq43ik670v2c63jv704bnmnh3cr0bw06qrrbi"; - isLibrary = false; - isExecutable = true; - buildDepends = [ filepath random ]; - buildTools = [ alex happy ]; - meta = { - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Tools to build the Gtk2Hs suite of User Interface libraries"; - license = self.stdenv.lib.licenses.gpl2; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix new file mode 100644 index 000000000000..aea067af9047 --- /dev/null +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -0,0 +1,18 @@ +{ cabal, alex, filepath, happy, random }: + +cabal.mkDerivation (self: { + pname = "gtk2hs-buildtools"; + version = "0.12.3.1"; + sha256 = "0a5lay1zy1pi6inaqjvhn8v0by2z5dpy3dssqsxwbq2hkfxizzy6"; + isLibrary = false; + isExecutable = true; + buildDepends = [ filepath random ]; + buildTools = [ alex happy ]; + meta = { + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Tools to build the Gtk2Hs suite of User Interface libraries"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index 353ae9e441db..756e1a1df978 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtksourceview2"; - version = "0.12.3"; - sha256 = "0bhwvhwsg3mf4w94fl6z6qkn67i68hh3zwwhzqa59lia0nc233gd"; + version = "0.12.3.1"; + sha256 = "1c91ja753dzr2c7sv13wn47sjbjg45jv8xx9ybx1q3188xrldqng"; buildDepends = [ glib gtk mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 04375877bca2..a3291ac4cec1 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,15 +1,16 @@ -{ cabal, binary, blazeHtml, citeprocHs, cryptohash, filepath -, hamlet, mtl, pandoc, parsec, regexBase, regexTdfa, snapCore -, snapServer, tagsoup, time +{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cryptohash +, filepath, hamlet, mtl, pandoc, parsec, regexBase, regexTdfa +, snapCore, snapServer, tagsoup, text, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.7.2"; - sha256 = "1l37w3q2jhcxjkq3h0nh8hl21vscgvsj6jkkd2hni62kfzfrgqhw"; + version = "3.3.0.0"; + sha256 = "0ljfdmmqigdzg8vaj502vrsz4i6ynaw3vhc9ys24m9xcqdmyha4h"; buildDepends = [ - binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc - parsec regexBase regexTdfa snapCore snapServer tagsoup time + binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet + mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup + text time ]; meta = { homepage = "http://jaspervdj.be/hakyll"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 6ccf6d77a0c9..97cfd0173b9b 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.0.1"; - sha256 = "0sjcfxcpv9sssk5fr5np57b10rajcid7x582s5ialf3yc9n1fshj"; + version = "7.0.2"; + sha256 = "0p4vy1h3nkq7riipizljc9wz64y3jfiyq5vzv1r963badk3q0xzb"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index a61d798f429a..6d749feea3a0 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.1"; - sha256 = "0v28z5l5fraf09b65j0fm75b702xp1s4ar8p5g9kigfn1wh8b62k"; + version = "0.1.2"; + sha256 = "04yk383504blg8x10x5j1fd5mzyybqkhz7jfsyimvz2wz2v86qsb"; buildDepends = [ blazeBuilder languageJavascript text ]; meta = { homepage = "http://github.com/alanz/hjsmin"; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index c431118ed766..ffe5de07db3f 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,21 +1,21 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate -, conduit, cookie, cprngAes, dataDefault, failure, httpTypes -, liftedBase, monadControl, mtl, network, regexCompat, resourcet -, socks, text, time, tls, tlsExtra, transformers, transformersBase -, utf8String, void, zlibConduit +, conduit, cookie, cprngAes, dataDefault, deepseq, failure +, httpTypes, liftedBase, monadControl, mtl, network, regexCompat +, resourcet, socks, text, time, tls, tlsExtra, transformers +, transformersBase, utf8String, void, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.4.1.3"; - sha256 = "15mpha91dfpzy6bz2577jk0866nmyj17rjwnjz3x7zh3x0i06534"; + version = "1.4.1.7"; + sha256 = "0b3iz03y3s30wyj5j0r8s070qwwzjbk4cs7znag5yjxqgph1h22f"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie - cprngAes dataDefault failure httpTypes liftedBase monadControl mtl - network regexCompat resourcet socks text time tls tlsExtra - transformers transformersBase utf8String void zlibConduit + cprngAes dataDefault deepseq failure httpTypes liftedBase + monadControl mtl network regexCompat resourcet socks text time tls + tlsExtra transformers transformersBase utf8String void zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 83cb547896fb..b3ae70bbb368 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.6.10"; - sha256 = "0py6l6hk14vrpqwrrajvsiasfksqsklk75sij4zx4xws01jwh9xd"; + version = "0.6.11"; + sha256 = "1waxhicqwp0nmvmpmfadpq9gdldbcx9wh6jz717ghi6y9l485vhf"; buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 24cfe6cafb31..b4986af4a019 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.3.1.0"; - sha256 = "0y3zfc43izvalm1lrbk286nmg4s3vgpj5v2j6j2saz3c7l2ly8z6"; + version = "0.3.1.2"; + sha256 = "0lqr9z2akx90l07k1qbv3y4wwwlcilj08zva4v9scbqydrwpqxip"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix new file mode 100644 index 000000000000..e089c8dce8ea --- /dev/null +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "parallel"; + version = "3.2.0.3"; + sha256 = "1kbdzdz9s8jq0xysqgvxx1zvzqlxgj1sk476mciwcn327kpl0fhn"; + buildDepends = [ deepseq ]; + meta = { + description = "Parallel programming library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix index 48785e97a2f6..39cb888748c9 100644 --- a/pkgs/development/libraries/haskell/regex-pcre/default.nix +++ b/pkgs/development/libraries/haskell/regex-pcre/default.nix @@ -2,10 +2,13 @@ cabal.mkDerivation (self: { pname = "regex-pcre"; - version = "0.94.2"; - sha256 = "0p4az8z4jlrcmmyz9bjf7n90hpg6n242vq4255w2dz5v29l822wn"; + version = "0.94.3"; + sha256 = "0ljng60s05ssy8pi4qnpcx5c1wrn6m35d77lq0xyafmj68cg4a2r"; buildDepends = [ regexBase ]; extraLibraries = [ pcre ]; + patchPhase = '' + sed -i -e '/Include-Dirs:/d' -e '/Extra-Lib-Dirs:/d' regex-pcre.cabal + ''; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix new file mode 100644 index 000000000000..6d7fac51658e --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix @@ -0,0 +1,15 @@ +{ cabal, regexBase }: + +cabal.mkDerivation (self: { + pname = "regex-posix"; + version = "0.95.2"; + sha256 = "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an"; + buildDepends = [ regexBase ]; + meta = { + homepage = "http://sourceforge.net/projects/lazy-regex"; + description = "Replaces/Enhances Text.Regex"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 1b8605bb8021..aa759a240c7c 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.0.0.2"; - sha256 = "1qygxihhfl7wzv3djxmldh82pwk8rhnk54zfvwy1pxhxb8y30wkm"; + version = "1.0.0.3"; + sha256 = "00x5xvjlaivl42q75cvbwbh055kgvk9i8s4y3xcmk4h7lnpfyzd6"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix index 6bacea99b593..e7aafd37264e 100644 --- a/pkgs/development/libraries/haskell/svgcairo/default.nix +++ b/pkgs/development/libraries/haskell/svgcairo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "svgcairo"; - version = "0.12.1"; - sha256 = "1nyr849ayk1fyjpxnpam1pychny609d6j2v3is84llh3gsyq99ps"; + version = "0.12.1.1"; + sha256 = "0fl9flsv4brvwryzxv4xpy8x3w0if4psx8nypxm2ix6l9qh3pghb"; buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc ]; diff --git a/pkgs/development/libraries/haskell/text/0.11.2.1.nix b/pkgs/development/libraries/haskell/text/0.11.2.1.nix new file mode 100644 index 000000000000..b34c1349ff76 --- /dev/null +++ b/pkgs/development/libraries/haskell/text/0.11.2.1.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "text"; + version = "0.11.2.1"; + sha256 = "0ajh2xhf8khh5vi4crdjgcs7w27dga7hlwzi8ia5xjs3hzgvbjb9"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/bos/text"; + description = "An efficient packed Unicode text type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 6cd63e8a8733..684fbd2eed0d 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.12"; - sha256 = "0mmx8rhj6k8c56qhaz7ay2yf9x61h27zxs14mrkw2y4qag6d4bii"; + version = "4.7.0.14"; + sha256 = "0wgn2jbr7lih9znkpa09nvb4qjd0801c0r4mwwrw4pd9n9mkjqn9"; buildDepends = [ deepseq mtl parallel parsec terminfo utf8String vector ]; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 18633f4cc1b1..9b2f80e8e534 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.2.1"; - sha256 = "0yjvd9dc0rwczj3041s55lhfn46zhymgibrawl84ssxky68syhx4"; + version = "1.2.1.1"; + sha256 = "1bgdvqa6c2ccxmgdsg5hjvc3mss8zgjj4xzqr5r5jdl338857xzg"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes liftedBase network networkConduit simpleSendfile transformers diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index a495ba4df3ce..8bc76c1baa7a 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.7.0"; - sha256 = "10l5isiidmjn818zm05ac65yaidrkq0qcb1bcpwnvi0fgjr308n5"; + version = "0.7.0.2"; + sha256 = "0hhxvw3zzra8vkbm9914nq03wpy5x5mg6sipwajqz0hv3j5hlsf3"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index c37287cd241d..72a1fed8db95 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.0.0.2"; - sha256 = "12r3i4s1g9wlf5jmbvqw9qzcgw96zdlky6zisdipy40yzpg6m07v"; + version = "1.0.0.3"; + sha256 = "1nl7cf8yw5akldlrkamnkbypwnj7g1pjkx7nkmlc38jbx58izf5d"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes text transformers unixCompat wai waiAppStatic yesodCore diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5dd355994685..141768b91a7c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -434,9 +434,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {}; - blazeHtml_0_4_3_4 = callPackage ../development/libraries/haskell/blaze-html/0.4.3.4.nix {}; - blazeHtml_0_5_0_0 = callPackage ../development/libraries/haskell/blaze-html/0.5.0.0.nix {}; - blazeHtml = self.blazeHtml_0_4_3_4; + blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; blazeMarkup = callPackage ../development/libraries/haskell/blaze-markup {}; @@ -725,9 +723,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libc = pkgs.stdenv.gcc.libc; }; - gtk2hsBuildtools_0_12_1 = callPackage ../development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix {}; - gtk2hsBuildtools_0_12_3 = callPackage ../development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix {}; - gtk2hsBuildtools = self.gtk2hsBuildtools_0_12_1; + gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; gtk2hsC2hs = self.gtk2hsBuildtools; gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 { @@ -1074,7 +1070,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {}; parallel_3_1_0_1 = callPackage ../development/libraries/haskell/parallel/3.1.0.1.nix {}; parallel_3_2_0_2 = callPackage ../development/libraries/haskell/parallel/3.2.0.2.nix {}; - parallel = self.parallel_3_2_0_2; + parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {}; + parallel = self.parallel_3_2_0_3; parseargs = callPackage ../development/libraries/haskell/parseargs {}; @@ -1189,7 +1186,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix { regexBase = self.regexBase_0_93_2; }; - regexPosix = self.regexPosix_0_95_1; + regexPosix_0_95_2 = callPackage ../development/libraries/haskell/regex-posix/0.95.2.nix { + regexBase = self.regexBase_0_93_2; + }; + regexPosix = self.regexPosix_0_95_2; regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {}; regexTdfa = self.regexTDFA; @@ -1358,7 +1358,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {}; text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; - text = self.text_0_11_2_0; + text_0_11_2_1 = callPackage ../development/libraries/haskell/text/0.11.2.1.nix {}; + text = self.text_0_11_2_1; thespian = callPackage ../development/libraries/haskell/thespian {}; -- cgit v1.2.3