Commit Graph

1713 Commits

Author SHA1 Message Date
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
zowoq
115b797a43 podman: 1.9.1 -> 1.9.2
https://github.com/containers/libpod/releases/tag/v1.9.2
2020-05-14 09:39:49 +10:00
Mario Rodas
8ec4b8b98b
Merge pull request #87660 from zowoq/crio-flavor
cri-o: drop flavor
2020-05-13 06:57:41 -05:00
zowoq
6007ba5075 conmon: 2.0.15 -> 2.0.16
https://github.com/containers/conmon/releases/tag/v2.0.16
2020-05-13 10:49:14 +10:00
zowoq
1d909f5fdb cri-o: drop flavor 2020-05-12 21:33:17 +10:00
Matthew Bauer
43545032af
Merge pull request #87314 from matthewbauer/bazel-flat
build-bazel-package: switch hash mode to “flat”
2020-05-11 15:27:48 -05:00
R. RyanTM
ae649e275c virt-viewer: 8.0 -> 9.0 2020-05-10 18:35:50 +00:00
Jaka Hudoklin
91271207ca
Merge pull request #87458 from zowoq/shellfiles
containerd, docker, runc: use/update installShellFiles
2020-05-10 02:35:15 +00:00
zowoq
3a79753662 runc: update installManPages 2020-05-10 11:33:10 +10:00
zowoq
764dd5c875 docker: use installShellFiles 2020-05-10 11:33:04 +10:00
zowoq
4d2bcaed5c containerd: use installShellFiles 2020-05-10 11:27:10 +10:00
Matthew Bauer
2a8d05627b build-bazel-package: switch hash mode to “flat”
flat hashes can be substituted through hashed-mirrors, while recursive
hashes can’t. This is especially important for Bazel since the bazel
fetch dependencies can come from multiple different methods (git,
http, ftp, etc.). To do this, we create tar archives from the
output/external directory, which is then extracted to build. All of
the Bazel hashes are all updated.
2020-05-09 13:33:26 -05:00
xrelkd
5e16e668f5 firecracker: 0.20.0 -> 0.21.1 2020-05-09 22:13:06 +08:00
Mario Rodas
9d959ff8d5
Merge pull request #86638 from zowoq/cri-shell
cri-o, cri-tools: install completion, manpages
2020-05-06 21:08:51 -05:00
zowoq
5012fc268b podman: disable on darwin 2020-05-06 22:26:19 +10:00
adisbladis
ba798d2c89 podman: Link directly to podman.man instead of maping over outputs
This seems brittle and fails on Hydra / OfBorg but not locally.
2020-05-06 21:09:12 +10:00
Jaka Hudoklin
85ee3e12ae
Merge pull request #85269 from euank/containerd-versioning
containerd: fix --version output
2020-05-06 08:27:37 +00:00
sjau
facbf402ac vdagent: fixing 90s timeout on shutdown 2020-05-06 09:53:51 +02:00
zowoq
848a8c1b37 cri-o: install completion/manpages 2020-05-06 16:43:15 +10:00
Frederik Rietdijk
9875bbae75 Merge master into staging-next 2020-05-05 19:51:09 +02:00
adisbladis
7c77e6d988
podman: Link directly to podman.man instead of maping over outputs
This seems brittle and fails on Hydra / OfBorg but not locally.
2020-05-05 00:47:42 +01:00
adisbladis
b346e1d444
podman: Don't symlink the $bin output
If we do it propagates and ends up in $PATH inside nix-shell
2020-05-04 22:20:00 +01:00
zowoq
a677738a23
podman: use $out instead of $bin with buildGoPackage 2020-05-04 20:55:21 +01:00
Jörg Thalheim
2b08905cae
Merge pull request #85603 from parthy/edk2-macos
edk2: Support build on macOS
2020-05-04 16:41:00 +01:00
Markus Partheymüller
faf984d12d ed2k/OVMF: Put URLs in quotes 2020-05-04 16:00:37 +02:00
R. RyanTM
169f2b05e8 tini: 0.18.0 -> 0.19.0 2020-05-04 09:49:49 +00:00
zowoq
b815de00f7 podman: use $out instead of $bin with buildGoPackage 2020-05-01 18:24:09 +10:00
Frederik Rietdijk
484ee79050 Merge staging-next into staging 2020-05-01 08:57:10 +02:00
Michael Lingelbach
4a704c653b libnvidia-container: 1.0.0 -> 1.0.6 2020-04-30 13:53:47 -07:00
adisbladis
b2a9a3e9cb
podman: Wrap packages required to run containers 2020-04-29 11:40:44 +01:00
Jan Tojnar
2874eebfd2
Merge branch 'staging-next' into staging 2020-04-29 08:35:47 +02:00
adisbladis
50950bda13
Merge pull request #86262 from zowoq/podman
podman: 1.9.0 -> 1.9.1
2020-04-29 03:00:47 +02:00
zowoq
3fb6a304d0 podman: 1.9.0 -> 1.9.1
https://github.com/containers/libpod/releases/tag/v1.9.1
2020-04-29 08:31:03 +10:00
Florian Klink
05328a49f6
Merge pull request #85772 from blitz/open-watcom
Use Open Watcom to build VirtualBox BIOS
2020-04-29 00:29:06 +02:00
Mario Rodas
ce7272b43c
Merge pull request #85869 from saschagrunert/crio
cri-o: 1.17.3 -> 1.18.0
2020-04-28 07:27:06 -05:00
Julian Stecklina
7c995a4532 virtualbox: build BIOS from C instead of alternative sources
VirtualBox ships with "alternative BIOS sources" for its virtual BIOS.
These are generated by first compiling the BIOS C sources with the
Open Watcom toolchain, disassembling the output and checking in the
disassembly into the VirtualBox repo.

The result means that the BIOS C code cannot be patched, because it's
not compiled from the C sources, if Open Watcom is not there.

As Open Watcom is now available in nixpkgs, we can just ignore the
alternative BIOS sources and compile it from C directly.
2020-04-28 13:36:50 +02:00
zowoq
b5dc07a4b4 treewide: use $out instead of $bin with buildGoPackage 2020-04-28 20:30:29 +10:00
zowoq
b2556b13f5 runc: remove hardeningDisable 2020-04-27 16:17:42 +10:00
Jacek Galowicz
002b553b14
Merge pull request #85781 from blitz/spike-test
Add spike integration test to nixosTests
2020-04-25 15:50:38 +02:00
Florian Klink
0d99474a9b
Merge pull request #85556 from B4dM4n/virtualbox-616
virtualbox: 6.1.4 -> 6.1.6
2020-04-24 11:54:29 +02:00
Sascha Grunert
1ae9631725
cri-o: 1.17.3 -> 1.18.0
- Make buildtags being able to set via the BUILDTAGS environment
- Switch to go 1.14

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-04-24 10:07:06 +02:00
zowoq
e3025ca128 cri-o: update maintainers 2020-04-24 08:08:53 +10:00
Alyssa Ross
98b3ac8d40 crosvm: 79.12607.0.0-rc4 -> 81.12871.0.0-rc1 2020-04-23 09:06:11 +00:00
Alyssa Ross
56e9d1f936 chromiumOSPackages.updateScript: fix buildspec url
"paladin" doesn't seem to be up to date, whereas "full" seems to match
what cros-updates-serving.appspot.com reports is currently being
shipped to Chromebooks.
2020-04-23 09:06:11 +00:00
zowoq
97851a33ac podman: add passthru.tests 2020-04-23 08:14:55 +02:00
Martin Milata
4ee9179a11 aqemu: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Julian Stecklina
a33ce7e4fb spike: add test to nixosTests 2020-04-22 14:45:12 +02:00
Markus Partheymüller
94d114dc2a edk2/OVMF: Determine build type from CC setting 2020-04-20 13:30:35 +02:00
Markus Partheymüller
f5f53288cc edk2/OVMF: Support build on macOS
In order to use OVMF firmware with e.g. qemu on macOS, these packages
needed to be made macOS ready. This meant choosing the clang build in
this case, because it is the only one working on macOS.

Unfortunately, just using clang on all platforms doesn't work because
there are hardcoded assumptions in the edk2 build system.
2020-04-20 09:53:32 +02:00
Mario Rodas
c3945dc31c
Merge pull request #85526 from zowoq/misc
buildah, conmon: misc fixes
2020-04-19 19:26:41 -05:00
José Romildo Malaquias
6dd72ea0c3
Merge pull request #84941 from romildo/upd.qtemu
qtemu: init at 2.1
2020-04-19 21:23:33 -03:00
Fabian Möller
0481e09ad3
virtualbox: 6.1.4 -> 6.1.6 2020-04-19 14:04:17 +02:00
Fabian Möller
93e8f5d90f
virtualbox: add update script 2020-04-19 14:03:58 +02:00
zowoq
9123c8c5de conmon: installFlags 2020-04-19 10:27:55 +10:00
Milan Pässler
08d83c1641 docker: add git to extraPath
When building a docker container from git, docker was missing the git
binary in $PATH.
2020-04-18 21:48:55 +02:00