Jonathan Ringer
c227fb4b17
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/tools/rust/cargo-cache/default.nix
pkgs/development/tools/rust/cargo-embed/default.nix
pkgs/development/tools/rust/cargo-flash/default.nix
pkgs/servers/nosql/influxdb2/default.nix
2021-05-17 07:01:38 -07:00
Robert Schütz
a22ebb6d6d
Merge pull request #123017 from DavHau/davhau-scikitlearn
...
python3Packages.scikitlearn: rename to scikit-learn
2021-05-17 15:13:33 +02:00
ajs124
8e78793029
nixos/tasks/filesystems: utillinux -> util-linux
2021-05-17 14:47:57 +02:00
Jörg Thalheim
b900661f6e
Merge pull request #122825 from Izorkin/update-duplicates-systemcallfilters
...
treewide: remove duplicates SystemCallFilters
2021-05-17 12:06:06 +01:00
DavHau
cd8f3e6c44
python3Packages.scikitlearn: rename to scikit-learn
2021-05-17 17:41:36 +07:00
Eelco Dolstra
c3b27282d7
Merge pull request #123272 from kini/nixos/security.pki/pems-without-final-newline
...
nixos/security.pki: handle PEMs w/o a final newline
2021-05-17 11:14:03 +02:00
Richard Marko
16b0f07890
nixos/nginx: fix comment about acme postRun not running as root
...
As of 67a5d66
this is no longer true, since acme postRun runs as root.
The idea of the service is good so reword a comment a bit.
2021-05-17 18:03:04 +09:00
Richard Marko
7423afb5e4
nixos/molly-brown: fix description of certPath
...
`allowKeysForGroup` is no longer available so this drops
```
security.acme.certs."example.com".allowKeysForGroup = true;
```
line. `SupplementaryGroups` should be enough for
allowing access to certificates.
2021-05-17 18:03:04 +09:00
Richard Marko
29158fc0ac
nixos/postgresql: fix description of ensureUsers.ensurePermissions
...
`attrName` and `attrValue` are now in correct order.
2021-05-17 18:03:04 +09:00
Jan Tojnar
354e005d6c
nixos/dconf: fix d-bus activation
...
dconf now supports autostarting the d-bus service using systemd's d-bus activation.
2781a86848
On NixOS, that requires making systemd aware of the package.
Fixes: https://github.com/NixOS/nixpkgs/issues/123265
2021-05-17 09:46:07 +02:00
Evils
7641769055
nixos/fancontrol: back to running as root
...
regular users don't have write access to /sys/devices
which is where the kernel endpoints are to control fan speed
2021-05-17 00:00:01 -07:00
github-actions[bot]
3ff6965554
Merge master into staging-next
2021-05-17 06:22:23 +00:00
Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
...
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Sandro
ec1dd62608
Merge pull request #118521 from SuperSandro2000/nginx-proxy-timeout
...
nixos/nginx: add option to change proxy timeouts
2021-05-17 03:15:54 +02:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
...
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Sandro Jäckel
51166f90c6
nixos/nginx: add option to change proxy timeouts
2021-05-17 02:37:44 +02:00
Keshav Kini
348858f297
nixos/security.pki: handle PEMs w/o a final newline
...
According to the ABNF grammar for PEM files described in [RFC
7468][1], an eol character (i.e. a newline) is not mandatory after the
posteb line (i.e. "-----END CERTIFICATE-----" in the case of
certificates).
This commit makes our CA certificate bundler expression account for
the possibility that files in config.security.pki.certificateFiles
might not have final newlines, by using `awk` instead of `cat` to
concatenate them. (`awk` prints a final newline from each input file
even if the file doesn't end with a newline.)
[1]: https://datatracker.ietf.org/doc/html/rfc7468#section-3
2021-05-16 17:23:11 -07:00
Martin Weinelt
7bd65d54f7
treewide: remove nand0p as maintainer
...
While looking at the sphinx package I noticed it was heavily
undermaintained, which is when we noticed nand0p has been inactive for
roughly 18 months. It is therefore prudent to assume they will not be
maintaining their packages, modules and tests.
- Their last contribution to nixpkgs was in 2019/12
- On 2021/05/08 I wrote them an email to the address listed in the
maintainer-list, which they didn't reply to.
2021-05-17 01:50:49 +02:00
Florian Klink
6c0058f47f
Merge pull request #85073 from hyperfekt/systemd-pstore
...
nixos/systemd|filesystems: mount and evacuate /sys/fs/pstore using systemd-pstore
2021-05-17 00:00:52 +02:00
Aaron Andersen
21f5dd5c6e
Merge pull request #122647 from onny/caddy
...
nixos/caddy: support user and group options
2021-05-16 17:23:57 -04: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]
9911b1c75b
Merge staging-next into staging
2021-05-16 01:01:01 +00:00
github-actions[bot]
b484cef365
Merge master into staging-next
2021-05-16 01:00:58 +00:00
Michael Weiss
a542827c9b
nixos/sway: Update the module documentation
...
Most programs already run natively under Wayland so extraSessionCommands
isn't as important anymore. XWayland is already covered by
"programs.xwayland.enable = mkDefault true;" in the module.
2021-05-15 20:30:53 +02:00
github-actions[bot]
c10600230e
Merge staging-next into staging
2021-05-15 18:30:31 +00:00
github-actions[bot]
f1b78f8618
Merge master into staging-next
2021-05-15 18:30:28 +00:00
Michael Weiss
73e0dd4b29
Merge pull request #123034 from primeos/sway-simplify-screen-sharing
...
sway: Simplify screen sharing
2021-05-15 18:38:52 +02:00
Jonathan Ringer
5a6540c49c
nixos/factorio: update admin setting
2021-05-15 09:04:35 -07:00
Jonas Heinrich
fff9cf00fd
caddy: support user and group options
2021-05-15 10:32:49 +02:00
github-actions[bot]
78ae7ac75e
Merge staging-next into staging
2021-05-15 06:22:25 +00:00
github-actions[bot]
c48794dcef
Merge master into staging-next
2021-05-15 06:22:22 +00:00
Aaron Andersen
fc63be7ac8
Merge pull request #122658 from aanderse/httpd-reload
...
nixos/httpd: provide a stable path stable path to the configuration f…
2021-05-14 23:50:43 -04:00
Michael Weiss
3f31c0edef
sway: Simplify screen sharing
...
This should make it easier to get started.
The xdg-desktop-portal backend for wlroots is required and one needs to
"make sure WAYLAND_DISPLAY and XDG_CURRENT_DESKTOP are imported into
D-Bus." [0]
[0]: efcbcb60aa/README.md (running)
2021-05-14 22:42:19 +02:00
Vladimír Čunát
c48eaa70e3
Merge branch 'master' into staging-next
2021-05-14 22:27:34 +02:00
Robert Schütz
e611d663f4
Merge pull request #120440 from dotlambda/radicale-settings
...
nixos/radicale: add settings option
2021-05-14 15:37:26 +02:00
WilliButz
94b2848559
Merge pull request #91663 from mweinelt/kea-exporter
...
prometheus-kea-exporter: init at 0.4.1
2021-05-14 14:38:08 +02:00
Eelco Dolstra
b08e223a04
nix: 2.3.10 -> 2.3.11
...
The patch is included in the new release, so can be dropped.
Co-authored-by: Alyssa Ross <hi@alyssa.is>
2021-05-14 12:24:54 +00:00
Alyssa Ross
195d532a63
Revert "Revert "Revert "nix: 2.3.10 -> 2.3.11"""
...
This reverts commit 66fc303070
.
There is still a patch that doesn't apply.
2021-05-14 11:35:18 +00:00
Eelco Dolstra
66fc303070
Revert "Revert "nix: 2.3.10 -> 2.3.11""
...
This reverts commit 1872bbdae5
.
2021-05-14 13:33:05 +02:00
Alyssa Ross
1872bbdae5
Revert "nix: 2.3.10 -> 2.3.11"
...
This reverts commit 6f6b2cdc98
.
Version wasn't updated, and apparently a patch didn't apply. Let's do
this upgrade properly, in a PR, but for now I'm reverting so we don't
have a broken nix package in master.
2021-05-14 11:30:55 +00:00
Eelco Dolstra
6f6b2cdc98
nix: 2.3.10 -> 2.3.11
2021-05-14 13:11:26 +02:00
zowoq
004f8cd986
Merge staging-next into staging
2021-05-14 16:32:43 +10:00
github-actions[bot]
bf5d8bb531
Merge master into staging-next
2021-05-14 00:58:11 +00:00
Jan Tojnar
ac6a4f7cf5
Merge branch 'staging-next' into staging
2021-05-14 01:40:09 +02:00
Samuel Dionne-Riel
12ede41735
Merge pull request #110435 from superloach/patch-2
...
nixos/modules: add "sdhci_pci" to availableKernelModules
2021-05-13 17:45:22 -04:00
Jens Nolte
22e797947b
nixos/zfs: Add defaultText for 'boot.zfs.package'-option ( #122002 )
2021-05-13 17:40:10 -04:00
Maximilian Bosch
bfd4c121ff
Merge pull request #122637 from mayflower/prometheus-2.26.0
...
Prometheus 2.26.0 + exporter updates
2021-05-13 23:05:29 +02:00
Michael Weiss
60f2af5938
Merge pull request #122605 from primeos/nixos-sway-extend-default-configuration
...
nixos/sway: Extend the default configuration for NixOS
2021-05-13 20:48:55 +02:00
github-actions[bot]
39e3f7c2cc
Merge master into staging-next
2021-05-13 18:32:50 +00:00