stuebinm
164f8c9457
nixos/nextcloud: deduplicate file reading
...
This combines the two functions nix_read_pwd and nix_read_secrets into a
single function nix_read_file, which takes two arguments: the file to be
read, and an error message that should be printed if reading the file
failed.
2021-08-01 20:39:29 +02:00
stuebinm
83a669a0be
nixos/nextcloud: better json typechecking
...
this now uses the pkgs.formats.json instead of the builtin function to
serialise json, which comes with a type signature that we can pass to mkOptions
2021-03-31 14:56:14 +02:00
stuebinm
727bdd736c
nixos/nextcloud: use array_merge instead of array_push
...
This should correctly merge the various configs (via nix module options,
the secretFile option, and the extraOptions option).
2021-03-31 14:52:45 +02:00
stuebinm
fb389cb0db
nixos/nextcloud: add test for declaratively defined redis
...
This is based on the test using redis and postgresql, but it does not
require any imperative configuration after startup; everything is defined
via Nix instead.
2021-03-30 20:09:29 +02:00
stuebinm
4ca2f27a60
nixos/nextcloud: allow more declarative config
...
This adds two options to the nextcloud module, with the aim of allowing
the entirety of `config.php` to be set declaratively:
1. `services.nextcloud.extraOptions`, which takes free-form options
given as an attribute set, and reads them in via json from the php
side (which lets us prevent syntax errors in php, if not key errors –
given the full length of nextcloud's potential options, I don't think
specifying them all via Nix is a viable option)
2. `services.nextcloud.secretFile`, which takes a path to a json file
specifying options which a user may want to keep secret and not add
to their nix store; this file is read in the same way on startup by
php, and may even overwrite options set in some other way.
2021-03-30 20:07:50 +02:00
Sandro
24466250ec
Merge pull request #116292 from samuelgrf/fix-rename/rtlwifi_new
...
rtlwifi_new: fix build & rename to rtw88
2021-03-30 17:28:02 +02:00
Sandro
7d0dad76ef
Merge pull request #116936 from hercules-ci/logstash-jdk
2021-03-30 17:22:21 +02:00
Sandro
36a4bbd3b9
Merge pull request #117887 from sikmir/pyosmium
...
python3Packages.pyosmium: 3.1.0 → 3.1.3
2021-03-30 17:18:40 +02:00
Sandro
498cb76bdf
Merge pull request #117799 from LeSuisse/aliza-1.98.57
...
aliza: 1.98.43 -> 1.98.57
2021-03-30 17:18:15 +02:00
ppenguin
e2b46c7ba6
strawberry: 0.9.1 -> 0.9.2 ( #117889 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-03-30 17:17:12 +02:00
Vladimír Čunát
4b872b6efd
dnsperf: 2.5.0 -> 2.5.2
...
https://github.com/DNS-OARC/dnsperf/releases/tag/v2.5.1
https://github.com/DNS-OARC/dnsperf/releases/tag/v2.5.2
It seems to work OK in my testing.
2021-03-30 17:06:40 +02:00
Sandro
ac570d2ba6
Merge pull request #117265 from thmzlt/kconf
...
kconf: init at 1.10.1
2021-03-30 17:06:23 +02:00
Sandro
151d746ab5
Merge pull request #115229 from rolfschr/android-fix-shebang-in-make-standalone-toolchain
2021-03-30 16:59:38 +02:00
Graham Christensen
83fccd0edb
Merge pull request #104915 from grahamc/fprintd-libfprint-tod
...
{fprintd,libfprint}-tod: init, plus libfprint-2-tod1-goodix: init at 0.0.6
2021-03-30 14:55:24 +00:00
Sandro
e570d93519
borgbackup: rename directory to borgbackup ( #118073 )
2021-03-30 16:48:27 +02:00
Mario Rodas
d1ccfb3d18
dune_2: 2.8.4 -> 2.8.5
...
https://github.com/ocaml/dune/releases/tag/2.8.5
2021-03-30 16:46:15 +02:00
Graham Christensen
65674c24f8
libfprint-2-tod1-goodix: init at 0.0.6
2021-03-30 14:36:25 +00:00
Graham Christensen
b0a4d392b9
fprintd-tod: init from fprintd
2021-03-30 14:36:24 +00:00
Graham Christensen
76558714f3
libfprint-tod: init at 1.90.7+tod1
2021-03-30 14:36:19 +00:00
Michael Raskin
377e92ddb1
Merge pull request #117902 from 7c6f434c/nyxt-update
...
nyxt: 2020-10-23 -> 2021-03-27
2021-03-30 14:32:37 +00:00
Fabian Affolter
0aa8c06d23
Merge pull request #118011 from r-ryantm/auto-update/python3.8-braintree
...
python38Packages.braintree: 4.6.0 -> 4.7.0
2021-03-30 16:27:51 +02:00
Fabian Affolter
d895d487f8
Merge pull request #117994 from r-ryantm/auto-update/jrnl
...
jrnl: 2.7.1 -> 2.8
2021-03-30 16:27:38 +02:00
Fabian Affolter
0378d398ba
Merge pull request #118033 from r-ryantm/auto-update/checkstyle
...
checkstyle: 8.41 -> 8.41.1
2021-03-30 16:25:28 +02:00
Sandro
5211006ae5
Merge pull request #117060 from Trundle/pulumi-bin-2.32.1
...
pulumi-bin: 2.22.0 -> 2.23.2
2021-03-30 16:22:46 +02:00
Sandro
8c3cecb457
Merge pull request #118009 from bryanasdev000/package-pgo
...
pgo-client: init at 4.6.2
2021-03-30 16:08:25 +02:00
Sandro
c58c862bf7
Merge pull request #118060 from r-ryantm/auto-update/grex
...
grex: 1.1.0 -> 1.2.0
2021-03-30 16:05:26 +02:00
Sandro
2e1c5b6d34
Merge pull request #98597 from onsails/fix-onehalf
...
vim-plugins: onehalf - fix path
2021-03-30 15:56:10 +02:00
Martin Weinelt
affc6f1de1
Merge pull request #117991 from mweinelt/webkitgtk
...
webkitgtk: 2.30.6 -> 2.32.0
2021-03-30 15:08:08 +02:00
Bryan A. S
853f7b8a9b
pgo-client: init at 4.6.2
...
Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
2021-03-30 09:57:34 -03:00
R. RyanTM
78ff084075
grex: 1.1.0 -> 1.2.0
2021-03-30 12:46:10 +00:00
Sandro
d07b2182c3
Merge pull request #118042 from r-ryantm/auto-update/dnscontrol
...
dnscontrol: 3.7.0 -> 3.8.0
2021-03-30 14:34:53 +02:00
Sandro
9a85cd47d4
Merge pull request #118048 from rhoriguchi/vscode-extensions.gruntfuggly.todo-tree
...
vscode-extensions.gruntfuggly.todo-tree: 0.0.208 -> 0.0.209
2021-03-30 14:33:32 +02:00
Sandro
5aa2443055
Merge pull request #118050 from 06kellyjac/kube3d
...
kube3d: 4.3.0 -> 4.4.0
2021-03-30 14:32:06 +02:00
Sandro
9e24497453
Merge pull request #117970 from mpoquet/simgrid-3.26-to-3.27
...
simgrid: 3.26 -> 3.27
2021-03-30 14:28:37 +02:00
Sandro
a0b523ce08
Merge pull request #118015 from jonringer/bump-vimplugins
...
vimPlugins: update
2021-03-30 14:28:22 +02:00
Maximilian Bosch
181f7deed3
Merge pull request #118031 from r-ryantm/auto-update/cargo-watch
...
cargo-watch: 7.5.1 -> 7.6.1
2021-03-30 14:21:35 +02:00
Pascal Bach
f15cbfdfcd
Merge pull request #117806 from r-ryantm/auto-update/minio
...
minio: 2021-03-17T02-33-02Z -> 2021-03-26T00-00-41Z
2021-03-30 13:49:44 +02:00
Jonas Chevalier
dad38a48e8
terraform-provers.google: 3.47.0 -> 3.62.0 ( #118051 )
2021-03-30 13:46:39 +02:00
Doron Behar
b3bd7cc0b5
Merge pull request #117986 from doronbehar/pkg/nlohmann_json
2021-03-30 11:34:58 +00:00
Sandro
c8058c2812
Merge pull request #118047 from stigtsp/package/perl-net-netmask-2.0001
...
perlPackages.NetNetmask: 1.9104 -> 2.0001
2021-03-30 13:30:49 +02:00
Sandro
9c0905cf28
Merge pull request #118043 from stigtsp/patch/perl-Net-CIDR-Lite-ipv4-octet-vuln
...
perlPackages.NetCIDRLite: add patch to prevent leading zeroes in ipv4 octets
2021-03-30 13:30:32 +02:00
Doron Behar
f69f4e412f
Merge pull request #117987 from doronbehar/pkg/spdlog
...
spdlog: 1.8.2 -> 1.8.5
2021-03-30 11:29:23 +00:00
06kellyjac
b27e590f7f
kube3d: 4.3.0 -> 4.4.0
...
add installCheckPhase
2021-03-30 12:23:33 +01:00
Ryan Horiguchi
0f8e176e52
vscode-extensions.gruntfuggly.todo-tree: 0.0.208 -> 0.0.209
2021-03-30 13:00:39 +02:00
Maximilian Bosch
8bc58b6a9a
Merge pull request #118030 from r-ryantm/auto-update/cargo-make
...
cargo-make: 0.32.14 -> 0.32.15
2021-03-30 12:57:48 +02:00
Stig Palmquist
7941adcaf3
perlPackages.NetNetmask: 1.9104 -> 2.0001
2021-03-30 12:56:12 +02:00
R. RyanTM
f35b604fd9
dnscontrol: 3.7.0 -> 3.8.0
2021-03-30 10:33:54 +00:00
Stig Palmquist
7365de5ace
perlPackages.NetCIDRLite: add patch to prevent leading zeroes in ipv4 octets
...
https://blog.urth.org/2021/03/29/security-issues-in-perl-ip-address-distros/
2021-03-30 12:31:27 +02:00
Nikolay Korotkiy
f525c90794
python3Packages.pyosmium: 3.1.0 → 3.1.3
2021-03-30 13:29:32 +03:00
Ben Siraphob
11027de7ae
koka: init at 2.1.1
2021-03-30 12:28:57 +02:00