Commit graph

1667 commits

Author SHA1 Message Date
Jan Tojnar
c637cbe992
Merge branch 'master' into staging-next 2020-06-10 04:10:34 +02:00
Marek Mahut
df1f883bbf
Merge pull request #89789 from 1000101/formatting
formatting: fix missing leading whitespace
2020-06-08 14:41:26 +02:00
Frederik Rietdijk
dc33419285 Merge master into staging-next 2020-06-08 12:06:12 +02:00
Florian Klink
3590f02e7d
Merge pull request #88574 from JJJollyjim/qemu-vm-qboot-opt
nixos/qemu-vm: add option to use qboot
2020-06-08 10:46:11 +02:00
1000101
277bbb8efe formatting: fix missing leading whitespace 2020-06-08 09:37:17 +02:00
Jamie McClymont
55912f3535 nixos/qemu-vm: add option to use a non-standard BIOS
I'd like to change the default on x86 platforms to qboot at some point, since it
saves a fair bit of startup time.
2020-06-08 11:21:53 +12:00
AndersonTorres
13abee9986 tiny8086: update source and build script 2020-06-06 02:53:18 -03:00
Frederik Rietdijk
08900c0554 Merge master into staging-next 2020-06-04 15:25:54 +02:00
Florian Klink
aad06c8ff5
Merge pull request #89328 from flokli/qemu-wrap
qemu: wrap GTK binaries
2020-06-03 22:29:19 +02:00
zowoq
c710d14f2d runc: 1.0.0-rc10 -> 1.0.0-rc90
https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc90
2020-06-02 13:17:30 +10:00
Florian Klink
c7eb16cec3 qemu: wrap GTK binaries
Applications using a different GTK version than the user session don't
work well, and people often run NixOS VM tests on different channels.

Wrapping these GTK binaries is a common way to fix this.

Fixes #69158
2020-06-01 23:06:28 +02:00
Sergey Lukjanov
a4ea8abae6 docker: 19.03.10 -> 19.03.11 2020-06-01 08:44:02 -07:00
Robin Gloster
f7056dca74
docker-compose: fix zsh completion 2020-05-31 15:49:29 +02:00
Sergey Lukjanov
c8dddcb1a9 docker: 19.03.9 -> 19.03.10 2020-05-29 11:08:03 -07:00
Frederik Rietdijk
36d9eeb9c7 Merge staging-next into staging 2020-05-29 17:06:01 +02:00
Claudio Bley
7172514b72 bazel: 3.1.0 -> 3.2.0 2020-05-29 15:22:35 +02:00
Claudio Bley
1c5386fa1d bazel: Make bazel_3 the default version
* drop bazel_2
* update hashes of fetch derivations that use `buildBazelPackage`
2020-05-29 08:52:17 +02:00
Frederik Rietdijk
362d88c2b1 Merge staging-next into staging 2020-05-27 15:27:28 +02:00
zowoq
2038916072 conmon: 2.0.16 -> 2.0.17
https://github.com/containers/conmon/releases/tag/v2.0.17
2020-05-27 10:00:30 +10:00
zowoq
37a87c343c podman: update comments in wrapper 2020-05-25 12:27:49 +02:00
zowoq
9e7fbc6f2c nixos/cri-o, cri-o: add wrapper 2020-05-25 12:27:49 +02:00
Florian Klink
dc351baa44
Merge pull request #88570 from JJJollyjim/qboot-2020
qboot: 20170330 -> 20200423
2020-05-24 19:48:57 +02:00
Frederik Rietdijk
8a77c900dd Merge staging-next into staging 2020-05-23 10:25:19 +02:00
zowoq
9754e3485c podman: 1.9.2 -> 1.9.3
https://github.com/containers/libpod/releases/tag/v1.9.3
2020-05-23 06:15:10 +10:00
Maximilian Bosch
d8ce282534
Merge pull request #88473 from r-ryantm/auto-update/x11docker
x11docker: 6.6.1 -> 6.6.2
2020-05-22 17:47:00 +02:00
Orivej Desh
16d7f7edae Merge branch 'master' into staging 2020-05-22 09:13:23 +00:00
adisbladis
0c70afa6d1
podman-compose: Don't wrap podman
Podman is now a wrapped with it's container runtimes in the podman
closure.

This means that the podman passed to podman-compose is not necessarily
the one that the user wants to use as it lacks user configured
container runtimes.

This change aims to make package composition more intuitive by
defering the installation of podman to the user of podman-compose.
2020-05-22 06:34:25 +01:00
adisbladis
e061c4bab3
podman-compose: Add podman team to maintainers 2020-05-22 06:34:25 +01:00
Jamie McClymont
3eb91ffa68 qboot: 20170330 -> 20200423 2020-05-22 14:49:31 +12:00
R. RyanTM
59c9a6ee3b x11docker: 6.6.1 -> 6.6.2 2020-05-21 00:49:18 +00:00
Sergey Lukjanov
fb3039d91b docker: 19.03.8 -> 19.03.9 2020-05-20 10:52:10 -07:00
Scott Worley
f2406c602a qemu: 4.2.0 -> 5.0.0 2020-05-19 21:51:33 +02:00
adisbladis
9aebaa1704
Merge pull request #88106 from zowoq/tests
podman packages: add passthru tests
2020-05-19 03:14:43 +02:00
zowoq
032462fc94 runc: add passthru.tests 2020-05-19 10:41:35 +10:00
zowoq
e469b77bf0 crun: add passthru.tests 2020-05-19 10:41:30 +10:00
zowoq
cd345dde53 conmon: add passthru.tests 2020-05-19 10:41:25 +10:00
zowoq
fe45946f7d podman: don't build "podman-remote" 2020-05-19 10:00:19 +10:00
zowoq
a26035f05f cri-o: 1.18.0 -> 1.18.1
https://github.com/cri-o/cri-o/releases/tag/v1.18.1
2020-05-17 09:16:11 +10:00
Mario Rodas
b5f2cb7620
Merge pull request #87923 from zowoq/umoci
umoci: install manpages, switch to buildGoModule
2020-05-16 06:56:41 -05:00
zowoq
f0fbd9deec umoci: install manpages, switch to buildGoModule 2020-05-16 13:37:01 +10:00
zowoq
5195aed617 rkt: remove 2020-05-16 09:23:07 +10:00
Jörg Thalheim
4de5006b9a
Merge pull request #85853 from sjau/vdagent_timeout
vdagent: fixing 90s timeout on shutdown
2020-05-15 10:08:19 +01:00
zowoq
b57ae98864 runc: add libselinux, update buildtags 2020-05-14 23:08:01 +10:00
zowoq
e142fbb3f7 podman: add libapparmor, libselinux 2020-05-14 23:08:01 +10:00
zowoq
399f5ea75e cri-o: remove propagated inputs, update buildtags 2020-05-14 23:07:57 +10:00
Mario Rodas
2c8312402d
Merge pull request #86378 from saschagrunert/crio-buildgomodule
cri-o: switch to buildGoModule
2020-05-14 08:01:03 -05:00
zowoq
1ad3b685f4 podman: switch to buildGoModule 2020-05-14 17:36:49 +10:00
Sascha Grunert
006e6b052f
cri-o: switch to buildGoModule
This is just a cleanup to switch from buildGoPackage to buildGoModule.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-05-14 09:32:16 +02:00
Colin L Rice
d6162dab50
go-modules: Update files to use vendorSha256 2020-05-14 07:22:21 +01:00
zowoq
82e0e43284 podman: fix passthru.tests 2020-05-14 09:39:49 +10:00