3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

6997 commits

Author SHA1 Message Date
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
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