3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

19993 commits

Author SHA1 Message Date
Kim Lindberger b43e0ae859
Merge pull request #157719 from talyz/bookstack-secret-paths
nixos/bookstack: Make secret replacement strings more unique
2022-02-02 16:27:22 +01:00
talyz be97b3b44d
nixos/bookstack: Make secret replacement strings more unique
If a secret path is a subset of a second secret path, there's a risk
that its secret is substituted for the matching part of the second
path. To prevent this, use the sha256 of the paths as placeholder
string instead.
2022-02-02 12:27:18 +01:00
github-actions[bot] 930984c1de
Merge master into staging-next 2022-02-02 06:01:23 +00:00
Bobby Rong 4fcca9b41f
nixos/pantheon/files: remove
This shouldn't appear in search.nixos.org.
2022-02-02 13:48:22 +08:00
Bobby Rong ede5fff929
nixos/pantheon: stop setting GTK_CSD=1
See https://github.com/elementary/gala/issues/244
2022-02-02 13:47:43 +08:00
Aaron Andersen 7da6bb8266
Merge pull request #157598 from markuskowa/fix-slurmd
nixos/slurm: fix startup of slurmd
2022-02-01 22:49:46 -05:00
Rodney Lorrimar d9b8919e34
nixos/ddccontrol: Ensure that i2c_dev module is loaded 2022-02-02 11:52:57 +10:00
github-actions[bot] 70961d54d6
Merge master into staging-next 2022-02-02 00:01:49 +00:00
Martin Weinelt 778d148959
Merge pull request #155061 from piegamesde/gnome 2022-02-01 20:53:10 +01:00
Jan Tojnar e00317be13 nixos/nvidia: remove obsolete GDM on Wayland assertion
GDM enables Wayland on supported platforms automatically (see ${gnome.gdm}/lib/udev/rules.d/61-gdm.rules), so we removed the `gdm.nvidiaWayland` option.

You will still need `hardware.nvidia.modesetting.enable = true;` with `nvidia` driver, though.
2022-02-01 19:22:04 +01:00
github-actions[bot] f5bdd2b8f8
Merge master into staging-next 2022-02-01 18:01:02 +00:00
Bernardo Meurer 02420e0ca6
Merge pull request #157618 from lovesegfault/nix-default-2.6
nixVersions.stable: point to nix_2_6
2022-02-01 09:23:18 -08:00
Maciej Krüger 8bb7bec755
Merge pull request #141122 from Luflosi/add-apfs-nixos-module 2022-02-01 17:29:10 +01:00
github-actions[bot] 809093c51c
Merge master into staging-next 2022-02-01 12:01:09 +00:00
Timo Kaufmann c395fe1e8f
Merge pull request #156706 from Luflosi/i2pd-remove-script
nixos/i2pd: get rid of unnecessary shell script
2022-02-01 11:52:02 +01:00
K900 e21fc555d6 nixos/vaultwarden: fix alias after #152372 2022-02-01 07:08:44 +00:00
K900 e68a2fffa1 nixos/murmur: remove extra space, fix build after #152372 2022-02-01 07:07:51 +00:00
Bernardo Meurer f46347fa66
nix-fallback-paths: update to 2.6.0 2022-01-31 18:53:43 -08:00
github-actions[bot] c073294043
Merge master into staging-next 2022-02-01 00:01:43 +00:00
pennae 7325eb455b
Merge pull request #157046 from kradalby/add-headscale-module
Add headscale module
2022-01-31 23:53:18 +00:00
Luflosi fd6d59f2ed
nixos/i2pd: get rid of unnecessary shell script
I think calling i2pd directly in `ExecStart` is much nicer than having an extra shell script for no reason. It's also easier to see what's going on when looking at the generated systemd unit file.
2022-01-31 23:21:40 +01:00
Markus Kowalewski 270da0a115
nixos/slurm: fix startup of slurmd
* make slurmd depend on network target to ensure basic networking
  is available on startup. This fixes behaviour
  where slurmd fails with "error: get_addr_info: getaddrinfo() failed".
* Use tmpfiles.d to ensure spool directory exists on start up.
2022-01-31 23:08:55 +01:00
Kristoffer Dalby 00db4205fb nixos/headscale: Add headscale service module 2022-01-31 22:02:56 +00:00
Guillaume Girol d5ddafd0fa
Merge pull request #153219 from symphorien/doc-miniflux
nixos/miniflux: improve docs
2022-01-31 20:05:30 +00:00
github-actions[bot] 0c98545395
Merge master into staging-next 2022-01-31 18:01:24 +00:00
Janne Heß be41b14875
Merge pull request #148695 from Mic92/nginx
nixos/nginx: fix mincore filtering
2022-01-31 14:33:45 +01:00
talyz b65b9bf73c
nixos/gitlab: Implement better script error handling
Fail scripts on pipeline errors and propagate subshell errors.

If an error occurs in a subshell, including while trying to read a
secret file, we want that error to propagate to the main shell
context. That means we have to set the `inherit_errexit` option, which
allows errors from subshells to propagate to the outer shell. Also,
the subshell cannot run as part of another command, such as `export`,
since that will simply ignore the subshell exit status and only
respect `export`s exit status; first assigning the value to a variable
and then exporting it solves issue.
2022-01-31 13:09:20 +01:00
github-actions[bot] 991e2a4022
Merge master into staging-next 2022-01-31 12:01:14 +00:00
Sandro 78e2ef7e3d
Merge pull request #157351 from SuperSandro2000/SuperSandro2000-patch-1 2022-01-31 12:54:13 +01:00
Jan Tojnar 95ba61a82a
Merge pull request #157350 from NixOS/gnome
GNOME: 41.2 → 41.3
2022-01-31 11:22:41 +01:00
Michele Guerini Rocco 09e2956012
Merge pull request #155895 from rnhmjoj/pr-dhcpd-hard
nixos/dhcpd: switch to DynamicUser [v2]
2022-01-31 10:06:57 +01:00
Jörg Thalheim fd382c011a
Merge branch 'master' into nginx 2022-01-31 05:44:42 +01:00
Jörg Thalheim 26ea046ed7
Update nixos/modules/services/web-servers/nginx/default.nix 2022-01-31 05:43:53 +01:00
illustris 43cfb7204b nixos/cloud-init: add support for network configuration 2022-01-31 09:50:23 +05:30
Greizgh 4094fcb66f seahub: init at 8.0.8 2022-01-30 20:45:56 +00:00
Michele Guerini Rocco 5af7724cbb
Merge pull request #154130 from rnhmjoj/fix-wpa
nixos/wireless: enable PMF by default
2022-01-30 19:35:25 +01:00
Guillaume Girol 0d5c5e46da
Merge pull request #157053 from lheckemann/systemd-optional-cryptsetup
nixos/systemd: only use cryptsetup units if systemd was built with it
2022-01-30 16:04:17 +00:00
ajs124 453a3baba2
Merge pull request #157347 from mweinelt/smartctl-exporter-capab-fix
nixos/smartctl-exporter: fix typo in rawio capab
2022-01-30 16:13:44 +01:00
Jess Schallenberg 0a16b05ea9
nixos/nftables: Allow use with iptables (#121517)
* nixos/nftables: Allow use with iptables

Since iptables and nftables do not actually conflict with each other, there's no real reason to artificially prevent people from combining them.
In fact, this practice is known to cause issues like #88643, which is fixed by this commit.
2022-01-30 13:59:56 +01:00
Linus Heckemann 4b27d4f9f8 nixos/systemd: only use cryptsetup units if systemd was built with it 2022-01-30 12:00:37 +01:00
Robert Hensing 9809e1575b nixos/etc.nix: Make independent
(cherry picked from commit 56c283e5c8)
2022-01-30 09:01:27 +01:00
Sandro b02446784d
enableRedistributableFirmware: only add rtw89-firmware when kernel older 5.16 2022-01-30 04:49:04 +01:00
Jan Tojnar 1a11eb1eb3 gnome.gdm: 41.0 → 41.3
Remove nvidiaWayland NixOS option since it was severely out of date.

https://ftp.gnome.org/pub/GNOME/sources/gdm/41/gdm-41.3.news
2022-01-30 04:47:01 +01:00
Martin Weinelt 9d8a23f66e
nixos/smartctl-exporter: fix typo in rawio capab 2022-01-30 04:32:15 +01:00
Sandro ff0dd3afe0
Merge pull request #153596 from illustris/elasticsearch 2022-01-30 01:23:58 +01:00
Janne Heß 5a17134ebd
Merge pull request #157320 from andersk/gnome-switch-fixed
nixos/gnome: Remove warning for fixed nixos-rebuild switch bug
2022-01-30 01:08:46 +01:00
Janne Heß 016e9e5a7f
Merge pull request #157310 from sternenseemann/nix-conf-validation-2.3
nixos/nix-daemon: fix config validation with 2.3
2022-01-29 23:33:18 +01:00
Anders Kaseorg 0ac96d7c53 nixos/gnome: Remove warning for fixed nixos-rebuild switch bug
https://github.com/NixOS/nixpkgs/issues/44344 was fixed years ago.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2022-01-29 14:16:20 -08:00
Niklas Hambüchen 13f5c4c45b
Merge pull request #156731 from Ma27/bump-plausible
plausible: 1.4.0 -> 1.4.3
2022-01-29 22:32:15 +01:00
sternenseemann e3d8cc81b3 nixos/nix-daemon: fix config validation with 2.3
--option experimental-features is no understood by Nix 2.3.
2022-01-29 21:41:49 +01:00
Ingo Blechschmidt 92eb5bc48e ethercalc: init at latest master (b19627) 2022-01-29 20:56:06 +01:00
piegames 405b157aaa nixos/modules/programs/spacefm: remove gksu dependency 2022-01-29 18:09:15 +01:00
piegames 5ffbf9ed81 tilp2: drop
While tilp2's libglade dependency is optional, it still has a hard dependency
on it via gfm
2022-01-29 18:08:52 +01:00
pennae 0be46d0515
Merge pull request #151795 from pennae/dhcpcd
dhcpcd: fix !enablePrivSep build, nixos/dhcpcd: assert if dhcpcd would crash
2022-01-29 17:06:02 +00:00
Bernardo Meurer d3a2238308
Merge pull request #157185 from mohe2015/patch-1
nixos/nix-daemon: Fix misspelled old option name
2022-01-28 16:19:39 -08:00
Maximilian Bosch 7b2f9d4732
Merge pull request #156315 from lheckemann/promtail-package
Promtail package
2022-01-28 23:41:48 +01:00
Moritz Hedtke a26134ffd4
nixos/nix-daemon: Fix misspelled old option name 2022-01-28 20:32:19 +01:00
Jan Tojnar 17969a9b55
Merge pull request #156978 from rhendric/submit/gnome-2048
gnome-2048: init at 3.38.2
2022-01-28 16:33:44 +01:00
Vincent Haupert 7c2319905d nixos/github-runner: use --disableupdate flag
Use the new `--disableupdate` configure flag instead of our patch.
2022-01-28 09:46:12 +01:00
Martin Weinelt 268157dc83 nixos/nix-daemon: fix buildMachines eval 2022-01-28 02:00:25 +01:00
Linus Heckemann 81cd4faec2
Merge pull request #156845 from mayflower/nextcloud-group
nextcloud: make home group-readable
2022-01-27 22:09:17 +01:00
Ryan Hendrickson 617d557d3b gnome-2048: init at 3.38.2 2022-01-27 15:40:02 -05:00
Jörg Thalheim 956dab36a3 nextcloud: use tmpfiles to create group-readable home
users.users.*.createHome makes home only owner-readable.
This breaks nginx reading static assets from nextcloud's home,
after a nixos-rebuild that did not restart nextcloud-setup.

Closes #112639
2022-01-27 19:13:50 +01:00
ajs124 47a2176ec8
Merge pull request #156998 from mweinelt/smartctl-exporter-fixups
prometheus.exporters.smartctl: fixes
2022-01-27 18:49:49 +01:00
Bernardo Meurer 5f9b470ff0
Merge pull request #154809 from helsinki-systems/feat/stc-proper-unit-file-parser
nixos/switch-to-configuration: Proper unit file parser and clean/fix lower part of the script
2022-01-27 09:35:34 -08:00
Martin Weinelt 12c26aca1f
prometheus.exporters.smartctl: Fix autodiscovery
When no devices are given the exporter tries to autodiscover available
disks. The previous DevicePolicy was however preventing the exporter
from accessing any device at all, since only explicitly mentioned ones
were allowed.

This commit adds an allow rule for several device classes that I could
find on my machines, that gets set when no devices are explicitly
configured.

There is an existing problem with nvme devices, that expose a character
device at `/dev/nvme0`, and a (namespaced) block device at
`/dev/nvme0n1`. The character device does not come with permissions that
we could give to the exporter without further impacting the hardening.

  crw------- 1 root root 247, 0 27. Jan 03:10 /dev/nvme0
  brw-rw---- 1 root disk 259, 0 27. Jan 03:10 /dev/nvme0n1

The autodiscovery only finds the character device, which the exporter
unfortunately does not have access to.

However a simple udev rule can be used to resolve this:

  services.udev.extraRules = ''
    SUBSYSTEM=="nvme", KERNEL=="nvme[0-9]*", GROUP="disk"
  '';

Unfortunately I'm not fully aware of the security implications this
change carries and we should question upstream (systemd) why they did
not include such a rule.
The disk group has no members on any of my machines.

  ❯ getent group disk
  disk6:
2022-01-27 17:33:27 +01:00
Daniel Olsen 5288bcab0a nixos/mx-puppet-discord: Change systemd unit description to avoid newline 2022-01-27 16:49:40 +01:00
Robert Hensing d0947df006
Merge pull request #156992 from hercules-ci/revert-153594-doc-optimization
Revert 153594 doc optimization
2022-01-27 15:46:36 +01:00
Luflosi 26a695399a
nixos/apfs: init
Add the final missing pieces for full APFS support.
2022-01-27 15:18:45 +01:00
Martin Weinelt f860b289d4
prometheus.exporters.smartctl: Allow RAWIO
This allows the exporter to perform SCSI commands and interact with hpsa
and cciss devices.
2022-01-27 13:49:25 +01:00
Janne Heß 1f3b1a9067
Merge pull request #139075 from polykernel/nix-structural-settings-patch-1
nixos/nix-daemon: use structural settings
2022-01-27 13:38:41 +01:00
Robert Hensing 6b9ef93b98 Revert "flake.nix: Set nixpkgs.config.path"
This reverts commit 0b222173db.
2022-01-27 12:53:29 +01:00
Robert Hensing aa877346f8 Revert "nixos/documentation: avoid copying nixpkgs subpaths, iteration 2"
This reverts commit 15a00be189.
2022-01-27 12:35:16 +01:00
Robert Hensing 647b304306 Revert "nixos/documentation.nix: Only use store non-flake pkgs.path directly when already copied"
This reverts commit fecf325059.
2022-01-27 12:35:16 +01:00
Robert Hensing a732a8de1c Revert "nixos/documentation.nix: Use builtins.storePath when appropriate"
This reverts commit 5d29853c38.
2022-01-27 12:33:10 +01:00
olegkapitonov ae5361fa1b
fix MTP support on KDE Plasma and Dolphin (#155405)
* fix MTP support on KDE Plasma and Dolphin

* Update pkgs/applications/kde/kio-extras.nix

Co-authored-by: ElXreno <elxreno@gmail.com>

Co-authored-by: Peter Hoeg <peter@hoeg.com>
Co-authored-by: ElXreno <elxreno@gmail.com>
2022-01-27 11:29:32 +08:00
polykernel 4a9d9928dc nixos/nix-daemon: use structural settings
The `nix.*` options, apart from options for setting up the
daemon itself, currently provide a lot of setting mappings
for the Nix daemon configuration. The scope of the mapping yields
convience, but the line where an option is considered essential
is blurry. For instance, the `extra-sandbox-paths` mapping is
provided without its primary consumer, and the corresponding
`sandbox-paths` option is also not mapped.

The current system increases the maintenance burden as maintainers have to
closely follow upstream changes. In this case, there are two state versions
of Nix which have to be maintained collectively, with different options
avaliable.

This commit aims to following the standard outlined in RFC 42[1] to
implement a structural setting pattern. The Nix configuration is encoded
at its core as key-value pairs which maps nicely to attribute sets, making
it feasible to express in the Nix language itself. Some existing options are
kept such as `buildMachines` and `registry` which present a simplified interface
to managing the respective settings. The interface is exposed as `nix.settings`.

Legacy configurations are mapped to their corresponding options under `nix.settings`
for backwards compatibility.

Various options settings in other nixos modules and relevant tests have been
updated to use structural setting for consistency.

The generation and validation of the configration file has been modified to
use `writeTextFile` instead of `runCommand` for clarity. Note that validation
is now mandatory as strict checking of options has been pushed down to the
derivation level due to freeformType consuming unmatched options. Furthermore,
validation can not occur when cross-compiling due to current limitations.

A new option `publicHostKey` was added to the `buildMachines`
submodule corresponding to the base64 encoded public host key settings
exposed in the builder syntax. The build machine generation was subsequently
rewritten to use `concatStringsSep` for better performance by grouping
concatenations.

[1] - https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md
2022-01-26 21:04:50 -05:00
Martin Weinelt b3b17c3885
Merge pull request #156787 from helsinki-systems/drop/racoon 2022-01-26 23:30:20 +01:00
Jan Tojnar d843a692ae
Merge pull request #148344 from pasqui23/portals
nixos/xdg-portals: add portals to systemPackages
2022-01-26 19:22:49 +01:00
Pasquale e9c4910524
nixos/xdg-portals: add portals' desktop files to XDG_DATA_DIRS 2022-01-26 18:45:42 +01:00
Sandro 89de95e632
Merge pull request #138439 from kjeremy/tmux-plugins-master 2022-01-26 17:17:19 +01:00
Martin Puppe 6a96992fe0 Fix invalid regular expression #156861
Empty parantheses are not supported in regular expressions on
Darwin/macOS. The old regular expression produces an error during
evaluation. This commit fixes that.

Nix‘s `builtins.match` works with extend POSIX regular expressions. The
specification for these regular expression states[^1] that the result
for a left paranthesis immediately followed by a right paranthesis
outside of a bracket expression is undefined.

[^1]: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04_03
2022-01-26 16:23:14 +01:00
ajs124 ef8280914f nixos/openvswitch: remove ipsec 2022-01-26 01:12:40 +01:00
ajs124 737de29e11 nixos/racoon: drop 2022-01-26 01:12:39 +01:00
Martin Weinelt 89e18a19cd
Merge pull request #156738 from mweinelt/hass-ping 2022-01-26 00:08:47 +01:00
Jeremy Kolb 7be304a543 nixos/programs/tmux: specify wanted plugins
Currently it's rather difficult to install tmux plugins. The process involves two steps:
  1. Specify the correct `pkg.tmuxPlugins` package in `environment.systemPackages`
  2. Adding to the configuration file to instantiate the plugin.

This commit allows the user to specify a list of plugins under `programs.tmux.plugins`.

Update nixos/modules/programs/tmux.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-01-25 17:12:44 -05:00
Pascal Bach ee59b97045
Merge pull request #155473 from yayayayaka/matrix-synapse-administration
nixos/matrix-synapse: Wrap register_new_matrix_user
2022-01-25 22:10:03 +01:00
Pascal Bach c0ad24ee1d
Merge pull request #155703 from dali99/synapse-webclient
nixos/matrix-synapse: Remove webclient from default listener
2022-01-25 22:03:34 +01:00
Jonathan Ringer e74ccf2d72
Merge pull request #154708 from NixOS/staging-next
Staging next 2022-01-12
2022-01-25 11:54:52 -08:00
Lara 04560b9163 nixos/gitlab: Add additional paths to systemd.tmpfiles.rules
This fixes the NixOS gitlab test failure since gitlab 14.7.0.
2022-01-25 19:05:49 +01:00
github-actions[bot] bf793f213d
Merge master into staging-next 2022-01-25 18:01:20 +00:00
Martin Weinelt d4061dcc6e
nixos/home-assistant: allow capset with components using ping command 2022-01-25 18:29:16 +01:00
Maximilian Bosch e211c94b94
plausible: 1.4.0 -> 1.4.3
ChangeLog: https://github.com/plausible/analytics/blob/v1.4.3/CHANGELOG.md#unreleased

Also makes the option `services.plausible.releaseCookiePath` mandatory[1]: since Elixir
1.13 the `RELEASE_COOKIE` env-var *must* be set, otherwise the startup
fails[2]. Since we drop `$out/releases/COOKIE` in the `fixupPhase` of
`mixRelease` and Elixir seems to always attempt to generate such a
file[3], I figured it's reasonable to just make it mandatory now.

Closes #155575

[1] https://nixos.org/manual/nixos/stable/options.html#opt-services.plausible.releaseCookiePath
[2] f24eb2c1ef /
    https://github.com/elixir-lang/elixir/issues/11114
[3] https://hexdocs.pm/mix/Mix.Tasks.Release.html, see `:cookie`
2022-01-25 17:19:49 +01:00
Franz Pletz 5940ac847f
Merge pull request #156718 from B4dM4n/bird-pre-check-config 2022-01-25 16:43:44 +01:00
Martin Weinelt 48f17360d9 Merge remote-tracking branch 'origin/master' into staging-next 2022-01-25 15:53:19 +01:00
Luflosi c6bd1eea71
nixos/tor: fix tor getting killed by systemd when shuttding down
Tor waits ShutdownWaitLength seconds (30s by default) before actually shutting down. Since the systemd timeout is also set to 30 seconds, this results in a race condition that ends up killing Tor most of the time on my machine during shutdown.
To fix this, add the ShutdownWaitLength setting and tell systemd to wait 30 seconds more than that.
Arch Linux also has `TimeoutSec` set to 60 seconds: 6df716fe19/trunk/tor.service.
2022-01-25 15:02:18 +01:00
Fabian Möller ba27a0aaed
nixos/bird: add option to modify config check environment 2022-01-25 14:58:26 +01:00
Anderson Torres 48743a4f17
Merge pull request #156571 from AndersonTorres/new-misc
mpc: install Bash shell completion (and more)
2022-01-25 10:20:29 -03:00
Robert Hensing 8919495cac
Merge pull request #156503 from hercules-ci/nixos-add-system.build-options
nixos: Add `system.build.`{`toplevel`,`installBootLoader`}, improve error message
2022-01-25 14:13:24 +01:00
Guillaume Girol 9a303957b9 nixos/miniflux: improve docs 2022-01-25 12:00:00 +00:00