github-actions[bot]
6e3a55e059
Merge staging-next into staging
2021-03-19 18:19:40 +00:00
Frederik Rietdijk
1ecb97eae9
Merge master into staging-next
2021-03-19 18:17:01 +01:00
edef
7ea4ee71c9
Merge pull request #112822 from deviant/localtime-user-allocation
...
nixos/localtime: make localtimed a system user
2021-03-19 12:45:58 +00:00
github-actions[bot]
29278dcf45
Merge staging-next into staging
2021-03-19 12:26:59 +00:00
github-actions[bot]
c804f22a81
Merge master into staging-next
2021-03-19 12:26:52 +00:00
Sandro
24d3016208
Merge pull request #114016 from oxalica/fix/partition-manager
2021-03-19 13:02:40 +01:00
Alexander Foremny
297b1ba320
Revert "nixos/systemd: Handle template overrides"
...
This reverts commit e3b90b6ccc
2021-03-19 09:05:33 +01:00
github-actions[bot]
8c03075f07
Merge staging-next into staging
2021-03-19 00:41:08 +00:00
github-actions[bot]
d73a492e83
Merge master into staging-next
2021-03-19 00:41:01 +00:00
Niklas Hambüchen
296c47d7b2
Merge pull request #116282 from nh2/programs-turbovnc
...
turbovnc: Add programs.turbovnc, add test for headless software OpenGL
2021-03-19 01:12:33 +01:00
Jan Tojnar
2445e9a681
Merge branch 'master' into staging-next
2021-03-18 19:24:39 +01:00
markuskowa
2af233afac
Merge pull request #115839 from markuskowa/fix-slurm
...
nixos/slurm: expose to path config files
2021-03-18 14:48:28 +01:00
Jan Tojnar
0136206b12
Merge branch 'master' into staging-next
2021-03-18 13:35:59 +01:00
Jaakko Luttinen
099a9e809c
nixos/update-users-groups: read access to /etc/shadow for group shadow
2021-03-18 00:08:35 -07:00
Aaron Andersen
7cdd6238dd
Merge pull request #109711 from ymarkus/bookstack
...
bookstack: init at 0.31.7, nixos/bookstack: init
2021-03-17 20:37:03 -04:00
kat
5be8697a33
nixos/sway: further parity between extraPackages default and defaultText
...
Co-authored-by: Robert Schütz <rschuetz17@gmail.com>
2021-03-17 15:36:31 +00:00
kat witch
102137e359
nixos/sway: fixed defaultText
2021-03-17 13:49:19 +00:00
Raphael Megzari
f295110b26
prometheus-postgres-exporter: add environment file ( #116373 )
...
* prometheus-postgres-exporter: add environment file
* Update nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
Co-authored-by: WilliButz <WilliButz@users.noreply.github.com>
2021-03-17 01:36:31 +01:00
Florian Klink
68d6ffc8d5
Merge pull request #115549 from adrianparvino/new-nixos-unstable
...
systemd: Handle template overrides
2021-03-16 23:05:11 +01:00
github-actions[bot]
7302b9368b
Merge staging-next into staging
2021-03-16 18:18:36 +00:00
github-actions[bot]
e0a6159fc6
Merge master into staging-next
2021-03-16 18:18:29 +00:00
ajs124
08ebda1a17
Merge pull request #115655 from helsinki-systems/upd/nginx
...
nginxMainline: 1.19.7 -> 1.19.8
2021-03-16 16:31:55 +01:00
github-actions[bot]
1398d44bac
Merge staging-next into staging
2021-03-16 00:39:16 +00:00
github-actions[bot]
d18aaddde4
Merge master into staging-next
2021-03-16 00:39:08 +00:00
Sarah Brofeldt
bdc36a0210
Merge pull request #116387 from lf-/doc-fix
...
manual/installation: s/boot.loader.systemd/boot.loader.systemd-boot
2021-03-15 19:43:27 +01:00
jali-clarke
cc582f1f59
nixos/kubernetes: import all platforms for seeded images
...
This fixes a class of errors seen on aarch64 during coredns import where content was seen to be missing ("digest xxx not found") or "failed to get reader from content store" depending on which coredns version was being imported.
2021-03-15 09:03:40 -04:00
Jade
c6189e2f28
manual/installation: s/boot.loader.systemd/boot.loader.systemd-boot
...
The link had the wrong title.
2021-03-15 01:26:32 -07:00
github-actions[bot]
01ebd9a303
Merge staging-next into staging
2021-03-15 00:40:33 +00:00
github-actions[bot]
8fa4dca9b5
Merge master into staging-next
2021-03-15 00:40:27 +00:00
Sarah Brofeldt
8c5e702875
Merge pull request #116084 from jonringer/bump-factorio
...
factorio: 1.1.26 -> 1.1.27
2021-03-14 19:51:42 +01:00
github-actions[bot]
cc6e2d60db
Merge staging-next into staging
2021-03-14 18:17:15 +00:00
github-actions[bot]
c7b23f6440
Merge master into staging-next
2021-03-14 18:17:08 +00:00
Sandro
5caaae33fb
Merge pull request #116303 from samuelgrf/printing-related-refactors
2021-03-14 17:49:41 +01:00
Martin Weinelt
0241873f7f
Merge branch 'master' into staging-next
2021-03-14 17:35:32 +01:00
Jan Tojnar
99fe978702
Merge pull request #113881 from jtojnar/stdenv.md
...
doc: Port stdenv to Markdown
2021-03-14 15:45:49 +01:00
Samuel Gräfenstein
87f4d7a07a
nixos/printing: simplify filterGutenprint function
2021-03-14 11:59:00 +01:00
github-actions[bot]
2c7bf48e77
Merge staging-next into staging
2021-03-14 06:17:35 +00:00
github-actions[bot]
3b97019142
Merge master into staging-next
2021-03-14 06:17:28 +00:00
Lancelot SIX
85ad7501ec
nixos/tests/spike: Fix assertion
2021-03-14 00:58:50 -05:00
Niklas Hambüchen
b46f6cba79
turbovnc: Add programs.turbovnc, add test for headless software OpenGL
2021-03-14 06:27:43 +01:00
Jan Tojnar
53830ca04c
doc: Port stdenv/multiple-output to Markdown
2021-03-14 02:18:40 +01:00
Jan Tojnar
921d0269cc
doc: Port stdenv/meta to Markdown
2021-03-14 02:15:14 +01:00
Jan Tojnar
a16ce80193
Merge branch 'staging-next' into staging
2021-03-14 02:09:44 +01:00
Jan Tojnar
b19f08ec61
nixos/doc: Fix release notes syntax
2021-03-14 02:01:46 +01:00
Jan Tojnar
01a4d350c7
Merge branch 'master' into staging-next
...
Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict.
It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.
2021-03-13 19:16:43 +01:00
Doron Behar
5e367ecef9
Merge pull request #106599 from doronbehar/pkg/gnuradio/pkgs
2021-03-13 17:27:40 +00:00
Aaron Andersen
0bf8f56105
Merge pull request #115871 from aanderse/kodi-packages
...
kodi: plugins cleanup
2021-03-13 10:10:20 -05:00
Maximilian Bosch
22b61e5263
nixos/prometheus/exporters: fix eval if only openFirewall = true; is set
...
If `openFirewall = true`, but no `firewallFilter` is set, the evaluation
fails with the following error:
The option `services.prometheus.exporters.node.firewallFilter` is defined both null and
not null, in `/home/ma27/Projects/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix'
and `/home/ma27/Projects/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix'.
Originally introduced by me in #115185 . The problem is that
`mkOptionDefault` has - as its name suggests - the same priority as the
default-value of the option `firewallFilter` and thus it conflicts if
this declaration and the actual default value are set which is the case
if `firewallFilter` isn't specified somewhere else.
2021-03-13 15:21:55 +01:00
Milan
24133ead28
nixos/mautrix-telegram: substitute secrets in config file at runtime ( #112966 )
...
In the latest release of mautrix-telegram not all secrets can be set
using environment variables (see https://github.com/tulir/mautrix-telegram/issues/584 ).
This change allows these secret values to be set without ending up in
the Nix store.
2021-03-13 13:56:17 +01:00
WilliButz
3971cda05f
Merge pull request #116037 from petabyteboy/feature/jitsi-exporter
...
prometheus-jitsi-exporter: init at 0.2.18
2021-03-13 13:37:10 +01:00
