Jonathan Ringer
46fd0afcb3
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/pysdl2/default.nix
pkgs/top-level/aliases.nix
2022-02-06 18:36:59 -08:00
Sandro
5560c824c7
Merge pull request #157761 from tp-la/amazon-ec2-utils
2022-02-07 01:53:35 +01:00
Sandro
7090608b3f
Merge pull request #136521 from pacien/nixos-upower-config-time-unit
2022-02-07 01:29:46 +01:00
Sandro
255417b8f4
Merge pull request #157146 from illustris/cloudinit
2022-02-07 01:27:21 +01:00
Kevin Cox
c2038731e4
Merge pull request #158348 from schnusch/ipfs
...
nixos/ipfs: use ipfs config replace
2022-02-06 18:11:36 -05:00
Robert Hensing
8403e02a5d
Merge pull request #126769 from ncfavier/nixosSystem-lib
...
nixos: move default module location logic to `eval-config.nix`
2022-02-06 22:49:17 +01:00
schnusch
97f809dc87
nixos/ipfs: use ipfs config replace
2022-02-06 21:42:56 +01:00
Jonathan Ringer
e680c83323
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/graphics/scrot/default.nix
2022-02-06 10:36:30 -08:00
github-actions[bot]
45efe10574
Merge master into staging-next
2022-02-06 18:01:09 +00:00
Vladimír Čunát
f0f251d90a
Merge #157109 : github-runner: 2.286.0 -> 2.287.1
2022-02-06 17:19:59 +01:00
Robert Hensing
189f73465b
Merge pull request #158327 from babbaj/virtio-keyboard-option
...
nixos/qemu-vm: Create option for virtio-keyboard device
2022-02-06 16:37:00 +01:00
Robert Hensing
6be11a84aa
Merge pull request #155892 from hercules-ci/nixos-etc-unit-test
...
nixos: Refactor to allow `etc` unit test
2022-02-06 16:12:25 +01:00
github-actions[bot]
9b66f3684b
Merge master into staging-next
2022-02-06 12:01:21 +00:00
Florian Klink
def482e28d
Merge pull request #150837 from abbradar/google-guest-agent
...
Move GCE config to google-guest-agent
2022-02-06 11:27:27 +01:00
Vladimír Čunát
3dfddd89c6
Merge branch 'master' into staging-next
...
Trivial conflict in pkgs/top-level/aliases.nix
2022-02-06 10:29:49 +01:00
Babbaj
56109be38b
nixos/qemu-vm: Create option for virtio-keyboard device
2022-02-06 01:55:49 -05:00
Aaron Andersen
2d055bb37a
nixos/cfssl: minor updates/cleanup
2022-02-05 18:53:35 -05:00
Aaron Andersen
67abfde611
nixos/cfssl: use systemd StateDirectory to provision the data directory
2022-02-05 18:53:28 -05:00
Emery Hemingway
e0fa89109b
nixos/yggdrasil: fix radvd example in manual
...
The Radvd "AdvDefaultLifetime" option should never be set to 0.
2022-02-05 23:20:08 +01:00
Robert Hensing
e3cfad0b9e
nixos/users: Fix type error
...
Fixes what seems to be a programming error that went undetected by
me and @pasqui23
See https://github.com/NixOS/nixpkgs/issues/158279
2022-02-05 22:38:56 +01:00
davidak
a57a774cfa
Merge pull request #157314 from onny/passwordsafe
...
gnome-passwordsafe: rename to gnome-secrets, 5.1 -> 6.1
2022-02-05 21:55:38 +01:00
Nikolay Amiantov
524aecf61e
google-compute-config: update config
2022-02-05 23:33:10 +03:00
github-actions[bot]
c86cbc2a8a
Merge master into staging-next
2022-02-05 18:01:08 +00:00
Robert Hensing
94f84acd92
Merge pull request #73106 from pasqui23/loginless2
...
nixos/users:added users.allowLoginless
2022-02-05 18:50:13 +01:00
Benjamin Hipple
1e45c20eca
Merge pull request #158238 from rnhmjoj/pr-fix-connman
...
nixos/connman: fix evaluation
2022-02-05 11:37:41 -05:00
Pasquale
07abf6942f
nixos/users:added users.allowLoginless
...
Correct the assertion logic
Fixed indentation
Better wording od allowLoginless' description
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
Better formatting
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
allowLoginless -> allowNoPasswordLogin
Clarified users.allowNoPasswordLogin's description
Clarified assertion expression
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Reworded assertion message to gude to safer alternative
2022-02-05 16:00:55 +01:00
rnhmjoj
6afcc5afc6
nixos/connman: fix evaluation
...
This was caused by 2a37dd8
that introduced strict checking of
the units names.
2022-02-05 13:51:52 +01:00
Bobby Rong
b1c093bf66
Merge pull request #158153 from witchof0x20/typo
...
nixos/networking: Typo fix
2022-02-05 20:18:19 +08:00
github-actions[bot]
9c2957b47d
Merge master into staging-next
2022-02-05 12:01:13 +00:00
Nikolay Amiantov
cb18e6cd01
nixos/docker-rootless: disable for root
2022-02-05 14:59:28 +03:00
github-actions[bot]
63e54d6343
Merge master into staging-next
2022-02-05 06:01:20 +00:00
Ellie Hermaszewska
58e445a1b5
Merge pull request #158078 from ashkitten/patch-2
...
nixos/syncplay: fix systemd service
2022-02-05 08:42:19 +08:00
github-actions[bot]
c69fbb8dc5
Merge master into staging-next
2022-02-05 00:01:49 +00:00
Michael Weiss
1c4d0f130b
Merge pull request #158027 from Synthetica9/test-sway-swaylock
...
nixosTests.sway: add swaylock test
2022-02-04 22:13:44 +01:00
piegames
5f88ffb05f
Merge pull request #158151 : matrix-conduit: 0.2.0 -> 0.3.0
2022-02-04 21:07:36 +01:00
Julius de Bruijn
57db7bcdd6
nixos/matrix-conduit: add database_backend option
2022-02-04 21:04:46 +01:00
Tom Prince
653a3e4ed0
amazon-ec2-utils: 1.2 -> 2.0
...
This also replaces the ec2-utils package, which is an older version.
2022-02-04 12:53:58 -07:00
Maximilian Bosch
6dfcf377a4
Merge pull request #157393 from LeSuisse/haproxy-2.5.1
...
haproxy: 2.3.14 -> 2.5.1
2022-02-04 20:31:08 +01:00
Jade
fe636b4805
nixos/networking: Typo fix
2022-02-04 13:55:56 -05:00
Jan Tojnar
bfd44c17cd
Merge branch 'master' into staging-next
...
; Conflicts:
; pkgs/top-level/aliases.nix
2022-02-04 19:54:59 +01:00
Maximilian Bosch
90a27b5771
Merge pull request #157247 from r-ryantm/auto-update/sudo
...
sudo: 1.9.8p2 -> 1.9.9
2022-02-04 16:05:30 +01:00
Nikolay Amiantov
2b3f77b716
nixos/udev: set firmware path in a separate modprobe.d file
...
This way we don't bloat ramdisk with the whole Linux firmware packages.
2022-02-04 17:47:32 +03:00
Jonas Heinrich
61b6ed869a
gnome-passwordsafe: rename to gnome-secrets, 5.0->6.1
2022-02-04 15:14:19 +01:00
Michele Guerini Rocco
819ee16945
Merge pull request #158085 from rnhmjoj/pr-fix-wpa3-only
...
nixos/wireless: don't attempt fallback on WPA3 only networks
2022-02-04 14:15:20 +01:00
William Carroll
e8ff81edb7
nixos/self-deploy: make systemd dependency conditional
...
As recommended in the discussion at #157883
2022-02-04 10:59:24 +01:00
rnhmjoj
3b8fa47f58
nixos/wireless: don't attempt fallback on WPA3 only networks
2022-02-04 08:46:32 +01:00
Jonathan Ringer
c6c7162876
Merge remote-tracking branch 'origin/staging-next' into staging
2022-02-03 21:34:17 -08:00
Jonathan Ringer
9a16965c75
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/awesomeversion/default.nix
pkgs/development/python-modules/md2gemini/default.nix
pkgs/development/python-modules/mill-local/default.nix
pkgs/development/python-modules/pyatv/default.nix
pkgs/development/python-modules/pyezviz/default.nix
pkgs/development/python-modules/pyinsteon/default.nix
pkgs/development/python-modules/pylitterbot/default.nix
pkgs/development/python-modules/pynuki/default.nix
pkgs/development/python-modules/pypck/default.nix
pkgs/development/python-modules/types-requests/default.nix
pkgs/top-level/aliases.nix
2022-02-03 21:29:24 -08:00
ash lea
959317df95
nixos/syncplay: fix systemd service
2022-02-03 22:59:34 -05:00
Kim Lindberger
415b9c3b5a
Merge pull request #157519 from talyz/gitlab-error-handling
...
nixos/gitlab: Implement better script error handling
2022-02-03 22:19:03 +01:00
Patrick Hilhorst
abcf236f36
nixosTests.sway: add swaylock test
2022-02-03 20:37:27 +01:00
Patrick Hilhorst
c39cc2e840
nixosTests.sway: factor out swaymsg
2022-02-03 20:37:21 +01:00
Patrick Hilhorst
aca22fb124
nixosTests.sway: format with nixpkgs-fmt
2022-02-03 20:25:05 +01:00
Pascal Bach
19763fd18e
Merge pull request #156245 from kamadorueda/nixos/virtualisation.virtualbox.guest
...
nixos/virtualisation.virtualbox.guest: remove override
2022-02-03 19:05:46 +01:00
Bobby Rong
95dab32edc
Merge pull request #157716 from bobby285271/pantheon
...
Pantheon updates 2022-02-01
2022-02-03 20:37:27 +08:00
Martin Weinelt
4a6f352305
Merge pull request #157900 from mweinelt/home-assistant
2022-02-03 13:16:36 +01:00
Markus Kowalewski
d86fef1a57
nixos/doc: add moosefs module to release notes
2022-02-03 12:33:44 +01:00
Markus Kowalewski
b74dc1a230
nixos/tests: add moosefs test
2022-02-03 12:31:36 +01:00
Markus Kowalewski
b302bda010
nixos: init moosefs module
2022-02-03 12:31:31 +01:00
William Carroll
b830507425
nixos/self-deploy: consume self-deploy's startAt attribute
...
As #157879 points-out, this attribute appears unused.
Fixes #157879
2022-02-03 12:19:47 +01:00
Jan Tojnar
7240c085d0
Merge pull request #148095 from rvl/update-ddccontrol
...
ddccontrol: 0.5.2 -> 0.6.0
2022-02-03 11:07:56 +01:00
Euan Kemp
dc5859ef7a
nixos/tests/k3s: remove stale test reference
...
https://github.com/NixOS/nixpkgs/pull/142706 renamed this test, but the
old 'k3s' one wasn't removed from all-tests.
Fix that.
2022-02-03 15:38:12 +10:00
Martin Weinelt
6267a995ec
nixos/home-assistant: drop --runner flag
...
Home Assistant now always emits exit code 100 when a restart is
requested, making this option redundant.
2022-02-03 02:17:17 +01:00
Bobby Rong
830cceb05a
Merge pull request #157892 from Patryk27/kvmgt
...
nixos/kvmgt: add myself to maintainers
2022-02-03 08:58:48 +08:00
pennae
a0a804b17d
Merge pull request #157890 from Patryk27/unifi7
...
unifi7: add package
2022-02-02 23:07:13 +00:00
ajs124
c7c159af4d
Merge pull request #153451 from Mic92/spidermonkey
...
spidermonkey_68: drop
2022-02-02 21:20:23 +01:00
Patryk Wychowaniec
30c8f7c42d
nixos/kvmgt: add myself to maintainers
...
I've got a use case and compatible hardware, so why not :-)
2022-02-02 20:48:35 +01:00
Patryk Wychowaniec
62ce6f2c9d
unifi7: add package
...
https://community.ui.com/releases/UniFi-Network-Application-7-0-20/3e4a4099-c063-42f6-8e21-5fb2c99fcea9
Since that's a release candidate, unifiLTS remains unchanged.
2022-02-02 20:42:06 +01:00
Jan Tojnar
16658b7fe9
Merge pull request #151105 from ncfavier/gio-extra-modules
...
nixos: make GIO_EXTRA_MODULES a session variable, take two
2022-02-02 19:35:58 +01:00
Jörg Thalheim
b41beef827
mediatomb: remove package
2022-02-02 18:57:09 +01:00
Lassulus
b80607af67
Merge pull request #154804 from Mic92/tests-prompt
...
nixos/tests: add prompt to shell_interact()
2022-02-02 18:50:46 +01:00
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
Nikolay Amiantov
3dc6fab5c9
nixos/stage-1: add nixos modprobe options
2022-02-02 15:18:09 +03: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]
900bded560
Merge staging-next into staging
2022-02-02 06:01:57 +00: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
Dmitry Kalinkin
3087088c41
Merge branch 'staging-next' into staging
...
Conflicts:
pkgs/top-level/aliases.nix
pkgs/top-level/python-aliases.nix
2022-02-01 21:37:39 -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]
e977885cba
Merge staging-next into staging
2022-02-01 18:05:39 +00: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
Sandro
330c63f740
Merge pull request #156342 from midchildan/fix/noto-cjk-src
2022-02-01 16:01:37 +01:00
github-actions[bot]
f636a27dac
Merge staging-next into staging
2022-02-01 12:01:45 +00:00
github-actions[bot]
809093c51c
Merge master into staging-next
2022-02-01 12:01:09 +00:00
Maximilian Bosch
f5b67f3b27
nixos/sudo: fix test for 1.9.9
...
The test failed with
> Test "test5 user should not be able to run commands under root" failed with
> error: "invalid literal for int() with base 10: ''"
since 2492da88ea
.
The reason for this is that `sudo(8)` writes the lecture to the
tty[1] and only as a fallback to stdout[2]. This means that the
`base64 --wrap 0` executed by `machine.execute()` doesn't affect the
text written to the terminal, however the lecture is part of the string
that's read from the VM via `shell.recv()`.
I confirmed the problem in an interactive test session[3]:
>>> command = "sudo -u test5 sudo -n -u root true"
>>> out_command = f"( set -euo pipefail; {command} ) | (base64 --wrap 0; echo)\n"
>>> machine.shell.send(out_command.encode())
84
>>> machine # [ 99.015512] sudo[877]: root : TTY=hvc0 ; PWD=/tmp ; USER=test5 ; COMMAND=/run/wrappers/bin/sudo -n -u root true
machine # [ 99.019373] sudo[877]: pam_unix(sudo:session): session opened for user test5(uid=1005) by (uid=0)
machine # [ 99.038692] sudo[879]: pam_unix(sudo:auth): conversation failed
machine # sudo: a password is required
machine # [ 99.041860] sudo[879]: pam_unix(sudo:auth): auth could not identify password for [test5]
machine # [ 99.046901] sudo[877]: pam_unix(sudo:session): session closed for user test5
>>>
>>> x=machine._next_newline_closed_block_from_shell()
>>> print(x)
<newline>
We trust you have received the usual lecture from the local System
Administrator. It usually boils down to these three things:
<newline>
#1 ) Respect the privacy of others.
#2 ) Think before you type.
#3 ) With great power comes great responsibility.
<newline>
<newline>
<newline>
>>>
Since the lecture isn't strictly necessary to confirm that
`security.sudo` works as expected, I decided to disable lecturing
inside the test, however we may want to fix the underlying problem in
the test-driver at some point.
[1] https://github.com/sudo-project/sudo/blob/SUDO_1_9_9/plugins/sudoers/check.c#L275-L283
[2] https://github.com/sudo-project/sudo/blob/SUDO_1_9_9/src/conversation.c#L95-L120
[3] I replaced each empty line with `<newline>` to make sure these
aren't swallowed by git.
2022-02-01 12:55:29 +01: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]
aee8ca6639
Merge staging-next into staging
2022-02-01 00:02:21 +00: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