Commit graph

17155 commits

Author SHA1 Message Date
Yury G. Kudryashov
b0f1da6b75 svn merge /path/to/nixpkgstrunk; resolve ghostscript as "theirs-full"
svn path=/nixpkgs/branches/libpng15/; revision=31250
2012-01-03 18:13:10 +00:00
Yury G. Kudryashov
29d613ba0e Add a warning to cmake/default.nix
svn path=/nixpkgs/trunk/; revision=31248
2012-01-03 18:00:02 +00:00
Peter Simons
b916544651 Updated GNU ghostscript to version 9.04.1.
- Merged the builder.sh file into the expression itself.

 - Need to force "-lz" flag to fix linker errors. This is probably a bug
   in the build system, so further updates may not need that hack.

 - Need to force "-rpath=${freetype}/lib" flag to fix run-time errors
   because gs can't find the libfreetype.so.6 library. I don't quite
   understand why that path isn't hard-coded to begin with.

svn path=/nixpkgs/trunk/; revision=31247
2012-01-03 17:50:10 +00:00
Eelco Dolstra
5386b47ead * Revert. Cmake is still broken on i686-linux.
svn path=/nixpkgs/trunk/; revision=31244
2012-01-03 17:22:11 +00:00
Yury G. Kudryashov
71c6de7338 cmake-2.8.7
svn path=/nixpkgs/trunk/; revision=31241
2012-01-03 16:38:53 +00:00
Yury G. Kudryashov
a988b581a0 Add libkvkontakte
svn path=/nixpkgs/trunk/; revision=31240
2012-01-03 16:15:22 +00:00
Yury G. Kudryashov
53739d23dc Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31239
2012-01-03 15:50:39 +00:00
Yury G. Kudryashov
5321904c4e ortp-0.18.0
svn path=/nixpkgs/trunk/; revision=31238
2012-01-03 15:39:05 +00:00
Eelco Dolstra
ab13fb0c34 * Firefox updated to 9.0.1.
svn path=/nixpkgs/trunk/; revision=31236
2012-01-03 15:18:03 +00:00
Lluís Batlle i Rossell
22e91e721e Removing references to openssl 1.0.0e
svn path=/nixpkgs/trunk/; revision=31234
2012-01-03 14:32:41 +00:00
Lluís Batlle i Rossell
2833652d5a Moving openssl 1.0.0e.nix to default.nix, as Eelco suggests. The 1.0.0e expression was moremaintained.
When I updated openssl, I didn't know there was such a file.


svn path=/nixpkgs/trunk/; revision=31233
2012-01-03 14:31:11 +00:00
Florian Friesdorf
9e050a9226 iwlwifi-5150-ucode: add Intel 5150 wireless firmware package
Author:    Sergey Mironov <ierton@gmail.com>

svn path=/nixpkgs/trunk/; revision=31232
2012-01-03 14:14:58 +00:00
Yury G. Kudryashov
3af2d4a89e Add kde4.networkmanagement
You still need to start NetworkManager daemon manually to use this widget

svn path=/nixpkgs/trunk/; revision=31229
2012-01-03 13:39:09 +00:00
Yury G. Kudryashov
7fdef7ca0d Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31225
2012-01-03 11:39:50 +00:00
Yury G. Kudryashov
e785aae6e8 Fix most packages depending on fltk
I failed to build cinepaint

svn path=/nixpkgs/trunk/; revision=31224
2012-01-03 10:32:56 +00:00
Yury G. Kudryashov
046ddeb32a fltk-1.3.0
svn path=/nixpkgs/trunk/; revision=31223
2012-01-03 10:02:33 +00:00
Yury G. Kudryashov
67add4eec5 pngcrush-1.7.22
svn path=/nixpkgs/branches/libpng15/; revision=31218
2012-01-02 19:25:08 +00:00
Yury G. Kudryashov
b08a07a4eb Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31217
2012-01-02 19:24:08 +00:00
Yury G. Kudryashov
995d3d3e03 tulip-3.6.1
svn path=/nixpkgs/trunk/; revision=31216
2012-01-02 18:36:04 +00:00
Lluís Batlle i Rossell
709ae01f34 Updating openssl.
svn path=/nixpkgs/trunk/; revision=31215
2012-01-02 18:18:04 +00:00
Yury G. Kudryashov
5ca5a0242a naev-0.5.0
svn path=/nixpkgs/trunk/; revision=31214
2012-01-02 17:37:53 +00:00
Yury G. Kudryashov
98e4666dcd update xfig, pull a few patches from debian
svn path=/nixpkgs/trunk/; revision=31213
2012-01-02 15:29:14 +00:00
Peter Simons
38f6d36e91 git-annex: updated to version 3.20111231
svn path=/nixpkgs/trunk/; revision=31212
2012-01-02 14:51:26 +00:00
Peter Simons
e195f5b358 monad-control: use consistent naming scheme for all supported versions
svn path=/nixpkgs/trunk/; revision=31211
2012-01-02 14:51:23 +00:00
Peter Simons
b21a827d2a ikiwiki: updated to version 3.20111229
svn path=/nixpkgs/trunk/; revision=31210
2012-01-02 14:51:20 +00:00
Yury G. Kudryashov
cb2202e499 libpano13-2.9.18
svn path=/nixpkgs/trunk/; revision=31209
2012-01-02 14:25:03 +00:00
Yury G. Kudryashov
ae88794123 dia-0.97.2
svn path=/nixpkgs/trunk/; revision=31208
2012-01-02 14:13:03 +00:00
Yury G. Kudryashov
dd02a842e6 Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31206
2012-01-02 13:45:14 +00:00
Yury G. Kudryashov
455d1e934b Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31205
2012-01-02 13:43:54 +00:00
Yury G. Kudryashov
7928d532a2 Fix dia.name
svn path=/nixpkgs/trunk/; revision=31204
2012-01-02 13:42:11 +00:00
Yury G. Kudryashov
15ab248bca Revert "Use qt-4.8 by default"
This reverts r31196. Will re-apply after fixing most packages broken by this
change.

svn path=/nixpkgs/trunk/; revision=31203
2012-01-02 12:54:22 +00:00
Yury G. Kudryashov
b8a3e5fbc9 kdelibs: depend on libjpeg
svn path=/nixpkgs/trunk/; revision=31202
2012-01-02 12:52:43 +00:00
Yury G. Kudryashov
a6c6878f5b libdbusmenu-qt-0.9.0, disable apidocs
svn path=/nixpkgs/trunk/; revision=31201
2012-01-02 11:35:13 +00:00
Peter Simons
2a0453e43e haskell-enumerator: updated to version 0.4.17
svn path=/nixpkgs/trunk/; revision=31200
2012-01-02 11:22:58 +00:00
Yury G. Kudryashov
0c824aa456 Pass pkgconfig to strigi
svn path=/nixpkgs/trunk/; revision=31199
2012-01-02 11:16:48 +00:00
Yury G. Kudryashov
78c300f015 soprano-2.7.4, pass pkgconfig explicitly
svn path=/nixpkgs/trunk/; revision=31198
2012-01-02 11:12:27 +00:00
Yury G. Kudryashov
097b7635af Explicitly add sqlite to calibre.buildInputs
The better way would be adding sqlite to
pythonPackages.sqlite3.propagatedBuildInputs but I don't want to touch this
code.

svn path=/nixpkgs/trunk/; revision=31197
2012-01-02 10:42:36 +00:00
Yury G. Kudryashov
6639c58398 Use qt-4.8 by default
Some packages may break because pkgconfig is no longer propagated.

svn path=/nixpkgs/trunk/; revision=31196
2012-01-02 10:42:25 +00:00
Peter Simons
a0e7016709 haskell-texmath: updated to version 0.5.0.4
svn path=/nixpkgs/trunk/; revision=31195
2012-01-01 21:24:20 +00:00
Peter Simons
ff5e4c4f4b haskell-syb-with-class: updated to version 0.6.1.3
svn path=/nixpkgs/trunk/; revision=31194
2012-01-01 21:24:17 +00:00
Peter Simons
e2c7b54f8c haskell-derive: updated to version 2.5.5
svn path=/nixpkgs/trunk/; revision=31193
2012-01-01 21:24:14 +00:00
Peter Simons
25db17f1b3 haskell-data-accessor: updated to version 0.2.2.1
svn path=/nixpkgs/trunk/; revision=31192
2012-01-01 21:24:11 +00:00
Lluís Batlle i Rossell
be12dae1ec Fixing the busybox installation. All symlinks were pointing wrong.
svn path=/nixpkgs/trunk/; revision=31191
2012-01-01 20:14:50 +00:00
Lluís Batlle i Rossell
076977b462 Making procps crossbuild.
svn path=/nixpkgs/trunk/; revision=31190
2012-01-01 20:01:02 +00:00
Florian Friesdorf
2e31e7293a moved parts of extra.list back to tarballs-7.6.list
also added an short description about them to generate-expr-from-tarballs.pl

svn path=/nixpkgs/trunk/; revision=31189
2011-12-31 15:37:51 +00:00
Florian Friesdorf
90dda8a07f adjusted awesome to generated names of xcbutil-*
svn path=/nixpkgs/trunk/; revision=31186
2011-12-31 06:14:31 +00:00
Florian Friesdorf
d2e8c37e41 default.nix now fully generated again
with additional xf86-video-intel-2.17.0 and what looks like a fixed
xf86-video-intel-2.14.901.

svn path=/nixpkgs/trunk/; revision=31185
2011-12-31 06:07:37 +00:00
Florian Friesdorf
1745900396 add xf86-video-intel-2.14.901 (and while at it 2.17.0) to extra.list
svn path=/nixpkgs/trunk/; revision=31184
2011-12-31 06:07:34 +00:00
Florian Friesdorf
2a2ceace7f generate-expr-from-tarballs.pl support multiple versions
svn path=/nixpkgs/trunk/; revision=31183
2011-12-31 06:07:32 +00:00
Florian Friesdorf
f6090f6bba reproduced my previous manual changes through generation of default.nix
svn path=/nixpkgs/trunk/; revision=31182
2011-12-31 06:07:28 +00:00