3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

17183 commits

Author SHA1 Message Date
Yury G. Kudryashov 3d61c49b42 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Lluís Batlle i Rossell 855e8f45a4 Fixing a typo in the icoutils file.
svn path=/nixpkgs/trunk/; revision=31267
2012-01-04 09:47:22 +00:00
Lluís Batlle i Rossell 8fadcd285a Adding icoutils
svn path=/nixpkgs/trunk/; revision=31265
2012-01-04 09:42:38 +00:00
Lluís Batlle i Rossell b15381fcf6 Adding pngtoico.
svn path=/nixpkgs/trunk/; revision=31264
2012-01-04 09:29:52 +00:00
Yury G. Kudryashov b3709689db Add modemmanager
svn path=/nixpkgs/trunk/; revision=31263
2012-01-04 09:05:22 +00:00
Lluís Batlle i Rossell fb0d088b33 Updating mono.
svn path=/nixpkgs/trunk/; revision=31262
2012-01-04 08:14:07 +00:00
Karn Kallio ec8e23cc97 In Emacs site-start.el check that NIX_PROFILES is set.
In the stdenv this is not set, which causes an elisp error
which in turn makes builds depending on Emacs (eg gnuplot) fail.

svn path=/nixpkgs/trunk/; revision=31261
2012-01-04 05:48:38 +00:00
Karn Kallio 0e1ea067ab Cause ghostscript to build libgs.
This fixes the failed build of libspectre.

svn path=/nixpkgs/trunk/; revision=31260
2012-01-04 00:26:48 +00:00
Eelco Dolstra f3c3f11520 * Debian requires/provides should be comma-separated.
svn path=/nixpkgs/trunk/; revision=31259
2012-01-03 22:33:48 +00:00
Eelco Dolstra 032617b0ab * Check whether any packages were generated. Apparently checkinstall
doesn't return a non-zero exit code if something goes wrong.

svn path=/nixpkgs/trunk/; revision=31258
2012-01-03 22:25:46 +00:00
Florian Friesdorf 30752215cd linux_3_2_powertop
svn path=/nixpkgs/trunk/; revision=31257
2012-01-03 22:25:38 +00:00
Cillian de Roiste 35879729d2 Ralink firmware is no longer available directly from ralinktech.com, it is now available from git.kernel.org. I've used the debian svn repo here instead for convenience
svn path=/nixpkgs/trunk/; revision=31256
2012-01-03 22:02:34 +00:00
Lluís Batlle i Rossell d028c7e00d Adding a preliminary package for librecad. It fails to install still.
svn path=/nixpkgs/trunk/; revision=31255
2012-01-03 21:14:14 +00:00
Florian Friesdorf 5a78287adf added myself to maintainers
svn path=/nixpkgs/trunk/; revision=31254
2012-01-03 20:59:00 +00:00
Florian Friesdorf f051f29fbd load-path also for emacs-22 and emacs-snapshot
svn path=/nixpkgs/trunk/; revision=31253
2012-01-03 20:58:57 +00:00
Florian Friesdorf 195ff32a63 set emacs load-path according to NIX_PROFILES via site-start.el
svn path=/nixpkgs/trunk/; revision=31252
2012-01-03 20:58:54 +00:00
Lluís Batlle i Rossell e43bd7c4ce Made lua and task warrior unstable crossbuild fine
svn path=/nixpkgs/trunk/; revision=31251
2012-01-03 19:12:06 +00:00
Yury G. Kudryashov ec3f38712a svn merge /path/to/trunk; svn revert path/to/cmake/default.nix
svn path=/nixpkgs/branches/stdenv-updates/; revision=31249
2012-01-03 18:04:57 +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
Yury G. Kudryashov 2bca92e32d Merge trunk
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +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 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 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 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 08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +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