1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Commit graph

22909 commits

Author SHA1 Message Date
github-actions[bot] 1bf55a993f
Merge master into staging-next 2021-08-26 00:01:37 +00:00
Leo Maroni 2163af5167 nixos/grafana: start systemd service after database 2021-08-26 07:06:59 +09:00
Michele Guerini Rocco 296da7b2f8
Merge pull request #133303 from rnhmjoj/cursor
nixos/hidpi: scale X11 core cursor
2021-08-25 21:07:47 +02:00
Silvan Mosberger 1ad73dadd2
Merge pull request #132836 from Infinisil/populate-members
nixos/users: Populate group members option
2021-08-25 20:17:09 +02:00
Vladimír Čunát 70e05c1003
Merge branch 'master' into staging-next 2021-08-25 19:42:15 +02:00
Graham Christensen 9ea7f443ec
Merge pull request #106574 from grahamc/amazon-image-zfs
nixos/amazonImageZfs: init
2021-08-25 12:08:33 -04:00
Martin Weinelt a90373118d
Merge pull request #135492 from mweinelt/octoprint
nixos/octoprint: allow access to serial devices
2021-08-25 18:07:12 +02:00
Graham Christensen 71b3d18181 amazon images: extend the image-info.json to have a disks object
Having a disks object with a dictionary of all the disks and their
properties makes it easier to process multi-disk images.

Note the rename of `label` to `system_label` is because `$label`i
is something of a special token to jq.
2021-08-25 10:42:35 -04: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
Graham Christensen 076f6e2d94 nixos/make-zfs-image: init
This is a private interface for internal NixOS  use. It is similar
to `make-disk-image` except it is much more opinionated about what
kind of disk image it'll make.

Specifically, it will always create *two* disks:

1. a `boot` disk formatted with FAT in a hybrid GPT mode.
2. a `root` disk which is completely owned by a single zpool.

The partitioning and FAT decisions should make the resulting images
bootable under EFI or BIOS, with systemd-boot or grub.

The root disk's zpools options are highly customizable, including
fully customizable datasets and their options.

Because the boot disk and partition are highly opinionated, it is
expected that the `boot` disk will be mounted at `/boot`. It is
always labeled ESP even on BIOS boot systems.

In order for the datasets to be mounted properly, the `datasets`
passed in to `make-zfs-image` are turned in to NixOS configuration
stored at /etc/nixos/configuration.nix inside the VM.
NOTE: The function accepts a system configuration in the `config`
argument. The *caller* must manually configure the system
in `config` to have each specified `dataset` be represented
by a corresponding `fileSystems` entry.

One way to test the resulting images is with qemu:

```sh
boot=$(find ./result/ -name '*.boot.*');
root=$(find ./result/ -name '*.root.*');

echo '`Ctrl-a h` to get help on the monitor';
echo '`Ctrl-a x` to exit';

qemu-kvm \
    -nographic \
    -cpu max \
    -m 16G \
    -drive file=$boot,snapshot=on,index=0,media=disk \
    -drive file=$root,snapshot=on,index=1,media=disk \
    -boot c \
    -net user \
    -net nic \
    -msg timestamp=on
```
2021-08-25 10:42:35 -04:00
lucasew 83514ae7a9 lib.formats.yaml: use well known YAML format
The way `(lib.formats.yaml {}).generate` generates YAML is compliant
because on YAML 1.2 spec JSON is a subset of YAML but it bugs people's
minds and can lead to problems with software that is not compatible with
YAML 1.2.

This commit also changes the test of the generation function. Data
validation/typing remains the same.

See #133802.

Signed-off-by: lucasew <lucas59356@gmail.com>
2021-08-25 14:02:59 +02:00
Sandro 49b5beea43
Merge pull request #128624 from vs49688/exfat 2021-08-25 12:24:39 +02:00
Martin Weinelt dd46a5e731
Merge pull request #135540 from mweinelt/hass-deconz
home-assistant: allow serial access when using deconz
2021-08-25 02:05:20 +02:00
Maximilian Bosch 749caaef5b
nixos/postfixadmin: fix eval & pin to PHP 7.4
Even though some PHP8 compat fixes seem to be in the release that's
packaged here, it seems as if there are still some minor issues[1].

[1] https://github.com/postfixadmin/postfixadmin/issues/395
2021-08-24 23:50:31 +02:00
Robin Gloster 13a5d7dc23
release-notes: add postfixadmin module addition 2021-08-24 23:50:27 +02:00
Robin Gloster 8a0b6a42ee
postfixadmin: fix db owner 2021-08-24 23:46:07 +02:00
Robin Gloster 862dd4ef58
postfixadmin: review additions
Co-authored-by: Linus Heckemann <git@sphalerite.org>
2021-08-24 23:46:06 +02:00
Robin Gloster 0eafc74d50
postfixadmin: init at 3.3.9 2021-08-24 23:46:06 +02:00
Silvan Mosberger 249710d95c
Merge pull request #135568 from DeterminateSystems/zfs-expand-on-boot
ZFS: expand on boot
2021-08-24 21:58:48 +02:00
Your Name 4bb4bcc30c services.zfs.expandOnBoot: support expanding pools on boot
Either enumerating a list of pools to expand or expanding
all pools on boot.
2021-08-24 15:01:08 -04:00
Ryan Mulligan e02fbd0065
Merge pull request #133438 from figsoda/sx-module
nixos/sx: init
2021-08-24 09:33:07 -07:00
Martin Weinelt 3c8a09364d
home-assistant: allow serial access when using deconz 2021-08-24 12:09:12 +02:00
Andreas Fuchs 15d14ad150
github-runner: Allow configuring the package to use (#134661)
This addresses #120263 in part, by allowing users to override the
github-runner derivation that is bound to turn non-functional via the
self-update mechanism. (And it'll allow using a buildFHSUserEnv-based
derivation, if someone ends up building that!)
2021-08-24 11:23:39 +02:00
Martin Weinelt f8df760668
nixos/octoprint: allow access to serial devices
Printers are usually connected over USB to serial interfaces that are
mounted as tty character devices owned by the dialout group. Add our
octoprint service to this group at runtime to allow access to these
printers.
2021-08-24 03:00:39 +02:00
Martin Weinelt 699b4f6fee
Merge pull request #135472 from em0lar/paperless-ng/postgresql
nixos/paperless-ng: allow using postgresql via a unix socket
2021-08-23 23:28:33 +02:00
Maximilian Bosch 23e1e165cd
Merge pull request #135094 from mguentner/matrix-synapse-modern-twisted
matrix-synapse: add e-mail delivery regression test
2021-08-23 23:19:10 +02:00
Leo Maroni fa80ed695b
nixos/paperless-ng: allow using postgresql via a unix socket 2021-08-23 22:44:36 +02:00
Kevin Cox c3df8057da
Merge pull request #121518 from Atemu/automatic-kernelTests
kernel/generic: add kernelTests automatically
2021-08-23 18:23:32 +00:00
Atemu a3f6ff6d48 nixosTests.kernel-generic: add myself as maintainer 2021-08-23 19:57:49 +02:00
Atemu 457653d99c nixosTests.kernel-generic: expose test-making functions
Changed the name to be clearer, 'makeKernelTest' could imply that it wants a
kernel pkg as its arg while it actually needs a set of linuxPackages.
2021-08-23 19:57:49 +02:00
Atemu 2b52f2b762 nixosTests.kernel-generic: simplify 2021-08-23 19:57:46 +02:00
Zane van Iperen 57b933a911
nixos/doc: add note about switching to exfatprogs 2021-08-24 03:33:45 +10:00
Zane van Iperen a049d84229
nixos/filesystems/exfat: use "exfatprogs" instead of "exfat" if kernel > 5.7
5.7+ comes with a native exfat implementation, exfatprogs should be used instead.

The exfat package puts a "mount.exfat" binary in the path, which causes
mount to prefer the FUSE version to the non-fuse one. There's no way to
disable the binary, so switch to exfatprogs.
2021-08-24 03:31:41 +10:00
Jan Tojnar 4ff3577f25 Merge branch 'staging-next' into staging 2021-08-23 14:19:54 +02:00
Sandro 2981a49d31
Merge pull request #135117 from rski/awesomewm 2021-08-23 12:45:49 +02:00
Zhaofeng Li 59af7f0a2b apparmor: Fix cups-client typo 2021-08-23 00:50:15 -07:00
Jörg Thalheim b7802cf399
Merge pull request #132087 from scvalex/improve-kubernetes-tests
kubernetes: fix flaky test and run tests as group
2021-08-22 19:25:50 +01:00
figsoda 7239ddf173 nixos/sx: init 2021-08-22 13:44:29 -04:00
Florian Klink 002cf7d42d
Merge pull request #132347 from anpandey/captive-browser-fix
captive-browser: fix empty string in interface args
2021-08-22 19:40:23 +02:00
ajs124 0e19ea6cd1
Merge pull request #134940 from dminuoso/dovecot-switch-service-to-notify
nixos/dovecot: Switch systemd service type to notify
2021-08-22 19:15:10 +02:00
Victor Nawothnig 60c8c64595 nixos/dovecot: Switch systemd service type to notify 2021-08-22 18:44:58 +02:00
Jörg Thalheim a076ce1ed3
Merge pull request #135150 from dminuoso/rspamd-avoid-empty-postfix-service
nixos/rspamd: Avoid empty postfix service
2021-08-22 16:06:39 +01:00
Maximilian Güntner 076074a8b4
nixos/tests/matrix-synapse: add email regression test case
twisted is used in matrix-synapse for smtp handling.
Mostly this is used for password resets, but also notifications
are delivered that way.

older versions of twisted require the e-mail server to
have TLS1.0 enabled.

Obviously, quite a lot of servers have this disabled which means
synapse won't be able to deliver mails using such servers.

matrix-synapse issue:

https://github.com/matrix-org/synapse/issues/6211
2021-08-22 16:47:25 +02:00
lewo 79e5ee0c76
Merge pull request #135089 from nlewo/kdb-update
nixos/tests/kbd-update-search-paths: explicitly import re
2021-08-22 16:04:35 +02:00
github-actions[bot] 42f8c46335
Merge staging-next into staging 2021-08-22 12:01:56 +00:00
Daniel Șerbănescu 792e517070 nixos/httpd: add none option to logFormat 2021-08-22 10:17:28 +02:00
Victor Nawothnig 942d78d9cd nixos/rspamd: Avoid empty postfix service 2021-08-22 03:18:55 +02:00
github-actions[bot] f6ad0961da
Merge staging-next into staging 2021-08-22 00:02:05 +00:00
Graham Christensen 1c145df9ae
Merge pull request #134981 from DeterminateSystems/aws-ami
AWS AMI: Make the serial console access useful.
2021-08-21 19:21:30 -04:00
Jan Tojnar 7a04c2ad68 Merge branch 'staging-next' into staging
- boost 171 removed on staging-next
- re-generated node-packages.nix

; Conflicts:
;	pkgs/development/java-modules/m2install.nix
;	pkgs/development/node-packages/node-packages.nix
;	pkgs/top-level/all-packages.nix
2021-08-22 01:13:41 +02:00