Commit graph

1406 commits

Author SHA1 Message Date
Mathijs Kwik
2cdc567ff5 new package: phantomjs 2012-12-13 17:51:03 +01:00
Eelco Dolstra
f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
Peter Simons
f9ad750bdc haskell-uuagc: update to version 0.9.42.2 2012-12-08 11:35:18 +01:00
Peter Simons
f38f3e19f6 haskell-uuagc-cabal: update to version 1.0.4.0 2012-12-08 11:35:18 +01:00
Peter Simons
45ffccf33a haskell-hlint: update to version 1.8.39 2012-12-08 11:35:18 +01:00
Michael Raskin
d3e5b8feee Fix dummy pseudo-updates being found for some packages 2012-12-08 13:05:43 +04:00
Eelco Dolstra
5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Mathijs Kwik
2b4fba3d03 neoload: upgrade to 4.1.1 2012-12-04 12:02:36 +01:00
Peter Simons
158388b521 haskell-cpphs: update to version 1.15 2012-12-03 16:12:12 +01:00
Peter Simons
b690d7a20b haskell-hlint: update to version 1.8.37 2012-12-03 16:12:12 +01:00
Rob Vermaas
faaa1581e2 Added re2c 0.13.5 2012-12-02 00:25:01 +01:00
Eelco Dolstra
72684fb42f Remove support for the obsolete powerpc-darwin and i686-darwin platforms 2012-11-29 14:10:49 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Mathijs Kwik
288d98afd9 neoload: upgrade to 4.1.0 2012-11-27 02:14:06 +01:00
Florian Friesdorf
fc57b8940b intltool: fix license attribute name 2012-11-26 16:11:32 +01:00
Michael Raskin
7333c01dba Update Compiz 2012-11-25 23:58:04 +04:00
Lluís Batlle i Rossell
2880190491 valgrind: updating to bugfix release 3.8.1 2012-11-23 15:04:51 +01:00
Michael Raskin
1c32897905 Merge pull request #187 from orbitz/ocaml-findlib-add-topfind
Ocaml findlib add topfind
2012-11-21 21:34:09 -08:00
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Mathijs Kwik
b155a188e3 neoload: link used jre to a location which is hard-coded into some binaries 2012-11-21 09:49:35 +01:00
Peter Simons
306cb4d9b5 haskell-cabal2nix: update to version 1.42 2012-11-20 14:42:19 +01:00
Peter Simons
84591241db haskell-hlint: update to version 1.8.35 2012-11-20 14:02:04 +01:00
Peter Simons
f1733b361f haskell-cabal2nix: update to version 1.41 2012-11-20 14:02:04 +01:00
Mathijs Kwik
3ab0cd1d41 neoload: fix evaluation of tarball job 2012-11-18 18:35:01 +01:00
Mathijs Kwik
125953f1bc add package: neoload-4.0.4 2012-11-18 15:33:52 +01:00
Malcolm Matalka
5ff6be9224 Support installing findlib 2012-11-16 11:43:43 +01:00
Malcolm Matalka
6299baeb88 Support installing topfind now 2012-11-16 11:43:32 +01:00
Peter Simons
3fafdb362b bison: update to version 2.6.5
This update fixes the grub-2.0 warning issue that was worked around in commit
4f5e655b36. Consequently, that patch is no longer
needed.
2012-11-09 18:00:49 +01:00
Peter Simons
6896a895c3 haskell-hlint: update to version 1.8.34 2012-11-08 14:57:37 +01:00
Peter Simons
0ae5d8fd05 haskell: drop noHaddock from some packages which build fine in their respective latest version 2012-11-06 13:38:34 +01:00
Peter Simons
5ce4e11e40 haskell-uuagc: update to version 0.9.42.1 2012-11-05 16:25:29 +01:00
Peter Simons
3385f76ae1 haskell-uuagc-cabal: update to version 1.0.3.0 2012-11-05 16:25:29 +01:00
Peter Simons
4fa4749b4f haskell-threadscope: update to version 0.2.2 2012-11-05 16:25:29 +01:00
Peter Simons
42c1c63919 haskell-splot: update to version 0.3.6 2012-11-05 16:25:28 +01:00
Peter Simons
e2e1526884 haskell-timeplot: update to version 1.0.18 2012-11-01 10:09:26 +01:00
Peter Simons
2531a08ef9 haskell-splot: update to version 0.3.5 2012-11-01 10:09:26 +01:00
Peter Simons
78a308f6f5 haskell-BNFC-meta: update to version 0.4.0.1 2012-11-01 10:09:26 +01:00
Cyril Roelandt
4b3d29003e smatch: add dependency on Perl
Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2012-10-30 17:15:26 +01:00
Ludovic Courtès
d1202f702b smatch: install files in the right place 2012-10-30 15:07:35 +01:00
Andres Loeh
4c5b56d212 Add cabal-dev. 2012-10-30 09:03:53 +01:00
Rob Vermaas
d72ee9c961 Added sysbench 0.4.12 2012-10-26 14:45:16 +02:00
Peter Simons
7ffcf39ad6 haskell-timeplot: update to version 1.0.14 2012-10-26 11:04:36 +02:00
Rickard Nilsson
9c0459972f Revert "gnum4: Disable tests for ARM."
This reverts commit b63305721d.

gnum4 builds fine on Sheevaplug for me now. I consider my previous
failure a glitch, since I'm not sure how my stdenv looked at that
time. Sorry for the noise.
2012-10-25 10:03:53 +02:00
Peter Simons
f54cc84aec haskell-hlint: update to version 1.8.33 2012-10-24 18:06:11 +02:00
Peter Simons
2e2a17a92a bison: drop obsolete version 1.875 2012-10-23 18:46:09 +02:00
Peter Simons
b3aafc8494 bison-2.6: update to version 2.6.4 2012-10-23 18:36:26 +02:00
Peter Simons
40c142201d haskell-hlint: update to version 1.8.32 2012-10-23 18:29:59 +02:00
Eelco Dolstra
6c75d07e65 automake: Update to 1.12.4
Also disable tests, they're really way too slow.

http://hydra.nixos.org/build/3082076
2012-10-16 14:09:57 -04:00
Peter Simons
a13346961f haskell-cabal2nix: update to version 1.40 2012-10-15 20:23:43 +02:00
Peter Simons
b1701fc609 haskell-alex-meta: update to version 0.3.0.5 2012-10-15 11:52:34 +02:00
Peter Simons
cbc3cb7bd8 haskell-BNFC-meta: update to version 0.4 2012-10-15 11:52:34 +02:00
Peter Simons
e32db14a59 haskell-haddock: add version 2.13.1 2012-10-15 11:52:01 +02:00
Marco Maggesi
2221bf0593 Update camlp5 to 6.06. 2012-10-09 14:03:12 -04:00
Peter Simons
e6f26c5142 haskell-happy-meta: update to version 0.2.0.5 2012-10-08 11:25:28 +02:00
Peter Simons
fc470f1d5a haskell-alex-meta: update to version 0.3.0.4 2012-10-08 11:25:27 +02:00
Peter Simons
8029d18f7a haskell-BNFC-meta: update to version 0.3.0.5 2012-10-08 11:25:27 +02:00
Peter Simons
0a9568df7b haskell-tar: update to version 0.4.0.1 2012-10-08 10:47:32 +02:00
Shea Levy
29fd8d4eaa cmake: Bump 2012-10-08 03:12:42 -04:00
Cyril Roelandt
172abb4b26 Add a "smatch" package.
Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2012-10-05 10:41:44 +02:00
Rickard Nilsson
b63305721d gnum4: Disable tests for ARM.
I can't get the `diversions' to pass on SheevaPlug. It builds fine otherwise.
2012-10-02 08:49:33 +02:00
Peter Simons
878595c2a0 haskell-hslogger: update to version 1.2.1 2012-09-24 12:08:34 +02:00
Peter Simons
df80a705af haskell-happy: add version 1.18.10 2012-09-24 12:08:29 +02:00
Eelco Dolstra
fcc18aad0a Fix some packages that referred to gets()
Glibc no longer defines gets() if _GNU_SOURCE is defined.
2012-09-18 14:05:23 -04:00
Eelco Dolstra
0b900d21f4 Remove unused files 2012-09-18 11:09:18 -04:00
Peter Simons
2460be6f63 haskell-splot: add version 0.3.4 2012-09-18 11:58:12 +02:00
Peter Simons
3865d54f0f haskell-timeplot: add version 1.0.11 2012-09-18 11:58:12 +02:00
Arie Middelkoop
44dec2d5dd fixes the build of coccinelle. 2012-09-12 12:08:21 +02:00
Peter Simons
7596ce3dbb Remove myself as maintainer of these packages. 2012-09-11 18:22:31 +02:00
Arie Middelkoop
504e2ad128 updates coccinelle to 1.0-rc15 2012-09-11 15:02:37 +02:00
Peter Simons
18e9e6832b haddock: add version 2.11.0 and 2.12.0 2012-09-10 14:18:40 +02:00
Peter Simons
2ccd0238cb haskell-jailbreak-cabal: add version 1.0 2012-09-10 12:28:25 +02:00
Peter Simons
11111c7d01 haskell-cabal2nix: update to version 1.39 2012-09-10 12:28:25 +02:00
Lluís Batlle i Rossell
6cdb98a140 valgrind: update to 3.8.0 2012-09-04 15:50:47 +02:00
Peter Simons
702854cb5d haskell-Ebnf2ps: update to version 1.0.11 2012-08-31 09:10:18 +02:00
Peter Simons
410ba4ee20 haskell-SourceGraph: update to version 0.7.0.3 2012-08-30 13:02:00 +02:00
Shea Levy
a94e8d2756 Add npm2nix as a nodePackage 2012-08-26 16:02:04 -04:00
Rob Vermaas
64a57c8f16 Merge branch 'master' of github.com:NixOS/nixpkgs 2012-08-23 11:22:53 +02:00
Rob Vermaas
7b5d312720 Add pstack, a wrapper script for gdb. Used to be part of gdb. 2012-08-23 11:22:06 +02:00
Lluís Batlle i Rossell
518c90d361 cscope: update to 15.8a 2012-08-23 10:15:27 +02:00
Eelco Dolstra
d7fc07705a Add latest patchelf prerelease 2012-08-21 15:57:41 -04:00
Eelco Dolstra
dc2f0f6474 gdb: Update to 7.5 2012-08-21 14:27:00 -04:00
Peter Simons
7f8246c76e haskell-hlint: update to version 1.8.31 2012-08-20 10:34:56 +02:00
Peter Simons
c0dafdf8d5 Merge pull request #94 from aszlig/boomerang
boomerang: New package from the fork.
2012-08-16 06:50:55 -07:00
Shea Levy
10aa2bd5c3 Update autobuild URL
Only tested building autobuild.src, succeeds now, failed before.

Fixes #99.
2012-08-15 05:58:25 -04:00
Rob Vermaas
61817876fc Revert "automake: Disabling tests on mips." Causes infinite recursion on all other platforms.
This reverts commit eadcd7dab6.
2012-08-15 10:13:02 +02:00
Lluís Batlle i Rossell
eadcd7dab6 automake: Disabling tests on mips.
There is a test that fails on mips, and that breaks the nix build.
The text does not exist anymore in automake upstream git, so the next
version may not need this mips-specific disabling.
2012-08-15 09:56:13 +02:00
Eelco Dolstra
6020d52cbe strace: Update to 4.7 2012-08-10 18:54:10 -04:00
aszlig
d10772ec8a boomerang: Fix prefix in dlopen().
We already have the correct library dir in our search path, so we don't need to
prepend lib/ again.
2012-08-10 15:02:19 +02:00
aszlig
a6e266306f boomerang: Fix endless loop in createDirectory().
Fix is on GitHub, so changing the git URL to point to the commit ID of my fix.
2012-08-10 14:59:05 +02:00
aszlig
77b1a7ff42 boomerang: New package from the fork.
This adds the boomerang decompiler, which has been forked on github because of
some years of inactivity.
2012-08-09 19:05:16 +02:00
Peter Simons
705fbf2e8c bison: update to version 2.6.2 2012-08-04 13:00:44 +02:00
Arie Middelkoop
5bc99bc883 Adds Ocaml 4.00.0 (first attempt)
Bumps Findlib to 1.3.3 (required for ocaml 4.00)
2012-07-31 14:09:27 +02:00
Arie Middelkoop
2df1d646c8 frama-c: add version 20111001 2012-07-31 14:08:52 +02:00
Arie Middelkoop
7d70836580 ocamlgraph: update to 1.8.2
Also added the dependency on lablgtk, so that it builds the 'dgraph' module,
which is needed for packaging frama-c. This dependency can be made optional.
2012-07-31 14:08:48 +02:00
Shea Levy
b0552eb9ca Add npm2nix 2012-07-25 18:11:57 -04:00
Peter Simons
72e07c2940 bison: add version 2.6 2012-07-22 18:54:50 +02:00
Peter Simons
03d98589e2 haskell-cabal2nix: update to version 1.38 2012-07-19 12:18:40 +02:00
Peter Simons
be22305ace haskell-BNFC: update to version 2.4.2.1 2012-07-17 22:50:29 +02:00
Peter Simons
abad8b8873 haskell-hslogger: update to version 1.2.0 2012-07-16 11:21:30 +02:00
Peter Simons
ed7a149f7d haskell-cpphs: update to version 1.14 2012-07-14 11:14:40 +02:00
Peter Simons
f2d77b76d7 haskell-hlint: update to version 1.8.30 2012-07-14 11:14:40 +02:00
Peter Simons
719852784a automake-1.11.x: create symlinks for un-versioned directory names
The latest Automake version installs the 'aclocal' and 'automake' directories
with a '-1.11' version suffix. Our setup hook is not prepared to handle that,
so we add those symlinks as a quick fix. A better solution would be to extend
the setup hook for Automake to recognize those kind of version suffixes.
2012-07-10 22:26:27 +02:00
Peter Simons
5c6185d925 automake-1.12.x.nix: disable 't/aclocal7.sh' regression test to avoid failures on Hydra
The test succeeds on my machine, but not when built on Hydra. It would
be great if some Automake guru could examine what exactly is going on.
2012-07-10 17:38:43 +02:00
Peter Simons
bb6c1e9878 automake-1.12.x: update to version 1.12.2 2012-07-10 16:15:30 +02:00
Peter Simons
9ca3cc08f6 automake-1.11.x: update to version 1.11.6 2012-07-10 16:15:30 +02:00
Ludovic Courtès
74c0e77271 automake 1.11: fix test case with Autoconf 2.69 2012-07-07 13:56:19 +02:00
Ludovic Courtès
25adbc91bb automake: add version 1.12.1 2012-07-07 11:27:29 +02:00
Ludovic Courtès
c04a322018 autoconf: update to 2.69 2012-07-07 11:27:29 +02:00
Ludovic Courtès
240d2e9cfa automake: remove versions 1.7 and 1.9 2012-07-07 11:27:29 +02:00
Peter Simons
31d237129d haskell-cabal2nix: update to version 1.37 2012-06-29 12:05:29 +02:00
Ludovic Courtès
18a9c46a46 GNU M4: Disable tests on Solaris. 2012-06-28 15:50:03 +02:00
Lluís Batlle i Rossell
db395d9eb3 cgdb: Packaging cgdb 0.6.6 2012-06-27 20:29:56 +02:00
Lluís Batlle i Rossell
4c06f5fcda gdb: Removing the unused fetchgit from the parameters. 2012-06-27 20:21:44 +02:00
Antono Vasiljev
e350003667 Fix url for guile-lint (geocities is dead now)
It doesn't fix build though...
2012-06-22 14:36:11 -04:00
Eelco Dolstra
b0359cdf11 gdb: Drop outdated "bleeding edge" version
Also note that Nixpkgs shoould ship "bleeding edge" versions unless
there is some compelling reason.
2012-06-21 09:28:17 -04:00
Lluís Batlle i Rossell
e2ec2e27e2 Updating gdb to 7.4.1 2012-06-21 09:40:51 +02:00
Eelco Dolstra
9f350c653a * Ant updated to 1.8.4.
svn path=/nixpkgs/trunk/; revision=34551
2012-06-18 16:58:57 +00:00
Eelco Dolstra
4f19239875 * Clean up the Ant name, e.g. "ant-openjdk-1.8.0RC1" instead of
"ant-<JDK name>".
* Remove openjdkDarwin/ecjDarwin/antDarwin attributes.  Instead
  the openjdk attribute refers to the Darwin package on Darwin.

svn path=/nixpkgs/trunk/; revision=34505
2012-06-13 14:11:52 +00:00
Lluís Batlle i Rossell
c5e03fecce Updating doxygen to 1.8.1. It fixes some parsing issues in 1.8.0.
svn path=/nixpkgs/trunk/; revision=34496
2012-06-13 12:44:52 +00:00
Yury G. Kudryashov
c6d9ead047 Add vanilla pkg-config
Some packages (e.g., telepathy) rely on the upstream way to handle
Requires.private in pkg-config.

svn path=/nixpkgs/trunk/; revision=34492
2012-06-13 07:09:10 +00:00
Peter Simons
ff2b57f957 Updated Haskell packages.
- BNFC-meta: updated to version 0.3.0.3
 - HUnit: added version 1.2.4.3
 - multirec: updated to version 0.7.2
 - resourcet: updated to version 0.3.2.2

svn path=/nixpkgs/trunk/; revision=34489
2012-06-13 07:08:57 +00:00
Peter Simons
d2d77e702e haskell-cabal2nix: updated to version 1.34
svn path=/nixpkgs/trunk/; revision=34476
2012-06-12 08:42:55 +00:00
Peter Simons
f3649161ec haskell-cabal2nix: updated to version 1.33
svn path=/nixpkgs/trunk/; revision=34329
2012-06-03 18:57:30 +00:00
Peter Simons
7ea86fc8a2 Updated Haskell packages.
- hlint: updated to version 1.8.29
 - hscolour: updated to version 1.20.2
 - random-fu: updated to version 0.2.3.0

svn path=/nixpkgs/trunk/; revision=34324
2012-06-03 18:26:09 +00:00
Ludovic Courtès
472a9d6e3d GNU M4: Disable tests on Cygwin.
svn path=/nixpkgs/trunk/; revision=34277
2012-05-29 16:37:28 +00:00
Peter Simons
952fabe3ce haskell-cabal2nix: updated to version 1.32
svn path=/nixpkgs/trunk/; revision=34258
2012-05-28 11:14:19 +00:00
Rickard Nilsson
c7ab74bacc lsof 4.86.
svn path=/nixpkgs/trunk/; revision=34106
2012-05-15 14:09:15 +00:00
Peter Simons
13a10c3e54 Updated Haskell packages.
- authenticate: updated to version 1.2.1.1
 - blaze-html: added version 0.5.0.0 (unused right now because happstack can't deal with it)
 - BNFC-meta: updated to version 0.3.0.2
 - graphviz: patched build to succeed with transformers 0.3.x
 - haskeline: updated to version 0.6.4.7
 - http-conduit: updated to version 1.4.1.3
 - numeric-prelude: updated to version 0.3.0.2
 - pandoc: updated to version 1.9.3

svn path=/nixpkgs/trunk/; revision=34087
2012-05-14 09:56:52 +00:00
Ludovic Courtès
63a9c0e5a1 LCOV: Fix FreeBSD patch.
svn path=/nixpkgs/trunk/; revision=34057
2012-05-11 09:31:37 +00:00
Michel Alexandre Salim
2c64c7fe9d - update leiningen to 1.7.1
- apply patch (applied upstream) to assume rlwrap is present
- update expression to depend on rlwrap
- rebase the nix-specific patch to apply cleanly

svn path=/nixpkgs/trunk/; revision=34056
2012-05-11 03:36:13 +00:00
Eelco Dolstra
3bb2f92106 * Final sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34045
2012-05-10 14:41:16 +00:00
Andres Löh
50a51c7654 Reverting some more Haskell changes, to make things complete again.
svn path=/nixpkgs/trunk/; revision=34044
2012-05-10 14:23:48 +00:00
Peter Simons
c07854ace4 Updated Haskell packages.
- DSH: updated to version 0.7.8.1
 - alex: updated to versino 3.0.2
 - certificate: updated to version 1.2.2
 - language-c: updated to version 0.4.2
 - xhtml: updated to version 3000.2.1

Also, downgraded GHC 7.4.1 environment to use mtl 2.0 and transformers 2.0 to
avoid lots of build errors, i.e. with monad-par.

svn path=/nixpkgs/trunk/; revision=34042
2012-05-10 10:28:49 +00:00
Eelco Dolstra
5bdea119d4 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=33971
2012-05-02 13:19:07 +00:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Peter Simons
c5c473b469 haskell-SourceGraph: updated to version 0.7.0.2
svn path=/nixpkgs/trunk/; revision=33843
2012-04-19 15:11:58 +00:00
Michael Raskin
969c89aa2f Update xxdiff
svn path=/nixpkgs/trunk/; revision=33818
2012-04-17 17:12:56 +00:00
Nicolas Pierron
7b7dd238fc Add dulwich (git filesystem in python).
Add bugz (command line tool for bugzilla)
Add gitBz (bugzilla in git)

svn path=/nixpkgs/trunk/; revision=33800
2012-04-15 23:48:11 +00:00
Eelco Dolstra
65ddcaa3ed * Bison: use an absolute path to M4. Otherwise Bison will silently
fail (due to a SIGPIPE) if M4 isn't installed.

svn path=/nixpkgs/branches/stdenv-updates/; revision=33772
2012-04-13 12:32:51 +00:00
Ludovic Courtès
eb7575138a Coccinelle: Make sure Python modules are looked up in the right place.
svn path=/nixpkgs/trunk/; revision=33763
2012-04-12 15:30:02 +00:00
Ludovic Courtès
4cedde0da4 GNU cppi 1.16.
svn path=/nixpkgs/trunk/; revision=33702
2012-04-09 20:51:22 +00:00
Ludovic Courtès
f62c274011 GNU GLOBAL 6.2.2.
svn path=/nixpkgs/trunk/; revision=33697
2012-04-09 20:50:59 +00:00
Ludovic Courtès
e5c7358336 GNU help2man 1.40.8.
svn path=/nixpkgs/trunk/; revision=33694
2012-04-09 20:50:45 +00:00
Arie Middelkoop
2b18ccf305 * Added "easytag", a GUI for organizing id3tags in mp3s.
* Updated some ocaml packages.
* Updated coccinelle.

svn path=/nixpkgs/trunk/; revision=33674
2012-04-09 09:42:20 +00:00
Peter Simons
9b0323859f Updated Haskell packages.
- cabal2nix: updated to version 1.31
 - gloss: updated to version 1.7.2.1
 - repa-algorithms: updated to version 3.1.0.1
 - repa-bytestring: deleted obsolete package
 - repa-examples: updated to version 3.1.0.1
 - repa-io: updated to version 3.1.0.1
 - repa: updated to version 3.1.0.1
 - semigroups: updated to version 0.8.0.1

svn path=/nixpkgs/trunk/; revision=33659
2012-04-07 11:59:28 +00:00
Eelco Dolstra
07b7aa1f38 * Revert r33558, it breaks various packages (see
e.g. http://hydra.nixos.org/build/2363689).

svn path=/nixpkgs/branches/stdenv-updates/; revision=33560
2012-04-04 08:59:03 +00:00
Peter Simons
7295830f7e Updated Haskell packages.
- aeson: updated to version 0.6.0.1
 - alex-meta: updated to version 0.3.0.3
 - BNFC-meta: updated to version 0.3.0.1
 - hakyll: updated to version 3.2.7.1
 - happy-meta: updated to version 0.2.0.4
 - http-enumerator: updated to version 0.7.3.2
 - multiarg: updated to version 0.2.0.0

Disabled Haddock documentation for the following packages, because the
input crashes Haddock:

 - BNFC-meta
 - alex-meta

Re-enabled Haddock documentation for the following packages, because
previously occurring errors have been fixed:

 - ConfigFile
 - HDBC-odbc
 - Hipmunk
 - instant-generics
 - RepLib
 - type-equality
 - xmonad
 - xmonad-extras
 - yesod-core

svn path=/nixpkgs/trunk/; revision=33559
2012-04-03 18:37:58 +00:00
Peter Simons
fe497cdcab automake: updated to version 1.11.4
svn path=/nixpkgs/branches/stdenv-updates/; revision=33558
2012-04-03 18:00:51 +00:00
Peter Simons
25fe5d43fe Updated Haskell packages.
- MemoTrie: updated to version 0.4.11
 - X11: updated to version 1.6.0
 - derive: updated to version 2.5.8
 - gloss: updated to version 1.7.1.1
 - haskell-src-exts: updated to version 1.13.0
 - haskell-src-meta: updated to version 0.5.1.2
 - hlint: updated to version 1.8.28

svn path=/nixpkgs/trunk/; revision=33528
2012-04-01 19:51:53 +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
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
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
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
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
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
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
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
e49110e221 scons: updated to version 2.1.0
svn path=/nixpkgs/trunk/; revision=33030
2012-03-13 08:29:18 +00:00
Eelco Dolstra
891dd9121b * Undo accidental commit.
svn path=/nixpkgs/trunk/; revision=33021
2012-03-12 15:34:00 +00:00
Eelco Dolstra
29df27f469 * Fix some Hydra dependencies that broke due to the Perl upgrade.
svn path=/nixpkgs/trunk/; revision=33020
2012-03-12 15:31:14 +00:00
Peter Simons
dd90a8b709 haskell-cabal2nix: updated to version 1.28
svn path=/nixpkgs/trunk/; revision=33016
2012-03-12 14:15:14 +00:00
Peter Simons
c86a90c4e9 Updating Haskell packages.
- Agda-executable: updated to version 2.3.0.1
 - Agda: updated to version 2.3.0.1
 - gio: added version 0.12.3
 - hamlet: updated to version 0.10.9.1
 - leksah-server: updated to version 0.12.0.4
 - leksah: updated to version 0.12.0.3
 - ltk: updated to version 0.12.0.0
 - packages.nix: cosmetic change
 - pandoc: updated to version 1.9.1.2
 - polyparse: added version 1.8
 - shakespeare-css: updated to version 0.10.8
 - shakespeare-i18n: updated to version 0.0.2.1
 - shakespeare-js: updated to version 0.11.2
 - shakespeare-text: updated to version 0.11
 - shakespeare: updated to version 0.11
 - tls: updated to version 0.9.1
 - unordered-containers: updated to version 0.2.0.1
 - uuagc: updated to version 0.9.40.3
 - yesod-core: updated to version 0.10.2.2
 - yesod-form: updated to version 0.4.2.1
 - yesod: updated to version 0.10.1.4

svn path=/nixpkgs/trunk/; revision=33015
2012-03-12 14:06:18 +00:00
Yury G. Kudryashov
2a074000be patch and fixCmakeFiles do not commute
svn path=/nixpkgs/trunk/; revision=32876
2012-03-08 07:59:56 +00:00
Lluís Batlle i Rossell
02ac39aef8 Setting myself as maintainer for xsane and cdecl, and telling hydra to build them.
svn path=/nixpkgs/trunk/; revision=32868
2012-03-07 22:20:23 +00:00
Lluís Batlle i Rossell
f1f834f260 Adding patches for cdecl to build. I picked them from:
http://gentoo-overlays.zugaina.org/gentoo/portage/dev-util/cdecl/files/


svn path=/nixpkgs/trunk/; revision=32866
2012-03-07 22:12:12 +00:00
Yury G. Kudryashov
614d81046c Remove cmake_2_8_7: default is already 2.8.7
svn path=/nixpkgs/trunk/; revision=32827
2012-03-06 14:35:30 +00:00
Yury G. Kudryashov
b7642bfdfb svn merge ^/nixpkgs/trunk
I need the latest KDE-related changes

svn path=/nixpkgs/branches/stdenv-updates/; revision=32806
2012-03-05 21:01:47 +00:00
Peter Simons
05d92999a0 Updated haskell packages.
- HDBC-postgresql updated to version 2.3.2.1
 - HsOpenSSL updated to version 0.10.1.3
 - hledger-web updated to version 0.17.1
 - persistent updated to version 0.8.0.2
 - xml-conduit updated to version 0.5.3.1
 - haddock: added version 2.10.0

svn path=/nixpkgs/trunk/; revision=32799
2012-03-05 11:58:21 +00:00
Yury G. Kudryashov
57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Lluís Batlle i Rossell
b479679b94 Fixing typos in the oprofile expression
svn path=/nixpkgs/trunk/; revision=32752
2012-03-03 12:15:58 +00:00
Lluís Batlle i Rossell
5a568ee185 Updating oprofile
svn path=/nixpkgs/trunk/; revision=32751
2012-03-03 11:30:44 +00:00
Ludovic Courtès
d8849a045e lcov: Fix build on FreeBSD.
svn path=/nixpkgs/trunk/; revision=32746
2012-03-02 15:57:36 +00:00
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Eelco Dolstra
55ce36faee * Updated Leiningen to 1.7.0 (contributed by Phil Hagelberg; added a
call to patchShebangs to fix the reference to /bin/bash).

svn path=/nixpkgs/trunk/; revision=32698
2012-02-29 14:35:34 +00:00
Ludovic Courtès
026f6e7697 Doxygen: Reinstate version 1.7.
svn path=/nixpkgs/trunk/; revision=32672
2012-02-28 10:08:21 +00:00
Peter Simons
de9ebc460c Added meta.maintainers section.
svn path=/nixpkgs/trunk/; revision=32669
2012-02-28 00:10:09 +00:00
Peter Simons
b2356973fe haskell-haskdogs: wrapper around hasktags that fetches sources for dependencies from hackage
svn path=/nixpkgs/trunk/; revision=32667
2012-02-28 00:10:02 +00:00
Peter Simons
be0acc8bc1 hasktags: ctags/etags for haskell sources
svn path=/nixpkgs/trunk/; revision=32665
2012-02-28 00:09:56 +00:00
Lluís Batlle i Rossell
49cb081019 Updating doxygen to 1.8.0
svn path=/nixpkgs/trunk/; revision=32619
2012-02-27 16:45:35 +00:00
Michael Raskin
4ff245c5de Add fresh cmake
svn path=/nixpkgs/trunk/; revision=32611
2012-02-27 06:22:47 +00:00
Lluís Batlle i Rossell
183d05a0d7 Setting the cmake build type Release in its setup-hook, for all cmake
projects to be built in Release by default.

Some packages were not getting optimisation flags, like rigsofrods.


svn path=/nixpkgs/branches/stdenv-updates/; revision=32574
2012-02-26 11:27:45 +00:00
Shea Levy
ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Lluís Batlle i Rossell
675e16f805 Fixing jam for i686-linux. That should allow building trigger rally.
svn path=/nixpkgs/trunk/; revision=32557
2012-02-25 16:47:21 +00:00
Peter Simons
4b3e14f5d0 Deleted deprecated packages:
haskell-containers-deepseq
  haskell-control-monad-attempt
  haskell-data-object
  haskell-data-object-yaml
  haskell-frown
  haskell-jsonEnumerator
  haskell-neither
  haskell-pool
  haskell-web-routes
  haskell-web-routes-quasi
  haskell-xml-enumerator

svn path=/nixpkgs/trunk/; revision=32538
2012-02-24 11:31:19 +00:00
Yury G. Kudryashov
38e3d7bc86 svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Yury G. Kudryashov
166e87319c Fix cmake-2.6.4 build (add xmlrpc-c)
svn path=/nixpkgs/trunk/; revision=32505
2012-02-23 11:27:47 +00:00
Yury G. Kudryashov
417124626b Add cmake-2.6.4
This is the minimum version required for KDE-4, so I need it to ensure that my
cmake code works with cmake-2.6.4.

svn path=/nixpkgs/trunk/; revision=32504
2012-02-23 11:27:43 +00:00
Peter Simons
0258bf1ef1 premake: fixed meta.license field
svn path=/nixpkgs/trunk/; revision=32492
2012-02-22 21:14:53 +00:00
Peter Simons
444b195a3d new package: premake -- lua based build configuration tool
this is version 3, while 4 already exists.
But I only need this tool for 'aacskeys', which doesn't work with 4

svn path=/nixpkgs/trunk/; revision=32490
2012-02-22 20:29:42 +00:00
Eelco Dolstra
e64443baf1 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
Peter Simons
9cc0657c86 haskell-hlint: updated to version 1.8.24
svn path=/nixpkgs/trunk/; revision=32422
2012-02-20 10:45:02 +00:00
Eelco Dolstra
a50d32e4db * Fix oprofile.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32402
2012-02-19 17:03:38 +00:00
Yury G. Kudryashov
313a029f16 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Eelco Dolstra
b23126fcc3 * Include the kernel version in kernel-specific packages so that they
can be distinguished in nix-env -qa output.

svn path=/nixpkgs/trunk/; revision=32352
2012-02-17 14:32:28 +00:00
Yury G. Kudryashov
79d0d410cb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
2012-02-17 13:43:31 +00:00
Arie Middelkoop
f8b1a1db26 Coccinelle: wrapper for 'spatch.opt'.
There was already a wrapper for spatch, but not for the optimized version 'spatch.opt'.
Actually, for coccinelle in nixpkgs, I'd propose to only provide the optimized version of
spatch, as it makes no difference for the end user.

svn path=/nixpkgs/trunk/; revision=32341
2012-02-16 23:55:46 +00:00
Peter Simons
255dc2478d haskell-cabal2nix: updated to version 1.27
svn path=/nixpkgs/trunk/; revision=32332
2012-02-16 17:48:28 +00:00
Yury G. Kudryashov
e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons
cb28766341 Re-generated Haskell package descriptions with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32327
2012-02-16 14:05:41 +00:00
Peter Simons
ca1912036b cppcheck: added version 1.53
svn path=/nixpkgs/trunk/; revision=32302
2012-02-15 16:07:45 +00:00
Peter Simons
c5d870f1d8 sparse: updated to version 0.4.4
svn path=/nixpkgs/trunk/; revision=32301
2012-02-15 16:07:38 +00:00
Peter Simons
ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Peter Simons
844d950d13 haskell-cabal2nix: updated to version 1.26
svn path=/nixpkgs/trunk/; revision=32291
2012-02-14 16:59:04 +00:00
Peter Simons
3c63b41aa4 haskell-tar: added version 0.4.0.0
svn path=/nixpkgs/trunk/; revision=32277
2012-02-14 16:58:27 +00:00
Yury G. Kudryashov
f7886ac78b svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
2012-02-13 19:47:36 +00:00
Peter Simons
d53d97ad5e haskell-HaRe: updated to version 0.6.0.2
svn path=/nixpkgs/trunk/; revision=32238
2012-02-13 09:01:46 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Peter Simons
d450c760f8 haskell-Ebnf2ps: updated to version 1.0.10
svn path=/nixpkgs/trunk/; revision=32149
2012-02-08 23:06:04 +00:00
Peter Simons
0df0d9ad9c Ebnf2ps: the package is now available from Hackage
svn path=/nixpkgs/trunk/; revision=32147
2012-02-08 22:07:42 +00:00
Peter Simons
6789ec0c84 haskell-cpphs: updated to version 1.13.3
svn path=/nixpkgs/trunk/; revision=32107
2012-02-07 10:34:43 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Peter Simons
31298a29ae haskell-hlint: updated to version 1.8.23
svn path=/nixpkgs/trunk/; revision=32069
2012-02-06 14:28:02 +00:00
Peter Simons
20f8c35e07 haskell-happy: added version 1.18.9
svn path=/nixpkgs/trunk/; revision=32052
2012-02-06 14:27:18 +00:00
Peter Simons
dbafd99a0a Moved python debugger into development/tools hierarchy.
svn path=/nixpkgs/trunk/; revision=32027
2012-02-04 09:30:53 +00:00
Peter Simons
868d8c2d9c haskell-cabal2nix: updated to version 1.25
svn path=/nixpkgs/trunk/; revision=32021
2012-02-03 21:00:32 +00:00
Ludovic Courtès
7dc9366796 GNU help2man: Wrap the program to have a correct $PERL5LIB.
svn path=/nixpkgs/trunk/; revision=31948
2012-01-31 15:50:51 +00:00
Ludovic Courtès
27100c36c4 GNU help2man 1.40.5.
svn path=/nixpkgs/trunk/; revision=31947
2012-01-31 15:31:23 +00:00
Peter Simons
b2bbcc7d5f haskell-cabal-ghci: updated to version 0.2.1
svn path=/nixpkgs/trunk/; revision=31932
2012-01-30 10:52:13 +00:00
Peter Simons
086e9a090b haskell-cabal2nix: updated to version 1.24
svn path=/nixpkgs/trunk/; revision=31921
2012-01-29 16:24:14 +00:00
Yury G. Kudryashov
71c28d0e33 Use meta.platforms
svn path=/nixpkgs/trunk/; revision=31909
2012-01-28 14:39:56 +00:00
Yury G. Kudryashov
b31c67e24d svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
2012-01-27 16:43:39 +00:00
Lluís Batlle i Rossell
29ca4d272f Updating gdb. I did not update the 'bleeding edge' thing though. That should be
better named to "one git checkout" instead of bleeding edge.


svn path=/nixpkgs/trunk/; revision=31883
2012-01-27 15:11:17 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Peter Simons
d9de74edd6 haskell-hlint: updated to version 1.8.21
svn path=/nixpkgs/trunk/; revision=31862
2012-01-26 14:20:27 +00:00
Peter Simons
adc8828c96 development/tools/parsing/ebnf2ps: added initial version 1.0.8
svn path=/nixpkgs/trunk/; revision=31855
2012-01-26 14:20:06 +00:00
Peter Simons
db98fa936b astyle: added initial version 2.02.1
svn path=/nixpkgs/trunk/; revision=31835
2012-01-25 13:52:18 +00:00
Arie Middelkoop
3226f48b17 coccinelle: comment update in nix expr..
svn path=/nixpkgs/trunk/; revision=31828
2012-01-24 22:08:17 +00:00
Peter Simons
c7dc7f5e87 haskell-tar: updated to version 0.3.2.0
svn path=/nixpkgs/trunk/; revision=31823
2012-01-24 15:06:39 +00:00
Eelco Dolstra
1e886749b5 * Don't replace /opt if it's followed by something other than
whitespace or a /, otherwise strings such as /foo/opticaldrive.c
  will be broken.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31793
2012-01-23 13:16:51 +00:00
Lluís Batlle i Rossell
3b4528fd7c Reverting the pkgconfig update. Eelco says it does not work.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31755
2012-01-21 09:05:43 +00:00
Lluís Batlle i Rossell
9ed137c45b Picking in pkgconfig the latest config.guess, as it does not know
mips64el-linux 3.2.0.

svn path=/nixpkgs/trunk/; revision=31754
2012-01-21 01:29:17 +00:00
Lluís Batlle i Rossell
8ea631310b Making the ccacheWrapper a bit nicer. More flexible, specifically.
svn path=/nixpkgs/trunk/; revision=31753
2012-01-21 01:29:06 +00:00
Lluís Batlle i Rossell
f5ddd22576 Updating pkgconfig.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31752
2012-01-21 00:47:03 +00:00
Lluís Batlle i Rossell
4a1c721c01 Changing every reference from mips64-linux to mips64el-linux. That's
what the new nix thinks the fuloong is.

Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.

svn path=/nixpkgs/trunk/; revision=31751
2012-01-21 00:34:51 +00:00
Lluís Batlle i Rossell
2f2ce81046 Modifying the all-packages stdenv changer, so it allows having a global stdenv
wrapper.

This will fail for crossStdenv, but it allows a wrapper that uses ccache for
example. That's so described in all-packages.nix around 'ccache'.


svn path=/nixpkgs/trunk/; revision=31747
2012-01-21 00:25:30 +00:00
Eelco Dolstra
28780d27d1 * cmake: don't use replace-literal.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31736
2012-01-20 15:10:28 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Yury G. Kudryashov
d0c8b530e9 leiningen: added package version 1.6.2
svn path=/nixpkgs/trunk/; revision=31716
2012-01-19 20:34:59 +00:00
Eelco Dolstra
26affd7238 * Doh!
svn path=/nixpkgs/branches/stdenv-updates/; revision=31699
2012-01-19 15:02:47 +00:00
Eelco Dolstra
0e353fdd5a * Don't use substite() here, because the bash binary in the bootstrap
tools (4.1.2) seems to have performance problems doing pattern
  substitutions on large strings (it takes several minutes on
  binutils' Makefile.in).  Bash 4.2 seems to be fine.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31698
2012-01-19 14:55:12 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Ludovic Courtès
300372af20 GNU Automake 1.11.2.
svn path=/nixpkgs/trunk/; revision=31667
2012-01-18 20:52:12 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
48ee2523da * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
2012-01-18 15:53:12 +00:00
Peter Simons
5bcd4dd4dd haskell-threadscope: updated to version 0.2.1
svn path=/nixpkgs/trunk/; revision=31592
2012-01-16 11:47:59 +00:00
Arie Middelkoop
c87285c255 Updated the coccinelle package to the latest release (1.0.0-RC9).
Added additional ocaml modules which are needed for coccinelle.

svn path=/nixpkgs/trunk/; revision=31579
2012-01-16 10:20:13 +00:00
Yury G. Kudryashov
9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Yury G. Kudryashov
a7f52f0fd0 xxdiff-4.0 beta (Qt4-based)
svn path=/nixpkgs/trunk/; revision=31422
2012-01-07 20:23:35 +00:00