Commit graph

10947 commits

Author SHA1 Message Date
Vladimír Čunát
2275f6626c webkitgtk-2.4: patch to fix build, rename file
Extracted from #7357 to avoid merge problems.
2015-04-25 08:30:32 +02:00
William A. Kennington III
79c15cdec2 samba: Pin to gnutls33 for now 2015-04-23 14:59:41 -07:00
William A. Kennington III
35f1e07647 gnutls: Make 34 the default 2015-04-20 21:39:09 -07:00
William A. Kennington III
775c412e57 gnutls: Add 3.4 2015-04-20 21:34:48 -07:00
Thomas Tuegel
cefdbbcfb8 add plasma-5.2.95 2015-04-19 20:50:03 -05:00
Thomas Tuegel
0444e9266c remove kde-apps-14.12 2015-04-19 20:40:57 -05:00
Thomas Tuegel
f6428cf2e9 remove kde-frameworks-5.7 2015-04-19 20:40:57 -05:00
Vladimír Čunát
3dba642c33 xorg: add xf86-input-libinput and xf86-video-i740 2015-04-18 07:11:55 +02:00
Vladimír Čunát
4b6b03e2ce xcb-util-cursor: autogenerate as other xorg pkgs
HEAD version still needed on darwin, reportedly:
https://github.com/vcunat/nixpkgs/commit/0c915b8812#commitcomment-10615086
2015-04-18 07:08:45 +02:00
Thomas Tuegel
d1a6edae0d kde-frameworks: update 5.8 to 5.9 2015-04-11 18:31:00 -05:00
Thomas Tuegel
88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Domen Kožar
86998c7075 Merge pull request #6858 from NixOS/kernel/longterm
linuxPackages: point to latests longterm kernel 3.18
2015-04-10 07:36:28 -04:00
Thomas Tuegel
204734c8cb plasma52: build with kf58 2015-04-09 17:46:01 -05:00
Thomas Tuegel
0d7955677f qt54: recurseIntoAttrs for nix-env 2015-04-09 17:46:01 -05:00
Thomas Tuegel
768f5a6d3e add kde-apps-15.04 2015-04-09 17:46:01 -05:00
Thomas Tuegel
49ad4c1417 qt5: don't pin packages to qt54 now that it is default 2015-04-09 17:46:00 -05:00
Vladimír Čunát
859e2c53d6 Merge #6793: add packages for some fonts
Also handle font-family aliases.
(I'm sorry about the bad commit above.)
2015-04-09 20:11:42 +02:00
Vladimír Čunát
da158672bd simutrans: update, refactor, improve, add paksets
Close #7019.

- update all, and add more paksets
- add config.simutrans.paksets, multiple are possible now
- fix #6719: missing sounds
- move user settings from ~/simutrans to ~/.simutrans
- darwin support is untested (but claimed upstream)

Tested-by: Matthias Beyer <mail@beyermatthias.de>
(and by the author vcunat)
2015-04-09 19:43:42 +02:00
koral
1b4722ac82 prosody: add dependency on zlib (close #6894)
@vcunat moved the defaults inside the prosody expression.
2015-04-09 18:40:20 +02:00
Arseniy Seroka
76e67b46b5 Revert "redshift: update 1.9.1 -> 1.10-git-20150222"
This reverts commit fb8308c4af.
2015-04-09 03:37:43 +03:00
Arseniy Seroka
c48051daf8 Merge pull request #6997 from oxij/update-redshift
redshift: update 1.9.1 -> 1.10-git-20150222
2015-04-09 01:46:08 +03:00
William A. Kennington III
458c8381e0 ntp: 4.2.8 -> 4.2.8p2 2015-04-08 14:07:26 -07:00
William A. Kennington III
64abb36f66 wiredtiger: Add derivation 2015-04-08 13:17:42 -07:00
Aristid Breitkreuz
7056264257 Merge pull request #7270 from nckx/remove-dead-mplayer2
Remove dead mplayer2
2015-04-08 21:56:02 +02:00
William A. Kennington III
9308b8e121 pgpool: 3.4.1 -> 3.4.2 2015-04-08 12:13:34 -07:00
Tobias Geerinckx-Rice
00caa18b2f Remove dead mplayer2
mplayer2.org is no longer owned by the project, and even when
using a mirror this two-year-old (!) version fails to build.

Use mpv instead.
2015-04-08 17:07:23 +02:00
Tobias Geerinckx-Rice
bee0ccd1f5 Add clipgrab 3.4.9: web video downloader and converter 2015-04-08 05:09:16 +02:00
Nikolay Amiantov
1fa5e7ae3c the-powder-toy: add derivation 2015-04-08 01:45:41 +03:00
William A. Kennington III
5872185250 automake: Bump to 1.15 2015-04-07 13:32:35 -07:00
Spencer Whitt
1c0f1ce949 krb5: fix Darwin build by providing mig 2015-04-07 12:51:14 -04:00
John Wiegley
e5775f533a Merge pull request #7145 from flosse/old-stable-nodejs
nixpkgs: added old stable nodejs v0.10.38
2015-04-07 10:38:47 -05:00
codyopel
033472c136 ffmpeg: refactor, ffmpeg -> ffmpeg-full & add ffmpeg (minimal)
+ adds a minimal dependency version of ffmpeg as the default
+ the current ffmpeg changes have been moved to ffmpeg-full
+ ffmpeg default 2.5 -> 2.6
+ removed ffmpeg 0.5 & 2.5 (unused versions)

Close #7160.
2015-04-07 14:53:18 +02:00
Domen Kožar
46f4e26154 Merge pull request #7233 from joachifm/apparmor-perl
apparmor: perl support
2015-04-07 11:54:49 +02:00
Joachim Fasting
d3ea6abf0e libapparmor: build perl bindings
There are still a few utils which use Perl, though most have been ported to
Python. Note that SWIG v2 is required to avoid the `error: 'bool' undeclared`
build failure with Perl >=5.16 [1].

[1]: 4305a3cef9
2015-04-07 11:05:54 +02:00
William A. Kennington III
6c9b529dd3 Revert "qt5Full: Fix version"
This reverts commit 5598a5b359.
2015-04-06 20:24:32 -07:00
William A. Kennington III
5598a5b359 qt5Full: Fix version 2015-04-06 20:23:36 -07:00
William A. Kennington III
4b5592cff7 top-level: Fix gettext versioning 2015-04-06 20:20:55 -07:00
Eric Seidel
8e9f13e7e9 more merge fallout 2015-04-06 20:12:47 -07:00
William A. Kennington III
90ca8b5875 linphone: 3.6.0 -> 3.8.1 2015-04-06 20:12:07 -07:00
William A. Kennington III
72d7ff2ace belle-sip: Add derivation 2015-04-06 20:12:07 -07:00
William A. Kennington III
63be75faa1 libzrtpcpp: Remove 1.6 2015-04-06 20:12:07 -07:00
William A. Kennington III
e596f6dab7 ccrtp: 2.0.9 -> 2.1.2 2015-04-06 20:12:07 -07:00
William A. Kennington III
fe4997d58d srtp: Remove linphone and update 1.4.4 -> 1.5.2 2015-04-06 20:12:07 -07:00
William A. Kennington III
8ad6b875ab ortp: 0.22.0 -> 0.24.1 2015-04-06 20:12:07 -07:00
William A. Kennington III
c10baf8377 mbedtls: Add derivation 2015-04-06 20:12:07 -07:00
William A. Kennington III
49b0ed21bd ucommon: 6.1.11 -> 6.3.1 2015-04-06 20:12:07 -07:00
Eric Seidel
c94b24fa4a fix fallout from merge of master 2015-04-06 19:48:44 -07:00
Nikolay Amiantov
25618c3670 agda: migrate to haskell-ng, update and cleanup
Resolves https://github.com/NixOS/nixpkgs/pull/7172.
2015-04-06 21:24:33 +02:00
Arseniy Seroka
e52e160190 Merge pull request #7215 from cwoac/btsync2
Add support for btsync 2.x branch
2015-04-06 18:50:05 +03:00
Oliver Matthews
0539ed4771 Add support for btsync 2.x branch 2015-04-06 15:31:40 +00:00