Benjamin Staffin
b42f820bdc
Merge pull request #22745 from vdemeester/docker_1_13_1
...
docker: 1.13.0 -> 1.13.1
2017-02-14 11:47:40 -05:00
Parnell Springmeyer
9e36a58649
Merging against upstream master
2017-02-13 17:16:28 -06:00
Vincent Demeester
a50b4d0e03
docker: 1.13.0 -> 1.13.1
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-13 16:42:39 +01:00
Vladimír Čunát
31eba21d1d
virtualbox: force xorg-server-1.18 for now
...
This is getting a little hacky, but hopefully it won't break anything.
2017-02-12 21:07:49 +01:00
Tuomas Tynkkynen
a14ef4ad52
open-vm-tools: 10.0.7 -> 10.1.0
...
Also add an option to disable all the X11 stuff.
2017-02-10 20:12:00 +02:00
Christoph Hrdinka
de9720b65f
aqemu: init at 0.9.2
2017-02-10 12:48:29 +01:00
Dan Peebles
03cab2d923
ecs-agent: init at 1.14.0
2017-02-10 04:33:48 +00:00
Tim Steinbach
f65a3515f4
rkt: 1.23.0 -> 1.24.0
2017-02-05 11:51:05 -05:00
volth
762cc106b4
virt-top: init at 1.0.8 ( #21536 )
2017-02-04 16:07:45 +01:00
Pascal Bach
5ca3a7e56f
virtualbox: remove upstream-info.json as it is no longer used
...
We keep the script as it might be useful in the future.
2017-02-02 21:11:08 +01:00
Pascal Bach
599df5e108
virtualbox: 5.1.10 -> 5.1.14
2017-02-02 21:10:01 +01:00
Eelco Dolstra
c20cc6d0b3
Excise use of importJSON
...
Putting information in external JSON files is IMHO not an improvement
over the idiomatic style of Nix expressions. The use of JSON doesn't
add anything over Nix expressions (in fact it removes expressive
power). And scattering package info over lots of little files makes
packages less readable over having the info in one file.
2017-01-30 11:44:08 +01:00
Parnell Springmeyer
6777e6f812
Merging with upstream
2017-01-29 05:54:01 -06:00
Parnell Springmeyer
4aa0923009
Getting rid of the var indirection and using a bin path instead
2017-01-29 04:11:01 -06:00
Parnell Springmeyer
e92b8402b0
Addressing PR feedback
2017-01-28 20:48:03 -08:00
Graham Christensen
f46c5b293b
qemu: 2.7 -> 2.8, drop 2.7
2017-01-26 20:23:40 -05:00
Parnell Springmeyer
a26a796d5c
Merging against master - updating smokingpig, rebase was going to be messy
2017-01-26 02:00:04 -08:00
Dan Peebles
ed83ec1b65
lkl: fix impure reference to /usr/bin/env
2017-01-25 21:30:59 +00:00
Parnell Springmeyer
bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts
2017-01-25 11:08:05 -08:00
Tim Steinbach
6aae00edfc
rkt: 1.22.0 -> 1.23.0
2017-01-23 17:56:46 +01:00
Vincent Demeester
d79fa8850a
Fixing the wrong Git Commit hash in docker version
...
`DOCKER_GITCOMMIT` needs to match the tagged commit used to build the
binary. The current commit refers to 1.12.1 and wasn't update each
time we updated the package. Using a variable near the version and
adding a comment so we don't forget to update next time.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-23 10:32:17 +01:00
Jaka Hudoklin
4884fa4502
Merge pull request #20656 from vdemeester/docker_1_13
...
Update to docker 1.13.x
2017-01-21 12:19:06 +01:00
Vladimír Čunát
6b6553c768
Merge branch 'staging'
...
It contains security updates. I somehow forgot to push this yesterday.
2017-01-20 16:33:59 +01:00
Michael Raskin
ac27b9d836
Merge pull request #22001 from nlewo/qemu-cve
...
Qemu CVEs
2017-01-20 11:28:14 +00:00
Antoine Eiche
9f1514f086
qemu: fix several CVEs
...
- CVE 2016-9845
- CVE-2016-9846
- CVE-2016-9907
- CVE-2016-9912
2017-01-20 11:09:02 +01:00
Antoine Eiche
0bd3f82a67
qemu: fix the url of patch for CVE-2016-9921 and CVE-2016-9922
2017-01-20 11:02:22 +01:00
Vincent Demeester
74d4d3e4f9
docker: 1.12.6 -> 1.13.0
...
- Update docker version to 1.13.0.
- Introduce now docker-proxy package (from libnetmork).
- Use overrideDerivation to set the correct version for docker.
- Update tini to make sure we can build it static.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-18 21:33:37 +01:00
Vladimír Čunát
0dc43ab9d6
virt-manager: fixup evaluation to unbreak Hydra
...
The package itself is probably still broken. /cc @fridh e94d9cdfaa
2017-01-18 16:07:25 +01:00
Vladimír Čunát
40003aa2ed
Merge branch 'master' into staging
2017-01-18 15:54:04 +01:00
Dan Peebles
3ab26fdb70
lkl: update to d7470730
2017-01-17 18:40:58 +00:00
Dan Peebles
f1a9bc356e
lkl: init
2017-01-16 21:24:32 +00:00
Tim Steinbach
490c109928
rkt: 1.21.0 -> 1.22.0
2017-01-11 17:27:19 -05:00
Frederik Rietdijk
e94d9cdfaa
virtmanager: use python2
2017-01-11 18:25:10 +01:00
Franz Pletz
260d97ca25
runc: add patches to fix CVE-2016-9962
2017-01-11 12:11:29 +01:00
Franz Pletz
0aa4931671
runc: 2016-06-15 -> 1.0.0-rc2
2017-01-11 10:59:27 +01:00
Franz Pletz
4df30fc74f
containerd: 0.2.3 -> 0.2.5
2017-01-11 10:59:26 +01:00
Franz Pletz
cb07316773
docker: 1.12.5 -> 1.12.6
...
Fixes CVE-2016-9962.
2017-01-11 10:59:24 +01:00
Graham Christensen
f5ca9a4212
Merge branch 'roundup-15'
2016-12-28 21:04:51 -05:00
Antoine Eiche
bc63738c6f
qemu: fix CVE-2016-9921 and CVE-2016-9922
2016-12-28 20:37:00 -05:00
Antoine Eiche
a5dd311208
qemu: fix CVE-2016-9911
2016-12-28 20:36:53 -05:00
Michael Raskin
442623e499
qemu_28: init at 2.8.0; not updating the main Qemu expression yet because there were some claims about NixOS test fragility
2016-12-28 15:04:51 +01:00
Graham Christensen
4e6c7faf36
xen: patch for many XSAs
...
- XSA-190
- XSA-191
- XSA-192
- XSA-193
- XSA-195
- XSA-196
- XSA-198
- XSA-200
- XSA_202
- XSA-204
2016-12-21 14:37:47 -05:00
Daiderd Jordan
49e3190efa
Revert "xhyve: update and fix to use our Hypervisor framework"
...
This reverts commit f3b65f67d9
2016-12-20 13:02:27 +01:00
Eelco Dolstra
8a0843c3c4
qemu-kvm: Mark the version for tests
...
(cherry picked from commit d58a4ec1ba
2016-12-20 10:52:46 +01:00
Dan Peebles
f3b65f67d9
xhyve: update and fix to use our Hypervisor framework
2016-12-19 19:47:24 -05:00
aszlig
c5e5dccd13
Merge pull request #21201 (VirtualBox 5.1.10)
...
This brings VirtualBox to the latest upstream version, which also fixes
building the modules against kernel 4.9.0.
Tested against all the the "virtualbox" subtests on x86_64-linux.
2016-12-17 15:46:06 +01:00
Tim Steinbach
a5a98290b7
docker: 1.12.3 -> 1.12.5
2016-12-16 08:57:08 -05:00
aszlig
38ea64e867
qemu_test: Make chown() calls to the store a no-op
...
The "misc" NixOS test is using Nix to query the store and it tries to
change the ownership of it while doing so.
This fails if Nix is not in a seccomp-sandboxed userid namespace, so
let's make chown() a no-op when applied to store paths.
Fixes the misc test (and possibly future tests) on older Nix versions.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-12-16 13:06:25 +01:00
Eelco Dolstra
705829b29a
Merge pull request #20500 from aszlig/qemu-patched-for-nixos-tests
...
nixos/tests: Use a patched QEMU for testing
2016-12-15 12:38:29 +01:00
Peter Hoeg
bea3209d5f
virtualbox: 5.1.8 -> 5.1.10
2016-12-15 16:20:33 +08:00
