Commit graph

7013 commits

Author SHA1 Message Date
Shea Levy cd83eb3173 Build clang to support all of llvm's targets
svn path=/nixpkgs/trunk/; revision=33518
2012-04-01 14:33:23 +00:00
Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
2012-03-31 20:01:40 +00:00
Yury G. Kudryashov 3f44fb8f2f Drop telepathy-farsight
It is not used, and it is deprecated by telepathy-farstream.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33491
2012-03-30 12:28:50 +00:00
Yury G. Kudryashov 6eb45d767f telepathy-qt: farsight -> farstream
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33488
2012-03-30 09:03:35 +00:00
Peter Simons 9db8eaac7f Updated Haskell packages.
- SHA: updated to version 1.5.0.1
 - bmp: updated to version 1.2.1.1

svn path=/nixpkgs/trunk/; revision=33487
2012-03-30 08:27:56 +00:00
Michael Raskin 19320cf6cc Updating autogen - builds now
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33485
2012-03-30 07:32:54 +00:00
Shea Levy b7f90b3406 libicns claims it can use openjpeg at build time, but at run time says it's not supported. Use jasper instead
svn path=/nixpkgs/trunk/; revision=33482
2012-03-30 01:42:13 +00:00
Shea Levy ef084be97b Add libicns
svn path=/nixpkgs/trunk/; revision=33481
2012-03-30 01:36:38 +00:00
Peter Simons a39f417ad7 Updated Haskell packages.
- RSA: updated to version 1.0.6.3
 - derive: updated to version 2.5.7
 - hakyll: updated to version 3.2.7.0
 - happstack-hamlet: updated to version 7.0.0
 - idris: updated to version 0.9.2.1

svn path=/nixpkgs/trunk/; revision=33479
2012-03-29 20:52:37 +00:00
Yury G. Kudryashov ce85d430bc Batch update telepathy-related packages
Some of these packages need glib-2.30.x, so I commit it to this branch.

Add sofia-sip and telepathy-rakia.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33475
2012-03-29 16:33:32 +00:00
Yury G. Kudryashov ded7dae81d glibmm-2.30.1
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33473
2012-03-29 14:29:54 +00:00
Yury G. Kudryashov e5fd55a954 glib-2.30.3
Build with system pcre.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33472
2012-03-29 14:29:50 +00:00
Peter Simons c031fccf5e Dropped obsolete Haskell packages.
- convertible-text: deprecated by author
 - failure: obsolete version 0.1.2
 - attempt: obsolete version 0.3.1.1

svn path=/nixpkgs/trunk/; revision=33470
2012-03-29 11:17:31 +00:00
Peter Simons d5b7235de1 Updated Haskell packages.
- blaze-html: updated to version 0.4.3.3
 - failure: updated 0.2.0.1
 - resourcet: updated to version 0.3.2
 - zlib-bindings: updated to version 0.1.0.1

svn path=/nixpkgs/trunk/; revision=33469
2012-03-29 11:17:28 +00:00
Yury G. Kudryashov a0474636d4 Remove some unused files
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33468
2012-03-29 10:34:47 +00:00
Michael Raskin 3decf956d4 Porting a fix from nixpkgs trunk - vimprobable2 now builds (against obsolete WebKit/GTK2)
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33467
2012-03-29 10:30:47 +00:00
Lluís Batlle i Rossell 3551d159d8 Updating the JDK6 to u32b03 due to some important security fix.
http://www.h-online.com/open/news/item/Critical-Java-hole-being-exploited-on-a-large-scale-1485681.html


svn path=/nixpkgs/trunk/; revision=33460
2012-03-28 20:42:54 +00:00
Yury G. Kudryashov defd86049c Merge ^/nixpkgs/trunk.
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
2012-03-28 15:42:42 +00:00
Yury G. Kudryashov 49b7f13128 Upgrading dssi to 1.1.1 (cherry-pick trunk@33360)
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33454
2012-03-28 15:11:50 +00:00
Peter Simons db8f709430 Updated Haskell packages.
- derp: updated to version 0.1.6
 - happstack-server: updated to version 6.6.5
 - hlint: updated to version 1.8.26

svn path=/nixpkgs/trunk/; revision=33453
2012-03-28 13:49:20 +00:00
Shea Levy db28c68df0 mkDerivation handles propagatedUserEnvPkgs properly now
svn path=/nixpkgs/trunk/; revision=33444
2012-03-27 15:20:37 +00:00
Shea Levy 092487c1fb Update rubygems
svn path=/nixpkgs/trunk/; revision=33443
2012-03-27 15:14:13 +00:00
Rob Vermaas 5a3a3a4e17 * Fix JDK/JRE error: /nix/store/.../jre/lib/i386/xawt/libmawt.so: file not recognized: File format not recognized.
Patch provided by Ambrus Kaposi.


svn path=/nixpkgs/trunk/; revision=33439
2012-03-27 11:19:00 +00:00
Peter Simons e85794243f Update Haskell packages.
- blaze-html: updated to version 0.4.3.2
 - ghc-mod: updated to version 1.10.12
 - gloss: updated to version 1.7.0.1

svn path=/nixpkgs/trunk/; revision=33436
2012-03-27 10:31:45 +00:00
Russell O'Connor 4bccef4db2 Updating hash for ocaml_sqlite3
Markus Mottl <markus.mottl@gmail.com> said by email to me that 

``Note that this link is served by a Mercurial Apache module, i.e. this
is not static content.  It's likely that e.g. tar or bzip2 produce
slightly different output, which would explain changing hashes.

So I guess we shouldn't worry too much about the change in hash?


svn path=/nixpkgs/trunk/; revision=33419
2012-03-25 21:24:23 +00:00
Peter Simons d44e55866a Updated Haskell packages.
- cabal2nix: updated to version 1.30
 - cmdargs: updated to version 0.9.5
 - derive: updated to version 2.5.6
 - hlint: updated to version 1.8.25
 - io-choice: added version 0.0.1

svn path=/nixpkgs/trunk/; revision=33411
2012-03-25 19:33:53 +00:00
Peter Simons a058381657 haskell-ghc-mod: updated to version 1.10.11
This expression can now be generated by cabal2nix. Note that it doesn't
propagate Emacs and haskell-mode, though, these dependencies must be
installed by the user in addition to ghc-mod.

To active ghc-mod, add the following snippet to your ~/.emacs file:

  (autoload 'ghc-init "ghc" nil t)
  (add-hook 'haskell-mode-hook (lambda () (ghc-init)))

svn path=/nixpkgs/trunk/; revision=33410
2012-03-25 19:33:48 +00:00
Peter Simons 48ce33903a haskell-hoogle: added version 4.2.10
svn path=/nixpkgs/trunk/; revision=33409
2012-03-25 18:22:20 +00:00
Arie Middelkoop 797c0f86fa Recovered OCaml 3.11 by using version 3.11.2 and a patch from ocaml's bugtracker.
svn path=/nixpkgs/trunk/; revision=33399
2012-03-24 22:59:08 +00:00
Peter Simons 6b0f1dab5c Updated Haskell packages.
- LambdaHack: updated to version 0.2.1
 - OpenAL: updated to version 1.4.0.1
 - cabal2nix: updated to version 1.29
 - unbound: updated to version 0.4.0.1

svn path=/nixpkgs/trunk/; revision=33394
2012-03-24 10:21:48 +00:00
Peter Simons 880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use.
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
2012-03-24 10:21:28 +00:00
Peter Simons e7403a7f63 haskell-permutation: added version 0.4.1
svn path=/nixpkgs/trunk/; revision=33389
2012-03-23 21:03:04 +00:00
Peter Simons 062c35144d haskell-monad-control: added version 0.3.1.1
svn path=/nixpkgs/trunk/; revision=33379
2012-03-23 12:03:21 +00:00
Peter Simons 952626fc94 haskell-transformers: added version 0.3.0.0
svn path=/nixpkgs/trunk/; revision=33378
2012-03-23 12:03:18 +00:00
Peter Simons f4462f5cad haskell-yesod-core: updated to version 0.10.3
svn path=/nixpkgs/trunk/; revision=33377
2012-03-23 12:03:15 +00:00
Peter Simons f503c5f728 haskell-resourcet: updated to version 0.3.1
svn path=/nixpkgs/trunk/; revision=33376
2012-03-23 12:03:12 +00:00
Peter Simons 39e8ab7157 haskell-monad-loops: updated to version 0.3.2.0
svn path=/nixpkgs/trunk/; revision=33375
2012-03-23 12:03:10 +00:00
Peter Simons 24c1200a02 haskell-fclabels: updated to version 1.1.1.1
svn path=/nixpkgs/trunk/; revision=33374
2012-03-23 12:03:07 +00:00
Peter Simons 3837c965ad haskell-zlib-bindings: added version 0.1.0
svn path=/nixpkgs/trunk/; revision=33373
2012-03-23 12:03:04 +00:00
Peter Simons 3fbeca3ebc pkgs/development/compilers/ghc/wrapper.nix: removed extraneous closing bracket that broke the script
svn path=/nixpkgs/trunk/; revision=33371
2012-03-23 11:26:28 +00:00
Michael Raskin f5cc572d8b Updating FPC and Lazarus - works OK with new glib
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33367
2012-03-23 05:55:13 +00:00
Shea Levy 6aa06a6699 ghc-packages: Darwin's native readlink doesn't support -f
svn path=/nixpkgs/trunk/; revision=33366
2012-03-23 03:01:58 +00:00
Mathijs Kwik c690fb832b haskell-arrows
svn path=/nixpkgs/trunk/; revision=33365
2012-03-22 22:37:17 +00:00
Mathijs Kwik 25fe36ff15 haskell-Stream
svn path=/nixpkgs/trunk/; revision=33364
2012-03-22 22:37:13 +00:00
Mathijs Kwik 01e0c31bae haskell-lazysmallcheck
svn path=/nixpkgs/trunk/; revision=33363
2012-03-22 22:37:08 +00:00
Cillian de Roiste e53c036470 Upgrading dssi to 1.1.1
svn path=/nixpkgs/trunk/; revision=33360
2012-03-22 18:49:15 +00:00
Peter Simons 0c842e7620 Updated Haskell packages.
- cautious-file: updated to version 1.0.1
 - hmatrix: updated to version 0.14.0.1
 - random-fu: updated to version 0.2.2.0
 - resourcet: added version 0.3.0
 - sendfile: updated to version 0.7.6
 - test-framework: added version 0.6

svn path=/nixpkgs/trunk/; revision=33354
2012-03-22 11:17:49 +00:00
Arie Middelkoop 3a7b035380 Fix of the ocaml extlib expression. The native object files were not installed. Turns out that also the 'opt' make target must be run besides 'all'.
svn path=/nixpkgs/trunk/; revision=33350
2012-03-22 10:32:32 +00:00
Arie Middelkoop 31ffda057e Fix of the ocaml pcre nix expr. Added 'pcre' as propagated build input.
svn path=/nixpkgs/trunk/; revision=33349
2012-03-22 10:31:10 +00:00
Yury G. Kudryashov c4b9da5949 Add libgweather
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33344
2012-03-22 08:39:08 +00:00