Robert Schütz
d6234c2165
Merge branch 'master' into staging-next
2021-06-26 00:33:58 +02:00
Florian Klink
6845a74d4c
Merge pull request #128082 from flokli/sdcard-firmware-partition-offset
...
nixos/sdcard: make firmware partition offset configurable
2021-06-25 22:52:07 +02:00
Florian Klink
1db54a5522
nixos/sdcard: make firmware partition offset configurable
...
Different boards using u-boot SPL require to write to different
locations. Sometimes, the 8MiB gap isn't sufficient - rk3399 boards
write to 0x16384 for example, which is at 8MiB, thus overriding the
fat32 partition with the SPL.
2021-06-25 22:33:42 +02:00
Florian Klink
9de5cbca45
Merge pull request #128079 from flokli/serial-getty-keep-baud
...
nixos/getty: add missing --keep-baud
2021-06-25 22:31:02 +02:00
Sandro
54cccb99de
Merge pull request #127941 from liff/libwnck/3-is-default
2021-06-25 15:53:01 +02:00
github-actions[bot]
bae6b2055f
Merge master into staging-next
2021-06-25 12:06:04 +00:00
Michael Weiss
370a10c27f
Merge pull request #128055 from Synthetica9/sway-check-quit
...
nixos/tests/sway: add check that sway quits
2021-06-25 13:23:39 +02:00
Maximilian Bosch
eb5013d20d
Merge pull request #128048 from dali99/add-txredisapi-synapse
...
Add txredisapi to matrix-synapse dependencies
2021-06-25 10:40:11 +02:00
Florian Klink
7e0623fb25
Merge pull request #127824 from yu-re-ka/feature/gitlab-14-0-0
...
gitlab: 13.12.4 -> 14.0.1
2021-06-25 10:30:09 +02:00
Robert Schütz
c1dca92daf
Merge branch 'master' into staging-next
2021-06-25 10:02:10 +02:00
Florian Klink
ba42d639f1
nixos/getty: add missing --keep-baud
...
systemd ships `units/serial-getty@.service.m4` with the `--keep-baud`
option.
We override that unit, and didn't add the `--keep-baud` option. (We have
it in our other getty options there).
Having `--keep-baud` in `serial-getty@` makes a lot of sense - the
console keeps working if it's initialized with a less standard baud
rate, such as the [Helios64](https://wiki.kobol.io/helios64/intro/ ).
2021-06-25 09:56:54 +02:00
Niklas Hambüchen
c223fd6007
release notes: Mention consul breaking changes
2021-06-24 20:58:59 -07:00
Jan Tojnar
27bbb94761
Merge pull request #127085 from minijackson/xdg-desktop-portal-wlr-0.4.0-and-module
...
xdg-desktop-portal-wlr: 0.3.0 -> 0.4.0 and module
2021-06-25 03:50:44 +02:00
Niklas Hambüchen
3b392e8951
Merge pull request #128057 from nh2/nixos-manual-xkb-layouts-fixes
...
manual: Fix missing semicolon in custom keyboard layout example
2021-06-25 02:39:08 +02:00
Niklas Hambüchen
a3c29c2cee
manual: Fix missing semicolon in custom keyboard layout example
2021-06-25 02:23:55 +02:00
Patrick Hilhorst
ad1141b528
nixos/tests/sway: add check that sway quits
...
We used to check that sway quits _succesfully_.
However, since 73d7f08b4d
disabled this, we'll add another check to see it quits _at all_.
cc @primeos
2021-06-25 02:06:00 +02:00
Yureka
2297eb35e5
nixos/gitlab: require at least postgresql 12
2021-06-25 01:21:19 +02:00
Daniel Olsen
f7f52a4fbf
pythonPackages.txredisapi: Add unit test
2021-06-24 23:34:03 +02:00
Michael Weiss
73d7f08b4d
sway: 1.6 -> 1.6.1
...
Since wlroots 0.14 setting WLR_RENDERER_ALLOW_SOFTWARE=1 to allow
software rendering is now enforced [0].
[0]: https://github.com/swaywm/wlroots/pull/2810
2021-06-24 22:59:06 +02:00
Olli Helenius
8609f3fd20
libwnck: make 3.36.0 default
2021-06-24 18:04:30 +03:00
github-actions[bot]
d437a6cac2
Merge master into staging-next
2021-06-24 00:06:27 +00:00
Martin Weinelt
9cc60287dc
Merge pull request #127554 from mweinelt/babel
...
nixos/babeld: update hardening
2021-06-23 21:53:20 +02:00
github-actions[bot]
b68a0d2f5e
Merge master into staging-next
2021-06-23 18:04:30 +00:00
Ryan Mulligan
f91d7910ea
doc: cleanup documentation relating to release notes
...
Also delete empty release notes file.
2021-06-23 11:04:22 -07:00
Ryan Mulligan
920113a6e5
Merge pull request #127734 from blaggacao/da/convert-rel-notes-md-2105
...
nixos/doc: convert 21.05 release notes to CommonMark
2021-06-23 10:48:24 -07:00
David Arnold
32c2dd304d
docs: nixos release notes to CommonMark (2105)
...
docs: nixos release notes (revise code blocks)
docs: nixos release notes (fix opt links outside of code blocks)
docs: nixos release notes (fix opt links inside of code blocks)
went fishing with:
```console
rg -A1 \
--multiline \
--multiline-dotall \
'<programlisting>[^</programlisting>]+' \
| rg linkend
```
docs: nixos release notes (prettier)
docs: nixos release notes (restore admonition from prettier destriction)
docs: nixos release notes (recreate xml files)
docs: nixos release notes (fix code block indentation)
docs: nixos release notes (diff after converting with https://github.com/NixOS/nixpkgs/pull/127270 )
2021-06-23 12:33:16 -05:00
Michael Weiss
eb8a694d92
nixos/sway: Drop rxvt-unicode from the extraPackages default
...
Upstream switched to Alacritty for the default configuration.
2021-06-23 17:35:20 +02:00
github-actions[bot]
b59d049598
Merge master into staging-next
2021-06-23 12:04:25 +00:00
Sandro
1956a52857
Merge pull request #126656 from jwoudenberg/add-system76-power
2021-06-23 12:54:22 +02:00
github-actions[bot]
e8122c3628
Merge master into staging-next
2021-06-23 00:09:33 +00:00
Niklas Hambüchen
959c4e82bc
Merge pull request #100255 from nh2/sshd-default-log-level-info
...
sshd service: Default to INFO logLevel (upstream default)
2021-06-23 02:06:54 +02:00
Niklas Hambüchen
4bd5f1115f
Merge pull request #127166 from nh2/xserver-config-mkAfter-docs
...
services.xorg.config: Extend docs
2021-06-23 01:55:58 +02:00
Niklas Hambüchen
a48fea4c5e
sshd service: Default to INFO logLevel (upstream default).
...
The previous justification for using "VERBOSE" is incorrect,
because OpenSSH does use level INFO to log "which key was used
to log in" for sccessful logins, see:
6247812c76/auth.c (L323-L328)
Also update description to the wording of the sshd_config man page.
`fail2ban` needs, sshd to be "VERBOSE" to work well, thus
the `fail2ban` module sets it to "VERBOSE" if enabled.
The docs are updated accordingly.
2021-06-23 01:49:11 +02:00
Niklas Hambüchen
e85693afde
Merge pull request #127157 from nh2/xserver-readable-config-indentation
...
xserver: Generate readable config indentation
2021-06-23 01:16:50 +02:00
Martin Weinelt
b607aadaac
Merge branch 'master' into staging-next
2021-06-22 23:55:21 +02:00
Ryan Mulligan
160831a5a8
Merge pull request #127783 from rnhmjoj/sshfs-doc
...
nixos/doc: add section on sshfs file systems
2021-06-22 12:13:56 -07:00
rnhmjoj
21a5268b26
nixos/doc: add section on sshfs file systems
...
This documents how to use sshfs a bit and how to set up an automatically
mounted sshfs filesystem in NixOS. Also it closes #125905 .
2021-06-22 11:58:25 -07:00
Sandro
bb8c2116dd
Merge pull request #127599 from Ma27/bump-privacyidea
2021-06-22 18:26:45 +02:00
Ryan Mulligan
5fa785a60a
Merge pull request #127134 from blaggacao/da/convert-rel-notes-md
...
doc: convert rel notes to CommonMark
2021-06-22 08:15:26 -07:00
David Arnold
1f6969dd5e
docs: nixos release notes (w/o 2105 - separate PR)
...
docs: nixos release notes (revise code blocks)
docs: nixos release notes (fix opt links outside of code blocks)
docs: nixos release notes (fix opt links inside of code blocks)
went fishing with:
```console
rg -A1 \
--multiline \
--multiline-dotall \
'<programlisting>[^</programlisting>]+' \
| rg linkend
```
docs: nixos release notes (prettier)
docs: nixos release notes (fix zonefile codeblocks)
docs: nixos release notes (restore admonition from prettier destriction)
docs: nixos release notes (recreate xml files)
docs: nixos release notes (fix trnslation error md -> xml)
admonition with a title seem not to work
docs: nixos release notes (fix code block indentation)
docs: nixos release notes (diff after converting with https://github.com/NixOS/nixpkgs/pull/127270 )
docs: nixos release notes (fix remaingin '???')
Those where not catched i a previous iteration since they didn't satisfy
the then presumed search regex `#opt-.*`
doc: nixos release notes make docbook/md conversion consistent
2021-06-22 09:52:13 -05:00
Maximilian Bosch
5aad4e73b6
privacyIDEA: 3.5.2 -> 3.6
...
ChangeLog: https://github.com/privacyidea/privacyidea/releases/tag/v3.6
Unfortunately we have to use `sqlalchemy` at 1.3 for `sqlsoup`. As
`sqlalchemy` is required by a lot of packages, I decided to move this
package out of `pythonPackages` itself and instantiate a new
`pythonPackages` inside the expression where `sqlalchemy` points to
`sqlalchemy_1_3`.
2021-06-22 15:36:36 +02:00
github-actions[bot]
c7bb5a79c8
Merge master into staging-next
2021-06-22 12:05:00 +00:00
Jacek Galowicz
243f958b40
Merge pull request #127763 from Mic92/test-driver-shell
...
nixos/test-driver: replace termlib with socat
2021-06-22 10:32:18 +02:00
Sandro
5f44b42bf4
Merge pull request #127641 from xfix/promethus-state-permissions
2021-06-22 10:23:56 +02:00
Jörg Thalheim
48aec70ea1
nixos/test-driver: replace termlib with socat
...
telnetlib does not handle unicode, which is annoying when using systemctl.
Also this gives us a nice readline with history.
2021-06-22 09:08:57 +02:00
Linus Heckemann
203e81e4ee
Merge pull request #125281 from zhaofengli/phosh-systemd
...
phosh: 0.10.2 -> 0.11.0
2021-06-22 08:23:29 +02:00
Martin Weinelt
eef9694ebc
Merge branch 'master' into staging-next
2021-06-22 00:58:31 +02:00
Robert Hensing
59bbfdf324
Merge pull request #127628 from blaggacao/da/fix-constant-nixos-revision
...
nixosTest: Force system.nixos.revision constant
2021-06-21 20:26:30 +02:00
David Arnold
8bbdff4581
nixosTest: Force system.nixos.revision constant
...
nixos tests are blended with other system configurations, hence
their settings must be either enforced or defaulted.
This particular setting is set via lib.nixosSystem as
`system.nixos.revision = final.mkIf (self ? rev) self.rev;` which would
mean that without this change no flake generated nixos could be blended
with nixos testing.
This setting was made previously constant in
169c6b4b14
in order to avoid pointless
rebuilds of the testing VMs, but was set without enforcing it.
2021-06-21 11:08:26 -05:00
Konrad Borowski
447b1cf03d
nixos/prometheus: allow state access for service only
...
There is no reason for Prometheus state files to be
world-readable.
2021-06-21 10:16:47 +02:00