Commit Graph

31948 Commits

Author SHA1 Message Date
github-actions[bot]
69a8c9e227
Merge master into staging-next 2023-02-18 00:02:21 +00:00
Jonas Heinrich
13ff144c70 nixos/maddy: Add option ensureAccounts 2023-02-17 17:42:27 -05:00
Lin Jian
405919c6c9 nixos/kanata: misc improvements
- simplify some descriptions
- use getExe instead of hardcoding a binary path
- remove a unneeded "lib."
2023-02-17 22:34:38 +01:00
Lin Jian
46122183b5 nixos/kanata: remove a limit that number of devices cannot be 0
Since 1.0.8, kanata can automatically detect keyboard devices if
linux-dev is not in config.
2023-02-17 22:34:38 +01:00
Lin Jian
f34917b128 nixos/kanata: do not use path activation
Since 1.2.0, kanata handles missing keyboards well:
- only one keyboard need to be present when kanata starts;
- if linux-continue-if-no-devs-found is set to yes, all keyboards can
be missing at the beginning;
- all keyboards can be (un)pluged when kanata is running.

For simplicity, linux-continue-if-no-devs-found is set to yes and
systemd patch activation is removed.
2023-02-17 22:34:38 +01:00
Artturi
efd1d7ed76
Merge pull request #97677 from ryneeverett/lockkernelmodules-docker-more 2023-02-17 23:28:32 +02:00
K900
9f987b895d
Merge pull request #216658 from K900/sensible-test-timeouts
nixos/tests: sensible test timeouts
2023-02-18 00:10:07 +03:00
github-actions[bot]
1c50878b7b
Merge master into staging-next 2023-02-17 18:01:15 +00:00
Robert Hensing
9964891440 nixos/doc: Add Developing the Test Driver 2023-02-17 18:06:02 +01:00
Robert Hensing
b72592ee04
Merge pull request #215973 from pennae/nrd-manual-structure
nixos/manual: specify manual structure in markdown
2023-02-17 18:01:23 +01:00
R-VdP
8467c63749
flashrom: use a udev uaccess tag instead of introducing a custom flashrom group
See https://wiki.archlinux.org/title/Udev#Allowing_regular_users_to_use_devices for more info about the uaccess tag. The udev-acl tag is a legacy implementation, we add it purely for backwards compatibility.
2023-02-17 15:56:51 +01:00
K900
bb935706a8
Merge pull request #216763 from K900/pipewire-0.3.66
[staging-next] pipewire: 0.3.65 -> 0.3.66
2023-02-17 16:24:25 +03:00
Sandro
4fba4ceab7
Merge pull request #215407 from aopom/onlyoffice-mergeable-execstartpre
nixos/onlyoffice: allow ExecStartPre additions
2023-02-17 13:37:39 +01:00
github-actions[bot]
72bb5faaca
Merge master into staging-next 2023-02-17 12:01:21 +00:00
Arian van Putten
98042fc6d3
Merge pull request #216357 from nikstur/systemd-repart-after-activation
nixos/systemd-repart: enable running after initrd
2023-02-17 12:56:24 +01:00
zowoq
3e081095a4 Revert "podman: remove wrapper"
This reverts commit 02f9255044.

broke rootlessport port forwarding
2023-02-17 20:26:02 +10:00
K900
218b28191a pipewire: 0.3.65 -> 0.3.66
Also enable libmysofa
2023-02-17 13:15:16 +03:00
Sandro
a366e69a12
Merge pull request #214815 from SFrijters/vim-no-x-libs
nixos/no-x-libs: add vim-full
2023-02-17 11:13:47 +01:00
pennae
122a7435fb Revert "nixos/jellyseerr: init"
This reverts commit 2ca375abdc.
2023-02-16 18:03:55 +01:00
genesis
2ca375abdc nixos/jellyseerr: init 2023-02-16 17:27:17 +01:00
K900
254426ec4b nixos/lib/testing: set default timeout for VM tests 2023-02-16 19:17:53 +03:00
K900
84434922bc nixos/tests/quake3: fix eval 2023-02-16 19:11:19 +03:00
K900
a456da3490 nixos/tests/pass-secret-service: fix eval 2023-02-16 19:11:10 +03:00
github-actions[bot]
5c852cc587
Merge master into staging-next 2023-02-16 12:01:36 +00:00
pennae
047bd73c5e nixos/wireguard: make publicKeys singleLineStrs
using readFile instead of fileContents (or using indented strings) can
leave a trailing newline that causes build errors in systemd units and
has previously caused runtime errors in wireguard scripts. use
singleLineStr to strip a trailing newline if it exists, and to fail if
more than one is present.
2023-02-16 11:56:12 +01:00
github-actions[bot]
f38c4cce4a
Merge master into staging-next 2023-02-16 06:01:07 +00:00
Artturi
7dad858aa1
Merge pull request #216385 from SuperSandro2000/ffmpeg-nox
nixos/no-x-libs: fix infinite recursion with ffmpeg
2023-02-16 02:46:25 +02:00
github-actions[bot]
bf5abe92d4
Merge master into staging-next 2023-02-15 18:01:14 +00:00
Naïm Favier
5cf311c036
nixos/unbound: make stateDir writable 2023-02-15 18:14:58 +01:00
Kim Lindberger
ad36a97de0
Merge pull request #175000 from shyim/add-opensearch
opensearch: init at 2.5.0
2023-02-15 18:11:53 +01:00
talyz
9e9007e45f
nixos/opensearch: Use DynamicUser and StateDirectory by default
...but still allow for setting `dataDir` to a custom path. This gets
rid of the use of the deprecated option PermissionsStartOnly. Also, add
the ability to customize user and group, since that could be useful
with a custom `dataDir`.
2023-02-15 16:38:24 +00:00
github-actions[bot]
1638d35583
Merge staging-next into staging 2023-02-15 12:01:56 +00:00
Vladimír Čunát
71f22e3aa6
Merge #214196: openssh: 9.1p1 -> 9.2p1 2023-02-15 11:33:13 +01:00
Peter Hoeg
7dc0f77ecf nixos/hardware: clean up "with lib;" for keyboards 2023-02-15 11:34:22 +08:00
Peter Hoeg
2a97c0d985 nixos/hardware: add support for qmk keyboards 2023-02-15 11:33:56 +08:00
github-actions[bot]
58cfebde3e
Merge staging-next into staging 2023-02-15 00:02:50 +00:00
Sandro Jäckel
9e3e928ad4
nixos/no-x-libs: fix infinite recursion with ffmpeg 2023-02-14 23:29:23 +01:00
Sandro
b2cf9511b3
Merge pull request #211547 from yater/patch-3 2023-02-14 22:32:47 +01:00
K900
0f923da38b nixos/tests/predictable-interface-names: fix eval 2023-02-14 23:09:34 +03:00
Soner Sayakci
8b84a720e8
nixos/doc: add release note for opensearch 2023-02-14 20:07:05 +00:00
Soner Sayakci
4561785dfc
nixos/tests/opensearch: init 2023-02-14 20:00:27 +00:00
Soner Sayakci
d7eb44a421
nixos/opensearch: init module 2023-02-14 20:00:27 +00:00
K900
03ce4617e8
Merge pull request #216072 from illdefined/akkoma
akkoma: 3.5.0 → 3.6.0
2023-02-14 22:43:49 +03:00
K900
0059f767b9
Merge pull request #211767 from K900/plasma-5.27
Plasma 5.27
2023-02-14 22:12:28 +03:00
Mikael Voss
507c66f5b1
pleroma-fe: Rename to akkoma-fe 2023-02-14 20:05:08 +01:00
nikstur
b1ff1e1658 nixos/systemd-repart: enable running after initrd 2023-02-14 19:42:32 +01:00
K900
2bbd450b8b
Merge pull request #210505 from notgne2/fix/systemd-initrd-allow-symlink
nixos/systemd-initrd: allow symlink into when checking for `/prepare-root`
2023-02-14 21:10:31 +03:00
Felix Bühler
b025cb11c5
Merge pull request #214996 from Stunkymonkey/optionalString-1
treewide: use optionalString
2023-02-14 19:09:46 +01:00
github-actions[bot]
f123085ae9
Merge staging-next into staging 2023-02-14 18:01:45 +00:00
K900
34f3085148
Merge pull request #201963 from zhaofengli/moonraker-2022-11-18
moonraker: unstable-2022-04-23 -> unstable-2022-11-18, nixos/moonraker: fixes
2023-02-14 21:00:44 +03:00
superherointj
e836805076
Merge pull request #215482 from moduon/k3s-test-all-versions
k3s: test all versions
2023-02-14 12:31:32 -03:00
Maximilian Bosch
3d53723112
Merge pull request #186660 from aopom/clickhouse-conf
Change clickhouse's module conf directory to permit overrides
2023-02-14 15:58:09 +01:00
Jairo Llopis
0ca947e125
k3s: dynamic detection of all k3s packages 2023-02-14 13:23:35 +00:00
github-actions[bot]
beb954d949
Merge staging-next into staging 2023-02-14 12:01:51 +00:00
Janne Heß
e918da4d48
openssh: 9.1p1 -> 9.2p1 2023-02-14 12:30:15 +01:00
K900
da6293b9b5 nixos/doc: add release note for Plasma 5.27 2023-02-14 14:15:58 +03:00
K900
8474716356 nixos/plasma5: install flatpak-kcm if needed 2023-02-14 14:15:57 +03:00
zowoq
02f9255044 podman: remove wrapper
trying to get all of the podman functionality to work with the wrapper
 is becoming more complicated with each release, it isn't sustainable

removing the wrapper does mean that using extraPackages will need to build from source

- include pkgs.zfs by default in the wrapped podman used by the module so it is cached
  - anyone using zfsUnstable will need to build from source

- remove unnecessary serviceConfig overrides

- set HELPER_BINARIES_DIR during build

- use install.bin target on linux for podman/tmpfiles
  - also installs quadlet/rootlessport in libexec

- remove unnecessary rootlessport output

- remove unnecessary substituteInPlace
2023-02-14 19:22:24 +10:00
zowoq
04b9fcca93 nixos/podman: wrap /run/wrappers for setuid shadow binaries
adding it here so it only needs to be done once
2023-02-14 19:22:24 +10:00
Felix Buehler
cdb39a86e0 treewide: use optionalString 2023-02-13 21:52:34 +01:00
github-actions[bot]
f60ea3cf39
Merge staging-next into staging 2023-02-13 18:01:55 +00:00
Vladimír Čunát
f1f9ae6a3b
Merge #214010: staging-next 2023-02-01 2023-02-13 15:42:23 +01:00
Louis Bettens
afbdf8c54d cosmoc: drop 2023-02-13 07:32:21 -05:00
Karel Kočí
116872aedd
nixos/gitlab-runner: fix shell syntax preventing build
The build fails when configFile is provided because of shellcheck
detects missing quotes here.
2023-02-13 13:20:26 +01:00
github-actions[bot]
29cdca7736
Merge staging-next into staging 2023-02-13 06:02:02 +00:00
github-actions[bot]
0d7cb3a2aa
Merge master into staging-next 2023-02-13 06:01:30 +00:00
Nick Cao
48d6418a2e
Merge pull request #215696 from fee1-dead-contrib/matrix-appservice-discord.customize-package
nixos/appservice-discord: customizable `package`
2023-02-13 09:50:52 +08:00
github-actions[bot]
8e2a123807
Merge staging-next into staging 2023-02-12 18:01:40 +00:00
github-actions[bot]
a55c80886c
Merge master into staging-next 2023-02-12 18:01:09 +00:00
Robert Schütz
7b60fce843
Merge pull request #215222 from dotlambda/nixos-imaginary-init
nixos/imaginary: init
2023-02-12 08:42:19 -08:00
pennae
bfc6975cbc nixos/manual: remove holdovers from docbook times
these files provided mainly or exclusively xml-related tooling and
support for editing the manual. since docbook is now an implementation
detail (except for still being allowed in option docs, for now) these
tools are no longer necessary, useful, or even functional.

xmlformat.conf is still used by the nixpkgs documentation, so we have to
keep it. there's no reason it can't go live with the nixpkgs docs though.
2023-02-12 14:23:38 +01:00
pennae
1229e735ac nixos-render-docs: add structural includes, use for manual
this adds support for structural includes to nixos-render-docs.
structural includes provide a way to denote the (sub)structure of the
nixos manual in the markdown source files, very similar to how we used
literal docbook blocks before, and are processed by nixos-render-docs
without involvement of xml tooling. this will ultimately allow us to
emit the nixos manual in other formats as well, e.g. html, without going
through docbook at all.

alternatives to this source layout were also considered:

a parallel structure using e.g. toml files that describe the document
tree and links to each part is possible, but much more complicated to
implement than the solution chosen here and makes it harder to follow
which files have what substructure. it also makes it much harder to
include a substructure in the middle of a file.

much the same goes for command-line arguments to the converter, only
that command-lined arguments are even harder to specify correctly and
cannot be reasonably pulled together from many places without involving
another layer of tooling. cli arguments would also mean that the manual
structure would be fixed in default.nix, which is also not ideal.
2023-02-12 13:02:42 +01:00
pennae
8b7f0e559a nixos/manual: clean up default.nix a bit
- inline copySources into single user
- remove `inherit sources` where it's not necessary
- inline generatedSources. this will go away completely soon so we may
  as well.
- inline modulesDoc into manual-combined. this too will go away soon.
- inline sources into manual-combined. this too will go away soon.
2023-02-12 11:58:20 +01:00
pennae
ef413e3eac nixos/manual: split manpages-combined from manual-combined
once we generate the entire manual-combined.xml with a single
nixos-render-docs invocation we will no longer need any options xml
files. likewise we do not need the test options xml in the manpage
build. splitting manpages-combined from manual-combined also allows
these two to run in parallel, slightly improving build times.
2023-02-12 11:56:26 +01:00
pennae
9977f99740 nixos/manual: inline man-configuration.xml
man-configuration.xml is the only manpage we build using docbook at this
time, and man-pages.xml includes just this one file. inline
man-configuration.nix into man-pages.xml so we can refer to a single
file to grab the manpage sources later rather than using find-by-suffix.
2023-02-12 11:55:10 +01:00
github-actions[bot]
23496088d9
Merge staging-next into staging 2023-02-12 06:02:09 +00:00
github-actions[bot]
db256a18b5
Merge master into staging-next 2023-02-12 06:01:33 +00:00
Vanilla
3ba3e20347
nixos/virtualisation/linode-image: Migrate to new openssh options. 2023-02-12 13:06:11 +08:00
Nick Cao
3bd8cc7a90
Merge pull request #215795 from e1mo/fix-dokuwiki-acluse
nixos/dokuwiki: remove last reference to aclUse
2023-02-12 09:06:24 +08:00
github-actions[bot]
516d7767c0
Merge staging-next into staging 2023-02-12 00:03:10 +00:00
github-actions[bot]
d5c6366a21
Merge master into staging-next 2023-02-12 00:02:30 +00:00
Nick Cao
a9335078db
Merge pull request #215740 from supermarin/patch-3
nixos/yubikey-agent: Add dependency to pcsd.service
2023-02-12 06:20:55 +08:00
github-actions[bot]
b0f16e56b0
Merge staging-next into staging 2023-02-11 18:01:50 +00:00
github-actions[bot]
15bfb025ab
Merge master into staging-next 2023-02-11 18:01:19 +00:00
Andreas Stührk
8dade1f713 nixos/envoy: add option requireValidConfig to make config validation errors non-fatal
Co-authored-by: Vincent Haupert <vincent@yaxi.tech>
2023-02-11 18:21:21 +01:00
Vincent Haupert
84220a7098 nixos/envoy: add package option 2023-02-11 18:21:21 +01:00
Vincent Haupert
3c3da8768b nixos/envoy: further service hardening 2023-02-11 18:21:21 +01:00
Vincent Haupert
a36fc1d72a nixosTests.envoy: use port 80 to test CAP_NET_BIND_SERVICE 2023-02-11 18:21:21 +01:00
Vincent Haupert
8fff553f7e nixos/envoy: sort serviceConfig entries 2023-02-11 18:21:21 +01:00
Vincent Haupert
989a1a6ef5 nixos/envoy: use lists in serviceConfig where appropriate
Using type `list` instead of `str` in `serviceConfig` entries which
accept multiple values allows easier extension of the unit
configuration.
2023-02-11 18:21:21 +01:00
Robert Schütz
efee1b5234 nixos/imaginary: init 2023-02-11 09:18:42 -08:00
Marin
785cd824a3 nixos/yubikey-agent: Add dependency to pcsd.service
Issue: after installing, running `yubikey-agent -setup` produces the
following error:
```
nixOS: Failed to connect to the YubiKey: connecting to pscs: the Smart
card resource manager is not running
```

More on this issue: https://github.com/FiloSottile/yubikey-agent/issues/137
2023-02-11 09:32:24 -05:00
Naïm Favier
86a387351a
Merge branch 'master' into nixos/hostapd 2023-02-11 14:03:56 +01:00
Moritz 'e1mo' Fromm
e8b59a1e2e
nixos/dokuwiki: remove last reference to aclUse
This was overlooked in #209299, but will throw a trace when building a
system even when the setting was not set.
2023-02-11 11:12:51 +01:00
github-actions[bot]
35f3a899ba
Merge staging-next into staging 2023-02-11 00:02:55 +00:00
github-actions[bot]
e969c56b62
Merge master into staging-next 2023-02-11 00:02:21 +00:00
Sandro
9ee0410a57
Merge pull request #214702 from Tom-Hubrecht/onlyoffice 2023-02-10 23:07:32 +01:00
Arian van Putten
5b23d0e51c
Merge pull request #214396 from nikstur/systemd-repart
systemd-repart
2023-02-10 20:03:09 +01:00
Tom Hubrecht
405984ac13 nixos/onlyoffice: Fix initial permissions for the documentserver data 2023-02-10 19:16:19 +01:00
github-actions[bot]
1c178195e0
Merge staging-next into staging 2023-02-10 18:01:57 +00:00
github-actions[bot]
42cf9b70d4
Merge master into staging-next 2023-02-10 18:01:23 +00:00
Deadbeef
e391cf368a nixos/appservice-discord: customizable package 2023-02-11 01:08:46 +08:00
Anderson Torres
e1ffcb46cd
Merge pull request #153098 from bb2020/udisks
nixos/udisks2: add mountOnMedia option
2023-02-10 13:50:57 -03:00
bb2020
61219651fe nixos/udisks2: add mountOnMedia option 2023-02-10 16:38:05 +03:00
nikstur
4700198654 nixos/systemd-repart: init 2023-02-10 14:05:44 +01:00
Vladimír Čunát
13e8ec1f2d
Merge branch 'staging-next' into staging 2023-02-10 13:46:44 +01:00
github-actions[bot]
9be52f693f
Merge master into staging-next 2023-02-10 12:01:38 +00:00
Jairo Llopis
52a153aae2
k3s: test all versions
Since https://github.com/NixOS/nixpkgs/issues/213943 got fixed, only the main k3s derivation is tested.

Here I changed the tests a bit to make them test all provided k3s derivations

@moduon MT-1718
2023-02-10 09:12:14 +00:00
1sixth
06972ea1fe nixos/nitter: add replaceReddit option 2023-02-10 09:28:17 +01:00
github-actions[bot]
f72b07e57d
Merge staging-next into staging 2023-02-10 06:01:53 +00:00
github-actions[bot]
bff8e74964
Merge master into staging-next 2023-02-10 06:01:18 +00:00
pennae
d041641b1a nixos/manual: remove md-to-db
with manual chapters no longer needing pandoc for their conversion to
xml we can get rid of this source of confusion, and its huge cache of
xml files.
2023-02-10 06:40:15 +01:00
pennae
652a283e51 nixos-render-docs: render manual chapters during manual build
render all manual chapters to docbook from scratch every time the manual
is built. nixos-render-docs is quick enough at this to not worry about
the cost (needing only about a second), and it means we can remove
md-to-db.sh in the next commit.

no changes to the rendered html manual except for replacements and smartquotes.
2023-02-10 06:40:02 +01:00
pennae
67917ac102 nixos-render-docs: rename manual docbook converter to docbook-section
we'll soon add another docbook converter that does not emit a section as
a collection of chapters, but sections or chapters on their own. this
should clarify naming a bit before there can be any confusion.
2023-02-10 06:40:02 +01:00
pennae
1c9f55ec64 nixos/manual: convert <kbd> elements to bracketed spans
since support for kbd elements was added with explicit intent in #175128
it seems like a good idea to support this in nixos-render-docs instead
of just dropping it in favor of `*F12*` etc. since it's a very rare
thing in the manual and purely presentational it makes sense to use
bracketed spans instead of a new myst role.

the html-elements.lua plugin is now somewhat misnamed, but it'll go away
very soon so we don't want to bother renaming it.
2023-02-10 06:40:01 +01:00
pennae
65d749c80b nixos/manual: inline the single footnote
this is a lot easier than adding footnote support for just the one
instance. if a use case for footnotes appears in the future (e.g. if we
wanted to render the nixpkgs manual with nixos-render-docs as well) this
decision should be reevaluated.
2023-02-10 06:40:01 +01:00
pennae
2ad93ab199 nixos/manual: remove remaining docbook tags
there's one remaining instance of literal docbook tags in the manual.
replace it with a literal (as has been done for package tags everywhere else).
2023-02-10 06:40:01 +01:00
pennae
bb34d5d6d4 nixos/manual: replace ids on blocks with inline anchors
nixos-render-docs supports inline anchors, but not ids for blocks. it
seems wise to reserve blocks for special cases that don't have other
syntax already, like admonitions.
2023-02-10 06:40:01 +01:00
pennae
2e3d9e8d74 nixos/manual: remove .unnumbered section attributes
pandoc would drop these when converting to docbook, just like it dropped
.title block classes.
2023-02-10 06:40:01 +01:00
pennae
a15d7335a5 nixos/manual: remove .title fenced divs
pandoc drops .title classes when rendering to docbook, so these are
effectively just paragraphs anyway. without support for including them
in a table of contents the complexity of parsing them in
nixos-render-docs won't be warranted.
2023-02-10 06:40:00 +01:00
pennae
8163651338 nixos/manual: fix option-declarations sections
the examples for mkPackageOption weren't terminated, leading to pretty
odd nesting of docbook (and thus html) elements. close them properly.

also turn the (likewise unclosed) fenced div containing just an anchor
id and a class that will be silently dropped to an inline anchor while
we're here. we'd have to convert it anyway later.
2023-02-10 06:40:00 +01:00
pennae
ba4bcdc5e4 nixos/manual: remove some newlines from deflists
markdown-it parses deflists slitghtly differently than pandoc does. in
these two cases pandoc would find a deflist item while markdown-it would
not, instead it'd find a lone colon and the rest of the text.
2023-02-10 06:40:00 +01:00
pennae
861ebec769 nixos/manual: don't use multi-definitions in installer chapter
pandoc renders these to multiple docbook paragraphs in a single
definition for the term, not multiple *actual* definitions for the same
term. this is most likely not what is intended here, so let's use
multiple paragraphs instead.
2023-02-10 06:40:00 +01:00
pennae
7098315342 nixos/manual: delete disabled xincludes
userconfiguration.xml hasn't existed for a while, and this comment will
interfere with processing we'll be doing shortly.
2023-02-10 06:40:00 +01:00
pennae
f1e888a53c nixos/manual: moving contributing chapter toc entry
this should be placed before the appendices, not between them. might
even have a good place in the development part, but that's a decision
for another day.
2023-02-10 06:40:00 +01:00
pennae
10f2c3cacf nixos/manual: remove sources input from manpages drv
it's not used. holdover from when manpages were written in docbook.
2023-02-10 06:40:00 +01:00
Aaron Andersen
ce81c3ab72
Merge pull request #215554 from bb2020/dlna
nixos/minidlna: minor changes
2023-02-09 21:45:59 -05:00
Nick Cao
4ba33a758f
Merge pull request #215489 from Alper-Celik/master
nixos/plasma5: use vlc phonon backend by default
2023-02-10 09:27:37 +08:00
github-actions[bot]
0417b0e54f
Merge staging-next into staging 2023-02-10 00:03:00 +00:00
github-actions[bot]
71c0c6d984
Merge master into staging-next 2023-02-10 00:02:27 +00:00
bb2020
76bf633dc2 nixos/minidlna: minor changes 2023-02-09 21:11:20 +03:00
Alvar Penning
63dd9fb5c8 nixos/ympd: Unit hardening
Next to some systemd unit hardening, the nobody user isn't used anymore,
as suggested in #55370.
2023-02-09 19:10:19 +01:00
github-actions[bot]
87e315024e
Merge staging-next into staging 2023-02-09 18:01:44 +00:00
github-actions[bot]
b5d4dad2b8
Merge master into staging-next 2023-02-09 18:01:11 +00:00
talyz
5757259eee
discourse.tests: nodes.discourse.config -> nodes.discourse 2023-02-09 17:36:42 +01:00
talyz
8fb5bab784
discourse: 2.9.0.beta14 -> 3.1.0.beta2 2023-02-09 17:36:29 +01:00
Robert Hensing
1991c40759
Merge pull request #194345 from codedownio/binary-cache
Introduce mkBinaryCache function
2023-02-09 15:25:16 +01:00
github-actions[bot]
8c32008a02
Merge staging-next into staging 2023-02-09 12:02:05 +00:00
github-actions[bot]
c76e040c19
Merge master into staging-next 2023-02-09 12:01:30 +00:00
Alper Çelik
0b74f9829f
nixos/plasma5: use vlc phonon backend by default 2023-02-09 13:53:28 +03:00
Nick Cao
6fa2bfdf4d
Merge pull request #215110 from gador/pgadmin-use-pstgresqltesthook
pgadmin4-desktopmode: init at 6.19, pgadmin4: simplify tests
2023-02-09 16:05:44 +08:00
Florian Brandes
a380674d85
pgadmin4: add option to enable desktop mode
By default, pgadmin4 uses SERVER_MODE = True. This requires
access to system directories (e.g. /var/lib/pgadmin). There is
no easy way to change this mode during runtime. One has to change
or add config files withing pgadmin's directory structure to change it
or add a system-wide config file under `/etc/pgadmin`[1].

This isn't always easy to achive or may not be possible at all. For
those usecases this implements a switch in the pgadmin4 derivation and
adds a new top-level package `pgadmin4-desktopmode`. This builds in
DESKTOP MODE and allows the usage of pgadmin4 without the nixOS module
and without access to system-wide directories.

pgadmin4 module saves the configuration to /etc/pgadmin/config_system.py
pgadmin4-desktopmode tries to read that as well. This normally fails with
a PermissionError, as the config file is owned by the user of the pgadmin module.

With the check-system-config-dir.patch this will just throw a warning
but will continue and not read the file.

If we run pgadmin4-desktopmode as root
(something one really shouldn't do), it can read the config file and fail,
because of the wrong config for desktopmode.

[1]https://www.pgadmin.org/docs/pgadmin4/latest/config_py.html

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-02-09 08:19:05 +01:00
Florian Brandes
2b63943be4 nixosTests.pgadmin4-standalone: format
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-02-09 08:06:54 +01:00
Florian Brandes
e4488f5efe pgadmin4: move package tests back into the package
We test pgadmin in nixosTests, because it needs a running postgresql instance.
This is now unnecessary since we can do so in the package itself.

This reduces the complexity of pgadmin and removes the need for the extra
nixosTests.

Also setting SERVER_MODE in `pkg/pip/setup_pip.py` does not have any effect
on the final package, so we remove it.
In NixOS, we use the module, which expects SERVER_MODE to be true (which it defaults to).
In non-NixOS installations, we will need the directory /var/lib/pgadmin and /var/log/pgadmin

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-02-09 08:06:52 +01:00
github-actions[bot]
bd14a95898
Merge staging-next into staging 2023-02-09 06:01:47 +00:00
github-actions[bot]
73fe6149d4
Merge master into staging-next 2023-02-09 06:01:10 +00:00
Nick Cao
aef8797863
Merge pull request #215345 from Izorkin/fix-coredump-id
nixos/systemd-coredump: fix group id
2023-02-09 13:52:05 +08:00
Nick Cao
e95397343c
Merge pull request #215369 from IndeedNotJames/caddy
caddy: 2.6.2 -> 2.6.3
2023-02-09 12:06:41 +08:00
IndeedNotJames
f5a06f7150
nixos/caddy: fix caddy fmt for caddy v2.6.3
The nixos module uses `caddy fmt` to *format* the generated Caddyfile.
v2.6.3 slightly altered `caddy fmt`'s behavior.

Excerpt from https://github.com/caddyserver/caddy/releases/tag/v2.6.3
> cmd: caddy fmt return code is 1 if not formatted
> cmd: fmt exit successfully after overwriting config file

Which is why the internal `Caddyfile-formatted` now uses `cp` and `caddy fmt --overwrite` instead
2023-02-09 03:36:10 +01:00
github-actions[bot]
bece38afcc
Merge staging-next into staging 2023-02-09 00:02:56 +00:00