Commit graph

19635 commits

Author SHA1 Message Date
Frederik Rietdijk e823016e66 Merge master into staging-next 2020-12-31 13:29:32 +01:00
lewo 7a6a0577f6
Merge pull request #107610 from puffnfresh/patch-3
oci-containers: fix containers attribute in docs
2020-12-31 09:39:25 +01:00
Jörg Thalheim c2fca99f97
Revert "Merge branch 'master' into staging-next"
This reverts commit f19b7b03a0, reversing
changes made to 572a864d02.

Sorry. I pushed the wrong staging-next (the one that had my master
merged in). This was not intended.
2020-12-31 08:50:36 +01:00
Jörg Thalheim f19b7b03a0
Merge branch 'master' into staging-next 2020-12-31 07:31:38 +01:00
Niklas Hambüchen 9206c0d115
Merge pull request #41966 from aneeshusa/allow-mutable-shells-for-declarative-users
nixos/users: Allow mutable shells for declarative users
2020-12-31 02:03:22 +01:00
Niklas Hambüchen 9424925867
Merge pull request #85244 from tomberek/tomberek/amazon-init
amazon-init: add xz to PATH
2020-12-31 01:50:19 +01:00
Niklas Hambüchen 5604a20762
Merge pull request #80769 from chkno/nixos-enter-tmp
nixos/nixos-enter: Create /tmp
2020-12-31 01:37:41 +01:00
Silvan Mosberger ff97a25fc6
Merge pull request #104419 from otavio/topic/shellhub
shellhub-agent: Add service and package expressions
2020-12-31 00:07:42 +01:00
Otavio Salvador 06edbabe06 nixos/shellhub-agent: initial service expression
This provides the service to configure the ShellHub Agent.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2020-12-30 19:24:13 -03:00
github-actions[bot] e75c8744cb
Merge master into staging-next 2020-12-30 18:40:45 +00:00
Luke Granger-Brown d0a9e1ec83 nixos/grafana: add support for declarative plugin installation 2020-12-30 17:59:52 +00:00
Kevin Cox 58f3c19b78
Merge pull request #107638 from thiagokokada/opentabletdriver-init
opentabletdriver: init at 0.4.2/add module
2020-12-30 09:18:26 -05:00
Thiago Kenji Okada 791ef2e848 nixos/hardware: add opentabletdriver module 2020-12-30 10:14:30 -03:00
Julien Moutinho 8866576300
nixos/tor: improve type-checking and hardening
Fixes #77395.
Fixes #82790.
2020-12-30 07:50:44 +01:00
Jörg Thalheim 1024571d35
nixos/nscd: start in early boot
Services that have dynamic users require nscd to resolve users
via pam_systemd. Those services might not even create
their own dynamic users itself i.e. iptables.
To make sure nscd is always started when this is happening we move
nscd to sysinit.target and make sure that it is always started before
starting/reloading/restarting any other service.
2020-12-30 07:50:34 +01:00
h0m1 330218e69a
stage-1: create temporary secrets directory in /tmp and not in cwd 2020-12-30 07:50:34 +01:00
Jörg Thalheim 4caaec36dd
amazon-ec2-utils: 0.5.1 -> 1.3 2020-12-30 07:50:33 +01:00
Jörg Thalheim 64a7e509d7
nixos/nix-daemon: fix unknown sandbox warnings 2020-12-30 07:50:32 +01:00
Jörg Thalheim f84f71e1e0
nixos/nginx: add streamConfig option 2020-12-30 07:50:31 +01:00
Jörg Thalheim f536901693
nixos/filesystems: don't allow mountpoints with trailing slash
They are semantically the same as the non-slash version and therefore
are potential source of duplicates.

Also fixes https://github.com/NixOS/nixpkgs/issues/78951
2020-12-30 07:50:31 +01:00
Jörg Thalheim 19bf53f143
nixos/filesystems: faster nonEmtpyStr check
regexes should be faster than nix functions
2020-12-30 07:50:30 +01:00
Jörg Thalheim b8a19ca2bc
nixos-rebuild: add --impure flag
There are two use case for this flag:

1. NixOS developer usually use a nixpkgs checkout for development.
Copying nixpkgs everytime when rebuilding NixOS is way to slow, even
with NVME disks.

2. Folks migrating from impure configuration in a sufficient complex
infrastructure need this flag to gradually migrate to NixOS flakes.
2020-12-30 07:50:30 +01:00
Jörg Thalheim e1e412215d
nixos-rebuild: document all nix flags 2020-12-30 07:50:30 +01:00
Jörg Thalheim 8420dc923e
homeassistant: support for python_script automation 2020-12-30 07:50:29 +01:00
Jörg Thalheim 9c6f9c4068
redis: fix redis service 2020-12-30 07:50:29 +01:00
Jörg Thalheim 8a6c765832
command-not-found: rewrite in Rust
- drops perl + libraries dependencies
2020-12-30 07:50:28 +01:00
Jörg Thalheim 55eaa55922
nixos/redis: set TimeoutStartSec/TimeoutStopSec 2020-12-30 07:50:28 +01:00
github-actions[bot] 056304189c
Merge master into staging-next 2020-12-30 06:22:20 +00:00
Anderson Torres dff06f0c25
Merge pull request #102973 from pacien/matrix-appservice-discord-v1.0.0
matrix-appservice-discord: 0.5.2 -> 1.0.0
2020-12-30 01:09:24 -03:00
Anderson Torres d7cf89800e
Merge pull request #105831 from pacien/nixos-msmtp-module
nixos/msmtp: add msmtp module
2020-12-30 01:08:32 -03:00
Anderson Torres b17e9cbb8f
Merge pull request #105706 from pacien/ssmtp-config-generator
nixos/ssmtp: fix configuration generator to accomodate ssmtp
2020-12-30 01:07:47 -03:00
Ben Sima dbf9750782 hoogle: set the host to bind on
Message-Id: <20201230032048.32626-1-ben@bsima.me>
2020-12-30 04:36:00 +01:00
github-actions[bot] 31fc475812
Merge master into staging-next 2020-12-30 00:53:01 +00:00
Matt Layher 071c02a4b2
nixos/corerad: use pkgs.formats.toml to generate TOML configuration
Signed-off-by: Matt Layher <mdlayher@gmail.com>
2020-12-29 17:47:01 -05:00
Luke Granger-Brown 3297ac72f1 nixos/prometheus: add smokeping and corresponding NixOS test 2020-12-29 18:59:51 +00:00
github-actions[bot] ff873c7c21
Merge master into staging-next 2020-12-29 18:40:52 +00:00
Lassulus 86102ebe5e
Merge pull request #107127 from qzle/nixos-container-extraVeth-fix
Fix: nixos-container does not always apply extraVeth ips
2020-12-29 19:19:46 +01:00
WilliButz 6739d17f34
Merge pull request #99180 from 0x4A6F/master-prometheus-service
nixos/prometheus: remote_{read,write} support
2020-12-29 16:08:29 +01:00
0x4A6F c53a0c16e4
nixos/prometheus: remote_{read,write}
- add [remote_write](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write) and [remote_read](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_read) support

Co-authored-by: Yorick van Pelt <yorickvanpelt@gmail.com>
2020-12-29 14:48:57 +00:00
github-actions[bot] c86ce50258
Merge master into staging-next 2020-12-29 00:51:31 +00:00
Florian Klink 316862f72b
Merge pull request #102106 from tadfisher/throttled-msr-warning
nixos/throttled: disable kernel msr warning
2020-12-29 01:28:09 +01:00
Peter Hoeg 7d07645cba nixos/sddm: use attrs instead of plain text
Instead of treating the sddm config a wall of text that doesn't allow us
to override anything, turn it into an attribute set.

We dump `extraConfig` and instead introduce `settings` that is merged
with the module defaults to provide the final configuration.

There is some additional noise in here due to nixpkgs-fmt.
2020-12-29 05:06:38 +08:00
github-actions[bot] ac03278035
Merge master into staging-next 2020-12-28 18:34:55 +00:00
Ivan b90c5cb703
XMonad: configured recompile (#107696)
* nixos/xmonad: xmonad config w/ghc+xmessage

When the "config" option isn't set, we use xmonad-with-packages to
provide xmonad with runtime access to an isolated ghc, ensuring it can
recompile and exec a user's local config (e.g. $HOME/.xmonad/xmonad.hs)
regardless of which ghc (if any) is on PATH.

When the "config" option is set, however, we compile a configured xmonad
executable upfront (during nixos-rebuild), and prior to this commit, it
was not provided with runtime access to an isolated ghc.

As a result, with the "config" option set, it was not possible
to recompile and exec a user's local config unless there was a
compatible version of ghc on PATH with the necessary packages (xmonad,
xmonad-contrib, etc.) in its package database. Adding such a ghc to
environment.systemPackages, e.g.

  (haskellPackages.ghcWithPackages (ps: with ps; [xmonad xmonad-contrib]))

is problematic because it adds both ghc and an unconfigured xmonad to
PATH, e.g.

  $ ls -l $(which xmonad ghc)
  lrwxrwxrwx ... /run/current-system/sw/bin/ghc -> /nix/store/...-ghc-8.10.2-with-packages/bin/ghc
  lrwxrwxrwx ... /run/current-system/sw/bin/xmonad -> /nix/store/...-ghc-8.10.2-with-packages/bin/xmonad

Having the unconfigured xmonad on PATH is particularly bad because
restarting xmonad will dump the user into the unconfigured version, and
if no local config exists (e.g. in $HOME/.xmonad/xmonad.hs), they'll be
left in this unconfigured state.

In this commmit, we give the configured xmonad runtime access to ghc
like xmonad-with-packages does for the unconfigured version. The aim
is to allow the user to switch between the nixos module's config and a
local config (e.g. $HOME/.xmonad/xmonad.hs) at will, so they can try out
config changes without performing a nixos-rebuild.

Since the xmonad on PATH is the configured executable, there's no
danger a user could unwittingly restart into the unconfigured version,
and because xmonad will refuse to recompile when no local config
exists, there's no danger a user could unwittingly recompile into an
unconfigured version.

Given that a local config exists, the recompile/restart behavior depends
on two factors:
- which entry point is used
  * 'XMonad.xmonad' (default)
  * 'XMonad.launch' (recommended in "config" option description)
- what operation is triggered (i.e. via mod+q)
  * `spawn "xmonad --recompile && xmonad --restart"` (default)
  * `restart "xmonad" True`
  * custom function

If the default 'XMonad.xmonad' entrypoint and default mod+q operation
are used, hitting mod+q will compile and exec the local config, which
will remain in use until next time the display manager is restarted.

If the entrypoint is changed to 'XMonad.launch' but mod+q left with its
default operation, hitting mod+q will have no visible effect. The logs
(as seen by running `journalctl --identifier xmonad --follow`) will show
an error,
  X Error of failed request:  BadAccess (attempt to access private resource denied)
which indicates that the shell was unable to start xmonad because
another window manager is already running (namely, the nixos-configured
xmonad).
https://wiki.haskell.org/Xmonad/Frequently_asked_questions#X_Error_of_failed_request:_BadAccess_.28attempt_to_access_private_resource_denied.29

Changing the mod+q operation to `restart "xmonad" True` (as recommended
in the "config" option's description) will allow a restart of the
nixos-configured xmonad to be triggeredy by hitting mod+q.

Finally, if the entrypoint is 'XMonad.launch', mod+q has been
bound to `restart "xmonad" True` and another key bound to a custom
recompile/restart function (e.g. `compileRestart` as shown in the
"config" option example), the user can switch between the nixos module's
config and their local config, with the custom key switching to the
local config and mod+q switching back.

* nixos/xmonad: refactor let binding

* nixos/xmonad: refactor (eliminate duplicate code)

* nixos/xmonad: install man pages

Prior to this commit, man pages were not installed if the "config"
option was set.

* nixos/xmonad: comment grammar fixups

* nixos/xmonad: writeStateToFile in example config

Calling writeStateToFile prior to recompiling and restarting allows
state (workspaces, etc.) to be preserved across the restart.

* nixos/xmonad: add ivanbrennan to maintainers

* nixos/xmonad: adjust compileRestart example

* nixos/xmonad: add missing import to example config
2020-12-28 17:27:36 +01:00
github-actions[bot] d5506c4c59
Merge master into staging-next 2020-12-28 12:24:08 +00:00
Florian Klink f71e439688 nixos/acme: fix typo in docs 2020-12-28 13:19:15 +01:00
Frederik Rietdijk 92cc19490e Merge staging into staging-next 2020-12-28 08:45:43 +01:00
Aaron Andersen a08ed097c9
Merge pull request #107064 from aanderse/nixos/zabbixWeb
nixos/zabbixWeb: include DOUBLE_IEEE754 directive
2020-12-28 00:22:35 -05:00
Maximilian Bosch e5e7c9b0f9
nixos/tests/loki: satisfy linter
Apparently, the linter used for python test-scripts just decided that
a reformat of the testscript is now necessary.
2020-12-28 00:37:13 +01:00
Pavol Rusnak b0121fcb03 trezord: TREZOR -> Trezor 2020-12-27 19:48:09 +01:00
pacien ea842627ce nixos/matrix-appservice-discord: update module for v1.0.0 2020-12-27 12:59:11 +01:00
Anderson Torres 086946df11
Merge pull request #91203 from davidak/zsa
nixos/zsa: init at unstable-2020-12-16
2020-12-26 23:53:48 -03:00
Jeff Slight 4bc2573a15
nixos/gitlab: move custom_hooks_dir into gitaly config (#107174) 2020-12-26 22:44:36 +01:00
Bernardo Meurer c4c899d3ef
Merge pull request #107613 from davidak/bcachefs-sha256
bcachefs: add sha256 kernel module
2020-12-26 21:37:26 +00:00
github-actions[bot] d4a33d75f2
Merge staging-next into staging 2020-12-26 18:28:57 +00:00
davidak 0d0ff21f2f nixos/zsa: init at unstable-2020-12-16
add support for ZSA keyboards

Co-authored-by: Julien Debon <julien.debon@pm.me>
2020-12-26 09:56:34 +01:00
Brian McKenna 1c73baa8c8
oci-containers: fix containers attribute in docs 2020-12-26 16:06:30 +11:00
Daniel Nagy f2ca4c8f1d
nixos/httpd: set lua paths
We conditionally set the lua paths for the Apache mod_lua module. This
allows executing Lua script handlers to require modules, that have been
packaged with the supplied Lua derivation of Apache.

For more information, see:

  https://httpd.apache.org/docs/2.4/mod/mod_lua.html#luapackagecpath
  https://httpd.apache.org/docs/2.4/mod/mod_lua.html#luapackagepath
2020-12-25 22:54:05 +01:00
davidak d42e2cc24e bcachefs: add sha256 kernel module
needed to mount as root fs
2020-12-25 21:28:50 +01:00
github-actions[bot] 7659201d58
Merge staging-next into staging 2020-12-25 18:28:52 +00:00
Florian Klink c674a51382 nixos/systemd: provide libidn2 for systemd-resolved
systemd started using dlopen() for some of their "optional"
dependencies.

Apparently, `libidn2` isn't so optional, and systemd-resolved doesn't
work without libidn2 present, breaking DNS resolution.

Fixes https://github.com/NixOS/nixpkgs/issues/107537

Upstream bug: https://github.com/systemd/systemd/issues/18078
2020-12-25 13:45:25 +01:00
github-actions[bot] 09a970dcd2
Merge staging-next into staging 2020-12-25 12:23:40 +00:00
Gabriel Ebner ce8c83623d
Merge pull request #107263 from edibopp/patch-rtl8761b
Firmware and kernel patch for Realtek RTL8761b
2020-12-25 11:08:32 +01:00
Vladimír Čunát 2b131c97bb
nixos/kresd: set .stopIfChanged = false
Since version 5.2.0 there's non-empty stop phase:
    ExecStopPost=/usr/bin/env rm -f "/run/knot-resolver/control/%i"
but it's perfectly OK to run that from a different version
(and typically it's no-op anyway).  Real-life example where this helps:
https://github.com/NixOS/nixpkgs/issues/49528#issuecomment-747723198
2020-12-25 09:54:04 +01:00
github-actions[bot] 8194c0475b
Merge staging-next into staging 2020-12-25 00:49:34 +00:00
Robbert Gurdeep Singh caa725a6fd nixos/nextcloud: fix missing quotes arround $* in occ wrapper and replace with $@
This will allow this to work:
    nextcloud-occ config:app:set theming slogan --value="A place for testing"
2020-12-24 21:02:05 +01:00
github-actions[bot] 5962ac3709
Merge staging-next into staging 2020-12-24 00:51:47 +00:00
Tim Steinbach 1d364e5138
tests/shadow: Improve
On slow hardware, the test was flaky.
This improves it.
2020-12-23 17:48:12 -05:00
WilliButz f1584ed282
Merge pull request #107469 from Ma27/bump-prometheus
prometheus: 2.22.2 -> 2.23.0
2020-12-23 21:49:08 +01:00
Vladimír Čunát 57a787c9fa
Revert Merge #107275: nixos: fix "nixos-rebuild ...
... build-vm-with-bootloader" for EFI systems

This reverts commit 20257280d9, reversing
changes made to 926a1b2094.
It broke nixosTests.installer.simpleUefiSystemdBoot
and right now channel is lagging behing for two weeks.
2020-12-23 21:24:24 +01:00
github-actions[bot] f1957cd789
Merge staging-next into staging 2020-12-23 18:33:06 +00:00
Tim Steinbach 49ca6941c2
release-combined: Add shadow test 2020-12-23 13:28:52 -05:00
Tim Steinbach 1539732cc6
shadow: Add test 2020-12-23 13:28:52 -05:00
Tim Steinbach 05bf935bc6
ripgrep: Add test 2020-12-23 12:30:39 -05:00
Florian Klink e7659b6288
Merge pull request #107086 from NixOS/staging-next
Staging next with systemd privacy fix
2020-12-23 15:32:32 +01:00
Maximilian Bosch ae48d62bb8
Merge pull request #107410 from Ma27/bump-grocy
grocy: 2.7.1 -> 3.0.0
2020-12-23 15:06:30 +01:00
Maximilian Bosch 39ebc637a1
nixos/tests/prometheus: increase memorySize
Apparently, our NixOS tests need more RAM now. This was needed for e.g.
the `gitea`-test as well[1].

[1] affb72eccd
2020-12-23 13:08:36 +01:00
github-actions[bot] 1f4fb62fda
Merge staging-next into staging 2020-12-23 00:48:34 +00:00
github-actions[bot] 28fd8e0d59
Merge master into staging-next 2020-12-23 00:48:29 +00:00
Michele Guerini Rocco 4b66d030e7
Merge pull request #107403 from gdamjan/fix-uwsgi-php
pkgs/uwsgi: fix compiling and linking the php plugin in uwsgi
2020-12-23 00:55:48 +01:00
José Romildo Malaquias a1c004725b
Merge pull request #107027 from romildo/upd.lxqt
lxqt: update to version 0.16.0
2020-12-22 20:50:10 -03:00
Silvan Mosberger 4a8ea93127
Merge pull request #65609 from jslight90/patch-2
nixos/sd-image-aarch64: update deprecated option
2020-12-23 00:19:09 +01:00
Frederik Rietdijk 736dd028ca Merge staging-next into staging 2020-12-22 19:43:32 +01:00
Maximilian Bosch 123f953c98
grocy: 2.7.1 -> 3.0.0
https://github.com/grocy/grocy/releases/tag/v3.0.0
2020-12-22 16:00:33 +01:00
rnhmjoj 06749ba321 nixos/tests/uwsgi: test PHP plugin 2020-12-22 14:12:19 +01:00
github-actions[bot] 3aac2c14a8
Merge master into staging-next 2020-12-22 12:25:40 +00:00
Florian Klink 80b0997499 nixos/udev: harmonize extraRules example
Use the same sample as in https://wiki.debian.org/NetworkInterfaceNames,
which includes the `ACTION=="add"` condition.
2020-12-22 11:16:29 +01:00
rnhmjoj 9f52d1f234
Revert "nixos/wireless: fix failure with no interfaces"
This reverts commit 8f177612b1.

Attempting to start any service from udev when systemd-udev-settle is
used at all hangs the boot for 2min. See issue #107341.
2020-12-22 10:17:32 +01:00
Sandro ca8343d1b9
Merge pull request #105781 from phile314/rm_old_kafka 2020-12-22 10:03:08 +01:00
Tom Fitzhenry 9d92c9d0a7 iso-image: add 'serial console' boot entry
Prior to this commit, installation over serial console would requiring
manually having to modify the kernel modeline, as described in
https://github.com/NixOS/nixpkgs/issues/58198 .

This is unnecessarily fiddly, so this commit adds a syslinux boot
entry that has serial enabled.

GRUB already has a serial console entry:
2c07a0800a/nixos/modules/installer/cd-dvd/iso-image.nix (L311-L317)

Why 115200 bps? This is already used in other places, e.g. https://github.com/NixOS/nixpkgs/pull/58196

I tested this change by building the image, booting the image, and
observing the boot process over serial:

    $ cd nixos/
    $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix
    $ sudo cp /nix/store/arcl702c3z8xlndlvnfplq9yhixjvs9k-nixos-20.09pre-git-x86_64-linux.iso/iso/nixos-20.09pre-git-x86_64-linux.iso /dev/sdb

    $ picocom -b 115200 /dev/ttyUSB0
2020-12-22 16:16:15 +08:00
github-actions[bot] 55868ac425
Merge staging-next into staging 2020-12-22 00:46:42 +00:00
github-actions[bot] f1ccef3fd4
Merge master into staging-next 2020-12-22 00:46:39 +00:00
WilliButz 97e863ad7f
nixos/doc: add note about codimd -> hedgedoc to release notes 2020-12-22 01:39:03 +01:00
WilliButz 1c55621706
nixos/codimd: rename to hedgedoc
CodiMD was renamed to HedgeDoc. The user, group and state directory,
will be named hedgedoc instead of codimd, starting with stateVersion
"21.03".
2020-12-22 01:39:03 +01:00
Vladimír Čunát 583470209f
Revert "Merge #97536: uwsgi: fix compiling and linking"
This reverts commit df4d0b03ef, reversing
changes made to b333263534.

It didn't even evaluate!
2020-12-21 22:48:19 +01:00
WilliButz 8fc05f7a19
Merge pull request #107292 from mguentner/nginxlog_exporter
nginxlog_exporter:  1.3.0 -> 1.8.1 + module w/ tests
2020-12-21 21:40:16 +01:00
John Ericson 9a6d2ba1c5
Merge pull request #107338 from Ericson2314/thermald-allow-custom-package
nixos/thermald: Allow switching package
2020-12-21 15:23:53 -05:00
Maximilian Güntner 65fd031277
nixos: add prometheus_nginxlog_exporter module + test 2020-12-21 21:23:39 +01:00
Léo Gaspard a5a819e059
Merge pull request #104292 from fgaz/image-contents
nixos/lib/make-disk-image.nix: support content mode and ownership
2020-12-21 19:58:49 +01:00
Philipp Hausmann a63c1a930f kafka: remove old versions 2020-12-21 19:46:16 +01:00