alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
281285 commits 217 branches 121 tags 4.5 GiB
Commit graph

20854 commits

Author SHA1 Message Date
github-actions[bot] 95c24d591a
Merge master into staging-next 2021-03-27 18:14:08 +00:00
Michele Guerini Rocco b01e00ba8f
Merge pull request #114688 from rnhmjoj/tcsd-no-udev-settle 
nixos/tcsd: several improvements and fixes
 2021-03-27 16:31:17 +01:00
Pavel Borzenkov 58ce51ed06 nixos/calibre-web: init module 2021-03-27 14:43:33 +03:00
github-actions[bot] 70fb533d57
Merge master into staging-next 2021-03-26 18:13:54 +00:00
Justin Humm 347a9168ae nixos/hledger-web: set capabilites as boolean 2021-03-26 13:45:13 +01:00
Justin Humm 569940b9fd nixos/hledger-web: add stateDir, use own user, fix ExecStart 
This allows for shared hledger installations, where the web interface is
available via network and multiple user share a SSH access to the
hledger user.

Also added `--serve` to the CLI options, as hledger-web tries to open a
webbrowser otherwise:

hledger-web: xdg-open: rawSystem: runInteractiveProcess: exec: does not
exist (No such file or directory)

Co-authored-by: Aaron Andersen <aaron@fosslib.net>
 2021-03-26 13:45:13 +01:00
github-actions[bot] eddd1a74ec
Merge master into staging-next 2021-03-26 12:06:41 +00:00
Maciej Krüger c8d2f4a3a8 cjdns: reduce password length to 32 
Maximum password length per cjdns code is somehwhere less than that, see
ecd01e7681/client/AdminClient.c (L80)

Currently we generate 96 char long passwords that don't work

This changes it so password length is just 32 chars long
 2021-03-26 11:35:09 +01:00
Robert Hensing 363d7c86b0
Merge pull request #117603 from lbpdt/fix/docker-tools-layered-image-env 
dockerTools.streamLayeredImage: resolve duplicate env vars
 2021-03-26 09:52:18 +01:00
github-actions[bot] b068d2e437
Merge master into staging-next 2021-03-26 00:15:53 +00:00
Louis Blin b3f68289df dockerTools.streamLayeredImage: resolve duplicate env vars 
For images running on Kubernetes, there is no guarantee on how duplicate
environment variables in the image config will be handled. This seems
to be different from Docker, where the last environment variable value
is consistently selected.

The current code for `streamLayeredImage` was exploiting that assumption
to easily propagate environment variables from the base image, leaving
duplicates unchecked. It should rather resolve these duplicates to
ensure consistent behavior on Docker and Kubernetes.
 2021-03-25 23:29:54 +00:00
Florian Klink f3fa3a38a9
Merge pull request #116743 from flokli/bird-check-config-disable 
nixos/bird*: enable config files outside the store, propagate reload errors to systemd
 2021-03-25 23:01:09 +01:00
github-actions[bot] 4dc869e403
Merge master into staging-next 2021-03-25 12:06:22 +00:00
Domen Kožar b992a92fa0
Merge pull request #117021 from AmineChikhaoui/gcp-cloud-images 
add new Google Cloud image for the current release
 2021-03-25 10:42:06 +01:00
github-actions[bot] 8cebf1dc19
Merge master into staging-next 2021-03-25 06:05:58 +00:00
Léo Gaspard 219ee8d091
release notes: typo fixes (#117539) 2021-03-25 01:28:41 +01:00
github-actions[bot] eb499aa20e
Merge master into staging-next 2021-03-25 00:17:22 +00:00
kvtb 5e647319ae less.nix: fix escape 
$$ does not escape $
\$ does
 2021-03-24 23:28:04 +01:00
github-actions[bot] 8e2d0e45c0
Merge master into staging-next 2021-03-24 18:10:39 +00:00
Izorkin f3a032dee5 nixos/mastodon: enable sandbox mode 2021-03-24 17:28:50 +01:00
github-actions[bot] 380cb1e995
Merge master into staging-next 2021-03-24 12:11:57 +00:00
Maximilian Bosch 0ad1d526dc
Merge pull request #117454 from dotlambda/wireguard-noalias 
nixos/wireguard: don't use alias
 2021-03-24 11:43:13 +01:00
Robert Schütz 683f374529 nixos/wireguard: don't use alias 2021-03-24 11:27:36 +01:00
Robert Hensing 43b02818f6
Merge pull request #117273 from hercules-ci/nixos-dont-format 
Don't format XML of the NixOS manual
 2021-03-24 11:07:23 +01:00
github-actions[bot] 2417360191
Merge master into staging-next 2021-03-24 00:41:10 +00:00
Benjamin Hipple 561cc81ee6
Merge pull request #115857 from lbpdt/feature/docker-tools-layered-base-image 
dockerTools.buildLayeredImage: support fromImage
 2021-03-23 18:15:34 -04:00
Robert Hensing e0e241c219
Merge pull request #116369 from m1cr0man/master 
nixos/acme: Fix webroot issues
 2021-03-23 21:31:42 +01:00
Louis Blin aae8588182 dockerTools.buildLayeredImage: support fromImage 
It is now possible to pass a `fromImage` to `buildLayeredImage` and
`streamLayeredImage`, similar to what `buildImage` currently supports.

This will prepend the layers of the given base image to the resulting
image, while ensuring that at most `maxLayers` are used. It will also
ensure that environment variables from the base image are propagated
to the final image.
 2021-03-23 14:50:42 +00:00
Robert Hensing 9011d59758 logstash-*-oss: Add passthru.tests 2021-03-23 14:42:40 +01:00
Robert Hensing e7e6e8d5c3 nixos/logstash: Don't set unnecessary JAVA_HOME 2021-03-23 14:42:40 +01:00
github-actions[bot] 963842fb19
Merge master into staging-next 2021-03-23 12:27:46 +00:00
Profpatsch c25ffa8b76
Merge pull request #117073 from sternenseemann/inspircd-3.9.0 
inspircd: init at 3.9.0
 2021-03-23 11:25:58 +01:00
github-actions[bot] 39e3812215
Merge master into staging-next 2021-03-23 06:18:02 +00:00
Peter Hoeg 6b815bbb99 nixos/systemd: missing a few units for KDE to use systemd 2021-03-23 09:44:34 +08:00
github-actions[bot] 11ee0bf5d7
Merge master into staging-next 2021-03-23 00:40:24 +00:00
Sander van der Burg 8fc9423565
Merge pull request #116455 from svanderburg/systemdunitpath 
systemd: allow custom unit folders to be configured with SYSTEMD_UNIT…
 2021-03-22 22:58:49 +01:00
Robert Hensing 2f7be87a8a nixos/doc: Update Writing Documentation to use nix-shell 2021-03-22 21:21:08 +01:00
Robert Hensing 12e7698a65 nixos/doc/manual/Makefile: Do not format 
Formatting has been neglected. Running `make` would format dozens
of files, which is a great way of scaring away newcomers and those
with less git experience. It would also annoy the heck out of
regular contributors.

The purpose of formatting is to avoid a small annoyance, so it
should not become a big annoyance that makes people give up on
their work.
 2021-03-22 21:15:11 +01:00
Sander van der Burg 5c8ed06fc9 systemd: allow custom unit folders to be configured with SYSTEMD_UNIT_PATH 2021-03-22 20:41:12 +01:00
github-actions[bot] 44763c135b
Merge master into staging-next 2021-03-22 18:21:11 +00:00
Bernardo Meurer 9334a29720
Merge pull request #116811 from jansol/pipewire 
pipewire: 0.3.23 -> 0.3.24
 2021-03-22 17:34:48 +00:00
Robert Hensing bef62e8c81
Merge pull request #114752 from hercules-ci/lazy-offline-acme 
acme: Determine offline whether renewal is due
 2021-03-22 16:04:33 +01:00
sternenseemann 76d9fe7629 !fixup add myself as maintainer for the module 2021-03-22 15:19:49 +01:00
adisbladis 04a37553f2
Merge pull request #114821 from erosennin/catatonit 
catatonit: init at 0.1.5, fix podman --init
 2021-03-22 16:04:06 +02:00
sternenseemann 726db56d68 !fixup simplify zipListsWith call 2021-03-22 14:52:13 +01:00
sternenseemann 66454f0e5a !fixup get rid of trailing comment hack 2021-03-22 14:48:38 +01:00
sternenseemann 4048b39fc1 nixos/modules/inspircd: add simplistic module and nixos test 2021-03-22 14:38:57 +01:00
github-actions[bot] feda7be375
Merge master into staging-next 2021-03-22 12:26:55 +00:00
Michele Guerini Rocco a88356cbbe
Merge pull request #97048 from bluecmd/patch-1 
nixos/manual: luks entries are auto-detected
 2021-03-22 08:15:42 +01:00
github-actions[bot] 8739248897
Merge master into staging-next 2021-03-22 06:22:54 +00:00
Matt McHenry 13bee29b9b restic: allow prune without backup 
fixes #97820
 2021-03-21 18:47:52 -07:00
Andrey Golovizin fd3f1ec19a nixos/tests/podman: test podman run --init 2021-03-21 21:26:47 +01:00
zowoq 4b11122749 nixos/containers: add catatonit / init_path 
https://github.com/containers/common/blob/master/docs/containers.conf.5.md

- Also drop unneeded true from ociSeccompBpfHook
 2021-03-21 20:57:28 +01:00
AmineChikhaoui 606b49721f
add new Google Cloud image for the current release 
update the create-gce.sh script with the ability to create public images
out of a GS object.
 2021-03-21 14:04:09 -04:00
github-actions[bot] 6f6e1d46b4
Merge master into staging-next 2021-03-21 12:26:00 +00:00
Guillaume Girol 584f971216
Merge pull request #113707 from symphorien/sane-backends-udpate 
sane-backends: 1.0.30 -> 1.0.32
 2021-03-21 11:03:04 +00:00
Symphorien Gibol c20cd1834f sane-backends: 1.0.30 -> 1.0.32 
sane-backends-git: remove, it's not updated often enough to be useful
 2021-03-21 11:07:14 +01:00
github-actions[bot] b0455cafa7
Merge master into staging-next 2021-03-21 06:17:15 +00:00
Sandro c10752cc4f
Merge pull request #113722 from rgrunbla/galene-03 
galene: 0.2 -> 0.3 and bugfix of the associated module
 2021-03-21 05:31:30 +01:00
Maximilian Bosch de98a184f5
wiki-js: init at 2.5.191 2021-03-20 20:43:21 +01:00
github-actions[bot] 933682b533
Merge master into staging-next 2021-03-20 18:19:30 +00:00
Jörg Thalheim 1fc14408ae
Merge pull request #108952 from Mic92/systemd-builder 
nixos/systemd-boot: add typechecking
 2021-03-20 16:05:27 +00:00
Milan 58804b24bc
nixos/gitlab: add option for tls wrapper-mode smtp (#116801) 2021-03-20 15:05:29 +01:00
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.

This commit broke container tests and thus blocked channels from
advancing.
 2021-03-19 09:05:33 +01:00
Jan Solanti fbdb248e54 pipewire: 0.3.23 -> 0.3.24 2021-03-19 05:14:44 +02: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
Florian Klink 2b03d3a1cf nixos/bird: check config during reload 
`birdc configure` seems to not return a nonzero exit code if the reload
failed.

Context: https://bird.network.cz/pipermail/bird-users/2018-January/011858.html

Co-Authored-By: Puck Meerburg <puck@puck.moe>
 2021-03-18 14:25:44 +01:00
Florian Klink 7d266264ce nixos/bird: add services.bird*.checkConfig option 
This is useful when the config doesn't entirely live in the Nix store,
but is configured to include mutable config files written at runtime.

Co-Authored-By: Puck Meerburg <puck@puck.moe>
 2021-03-18 14:24:55 +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
Alex Rice c60bd18006
agda nixos test: fix hello world program 2021-03-17 22:01:59 +00: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
Lucas Savva 2dd7973751 nixos/acme: Add permissions tests 2021-03-15 19:25:49 +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
Lucas Savva 920a3f5a9d nixos/acme: Fix webroot issues 
With the UMask set to 0023, the
mkdir -p command which creates the webroot
could end up unreadable if the web server
changes, as surfaced by the test suite in #114751
On top of this, the following commands
to chown the webroot + subdirectories was
mostly unnecessary. I stripped it back to
only fix the deepest part of the directory,
resolving #115976, and reintroduced a
human readable error message.
 2021-03-15 01:41:40 +00: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
Frederik Rietdijk 9d03ff5222 python: reproducible builds 
Achieve reproducible builds of the interpreter. Note this meant
disabling optimizations again.
 2021-03-13 13:11:50 +01:00
Julien Moutinho a9ce4c4a0e zerobin: 20160108 -> 1.0.5 2021-03-13 13:06:06 +01:00
Doron Behar 2d08e55e9b gnuradio.pkgs: init 
- Write a `mkDerivation` and `mkDerivationWith` function for gnuradio,
  like qt5.
- qradiolink, gqrx: Use gnuradio's callPackage and mkDerivation.
- Use gnuradio.callPackage to define all gnuradio.pkgs.
- Move all gnuradio packages expressions to pkgs/development/gnuradio-modules/ -
  modeled after Python's.
- Add more paths to gnuradio's wrapper - add the extra packages as
  python modules, and add their executables with proper env vars
  wrapping.

Co-authored-by: Frederik Rietdijk <fridh@fridh.nl>
 2021-03-13 12:46:59 +02:00
github-actions[bot] 970aea96fa
Merge staging-next into staging 2021-03-13 06:17:38 +00:00
github-actions[bot] 4181409166
Merge master into staging-next 2021-03-13 06:17:31 +00:00
Aaron Andersen 5a24206e17
Merge pull request #111030 from cript0nauta/miniflux-sudo 
nixos/miniflux: don't depend on sudo
 2021-03-12 20:42:09 -05:00
Aaron Andersen 47c5175f0c
Merge pull request #93629 from ju1m/croc 
nixos/croc: init
 2021-03-12 20:34:33 -05:00
Jan Tojnar 9a64ee2b45
Merge branch 'staging-next' into staging 2021-03-13 01:58:15 +01:00
github-actions[bot] b0a6c2b8a5
Merge master into staging-next 2021-03-13 00:38:26 +00:00
Jonathan Ringer d980362a95 nixos/factorio: add nonBlockingSaving option 2021-03-12 10:34:59 -08:00
Yannick Markus 951f41fd41
nixos/bookstack: init 2021-03-12 16:59:06 +01:00
Philipp Riegger ac59cb8276 nixos/release-notes/rl-2105.xml: fix typo 2021-03-12 15:44:13 +01:00
Milan Pässler b2bebd7cd5
nixos/prometheus-jitsi-exporter: init 2021-03-12 11:11:16 +01:00
Aaron Andersen 696ac06a93 kodi: add release notes for version 19.0 update 2021-03-11 20:35:54 -05:00
Aaron Andersen 4769eb4f58 kodi: add release notes for kodi.withPackages 2021-03-11 20:35:54 -05:00
github-actions[bot] 903fc48674
Merge master into staging-next 2021-03-12 00:39:51 +00:00
Benjamin Hipple 17a9f368e3
Merge pull request #115793 from lbpdt/feature/docker-tools-layered-image-name-slashes 
dockerTools.buildLayeredImage: image names with registry/ prefix
 2021-03-11 14:58:26 -05:00
github-actions[bot] d6257d451b
Merge master into staging-next 2021-03-11 18:23:54 +00:00
WilliButz f5c01cf9d4
Merge pull request #113370 from chkno/prometheus-systemd-exporter-no-flags 
prometheus-systemd-exporter: Init at 0.4.0
 2021-03-11 19:18:29 +01:00
WilliButz 3ceef8186c
Merge pull request #115185 from Ma27/knot-exporter 
prometheus-knot-exporter: init at 2021-01-30; minor module improvements
 2021-03-11 18:58:59 +01:00
WilliButz 902a479225
Merge pull request #111364 from lbpdt/feature/prometheus-artifactory-exporter 
nixos/prometheus-exporters/artifactory: init at 1.9.0
 2021-03-11 18:44:03 +01:00
Florian Klink 540af5fe05
Merge pull request #115879 from khumba/doc-black-disable 
nixos/manual/writing-nixos-tests: document how to disable Black silently
 2021-03-11 16:18:17 +01:00
github-actions[bot] b4d5951d9e
Merge master into staging-next 2021-03-11 12:21:28 +00:00
Maximilian Bosch 7ecc3b0684
Merge pull request #115372 from BBBSnowball/pr-add-config-nextcloud-imagick 
nixos/nextcloud: Conditionally enable ImageMagick PHP extension
 2021-03-11 12:45:17 +01:00
rnhmjoj 7962df46fe
nixos/privoxy: make certificate-directory optional 
The tmpfiles.d rule should only be added if inspectHttps is enabled.
 2021-03-11 08:17:50 +01:00
Bryan Gardiner d3ea5a7290
nixos/manual/writing-nixos-tests: document how to disable Black silently 2021-03-10 18:56:52 -08:00
Adrian Parvin D. Ouano e3b90b6ccc nixos/systemd: Handle template overrides 
Adding template overrides allows for custom behavior for specific
instances of a template. Previously, it was not possible to provide
bind mounts for systemd-nspawn. This change allows it.
 2021-03-11 10:21:14 +08:00
Benjamin Koch 1bd7941a6b nixos/nextcloud: Use exportReferencesGraph for imagick test 2021-03-11 02:56:11 +01:00
github-actions[bot] 0a8ec23e51
Merge master into staging-next 2021-03-11 00:39:21 +00:00
Markus Kowalewski c923b4c71b
nixos/slurm: expose to path config files 
This adds a new internal option, services.slurm.etcSlurm such
that other modules can access slurm's config files. This is
needed, for example, when a service wants to run a slurm command.
 2021-03-10 23:12:47 +01:00
Sarah Brofeldt 33d6e71133
Merge pull request #98446 from srhb/fix-kafka 
apache-kafka: Fix, update and adjust JRE/JVM
 2021-03-10 20:25:13 +01:00