Commit Graph

1645 Commits

Author SHA1 Message Date
Michael Raskin
e726201cc8
Merge pull request #52352 from hyperfekt/init_crosvm
crosvm: init at 77.0.3865.105
2019-12-17 15:22:14 +00:00
Sascha Grunert
7aba727c0d
conmon: v2.0.7 -> v2.0.8
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-12-16 09:43:03 +01:00
Robert Scott
46460d3d7a crun: 0.8 -> 0.10.6 (security) (#75304)
addressing CVE-2019-18837
2019-12-14 18:49:18 +01:00
Mario Rodas
d712be5f3e
podman: add marsam to maintainers 2019-12-13 04:21:00 -05:00
Mario Rodas
072cdcb265
podman: enable on darwin 2019-12-13 04:20:00 -05:00
Ivan Kozik
61f264fc41 open-vm-tools: 11.0.1 -> 11.0.5 2020-01-20 07:42:00 +00:00
Sascha Grunert
0101712a5b
conmon: v2.0.6 -> v2.0.7
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-12-13 09:24:52 +01:00
Mario Rodas
10fbebcfc6
Merge pull request #75483 from saschagrunert/conmon
conmon: v2.0.4 -> v2.0.6
2019-12-12 08:19:14 -05:00
Sascha Grunert
9165b15335
conmon: v2.0.4 -> v2.0.6
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-12-12 09:23:13 +01:00
Florian Klink
135ebdb7b8
Merge pull request #74260 from B4dM4n/virtualbox-update
virtualbox: 6.0.12 -> 6.0.14
2019-12-12 03:52:39 +01:00
Fabian Möller
837dbc809e
fixup! virtualbox: 6.0.12 -> 6.0.14
use fetchpatch in guest additions
2019-12-12 00:59:03 +01:00
Fabian Möller
63969f5821
fixup! virtualbox: 6.0.12 -> 6.0.14 2019-12-11 22:59:50 +01:00
Sascha Grunert
23f10837ab
conmon: v2.0.3 -> v2.0.4
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-12-09 18:36:35 +01:00
Nikolay Korotkiy
2a6a39bc8c
podman-compose: init at 0.1.5 2019-12-06 12:41:40 +03:00
Florian Klink
3140fa89c5
Merge pull request #73097 from andrew-d/andrew/gvisor-redux
gvisor: init at 2019-11-14
2019-12-05 01:28:43 +01:00
Andrew Dunham
1f0512faf6 gvisor-containerd-shim: init at 2019-10-09 2019-12-03 23:55:24 -08:00
Andrew Dunham
3147b0a09e gvisor: init at 2019-11-14 2019-12-03 23:55:24 -08:00
Maximilian Bosch
7d8205bc09
docker-distribution: 2.6.2 -> 2.7.1 2019-12-03 13:49:03 +01:00
Frederik Rietdijk
d14baf7747 Merge master into staging-next 2019-11-30 08:57:28 +01:00
Mario Rodas
33be10e490
Merge pull request #74701 from r-ryantm/auto-update/x11docker
x11docker: 6.3.0 -> 6.4.0
2019-11-29 19:38:25 -05:00
R. RyanTM
06c6f43430 x11docker: 6.3.0 -> 6.4.0 2019-11-29 15:14:39 -08:00
R. RyanTM
bd834e51e4 charliecloud: 0.11 -> 0.12 2019-11-28 11:55:44 -08:00
Florian Klink
445b872c89 virtualboxExtpack: remove flokli from maintainers
I'm not using virtualbox anymore.
2019-11-28 16:19:09 +01:00
Florian Klink
64bb05dc4a virtualbox: remove flokli from maintainers
I'm not using virtualbox anymore.
2019-11-28 16:18:11 +01:00
Frederik Rietdijk
072f9fe290
Merge pull request #73813 from aske/virt-man-flags
virt-manager: use setupPyGlobalFlags
2019-11-28 15:14:06 +01:00
Jonathan Ringer
0c1c18ca44
Merge branch 'master' into staging-next 2019-11-27 22:57:50 -08:00
Robin Gloster
4fb0e3c4f2
Merge pull request #74320 from saschagrunert/cri-o
cri-o: v1.16.0 -> v1.16.1
2019-11-27 17:10:19 +01:00
Sascha Grunert
018136cd39
cri-o: v1.16.0 -> v1.16.1
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-11-27 11:38:22 +01:00
Jörg Thalheim
bab9a6f8a8
cntr: 1.2.0 -> 1.2.1 2019-11-27 10:12:04 +00:00
Fabian Möller
041680d936
virtualbox: 6.0.12 -> 6.0.14 2019-11-26 11:58:52 +01:00
Frederik Rietdijk
06a054e6eb Merge master into staging-next 2019-11-25 21:51:57 +01:00
R. RyanTM
eaa70f27c6 docker-compose: 1.24.1 -> 1.25.0 2019-11-25 09:28:55 -08:00
John Ericson
d0d5136cce Merge remote-tracking branch 'upstream/master' into wrapper-pname-support 2019-11-24 17:25:07 +00:00
John Ericson
9b090ccbca treewide: Get rid of most parseDrvName without breaking compat
That is because this commit should be merged to both master and
release-19.09.
2019-11-24 17:22:28 +00:00
Kirill Boltaev
22a050ff5e virt-manager: use pname 2019-11-21 14:30:20 +03:00
Kirill Boltaev
0072e70d35 virt-manager: remove redundant namePrefix assignment
buildPythonApplication does namePrefix = ""
2019-11-21 14:27:59 +03:00
Kirill Boltaev
3d7d72bc46 virt-manager: use setupPyGlobalFlags 2019-11-20 15:46:41 +03:00
Frederik Rietdijk
5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Lassulus
ce52d6b6ae
Merge pull request #73188 from blitz/spike
spike: init at 1.0.0
2019-11-17 19:19:17 +01:00
Sascha Grunert
08fa83ce52 conmon: v2.0.2 -> v2.0.3
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-11-14 16:47:48 +01:00
Julian Stecklina
e750461511 spike: init at 1.0.0
Spike is the RISC-V ISA simulator from the RISC-V project.
2019-11-11 00:46:05 +01:00
Alyssa Ross
d3b0f178ef crosvm: init at 77.12371.0.0-rc1
Co-Authored-By: hyperfekt <git@hyperfekt.net>
2019-11-06 19:35:48 +01:00
Sascha Grunert
f46e8f9a12 cri-o: 1.15.2 -> 1.16.0
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-11-06 19:22:36 +01:00
hyperfekt
4dce5d71c6 qemu: name -> pname 2019-11-05 23:39:12 +00:00
Sascha Grunert
b5d42984bb
podman: v1.6.2 -> v1.6.3
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-11-05 08:38:54 +01:00
Franz Pletz
8dca8b9ccb
Merge remote-tracking branch 'origin/master' into gcc-9 2019-11-05 01:07:22 +01:00
Franz Pletz
1ba64dad7c
xen_4_8: fix build with gcc9 2019-11-05 01:04:17 +01:00
Franz Pletz
50dad9e873
xen_4_10: fix build with gcc9 2019-11-05 01:04:17 +01:00
Mario Rodas
8a1569d1c5
x11docker: add missing dependencies 2019-11-03 09:00:00 -05:00
Franz Pletz
c124d44e49
open-vm-tools: fix build with gcc9 2019-11-03 14:43:38 +01:00
R. RyanTM
a40b03c608 x11docker: 6.2.0 -> 6.3.0 2019-11-03 03:36:33 -08:00
Franz Pletz
8b9b91ccbb
spice-vdagent: 0.18.0 -> 0.19.0 2019-11-03 01:24:46 +01:00
Franz Pletz
d25337d16a
spice-vdagent: fix build with gcc9 2019-11-03 01:24:45 +01:00
zokrezyl
f23870a45b umoci: 0.4.4 2019-10-30 09:43:44 +01:00
Sascha Grunert
702c745241 conmon: 2.0.0 -> 2.0.2
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-10-29 13:43:05 +01:00
Maximilian Bosch
d1109dac5b
virt-top: 2017-11-18-unstable -> 1.0.9
http://git.annexia.org/?p=virt-top.git;a=blob_plain;f=ChangeLog;hb=4e29d93ac30354743258a7a737ad30dc346a3b38
2019-10-29 13:10:29 +01:00
Austin Seipp
4be9fcd184 firecracker: support on aarch64-linux
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-10-28 20:18:07 -05:00
Austin Seipp
610a6fc20b firecracker: 0.18.0 -> 0.19.0, some cleanups
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-10-28 20:18:07 -05:00
adisbladis
5dd330ef0e
Merge pull request #72093 from prusnak/go-fortify
stop using hardeningDisable = [ "fortify" ]; for Go packages
2019-10-28 14:09:55 +01:00
xrelkd
cbeb6570ac firectl: init at 0.1.0 2019-10-27 22:32:58 -07:00
Tim Steinbach
eada48dd98
docker: 19.03.2 -> 19.03.4 2019-10-27 11:01:34 -04:00
Pavol Rusnak
afd38ea1ee
stop using hardeningDisable = [ "fortify" ]; for Go packages
it seems that the issue #25959 is not present anymore
2019-10-27 14:44:26 +01:00
Robert Hensing
becfba9512
Merge pull request #71092 from roberth/arion-init
arion: init at 0.1.0.0
2019-10-24 16:12:06 +02:00
worldofpeace
8f3297fbf2 open-vm-tools: ignore deprecation warnings
Fixes #71311
2019-10-24 09:45:56 -04:00
Robert Hensing
d3913c84da arion: init at 0.1.0.0 2019-10-24 12:45:07 +02:00
Jason Samsa
55d1739f22 xhyve: upgrade to 20191001 2019-10-23 13:10:18 -05:00
Mario Rodas
d86e57c819
Merge pull request #71309 from marsam/init-dumb-init
dumb-init: init at 1.2.2
2019-10-22 02:38:21 -05:00
Tim Steinbach
2dc7d6197e
Merge pull request #71386 from d-goldin/docker_runc_cve
docker-runc: switch to OCI runc 1.0.0-rc8+dev (security)
2019-10-21 12:14:41 -04:00
Sascha Grunert
64dbf3a22d podman: 1.6.1 -> 1.6.2
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-10-21 18:11:30 +02:00
Dima
b36ee87814 docker-runc: switch to OCI runc 1.0.0-rc8+dev
The revision picked is based on
https://github.com/docker/docker-ce/blob/19.03/components/engine/hack/dockerfile/install/runc.installer
and https://github.com/docker/docker-ce/blob/18.09/components/engine/hack/dockerfile/install/runc.installer

This should address CVE-2019-16884.
2019-10-19 15:39:09 +02:00
Mario Rodas
a988883d91
dumb-init: init at 1.2.2 2019-10-17 21:00:00 -05:00
Marek Mahut
fa456e4209
Merge pull request #70557 from r-ryantm/auto-update/charliecloud
charliecloud: 0.9.8 -> 0.11
2019-10-15 15:44:47 +01:00
Vladimír Čunát
0fa45b865a
Merge #70464: runc: v1.0.0-rc8 -> v1.0.0-rc9 (security) 2019-10-12 10:12:58 +02:00
Florian Klink
fb5f649bc9
Merge pull request #70881 from xfix/virtualbox-update
virtualbox: 6.0.10 -> 6.0.12
2019-10-11 19:24:12 +02:00
Renaud
b943338ea5
Merge pull request #70806 from r-ryantm/auto-update/virt-what
virt-what: 1.19 -> 1.20
2019-10-11 14:20:27 +02:00
Konrad Borowski
8e2c34c0b0 virtualbox: 6.0.10 -> 6.0.12 2019-10-09 22:14:57 +02:00
R. RyanTM
a2fd3f41e5 virt-what: 1.19 -> 1.20
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/virt-what/versions
2019-10-08 16:12:53 -07:00
Vladimír Čunát
b7b8e1f2e7
Merge #70618: linuxPackages.virtualBoxGuestAdditions: fix build 2019-10-07 17:50:33 +02:00
Linus Heckemann
22011b0218 linuxPackages.virtualBoxGuestAdditions: fix build
Fixes #70470
2019-10-07 14:02:45 +02:00
Linus Heckemann
9906b88423
Merge pull request #70382 from mayflower/anonscm
Fix dead anonscm links
2019-10-07 11:53:29 +02:00
R. RyanTM
31f3f91966 charliecloud: 0.9.8 -> 0.11
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/charliecloud/versions
2019-10-06 18:43:17 -07:00
Renaud
261fb1b443
Merge pull request #70369 from saschagrunert/podman
podman: 1.5.1 -> 1.6.1
2019-10-06 16:14:56 +02:00
Joachim Fasting
a1febca9fc lkl: 2019-06-20 -> 2019-10-04 2019-10-06 13:38:12 +09:00
Sascha Grunert
ed633cb994
runc: v1.0.0-rc8 -> v1.0.0-rc9
Signed-off-by: Sascha Grunert <mail@saschagrunert.de>
2019-10-05 15:42:04 +02:00
Linus Heckemann
91ceb6b997 treewide: fix dead anonscm.debian.org links 2019-10-04 12:42:21 +02:00
Sascha Grunert
4f2119af05
podman: 1.5.1 -> 1.6.1
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-10-04 08:42:39 +02:00
Joachim F
2c117aec37
Merge pull request #58471 from colemickens/cu
cloud-utils: use `qemu-utils` instead of `qemu`
2019-10-02 09:59:52 +00:00
jD91mZM2
a9e872a126
x11docker: 6.0.0 -> 6.2.0 2019-09-28 18:48:55 +02:00
Florian Klink
8058883bad
linuxPackages.virtualboxGuestAdditions: apply mp-r0drv-linux.c… (#69500)
linuxPackages.virtualboxGuestAdditions: apply mp-r0drv-linux.c patch
2019-09-27 15:46:55 +02:00
Joachim F
ad773d31e2
Merge pull request #69345 from joachifm/feat/split-version
Replace uses of splitString for splitting version strings
2019-09-27 06:19:18 +00:00
Joachim Fasting
bad07dfac5
tree-wide: replace uses of splitString "." with lib.versions
Quoting from the splitString docstring:

   NOTE: this function is not performant and should never be used.

This replaces trivial uses of splitString for splitting version
strings with the (potentially builtin) splitVersion.
2019-09-26 17:42:49 +02:00
Florian Klink
61f0f8d607 linuxPackages.virtualboxGuestAdditions: apply mp-r0drv-linux.c patch
These don't use a the virtualbox sources, but an iso as src, and we need
to add the kernel 5.3 patch aswell.

As for some reason the source files are present on the .iso with Windows
Line endings (sic!), call dos2unix first.

Unfortunately, we can't use the same kernel-5.3-fix.patch as virtualbox
itself, as some files are missing and paths are different.
2019-09-26 12:01:30 +02:00
Florian Klink
08a1aa4e6a
virtualboxGuestAdditions: Fix clipboard integration. (#69306)
virtualboxGuestAdditions: Fix clipboard integration.
2019-09-25 10:26:49 +02:00
William Kral
2f2da824ed virtualbox: Temporary fix for kernel >= 5.3 2019-09-23 12:33:34 -07:00
Ambroz Bizjak
7dcef37ef8 virtualboxGuestAdditions: Fix clipboard integration.
VBoxClient needs a RUNPATH entry to dlopen libXfixes successfully.

Fixes https://github.com/NixOS/nixpkgs/issues/65542
2019-09-23 18:07:37 +02:00
Danielle Lancashire
de627c704b firecracker: 0.15.2 -> 0.18.0 2019-09-21 17:22:25 -05:00
Sascha Grunert
29819009ec cri-o: 1.15.1 -> 1.15.2 (#68490)
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-09-16 00:15:49 -04:00
Robin Gloster
dcdf68ee01
xen_4_10: 4.10.0 -> 4.10.4
glusterfs compatibility fix, also added Wno-error flags for gcc8
compatibility
2019-09-14 14:06:16 +02:00
Robin Gloster
da28be646f
Merge pull request #68661 from JohnAZoidberg/xen-gcc8
xen: Ignore GCC8 errors
2019-09-13 23:28:20 +02:00
Robin Gloster
c53d6f947f
Merge pull request #68673 from ck3d/fix-vb-guest-kernel52
virtualboxGuestAdditions: fix compilation with kernel 5.2
2019-09-13 23:26:29 +02:00
Christian Kögler
2756c3054c virtualboxGuestAdditions: fix compilation with kernel 5.2 2019-09-13 17:39:27 +02:00
Daniel Schaefer
dc0e697038 xen: Ignore GCC8 errors 2019-09-13 15:12:18 +02:00
WilliButz
f40ad53dea
Merge pull request #68542 from peterhoeg/p/crun
crun: init at 0.8
2019-09-12 13:31:42 +02:00
Peter Hoeg
5f649b2a10 crun: init at 0.8 2019-09-12 17:23:14 +08:00
Eelco Dolstra
404caba16b
Merge pull request #66775 from Izorkin/qemu
qemu: 4.0.0 -> 4.1.0
2019-09-09 17:36:36 +02:00
Tim Steinbach
8a18c9f261
docker: 19.03.1 -> 19.03.2 2019-09-09 09:11:41 -04:00
Tim Steinbach
69796183b3
docker: 18.09.8 -> 18.09.9 2019-09-09 08:59:03 -04:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Florian Klink
db1f05c763
Merge pull request #66405 from NeQuissimus/virtualbox_6_0_10
virtualbox: 6.0.8 -> 6.0.10
2019-09-06 20:33:35 -07:00
Frederik Rietdijk
66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
Sascha Grunert
573aa63fa6 cri-o: 1.15.0 -> 1.15.1
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-09-06 21:52:12 +02:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Tim Steinbach
4e99ef6a18
virtualbox: 6.0.8 -> 6.0.10 2019-09-04 11:12:07 -04:00
Florian Klink
432e55242e
Merge pull request #67968 from ambrop72/virtualbox-qt-fix
virtualbox: Fix #65564
2019-09-04 06:38:37 -07:00
Ambroz Bizjak
b52dfd3007 virtualbox: Make sure that Qt finds plugins to make VMs run again.
Fixes #65564. When hardening is enabled, we cannot use a wrapper for
VirtualBoxVM, so patch the source code to set QT_PLUGIN_PATH as required.
2019-09-04 06:38:12 -07:00
Robert Hensing
320bcfeb24
Merge pull request #66635 from Gerschtli/docker-compose-zsh
docker-compose: add zsh completion
2019-09-04 12:20:57 +02:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
worldofpeace
62973ddc07
Merge pull request #67836 from petabyteboy/feature/corebootutils
coreboot-utils: init at 4.10
2019-09-03 11:54:36 -04:00
Milan Pässler
d977d48baf coreboot-utils: init at 4.10
Build various tools from the coreboot tree with a generic builder for better
maintainability and provide a buildEnv with all of them, similar to other
distributions' coreboot-utils package.
2019-09-03 17:49:50 +02:00
Milan Pässler (work)
185fd61631 treewide: remove uses of doBuild and doConfigure
doBuild and doConfigure are not actually used by any builders, they were
probably added by mistake and just confuse people.
2019-09-02 23:42:12 +02:00
volth
7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Izorkin
4471efd9e0
virt-viewer: remove unused packages 2019-08-29 15:16:34 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
markuskowa
a69ce83649
Merge pull request #67457 from scalavision/singularity-rewrite-path-to-cp
singularity: prepatch path to cp in 3.2.1
2019-08-26 22:59:34 +02:00
scalavision
3ce3e75946 singularity: prepatch path to cp in 3.2.1 2019-08-25 18:31:17 +00:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster
2cc05be907
treewide: openssl_1_1 pinning is unnecessary 2019-08-23 02:02:50 +02:00
Florian Klink
d9617978fb
xen: 4.8.3 -> 4.8.5, unbreak (#67119)
* xen: 4.8.3 -> 4.8.5, unbreak

It was broken during GlusterFs upgrade: https://github.com/NixOS/nixpkgs/pull/66736
2019-08-21 23:29:42 +02:00
Danylo Hlynskyi
8fe244edce
fix hash 2019-08-21 20:18:14 +03:00
danbst
f0a805f5e5 xen: 4.8.3 -> 4.8.5, unbreak
It was broken during GlusterFs upgrade: https://github.com/NixOS/nixpkgs/pull/66736
2019-08-20 23:28:13 +03:00
Robin Gloster
4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Nikolay Amiantov
c3a6c8de88 edk2: 2017-12-05 -> 201905
* Move to stable version;
* Refactor `setup` to `mkDerivation`;
* Use flags instead of `sed`;
* Support Secure Boot builds.
2019-08-19 19:52:30 +03:00
Marek Mahut
17f72af38a
Merge pull request #66513 from alexbakker/looking-glass-client-b1
looking-glass-client: a12 -> B1
2019-08-18 16:20:32 +02:00
Izorkin
a2226d7de5 qemu: 4.0.0 -> 4.1.0 2019-08-17 21:00:40 +03:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk
fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
Sascha Grunert
a2b27ecf37
podman: 1.4.4 -> 1.5.1
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-08-16 14:28:46 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Alexander Bakker
13d261b535 looking-glass-client: replace pneumaticat as maintainer 2019-08-14 21:45:09 +02:00
Tobias Happ
66c616fa3d docker-compose: add zsh completion 2019-08-14 20:28:21 +02:00
Alexander Bakker
d6d1e6bd27 looking-glass-client: a12 -> B1 2019-08-12 09:53:31 +02:00
Sascha Grunert
965f869e59
conmon: 0.3.0 -> 2.0.0
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-08-12 09:02:15 +02:00
worldofpeace
2bd649b152 virtualbox: use wrapQtAppsHook
Fixes #66200

See: #65399
2019-08-06 13:07:57 -04:00
Sascha Grunert
31feec6b5f
podman: 1.3.2 -> 1.4.4
Signed-off-by: Sascha Grunert <mail@saschagrunert.de>
2019-07-29 09:39:51 +02:00
Tim Steinbach
6dfd13ab34
docker: 18.09.8 -> 19.03.1
Keep docker_18_09 around as it is still supported.
2019-07-26 12:43:36 -04:00
Tim Steinbach
86f424585f
docker: 18.09.7 -> 18.09.8 2019-07-26 12:43:36 -04:00
Danylo Hlynskyi
9b20ea0e1b
Merge pull request #65269 from jD91mZM2/x11docker
x11docker: v5.4.4 -> v6.0.0
2019-07-23 22:22:56 +03:00
jD91mZM2
f1ba9c2083
x11docker: v5.4.4 -> v6.0.0 2019-07-22 16:09:08 +02:00
R. RyanTM
076c101836 virtmanager: 2.2.0 -> 2.2.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/virt-manager/versions
2019-07-20 17:12:06 -07:00
Jaka Hudoklin
7803ff314c
Merge pull request #64627 from aske/virtman-fix
Fix virt-manager on non-gnome systems
2019-07-13 08:00:46 +02:00
Kirill Boltaev
2df33c40ff virtmanager: remove redundant gtk3 dependency 2019-07-12 23:55:37 +03:00
Kirill Boltaev
6b68d9b911 virtviewer: remove gstreamer plugins already propagated by spice-gtk 2019-07-12 23:52:48 +03:00
Kirill Boltaev
5e18c7cf21 virtmanager: remove redundant gsettings schema compilation
Schemas are now compiled in the setup.py.
2019-07-12 23:52:48 +03:00
Kirill Boltaev
cdfc0b6429 virtmanager: fix librsvg propagation from wrapGAppsHook
Custom buildPhase should be removed once there is support
for setupPyDistFlags (not a final name).
2019-07-12 23:52:48 +03:00
Kirill Boltaev
22e2acd736 virtmanager: add missing GI dependencies 2019-07-12 23:52:48 +03:00
Michael Weiss
dbaa1406a2
dynamips: 0.2.20 -> 0.2.21 2019-07-12 22:40:55 +02:00
Sascha Grunert
97dcaa9204 cri-o: v1.14.2 -> v1.15.0
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-07-05 23:23:40 +02:00
Ben Wolsieffer
721b391f93 lkl: 2018-08-22 -> 2019-06-20
Fixes the build on 32-bit ARM, which enables the generation of SD card images
on these platforms.
2019-07-05 08:06:09 +02:00
Tim Steinbach
3bdaf58710
docker: 18.09.6 -> 18.09.7 2019-07-03 20:15:32 -04:00
Nikolay Amiantov
ef8addb919 qemu: fix documentation 2019-07-03 21:11:59 +03:00
Mario Rodas
6d3f8470b1
Merge pull request #64010 from r-ryantm/auto-update/docker-compose
docker-compose: 1.24.0 -> 1.24.1
2019-07-03 07:47:50 -05:00
R. RyanTM
48a1b8e25a virtmanager: 2.1.0 -> 2.2.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/virt-manager/versions
2019-07-03 08:29:48 +02:00
R. RyanTM
4864de061d docker-compose: 1.24.0 -> 1.24.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/docker-compose/versions
2019-07-01 03:56:20 -07:00
Nikolay Amiantov
6f0b781bc1 virtualbox: enable Java bindings
Almost doesn't affect closure size:

Before:
/nix/store/0l23ahih0wzm39q7vgch9v86pw28shdh-virtualbox-6.0.8	 545.9M

After:
/nix/store/s7c6jgf6p0w64fxxh9iik9yi1rsmf2jz-virtualbox-6.0.8	 546.6M
2019-06-28 17:49:36 +03:00
Vladimír Čunát
145a620802
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1527134
2019-06-25 14:04:12 +02:00
Sascha Grunert
e952dc5898
conmon: 0.2.0 -> 0.3.0
Signed-off-by: Sascha Grunert <mail@saschagrunert.de>
2019-06-22 16:55:19 +02:00
Frederik Rietdijk
72d647f3d8 Merge master into staging-next 2019-06-21 08:20:26 +02:00
Frederik Rietdijk
f120248daf Merge staging-next into staging 2019-06-18 11:07:56 +02:00
Justin Bedo
086d5998dd
singularity: 3.0.1 -> 3.2.1 2019-06-18 12:05:42 +10:00
Matthew Bauer
4d6f65b81f
Merge pull request #62167 from matthewbauer/alias-libgl
Add libGL* aliases
2019-06-17 15:18:29 -04:00
Matthew Bauer
263f5891b6 treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
Just use mesa for these to be more clear. Move these to aliases.nix
2019-06-17 14:43:18 -04:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Marek Mahut
a4e6261173 qemu: CVE-2019-12155 2019-06-15 23:54:01 +02:00
Sascha Grunert
3577443b37 conmon: 0.0.1pre52_6905a4d -> 0.2.0
Update conmon to v0.2.0 and move it into a dedicated package. Since we
are now using conmon as dedicated package, cri-o does not need to built
it, too.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-06-11 10:44:22 -07:00
Matthew Bauer
b22fa4e091
Merge pull request #62842 from lopsided98/lkl-cross
lkl: fix cross
2019-06-09 17:49:57 -04:00
Vladimír Čunát
72216e12de
Merge #62393: virtualboxHeadless: Fix build 2019-06-09 12:10:20 +02:00
Ben Wolsieffer
95c412ab61 lkl: fix cross 2019-06-07 18:00:46 -04:00
Franz Pletz
ff05703611
Merge pull request #62701 from dtzWill/update/podman-cni-and-containers-oh-my
podman, cni{,-plugins}, cri*: updates
2019-06-07 11:54:52 +00:00
Will Dietz
c864ce9703
docker-compose: 1.23.2 -> 1.24.0
https://github.com/docker/compose/releases/tag/1.24.0

Add new req dep paramiko.
2019-06-04 15:50:29 -05:00
Will Dietz
1af13e8aad
cri-o: 1.14.1 -> 1.14.2 2019-06-04 15:44:56 -05:00
Will Dietz
7e59e33b8a
conmon: 0.0.1pre52_xxxx -> 0.2.0
https://github.com/containers/conmon/releases/tag/v0.2.0
2019-06-04 15:44:18 -05:00
Will Dietz
71304bf88c
podman: 1.3.1 -> 1.3.2 2019-06-04 15:44:17 -05:00
Vladimír Čunát
c4724fb7bc
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1523028
2019-06-03 10:01:25 +02:00
Alyssa Ross
062210bdff treewide: update cargoSha256 hashes for cargo-vendor upgrade
A recent upgrade of cargo-vendor changed its output slightly, which
broke all cargoSha256 hashes in nixpkgs.
See https://github.com/NixOS/nixpkgs/issues/60668 for more information.

Since then, a few hashes have been fixed in master by hand, but there
were a lot still to do, so I did all of the ones left over with some
scripts I wrote.

The one hash I wasn’t able to update was habitat's, because it’s
currently broken and the build doesn’t get far enough to produce a
hash anyway.
2019-06-01 15:17:52 +00:00
Josef Kemetmüller
25a89d05d8 virtualboxHeadless: Fix build 2019-06-01 15:30:35 +02:00
Frederik Rietdijk
3685108787 Merge staging-next into staging 2019-05-28 08:32:57 +02:00
Florian Klink
fa6c93abe5
linuxPackages.virtualboxGuestAdditions: don't install VBoxOGL for now (#61944)
linuxPackages.virtualboxGuestAdditions: don't install VBoxOGL for now
2019-05-26 12:30:28 +02:00
Vladimír Čunát
b4ae841b23
Merge branch 'staging-next' into staging 2019-05-26 09:48:55 +02:00
Ambroz Bizjak
1430e10892 virtualbox: 6.0.6 -> 6.0.8 2019-05-25 21:39:55 +02:00
Florian Klink
8b34ec423c linuxPackages.virtualboxGuestAdditions: don't install VBoxOGL for now
It seems to be broken upstream too, and fixing it is far down the
priority list:
https://www.virtualbox.org/pipermail/vbox-dev/2017-June/014561.html
Additionally, 3d support seems to rely on VBoxOGL.so being symlinked
from libGL.so (which we can't), and Oracle doesn't plan on supporting
libglvnd either. (#18457)
2019-05-23 14:27:05 +02:00
Austin Seipp
99c8680f49 podman: 1.2.0 -> 1.3.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-05-23 12:05:48 +02:00
Austin Seipp
a86c178a58 conmon: unstable-2019-03-19 -> 0.0.1pre52_6905a4d
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-05-23 12:05:48 +02:00
Tim Steinbach
d35692126f
docker: 18.09.5 -> 18.09.6 2019-05-22 09:15:36 -04:00
Will Dietz
35dea87c70
Merge pull request #60133 from dtzWill/update/qemu-4.0.0
qemu: 3.1.0 -> 4.0.0
2019-05-21 03:12:21 -05:00
Sascha Grunert
9b43c29047 cri-o: init at version v1.14.1
This commits adds the CRI-O package, which includes the `crio` binary as
well as `conmon` and `pause`. The configuration is not part of this
package because it would be included in a service.

Signed-off-by: Sascha Grunert <mail@saschagrunert.de>
2019-05-20 11:12:11 +01:00
Spencer Baugh
4b8803dae6 switch users of "gnupg1" to plain "gnupg"
gnupg is gnupg 2.2. gnupg1 is also gnupg 2.2, just with a few extra
symlinks in the bin directory. None of these packages need those
symlinks, and it's confusing for them to say they're depending on
"gnupg1", so switch their dep to plain "gnupg".
2019-05-12 20:08:50 +02:00
Florian Klink
7495a761cc
virtualbox: python2 -> python3 (#61100)
virtualbox: python2 -> python3
2019-05-10 14:54:56 +02:00
Ambroz Bizjak
5bec9dc65b virtualbox: 5.2.28 -> 6.0.6
Quite some fixing was needed to get this to work.

Changes in VirtualBox and additions:

- VirtualBox is no longer officially supported on 32-bit hosts so i686-linux is removed from platforms
  for VirtualBox and the extension pack. 32-bit additions still work.

- There was a refactoring of kernel module makefiles and two resulting bugs affected us which had to be patched.
  These bugs were reported to the bug tracker (see comments near patches).

- The Qt5X11Extras makefile patch broke. Fixed it to apply again, making the libraries logic simpler
  and more correct (it just uses a different base path instead of always linking to Qt5X11Extras).

- Added a patch to remove "test1" and "test2" kernel messages due to forgotten debugging code.

- virtualbox-host NixOS module: the VirtualBoxVM executable should be setuid not VirtualBox.
  This matches how the official installer sets it up.

- Additions: replaced a for loop for installing kernel modules with just a "make install",
  which seems to work without any of the things done in the previous code.

- Additions: The package defined buildCommand which resulted in phases not running, including RUNPATH
  stripping in fixupPhase, and installPhase was defined which was not even run. Fixed this by
  refactoring using phases. Had to set dontStrip otherwise binaries were broken by stripping.
  The libdbus path had to be added later in fixupPhase because it is used via dlopen not directly linked.

- Additions: Added zlib and libc to patchelf, otherwise runtime library errors result from some binaries.
  For some reason the missing libc only manifested itself for mount.vboxsf when included in the initrd.

Changes in nixos/tests/virtualbox:

- Update the simple-gui test to send the right keys to start the VM. With VirtualBox 5
  it was enough to just send "return", but with 6 the Tools thing may be selected by
  default. Send "home" to reliably select Tools, "down" to move to the VM and "return"
  to start it.

- Disable the VirtualBox UART by default because it causes a crash due to a regression
  in VirtualBox (specific to software virtualization and serial port usage). It can
  still be enabled using an option but there is an assert that KVM nested virtualization
  is enabled, which works around the problem (see below).

- Add an option to enable nested KVM virtualization, allowing VirtualBox to use hardware
  virtualization. This works around the UART problem and also allows using 64-bit
  guests, but requires a kernel module parameter.

- Add an option to run 64-bit guests. Tested that the tests pass with that. As mentioned
  this requires KVM nested virtualization.
2019-05-09 23:36:57 +02:00
Graham Christensen
e2f6e36401
virtualbox: python2 -> python3 2019-05-07 14:54:39 -04:00
lewo
cbb0a0c108
Merge pull request #60466 from vdemeester/update-runc
runc: 1.0.0-rc7 -> 1.0.0-rc8
2019-05-05 09:22:06 +02:00
Mario Rodas
6e90393ead
looking-glass-client: fix build
spice-protocol removed the spice/error_codes.h header file [1], which
looking-glass-client was still using.

[1] 334cef51d0
2019-05-02 22:06:56 -05:00
Vincent Demeester
c64087b4a3
runc: 1.0.0-rc7 -> 1.0.0-rc8
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-04-30 10:56:50 +02:00
Artemis Tosini
ea29d811b5
virtualbox: 5.2.26 → 5.2.28 2019-04-28 23:07:55 +00:00
Neil Mayhew
48415a20b9 docker: 18.09.2 -> 18.09.5 2019-04-27 17:48:50 -04:00
Neil Mayhew
f100ec7939 docker: make overridable 2019-04-27 17:48:50 -04:00
volth
56b25e7034 qemu: fix cross (#60261) 2019-04-27 09:19:06 +02:00
Will Dietz
bf35e8f0ba qemu: drop fix-hda-recording.patch, appears applied upstream
(across multiple commits, maybe?)
2019-04-23 21:44:25 -05:00
Will Dietz
b6f020fe51 qemu: fix patch, drop CVE patch included 2019-04-23 21:44:23 -05:00
Will Dietz
9a711ccb8c qemu: 3.1.0 -> 4.0.0 2019-04-23 20:31:13 -05:00
Austin Seipp
d3fad881d6
firecracker: 0.15.0 -> 0.15.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-04-22 11:52:40 -05:00
Vincent Demeester
6adf0f3e9a
containerd: 1.2.5 -> 1.2.6
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-04-09 20:05:38 +02:00
Vladimír Čunát
a6dd84a126
Merge #57951: qemu: apply CVE-2019-3812 patch 2019-04-07 11:23:20 +02:00
lewo
79016d9f40
Merge pull request #58732 from r-ryantm/auto-update/open-vm-tools
open-vm-tools: 10.3.5 -> 10.3.10
2019-04-06 19:29:35 +02:00
Vincent Demeester
91fc821cc1
podman: 1.1.2 -> 1.2.0
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-04-05 16:56:37 +02:00
markuskowa
3eecb297bc
Merge pull request #58936 from bzizou/charliecloud
charliecloud: init at 0.9.8
2019-04-04 14:43:36 +02:00
Bruno Bzeznik
8a298f8d5a charliecloud: init at 0.9.8 2019-04-04 14:16:48 +02:00
R. RyanTM
475ea05064 open-vm-tools: 10.3.5 -> 10.3.10
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/open-vm-tools/versions
2019-04-01 21:24:10 -07:00
Vincent Demeester
28a2dd8024
runc: 1.0.0-rc6 -> 1.0.0-rc7
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-03-29 11:12:04 +01:00
Cole Mickens
23576f225c qemu-utils: init 2019-03-27 20:44:54 -07:00
Andreas Rammhold
c7d7c6fc41
qemu: apply CVE-2019-3812 patch 2019-03-20 11:15:41 +01:00
aszlig
12efcc2dee
Merge overlayfs fix, LTS kernel bump and test
In Linux 4.19 there has been a major rework of the overlayfs
implementation and it now opens files in lowerdir with O_NOATIME, which
in turn caused issues in our VM tests because the process owner of QEMU
doesn't match the file owner of the lowerdir.

The crux here is that 9p propagates the O_NOATIME flag to the host and
the guest kernel has no way of verifying whether that flag will lead to
any problems beforehand.

There is ongoing work to possibly fix this in the kernel, but it will
take a while until there is a working patch and consensus.

So in order to bring our default kernel back to 4.19 and of course make
it possible to run newer kernels in VM tests, I'm merging a small QEMU
patch as an interim solution, which we can drop once we have a working
fix in the next round of stable kernels.

Now we already had Linux 4.19 set as the default kernel, but that was
subsequently reverted in 048c36ccaa
because the patch we have used was the revert of the commit I bisected a
while ago.

This patch broke overlayfs in other ways, so I'm also merging in a VM
test by @bachp, which only tests whether overlayfs is working, just to
be on the safe side that something like this won't happen in the future.

Even though this change could be considered a moderate mass-rebuild at
least for GNU/Linux, I'm merging this to master, mainly to give us some
time to get it into the current 19.03 release branch (and subsequent
testing window) once we got no new breaking builds from Hydra.

Cc: @samueldr, @lheckemann

Fixes: https://github.com/NixOS/nixpkgs/issues/54509
Fixes: https://github.com/NixOS/nixpkgs/issues/48828
Merges: https://github.com/NixOS/nixpkgs/pull/57641
Merges: https://github.com/NixOS/nixpkgs/pull/54508
2019-03-19 00:15:51 +01:00
Jason Samsa
a7147c868f update xhyve to tip of master 2019-03-18 17:39:18 -05:00
aszlig
4c1ddb3a57
qemu: Apply interim fix for overlayfs + O_NOATIME
Our VM tests and everything related to our virtualisation infrastructure
is currently broken if used with kernel 4.19 or later.

The reason for this is that since 4.19, overlayfs uses the O_NOATIME
flag when opening files in lowerdir and this doesn't play nice with the
way we pass the Nix store to our QEMU guests.

On a NixOS system, paths in the Nix store are typically owned by root
but the QEMU process is usually run by an ordinary user. Using O_NOATIME
on a file where you're not the owner (or superuser) will return with
EPERM (Operation not permitted).

This is exactly what happens in our VM tests, because we're using
overlayfs in the guests to allow writes to the store.

Another implication of this is that the default kernel version for NixOS
19.03 has been reverted to Linux 4.14.

Work on getting this upstream is still ongoing and the patch I posted
previously was incomplete, needs rework and also some more review from
upstream maintainers - in summary: This will take a while.

So instead of rushing in a kernel patch to nixpkgs, which will affect
all users of overlayfs, not just NixOS VM tests, I opted to patch QEMU
for now to ignore the O_NOATIME flag in 9p.

I think this is also the least impacting change, because even if you
care about whether access times are written or not, you get the same
behaviour as with Linux 4.19 in conjunction with QEMU.

Signed-off-by: aszlig <aszlig@nix.build>
Fixes: https://github.com/NixOS/nixpkgs/issues/54509
2019-03-18 13:34:30 +01:00
Vincent Demeester
115dde6d33
containerd: 1.2.4 -> 1.2.5
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-03-14 17:05:29 +01:00
Jascha Geerds
ffedc3e4a9 misc: Remove myself from list of maintainers
Unfortunately I don't have the time anymore to maintain those
packages.
2019-03-12 23:50:52 +01:00
Florian Franzen
871c1d5bb1 virtmanager: Fix gobject-introspection (#57385) 2019-03-12 22:29:45 +01:00
Michael Raskin
fdeb864cc8
Merge pull request #57498 from r-ryantm/auto-update/virt-viewer
virt-viewer: 7.0 -> 8.0
2019-03-12 15:28:30 +00:00
R. RyanTM
8f92b77ab4 virt-viewer: 7.0 -> 8.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/virt-viewer/versions
2019-03-12 02:09:33 -07:00
Wael M. Nasreddine
eee09b103c
docker: export GOCACHE for all platforms 2019-03-11 09:59:10 -07:00
Vincent Demeester
54cf5b4bbf containerd: 1.2.2 -> 1.2.4 (#56947)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-03-08 22:56:00 +01:00
Vincent Demeester
1bd0655e6d podman: 1.1.0 -> 1.1.2 (#56945)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-03-08 22:31:58 +01:00
lewo
f5462b19d5
Merge pull request #56513 from vdemeester/update-podman
Update podman
2019-03-05 21:12:51 +01:00
Jörg Thalheim
27cb0669c6
Merge pull request #56500 from kalbasit/nixpkgs_add-support-go-1-12
go_1_12: init at go 1.12
2019-03-04 14:22:27 +00:00
jD91mZM2
4901af69c5 x11docker: v5.4.1 -> v5.4.4 (#56570) 2019-03-04 13:38:19 +01:00
Wael M. Nasreddine
6ef04cabd4
go_1_12: init at go 1.12 2019-03-02 14:24:17 -08:00
R. RyanTM
d047e1e397 docker-compose: 1.23.1 -> 1.23.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/docker-compose/versions
2019-03-01 18:16:02 -08:00
Frederik Rietdijk
2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Vincent Demeester
42a79f7bc2
podman: 1.0.0 -> 1.1.0
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-02-28 11:54:53 +01:00
Vincent Demeester
e8a4d2a2be
conmon: unstable-2018-11-28 -> unstable-2019-02-15
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-02-28 11:25:24 +01:00
Averell Dalton
d6c2fe76ed nvidia-docker: init at 2.0.3
nvidia_x11 and persistenced were modified to provide binaries which can be
mounted inside a docker-container to be executed there.

most ldconfig-based discovery of bundled nvidia libraries is patched out

ldconfig itself is patched to be able to deal with patchelf'ed libraries
See https://sourceware.org/bugzilla/show_bug.cgi?id=23964
2019-02-27 09:56:03 +01:00
Frederik Rietdijk
c2eac6741b Merge master into staging-next 2019-02-24 09:19:12 +01:00
Florian Klink
29d7e7a0c6 virtualbox: 5.2.22 -> 5.2.26 (#56210) 2019-02-22 17:55:47 -08:00
Austin Seipp
d011a91b70
firecracker: 0.14.0 -> 0.15.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-02-22 13:23:46 -06:00
Vladimír Čunát
71f4ba29a3
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00