Commit Graph

1713 Commits

Author SHA1 Message Date
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
zowoq
05be03fbce podman: 1.8.2 -> 1.9.0
https://github.com/containers/libpod/releases/tag/v1.9.0
2020-04-16 08:26:09 +10:00
Euan Kemp
6d3eaa0527 containerd: fix --version output
Before this change, 'containerd --version' with the nix package wouldn't
print useful version information.

In addition, the build output a bunch of (harmless) errors about 'git:
command not found'.

This fixes both of those problems.
2020-04-14 23:28:27 -07:00
Sascha Grunert
392b2a1fef
cri-o: 1.17.1 -> 1.17.3
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-04-14 09:24:32 +02:00
Sergey Lukjanov
203d7c9f10 docker-compose: 1.25.4 -> 1.25.5 2020-04-12 17:49:31 -07:00
zowoq
c533af1b8a runc: fix manpages 2020-04-12 22:08:47 +10:00
José Romildo Malaquias
a4b7440f41 qtemu: init at 2.1 2020-04-11 18:42:05 -03:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jan Tojnar
bbb299c8e4
Merge pull request #84177 from zowoq/team
maintainers/teams: add podman team
2020-04-09 13:57:12 +02:00
Milan
28d8bc7251
seabios: 1.11.0 -> 1.13.0 (#79880)
https://www.seabios.org/Releases#SeaBIOS_1.13.0
2020-04-07 20:11:38 +02:00
Vincent Laporte
c0086a5c2a
ocamlPackages.ocaml_gettext: 0.3.8 → 0.4.1 2020-04-06 13:57:21 +02:00
zowoq
163d905305 runc: update maintainers 2020-04-03 20:37:59 +10:00
zowoq
edd336f4bb podman: update maintainers 2020-04-03 20:37:59 +10:00
zowoq
f85106b3d2 crun: update maintainers 2020-04-03 20:37:59 +10:00
zowoq
6f052a9a12 conmon: update maintainers 2020-04-03 20:37:59 +10:00
Sascha Grunert
109362d803
conmon: 2.0.14 -> 2.0.15
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-04-03 09:27:56 +02:00
R. RyanTM
a159ec6dcc x11docker: 6.6.0 -> 6.6.1 2020-04-01 16:55:00 -07:00
AndersonTorres
b334984a15 bochs: 2.6.10 -> 2.6.11 2020-03-30 23:29:25 -03:00
Marek Mahut
76196e9fe6
Merge pull request #83396 from r-ryantm/auto-update/spice-vdagent
spice-vdagent: 0.19.0 -> 0.20.0
2020-03-29 11:28:29 +02:00
Benjamin Hipple
faebb66e90
Merge pull request #82996 from saschagrunert/cri-o
cri-o: v1.17.0 -> v1.17.1
2020-03-28 22:54:28 -04:00
R. RyanTM
bbb3586884 spice-vdagent: 0.19.0 -> 0.20.0 2020-03-26 01:22:02 +00:00
Dmitry Kudriavtsev
e882dfe91f hercules: init at 3.13 2020-03-25 17:52:23 -07:00
Mario Rodas
b0de374f6a
Merge pull request #83036 from zowoq/conmon
conmon: 2.0.13 -> 2.0.14
2020-03-24 20:50:36 -05:00
Jörg Thalheim
aa7b26fe29
singularity: fix build with strict deps 2020-03-23 08:16:38 +00:00
Jörg Thalheim
831ed29331
containerd: fix build with strictDeps 2020-03-23 08:14:35 +00:00
R. RyanTM
473366f5ca x11docker: 6.5.0 -> 6.6.0 2020-03-20 23:43:11 -07:00
zowoq
146b207f08 conmon: 2.0.13 -> 2.0.14
https://github.com/containers/conmon/releases/tag/v2.0.14
2020-03-21 08:15:42 +10:00
Sascha Grunert
ac367b9946
cri-o: v1.17.0 -> v1.17.1
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-03-20 14:30:44 +01:00
Mario Rodas
1b91a99567
Merge pull request #82911 from marsam/update-docker-slim
docker-slim: 1.28.1 -> 1.29.0
2020-03-19 18:47:00 -05:00
zowoq
617d3b751a podman: 1.8.1 -> 1.8.2
https://github.com/containers/libpod/releases/tag/v1.8.2
2020-03-20 07:09:17 +10:00
Mario Rodas
9d6dce5344
docker-slim: 1.28.1 -> 1.29.0 2020-03-18 20:20:20 -05:00
Jörg Thalheim
e63be52970
gvisor: remove unneeded go-bindata 2020-03-18 11:29:35 +00:00
Mario Rodas
8d985cb9ba
Merge pull request #82811 from zowoq/conmon
conmon: 2.0.12 -> 2.0.13
2020-03-17 22:37:37 -05:00
zowoq
cb099ca0d8 conmon: 2.0.12 -> 2.0.13
https://github.com/containers/conmon/releases/tag/v2.0.13
2020-03-18 08:15:24 +10:00
Fabian Möller
2c77f1c049
virtualboxExtpack: synchronize version with virtualbox 2020-03-17 11:23:06 +01:00
zowoq
48e1ed7c71 conmon: 2.0.11 -> 2.0.12
https://github.com/containers/conmon/releases/tag/v2.0.12
2020-03-17 08:54:40 +10:00
Matteo Scarlata
2b99b29136 virtualbox: 6.0.14 -> 6.1.4
Update Virtualbox to its latest version. This allows compilation against
kernel >= 5.4 to succeed without further patches (see #74260, build
would fail for linux-5.5.5 to 5.5.9).
2020-03-13 22:36:31 +00:00
Maximilian Bosch
cfc1ad7012
Merge pull request #82382 from Frostman/docker-19.03.8
docker: 19.03.7 -> 19.03.8
2020-03-12 23:05:31 +01:00
zowoq
be13a1f358 podman: 1.8.0 -> 1.8.1
https://github.com/containers/libpod/releases/tag/v1.8.1
2020-03-12 07:04:31 +00:00
Sergey Lukjanov
1d0c3f148b docker: 19.03.7 -> 19.03.8 2020-03-11 21:11:10 -07:00
Mario Rodas
ea23f5b811
docker-slim: 1.28.0 -> 1.28.1 2020-03-10 04:20:00 -05:00
Mario Rodas
65731ad634
Merge pull request #82023 from zowoq/rkt-cve
rkt: add CVEs
2020-03-08 20:29:53 -05:00
Mario Rodas
0623c70586
Merge pull request #81968 from vdemeester/update-containerd
containerd: 1.2.6 -> 1.2.13
2020-03-08 19:56:46 -05:00
Mario Rodas
e26941fdbd
Merge pull request #81962 from marsam/udpate-docker-slim
docker-slim: 1.27.0 -> 1.28.0
2020-03-08 19:53:42 -05:00
Frederik Rietdijk
0eb0ddc4db Merge staging-next into master 2020-03-08 08:11:01 +01:00
zowoq
c4c936f2f7 rkt: add CVEs
https://www.twistlock.com/labs-blog/breaking-out-of-coresos-rkt-3-new-cves/
2020-03-08 07:19:44 +10:00
Vincent Demeester
68d61b1654
containerd: 1.2.6 -> 1.2.13
Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
2020-03-07 12:27:01 +01:00
Mario Rodas
1068dd3772
docker-slim: 1.27.0 -> 1.28.0
Changelog: https://github.com/docker-slim/docker-slim/releases/tag/1.28.0
2020-03-07 02:34:00 -05:00
Frederik Rietdijk
188c3a4d03 Merge staging-next into staging 2020-03-06 07:09:30 +01:00
zowoq
66aea3292f crun: 0.12.2.1 -> 0.13
https://github.com/containers/crun/releases/tag/0.13
2020-03-06 12:25:36 +10:00
Sergey Lukjanov
e1611f85c2 docker: 19.03.6 -> 19.03.7 2020-03-05 07:18:44 -08:00
zowoq
f14ee5bce5 conmon: 2.0.10 -> 2.0.11
https://github.com/containers/conmon/releases/tag/v2.0.11
2020-03-05 07:50:51 +10:00
Jan Tojnar
1a44e325d2
Merge branch 'staging-next' into staging 2020-03-04 21:24:05 +01:00
Andreas Rammhold
abd312b6b1
gvisor: update fixed output hash 2020-03-03 01:12:26 +01:00
Mario Rodas
e24855d70d
docker-slim: 1.26.1 -> 1.27.0
Changelog: https://github.com/docker-slim/docker-slim/releases/tag/1.27.0
2020-02-29 04:20:00 -05:00
Benjamin Hipple
ad30a30488 rustPlatform.fetchCargo: handle custom Cargo.lock patchfiles with validation
Previously, we would asssert that the lockfiles are consistent during the
unpackPhase, but if the pkg has a patch for the lockfile itself then we must
wait until the patchPhase is complete to check.

This also removes an implicity dependency on the src attribute coming from
`fetchzip` / `fetchFromGitHub`, which happens to name the source directory
"source". Now we glob for it, so different fetchers will work consistently.
2020-02-28 18:54:23 -08:00
zowoq
4ddbe3f263 umoci: 0.4.4 -> 0.4.5 2020-02-25 06:52:34 +10:00
Peter Hoeg
e17dff1104
Merge pull request #80004 from peterhoeg/f/crun
crun: run tests and show the proper version number
2020-02-23 21:15:44 +08:00
Vladimír Čunát
627a9ff433
lkl: fixup build after PR #78994 2020-02-20 21:07:43 +01:00
zowoq
d9bedd0e3e crun: 0.12.1 -> 0.12.2.1
https://github.com/containers/crun/blob/0.12.2.1/NEWS
2020-02-18 08:42:04 +10:00
Benjamin Hipple
2494471a14 cntr: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-16 09:35:30 -08:00
Mario Rodas
7696369bec
docker-slim: move expression to outside of build-support (#80078) 2020-02-14 09:42:18 +01:00
Benjamin Hipple
eb11feaa0b treewide: change fetchCargoTarball default to opt-out
Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.

This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.

See #79975 for details.
2020-02-13 22:41:37 -08:00
zowoq
1979e038a3 docker: 19.03.5 -> 19.03.6
https://github.com/docker/docker-ce/releases/tag/v19.03.6
2020-02-13 14:17:47 +10:00
Matthew Bauer
ba30ee3389
Merge pull request #79708 from saschagrunert/unused-ldflags-var
cri-o: remove unused ldflags variable
2020-02-10 14:28:12 -05:00
Christian Kauhaus
edfd964253
Merge pull request #79050 from andrew-d/andrew/qemu-CVEs
qemu: add patches for CVE-2020-7039 and CVE-2020-7211
2020-02-10 16:52:25 +01:00
Sascha Grunert
c36fca9701
cri-o: remove unused ldflags variable
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-02-10 14:42:40 +01:00
Sascha Grunert
b771cc73d4
cri-o: v1.16.1 -> v1.17.0
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-02-10 09:18:23 +01:00
Peter Hoeg
ee027c128b crun: run tests and show the proper version number 2020-02-10 12:01:48 +08:00
Frederik Rietdijk
03755ed59a Merge master into staging-next 2020-02-09 09:17:51 +01:00
Mario Rodas
54df335531
Merge pull request #79491 from zowoq/crun
crun: 0.12 -> 0.12.1
2020-02-08 06:14:06 -05:00
zowoq
69c29537b3 crun: 0.12 -> 0.12.1
https://github.com/containers/crun/blob/0.12.1/NEWS
2020-02-08 11:24:26 +10:00
Frederik Rietdijk
30f0909e3a Merge master into staging-next 2020-02-07 19:27:52 +01:00
Sascha Grunert
6d7e4fb746
podman: v1.7.0 -> v1.8.0
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-02-07 15:25:19 +01:00
Sergey Lukjanov
57be3cab36 docker-compose: 1.25.1 -> 1.25.4 2020-02-06 14:31:59 -08:00
Vladimír Čunát
48a997cd76
Merge #66528: glibc: 2.27 -> 2.30 (into staging)
Includes update of stdenv bootstap tools (for three main platforms)
and many package fixes with new glibc.
2020-02-05 13:41:09 +01:00
zowoq
1a021570f9 crun: 0.11 -> 0.12
https://github.com/containers/crun/releases/tag/0.12
2020-02-04 08:19:12 +10:00
zowoq
f578bcadbe firecracker: 0.19.0 -> 0.20.0
https://github.com/firecracker-microvm/firecracker/blob/v0.20.0/CHANGELOG.md#0200
2020-02-02 12:52:48 +10:00
Andrew Dunham
ef3addb1cb qemu: add patches for CVE-2020-7039 and CVE-2020-7211
Fixes #78762
2020-02-01 16:37:15 -08:00
Maximilian Bosch
ea8ae88f04
Merge branch 'staging' into glibc230 2020-02-01 17:42:03 +01:00
Maximilian Bosch
10ad9fea9f
xen: remove 4.5
Depends on a fairly old gcc, marked as insecure for ~2 years.
2020-01-28 20:11:00 +01:00
Maximilian Bosch
6b0cd9ad47
Merge branch 'staging' into glibc230
Conflicts:
	pkgs/applications/misc/vit/default.nix
2020-01-28 14:54:51 +01:00
zowoq
5bee42b6b4 conmon: 2.0.9 -> 2.0.10 2020-01-28 08:07:52 +10:00
zowoq
b9e3d5ab9d runc: 1.0.0-rc9 -> 1.0.0-rc10
https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc10
2020-01-24 13:13:52 +10:00
Maximilian Bosch
91b7e73bbc
xen_4_8-{light,slim}: fix build 2020-01-23 11:00:54 +01:00
Peter Hoeg
2cfb5f51d2
Merge pull request #77483 from zowoq/crun
crun: 0.10.6 -> 0.11
2020-01-23 09:11:22 +08:00
Maximilian Bosch
ad2fd68cff
xen_4_8: fix build w/glibc-2.30
The header (and the `sysctl`-function) were unused, so the inclusion can be
removed safely.

This was done by upstream in 4.9 as well[1].

[1] 74858c9eaf
2020-01-23 00:21:22 +01:00
Sascha Grunert
b5035c0892 cri-o: Fix build tags usage
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-01-22 17:33:57 +01:00
zowoq
f64bcd6cca crun: 0.10.6 -> 0.11 2020-01-16 15:45:59 +10:00
R. RyanTM
41c3914b62 docker-compose: 1.25.0 -> 1.25.1 2020-01-15 07:09:58 +00:00
Christian Mainka
316c4012e2 open-vm-tools: 10.3.10 -> 11.0.1
Also update our downstream patch.
2020-01-11 11:48:53 -05:00
Mario Rodas
0a4c110bc3
Merge pull request #77221 from saschagrunert/conmon
conmon: v2.0.8 -> v2.0.9
2020-01-07 20:43:50 -05:00
zowoq
66978f0f46 podman: 1.6.3 -> 1.7.0 2020-01-08 07:25:59 +10:00
Sascha Grunert
d4a9b0a087
conmon: v2.0.8 -> v2.0.9
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-01-07 13:22:45 +01:00
zowoq
31d2d5a382 docker: 19.03.4 -> 19.03.5 2020-01-03 12:49:49 +00:00
Frederik Rietdijk
f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
Franz Pletz
5338dd7ac8
Merge pull request #76065 from risicle/ris-qemu-4.2.0
qemu: 4.1.0 -> 4.2.0, including patch for minor CVE-2019-15890
2020-01-02 15:19:30 +00:00
Jan Tojnar
0c2adc0fb1
Merge branch 'staging' into staging-next 2019-12-31 03:59:58 +01:00
Robin Gloster
313da176d3
treewide: NIX_*_FLAGS -> string 2019-12-31 00:16:46 +01:00
Robin Gloster
5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
Robin Gloster
4db0860814
cri-o: fix *Flags 2019-12-31 00:03:37 +01:00