Commit Graph

25695 Commits

Author SHA1 Message Date
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
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
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