1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-19 03:47:13 -04:00
Commit graph

60899 commits

Author SHA1 Message Date
Domen Kožar 2b5fc4fd73 Merge pull request #7187 from arno01/php5439
php: Update to 5.4.39
2015-04-07 12:38:05 +02:00
Domen Kožar 42c421adc3 Merge pull request #7180 from jagajaga/fix_generator
Fixing nixos-generate-config
2015-04-07 12:24:04 +02:00
Nikolay Amiantov 93e2a6d4a3 Merge branch 'caramia-fix' 2015-04-07 13:21:45 +03:00
Domen Kožar 25ece970a8 Merge pull request #7209 from bjornfor/update-slic3r
slic3r: update 1.2.1 -> 1.2.6
2015-04-07 12:20:38 +02:00
Domen Kožar 13b68e727f Merge pull request #7231 from olcai/update-python-azure
python-packages: azure 0.9.0 -> 0.10.0
2015-04-07 12:19:18 +02:00
Nikolay Amiantov d33d53a3a3 haskellng.caramia: fix build 2015-04-07 13:14:33 +03:00
Domen Kožar 46f4e26154 Merge pull request #7233 from joachifm/apparmor-perl
apparmor: perl support
2015-04-07 11:54:49 +02:00
Erik Timan e5989ee6e3 python-packages: add missing deps to azure 2015-04-07 09:52:29 +00:00
_1126 a3785360a9 isync: adds cyrus_sasl to (re)enable authentication 2015-04-07 11:49:24 +02:00
Domen Kožar 20e8e71c96 Merge pull request #7230 from codyopel/chromaprint
chromaprint: 1.1 -> 1.2
2015-04-07 11:31:13 +02:00
Erik Timan db6de11341 python-packages: azure 0.9.0 -> 0.10.0
Also adds maintainer section.
2015-04-07 09:30:46 +00:00
Domen Kožar 5356011eb5 Merge pull request #7216 from jagajaga/master
Cosmetic changes
2015-04-07 11:21:55 +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
codyopel 1459578315 chromaprint: 1.1 -> 1.2 2015-04-07 04:53:16 -04:00
Joachim Fasting 38dc021b16 apparmor: use base32 digest 2015-04-07 10:21:40 +02:00
William A. Kennington III e7306302d0 Merge pull request #7228 from codyopel/guitarix
guitarix: refactor
2015-04-07 00:04:36 -07:00
codyopel da463e761b guitarix: refactor
add bluez (bluetooth support)
2015-04-07 02:45:32 -04:00
William A. Kennington III 1e47ac93aa mesa: Disable opencl temporarily 2015-04-06 23:08:12 -07:00
Domen Kožar 64c0e6b7fa Merge pull request #7219 from rzetterberg/development
Removes python 2.7 block in favor of "disabled"
2015-04-07 06:44:44 +02:00
Spencer Whitt 309d0f0c8b git-imerge: new package 2015-04-07 00:40:33 -04:00
William A. Kennington III 86639ee6f9 Merge pull request #7223 from codyopel/guitarix
guitarix: 0.32.2 -> 0.32.3
2015-04-06 21:30:02 -07:00
William A. Kennington III 0e78d175b5 Merge pull request #7225 from spwhitt/mktorrent
mktorrent: Fix build on Darwin
2015-04-06 21:29:47 -07:00
Eric Seidel e29bf6e26e gnutar: patch to build on darwin 2015-04-06 20:56:50 -07: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 22bb53dfe2 linux-testing: 4.0-rc6 -> 4.0-rc7 2015-04-06 20:12:08 -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 b0abac5821 twinkle: Add missing ccrtp dependency 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 3b4a217cb7 mediastreamer: 2.10.0 -> 2.11.1 2015-04-06 20:12:07 -07:00
William A. Kennington III ac0a939b1f libzrtpcpp: Refactor 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
Spencer Whitt ead57bf463 mktorrent: Fix build on Darwin
Fixes #2676
2015-04-06 22:10:08 -04:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
codyopel 3b15b975fa guitarix: 0.32.2 -> 0.32.3 2015-04-06 18:44:11 -04:00
Arseniy Seroka 812d8f9fa6 Merge pull request #7221 from codyopel/mopidy
Update Mopidy & dependencies
2015-04-07 00:42:37 +03:00
Peter Simons d751367d70 haskell-gloss: keep old version around for GHC 7.8.x 2015-04-06 21:24:34 +02:00
Peter Simons 16dd6caec0 haskell-safecopy: upstream has fixed the test suite 2015-04-06 21:24:34 +02:00
Peter Simons 696513be2c haskell-mysql: manually pass the correct "lib" derivation
Apparently, automatic propagation to "mysql" still doesn't work. Anyway,
it's nicer to link "lib" only anyway.
2015-04-06 21:24:34 +02:00
Peter Simons e3925a3478 hackage-packages.nix: re-generate from Hackage 2015-04-06T20:16:31+0200 2015-04-06 21:24:34 +02: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
Peter Simons 434f129c62 Agda: fix build by providing the required older versions of its dependencies
Resolves https://github.com/NixOS/nixpkgs/issues/7201.
2015-04-06 21:24:33 +02:00