Commit graph

60626 commits

Author SHA1 Message Date
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
John Wiegley
8f702347a2 Merge pull request #7169 from cstrahan/hakyll-ghc710-fix
hakyll: fix on GHC 7.10
2015-04-07 10:37:55 -05:00
John Wiegley
54bf1360c1 Merge pull request #7226 from spwhitt/git-imerge
git-imerge: new package
2015-04-07 10:37:18 -05:00
John Wiegley
0c6fdbbcc1 Merge pull request #7238 from 1126/master
tor-browser: bumps to 4.0.6
2015-04-07 10:36:40 -05:00
John Wiegley
0f817531b8 Merge pull request #7242 from spwhitt/liboil
Fix liboil build on Darwin
2015-04-07 10:33:29 -05:00
Sander van der Burg
ee6406d234 python-dicttoxml: add package 2015-04-07 15:32:07 +00:00
Charles Strahan
fad17a9ace hakyll: fix on GHC 7.10 2015-04-07 10:32:31 -04:00
Arseniy Seroka
4ebc94db5b Merge pull request #7239 from cwoac/minecraft
allow changing minecraft data dir + allow opening firewall
2015-04-07 17:23:04 +03:00
Oliver Matthews
09179b603f allow changing minecraft data dir + allow opening firewall 2015-04-07 14:10:13 +00:00
Tobias Geerinckx-Rice
8bf4be4c30 .travis.yml: add "sudo: required" to opt out of containers 2015-04-07 15:45:00 +02:00
_1126
64758a6429 tor-browser: bumps to 4.0.6 2015-04-07 15:37:57 +02:00
Eelco Dolstra
facd53315b tests/misc.nix: Ensure that the Nix DB is initialised correctly 2015-04-07 15:10:47 +02:00
Eelco Dolstra
a38f130126 Revert "Set stricter permissions on /nix/store"
This reverts commit 066758758e7c0768ff8da51d208cdae0f33b368c because
it breaks NixOS VM tests.
2015-04-07 15:10:41 +02:00
Eelco Dolstra
088523f094 nodejs: Update to 0.12.2 2015-04-07 14:53:45 +02:00
Eelco Dolstra
488d7a70e1 nodejs: Disable unstableVersion
It's pretty pointless to have an unstable version older than the
stable version.
2015-04-07 14:07:48 +02:00
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
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
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
Spencer Whitt
ead57bf463 mktorrent: Fix build on Darwin
Fixes #2676
2015-04-06 22:10:08 -04:00
codyopel
3b15b975fa guitarix: 0.32.2 -> 0.32.3 2015-04-06 18:44:11 -04:00