Commit graph

17695 commits

Author SHA1 Message Date
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
Yury G. Kudryashov e9974606a5 kmymoney: explicitly pass pkgconfig
svn path=/nixpkgs/trunk/; revision=32173
2012-02-10 10:13:52 +00:00
Yury G. Kudryashov c84eb70b51 Latest exosip and linphone
svn path=/nixpkgs/trunk/; revision=32172
2012-02-10 10:13:48 +00:00
Yury G. Kudryashov 3217e1c5c3 djview-4.8, fix build with qt-4.8
svn path=/nixpkgs/trunk/; revision=32171
2012-02-10 10:13:44 +00:00
Yury G. Kudryashov f9c551a41f hugin-2011.4.0
svn path=/nixpkgs/trunk/; revision=32170
2012-02-10 10:13:39 +00:00
Yury G. Kudryashov f8d0599756 Add tclap (required for new hugin)
svn path=/nixpkgs/trunk/; revision=32169
2012-02-10 10:13:34 +00:00
Shea Levy f77fa09f56 v8: Get building on darwin
svn path=/nixpkgs/trunk/; revision=32168
2012-02-10 05:22:58 +00:00
Lluís Batlle i Rossell 232da3a29d Adding a new url for isl.src. The current is only meant for the last version.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32167
2012-02-09 19:53:01 +00:00
Lluís Batlle i Rossell ab93b3a032 Updating imagemagick; I think it's meant to build with the new zlib 1.2.6.
I'll let hydra try it.

I don't update this in trunk because a lot depends on this.


svn path=/nixpkgs/branches/stdenv-updates/; revision=32166
2012-02-09 19:45:31 +00:00
Peter Simons 2d48075c4a haskell-packages.nix: disable the obsolete 'HaRe' tool
svn path=/nixpkgs/trunk/; revision=32165
2012-02-09 14:53:07 +00:00
Peter Simons 792bbd3522 haskell-packages.nix: disable the obsolete 'frown' tool
svn path=/nixpkgs/trunk/; revision=32164
2012-02-09 14:53:05 +00:00
Peter Simons bfd1783a06 haskell-packages.nix: fixed obsolete reference to json_0_5 attribute
svn path=/nixpkgs/trunk/; revision=32163
2012-02-09 14:41:36 +00:00
Peter Simons 1e8e60da41 haskell-json: fix build with GHC 7.4.x
svn path=/nixpkgs/trunk/; revision=32162
2012-02-09 14:38:03 +00:00
Peter Simons 24ff52e62e haskell-json: dropped obsolete version 0.4.4
svn path=/nixpkgs/trunk/; revision=32161
2012-02-09 14:38:01 +00:00
Eelco Dolstra 3a4595d679 * zlib should be a propagated build input of libzip.
svn path=/nixpkgs/trunk/; revision=32160
2012-02-09 14:22:13 +00:00
Eelco Dolstra 2051002180 * libzip updated to 0.10.
svn path=/nixpkgs/trunk/; revision=32159
2012-02-09 14:09:08 +00:00
Peter Simons 1a7d345aab wxmaxima: updated to version 12.01.0
svn path=/nixpkgs/trunk/; revision=32158
2012-02-09 13:22:57 +00:00
Peter Simons db29c078b3 haskell-texmath: updated to version 0.6.0.2
svn path=/nixpkgs/trunk/; revision=32157
2012-02-09 12:54:05 +00:00
Peter Simons 4ef705c1ef haskell-haxr: updated to version 3000.8.5
svn path=/nixpkgs/trunk/; revision=32156
2012-02-09 12:54:03 +00:00
Peter Simons 0333114f58 haskell-happstack-data: updated to version 6.0.1
svn path=/nixpkgs/trunk/; revision=32155
2012-02-09 12:54:00 +00:00
Ludovic Courtès 452cdc59f1 GNU Guile: Use the right configure option name.
svn path=/nixpkgs/trunk/; revision=32154
2012-02-09 10:07:42 +00:00
Lluís Batlle i Rossell f113fbb5dd Fixing the xine lib build, for problems building with zlib 1.2.6
svn path=/nixpkgs/branches/stdenv-updates/; revision=32153
2012-02-09 09:35:54 +00:00
Ludovic Courtès 1d44b332ed GNU Guile: Disable pthread support on FreeBSD.
svn path=/nixpkgs/trunk/; revision=32152
2012-02-09 09:16:17 +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 d2bbefa08e haskell-hint: updated to version 0.3.3.4
svn path=/nixpkgs/trunk/; revision=32148
2012-02-08 23:06:01 +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
Lluís Batlle i Rossell 3782f740a0 Adding libwebp
svn path=/nixpkgs/trunk/; revision=32146
2012-02-08 21:37:20 +00:00
Lluís Batlle i Rossell d83e1b4b5d Updating libvorbis and libogg, and enabling by default libvorbis and libxvid on ffmpeg.
I think there are little drawbacks on that, whlie there are benefits.


svn path=/nixpkgs/trunk/; revision=32145
2012-02-08 19:54:16 +00:00
Eelco Dolstra 1e0012c1ab * Tribler updated to 5.5.10.
svn path=/nixpkgs/trunk/; revision=32144
2012-02-08 16:46:09 +00:00
Eelco Dolstra ff1bfcaefb * Added fuse-zip, a FUSE filesystem for accessing zip files.
svn path=/nixpkgs/trunk/; revision=32143
2012-02-08 15:45:26 +00:00
Eelco Dolstra f680a3c175 * Put back the Ubuntu 10.10 images that I accidentally removed.
svn path=/nixpkgs/trunk/; revision=32141
2012-02-08 11:38:46 +00:00
Peter Simons 6a46fac659 haskell-zlib-bindings: updated to version 0.0.3.2
svn path=/nixpkgs/trunk/; revision=32140
2012-02-08 09:22:40 +00:00
Peter Simons 115ec41ba1 haskell-libmpd: updated to version 0.7.1
svn path=/nixpkgs/trunk/; revision=32139
2012-02-08 09:22:38 +00:00
Peter Simons 8be0696c79 haskell-hamlet: updated to version 0.10.8
svn path=/nixpkgs/trunk/; revision=32138
2012-02-08 09:22:35 +00:00
Peter Simons efd8bf8677 haskell-gloss: updated to version 1.6.1.1
svn path=/nixpkgs/trunk/; revision=32137
2012-02-08 09:22:32 +00:00
Peter Simons 07bf4c6f76 haskell-asn1-data: updated to version 0.6.1.3
svn path=/nixpkgs/trunk/; revision=32136
2012-02-08 09:22:28 +00:00
Yury G. Kudryashov 0de0994bc4 zlib: largefile_source problem fixed upstream
svn path=/nixpkgs/branches/stdenv-updates/; revision=32135
2012-02-08 05:05:46 +00:00
Eelco Dolstra 34c8b2fa31 * Updated Postgres to 9.0.6 (contributed by Bryce L Nordgren).
svn path=/nixpkgs/trunk/; revision=32134
2012-02-07 23:31:40 +00:00
Lluís Batlle i Rossell 1f3f0e6b65 Updating zlib. The zlib.net site is down, but I could pick the file from a gentoo distfiles mirror.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32133
2012-02-07 21:51:03 +00:00
Peter Simons 85f4a69a14 nbd: the test suite still doesn't work on Hydra
svn path=/nixpkgs/trunk/; revision=32132
2012-02-07 21:45:05 +00:00
Yury G. Kudryashov 912637f33a Enable/disable libreoffice build in nixpkgs.config, not in tree.
I've tried to use override instead of getConfig but failed because exception is
thrown before the function is called with force = true.

svn path=/nixpkgs/trunk/; revision=32131
2012-02-07 21:03:25 +00:00
Yury G. Kudryashov 043000cf35 Fix eval
svn path=/nixpkgs/trunk/; revision=32130
2012-02-07 21:03:20 +00:00
Yury G. Kudryashov a8dba7888b Move gtkLibs3x to top-level namespace, gtk+-3.2.3
Cherry-pick /nixpkgs/branches/glib-2.30@32044

svn path=/nixpkgs/trunk/; revision=32129
2012-02-07 21:03:16 +00:00
Yury G. Kudryashov acd9d6b42e pango-1.29: use fetchurl
cherry-pick /nixpkgs/branches/glib-2.30@32043

svn path=/nixpkgs/trunk/; revision=32128
2012-02-07 21:03:12 +00:00
Peter Simons 07a925d08a nbd: re-enable the test suite to see what happens
svn path=/nixpkgs/trunk/; revision=32127
2012-02-07 19:54:31 +00:00
Peter Simons 1451109c95 nbd: linking with -lrt is no longer necessary because we don't link glib statically anymore
svn path=/nixpkgs/trunk/; revision=32126
2012-02-07 19:54:28 +00:00
Peter Simons a62fa4480a nbd: updated to version 2.9.25
svn path=/nixpkgs/trunk/; revision=32125
2012-02-07 19:54:25 +00:00
Peter Simons 4afaf0be23 emacs-w3m: updated the SHA256 hash
Thanks Ludo!

svn path=/nixpkgs/trunk/; revision=32124
2012-02-07 17:45:47 +00:00
Florian Friesdorf 2f7102afc0 emacs 24.0.93
svn path=/nixpkgs/trunk/; revision=32123
2012-02-07 17:40:05 +00:00
Florian Friesdorf df12f0bd01 emacs js2-mode
svn path=/nixpkgs/trunk/; revision=32122
2012-02-07 17:40:02 +00:00