José Romildo
d18aeb6351
nixos/xfconf: init
...
- Add a module for xfconf, the Xfce configuration storage system.
2022-06-26 14:29:01 -03:00
Erik Arvstedt
1a32663efc
treewide: rename maintainer earvstedt
-> erikarvstedt
...
The maintainer name now matches the Github username, which simplifies
maintainer notifications.
2022-06-26 19:12:18 +02:00
Lassulus
ea532fe833
Merge pull request #179168 from yayayayaka/revert-177536-hedgedoc-fix-statedirectory
2022-06-26 19:05:04 +02:00
José Romildo Malaquias
c7c3c6586c
Merge pull request #179108 from romildo/fix.thunar
...
nixos/thunar: init
2022-06-26 13:22:15 -03:00
José Romildo
bb5ec4625a
nixos/thunar: init
...
- Add a module for the thunar file manager, which depends on the xfconf dbus service, and also has a dbus service and a systemd unit.
- Renames the option services.xserver.desktopManager.xfce.thunarPlugins to programs.thunar.plugins.
2022-06-26 12:22:07 -03:00
Matthias Thym
48ee6e1663
Merge branch 'master' into update/bsp-layout-unstable-2022-06-19
2022-06-26 14:06:53 +02:00
Thiago Kenji Okada
659096dd89
nixos/fontconfig: add fonts.fontconfig.hinting.style option
2022-06-26 12:19:04 +01:00
Yaya
57617daaff
Revert "nixos/hedgedoc: Do not set StateDirectory to an absolute path"
2022-06-26 12:06:36 +02:00
Bernardo Meurer
83801da137
Merge pull request #176979 from winterqt/nginx-per-location-recommended-proxy-settings
...
nixos/nginx: allow recommended proxy settings to be enabled per location
2022-06-25 23:48:29 -07:00
Maximilian Bosch
cb009ecbc7
Merge pull request #178842 from Ma27/vrf-test-json
...
nixos/systemd-networkd-vrf: check routing tables via `ip --json`
2022-06-26 00:25:08 +02:00
piegames
aa3641fa90
Merge pull request #178838 from mweinelt/matrix-appservice-irc
...
nixos/matrix-appservice-irc: wait for postgres to start
2022-06-25 23:09:36 +02:00
Thomas Depierre
fc658c86f7
riak, nixos/riak: remove
...
Riak have been updated a lot since the version 2.2 (now 3.0.10) but
has seen no updated to the package. This is at this point
a problem forcing us to maintain old versions of erlang.
We would be happy to re accept a newer version of Riak if someone want
to spend the time to set it up.
2022-06-25 15:51:18 -04:00
Kim Lindberger
5710bac2b4
nixos/gitlab: Use Git 2.35.x to work around git bug ( #177776 )
...
Git 2.36.1 seemingly contains a commit-graph related bug which is
easily triggered through GitLab, so let's downgrade it to 2.35.x until
this issue is solved. See
https://gitlab.com/gitlab-org/gitlab/-/issues/360783#note_992870101 .
2022-06-25 21:22:53 +02:00
Thiago Kenji Okada
66e8dceabc
Merge pull request #167907 from Misterio77/argonone-module
...
nixos/argonone: init
2022-06-25 10:48:22 +01:00
Christian Burger
e2610640c4
nixos/release.nix: fixed commands in comment
...
Proposed commands to execute tests were not working anymore.
2022-06-25 11:13:24 +02:00
K900
9ce75f675e
nixos/doc: regenerate
...
Fixes whatever happened there.
2022-06-25 11:58:44 +03:00
Robert Hensing
1d43ea01da
Merge pull request #178958 from hercules-ci/fix-installer-tests
...
nixos/nixpkgs.nix: Ignore the default system in check
2022-06-25 10:48:29 +02:00
Robert Hensing
985b6812d6
nixos/nixpkgs.nix: Ignore the default system in check
...
We might want to make this more strict at some point.
2022-06-25 10:40:41 +02:00
Vladimír Čunát
24b43564ff
Merge #177318 : nixos/i18n: reduce default supportedLocales
2022-06-25 10:29:27 +02:00
Mario Rodas
9d6c025ad9
Merge pull request #176079 from aaronjheng/traefik
...
traefik: 2.6.3 -> 2.7.1
2022-06-24 21:34:05 -05:00
Gabriel Fontes
17fc78ea58
nixos/argonone: init
2022-06-24 21:20:32 -03:00
ajs124
5c39c81260
Merge pull request #176702 from Mic92/tt-rss
...
tt-rss: downgrade to php 8.0
2022-06-25 00:29:11 +02:00
Martin Weinelt
a24431e56f
Merge pull request #162808 from mweinelt/schleuder
...
schleuder: init
2022-06-24 21:38:22 +02:00
Linus Heckemann
e608c54d58
rl-2211: document schleuder addition
2022-06-24 15:30:16 -04:00
Linus Heckemann
1dabedae3e
nixos/schleuder: init module and accompanying test
...
Co-Authored-By: Martin Weinelt <hexa@darmstadt.ccc.de>
Co-Authored-By: Cole Helbling <cole.helbling@determinate.systems>
2022-06-24 15:30:16 -04:00
Sandro
5c92665484
Merge pull request #177679 from fgaz/vengi-tools/0.0.20
2022-06-24 21:27:56 +02:00
Sandro
74ea995b11
Merge pull request #174446 from jsimonetti/routedns-init
...
routedns: init at 0.1.5
2022-06-24 16:31:03 +02:00
Madoura
93b55ffb00
release-notes: move zfs update from 22.11 to 22.05
2022-06-24 03:07:06 -05:00
Maximilian Bosch
9f7b0d8f0c
nixos/systemd-networkd-vrf: check routing tables via ip --json
...
The original implementation did a simple string-comparison against the
output of `ip route`. This is problematic because
* if the details in the string-output change, the test breaks. This is
less likely with JSON because the relevant values (i.e. destination,
interface etc) aren't supposed to be changed.
* this is causing issues with formatters[1][2].
[1] #161703
[2] #154818
2022-06-24 09:58:40 +02:00
Martin Weinelt
e215af7113
nixos/tests/matrix-appservice-irc: fix typing mismatch
2022-06-24 08:52:46 +02:00
Martin Weinelt
6c1f44b3f1
nixos/matrix-appservice-irc: wait for postgres to start
...
Closes : #178692
2022-06-24 08:37:43 +02:00
Florian Klink
477964801a
Merge pull request #178632 from Madouura/dev/zfs
...
zfs: 2.1.4 -> 2.1.5
2022-06-24 11:54:17 +07:00
Lassulus
ab4af8e8a1
Merge pull request #161703 from kamadorueda/formatting-preparation
...
nixos/systemd: prepare tests for formatters
2022-06-24 00:31:12 +02:00
Lassulus
8c2e25e98e
Merge pull request #177081 from azahi/trickster
...
trickster: 0.1.10 -> 1.1.5
2022-06-23 22:24:54 +02:00
Madoura
8cfcee74b1
zfs: 2.1.4 -> 2.1.5
2022-06-23 15:04:46 -05:00
Greizgh
ac1e34f0fe
nixos/syncthing: fix services.syncthing.folders description
...
It was improperly referencing overrideDevices instead of overrideFolders.
2022-06-23 20:44:59 +02:00
Bernardo Meurer
c7eacbf87e
Merge pull request #177672 from hercules-ci/nixos-generate-config-add-nixpkgs.system
...
nixos-generate-config: Add nixpkgs.hostPlatform to hardware-configuration.nix
2022-06-23 12:18:20 -04:00
Bernardo Meurer
5332bc174a
Merge pull request #178483 from twitchyliquid64/tailscale-networkd
...
tailscale: ignore tailscale link when using networkd
2022-06-23 12:10:14 -04:00
Maximilian Bosch
046fcb0f8b
Merge pull request #178709 from Ma27/kernel-updates
...
Linux kernel updates 2022-06-23
2022-06-23 17:07:32 +02:00
Bobby Rong
045b9096ac
Merge pull request #176896 from theHedgehog0/xplr-0-19-update
...
xplr: 0.18.0 -> 0.19.0
2022-06-23 19:20:17 +08:00
Maximilian Bosch
f0e3e98377
linux_5_17: remove
2022-06-23 11:09:16 +02:00
pennae
db0dcf15c6
Merge pull request #177379 from hercules-ci/markdown-cassandra
...
nixos/cassandra: Convert option docs to markdown
2022-06-23 08:43:35 +00:00
Jan Tojnar
5d5c2ef49b
nixos/xdg.portal: avoid with statement
2022-06-22 21:26:53 +02:00
ajs124
6c189d264e
Merge pull request #177077 from Lassulus/bitlbee_cfgdir
...
nixos/bitlbee: allow writing to configDir
2022-06-22 19:27:59 +02:00
Martin Weinelt
b15badc6c9
Merge pull request #151241 from andir/hass-reload-on-config-changes
2022-06-22 17:20:43 +02:00
Martin Weinelt
d26a6e377d
nixos/tests/home-assistant: stop printing log
...
With multiple specialization changes this isn't very helpful anymore,
but no biggie since we check the log for errors anyway and the log is
not too verbose anyway.
2022-06-22 17:02:48 +02:00
Andreas Rammhold
cfbcf381c2
nixos/home-assistant: reload the daemon when configuration changed
...
Reload the service when configuration changes. This means that we don't
have a potentially slow startup for every small configuration change.
2022-06-22 16:20:11 +02:00
Robert Hensing
fa9c83ca7f
Merge pull request #174460 from hercules-ci/module-docs-Nix-driven-location-links
...
make-options-doc: Support Nix-provided declaration links
2022-06-22 15:48:46 +02:00
Robert Hensing
9d92bee00a
Merge pull request #175474 from hercules-ci/issue-148456-dockerTools-example-etc
...
dockerTools: Add example of using NixOS' etc
2022-06-22 15:43:29 +02:00
Lassulus
773cbfbd28
Merge pull request #151633 from wucke13/sd-image-experiment
...
honor `sdImage.compressImage` also in the build process
2022-06-22 14:48:21 +02:00
Lassulus
5308b5b44a
Merge pull request #178194 from spacekitteh/patch-35
...
xpra: Add the ability to perform a start-desktop
2022-06-22 14:41:15 +02:00
Naïm Favier
4af5c46faa
nixos/dhcpcd: use networking.resolvconf.package
...
Allow using the appropriate resolver implementation to set DNS entries
(typically systemd-resolved instead of openresolv).
2022-06-21 22:58:44 +02:00
Naïm Favier
953a5bd3dd
nixos/tailscale: use networking.resolvconf.package
...
Allow using the appropriate resolver implementation to set DNS entries
(typically systemd-resolved instead of openresolv).
2022-06-21 22:58:44 +02:00
Naïm Favier
458ac47a1d
nixos/wg-quick: improve usage with systemd-networkd
...
Use `networking.resolvconf.package` to allow DNS entries to be set using
the system-wide resolver implementation instead of hardcoding systemd or
openresolv.
Extend the tests by adding DNS entries and making one of the peers use
systemd-networkd (hence systemd-resolved).
Also add a few `networkd`-specific settings.
2022-06-21 22:58:44 +02:00
Naïm Favier
203696f098
nixos/resolvconf: add package
...
Expose the package that provides the system-wide `resolvconf` command
(either openresolv or systemd) to allow implementation-agnostic modules.
2022-06-21 22:58:43 +02:00
Tom
3b8a162680
tailscale: ignore tailscale link when using networkd
2022-06-21 13:23:28 -07:00
Naïm Favier
e1c1fdd8c2
nixos/networkd: add IPv6PrivacyExtensions=kernel
for default networks
...
Maybe this could go in `genericNetwork`, but I don't know if it makes
sense for bridges, bonds etc. and I don't want to break anything.
2022-06-21 17:12:01 +02:00
Naïm Favier
f8a83b4260
nixos/networkd: make default networks RequiredForOnline
when possible
...
When `systemd.network.wait-online.anyInterface` is enabled,
`RequiredForOnline` really means "sufficient for online", so enable it.
2022-06-21 17:12:01 +02:00
Robert Hensing
82da0794c2
nixos-generate-config: Make robust against missing newline
...
The substr solution assumed a newline to be present.
The new solution will not remove the newline if it goes missing in the future.
Apparently this is idiomatic perl.
Thanks pennae for the suggestion!
2022-06-21 14:37:16 +02:00
Robert Hensing
1b4f4ddb5b
release-notes: Add nixpkgs.hostPlatform changes
2022-06-21 14:22:37 +02:00
Robert Hensing
fc0971f436
nixos-generate-config: nixpkgs.system -> nixpkgs.hostPlatform
2022-06-21 14:22:36 +02:00
Robert Hensing
c9fea8c03c
nixos: Add simplified nixpkgs.{hostSystem,buildSystem}
2022-06-21 14:22:36 +02:00
Robert Hensing
a234fb2a5b
nixos-generate-config: Add nixpkgs.system to hardware-config.nix
2022-06-21 14:21:17 +02:00
Robert Hensing
fe11145ec9
nixos/cassandra: Convert option docs to markdown
2022-06-21 13:20:13 +02:00
Robert Hensing
e2c261f2c0
Merge pull request #176146 from pennae/module-docs-markdown
...
treewide: markdown option docs
2022-06-21 13:16:02 +02:00
tljuniper
84f1f79a8d
nixos/doc: test-driver: Note on skipTypeCheck with extraPythonPackages
2022-06-21 09:05:24 +02:00
Maximilian Bosch
5ab65d9cd1
nixos/prometheus-postfix-exporter: fixes for systemd integration
...
* Allow the service to read from the journal w/systemd.enable
* Ensure that the service is started after postfix.service
2022-06-20 19:30:59 +02:00
pennae
9e109ffdb5
Merge pull request #178110 from pennae/fix-networkd-gateways
...
nixos/networking: fix v4+v6 default gateways with networkd
2022-06-20 14:17:41 +00:00
Sandro
b3df41c011
Merge pull request #177913 from Yarny0/clickshare
...
{nixos/,}clickshare-csc1: remove (qt4)
2022-06-20 15:55:24 +02:00
Matthias Thym
caed3fca4b
bsp-layout: add breaking change to 22.11 release notes
2022-06-19 15:20:37 +02:00
Lassulus
eb013128da
Merge pull request #178195 from dnr/pipewire-systemwide
...
nixos/pipewire: fix wireplumber with system-wide
2022-06-19 12:42:37 +02:00
Florian Klink
8b926cad93
nixos/tests/grafana-agent: update port
...
We now don't explicitly configure a self-chosen port, but use the
default port choosen by grafana, 12345.
2022-06-19 12:23:06 +02:00
Florian Klink
5f297c164e
nixos/grafana-agent: add myself as maintainer
2022-06-19 11:50:32 +02:00
Florian Klink
b09836593e
nixos/grafana-agent: move remote write config from integrations.prometheus_remote_write to metrics.global.remote_write
...
remote_write config in integrations.prometheus_remote_write is only
applied for integrations, so static configurations won't get written
anywhere.
2022-06-19 11:50:32 +02:00
Florian Klink
e578b4d3ed
nixos/grafana-agent: drop server.{grpc,http}_listen_address,http_listen_port
...
According to https://grafana.com/docs/agent/latest/upgrade-guide/#v0240 ,
this has been deprecated/moved to -server.http.address and
-server.grpc.address (accepting ip and port) config options in v0.24.0,
and already listens on localhost and not port 80 by default.
2022-06-19 11:50:31 +02:00
Florian Klink
2cca676e69
nixos/grafana-agent: replace settings.prometheus
with settings.metrics
...
According to https://github.com/grafana/agent/pull/1540 , -prometheus.*
flages were deprecated in 0.19.0 in favor of the -metrics.*
counterparts. Same applies to `loki` being renamed to `logs`.
I'm not sure if the config file format is still supported (it could be),
but we shouldn't use deprecated configs.
2022-06-19 11:50:31 +02:00
Florian Klink
4386cb104e
Merge pull request #178200 from lopsided98/device-tree-preprocessor
...
nixos/device-tree: preprocess overlays before compiling
2022-06-19 11:13:54 +02:00
Sophie Taylor
62494281d8
xpra: fix whitespace
2022-06-19 18:26:10 +10:00
Jörg Thalheim
96b227697f
Merge pull request #177785 from Mic92/navidrome
...
nixos/navidrome: fixes missing ssl certficates
2022-06-19 07:07:41 +01:00
Jörg Thalheim
f5ca531054
Merge pull request #158602 from hercules-ci/systemd-unit-mixed-list-error
...
nixos/systemd: Custom error when mixing list/non-list defs
2022-06-19 07:05:04 +01:00
Ben Wolsieffer
754005bf48
nixos/device-tree: preprocess overlays before compiling
...
Run the device tree overlays through the preprocessor before compiling it, as
is done in the kernel. This helps make overlays easier to understand, and
improves compatibility with those found in the wild.
I found the correct command line by running the kernel build with V=1, and then
removing all the arguments related to dependency tracking.
2022-06-18 22:24:30 -04:00
Ben Wolsieffer
8e4b3323d1
nixos/device-tree: use new overlay syntax in example
...
Since dtc 1.4.7 (released in 2018), there has been a much nicer syntax for
device tree overlays. This commit converts the dtsText example to use this
syntax.
2022-06-18 22:24:30 -04:00
David Reiss
33163bd0ef
nixos/pipewire: fix wireplumber with system-wide
2022-06-18 18:46:41 -07:00
Sophie Taylor
f13c61a3b9
xpra: Add the ability to perform a start-desktop
2022-06-19 11:40:41 +10:00
Sandro
861771aac2
Merge pull request #177174 from fgaz/zeronet-conservancy/0.7.6
...
zeronet-conservancy: 0.7.5 -> 0.7.6, add nixos test
2022-06-19 01:34:44 +02:00
Francesco Gazzetta
3cfdd35ff6
zeronet-conservancy: add nixos test
2022-06-18 22:06:55 +02:00
Aaron Andersen
078a53824e
nixos/prosody: provide additional details in the user and group options description
2022-06-18 10:08:08 -04:00
Aaron Andersen
79bfd3c0d0
nixos/prosody: conditionally provision required directories with StateDirectory
2022-06-18 10:05:15 -04:00
Yarny0
bd86db1833
{nixos/,}clickshare-csc1: remove (prepare Qt4 removal)
...
Qt4 is on it's way out, according to
https://github.com/NixOS/nixpkgs/pull/174634
Barco's ClickShare driver/client requires Qt4;
an update isn't in sight anywhere.
To prepare for the removal of Qt4,
the commit at hand removes the
ClickShare package and its NixOS module.
The release notes are appended with a hint about the
removal and some alternatives that might help users
that are still in need of the driver/client functionality.
2022-06-18 11:47:08 +02:00
Martin Weinelt
86c4f203c1
Merge pull request #176475 from vlinkz/calamaresupdates
2022-06-18 10:11:06 +02:00
pennae
da28b26d64
nixos/networking: fix v4+v6 default gateways with networkd
...
fixes #178078
2022-06-18 09:33:35 +02:00
Kevin Cox
b2537dc430
Merge pull request #177561 from max-privatevoid/ipfs-dont-leak-config
...
nixos/ipfs: do not leak config to journal on startup
2022-06-17 19:37:33 -04:00
Max
2a8bf9777d
nixos/ipfs: do not leak config to journal on startup
...
The preStart script for the IPFS service will print parts of the configuration
to stdout (and therefore, the journal) when applying profiles on startup. This
may lead to unwanted disclosure of private information, such as remote pinning
service API keys. Fix by sending stdout to /dev/null.
2022-06-17 23:41:27 +02:00
Sandro
8effa309cc
Merge pull request #176379 from SuperSandro2000/network-setup
...
nixos/network-interfaces-scripted: remove network-setup unit if unused
2022-06-17 22:36:45 +02:00
Sandro
0e6db671a0
Merge pull request #178009 from bbenno/update-gollum
...
gollum: 5.2.3 -> 5.3.0
2022-06-17 21:08:57 +02:00
Maciej Krüger
fc996dab2f
Merge pull request #178039 from adamcstephens/lxc-template-docs
2022-06-17 20:37:02 +02:00
Sandro
558031dcf7
Merge pull request #178041 from vcunat/p/annoying-tests
...
nixos/tests/fcitx: disable
2022-06-17 20:20:52 +02:00
Thiago Kenji Okada
4cf04594a9
Merge pull request #172660 from NickCao/nvidia-open
...
nvidia-open: init at 515.43.04
2022-06-17 18:59:32 +01:00
Vladimír Čunát
7e2a357edb
nixos/tests/fcitx: disable
...
It never worked on 21.11 and still does not:
https://hydra.nixos.org/job/nixos/release-21.11/nixos.tests.fcitx.x86_64-linux/all
https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.fcitx.x86_64-linux/all
and it frequently makes big channels wait (same on aarch64-linux).
2022-06-17 18:16:12 +02:00
Adam Stephens
2e090e0d60
nixos/lxc-container: improve template example
2022-06-17 11:42:16 -04:00
Benno Bielmeier
be0e2db8b9
nixos/gollum: add option local-time
...
This feature was introduced in gollum v5.3.0
2022-06-17 12:50:47 +02:00
Benno Bielmeier
9434ac0963
nixos/gollum: improve description of user-icons option
2022-06-17 12:50:13 +02:00
Robert Hensing
3624bb535f
nixosTests.convos: Fix missing port variable
2022-06-17 12:24:52 +02:00
Robert Hensing
2c8bbf33fd
nixos/test-driver: Support mypy through regular mechanisms
2022-06-17 12:22:57 +02:00
Robert Hensing
152736d39e
nixosTests.acme: Fix typechecking, avoiding type reassignment
2022-06-17 11:45:19 +02:00
Jörg Thalheim
5d54641d7f
Merge pull request #177790 from superherointj/package-k3s-1.24.1+k3s1
...
k3s: 1.23.6+k3s1 -> 1.24.1+k3s1
2022-06-17 08:38:10 +01:00
talyz
858a0c3fa6
nixos/parsedmarc: Improve secret handling
...
Make secret replacement more robust and futureproof:
- Allow any attribute in `services.parsedmarc.settings` to be a
secret if set to `{ _secret = "/path/to/secret"; }`.
- Hash secret file paths before using them as a placeholders in the
config file to minimize the risk of conflicting file paths being
replaced instead.
2022-06-16 13:58:20 +02:00
Lily Foster
b5818b7a30
nixos/pipewire: only add pipewire-pulse.conf conditionally
2022-06-15 15:05:44 -07:00
Lily Foster
1e3747b98b
nixos/pipewire: add pkgs.pulseaudio to pipewire-pulse user unit path
2022-06-15 15:05:44 -07:00
superherointj
a6a0c44760
k3s: remove docker support
2022-06-15 16:40:29 -03:00
Jörg Thalheim
c772b13ee7
nixos/navidrome: fixes missing ssl certficates
2022-06-15 20:40:07 +02:00
talyz
32e057881a
nixos/parsedmarc: Remove kafka support
...
It's broken (see https://github.com/domainaware/parsedmarc/issues/243 )
and providing settings for it is therefore misleading.
2022-06-15 20:15:09 +02:00
talyz
6686a3115c
nixos/parsedmarc: Fix compatibility with recent versions of grafana
2022-06-15 20:15:03 +02:00
talyz
4dddca8240
nixos/geoipupdate: Improve secret handling
...
Make secret replacement more robust and futureproof:
- Allow any attribute in `services.geoipupdate.settings` to be a
secret if set to `{ _secret = "/path/to/secret"; }`.
- Hash the license key path before using it as a placeholder in the
config file to minimize the risk of conflicting file paths being
replaced instead.
2022-06-15 20:14:57 +02:00
talyz
23c15323ce
nixos/geoipupdate: Add error handling to scripts
2022-06-15 17:18:50 +02:00
Jonas Chevalier
9c587c51ac
Merge pull request #177743 from zimbatm/grafana-agent-module
...
nixos: add grafana-agent module
2022-06-15 16:22:54 +02:00
Bobby Rong
284ccb5f4d
Merge pull request #177111 from samuela/upkeep-bot/vscodium-1.68.0-1654822313
...
vscodium: 1.67.2 -> 1.68.0
2022-06-15 22:13:41 +08:00
Bobby Rong
fe1f4564af
nixos/tests/vscodium: skip type check for now
2022-06-15 22:01:04 +08:00
Silvan Mosberger
8f8db59c0e
Merge pull request #163617 from hercules-ci/lib-types-deferredModule
...
lib.types: Add deferredModule
2022-06-15 13:23:43 +02:00
zimbatm
31b47913f3
nixos: add grafana-agent module
...
Easily ship logs and metrics to Grafana Cloud and other similar targets.
2022-06-15 12:59:06 +02:00
Bobby Rong
6d1779c567
Merge pull request #175620 from bobby285271/nixos-pantheon
...
nixos/pantheon: make it possible to remove core packages
2022-06-15 18:49:37 +08:00
Lassulus
a632afba6d
Merge pull request #177536 from yayayayaka/hedgedoc-fix-statedirectory
...
nixos/hedgedoc: Do not set StateDirectory to an absolute path
2022-06-15 11:25:04 +02:00
M. A
becff58579
nixos/hedgedoc: Do not set StateDirectory to an absolute path
...
Commit 8109d8a
set the `StateDirectory=` option of the systemd service
configuration to the value of `cfg.workDir` which is wrong, according
to dasJ [1]. This commit resolves this issue by stripping the
`/var/lib/` prefix from `cfg.workDir`.
[1] https://github.com/NixOS/nixpkgs/pull/172824#issuecomment-1130350412
2022-06-15 08:58:52 +00:00
Andreas
c028f5569b
kcheckpass is gone(?)
2022-06-15 14:53:40 +08:00
Jeroen Simonetti
829167bd27
nixos/routedns: init
...
Signed-off-by: Jeroen Simonetti <jeroen@simonetti.nl>
2022-06-15 08:33:46 +02:00
Sandro
f7251ca210
Merge pull request #168505 from brhoades/brhoades/ngrok-bump-v3
...
ngrok: 2.3.40 -> 3.0.4
2022-06-15 01:30:17 +02:00
Niklas Hambüchen
0652ef9a64
Merge pull request #176903 from nh2/vaultwarden-service-better-example
...
nixos/vaultwarden: Make example more detailed.
2022-06-15 01:21:40 +02:00
Robert Hensing
cee66a8cd5
make-options-doc: Support Nix-provided declaration links
...
Previously, the location logic was hardcoded, supporting only
Nixpkgs and NixOps properly, leaving other uses of the module
system without good location support.
2022-06-15 00:45:05 +02:00
Robert Hensing
d9dccae07c
nixos/doc: Hold off on NixOps 2 info until released
2022-06-14 23:23:41 +02:00
Robert Hensing
dfd98a5da2
lib.deferredModule: Make it properly singular
2022-06-14 23:01:27 +02:00
Robert Hensing
4746f6d03e
lib.types: Add deferredModule
2022-06-14 23:01:23 +02:00
Francesco Gazzetta
5e52fdf6f6
vengi-tools: 0.0.18 -> 0.0.20
2022-06-14 22:23:50 +02:00
Azat Bahawi
82497b0e9f
trickster: 0.1.10 -> 1.1.5
2022-06-14 01:51:45 +03:00
Robert Hensing
5f2eb57725
Merge pull request #177461 from leungbk/mypy-terminal-emulator
...
tests/terminal-emulators: comply with mypy typecheck
2022-06-14 00:34:16 +02:00
Billy J Rhoades II
8e97f29c01
ngrok: 2.3.40 -> 3.0.4
...
ngrok 3 was released this morning. Changelog from v2 is here:
https://ngrok.com/docs/ngrok-agent/changelog
And a detailed upgrade guide is here:
https://ngrok.com/docs/guides/upgrade-v2-v3
Notably, arguments must now be double hyphens: `--token`. Previously,
single hyphens were accepted but those invocations will now error.
2022-06-13 14:53:58 -07:00
Pascal Bach
0d27868e91
Merge pull request #144082 from jojosch/jellyfin-10.8.0
...
jellyfin{,-web}: 10.7.7 -> 10.8.0
2022-06-13 23:35:36 +02:00
Johannes Schleifenbaum
b1ff292b1a
nixos/tests/jellyfin: fix type errors in test script
...
Co-authored-by: Minijackson <minijackson@riseup.net>
2022-06-13 21:58:48 +02:00
Max
664dab9574
nixos/tests/ipfs: Simplify FUSE test
...
Co-authored-by: Luflosi <Luflosi@users.noreply.github.com>
2022-06-13 21:01:32 +02:00
Brian Leung
b8df14aec0
tests/terminal-emulators: comply with mypy typecheck
...
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2022-06-13 07:53:43 -07:00
Aaron Jheng
c3c876462b
traefik: 2.6.3 -> 2.7.1
2022-06-13 14:30:08 +00:00
Léo Gaspard
02cd48717d
nixos/openldap: fix systemd rejecting notification ( #177084 )
...
On one of the two machines I have running openldap, openldap failed to start due to a "timeout". Increasing the allowed startup delay didn't help.
I noticed the following in logs:
```
openldap.service: Got notification message from PID 5224, but reception only permitted for main PID 5223
```
It turns out that on this machine at least, openldap apparently sends the notification from a non-main process, which means that we need this NotifyAccess setting for systemd to record that it successfully started. Without it, after 30 seconds systemd kills the process because it didn't receive the sd_notify call.
Somehow the other machine I have on nixos running ldap works fine even without this, but I could not figure out what changes the behavior.
Given that AFAIU NotifyAccess still restricts to "from the cgroup of the service", I think this change should be safe.
2022-06-13 15:28:12 +02:00
Matthieu Coudron
a1ad235743
vimUtils: deprecate configure.pathogen ( #154814 )
...
pathogen does not bring any value compared to vim native packages so
remove it to ease maintainance burden.
2022-06-13 15:25:46 +02:00
Maximilian Bosch
7f9a78e197
Merge pull request #175330 from jtojnar/grafana-uid
...
nixos/grafana: Allow setting UID for datasource
2022-06-13 07:01:19 +02:00
Maximilian Bosch
5203011e4e
Merge pull request #177430 from Ma27/fix-wireguard-exporter
...
nixos/prometheus-wireguard-exporter: fix broken options
2022-06-13 06:14:30 +02:00
Aaron Andersen
37b6b161e5
Merge pull request #177321 from rnhmjoj/pr-fix-mpd
...
mpd: fix socket activation
2022-06-12 22:26:53 -04:00
Dominique Martinet
f878c8994f
logrotate: do not add mail if 'mail = false' is specified
...
Reported-by: Ricardo M. Correia <rcorreia@wizy.org>
2022-06-13 08:57:49 +09:00
Winter
6c53004840
nixos/nginx: allow recommended proxy settings to be enabled per location
2022-06-12 19:52:35 -04:00
Mario Rodas
cc73dc83b3
Revert "nixos/security/wrappers: use an assertion for the existence check"
2022-06-12 15:38:05 -05:00
Maximilian Bosch
e03d41fb6b
nixos/prometheus-wireguard-exporter: fix broken options
...
This is apparently a breaking change in a patch-level release[1] where
it's now necessary to specify values for each CLI argument.
[1] https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.6.1
2022-06-12 20:27:25 +02:00
Maximilian Bosch
6717faa02c
Merge pull request #177216 from amarshall/linux-kernel-updates
...
Linux kernel updates 2022-06-10
2022-06-12 19:52:57 +02:00
Michele Guerini Rocco
2b6c834377
Merge pull request #177336 from ncfavier/wrappers-source-check
...
nixos/security/wrappers: use an assertion for the existence check
2022-06-12 18:07:40 +02:00
Maximilian Bosch
fd2a89b983
nixos/wpa_supplicant: don't log that wpa_supplicant.conf is ignored with allowAuxiliaryImperativeNetworks = true
...
The warning is wrong with `allowAuxiliaryImperativeNetworks`[1] being
set to `true` because both files are included in this case with `-c` and
`-I`.
[1] https://nixos.org/manual/nixos/stable/options.html#opt-networking.wireless.allowAuxiliaryImperativeNetworks
2022-06-12 17:07:36 +02:00
K900
a5f11a6938
nixos/tests/plasma5: also test excludePackages works as expected
2022-06-12 17:48:09 +03:00
K900
6350d8d9b3
nixos/plasma5: add excludePackages option
...
This is a pretty straightforward port of #151005 .
More things can probably be made optional, I've only added ones
that I'm confident in.
2022-06-12 14:39:59 +03:00
pennae
320aa2a791
treewide: attempt at markdown option docs
2022-06-12 12:44:38 +02:00
Florian Klink
f9b0f5d09c
Merge pull request #177048 from NixOS/packages-systemd
...
nixos/systemd: use cfg.package in systemPackages to avoid confusion
2022-06-12 10:20:51 +02:00
Florian Klink
2b9be3117e
Merge pull request #177010 from flokli/make-kexec
...
nixos/modules/installer/kexec/kexec-boot.nix: move into nixos/lib, expose `kexec` nixos/release.nix
2022-06-12 10:07:35 +02:00
Bobby Rong
2375fac93d
nixos/pantheon: treat evince and file-roller as optional app
2022-06-12 13:12:15 +08:00
Bobby Rong
860781d909
nixos/pantheon: allow disabling pantheon-agent-geoclue2
2022-06-12 13:11:58 +08:00
Timothy DeHerrera
ec4e23d4e9
Merge pull request #171155 from cab404/wg-quick-files
...
nixos/wg-quick: added support for configuration files
2022-06-11 22:00:45 -07:00
Bobby Rong
1097e3e80c
nixos/pantheon: make it possible to remove core packages
2022-06-12 11:39:05 +08:00
Bobby Rong
c1559a07fe
nixos/pantheon: switch to xdg.icons.enable
2022-06-12 11:39:04 +08:00
Bobby Rong
9ca889d0fb
nixos/pantheon: switch to xdg.mime.enable
2022-06-12 11:39:01 +08:00
ckie
4af74fa1fb
Merge pull request #173937 from KFearsoff/openvpn3-master
...
openvpn3: refactor the build
2022-06-12 02:46:08 +03:00
Sandro Jäckel
515b36c093
nixos/i18n: don't build all supportedLocales by default
2022-06-11 23:29:29 +02:00
Naïm Favier
39a56c7696
nixos/security/wrappers: use an assertion for the existence check
...
A simpler implementation of 7d8b303e3f
that uses an assertion instead of a derivation.
`pathHasContext` seems a bit better than `hasPrefix storeDir` because it
avoids a string comparison, and catches nonsense like
`"foo${pkgs.hello}bar"`.
2022-06-11 23:22:03 +02:00
Robert Hensing
89690dcb46
Merge pull request #177278 from rnhmjoj/pr-fix-wait-port
...
nixos/tests: fix type mismatch in wait_for_open_port
2022-06-11 22:56:52 +02:00
KFears
49834aef6c
nixos/openvpn3: add enable option
2022-06-12 01:19:51 +05:00
Jan Tojnar
c397df20d1
Merge pull request #151005 from rhoriguchi/gnome
...
nixos/gnome: make it possible to remove core packages
2022-06-11 21:40:35 +02:00
rnhmjoj
7149c5cb60
mpd: fix socket activation
...
Apparently since systemd v250 a `ListenStream` in an override file won't
override the unit, but will be appended to a list of socket addresses.
The socket unit fails if two or more addresses have the same port,
probably because two systemd processes try to listen to it at once.
The solution is to add an empty `ListenStream=` to reset all previous
definitions.
Fix #175478 .
2022-06-11 20:56:19 +02:00
Rick van Schijndel
5bc0350e7c
Merge pull request #177256 from rnhmjoj/pr-picom
...
nixos/picom: remove deprecated refreshRate option
2022-06-11 20:09:28 +02:00
Sandro
d06755d422
Merge pull request #165780 from OPNA2608/init/haguichi
...
haguichi: init at 1.4.5
2022-06-11 19:02:06 +02:00
Guillaume Girol
419e07c382
Merge pull request #174218 from NickCao/fcitx5-qt6
...
fcitx5-qt: add support for qt6 applications
2022-06-11 16:20:20 +00:00
rnhmjoj
5803706662
nixos/tests: fix type mismatch in wait_for_open_port
...
Fix some fallout from de3e423
(PR #171280 ).
2022-06-11 14:22:53 +02:00
Soham Sen
feff6ddbe7
expressvpn: init at 3.25.0.13
2022-06-11 17:10:33 +05:30
rnhmjoj
26526f02ad
nixos/picom: remove deprecated refreshRate option
...
Fix #175765
2022-06-11 08:59:20 +02:00
Andrew Marshall
a2c6e4372a
linux/hardened/patches/5.18: init at 5.18.3-hardened1
2022-06-10 17:22:33 -04:00
Robert Hensing
9970c0b874
Merge pull request #174470 from hercules-ci/module-docs-visibility-override
...
make-options-doc: Allow transformOptions to override visibility
2022-06-10 14:27:58 +02:00
piegames
4ebc288038
Merge #172819 : nixos: move matrix services into their category
2022-06-10 10:54:18 +02:00
Elis Hirwing
7afff45088
Merge pull request #174555 from etu/php-drop-php74
...
php: Drop PHP 7.4
2022-06-10 10:43:31 +02:00
Martin Weinelt
7b3e907a6f
Merge pull request #176561 from K900/pipewire-create-home
2022-06-10 09:25:41 +02:00
zowoq
f063970e50
nixos/podman: add user socket/service
2022-06-10 07:21:56 +10:00
Sandro Jäckel
3df045e6d5
nixos/systemd: use cfg.package in systemPackages to avoid confusion
2022-06-09 22:44:28 +02:00
lassulus
a12e525410
nixos/bitlbee: allow writing to configDir
2022-06-09 21:05:16 +02:00
Florian Klink
06aa64684c
nixos/doc: document how to use kexecTree
...
This documents how to build kexec artifacts.
2022-06-09 20:08:34 +02:00
Florian Klink
cdaaf95e20
nixos/release.nix: expose a kexec.$system
attribute
2022-06-09 20:00:26 +02:00
Florian Klink
50648f568d
nixos/…/kexec-boot.nix: move into netboot.nix, rename to kexecTree
...
`nixos/modules/installer/kexec/kexec-boot.nix` doesn't contain any
custom NixOS config, other than importing `netboot-minimal.nix` (which
imports `netboot-base.nix`, which imports `netboot.nix`.
`netboot.nix` really is just describing a self-contained system config,
running entirely off kernel and initrd, so we might as well move the
kexec script generation there as well.
`netboot.nix` already contains some `system.build` attributes.
Provide a `system.build.kexecTree` attribute (and `kexecScript` for
composability).
2022-06-09 19:59:03 +02:00
Domen Kožar
f38fd46992
cachix-agent: set USER to please cachix
2022-06-09 17:07:28 +01:00
Jan Tojnar
c60d526995
Merge pull request #176881 from jian-lin/fix-nixos/ibus-gnome-autostart
...
nixos/ibus: don't use xdg autostart for Gnome
2022-06-09 14:59:05 +02:00
Ryan Horiguchi
42ceb20d29
nixos/gnome: make it possible to remove core packages
...
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
2022-06-09 13:09:55 +02:00
Jan Tojnar
ca23e42105
nixos/gnome: Move sessionPath to core-shell group
...
This will allow people to disable these packages.
2022-06-09 13:04:20 +02:00
Jan Tojnar
016b99dce6
nixos/gnome: drop hicolor-icon-theme
...
It is already installed by xdg.icons.enable.
Let’s also enable that option explicitly to prevent users from accidentally
disabling it since GNOME will be severely broken without it.
2022-06-09 13:04:20 +02:00
Jan Tojnar
7f0ce26bbd
nixos/xdg/icons: Install hicolor-icon-theme
...
While the package contains no icons, it includes an `index.theme` file
describing directories where toolkits should look for icons installed by apps.
2022-06-09 13:04:20 +02:00
Jan Tojnar
aad39fe41a
nixos/gnome: drop shared-mime-info
...
It is already installed by xdg.mime.enable.
Let’s also enable that option explicitly to prevent users from accidentally
disabling it since GNOME will be severely broken without it.
2022-06-09 13:04:19 +02:00
Rick van Schijndel
05eb6570c0
Merge pull request #176801 from K900/upd8n
...
n8n: update, fix tests
2022-06-09 07:49:37 +02:00
K900
c54c71b4ec
n8n: fix test
2022-06-09 08:19:42 +03:00
Julien Moutinho
9d69ea4b7f
nixos/sourcehut: improve testing
2022-06-08 19:46:04 -04:00
Julien Moutinho
17c6f62503
nixos/sourcehut: some settings became mandatory upstream
2022-06-08 19:46:04 -04:00
Julien Moutinho
f34d654860
nixos/sourcehut: increase RestartSec to better avoid degraded states
2022-06-08 19:46:04 -04:00
Julien Moutinho
cd6808ba9f
sourcehut: fix Unix socket support for Redis
2022-06-08 19:46:04 -04:00
Julien Moutinho
43b5dcd60c
nixos/sourcehut: remove forgotten unused files
2022-06-08 19:46:04 -04:00
Julien Moutinho
876f3a8bf0
sourcehut.todosrht: 0.67.2 -> 0.71.0
2022-06-08 19:46:04 -04:00
Julien Moutinho
bcb91bbeb7
sourcehut.metasrht: 0.57.5 -> 0.58.8
2022-06-08 19:46:04 -04:00
Julien Moutinho
59d8439966
sourcehut.listssrht: 0.51.7 -> 0.51.9
2022-06-08 19:46:04 -04:00
Julien Moutinho
658d8f1240
sourcehut.hgsrht: 0.29.4 -> 0.31.2
2022-06-08 19:46:04 -04:00
Julien Moutinho
b57ed0fa1d
sourcehut.gitsrht: 0.77.3 -> 0.78.18
2022-06-08 19:46:04 -04:00
Julien Moutinho
43f856ab2c
sourcehut.buildsrht: 0.75.2 -> 0.79.1
2022-06-08 19:46:04 -04:00
Eelco Dolstra
0e51dce778
nix-fallback-paths.nix: Update to 2.9.1
2022-06-09 09:00:27 +10:00
Sandro
acbfbd0d86
nixos/kdeconnect: remove alias from default package
2022-06-08 23:11:44 +02:00
linj
cdfd2b9f57
nixos/ibus: don't use xdg autostart for Gnome
...
Gnome uses systemd to start ibus.
2022-06-08 18:37:42 +02:00
Elis Hirwing
e91811bbe1
php74: Drop PHP 7.4 and add aliases throwing an error
2022-06-08 18:11:55 +02:00
Elis Hirwing
da19e4ae97
nixos/snipe-it: Upgrade to PHP 8.1
...
They state that they support PHP 8.1:
https://snipe-it.readme.io/docs/requirements
2022-06-08 18:09:15 +02:00
Elis Hirwing
d7f000b98b
nixos/moodle: Upgrade to PHP 8.1
2022-06-08 18:09:11 +02:00
Elis Hirwing
d0862b0ed9
nixos/nextcloud: Upgrade to PHP 8.0
2022-06-08 18:09:07 +02:00
Elis Hirwing
a69ba21a29
nixos/invoiceplan: Upgrade to PHP 8.1
...
They seem to be working to get PHP 8.1 support:
https://github.com/InvoicePlane/InvoicePlane/issues/798
2022-06-08 18:09:03 +02:00
Elis Hirwing
f822b894c5
nixos/dokuwiki: Upgrade to PHP 8.1
...
They seem to run tests against 8.1 since this commit:
7aee97ee81
2022-06-08 18:08:59 +02:00
Elis Hirwing
c53c34ee72
nixos/postfixadmin: Upgrade to PHP 8.1
2022-06-08 18:08:56 +02:00
Elis Hirwing
4580a63bc4
nixos/grocy: Upgrade to PHP 8.0
2022-06-08 18:08:52 +02:00
Bernardo Meurer
1430c4b0ed
Merge pull request #176904 from alyssais/localtime
...
nixos/localtime: add missing mkRenamedOptionModule
2022-06-08 11:53:50 -04:00
Janne Heß
4a77546116
Merge pull request #175655 from AmineChikhaoui/ec2-amis-22.05
...
ec2-amis: add release 22.05
2022-06-08 17:39:36 +02:00
Niklas Hambüchen
5683c6e03b
nixos/vaultwarden: Make example more detailed.
...
It took me a while to figure out how to correctly setup
vaultwarden on NixOS.
I hope that this more detailed example will help others.
2022-06-08 17:03:53 +02:00
Alyssa Ross
c0b05f106f
nixos/localtime: add missing mkRenamedOptionModule
...
Fixes: ffae8569b0
("nixos/localtimed: hopefully fix geoclue")
2022-06-08 13:46:26 +00:00
Mr Hedgehog
276699cdac
xplr: 0.18.0 -> 0.19.0
2022-06-08 08:48:29 -04:00
linj
34b85dfb85
nixos/ibus: fix services.dbus.package
2022-06-08 14:37:59 +02:00
Martin Weinelt
e0169d7a9d
Merge pull request #176558 from Artturin/bumpnofileinfinity
2022-06-08 12:03:01 +02:00
Sandro
be96e24124
Merge pull request #163226 from lodi/persistent-evdev
...
persistent-evdev: init at unstable-2022-01-14
2022-06-07 23:46:13 +02:00
Ben Siraphob
033da0465f
Merge pull request #176418 from Yureien/init/dragonflydb
...
dragonflydb: init at 0.1.0
2022-06-07 14:02:26 -07:00
Erik Arvstedt
64589bcefa
nixos/netboot: use makeInitrdNG
to shrink ramdisk size
...
Previously, `makeInitrd` added the whole closure of the squashfs
derivation to initrd.
This closure contains the squashfs.img and some store paths which are
still referenced by the compressed squashfs.img.
These extra store paths are unused in stage 1.
With `makeInitrdNG` only the squashfs.img is added to the initrd.
(`makeInitrdNG` only resolves shared library references instead of the
whole closure).
This shrinks the netboot ramdisk by ~6% for a minimal system and
significantly decreases the size of the uncompressed root filesystem
in stage 1.
2022-06-07 22:34:30 +02:00
lodi
3f1ec25f90
persistent-evdev: init at unstable-2022-01-14
2022-06-07 13:20:52 -04:00
Sandro
2d399082aa
Merge pull request #176723 from SuperSandro2000/runCommandNoCC
...
treewide: remove usage of runCommandNoCC aliases
2022-06-07 19:03:22 +02:00
Sandro Jäckel
43d4ddf28e
treewide: remove usage of runCommandNoCC aliases
2022-06-07 16:57:06 +02:00
Daniel Poelzleithner
e78c2d05da
hedgedoc: ensure upload directory exists
...
Upload directory is not created when uploading, but will fail silently.
Ensure the upload directory is created.
2022-06-07 09:06:56 -05:00
Jörg Thalheim
70b31373b4
tt-rss: downgrade to php 8.0
2022-06-07 14:24:07 +02:00
happysalada
f5ef819e24
mimir: switch pname to mimir
2022-06-07 06:53:15 -04:00
cab
8de1e9e2f8
nixos/wg-quick: added support for configuration files
2022-06-07 01:28:50 +04:00
Martin Weinelt
b981c4217f
Merge pull request #176626 from winterqt/bump-radarr
...
radarr: 4.0.5.5981 -> 4.1.0.6175
2022-06-06 23:12:26 +02:00
Winter
c08942e1ad
nixos/tests/radarr: fix type of argument in test script
2022-06-06 16:39:55 -04:00
Leona Maroni
0eaa72390b
maintainers: rename to leona
2022-06-06 22:20:31 +02:00
Rick van Schijndel
3037752d1d
Merge pull request #175961 from helsinki-systems/rem/broken
...
remove some packages marked broken for over 1.5 years
2022-06-06 20:44:39 +02:00
Sebastien Bourdeauducq
6cecab9cd8
hydra: create runcommand-logs directory
2022-06-06 11:36:58 -07:00
Artturin
c8f5b17a98
nixos/nix-daemon: set LimitNOFILE to 1048576
...
fixes 'too many open files'
2022-06-06 21:16:47 +03:00
Robert Hensing
03bcd6fd64
nixos/release.nix: Add nixos.tests.allDrivers
2022-06-06 19:25:04 +02:00
Robert Hensing
51224f522f
nixosTests.allDrivers: Move logic to all-packages.nix
...
Bring it in line with release.nix
2022-06-06 19:24:30 +02:00
K900
955d1a6dde
pipewire: create home directory for the pipewire user when running systemwide
...
wireplumber wants to store state there
2022-06-06 18:06:38 +03:00
Martin Weinelt
6edccf1278
Merge pull request #176541 from mweinelt/firefox-test-typing
2022-06-06 14:50:53 +02:00
Sandro
d8fad83d2c
Merge pull request #176133 from SuperSandro2000/asf-2
2022-06-06 14:34:44 +02:00
Sandro
2cdcb50406
Merge pull request #176049 from LunNova/lunnova/memtest-update
...
memtest86+: 5.01-coreboot-002 -> 6.00-beta2
2022-06-06 14:29:51 +02:00
Guillaume Girol
fd3fc309f4
nixos/doc: explain how to run appimages
2022-06-06 12:00:00 +00:00
Martin Weinelt
0be108df2e
nixos/tests/firefox: fix return type typing
2022-06-06 13:29:09 +02:00
Nguyễn Gia Phong
22f3d4e4db
nixos: move matrix services into their category
2022-06-06 13:50:58 +09:00