alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
380616 commits 217 branches 121 tags 4.5 GiB
Commit graph

1316 commits

Author SHA1 Message Date
Robert Hensing 4ec119009b virtualisation/qemu-vm: Double the default diskSize 
The default has been unchanged for a decade. Space is cheaper and
software catches up with that. Let's not make our testing harder
than necessary by default.
 2021-11-05 21:06:08 +01:00
ajs124 ce21576c61
Merge pull request #142408 from mschwaig/fix-vmware-guest-headless 
nixos/vmware-guest: fix headless option
 2021-11-05 12:33:37 +01:00
Maciej Krüger 1c31f8db6a
nixosTest.lxdImage: add lxdImage test 2021-11-03 07:49:54 +01:00
Maciej Krüger a797967cec
lxdImage: split from docker profile, use generators.toYAML 2021-11-03 07:49:54 +01:00
Maciej Krüger fec499bb98
virtualisation.lxc: replace /sbin/init on switch 
in the future maybe a proper shim-bootloader could be used that supports 
switching out /sbin/init (so nixos-rebuild boot would just switch the 
link)
 2021-11-03 07:49:53 +01:00
Maciej Krüger 8eac2a669a
virtualisation.lxc: add default for .templates 2021-11-03 07:49:53 +01:00
Maciej Krüger 681bd59661
virtualisation.lxc: apply changes from review 2021-11-03 07:49:52 +01:00
Maciej Krüger 9f66f9a669
release.lxdImage: add lxdImage to hydra 2021-11-03 07:49:52 +01:00
Maciej Krüger 5ea329958a
virtualisation.lxc: add the overrides from distrobuilder 2021-11-03 07:49:52 +01:00
Maciej Krüger 1c7a7f198c
virtualisation.lxc: split meta and root 2021-11-03 07:49:51 +01:00
Maciej Krüger d203189dbf
virtualisation.lxc: use openFirewall instead of allowedTCPPorts 2021-11-03 07:49:51 +01:00
Maciej Krüger caabd8933c
virtualisation.lxc: add support for lxd templates 2021-11-03 07:49:51 +01:00
Maciej Krüger b9df9ca2c4
virtualisation.lxc: indent config 2021-11-03 07:49:50 +01:00
Maciej Krüger d262f6f593
virtualisation.lxc-container: overwrite tarball for lxd 2021-11-03 07:49:50 +01:00
Maciej Krüger 9d3df0b2ac
nixos/lxd: fix nftables switch #81172 breaking module 2021-11-03 07:41:40 +01:00
misuzu ff22dd6684 nixos/libvirtd: use /etc/ethertypes from iptables package 
This change is part of #81172 and must have been lost during staging cycle.
 2021-11-02 11:45:19 +02:00
Alyssa Ross e791519f0f
nixos/qemu-vm: use qemu_kvm 
qemu_kvm is only built for one architecture, so it's smaller and takes
MUCH less time to build if it has to be built from source.  And this
module doesn't support running a VM for one architecture from another
architecture, so the one architecture is all we'll need.
 2021-11-01 12:04:45 +00:00
talyz af9f6d9a2a nixos/qemu-vm: Rename pathsInNixDB to additionalPaths 
pathsInNixDB isn't a very accurate name when a Nix store image is
built (virtualisation.useNixStoreImage); rename it to additionalPaths,
which should be general enough to cover both cases.
 2021-10-28 12:55:01 +02:00
talyz 84839b395f nixos/qemu-vm: Allow building a Nix store image instead of using 9p 
Add the `useNixStoreImage` option, allowing a disk image with the
necessary contents from the Nix store to be built using
make-disk-image.nix. The image will be mounted at `/nix/store` and
acts as a drop-in replacement for the usual 9p mounting of the host's
Nix store.

This removes the performance penalty of 9p, drastically improving
execution speed of applications which do lots of reads from the Nix
store. The caveats are increased disk space usage and image build
time.
 2021-10-28 12:55:01 +02:00
Martin Schwaighofer 60369bb333 nixos/vmware-guest: fix headless option 
The headless option broke with 7d8b303e3f
because the path /bin/vmware-user-suid-wrapper does not exist in the
headless variant of the open-vm-tools package.

Since the vmblock fuse mount and vmware-user-suid-wrapper seem to only
be used for shared folders and drag and drop, they should not exist in
the vmware-guest module if it is configured as headless.
 2021-10-20 16:12:07 +02:00
figsoda a209d563cd
Merge pull request #142032 from thiagokokada/refactor-libvirtd-module 
nixos/libvirtd: refactor module
 2021-10-18 16:07:05 -04:00
Sam Hug d6e1fb43c4 nixos/hyperv: fix evaluation of kernelParams 2021-10-18 11:22:53 -07:00
Thiago Kenji Okada 9e7b50e885 nixos/libvirtd: refactor module 
Move all `virtualisation.libvirtd.qemu*` options to a
`virtualisation.libvirtd.qemu` submodule.

Also for consistency, add `virtualisation.libvirtd.qemu.swtpm.package`
(only new option during this refactor.)
 2021-10-18 13:45:35 -03:00
Jade 8d52479bc7 nixos/libvirtd: Add configuration option for swtpm 2021-10-17 16:48:17 +02:00
Thiago Kenji Okada 5f7e675c45 nixos/libvirtd: add qemuOvmfPackage option 2021-10-17 11:39:25 +02:00
Robert Hensing 00563d4f07 amazon-ec2-amis: Add aarch64 amis 2021-10-08 17:30:02 +02:00
Robert Hensing 5a6c43dda3 ec2-amis.nix -> amazon-ec2-amis.nix, new format 2021-10-08 17:30:01 +02:00
Maximilian Bosch f700a92d5c
nixos/qemu-vm: quote QEMU_NET_OPTS 
Co-authored-by: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
 2021-10-06 23:12:53 +02:00
Maximilian Bosch 60e731d1ce
nixos/qemu-vm: fix running VM with QEMU_NET_OPTS 
I realized quite recently that running a test VM - as documented in the
manual - like

    QEMU_NET_OPTS='hostfwd=tcp::8080-:80'  ./result/bin/nixos-run-vms

doesn't work anymore on `master`. After bisecting I realized that the
introduction of a forward-port option[1] is the problem since it adds a
trailing comma even if no forwarding options are specified via
`virtualisation.forwardPorts`. In that case, the networking options
would look like `-netdev user,id=user.0,,hostfwd=tcp::8080-:80' which
confused QEMU and thus the VM refused to start.

Now, the trailing comma is only added if additional port forwards are
specified declaratively.

[1] b8bfc81d5b
 2021-10-06 22:40:30 +02:00
Naïm Favier 2ddc335e6f
nixos/doc: clean up defaults and examples 2021-10-04 12:47:20 +02:00
rnhmjoj 1497e8f5f5
nixos/qemu: use set -e in shell script 
Also fix this: https://github.com/koalaman/shellcheck/wiki/SC2166
 2021-09-29 08:46:03 +02:00
Timothy DeHerrera 895f3956d2
Merge pull request #127933 from rnhmjoj/qemu-restoration 
Qemu restoration
 2021-09-28 21:35:23 -06:00
rnhmjoj b6fbbe768d
nixos/containerd: use v2 settings by default 
Kubernetes is using v2 setting names and is the only module
in Nixpkgs using containerd, so it makes sense to upgrade.
 2021-09-23 00:18:58 +02:00
rnhmjoj 74c572d2f8
nixos/vmware-guest: fix setuid wrapper 
Since 904f68fb0, setuid/owner/group are required.
 2021-09-20 23:49:46 +02:00
Jeremy Kolb cb9167139e
vmware-guest: Use vmware-vmblock-fuse for drag-and-drop synchronization (#131278) 2021-09-19 18:15:41 +03:00
Guillaume Girol ceb2e6667b
Merge pull request #126289 from rnhmjoj/wrappers 
nixos/security/wrappers: make well-typed
 2021-09-18 15:28:49 +00:00
rnhmjoj b29c2f97c3
nixos/lib/qemu-flags: rename to qemu-common 
The current name is misleading: it doesn't contain cli arguments,
but several constants and utility functions related to qemu.
This commit also removes the use of `with import ...` for clarity.
 2021-09-18 16:58:16 +02:00
rnhmjoj b8bfc81d5b
nixos/qemu: add option to forward ports 2021-09-18 16:47:12 +02:00
rnhmjoj 44d95b773b
nixos/qemu: make display resolution configurable 2021-09-18 16:47:11 +02:00
rnhmjoj ec6c604b6e
nixos/qemu: make shared directories configurable 2021-09-18 16:47:11 +02:00
rnhmjoj 30f0faac22
nixos/qemu: add types to all options 2021-09-18 16:47:11 +02:00
rnhmjoj f1f434c4f7
nixos/qemu: cleaner formatting of the run-machine-vm script 2021-09-18 16:47:11 +02:00
rnhmjoj 2af5413cc6
nixos/qemu: set a reasonable msize by default 2021-09-18 16:47:10 +02:00
rnhmjoj 65e83389ef
nixos/qemu: fix deprecation warning 2021-09-18 16:47:10 +02:00
rnhmjoj c1fd51f490
nixos/qemu: fix several shellcheck issues 
- Fix shell quoting issues
- Fix unsafe cd in run-machine-vm script
 2021-09-18 16:46:20 +02:00
Artturi 74b3e9ff87
Merge pull request #136471 from Artturin/tmpontmpfssize 2021-09-16 02:25:02 +03:00
rnhmjoj fedd7cd690
nixos: explicitely set security.wrappers ownership 
This is slightly more verbose and inconvenient, but it forces you
to think about what the wrapper ownership and permissions will be.
 2021-09-13 13:48:13 +02:00
Guillaume Girol bc3bca822a nixos: define the primary group of users where needed 2021-09-12 14:59:30 +02:00
Artturin f45e8d560e nixos/tmp: add tmpOnTmpfsSize 2021-09-08 19:30:52 +03:00
Graham Christensen bd38b059ea NixOS/amazonImageZfs: init 
Introduce an AWS EC2 AMI which supports aarch64 and x86_64 with a ZFS
root.

This uses `make-zfs-image` which implies two EBS volumes are needed
inside EC2, one for boot, one for root. It should not matter which
is identified `xvda` and which is `xvdb`, though I have always
uploaded `boot` as `xvda`.
 2021-08-25 10:42:35 -04:00
Your Name c042c1a1f8 NixOS AWS AMI: Create boot entries for each system generation 2021-08-20 14:02:11 -04:00
Your Name 1b79176310 NixOS AWS AMI: enable the serial console on ttyS0 2021-08-20 12:42:02 -04:00
Your Name 54aa35d40e NixOS AWS AMI: Configure Grub's serial console 
See:

* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-os.html
* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/grub.html
 2021-08-20 11:22:45 -04:00
Your Name bfd2f800ee NixOS AMI: Give grub a 1s timeout now that AWS has emergency console access. 
See:

* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-os.html
* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/grub.html
 2021-08-20 11:22:39 -04:00
Your Name 0ccd6448d6 NixOS AWS AMI: Set the console to 115200n8 
See:

* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-os.html
* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/grub.html
 2021-08-20 11:15:31 -04:00
Robert Hensing fbafeb7ad5 treewide: runCommandNoCC -> runCommand 
This has been synonymous for ~5y.
 2021-08-15 17:36:41 +02:00
edef 9451a23e9f
Merge pull request #130265 from liclac/gce-image-compression-level 
google-compute-image: Add a setting for GZIP compression level
 2021-08-13 14:31:08 +00:00
Artturi c10ded1bb2
Merge pull request #131966 from ArctarusLimited/fix/containerd-restart 
nixos/virtualisation/containerd: do not wipe runtime directory on restart or stop
 2021-08-08 17:21:30 +03:00
Luke Granger-Brown b5fab53628 nixos/virtualbox-image: cast baseImageFreeSpace into str 
This fixes an evaluation error that's blocking the nixos-unstable
channel (#132328).
 2021-08-01 18:59:08 +00:00
Alex Zero bd14d73794
nixos/modules/virtualisation/containerd: do not wipe runtime directory on restart or stop 2021-07-29 16:17:40 +01:00
lassulus a6700d75f3 vbox-image: add new option to set free space in image 2021-07-24 09:33:10 +02:00
embr 8e6c4f9a2e nixos/cri-o: Remove unnecessary lib. qualifiers 
We're already using `with lib` here, so we can just say `mkOption`, etc.
 2021-07-20 15:35:45 +10:00
embr 1cf78b53af nixos/cri-o: Add RFC42 'settings' option 2021-07-20 15:35:45 +10:00
Jeremy Kolb f96ee10c88
open-vm-tools: 11.2.5 -> 11.3.0 (#129978) 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-07-14 03:26:58 +02:00
embr 91646d62b9 google-compute-image: Make GZIP compression level configurable 
Change-Id: I1bde130f0a951fa40b1a16bad09497c796bca473
 2021-07-13 16:53:09 +02:00
Tobias Happ bbd5cdac29 nixos/oci-containers: enable login for registry 2021-07-08 16:30:17 +10:00
Ramses 14d2192623 nixos/oci-containers: restore ability to easily view the container output in the logs 
Fixes #102768.
Allows the usage of `journalctl -u` to easily view the logs for a container managed by this module.
 2021-07-06 07:36:33 +10:00
Maciej Krüger b877b70d32
Merge pull request #125366 from mkg20001/vbox-export-params 2021-06-28 06:58:01 +02:00
jakobrs 475c007da0 nixos/libvirtd: add assertion requiring polkit to be enabled 2021-06-07 15:12:21 +02:00
AmineChikhaoui 7e89fb12e4 ec2-amis: add release 21.05 2021-06-06 17:09:14 -07:00
Sandro 6e2204ea32
Merge pull request #123364 from edude03/patch-7 2021-06-06 01:35:18 +02:00
Edward Tjörnhammar afdb5675a1 nixos/containers: add storage.conf 2021-06-05 10:08:24 +10:00
Maciej Krüger 26b3751de7
Merge pull request #97692 from ryneeverett/lockkernelmodules-lxd 2021-06-05 01:27:27 +02:00
zowoq 3cf17240f0 Revert "nixos/containers: add storage.conf" 
This file requires some defaults to be set otherwise podman, etc errors.
It also broke the podman nixos tests.

This reverts commit 7a4de9a983.
 2021-06-03 13:56:17 +10:00
Maciej Krüger 5faa7056f9
nixos/virtualbox-image: add exportParams 
This allows the user to specify custom export
parameters like adding a vendor to the exported VM
 2021-06-02 13:28:43 +02:00
Edward Tjörnhammar 7a4de9a983 nixos/containers: add storage.conf 2021-06-02 19:03:53 +10:00
Robert Hensing d9e4512443
Merge pull request #124589 from hercules-ci/containers-dnsname 
nixos/podman-dnsname: init
 2021-06-02 08:18:48 +02:00
Jörg Thalheim f2e4cb7f20
nixos/containerd: improve zfs support 2021-06-01 20:41:42 +02:00
zowoq 72f54c32a6 nixos/podman-network-socket-ghostunnel: move condition to include socket 2021-05-31 23:38:31 +10:00
Robert Hensing 54f2f1e5f1 nixos/podman-dnsname: init 2021-05-31 14:31:09 +02:00
Robert Hensing d81631fb98 nixos/podman: Add defaultNetwork.extraPlugins 2021-05-31 14:31:09 +02:00
Robert Hensing efba949352 nixos/containers: Add virtualisation.containers.containersConf.cniPlugins 2021-05-31 14:29:57 +02:00
Robert Hensing 3600a82711
Merge pull request #124921 from zowoq/podman-cni-conf 
podman: install cni config
 2021-05-31 14:27:10 +02:00
Martin Weinelt 219d8381bd
Merge pull request #124947 from helsinki-systems/fix/libvirtd-ethertypes 2021-05-30 16:52:46 +02:00
Janne Heß 964fc7cfef
Update nixos/modules/virtualisation/libvirtd.nix 
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
 2021-05-30 16:00:50 +02:00
Janne Heß 2eeecef3fc
nixos/libvirtd: Take ethertypes from iptables-nftables-compat 
iptables is currently defined in `all-packages.nix` to be
iptables-compat. That package does however not contain `ethertypes`.
Only `iptables-nftables-compat` contains this file so the symlink
dangles.
 2021-05-30 11:55:19 +02:00
Robert Hensing b6570e7238 nixos/podman-network-socket-ghostunnel: init 2021-05-30 11:23:24 +02:00
Robert Hensing 52844efcd6 nixos/podman: Add generic networkSocket interface 2021-05-30 11:21:05 +02:00
Robert Hensing ff4d83a667 nixos/podman: Add dockerSocket.enable 2021-05-30 11:21:05 +02:00
Robert Hensing fb8b0a3843 nixos/podman: Change podman socket to new podman group 2021-05-30 11:21:05 +02:00
zowoq 30ae7e4ba9 nixos/podman: install cni config from package 2021-05-30 11:40:36 +10:00
Anderson Torres e445fc8661
Merge pull request #123583 from superherointj/module-libvirtd-ovmf-aarch64-fix 
libvirtd: fix ovmf for aarch64
 2021-05-23 19:56:27 -03:00
Maximilian Bosch 9cab80ce4d
Merge pull request #122203 from mohe2015/imperative-nixos-container-timeout 
nixos-containers: Increase startup timeout for imperative containers
 2021-05-22 23:04:12 +02:00
Jörg Thalheim 5b4915fb7a
Merge pull request #110927 from Izorkin/fix-qemu-ga 
nixos/qemu-guest-agent: fix start service
 2021-05-19 05:42:06 +01:00
superherointj 4e3060d488 libvirtd: fix ovmf for aarch64 2021-05-18 17:27:37 -03:00
Michael Francis 80830373f0
Update openvswitch.nix 2021-05-17 21:11:07 +08:00
Michael Francis adc368d2fc
Only include ipsecTools if using ipsec 2021-05-17 21:00:57 +08:00
Sandro 700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah 
treewide: remove gnidorah
 2021-05-17 02:42:24 +02:00
Johan Thomsen 7e310dd8e8 nixos/containerd: StartLimit* options must be in the unit-section 
also, raise limits to ensure reasonable startup time, now that StartLimits are actually enforced
 2021-05-17 06:17:18 +10:00
Johan Thomsen 2142f88526 nixos/containerd: sanitize StateDirectory and RuntimeDirectory 2021-05-17 06:17:18 +10:00
github-actions[bot] 39e3f7c2cc
Merge master into staging-next 2021-05-13 18:32:50 +00:00
Luke Granger-Brown ca6255bf0b nixos/docker: fix evaluation when NAT is enabled too 
Both networking.nat.enable and virtualisation.docker.enable now want to
make sure that the IP forwarding sysctl is enabled, but the module
system dislikes that both modules contain this option.

Realistically this should be refactored a bit, so that the Docker module
automatically enables the NAT module instead, but this is a more obvious
fix.
 2021-05-13 10:26:45 +00:00
github-actions[bot] bc1f4b790e
Merge master into staging-next 2021-05-09 12:23:16 +00:00
Hedtke, Moritz 7a80d281ed
nixos/containers: Increase startup timeout for imperative containers 
Changed the startup timeout from 15 seconds to one minute as 15 seconds is really low.
Also it's currently not possible to change it without editing your system configuration.
 2021-05-08 19:59:20 +02:00
Laurynas Alekna 9317570735 nixos/docker: ensure ipv4 forwarding is enabled 
Fixes #118656
 2021-05-08 18:58:24 +01:00
github-actions[bot] 77c79724e3
Merge staging-next into staging 2021-05-04 06:20:26 +00:00
Silvan Mosberger 37e2fbda39
Merge pull request #121449 from endgame/metadata-fetcher-umask 
metadata fetchers: use umask instead of fetch-and-chmod
 2021-05-04 03:39:38 +02:00
github-actions[bot] 5e177b16b1
Merge staging-next into staging 2021-05-03 18:25:49 +00:00
Luke Granger-Brown a0da004326
Merge pull request #121376 from urbas/amazon-init-shell-script-support 
nixos/amazon-init: add user-data shell script support
 2021-05-03 16:01:26 +01:00
Jack Kelly 5ea55e4ed0 metadata fetchers: use umask instead of fetch-and-chmod 2021-05-02 08:28:59 +10:00
github-actions[bot] ef6416a6ba
Merge staging-next into staging 2021-05-01 00:54:32 +00:00
Florian Klink 44a0debca7
Merge pull request #121021 from pennae/container-sigterm 
nixos/nix-containers: use SIGTERM to stop containers
 2021-04-30 21:35:16 +02:00
Sandro Jäckel ae02415ee8
treewide: remove gnidorah 
due to github account removal/deletion and not other mean of contact.
 2021-04-30 01:48:19 +02:00
ryneeverett 161a35b0b8
nixos/lxd: explicitly load xt_CHECKSUM module 
This module is needed to create bridge networks such as the default
lxdbr0 created by `lxd init`. Without this module, running `lxc network
create lxdbr0` errors with:

> Error: Failed to create network 'lxdbr0': Failed to run: iptables -w -t mangle -I POSTROUTING -o lxdbr0 -p udp --dport 68 -j CHECKSUM --checksum-fill -m comment --comment generated for LXD network lxdbr0: iptables v1.8.5 (legacy): unknown option "--checksum-fill"
 2021-04-29 11:40:00 +02:00
ryneeverett 80e263b389
nixos/lxd: explicitly load kernel modules 
This is analogous to #70447 and #76487.

These are all needed to attach a container to the default bridge
network, without which the final line of the following script fails with
the error for each respective kernel module listed below.

```sh
lxc storage create foo dir
lxc launch -s foo ubuntu:trusty bar
lxc network attach lxdbr0 bar
```

veth
----

> Error: Failed to start device 'lxdbr0': Failed to create the veth interfaces vethefbc3cd6 and vetha4abbcbc: Failed to run: ip link add dev vethefbc3cd6 type veth peer name vetha4abbcbc: RTNETLINK answers: Operation not supported

iptable_mangle
--------------

> lvl=eror msg="Failed to bring up network" err="Failed to list ipv4 rules for LXD network lxdbr0 (table mangle)" name=lxdbr0

xt_comment
----------

> lvl=error msg="Failed to bring up network" err="Failed to run: iptables -w -t filter -I INPUT -i lxdbr0 -p udp --dport 67 -j ACCEPT -m comment --comment generated for LXD network lxdbr0: iptables v1.8.4 (legacy): Couldn't load match `comment':No such file or directory\n\nTry `iptables -h' or 'iptables --help' for more information." name=lxdbr0

xt_MASQUERADE
-------------

> vl=eror msg="Failed to bring up network" err="Failed to run: iptables -w -t nat -I POSTROUTING -s 10.0.107.0/24 ! -d 10.0.107.0/24 -j MASQUERADE -m comment --comment generated for LXD network lxdbr0: iptables v1.8.4 (legacy): Couldn't load target `MASQUERADE':No such file or directory\n\nTry `iptables -h' or 'iptables --help' for more information." name=lxdbr0
 2021-04-29 11:37:10 +02:00
github-actions[bot] 01105a117a
Merge staging-next into staging 2021-04-29 06:21:55 +00:00
Peter Hoeg ce93de4f62 nixos/hyperv: bail gracefully if device is missing 2021-04-29 09:37:17 +08:00
pennae 82931ea446 nixos/nix-containers: use SIGTERM to stop containers 
systemd-nspawn can react to SIGTERM and send a shutdown signal to the container
init process. use that instead of going through dbus and machined to request
nspawn sending the signal, since during host shutdown machined or dbus may have
gone away by the point a container unit is stopped.

to solve the issue that a container that is still starting cannot be stopped
cleanly we must also handle this signal in containerInit/stage-2.
 2021-04-28 14:07:35 +02:00
github-actions[bot] e30742adc3
Merge staging-next into staging 2021-04-26 12:06:35 +00:00
Lassulus ee04d772e4
Merge pull request #120489 from samueldr/fix/make-disk-image-auto-size 
Fix make disk image automatic size
 2021-04-26 10:34:15 +02:00
github-actions[bot] 1626c4772a
Merge staging-next into staging 2021-04-25 12:06:12 +00:00
Frederik Rietdijk c648f7ee2a Merge master into staging-next 2021-04-25 13:54:29 +02:00
Luke Granger-Brown 0cc25061b0
Merge pull request #114240 from sorki/containers/nested 
nixos/nixos-containers: default boot.enableContainers to true
 2021-04-25 11:37:01 +01:00
lassulus 5aa4273e4f treewide: use auto diskSize for make-disk-image 
(cherry picked from commit f3aa040bcb)
 2021-04-24 14:49:07 -04:00
Michael Raskin d04f1c4314
Merge pull request #101071 from ju1m/apparmor 
apparmor: try again to fix and improve
 2021-04-24 11:24:26 +00:00
github-actions[bot] d8d6ba0d2e
Merge master into staging-next 2021-04-24 06:05:30 +00:00
Luke Granger-Brown 4fb91cbafe Revert "treewide: use auto diskSize for make-disk-image" 
This reverts commit f3aa040bcb.
 2021-04-24 02:38:36 +00:00
Julien Moutinho 05d334cfe2 Revert "Revert "apparmor: fix and improve the service"" 
This reverts commit 420f89ceb2.
 2021-04-23 07:17:55 +02:00
github-actions[bot] b95da5efb6
Merge master into staging-next 2021-04-22 18:14:27 +00:00
lassulus f3aa040bcb treewide: use auto diskSize for make-disk-image 2021-04-22 19:52:49 +02:00
github-actions[bot] 8248f4db36
Merge master into staging-next 2021-04-22 06:05:51 +00:00
Matej Urbas db5b547b25 nixos/amazon-init: add user-data shell script support 2021-04-18 10:19:06 +01:00
Philipp Mildenberger f5922de1d7 nixos/oci-containers: add support for environment files 2021-04-15 10:57:56 +02:00
Luke Granger-Brown 08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
Jörg Thalheim 9af991a1b1
Merge pull request #117618 from Mic92/docker 
nixos/docker: re-add network.target
 2021-04-09 12:43:13 +01:00
Dmitry Kalinkin 219590673c
Merge branch 'staging-next' into staging 
Conflicts:
	pkgs/development/python-modules/panel/default.nix
	pkgs/os-specific/linux/kernel/generic.nix
	pkgs/servers/home-assistant/default.nix
 2021-04-08 22:42:26 -04:00
Luke Granger-Brown 1ce6b05ea1 nixos/libvirtd: add package option 
At the moment, it's not possible to override the libvirtd package used
without supplying a nixpkgs overlay. Adding a package option makes
libvirtd more consistent and allows enabling e.g. ceph and iSCSI support
more easily.
 2021-04-09 01:20:19 +02:00
Phillip Cloud 7c36ce8d3a nixos/containers: move extraConfig to settings model 2021-04-07 16:08:18 -04:00
Jan Tojnar 70babe5bcf Merge branch 'staging-next' into staging 2021-04-06 16:25:41 +02:00
Alyssa Ross 25208eeaba linux: remove xen_dom0 feature entirely 
Xen is now enabled unconditionally on kernels that support it, so the
xen_dom0 feature doesn't do anything.  The isXen attribute will now
produce a deprecation warning and unconditionally return true.
Passing in a custom value for isXen is no longer supported.
 2021-04-05 09:25:39 +00:00
Sandro Jäckel 9378fdf87e
iproute: deprecate alias 2021-04-04 01:43:46 +02:00
Izorkin e65d8e4845
nixos/qemu-guest-agent: add statedir 2021-03-31 20:07:17 +03:00
Sandro da7bf30372
nixos/containers: update example path to match defaults 2021-03-29 03:40:44 +02:00
Jörg Thalheim 0f4872b4c4
nixos/docker: re-add network.target 
Currently if docker starts concurrently with
firewall.service/systemd-networkd it breaks both due to iptables/netlink
logs.
 2021-03-25 22:06:54 +01:00
Domen Kožar b992a92fa0
Merge pull request #117021 from AmineChikhaoui/gcp-cloud-images 
add new Google Cloud image for the current release
 2021-03-25 10:42:06 +01:00
zowoq 4b11122749 nixos/containers: add catatonit / init_path 
https://github.com/containers/common/blob/master/docs/containers.conf.5.md

- Also drop unneeded true from ociSeccompBpfHook
 2021-03-21 20:57:28 +01:00
AmineChikhaoui 606b49721f
add new Google Cloud image for the current release 
update the create-gce.sh script with the ability to create public images
out of a GS object.
 2021-03-21 14:04:09 -04:00
Lassulus ba6d848c40
Merge pull request #112332 from urbas/amazon-init-options 
virtualization/amazon-init: enable option
 2021-03-07 18:39:05 +01:00
Johan Thomsen 7b5c38e973 nixos/kubernetes: docker -> containerd 
also, nixos/containerd: module init
 2021-03-07 12:51:14 +10:00
rnhmjoj c0c288b70b nixos/libvirtd: remove systemd-udev-settle 
This dependency has been added in 65eae4d, when NixOS switched to
systemd, as a substitute for the previous udevtrigger and hasn't been
touched since. It's probably unneeded as the upstream unit[1] doesn't
do it and I haven't found any mention of any problem in NixOS or the
upstream issue trackers.

[1]: https://gitlab.com/libvirt/libvirt/-/blob/master/src/remote/libvirtd.service.in
 2021-03-05 23:44:28 +01:00