diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix index 963448a56e7..3e65c0a2dd4 100644 --- a/pkgs/development/libraries/haskell/boomerang/default.nix +++ b/pkgs/development/libraries/haskell/boomerang/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "boomerang"; - version = "1.3.3"; - sha256 = "1i44j3qyjkq69h65wfsrps5zp097i3nh9fwcb2f1spr8nznb5mff"; + version = "1.4.0"; + sha256 = "1z6sx2r886jms59ah31is0fqkwix2kwxmpnrc6bb2r6xazznxfc9"; buildDepends = [ mtl text ]; meta = { description = "Library for invertible parsing and printing"; diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix index 464e8dbb5e7..fc76f85cebc 100644 --- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix +++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cereal-conduit"; - version = "0.7"; - sha256 = "0cf0lp47qiilrdrzmn58hwh3q7fh7g55f2a1r1bw31xapp1cvbix"; + version = "0.7.1"; + sha256 = "0ry6vc3nkb1lj0p103b8pyd3472hx62s3c7yw3fk8mbjlygxyv43"; buildDepends = [ cereal conduit transformers ]; testDepends = [ cereal conduit HUnit mtl resourcet transformers ]; meta = { diff --git a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix index af8114c6d02..535a4b97fca 100644 --- a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix +++ b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cipher-blowfish"; - version = "0.0.1"; - sha256 = "0bz8jd65idcalyzcbmgz16hr6y5mnw7mckk5yvrm9k19cr6mwq52"; + version = "0.0.2"; + sha256 = "08jc1qsvnyk7zm7bp0nibkc6lx3bkid79cn1r6fidmccf716r3sp"; buildDepends = [ byteable cryptoCipherTypes securemem vector ]; testDepends = [ byteable cryptoCipherTests cryptoCipherTypes QuickCheck diff --git a/pkgs/development/libraries/haskell/cipher-des/default.nix b/pkgs/development/libraries/haskell/cipher-des/default.nix index 588a28f3a25..0340372d54b 100644 --- a/pkgs/development/libraries/haskell/cipher-des/default.nix +++ b/pkgs/development/libraries/haskell/cipher-des/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cipher-des"; - version = "0.0.3"; - sha256 = "1gcpwfxrlgwl34yy7k3vhpmcrmyiirbmz40zssk2lv6cfrylc4z7"; + version = "0.0.4"; + sha256 = "18xpc7v0xyh0qb7p03ail1lyh376h1vg000xn22b5shpgp5kxiqq"; buildDepends = [ byteable cryptoCipherTypes securemem ]; testDepends = [ byteable cryptoCipherTests cryptoCipherTypes QuickCheck diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index 2c68fd24d1f..573c5085b10 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec syb time utf8String ]; + jailbreak = true; meta = { homepage = "http://gorgias.mine.nu/repos/citeproc-hs/"; description = "A Citation Style Language implementation in Haskell"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 8c550065deb..0e1757f7b50 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.7.3"; - sha256 = "0ih3ymv5m3c66wr9xydc1dxgpvh5b92dyyc7v67li6n3w7dzi6fp"; + version = "1.0.7.4"; + sha256 = "1bvi9gw9sfi1fml339rn3cfq4i3yd9j9vw41p5cpz5pnv3gw225x"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index fb6d2ff456b..9425ec37547 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cprng-aes"; - version = "0.5.1"; - sha256 = "1bw76y2krcshimvwzph76d69bdfaxfi21w4dxfslmqm78knlls47"; + version = "0.5.2"; + sha256 = "1nf8dd83ywriq2ynv48f2s5lvc9s3srq4j5vbspmf0kc74kmq2pf"; buildDepends = [ byteable cipherAes cryptoRandom random ]; meta = { homepage = "http://github.com/vincenthz/hs-cprng-aes"; diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index eba1b906d5b..68deb8e3472 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "crypto-numbers"; - version = "0.2.0"; - sha256 = "1s4q9qqb7qb0shaxmhhxixsnhgwn2h6nxxblkfqqqvkdiwis278j"; + version = "0.2.1"; + sha256 = "1bc24xk101x7npv083gzh3vjzwjh65ql85h4z0vxk3lnd0pmdmnq"; buildDepends = [ cryptoRandom vector ]; testDepends = [ byteable cryptoRandom HUnit QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/crypto-random/default.nix b/pkgs/development/libraries/haskell/crypto-random/default.nix index 583e9e5805b..1b5e2aa3238 100644 --- a/pkgs/development/libraries/haskell/crypto-random/default.nix +++ b/pkgs/development/libraries/haskell/crypto-random/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-random"; - version = "0.0.5"; - sha256 = "1wvbbqqfqaylq9w8pyiz243d06ivh982mhb2ci5yhjl06vqv2gk3"; + version = "0.0.7"; + sha256 = "1dj63y85l3f1x7fw8j7hykz56ajd38iikl3f8ygaz8r95pd1zjxw"; buildDepends = [ securemem vector ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-random"; diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index 7fe2fdcba9f..0873e65d9da 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.12"; - sha256 = "17agsdarxm22z4g911layb5g11gg8r1p2ar86pg1ch1q0jnhfqxr"; + version = "2.5.13"; + sha256 = "0lmwj66s4krh29qqmkyc3cn3j4b4mhyqvlngvmy1xaigmgib5aci"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index e2dc195b196..460154c70f0 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; + jailbreak = true; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; diff --git a/pkgs/development/libraries/haskell/gnutls/default.nix b/pkgs/development/libraries/haskell/gnutls/default.nix index 72f98677ce6..8e77a0626ce 100644 --- a/pkgs/development/libraries/haskell/gnutls/default.nix +++ b/pkgs/development/libraries/haskell/gnutls/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gnutls"; - version = "0.1.4"; - sha256 = "0xgjp274m4z005z77lhmh7blg6rw9g28jm0sd376rr49hykbxwd1"; + version = "0.1.5"; + sha256 = "1sf6b4g0jwk1jrzjq4vwwak57lzm1zc43ggysp973q5icm6gs8wp"; buildDepends = [ monadsTf transformers ]; extraLibraries = [ gnutls ]; pkgconfigDepends = [ gnutls ]; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index c5d0b335531..c29672767a6 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.7.1"; - sha256 = "1kcjzvslxis8qapy7g1cqkqqamrnkyammy33pan7ckzv5fd59q5p"; + version = "1.1.7.2"; + sha256 = "1pfpygbabfmgx01vjkxhf3p9map2v7x8jys06jd6qgc4j90dnk1c"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 22ad08afe38..9def726fb69 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.12.0"; - sha256 = "0fdqvippsxljylchfcr32lw367i17cpv4yavjvmhfd923vgmmfj9"; + version = "0.13.0"; + sha256 = "1f406i7jdz45s88n0nrd76vj927a0fx02nf1f98r4in0ic5anp11"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index ff6c0f204d7..d409501d706 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.1"; - sha256 = "08g327jnv7alamabxafhsv7ssisgymgsf91khr73zja5x8idfkxc"; + version = "1.7.2"; + sha256 = "03ksxx7w61iw3hf055mjb47bjh8srwxpqxs5bxqdqrilfd1cixmj"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 0c9783c9a9c..6d9caf6e6b6 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.1"; - sha256 = "0fc8phc36876f8qydc5iwz3i7nri0n6b4dlxv0w4rcxgv9hp7ls0"; + version = "1.7.2"; + sha256 = "0f0l5kzkpn957v7ibaxz9bxmjmbjaw50z2xs23g2w06zwnxii90h"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index c44e489519c..a4f458f8395 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit +{ cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit , dataDefault, hspec, httpConduit, httpTypes, liftedBase , monadControl, network, networkConduit, text, transformers, wai , waiLogger, warp, word8 @@ -6,10 +6,10 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.2.1"; - sha256 = "1f1087igr4kisb3z3lxznb85sfhzr2s08am1za3jg8cgffmrais8"; + version = "0.2.1.1"; + sha256 = "12hfbl8239ivrqvd5pi1avlcb381q861958qwyf20jc5jpwvjjgj"; buildDepends = [ - blazeBuilder caseInsensitive classyPrelude conduit dataDefault + basicPrelude blazeBuilder caseInsensitive conduit dataDefault httpConduit httpTypes liftedBase monadControl network networkConduit text wai waiLogger warp word8 ]; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 8bc221f1493..20541aa4a2f 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "3.9.0.2"; - sha256 = "0ch38z33zgdyzjmc7jqwabwq68iidicpzhbwzpd4fvcqdp27apl2"; + version = "3.9.1"; + sha256 = "141v7b5ag6jxnim1hdyxqi5m2sm1j5fpspkcs8qnznfcd33gyfja"; buildDepends = [ bifunctors comonad comonadsFd comonadTransformers contravariant distributive filepath genericDeriving hashable @@ -26,9 +26,6 @@ cabal.mkDerivation (self: { transformers unorderedContainers vector ]; doCheck = false; - patchPhase = '' - sed -i -e 's|generic-deriving.*,|generic-deriving,|' lens.cabal - ''; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index d4f49791d30..63874d39fb8 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb }: +{ cabal, aeson, syb }: cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.10"; - sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6"; - buildDepends = [ syb ]; + version = "1.12"; + sha256 = "1dn5zl6r1vvnqcsdxdd5cv0n44rbffg3sm2jxpvcv9846wpaj8qj"; + buildDepends = [ aeson syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index fa60370f1f5..f4c9214b0b6 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -1,19 +1,19 @@ -{ cabal, base64Bytestring, base64Conduit, classyPrelude, conduit +{ cabal, base64Bytestring, base64Conduit, basicPrelude, conduit , hspec, mtl, QuickCheck, resourcet, systemFileio, systemFilepath , text, transformers }: cabal.mkDerivation (self: { pname = "project-template"; - version = "0.1.3"; - sha256 = "1nsc4i3s9a7d0nysswhylvnr79z0ax9biiwr7b6jn7jzx0f2bdmm"; + version = "0.1.3.2"; + sha256 = "076xq5hwi7bfn3cmx8zd19vnj6lj2p7qm2waam94qqw2m466xq50"; buildDepends = [ - base64Bytestring base64Conduit classyPrelude conduit mtl resourcet + base64Bytestring base64Conduit basicPrelude conduit mtl resourcet systemFileio systemFilepath text transformers ]; testDepends = [ - base64Bytestring classyPrelude conduit hspec QuickCheck - transformers + base64Bytestring basicPrelude conduit hspec QuickCheck + systemFilepath text transformers ]; meta = { homepage = "https://github.com/fpco/haskell-ide"; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 3887abad71c..b0953cf9f7c 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.7.2"; - sha256 = "0gchdip4srilgqwxdzlamplwqsyrn4df0m72i8pjqpk7zwn96q1w"; + version = "0.4.8"; + sha256 = "10pp4hm5c2k2fqzqpagy03gmr526ac2ji8h7k0mcypf4v0ga620m"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index df12c935d71..f24d60612d6 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.6.2"; - sha256 = "1w29k0k5124vygydavb6a5szrv5a6n9qqhf1f27bkk86br55vnw6"; + version = "1.0.6.3"; + sha256 = "1zwvrdb8kgknp2ri3ws6m0jg41d8kdprvjdimwxh98san7vmk744"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index 667edcdce1c..b7710d7c3d5 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-i18n"; - version = "1.0.0.3"; - sha256 = "0k5daz6ayc4d6zxsq7p27bp5fq4qr31qxw9z9mwb5xcz2404d00r"; + version = "1.0.0.4"; + sha256 = "1ia73rq9kva2v4vxcyc2nzbvvkrbwrx48gjhnljx39szx1klyk3l"; buildDepends = [ parsec shakespeare text ]; testDepends = [ hspec text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 917ea0c6cad..6aa34026ce8 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.1.4.1"; - sha256 = "1mvsdbc3c6vgdpdb4m8b2d28vrh79v64vb9wkpnvhfg0jn7kb5c0"; + version = "1.2.0"; + sha256 = "1g37m7shqxfv7i2dk5qhvxldfzh1xipd91vcyqhks1jwa5byarzj"; buildDepends = [ aeson shakespeare text ]; testDepends = [ aeson hspec HUnit shakespeare text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index e2ff7ff27e1..d05e2247710 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.0.6"; - sha256 = "1qlf51rpyzgnxdhyfs6g3vh8zq5vyq263qhm577w7rc9s4hjxk45"; + version = "1.0.0.7"; + sha256 = "0vl8884a0x927svvkza5xzjn4g1rip8dak1zh9wkm4d0q7lhv2px"; buildDepends = [ shakespeare text ]; testDepends = [ hspec HUnit text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 4864adfe83a..231470dca5a 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.5.1"; - sha256 = "1qsg23jqv6lzwqk42yapqydx3fn6crkrzim8wr7ds55z6iblxbq6"; + version = "1.2.0"; + sha256 = "0lzzdkry3sm5i5hhdygsikpnaps66k1sfdxi2mp0ly5aqi1n1blz"; buildDepends = [ parsec systemFileio systemFilepath text time ]; testDepends = [ hspec parsec systemFileio systemFilepath text time diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 11ef315a523..b93adda166c 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.12.1"; - sha256 = "0mmmai257r3ssmy58v4c3hds0i0hwrww6r495j8yb2r90b31b1gg"; + version = "0.13.0"; + sha256 = "03m6fi8dbc69i6mafyq2xxdmqp1zm0akfilahvjd7cknf4qhdyq7"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix new file mode 100644 index 00000000000..b8a65e41fd8 --- /dev/null +++ b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "system-posix-redirect"; + version = "1.1"; + sha256 = "08l8n671ypmharmkm9s8wv5ipcznn7hv5zadf96liml3v16d8fcr"; + meta = { + description = "A toy module that allows you to temporarily redirect a program's stdout"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index 3258267f012..5dc83178be0 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagsoup"; - version = "0.12.8"; - sha256 = "05cm9h80qmxvk7xhlgly9zcmpbsajagspaa8p6k4ddch6q9lj7m3"; + version = "0.13"; + sha256 = "1pfkcfrmhzxplfkdzb0zj24dfsddw91plqp3mg2gqkv82y8blzk1"; isLibrary = true; isExecutable = true; buildDepends = [ text ]; diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index 1e372d8f5ba..7d79881127d 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -1,5 +1,5 @@ -{ cabal, attoparsec, deepseq, lens, QuickCheck -, random, text, time, transformers, vector +{ cabal, attoparsec, Cabal, deepseq, filepath, lens, QuickCheck +, random, systemPosixRedirect, text, time, transformers, vector , vectorSpace }: @@ -11,8 +11,10 @@ cabal.mkDerivation (self: { attoparsec deepseq lens QuickCheck random text time transformers vector vectorSpace ]; - # have some strange test depends - doCheck = false; + testDepends = [ + attoparsec Cabal filepath lens QuickCheck random + systemPosixRedirect text time vectorSpace + ]; meta = { homepage = "https://github.com/liyang/thyme"; description = "A faster time library"; diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 56999914989..0f354d8b77e 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "1.1.4"; - sha256 = "0fq6hnc3j54kkzlvcvhskjrj740p44y65fggnj3m4kgfiwjphw5p"; + version = "1.1.5"; + sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c"; buildDepends = [ cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network ]; diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.1.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.2.nix similarity index 87% rename from pkgs/development/libraries/haskell/unordered-containers/0.2.3.1.nix rename to pkgs/development/libraries/haskell/unordered-containers/0.2.3.2.nix index af4f93c7457..669f45d83f2 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.1.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.2.3.1"; - sha256 = "10wz5y42r9b2ym7vl5sqrcawyjixmhy370h0kzpvczs8mlzvrlx8"; + version = "0.2.3.2"; + sha256 = "0fgfb2zqa2zi2hb9nkj92nwnxr54wkqa6gmqbcn4h5zks5anfvn5"; buildDepends = [ deepseq hashable ]; testDepends = [ ChasingBottoms hashable HUnit QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 917000364c3..9789c80e8c1 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,19 +1,19 @@ { cabal, ansiTerminal, base64Bytestring, blazeBuilder , blazeBuilderConduit, caseInsensitive, conduit, dataDefault -, dateCache, fastLogger, hspec, httpTypes, HUnit, network -, resourcet, stringsearch, text, time, transformers, void, wai -, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit +, dateCache, fastLogger, hspec, httpTypes, HUnit, liftedBase +, network, resourcet, stringsearch, text, time, transformers, void +, wai, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.4.4"; - sha256 = "0x7nm3vrp1jhcdvcspdpgpgm12rcafng81f9kq9c01z5270myg2f"; + version = "1.3.4.5"; + sha256 = "062d7f8p2xgzn94fllgfc2bhbjv4vgp9j1adjaw9f0s1asnsdmnj"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes - network resourcet stringsearch text time transformers void wai - waiLogger word8 zlibConduit + liftedBase network resourcet stringsearch text time transformers + void wai waiLogger word8 zlibConduit ]; testDepends = [ blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index 9c85223d654..e2719984708 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xml-hamlet"; - version = "0.4.0.4"; - sha256 = "1s4s5z1xir9zmcbfz8mrznf2byclmg0qjjhwmpal2r9ly9g3na98"; + version = "0.4.0.5"; + sha256 = "1w1ixjdbpbny332j24d5yjxc4i7cg83jc4yjdm6yl94y1sr90yc5"; buildDepends = [ parsec shakespeare text xmlConduit ]; testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ]; meta = { diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 1e22f1ae4ba..7e2bd368c7e 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,14 +4,17 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.4.1"; - sha256 = "0zbnyf5hp206ywqkdd7c1hsdbn4wxwk7p3rzn53m7rzxvfshlbbx"; + version = "0.8.5"; + sha256 = "12jj785gzcnrif460cx2k69pc2h9h956g0w1gp8pcr5hawrvd6rg"; + isLibrary = true; + isExecutable = true; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector ]; testDepends = [ - conduit hspec HUnit text transformers unorderedContainers + aeson conduit hspec HUnit text transformers unorderedContainers + vector ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 66ed9df2d20..c437b5b8624 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.1"; - sha256 = "0xvb2v1c7zih4r1acd21s0fl18ygcajry5w6yiqqhnhx8wcniiqv"; + version = "1.2.2.1"; + sha256 = "1f3zdqywak54f2s11v26iyzb3svb0mdpfskxhps30jmkji2ph2iz"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 3dfedd471fe..3afb8747547 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.2.1"; - sha256 = "0m68wm46qh8bwaccq2y8l4hh4xby0kczvhgd7caaxhmv6j3srrf2"; + version = "1.2.3.2"; + sha256 = "10q4xjhcrskz3h0nay2vxfz2b3c2d532bvbggl2615aih05zdhwc"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 3fcec1a7d9f..bd2d0d97b2f 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.4"; - sha256 = "0vgxspdxdjfdfgyx20lp460np7v1qjv6wzw95kj5cb5yiqv1nr9d"; + version = "1.2.4.2"; + sha256 = "0zrhqh3phla8p7fjv30n4ypicbd6x6rwkrhpag79p1w4wwvkjxnn"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 926cba46499..aca42bfce6c 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.1"; - sha256 = "0zkwpymxwxca2p8i0fhq58wq7ic0dlyc3z89ypqglnp6h2mv2lwx"; + version = "1.3.2.1"; + sha256 = "0lybrw244y2ca1jvz218jh2kfypj4wblpdvk4n8wllll79dm3pq7"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index 3d900d94cda..5831bfe1df6 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -3,9 +3,10 @@ , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml , blazeMarkup, byteable, byteorder, caseInsensitive, cereal , certificate, cipherAes, cipherRc4, clientsession, conduit, cookie -, cprngAes, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers -, cryptoPubkey, cryptoPubkeyTypes, cryptoRandomApi, cssText -, dataDefault, dataDefaultClass, dataDefaultInstancesBase +, cprngAes, cryptoApi, cryptoCipherTypes, cryptoConduit, cryptohash +, cryptohashCryptoapi, cryptoNumbers, cryptoPubkey +, cryptoPubkeyTypes, cryptoRandom, cssText, dataDefault +, dataDefaultClass, dataDefaultInstancesBase , dataDefaultInstancesContainers, dataDefaultInstancesDlist , dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate , entropy, failure, fastLogger, fileEmbed, filesystemConduit @@ -15,7 +16,7 @@ , monadControl, monadLogger, networkConduit, pathPieces, pem , persistent, persistentTemplate, poolConduit, primitive , publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo -, resourcePool, resourcet, safe, semigroups, setenv, SHA +, resourcePool, resourcet, safe, securemem, semigroups, setenv, SHA , shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs , shakespeareText, silently, simpleSendfile, skein, socks , stringsearch, systemFileio, systemFilepath, tagged, tagsoup @@ -29,33 +30,34 @@ cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.3"; - sha256 = "16hp64gqgvpmlrwg6h8ldakw2n3x985cnv4pzmv9akjq27jq8rjl"; + version = "1.2.4.1"; + sha256 = "13fw1svs3769m8rf5mnks0ibgdd73s1qq9dgg4h49xkzrdgs31rk"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder caseInsensitive cereal certificate cipherAes cipherRc4 - clientsession conduit cookie cprngAes cryptoApi cryptoConduit - cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes - cryptoRandomApi cssText dataDefault dataDefaultClass - dataDefaultInstancesBase dataDefaultInstancesContainers - dataDefaultInstancesDlist dataDefaultInstancesOldLocale dateCache - dlist emailValidate entropy failure fastLogger fileEmbed - filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit - httpAttoparsec httpConduit httpDate httpTypes languageJavascript - liftedBase mimeMail mimeTypes mmorph monadControl monadLogger - networkConduit pathPieces pem persistent persistentTemplate - poolConduit primitive publicsuffixlist pureMD5 pwstoreFast - quickcheckIo resourcePool resourcet safe semigroups setenv SHA - shakespeare shakespeareCss shakespeareI18n shakespeareJs - shakespeareText silently simpleSendfile skein socks stringsearch - systemFileio systemFilepath tagged tagsoup tagstreamConduit tls - tlsExtra transformersBase unixCompat unorderedContainers utf8Light - utf8String vault vector void wai waiAppStatic waiExtra waiLogger - waiTest warp word8 xmlConduit xmlTypes xssSanitize yaml yesod - yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes - yesodStatic yesodTest zlibBindings zlibConduit + clientsession conduit cookie cprngAes cryptoApi cryptoCipherTypes + cryptoConduit cryptohash cryptohashCryptoapi cryptoNumbers + cryptoPubkey cryptoPubkeyTypes cryptoRandom cssText dataDefault + dataDefaultClass dataDefaultInstancesBase + dataDefaultInstancesContainers dataDefaultInstancesDlist + dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy + failure fastLogger fileEmbed filesystemConduit hamlet hjsmin hspec + hspecExpectations htmlConduit httpAttoparsec httpConduit httpDate + httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph + monadControl monadLogger networkConduit pathPieces pem persistent + persistentTemplate poolConduit primitive publicsuffixlist pureMD5 + pwstoreFast quickcheckIo resourcePool resourcet safe securemem + semigroups setenv SHA shakespeare shakespeareCss shakespeareI18n + shakespeareJs shakespeareText silently simpleSendfile skein socks + stringsearch systemFileio systemFilepath tagged tagsoup + tagstreamConduit tls tlsExtra transformersBase unixCompat + unorderedContainers utf8Light utf8String vault vector void wai + waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit + xmlTypes xssSanitize yaml yesod yesodAuth yesodCore yesodForm + yesodPersistent yesodRoutes yesodStatic yesodTest zlibBindings + zlibConduit ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index fd68a161c68..556b210b91b 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.2"; - sha256 = "06ac99srh44rwj6mwyl7h0d0ckyb19dvpabylbawmks25v5ig0y3"; + version = "1.2.2.1"; + sha256 = "0xhpsqfshnay7kaz0czr7ass84cbjlgz2n13jk08hs8g8dw72as4"; buildDepends = [ aeson blazeHtml blazeMarkup dataDefault hamlet monadControl networkConduit safe shakespeareCss shakespeareJs text transformers diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 7e8b3ea11ff..4cb75151b00 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -1,23 +1,25 @@ -{ cabal, attoparsec, blazeBuilder, caseInsensitive, conduit -, dataDefault, filepath, fsnotify, httpConduit, httpReverseProxy -, httpTypes, mtl, network, networkConduit, networkConduitTls -, random, regexTdfa, systemFileio, systemFilepath, tar, text, time -, transformers, unixCompat, unixProcessConduit, wai, waiAppStatic -, warp, warpTls, yaml, zlib +{ cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive +, conduit, dataDefault, filepath, fsnotify, httpConduit +, httpReverseProxy, httpTypes, mtl, network, networkConduit +, networkConduitTls, random, regexTdfa, stm, systemFileio +, systemFilepath, tar, text, time, transformers, unixCompat +, unixProcessConduit, unorderedContainers, vector, wai +, waiAppStatic, waiExtra, warp, warpTls, yaml, zlib }: cabal.mkDerivation (self: { pname = "keter"; - version = "0.4.0"; - sha256 = "0ny8z2rfn090vci262xvyrdbkmdb7qjb4x15r81l2691ibf09ppv"; + version = "1.0.1"; + sha256 = "0ghgwp1winf0jj70jrwsk4b85f8m4v78n8kijhqghh4kskh457b5"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec blazeBuilder caseInsensitive conduit dataDefault - filepath fsnotify httpConduit httpReverseProxy httpTypes mtl - network networkConduit networkConduitTls random regexTdfa - systemFileio systemFilepath tar text time transformers unixCompat - unixProcessConduit wai waiAppStatic warp warpTls yaml zlib + aeson async attoparsec blazeBuilder caseInsensitive conduit + dataDefault filepath fsnotify httpConduit httpReverseProxy + httpTypes mtl network networkConduit networkConduitTls random + regexTdfa stm systemFileio systemFilepath tar text time + transformers unixCompat unixProcessConduit unorderedContainers + vector wai waiAppStatic waiExtra warp warpTls yaml zlib ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix index 460dc3f8c43..4e99a1e68cd 100644 --- a/pkgs/development/tools/haskell/splot/default.nix +++ b/pkgs/development/tools/haskell/splot/default.nix @@ -1,5 +1,5 @@ -{ cabal, bytestringLexing, cairo, colour, HUnit, mtl -, strptime, time, vcsRevision +{ cabal, bytestringLexing, cairo, colour, HUnit, mtl, strptime +, time, vcsRevision }: cabal.mkDerivation (self: { @@ -9,8 +9,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - bytestringLexing cairo colour HUnit mtl strptime time - vcsRevision + bytestringLexing cairo colour HUnit mtl strptime time vcsRevision ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Splot"; diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.nix b/pkgs/tools/package-management/cabal-install/1.18.0.1.nix similarity index 90% rename from pkgs/tools/package-management/cabal-install/1.18.0.nix rename to pkgs/tools/package-management/cabal-install/1.18.0.1.nix index 8b093bc925c..ceb54effdd9 100644 --- a/pkgs/tools/package-management/cabal-install/1.18.0.nix +++ b/pkgs/tools/package-management/cabal-install/1.18.0.1.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.18.0"; - sha256 = "14c4i8cy2rnvjj2krv3swna53k2674xhpzqkmcr56lxnyzych5wh"; + version = "1.18.0.1"; + sha256 = "0b44w4iqzaq5119zjkpagd3a2279kz6xq5pk5rqnlnfn8a8ihdbb"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ae90596886c..51f8a33d606 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -160,11 +160,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x syb = self.syb_0_4_1; text = self.text_0_11_3_1; transformers = null; # this has become a core package in GHC 7.7 - unorderedContainers = self.unorderedContainers_0_2_3_0; + unorderedContainers = self.unorderedContainers_0_2_3_2; vector = self.vector_0_10_0_1; xhtml = self.xhtml_3000_2_1; zlib = self.zlib_0_5_4_1; - cabalInstall = self.cabalInstall_1_18_0; + cabalInstall = self.cabalInstall_1_18_0_1; alex = self.alex_3_0_5; haddock = self.haddock_2_13_2; happy = self.happy_1_18_10; @@ -1954,6 +1954,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x systemFileio = callPackage ../development/libraries/haskell/system-fileio {}; + systemPosixRedirect = callPackage ../development/libraries/haskell/system-posix-redirect {}; + TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {}; tabular = callPackage ../development/libraries/haskell/tabular {}; @@ -2070,8 +2072,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x unlambda = callPackage ../development/libraries/haskell/unlambda {}; unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {}; - unorderedContainers_0_2_3_1 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.1.nix {}; - unorderedContainers = self.unorderedContainers_0_2_3_1; + unorderedContainers_0_2_3_2 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.2.nix {}; + unorderedContainers = self.unorderedContainers_0_2_3_2; url = callPackage ../development/libraries/haskell/url {}; @@ -2389,7 +2391,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {}; - cabalInstall_1_18_0 = callPackage ../tools/package-management/cabal-install/1.18.0.nix {}; + cabalInstall_1_18_0_1 = callPackage ../tools/package-management/cabal-install/1.18.0.1.nix {}; cabalInstall = self.cabalInstall_1_18_0; gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};