Commit graph

7049 commits

Author SHA1 Message Date
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
Yury G. Kudryashov 268146472c Add libgtop
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33343
2012-03-22 07:32:08 +00:00
Shea Levy 214482c79a Update ctemplate
I don't know what this is, but it wasn't building before and now it is.

svn path=/nixpkgs/trunk/; revision=33338
2012-03-21 17:42:19 +00:00
Shea Levy 26789f2e89 Update rubygems
svn path=/nixpkgs/trunk/; revision=33333
2012-03-21 14:07:29 +00:00
Lluís Batlle i Rossell 6c4fb4a7b7 libnfsidmap plugin path fix.
Patch by Rickard Nilsson.


svn path=/nixpkgs/trunk/; revision=33328
2012-03-21 11:56:04 +00:00
Lluís Batlle i Rossell c6dc67483e Updating the libevent version and url, patch by Rickard Nilsson.
svn path=/nixpkgs/trunk/; revision=33327
2012-03-21 11:55:26 +00:00
Peter Simons 115b3d943a pkgs/development/compilers/ghc/with-packages.nix: renamed this expression from "ghc-${ghc.version}-linkdir" to "haskell-env-${ghc.name}"
This change allows use of the with-packages wrapper in user profiles that are
being updated with "nix-env -u \*". The previous name this expression generated
was considered by Nix to be an older version of "ghc-7.0.4-wrapper", because
that name has a higher priority.

svn path=/nixpkgs/trunk/; revision=33325
2012-03-21 11:46:15 +00:00
Peter Simons d8e65ee71d pkgs/development/compilers/ghc/with-packages.nix: trivial changes to fix syntax highlighting in Emacs
svn path=/nixpkgs/trunk/; revision=33324
2012-03-21 11:46:12 +00:00
Michael Raskin 4233eece19 Update and fix WebKit
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33323
2012-03-21 10:47:00 +00:00
Lluís Batlle i Rossell 28027d4771 Aestethic changes suggested by Eelco, and trying to fix
the problem on rpc.statd, that looks at /etc/netconfig.

Problem: http://hydra.nixos.org/build/2310686/log/raw


svn path=/nixpkgs/trunk/; revision=33322
2012-03-21 09:18:40 +00:00
Eelco Dolstra 7bc7db74fb * NSPR updated to 4.9.
svn path=/nixpkgs/trunk/; revision=33318
2012-03-20 23:55:22 +00:00
Lluís Batlle i Rossell b2d61a850d Enabling nfsv4 and nfsv41 in nfsUtils (or at least I think so).
svn path=/nixpkgs/trunk/; revision=33315
2012-03-20 23:17:45 +00:00
Yury G. Kudryashov 34fcba81be Add new release of kdevelop
I'll remove the old release when Hydra will build the new one, and I'll test the
result.

svn path=/nixpkgs/trunk/; revision=33296
2012-03-20 14:12:53 +00:00
Yury G. Kudryashov ba7f02630a Add gtkmm-3.x
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33294
2012-03-20 11:46:42 +00:00
Yury G. Kudryashov bf530f6c03 cairomm-1.10.0
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33293
2012-03-20 11:41:11 +00:00
Yury G. Kudryashov aa47fca2f6 Restore libchamplain
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33291
2012-03-20 11:16:06 +00:00
Yury G. Kudryashov f0039537ce Restore clutter-gtk
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33290
2012-03-20 11:16:01 +00:00
Shea Levy f272acd501 Add a module for the pommed tool for Apple laptop keyboards.
svn path=/nixpkgs/trunk/; revision=33286
2012-03-20 04:41:13 +00:00
Shea Levy 6fe5413cb7 xf86-input-multitouch seems to be abandoned, update it with the mtrack fork
svn path=/nixpkgs/trunk/; revision=33283
2012-03-20 01:48:09 +00:00
Peter Simons 5f32e704bf haskell-url: updated to version 2.1.3
svn path=/nixpkgs/trunk/; revision=33280
2012-03-19 23:41:06 +00:00
Lluís Batlle i Rossell a39a9b3d8e Adding a glibc patch to get proper first days of the week in the Catalan locale.
Since 2008 somehow it cannot get fixed in glibc:
https://bugzilla.redhat.com/show_bug.cgi?id=454629


svn path=/nixpkgs/trunk/; revision=33279
2012-03-19 21:50:58 +00:00
Eelco Dolstra a772508846 * NASM updated to 2.10.
svn path=/nixpkgs/trunk/; revision=33256
2012-03-19 13:16:35 +00:00
Peter Simons 69adc0d433 Update Haskell packages.
- gd: updated to version 3000.7.3
 - hakyll: updated to version 3.2.6.2
 - HaskellForMaths: updated to version 0.4.4
 - haskell-src-meta: updated to version 0.5.1.1
 - mwc-random: dropped obsolete version 0.10.0.1.
 - persistent-template: updated to version 0.8.2
 - snap-core: updated to version 0.8.0.1
 - snap-server: updated to version 0.8.0.1
 - unordered-containers: dropped obsolete version 0.1.4.6.

svn path=/nixpkgs/trunk/; revision=33255
2012-03-19 11:15:39 +00:00
Yury G. Kudryashov abec146924 Add libwnck3
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33254
2012-03-19 04:36:51 +00:00
Yury G. Kudryashov b113433d51 Move libwnck to top-level
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33253
2012-03-19 04:36:47 +00:00
Yury G. Kudryashov 3d0b778848 Move gnome-doc-utils and gtk-doc to top-level
Add compatibility attrs.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33252
2012-03-19 04:36:41 +00:00
Piotr Pietraszkiewicz 1824f424b2 Made sword build again by tuning the configureFlags:
- to ignore warnings about unused variables
- not to build the tests (the warnings in tests looked serious at first
  glance)
Additionally disabled debug because I hit no problems at runtime so far

svn path=/nixpkgs/trunk/; revision=33243
2012-03-18 22:51:17 +00:00
Yury G. Kudryashov 23b865d1b4 Fix evaluation
svn path=/nixpkgs/trunk/; revision=33220
2012-03-17 22:25:30 +00:00
Yury G. Kudryashov 168a3d7101 Add qt4_for_skype
This build disables some optional features. I'm going to pass this to
skype_linux to reduce the size occupied by i686 packages on x86_64 system.

svn path=/nixpkgs/trunk/; revision=33217
2012-03-17 20:57:28 +00:00
Peter Simons 457e59d99d libtirpc: updated to version 0.2.2
svn path=/nixpkgs/trunk/; revision=33211
2012-03-17 17:44:20 +00:00
Yury G. Kudryashov d68c80932a Remove libjingle
It seems that every japper/jingle implementation ships a modified version of
libjingle.

svn path=/nixpkgs/trunk/; revision=33207
2012-03-17 17:20:39 +00:00
Yury G. Kudryashov 776bedbb5f Remove some files not reachable from all-packages.nix
List of removed files:
* pkgs/applications/misc/kiwixbuilder/default.nix
* pkgs/applications/misc/simgrid/default.nix
* pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
* pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
* pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch
* pkgs/development/libraries/bluez-libs/default.nix
* pkgs/development/libraries/libjingle/0.4.0.nix
* pkgs/development/perl-modules/Font-TTF/default.nix
* pkgs/tools/X11/xauth/default.nix
* pkgs/tools/security/p0f/default.nix
* pkgs/tools/security/p0f/p0f.patch

svn path=/nixpkgs/trunk/; revision=33205
2012-03-17 17:20:30 +00:00
Yury G. Kudryashov d1860f6def Move gnome3.GConf to GConf3
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33201
2012-03-17 16:46:02 +00:00
Yury G. Kudryashov ddb01436a0 Move gnome3.libgnome_keyring to libgnome_keyring3
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33200
2012-03-17 16:45:56 +00:00
Yury G. Kudryashov d96524476d Move libsoup to development/libraries
It is used in many packages outside of gnome2 set.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33197
2012-03-17 16:45:37 +00:00
Yury G. Kudryashov 0e397758ee dragonegg-3.0
The old version fails to build, thus I commit it instead of review request.

svn path=/nixpkgs/trunk/; revision=33193
2012-03-17 15:25:00 +00:00
Peter Simons 70139b0bbd pkgs/development/libraries/libtirpc: removed obsolete copy of this library
svn path=/nixpkgs/trunk/; revision=33191
2012-03-17 13:45:56 +00:00
Yury G. Kudryashov a47127de32 libchamplain-0.12.2
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33190
2012-03-17 13:30:51 +00:00
Yury G. Kudryashov 8a2b2f3338 clutter-gtk-1.0.4
Depends on gtk3

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33189
2012-03-17 13:30:46 +00:00
Yury G. Kudryashov 5c4e3c7701 clutter-1.8.2
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33188
2012-03-17 13:30:39 +00:00
Yury G. Kudryashov 1bbaec552e taglib-1.7.1
Release notes says that this release fixes a few security issues.

svn path=/nixpkgs/trunk/; revision=33186
2012-03-17 13:21:31 +00:00
Yury G. Kudryashov a658884c17 Revert "pango-1.29.5"
This reverts r33178
pango-1.29.5 depends on glib-2.31

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33182
2012-03-16 22:53:32 +00:00
Yury G. Kudryashov ef95c7855d pango-1.29.5
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33178
2012-03-16 21:37:42 +00:00
Lluís Batlle i Rossell 6b4810d310 Updating php 5.3 to 5.3.10
svn path=/nixpkgs/trunk/; revision=33170
2012-03-16 19:40:36 +00:00
Lluís Batlle i Rossell 6b6b758745 Updating mlt to 0.7.8.
kdenlive 0.8.2.1 wants mlt 0.7.8. With 0.7.6, it crashed clicking the timeline
(only with qt48).


svn path=/nixpkgs/trunk/; revision=33168
2012-03-16 18:40:10 +00:00
Yury G. Kudryashov eefb2b6531 ilbc: style
svn path=/nixpkgs/trunk/; revision=33163
2012-03-16 17:15:47 +00:00
Shea Levy a09a78165c Update rubygems
svn path=/nixpkgs/trunk/; revision=33155
2012-03-16 13:28:35 +00:00
Ludovic Courtès cc6f814a8f GFortran 4.6: Add patch to fix the output of `-v'.
svn path=/nixpkgs/trunk/; revision=33154
2012-03-16 13:11:41 +00:00
Peter Simons 6e56feca1d Updated Haskell packages.
- RepLib: updated to version 0.5.2
 - http-enumerator: updated to version 0.7.3.1
 - http-types: updated to version 0.6.10
 - leksah-server: updated to version 0.12.0.5
 - test-framework-quickcheck2: updated to version 0.2.12.1
 - unbound: updated to version 0.4
 - yesod: updated to version 0.10.2

svn path=/nixpkgs/trunk/; revision=33144
2012-03-16 09:47:31 +00:00
Yury G. Kudryashov d477e709c8 Add telepathy-farstream
svn path=/nixpkgs/trunk/; revision=33128
2012-03-15 21:50:02 +00:00
Yury G. Kudryashov 0239640def Add farstream
svn path=/nixpkgs/trunk/; revision=33127
2012-03-15 21:49:54 +00:00
Peter Simons ee402fac15 haskell-bloomfilter: added version 1.2.6.8
svn path=/nixpkgs/trunk/; revision=33115
2012-03-15 18:07:45 +00:00
Yury G. Kudryashov b0d0278e82 libssh-0.5.2, switch to libgcrypt
svn path=/nixpkgs/trunk/; revision=33114
2012-03-15 17:08:26 +00:00
Yury G. Kudryashov 785d18e02b svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33111
2012-03-15 15:09:36 +00:00
Peter Simons fe3ac7658b haskell-alex-meta: updated to version 0.3.0.2
svn path=/nixpkgs/trunk/; revision=33102
2012-03-15 10:43:20 +00:00
Peter Simons b68db0ea2d haskell-BNFC-meta: updated to version 0.3
svn path=/nixpkgs/trunk/; revision=33101
2012-03-15 10:43:16 +00:00
Peter Simons 4bd54310e6 haskell-xml-conduit: updated to version 0.5.4
svn path=/nixpkgs/trunk/; revision=33100
2012-03-15 10:43:05 +00:00
Yury G. Kudryashov fe1115caf4 Make nixpkgs ready for gst_all attrset removal
svn path=/nixpkgs/trunk/; revision=33092
2012-03-14 22:44:52 +00:00
Shea Levy 6c99fad938 OMVF: Only need some of the sources, and symlinks instead of copies are fine
svn path=/nixpkgs/trunk/; revision=33090
2012-03-14 22:43:07 +00:00
Yury G. Kudryashov 044361ec18 Pass qt_gstreamer to ktp-call-ui
svn path=/nixpkgs/trunk/; revision=33080
2012-03-14 19:35:46 +00:00
Yury G. Kudryashov c9da6ff736 Move dev/libs/telepathy-* to a subdir
svn path=/nixpkgs/trunk/; revision=33079
2012-03-14 19:35:41 +00:00
Yury G. Kudryashov 4d9fb0a594 Move gstreamer packages to top-level
This will make callPackage work with gst.
* Rename gstCamelCase to gst_with_underscores.
* Add compatibility attributes.

svn path=/nixpkgs/trunk/; revision=33078
2012-03-14 19:35:35 +00:00
Yury G. Kudryashov 6d2a78fc40 Add qt-gstreamer
svn path=/nixpkgs/trunk/; revision=33076
2012-03-14 19:35:26 +00:00
Peter Simons f59e3b6bfb wxGTK: make mesa support optional in versions 2.9.0 and 2.9.1 too
svn path=/nixpkgs/trunk/; revision=33069
2012-03-14 17:45:11 +00:00
Yury G. Kudryashov dc2d99ec96 Move telepathy-gabble to applications
svn path=/nixpkgs/trunk/; revision=33064
2012-03-14 15:41:37 +00:00