Commit Graph

611 Commits

Author SHA1 Message Date
Robin Gloster
696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Frederik Rietdijk
97a29ff817 Merge pull request #14110 from lancelotsix/clean_sqlalchemy_legacy
Clean sqlalchemy legacy
2016-03-31 10:52:53 +02:00
Franz Pletz
2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Domen Kožar
8a34a3b37a qemu: 2.5.0 -> 2.5.1
Hopefully this also fixes installer tests on i686
2016-03-30 15:12:41 +01:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Derek Gonyeo
587fbb5b15 rkt: v1.1.0 -> v1.2.0 2016-03-22 14:59:55 -07:00
Lancelot SIX
8dd955cc10 virtinst: remove sqlalchemy7 dependency
sqlalchemy is never used:

```
$ nix-shell default.nix -A virtinst
$ unpackPhase && cd virtinst-*
$ grep -r sqlalchemy .
$
```
2016-03-21 21:09:20 +01:00
Pierre Dal-Pra
d97805ccd0 docker: 1.10.0 -> 1.10.3 2016-03-18 22:12:42 +01:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Domen Kožar
9ad60eae48 xen: remove unneeded depds now that stubdom is disabled 2016-03-09 18:56:25 +00:00
Domen Kožar
086a7d138d xen: disable stubdom due to #13590 2016-03-09 13:51:45 +00:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
40d90ef8ac Merge pull request #13561 from matthewbauer/qemu-mac
qemu: compile with cocoa for darwin support
2016-03-08 02:15:09 +01:00
Robin Gloster
1b4ec4b495 linuxPackages.virtualbox: disable fortify/pic/stackprotector 2016-03-06 15:48:16 +00:00
Franz Pletz
cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Frederik Rietdijk
36506df7fe Merge pull request #13448 from lancelotsix/use_recent_sqlalchemy_as_default
pythonPackages.sqlalchemy: follows upstream, use "sqlalchemy7" for lecagy
2016-03-05 11:07:50 -05:00
Matthew Bauer
864ec69c84 qemu: compile with cocoa for darwin support
This uses the --enable-cocoa flag in qemu to build in Darwin.
2016-03-04 17:45:34 -06:00
Adam Boseley
5b83791207 spice-vdagentd service : initial at 0.16.0 2016-03-05 07:56:47 +10:00
Stefan Junker
13bd76b525 pkgs/rkt: 1.0.0 -> 1.1.0 2016-03-03 19:57:15 +01:00
Robin Gloster
d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
aszlig
605cc4fdeb
Merge pull request #13052 from @bendlas
Updates VirtualBox from version 5.0.12 to 5.0.14.

Upstream changes are (without bug IDs):

 * GUI: properly limit the number of VCPUs to the number of physical cores
        on Mac OS X
 * Audio: fixed a bug which prevented loading a saved state of a saved
          guests with HDA emulation (5.0.12 regression)
 * Audio: don't crash if the backend is unable to initialize
 * Audio: fixed audio capture on Mac OS X
 * Storage: fixed a possible crash when attaching the same ISO image
            multiple times to the same VM
 * BIOS: properly report if two floppy drives are attached
 * USB: fixed a problem with filters which would not capture the device
        under certain circumstances (5.0.10 regression)
 * ExtPack: black-list Extension Packs older than 4.3.30 due to
            incompatible changes not being properly handled in the past
 * Windows hosts: fixed a regression which caused robocopy to fail
 * Linux hosts: properly create the /sbin/rcvboxdrv symbolic link (5.0.12
                regression)
 * Mac OS X hosts: several fixes for USB on El Capitan
 * Linux Additions: fixes for Linux 4.5

Full upstream changelog with bug IDs can be found at:

  https://www.virtualbox.org/wiki/Changelog

The reason I was reluctant to merge this before were these symbol lookup
errors:

  vboxsf: Unknown symbol VBoxGuest_RTMemTmpFree (err 0)
  vboxsf: Unknown symbol VBoxGuestIDCCall (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemFastMutexRequest (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemFastMutexRelease (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTLogRelGetDefaultInstanceEx (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTErrConvertToErrno (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemFastMutexCreate (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemFastMutexDestroy (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTMemContFree (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemMutexRelease (err 0)
  vboxsf: Unknown symbol VBoxGuestIDCOpen (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTAssertShouldPanic (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTMemContAlloc (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemMutexRequest (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemMutexCreate (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTMemTmpAllocTag (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTSemMutexDestroy (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTAssertMsg1Weak (err 0)
  vboxsf: Unknown symbol VBoxGuestIDCClose (err 0)
  vboxsf: Unknown symbol VBoxGuest_RTAssertMsg2Weak (err 0)

However, after testing it against 5.0.12, the same errors occur there as
well, so it is likely related to our VM tests.
2016-03-01 03:36:44 +01:00
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
zimbatm
69ce5cb656 use the sourceforge mirrors everywhere
find pkgs -name "*.nix" -exec sed -r \
    "s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
2016-02-28 12:07:42 +00:00
Franz Pletz
6b20b7c4d7 qemu: 2.4.1 -> 2.5.0 (multiple CVEs)
https://lwn.net/Vulnerabilities/666755/
2016-02-27 17:53:22 +01:00
Lancelot SIX
0467a17858 pythonPackages.sqlalchemy: follows upstream, sqlalchemy7 for lecagy
This makes pythonPackages.sqlalchemy the most up to date revision (it
was called sqlalchemy_1_0 before), and maintains the various “legacy”
versions available as pythonPackages.sqlalchemyX for X in {7,8,9}.

All derivations that required `sqlalchemy_1_0` now require `sqlalchemy`
while those that required `sqlalchemy` now require `sqlalchemy7`.

The derivations are not changed, only the attribute names they are
bound to.
2016-02-27 12:11:12 +01:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Herwig Hochleitner
bd3ca11e0d virtualbox: 5.0.12 -> 5.0.14 2016-02-16 21:59:11 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster
a53bd9daa8 xen: turn off pic hardening 2016-02-11 01:44:23 +00:00
Robin Gloster
63d4e59add seabios: turn off pic and stackprotector hardening 2016-02-10 23:27:37 +00:00
Robin Gloster
e264f1077b bochs: turn off format hardening 2016-02-09 10:29:34 +00:00
Robin Gloster
82daf82e61 xen: turn off fortify 2016-02-09 01:10:57 +00:00
Robin Gloster
5b535580fd cbfstool: turn off fortify 2016-02-09 01:00:21 +00:00
Robin Gloster
2f1567ad33 OVMF: no stackprotector/pic/fortify hardening 2016-02-08 23:18:03 +00:00
Robin Gloster
859a150373 linuxPackages.virtualboxGuestAdditions: no pic hardening 2016-02-07 22:45:28 +00:00
Robin Gloster
9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Cole Mickens
14dfebd364 rkt: reset stage1 to rkt's recommended version 2016-02-05 11:18:12 -08:00
Arseniy Seroka
50f94c2751 Merge pull request #12831 from colemickens/rkt-1.0.0
rkt 0.15.0 -> 1.0.0 + trousers
2016-02-05 17:32:45 +03:00
Cole Mickens
34f59ae390 rkt 0.15.0 -> 1.0.0 + trousers 2016-02-04 22:52:55 -08:00
Cole Mickens
712eb6b7e0 docker 1.9.1 -> 1.10.0 2016-02-04 22:52:06 -08:00
Vladimír Čunát
54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Tuomas Tynkkynen
e97e690244 treewide: Mass replace 'xz}/bin' to refer the 'bin' output 2016-02-01 20:46:28 +02:00
Tuomas Tynkkynen
13b3f3f246 treewide: Mass replace 'openssl}/bin' to refer the 'bin' output 2016-02-01 20:46:16 +02:00
Robin Gloster
359b1726a5 xen: turn off stackprotector hardening 2016-01-30 16:36:57 +00:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Vladimír Čunát
0957359568 Merge branch 'staging' 2016-01-22 13:48:35 +01:00
Domen Kožar
b39c51a362 Merge pull request #12323 from kragniz/rkt-v0.15.0
rkt: 0.14.0 -> 0.15.0
2016-01-21 22:27:33 +01:00
aszlig
c92d7481a5
multipath_tools: Rename to multipath-tools
See http://nixos.org/nixpkgs/manual/#sec-package-naming

I've added an alias for multipath_tools to make sure that we don't break
existing configurations referencing the old name.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-21 16:18:38 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Robin Gloster
53b389327e refactor to use autoreconfHook where possible
Close #12446.
2016-01-18 10:45:31 +01:00
Tobias Geerinckx-Rice
b01b11c657 virtualbox: 5.0.10 -> 5.0.12
This is a maintenance release.
Changes: https://www.virtualbox.org/wiki/Changelog.
2016-01-18 03:57:09 +01:00
Louis Taylor
6309f48137 rkt: 0.14.0 -> 0.15.0 2016-01-15 18:09:58 +00:00
Franz Pletz
a224badfea Merge pull request #12373 from nathan7/docker-journald
docker: enable journald support
2016-01-15 00:54:55 +01:00
Nathan Zadoks
9c9a5353f9 docker: enable journald support 2016-01-14 16:01:19 +01:00
Stefan Junker
1e9a4a6d5b fixup! rkt: align stage1 information with upstream source 2016-01-04 13:08:11 +01:00
Arseniy Seroka
387b38e10b Revert "rkt: align stage1 information with upstream source" 2016-01-04 14:39:34 +03:00
Arseniy Seroka
014ee32abd Merge pull request #11946 from steveeJ/rkt
rkt: align stage1 information with upstream source
2016-01-04 14:39:05 +03:00
Tobias Geerinckx-Rice
82419575aa btrfsProgs -> canonical btrfs-progs 2016-01-03 20:38:44 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Robin Gloster
729fb7a440 virt-viewer: fix build and clean up 2015-12-28 21:44:12 +00:00
Domen Kožar
af25cc9427 fix virtviewer build 2015-12-28 22:39:22 +01:00
Stefan Junker
e3630bcf89 rkt: align stage1 information with upstream source
We rely on the upstream tests and hence should not change the
constellation.

See: https://github.com/coreos/rkt/blob/v0.14.0/stage1/usr_from_coreos/coreos-common.mk

Additionally add the "fly" stage1.
2015-12-28 14:20:12 +01:00
Derek Gonyeo
540c520cf6 rkt: bump version 0.13.0 -> 0.14.0, fixes #11885 2015-12-23 01:27:26 +01:00
Nathan Zadoks
d5e5a7dbc3 docker: 1.9.0 -> 1.9.1 2015-12-21 12:18:22 +01:00
Pascal Wittmann
63b7648870 Merge pull request #11755 from steveeJ/rkt-v0.13
rkt: bump version 0.12.0 -> 0.13.0
2015-12-16 13:03:57 +01:00
Domen Kožar
caa9c53d6e qemu: enable numa 2015-12-15 23:41:55 +01:00
Stefan Junker
a4cd9f771a rkt: bump version 0.12.0 -> 0.13.0 2015-12-15 23:03:28 +01:00
Jakob Gillich
8da384edad virt-manager: 1.2.1 -> 1.3.1 2015-12-12 19:36:08 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Luca Bruno
2f0fe05543 docker: use glibc.static with multiple-outputs for dockerinit 2015-12-10 13:19:25 +01:00
ts468
c8eaa71cae Merge pull request #11173 from mixis/updates/xen-4.5.2
xen: 4.5.1 -> 4.5.2
2015-12-09 21:17:17 +01:00
Ambroz Bizjak
067141621e virtualboxGuestAdditions: Add missing library paths to patchelf, fixes #11509 2015-12-07 15:15:03 +01:00
Herwig Hochleitner
088c3fc9dd virtualbox: 5.0.6 -> 5.0.10, fixes #11115 2015-12-06 13:23:46 +01:00
devhell
c711f4bb11 virt-{manager,inst}: Fix glance dependency
Since 710b350b8e `glance` has been
replaced in favor of `glanceclient`. This commit fixes the resulting
eval error.
2015-12-03 21:56:00 +00:00
Domen Kožar
a4fc362c54 neutron: patch for iproute 4.x compatibility 2015-12-03 11:09:54 +01:00
Domen Kožar
4abb515c6e glance: propagated MySQL_python 2015-12-03 11:09:50 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Stefan Junker
04af203306 rkt: v0.11.0 -> 0.12.0 2015-11-28 12:18:26 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Domen Kožar
d83a97823c buildPythonPackage: fix a few more wheel packages 2015-11-21 21:44:12 +01:00
Domen Kožar
704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Michael Weiss
73058eb946 xen: 4.5.1 -> 4.5.2
Excerpt from upstream release notes:
This release also contains the security fixes for XSA-137, XSA-138, XSA-141 to XSA-153.
XSA-139 and XSA-140 only apply to QEMU Upstream and are fixed from versions 2.3.1 and 2.4.0 of QEMU.
The qemu portion of XSA-135 has also been applied to qemu-traditional.
2015-11-20 16:57:27 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Jaka Hudoklin
8f806d88bf Merge pull request #11057 from offlinehacker/pkgs/docker-gc/add
docker-gc: init at b0cc52aa3da2e2ac0080794e0be6e674b1f063fc
2015-11-18 22:28:18 +01:00
Jaka Hudoklin
7f45af89f7 Merge pull request #11063 from offlinehacker/pkgs/docker/update_1.9.0
docker: 1.8.1 -> 1.9.0
2015-11-18 22:26:17 +01:00
Jaka Hudoklin
81dc21de26 Merge pull request #11065 from offlinehacker/pkgs/docker/optional_lxc
docker: make lxc optional
2015-11-18 22:24:00 +01:00
Stefan Junker
93e1f92781 rkt: v0.10.0 -> 0.11.0
Also prepare to support multiple stage1 flavors.
The 'host' flavor would be preferred to reuse systemd components instead
of downloading/unpacking/processing a CoreOS PXE image.
2015-11-17 12:44:32 +01:00
Jaka Hudoklin
02fc10ce25 docker: make lxc optional 2015-11-16 16:17:53 +01:00
Jaka Hudoklin
c79e22edbf docker: 1.8.1 -> 1.9.0 2015-11-16 15:56:09 +01:00
Jaka Hudoklin
a42d2e439b docker-gc: init at b0cc52aa3da2e2ac0080794e0be6e674b1f063fc 2015-11-16 15:16:48 +01:00
Asko Soukka
7b7ce45d03 tini: init at 0.8.3 2015-11-10 22:24:13 +02:00
William A. Kennington III
cfda3f3eed qemu: 2.4.0.1 -> 2.4.1 2015-11-05 18:18:35 -08:00
Domen Kožar
cb30c3a95e neutron: include migrations upon install 2015-11-05 19:23:16 +01:00
Domen Kožar
0549078488 fix eval 2015-11-04 16:23:23 +01:00
Domen Kožar
b4882f1462 keystone: copy .ini files, make openssl tools available 2015-11-04 12:24:23 +01:00
Domen Kožar
ac00195cbd glance: copy .ini config to /etc 2015-11-04 12:23:57 +01:00
Domen Kožar
8a4f01c139 nova: install migrate.cfg 2015-11-04 11:53:49 +01:00
Domen Kožar
dd1882d991 nova, keystone, glance, neutron: use correct mysql lib 2015-10-30 19:48:57 +01:00
Domen Kožar
ed02ed0657 nova, neutron, keystone: add pymysql 2015-10-30 08:46:56 +01:00
Domen Kožar
3ee4747675 OpenStack: package Glance, Keystone, Neutron 2015-10-27 11:52:40 +01:00
Domen Kožar
24cbc374cf nova: 2011.2 -> 12.0.0 2015-10-27 11:52:40 +01:00
Stefan Junker
8e8a985c4c rkt: bump to v0.10.0
* bump stage1 base image to v794.1.0 according to upstream release
* make use of BUILDDIR environment variable to control output path
* make use of the configure option for the stage1 image path and the stage1 base image path
* fix homepage URL

* add myself to the list of maintianers
2015-10-25 02:13:01 +02:00
Shea Levy
326ed47a97 libvirt: Fix typo introduced by 556151911e 2015-10-15 16:48:05 -04:00
Shea Levy
556151911e virt-manager: Fixup path to libvirt's cpu_map.xml 2015-10-15 16:46:14 -04:00
Vladimír Čunát
783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Vladimír Čunát
1fdbc3097b alsa-lib: split "dev" output and fix referrers 2015-10-13 20:18:55 +02:00
Vladimír Čunát
99e4371526 curl: split into multiple outputs
Also use pkgconfig to be safer and fix (some) referrers.
2015-10-13 20:18:48 +02:00
Vladimír Čunát
1197003966 fix references to ${libtool}/lib 2015-10-13 20:18:47 +02:00
Vladimír Čunát
91407a8bdf ncurses: split into multiple outputs
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
2015-10-13 20:18:44 +02:00
Karn Kallio
5012fffecb qemu: 2.4.0 updated to 2.4.0.1 2015-10-12 10:53:46 +02:00
Ricardo M. Correia
305a92a004 virt-manager: fix lost/forgotten settings
This fixes the error message: GLib-GIO-Message: Using the 'memory'
GSettings backend.  Your settings will not be saved or shared with other
applications.

It caused old saved settings to be forgotten, and new settings to be lost
when virt-manager is closed.
2015-10-09 21:27:59 +02:00
Bjørn Forsman
5fee5c6d08 virtualbox: 5.0.4 -> 5.0.6
Tested on release-15.09 branch.
2015-10-07 15:12:51 +02:00
Vladimír Čunát
32b31398eb xorg.libXt: re-split into multiple outputs
Fixed all 'libXt}' references, too.
2015-10-05 11:23:34 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Pascal Wittmann
edee7f1720 Transformed meta.maintainers attributes to lists 2015-09-17 15:33:36 +02:00
Pascal Wittmann
11aa159977 Merge pull request #9900 from LnL7/xhyve-0.2.0
xhyve: xhyve-0.1.0 -> xhyve-0.2.0
2015-09-17 15:14:01 +02:00
Daiderd Jordan
c0c1374b8a xhyve: xhyve-0.1.0 -> xhyve-0.2.0 2015-09-17 13:27:12 +02:00
Vladimír Čunát
ab295420c5 qemu: qemu-2.4.0-x86-only -> qemu-x86-only-2.4.0 2015-09-17 12:47:45 +02:00
aszlig
89b6831ffd
virtualbox: Fix load of dbus library at runtime.
VirtualBox had support for DBUS even in version 4.x, but it appears that
nothing in our VM test triggered it to load, thus I didn't notice the
runtime error:

rtldrNativeLoad: dlopen('libdbus-1.so.3', RTLD_NOW | RTLD_LOCAL) failed:
                 libdbus-1.so.3: cannot open shared object file: No such
                 file or directory

The upstream commits I think are responsible for this to come to surface
are _probably_ (did I ever mention that I love SVN? *cough*) one of
these:

https://www.virtualbox.org/changeset/55664/vbox
https://www.virtualbox.org/changeset/55602/vbox

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-16 00:19:52 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Domen Kožar
d2fbbb2100 Revert "Revert "qemu: 2.2.1 -> 2.4.0""
This reverts commit df592a6535.

Segfauls on build machines were not caused due to qemu bump.
2015-09-12 12:56:18 +02:00
Eelco Dolstra
972c0e5df4 virtualbox: Update to 5.0.4 2015-09-10 20:48:16 +02:00
aszlig
8be8193bd5
virtualbox: Fix revision/hash for guest additions.
Regression introduced in 7ffb1f3bde.

Also added a small notice so that this hopefully won't happen with
future updates.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-10 17:03:36 +02:00
Domen Kožar
df592a6535 Revert "qemu: 2.2.1 -> 2.4.0"
This reverts commit 0e0e3c0c08.

I've been seeing quite some QEMU segfaults on Hydra,
hopefully reverting the bump will fix the issue.

(cherry picked from commit 863c121c0782b82900d736f9f71dbcfa80f62e1d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-07 12:22:13 +02:00
Eelco Dolstra
7ffb1f3bde virtualbox: Update to 5.0.2 2015-09-04 19:41:06 +02:00
Ragnar Dahlén
1942480e95 rkt: Don't download stage1 image during build.
Second attempt to resolve this issue. Copies stage1 image into expected
place manually. This has been improved in rkt master where there is a
configure option for specifying the location of this file. Can update
when next stable rkt is released.
2015-09-03 14:07:50 +01:00
Thomas Strobel
e80b41e94f xen: remove 4.4.1 + fixes compilation of 4.5.x, fixes #9572 2015-09-02 08:33:24 +02:00
Ragnar Dahlén
6e1bee84d3 rkt: Don't download stage1 image during build.
The rkt build process requires a stage1 image. By default it will try
and download one with wget from coreos.com during the build. This change
explicitly downloads the image using `fetchurl`, verifying checksum,
then passes that to the build using appropriate configure flag.
2015-09-01 10:08:44 +01:00
Jaka Hudoklin
95e2403f86 Merge pull request #9530 from offlinehacker/pkgs/docker/fix_add_utillinux
docker: add blkid from utillinux to path
2015-08-29 18:32:52 +02:00
Jaka Hudoklin
ff0575a2f1 docker: add blkid from utillinux to path 2015-08-29 18:25:39 +02:00
Domen Kožar
e65fce3af6 docker: fix build on i686 2015-08-27 13:22:29 +02:00
Luca Bruno
66a270b9df rkt: disable on i686 (ZHF) 2015-08-26 18:55:22 +02:00
lethalman
d60c099a3c Merge pull request #9231 from Bevaz/qemu
qemu: 2.2.1 ->  2.4.0
2015-08-26 14:08:27 +02:00
Domen Kožar
c2841a2221 docker: 1.7 -> 1.8.1, fix build (go 1.4) 2015-08-26 13:56:18 +02:00
Anton Fedotov
0e0e3c0c08 qemu: 2.2.1 -> 2.4.0 2015-08-26 13:16:53 +03:00
Arseniy Seroka
3ebe6fa802 open-vm-tools: temp fix for https://github.com/NixOS/nixpkgs/issues/9262 2015-08-21 20:29:09 +03:00
Arseniy Seroka
d8fc9ed20c Merge pull request #9337 from ragnard/rkt
rkt: init at 0.8.0
2015-08-19 14:57:13 +03:00
Ragnar Dahlén
9d0efe846e rkt: init at 0.8.0 2015-08-19 12:40:36 +01:00
Vladimír Čunát
26b5776cd7 virt-manager: fix gschemas problems (fixes #9208)
Also fix missing icons, at least in combo-boxes.
/cc maintainers: @offlinehacker, @qknight.
2015-08-12 05:37:03 +02:00
Benjamin Staffin
a5cdd98da4 docker: 1.6.0 -> 1.7.1 2015-08-03 20:20:56 -07:00
aszlig
86b695a18e
vbox-guest: Remove all references to sbin/.
Using $storepath/sbin is deprecated according to commit 98cedb3, so
let's avoid putting anything in .../sbin for the guest additions.

This is a continuation of the initial commit done by @ctheune at
1fb1360, which unfortunately broke VM tests and only changed the path of
the mount.vboxsf helper.

With this commit, the VM test is fixed and I've also verified on my
machine that it is indeed working again.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-08-04 03:03:24 +02:00
aszlig
a26edf0f77
vbox-guest: Merge pull request #9063 from ctheune.
This places mount.vboxsf in $out/bin instead of sbin, because as
reported in #9063 it seems that the the mount tools are no longer
looking into $storepath/sbin/mount.$what but into
$storepath/bin/mount.$what instead.

However, I haven't found any commit which changes this behavior and
couldn't reproduce it. Also, merging this will break the VirtualBox
tests, but I'm merging it anyway in an effort to remove $storepath/sbin
from virtualboxGuestAdditions entirely.

Tested against virtualbox NixOS VM test, which of course failed as said
before.
2015-08-04 01:16:35 +02:00