Commit graph

81546 commits

Author SHA1 Message Date
Nikolay Amiantov 454a64caff Merge commit 'refs/pull/14779/head' of git://github.com/NixOS/nixpkgs 2016-04-18 14:02:35 +03:00
Lluís Batlle i Rossell 3868f02b17 Adding back Rigs of Rods.
Merge branch 'rormaster'
2016-04-18 12:57:28 +02:00
Ricardo Ardissone 5f832739ce warzone2100: 3.1.1 -> 3.1.5 2016-04-18 07:37:18 -03:00
Lluís Batlle i Rossell c85e3861ba Make rigsofrods use mygui with ogre. Required. 2016-04-18 12:30:48 +02:00
Lluís Batlle i Rossell ecedf80a52 Fixing ogre-paged build.
I update to a tree maintained by rigsofrods people.
2016-04-18 12:30:48 +02:00
Lluís Batlle i Rossell 2d3245042e Removing content-pack download from rigsofrods.
The content packs from 0.37 don't seem to work. We should get one from 0.4, but
there are license problems, I think.
2016-04-18 12:30:47 +02:00
Lluís Batlle i Rossell e741a302d4 Make rigsofrods build the latest code.
I add angelscript 2.22 too, as it makes RoR happy.
2016-04-18 12:30:47 +02:00
Lluís Batlle i Rossell 93bd5556be Revert "rigsofrods: remove dead package"
This reverts commit 69e7948ffe.
2016-04-18 12:04:38 +02:00
Michiel Leenaars ccaeab6323 softhsm: init -> 2.1.0 2016-04-18 12:04:38 +02:00
Dmitry Kalinkin b8b368ef7c root: 5.34.15 -> 6.04.16 2016-04-18 12:04:37 +02:00
Michael Fellinger 55bd038cc1 gem-config: fix bundler 2016-04-18 12:04:37 +02:00
Alexander Ried c09692ede5 bootstrap-tools-linux: Use tar without acl 2016-04-18 12:04:37 +02:00
Alexander Ried 6dffcd69f6 bootstrap-tools-linux: Qualify all multi-output packages 2016-04-18 12:04:37 +02:00
Michael Fellinger 263d467131 bundlerEnv: filter gemset groups 2016-04-18 12:04:36 +02:00
Michiel Leenaars 38c5319fd8 softhsm: init -> 2.1.0 2016-04-18 10:31:46 +01:00
Peter Simons 5d3ccc0fe1 Merge pull request #14794 from veprbl/root6.04.16
root: 5.34.15 -> 6.04.16
2016-04-18 11:18:05 +02:00
zimbatm f8e020bb6b Merge pull request #14787 from manveru/gem-config
gem-config: fix bundler
2016-04-18 10:14:07 +01:00
Michael Fellinger 7d974e7eef
gem-config: fix bundler 2016-04-18 11:12:19 +02:00
Vladimír Čunát 3841029b81 Merge #14792: bootstrap-tools-linux: fix
... by qualifying packages with multiple outputs
2016-04-18 08:40:14 +02:00
Charles Strahan 99fd109a85 Merge pull request #14786 from manveru/gemset-groups
bundlerEnv: filter gemset groups
2016-04-18 02:02:57 -04:00
Dmitry Kalinkin baded4ea96 root: 5.34.15 -> 6.04.16 2016-04-17 22:59:31 -04:00
Tuomas Tynkkynen 00f5f08e05 Merge pull request #14780 from womfoo/update-facter
Update facter: 3.1.3 -> 3.1.5 and add new library dependency leatherman 0.4.2
2016-04-18 05:42:56 +03:00
Tuomas Tynkkynen 1830c480d8 Merge pull request #14793 from micxjo/update-feh
feh: 2.14 -> 2.15.2
2016-04-18 05:39:10 +03:00
Micxjo Funkcio 68d99a82cb
feh: 2.14 -> 2.15.2 2016-04-17 19:16:24 -07:00
Joachim Fasting 49894ac857
nixos.tests.printing: fix
Two fixes:

Not really sure why removing `--fail` from the curl calls is necessary,
but with that option, curl erronously reports 404 (which it shouldn't
per my interactive vm testing).

Fix paths to example files used for the printing test

Toghether, these changes allow the test to run to completion on my machine.
2016-04-18 02:21:12 +02:00
Joachim Fasting 192a1ada24
apparmor: cleanups
- Move build tools to nativeBuildInputs
- capability.h should come from linuxHeaders not glibc
- Delete v2.9
2016-04-18 02:21:12 +02:00
Nikolay Amiantov beeb113eaf Merge pull request #14781 from ambrop72/wine-fix
wine: Disable stripping to avoid breaking fakedlls.
2016-04-18 04:19:57 +04:00
Arseniy Seroka 37d3c7d05e Merge pull request #14788 from manveru/capybara-webkit
capybara-webkit: qt5Full -> qt48
2016-04-18 01:54:40 +03:00
Alexander Ried c6952ece24 bootstrap-tools-linux: Use tar without acl 2016-04-18 00:02:44 +02:00
Alexander Ried 28780a4dad bootstrap-tools-linux: Qualify all multi-output packages 2016-04-18 00:01:44 +02:00
Michael Fellinger 090da825fe
bundlerEnv: filter gemset groups 2016-04-17 23:07:31 +02:00
Michael Fellinger caadfd53e3
capybara-webkit: qt5Full -> qt48 2016-04-17 22:35:04 +02:00
Dan Peebles fbf36c5108 goPackages.hologram: update to latest
No recent official releases so I'm just going by git hashes
2016-04-17 15:27:51 -04:00
Arseniy Seroka 0b3827d04a Merge pull request #14772 from cleverca22/mariadb
mariadb: fix arm builds
2016-04-17 22:16:24 +03:00
Luca Bruno cd8b383f62 cups: do not split doc output
The DocumentRoot is under doc/ which is looked up in
.out. So for now let doc/ directory in .out.
Not the right fix, but the easiest fix.

cc @vcunat
2016-04-17 21:09:34 +02:00
Ambroz Bizjak d7eadb19fb wine: Disable stripping to avoid breaking fakedlls. 2016-04-17 20:59:46 +02:00
Luca Bruno 65ef8821b9 golden-cheetah: remove from pkgs, it does not evaluate without config.golden-cheetah
cc @ocharles
2016-04-17 20:52:32 +02:00
Dan Peebles 5ced92f83b mariadb: fix build on darwin
My simplistic test seemed to work just fine, so I assume the
install_name_tool shenanigans became unnecessary at some point.
2016-04-17 14:49:25 -04:00
Kranium Gikos Mendoza 6d2fb3c730 leatherman: init at 0.4.2 2016-04-18 01:31:41 +08:00
Kranium Gikos Mendoza ca7f93a668 facter: 3.1.3 -> 3.1.5 2016-04-18 01:31:41 +08:00
Tobias Geerinckx-Rice 0352d4fb72
libpsl: list 2016-04-05 -> 2016-04-16 2016-04-17 18:48:14 +02:00
Tobias Geerinckx-Rice 11ee4c394d
zpaq: 710 -> 711 2016-04-17 18:43:44 +02:00
Tobias Geerinckx-Rice 038b18496c
ccache: 3.2.4 -> 3.2.5 2016-04-17 18:25:07 +02:00
Nikolay Amiantov ce47fb38d8 Merge pull request #14776 from avnik/fixes
wine && mumble -- Fixes for post multiple-output issues
2016-04-17 20:04:51 +04:00
Alexander V. Nikolaev 9751cd456a wine: Fix RPATH for multiple-outputs 2016-04-17 18:51:34 +03:00
Alexander V. Nikolaev 3ceeb22ea8 mumble: fix build after closure-size merge 2016-04-17 18:51:23 +03:00
Robert Helgesson 6e802a531a perl-DBIx-Class-Schema-Loader: 0.07043 -> 0.07045
Also fix license field.
2016-04-17 17:17:39 +02:00
Robert Helgesson b8d7228df2 perl-Math-BigRat: 0.260801 -> 0.260802
Also fix license.
2016-04-17 17:17:39 +02:00
Robert Helgesson dee80890d0 perl-Math-BigInt: 1.9993 -> 1.999717
Also add meta section.
2016-04-17 17:17:39 +02:00
Robert Helgesson 9bc8c75867 perl-Class-MethodMaker: fix build 2016-04-17 17:17:39 +02:00