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
Vladimír Čunát
f0f251d90a
Merge #157109 : github-runner: 2.286.0 -> 2.287.1
2022-02-06 17:19:59 +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
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
github-actions[bot]
c86cbc2a8a
Merge master into staging-next
2022-02-05 18:01:08 +00:00
rnhmjoj
6afcc5afc6
nixos/connman: fix evaluation
...
This was caused by 2a37dd8
2022-02-05 13:51:52 +01: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
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
Jan Tojnar
bfd44c17cd
Merge branch 'master' into staging-next
...
; Conflicts:
; pkgs/top-level/aliases.nix
2022-02-04 19:54:59 +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
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
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
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
ajs124
c7c159af4d
Merge pull request #153451 from Mic92/spidermonkey
...
spidermonkey_68: drop
2022-02-02 21:20:23 +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
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]
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
Rodney Lorrimar
d9b8919e34
nixos/ddccontrol: Ensure that i2c_dev module is loaded
2022-02-02 11:52:57 +10: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
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
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
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]
ed5ed282df
Merge staging-next into staging
2022-01-31 18:06:44 +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
