JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,086 Commits 2 Branches 0 Tags 13 GiB
5c6a3faf4e
Commit Graph

17823 Commits

Author SHA1 Message Date
Yury G. Kudryashov
5c6a3faf4e Merge ^/nixpkgs/trunk 
svn tried to change libpng/default.nix version, I've changed libpng/12.nix
version manually.

svn path=/nixpkgs/branches/libpng15/; revision=32395
 2012-02-19 11:06:00 +00:00
Yury G. Kudryashov
668a505214 libpng-1.2.47 (see CVE 2011-3026) 
svn path=/nixpkgs/trunk/; revision=32394
 2012-02-19 10:59:31 +00:00
Lluís Batlle i Rossell
d77cfce6d3 Adding bullet. Patch by Alexander Foremny. 
svn path=/nixpkgs/trunk/; revision=32393
 2012-02-19 10:51:04 +00:00
Yury G. Kudryashov
08f6682666 KDE-4.7: build with qt-4.8 
svn path=/nixpkgs/trunk/; revision=32392
 2012-02-19 09:22:33 +00:00
Yury G. Kudryashov
aaad871c35 inkscape: a couple of upstream patches to fix FTBFS with libpng-1.5 
svn path=/nixpkgs/trunk/; revision=32391
 2012-02-19 09:22:24 +00:00
Yury G. Kudryashov
26f5bdfde1 xplanet: pass netpbm, edit meta 
svn path=/nixpkgs/trunk/; revision=32390
 2012-02-19 09:22:20 +00:00
Yury G. Kudryashov
045d0a3ea0 xplanet-1.2.2; builds with libpng-1.5 
svn path=/nixpkgs/trunk/; revision=32389
 2012-02-19 09:22:14 +00:00
Eelco Dolstra
5178c6fcc6 * GNUcash updated to 2.4.10. 
svn path=/nixpkgs/trunk/; revision=32388
 2012-02-18 18:47:42 +00:00
Eelco Dolstra
2eb0d0f246 * Chatzilla updated to 0.9.88. 
svn path=/nixpkgs/trunk/; revision=32384
 2012-02-18 17:11:57 +00:00
Yury G. Kudryashov
024c247807 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32382
 2012-02-18 16:26:34 +00:00
Shea Levy
e45be4fcaf Remove coffee-script rubygem 
A seeming bug the "nix" rubygem causes activesupport's dependencies to be set
incorrectly when execjs is one of the relevant gems. I'll try to fix it, but
until then IMO a working activesupport is more important than coffee-script

svn path=/nixpkgs/trunk/; revision=32377
 2012-02-17 22:34:46 +00:00
Eelco Dolstra
8096ed3b12 * man-pages updated to 3.35. 
svn path=/nixpkgs/trunk/; revision=32375
 2012-02-17 22:25:47 +00:00
Shea Levy
609b5589bc rubygems will always conflict with ruby's 'gem' command, but if it's installed it should take precedence 
svn path=/nixpkgs/trunk/; revision=32372
 2012-02-17 21:51:06 +00:00
Shea Levy
86710c1fe6 Ruby gems: Install all dependent gems in the user environment 
svn path=/nixpkgs/trunk/; revision=32370
 2012-02-17 21:40:14 +00:00
Shea Levy
2fb0d1c6c7 Update ruby/rubygems 
svn path=/nixpkgs/trunk/; revision=32366
 2012-02-17 20:33:15 +00:00
Arie Middelkoop
453768b1cc kde-runtime requires libjpeg as buildInput. 
svn path=/nixpkgs/trunk/; revision=32363
 2012-02-17 18:55:36 +00:00
Yury G. Kudryashov
c1c3317f65 vigra: fix install 
svn path=/nixpkgs/trunk/; revision=32362
 2012-02-17 18:50:29 +00:00
Yury G. Kudryashov
14a5b4991c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32360
 2012-02-17 17:44:20 +00:00
Yury G. Kudryashov
e446dee4c3 Backport r32353 from stdenv-udpates 
* Get rid of Qt 4.6.  It doesn't compile with GCC 4.6.  There was only
  one application still using it (Caneda), but upgrading it allowed it
  to build with Qt 4.7.

Eelco, could you please fix the date in caneda version?

svn path=/nixpkgs/trunk/; revision=32359
 2012-02-17 17:40:58 +00:00
Yury G. Kudryashov
615f0423e8 telnet.meta.platforms 
svn path=/nixpkgs/trunk/; revision=32355
 2012-02-17 16:22:07 +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
Peter Simons
d27f8787f7 haskell-http-date: updated to version 0.0.2 
svn path=/nixpkgs/trunk/; revision=32351
 2012-02-17 14:02:01 +00:00
Yury G. Kudryashov
882b8ea871 kde47.libkdcraw: fix build with qt-4.8 
svn path=/nixpkgs/trunk/; revision=32349
 2012-02-17 13:36:41 +00:00
Yury G. Kudryashov
8b4f571491 kdiff3-0.9.96 
svn path=/nixpkgs/trunk/; revision=32348
 2012-02-17 13:29:34 +00:00
Yury G. Kudryashov
ed8caa2c7f svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32347
 2012-02-17 13:10:05 +00:00
Yury G. Kudryashov
afb26b6aed vigra-1.8.0 
svn path=/nixpkgs/trunk/; revision=32346
 2012-02-17 13:03:41 +00:00
Yury G. Kudryashov
950d8f5d60 linphone: set meta.platforms 
svn path=/nixpkgs/trunk/; revision=32345
 2012-02-17 13:03:37 +00:00
Yury G. Kudryashov
84c3137a96 linphone: use external mediastreamer 
svn path=/nixpkgs/trunk/; revision=32344
 2012-02-17 13:03:33 +00:00
Yury G. Kudryashov
572a26b27e mediastreamer-2.8.0 
svn path=/nixpkgs/trunk/; revision=32343
 2012-02-17 13:03:27 +00:00
Peter Simons
dbf98824a5 all-packages.nix: fixed linuxPackages.kqemu attribute that pointed nowhere 
We have two expressions for kqemu, but I wasn't sure which one to use here, so
I just picked the newer one. Could someone who knows about these matters please
check whether that was the right choice? I don't use the qemu kernel module
myself.

svn path=/nixpkgs/trunk/; revision=32342
 2012-02-17 10:39:02 +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
Eelco Dolstra
a3da139c73 * Remove ext3cow, it's dead. 
svn path=/nixpkgs/trunk/; revision=32340
 2012-02-16 19:30:41 +00:00
Yury G. Kudryashov
ee75764bdb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32338
 2012-02-16 18:46:10 +00:00
Eelco Dolstra
148612239c * Added openresolv, a program for managing /etc/resolv.conf. 
svn path=/nixpkgs/trunk/; revision=32337
 2012-02-16 18:40:05 +00:00
Yury G. Kudryashov
4df117c395 ufraw-0.18 (builds with libpng-1.5) 
svn path=/nixpkgs/trunk/; revision=32336
 2012-02-16 18:39:31 +00:00
Yury G. Kudryashov
f8926aa0d7 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32335
 2012-02-16 18:18:34 +00:00
Eelco Dolstra
9da1dd6c90 * dnsmasq updated to 2.59. 
svn path=/nixpkgs/trunk/; revision=32334
 2012-02-16 18:03:12 +00:00
Yury G. Kudryashov
1bf215f261 warmux-11.04.1, fix build with libpng-1.5 
svn path=/nixpkgs/trunk/; revision=32333
 2012-02-16 17:56:14 +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
Peter Simons
e76f971db6 haskell-happstack-hamlet: updated to version 6.2.4 
svn path=/nixpkgs/trunk/; revision=32331
 2012-02-16 17:47:59 +00:00
Yury G. Kudryashov
82aab32119 Remove knetworkmanager. Use networkmanagement instead 
svn path=/nixpkgs/trunk/; revision=32329
 2012-02-16 14:54:13 +00:00
Yury G. Kudryashov
a03eacdf22 kde4.networkmanagement needs pkg-config 
svn path=/nixpkgs/trunk/; revision=32328
 2012-02-16 14:53:51 +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
b7e432214b haskell-packages.nix: improved handling of 'Cabal' 
Most packages use the Cabal library only as a build tool, and as such it is a
dependency of the cabal.nix builder -- not of the package that's being built
with that builder.

svn path=/nixpkgs/trunk/; revision=32326
 2012-02-16 14:05:01 +00:00
Yury G. Kudryashov
4a260f082e svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32325
 2012-02-16 12:24:13 +00:00
Yury G. Kudryashov
9dbf57715a liquidwar: update (builds with libpng-1.5) 
I removed update-upstream-info magick because it didn't work for new version.

svn path=/nixpkgs/trunk/; revision=32324
 2012-02-16 12:22:05 +00:00
Yury G. Kudryashov
7b3d0a54f3 Pass libpng12 to libgdiplus 
svn path=/nixpkgs/branches/libpng15/; revision=32323
 2012-02-16 11:50:33 +00:00
Yury G. Kudryashov
bedbebc2e4 enblend-enfuse: build with libpng-1.5 
svn path=/nixpkgs/branches/libpng15/; revision=32322
 2012-02-16 11:50:29 +00:00
Yury G. Kudryashov
070874c5f1 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32321
 2012-02-16 11:23:36 +00:00
Yury G. Kudryashov
1eed9f56e3 gimp-2.6.12 
svn path=/nixpkgs/trunk/; revision=32320
 2012-02-16 11:17:16 +00:00