JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
281,833 Commits 2 Branches 0 Tags 13 GiB
c876eb99be
Commit Graph

16623 Commits

Author SHA1 Message Date
Sandro
7d0dad76ef
Merge pull request #116936 from hercules-ci/logstash-jdk 2021-03-30 17:22:21 +02:00
Samuel Gräfenstein
e6cd793a74
nixos/config: move nano to defaultPackages 
Some people already have another editor installed and may want to
get rid of applications they don't use.
 2021-03-30 11:50:03 +02:00
Aaron Andersen
31f9775f20 nixos/kodi: add package option 2021-03-29 16:47:30 -04:00
github-actions[bot]
f7049b343c
Merge master into staging-next 2021-03-29 18:13:15 +00:00
Doron Behar
c2b66f2702
Merge pull request #98734 from ju1m/zerobin 2021-03-29 17:18:29 +00:00
Leo Maroni
c162597465
nixos/grafana: add socket configuration option 2021-03-29 15:59:24 +02:00
github-actions[bot]
b1788736fd
Merge master into staging-next 2021-03-29 12:06:25 +00:00
Luke Granger-Brown
309e836c33 nixos/tests/pomerium: init 2021-03-29 10:41:41 +00:00
Luke Granger-Brown
cb2f1df034 nixos/pomerium: init 2021-03-29 10:41:41 +00:00
Jörg Thalheim
96e4052d70
nixos/hydra: gc-check-reachability no longer exists in nix 2.4 (#117925) 
* nixos/hydra: gc-check-reachability no longer exists in nix 2.4

fixup! nixos/hydra: gc-check-reachability no longer exists in nix 2.4

* Update nixos/modules/services/continuous-integration/hydra/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-03-29 11:14:16 +02:00
Peter Hoeg
860e87d363 nixos/geoclue2: do not start geoclue agent for system users 2021-03-29 16:57:49 +08:00
Sandro
da7bf30372
nixos/containers: update example path to match defaults 2021-03-29 03:40:44 +02:00
github-actions[bot]
d495e7527f
Merge master into staging-next 2021-03-29 00:15:48 +00:00
Maximilian Bosch
c2836eb953
Merge pull request #117809 from mayflower/graylog-4 
graylog: improve JRE handling
 2021-03-28 23:47:26 +02:00
Doron Behar
9d47c33ee0
Merge pull request #82005 from esclear/mpd-socket 
nixos/mpd: allow autostart when listening for unix socket
 2021-03-28 20:04:31 +00:00
Sander van der Burg
b8258843d4 nixos/misc/ids: reclaim uid for disnix 2021-03-28 21:40:44 +02:00
Sander van der Burg
13b367df5f nixos/dysnomia: configure systemd unit path 2021-03-28 21:39:23 +02:00
Sander van der Burg
4ae1fa61ad Revert "nixos/dysnomia nixos/disnix: Drop modules" 
This reverts commit a3f4db8679.
 2021-03-28 21:37:43 +02:00
Vladimír Čunát
56f308bb2f
nixos/kresd: trivial cleanup 2021-03-28 21:01:50 +02:00
Vladimír Čunát
6e562fd6a7
Merge #101043: nixos/kresd: Listen on IPv4 wildcard, too 
This makes sense to me.  I can't see any reference (incl. PR #78628)
why that commit of mine (ae74a0e27c) used 127.0.0.1 instead of 0.0.0.0
 2021-03-28 20:53:33 +02:00
Vladimír Čunát
0032a3fc81
Merge #100592: nixos/kresd: Fix unportable regex 2021-03-28 20:27:49 +02:00
github-actions[bot]
b9456ca263
Merge master into staging-next 2021-03-28 18:14:11 +00:00
oxalica
80a1336bb9 nixos/filesystems: always write mount options for swap devices 
According to fstab(5), unlike last two fields `fs_freq` and `fs_passno`,
the 4-th field `fs_mntops` is NOT optional, though it works when omitted.

For best-practice and easier to be parsed by other programs, we should always
write `defaults` as default mount options for swap devices.
 2021-03-28 19:54:03 +02:00
Aaron Andersen
d6fd7c6613 nixos/zabbixAgent: add a few minor tweaks to make configuration file compatible with both zabbix agent 1 and 2 2021-03-28 13:35:21 -04:00
Linus Heckemann
4aacd02d33
Merge pull request #115792 from ncfavier/patch-2 
nixos/stage-1: make cpio quiet
 2021-03-28 14:38:46 +02:00
Linus Heckemann
22de3c19e7 graylog: improve JRE handling 
Since the upstream graylogctl script will prefer finding its java
executable based on JAVA_HOME, we now set this instead of PATH in
order to allow it to find the JRE. By setting it conditionally on it
not already being set, we allow selecting a different JRE at runtime.

We also explicitly use openjdk11, which supports the
UseConcMarkSweepGC option which graylog insists on using.
 2021-03-28 14:37:28 +02:00
github-actions[bot]
732dc6ef8f
Merge master into staging-next 2021-03-28 00:15:41 +00:00
Maximilian Bosch
ae73ec2b68
Merge pull request #116738 from Ma27/wiki-js 
wiki-js: init at 2.5.191
 2021-03-27 22:03:35 +01:00
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
github-actions[bot]
b068d2e437
Merge master into staging-next 2021-03-26 00:15:53 +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
Jörg Thalheim
0f4872b4c4
nixos/docker: re-add network.target 
Currently if docker starts concurrently with
firewall.service/systemd-networkd it breaks both due to iptables/netlink
logs.
 2021-03-25 22:06:54 +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
Alexandre Macabies
f5b0542cb1 nixos/snapserver: add support for meta stream type introduced in 0.23.0 2021-03-25 04:05:50 +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
TredwellGit
08b21db9c9 nixos/amdgpu: remove 
https://github.com/NixOS/nixpkgs/pull/111551#issuecomment-802082766
 2021-03-24 21:03:44 +00: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
github-actions[bot]
2417360191
Merge master into staging-next 2021-03-24 00:41:10 +00:00
Robert Hensing
e0e241c219
Merge pull request #116369 from m1cr0man/master 
nixos/acme: Fix webroot issues
 2021-03-23 21:31:42 +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
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
4048b39fc1 nixos/modules/inspircd: add simplistic module and nixos test 2021-03-22 14:38:57 +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
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
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
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
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
Samuel Gräfenstein
87f4d7a07a
nixos/printing: simplify filterGutenprint function 2021-03-14 11:59:00 +01: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
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
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
Julien Moutinho
a9ce4c4a0e zerobin: 20160108 -> 1.0.5 2021-03-13 13:06:06 +01: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
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
Milan Pässler
b2bebd7cd5
nixos/prometheus-jitsi-exporter: init 2021-03-12 11:11:16 +01: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
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
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
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
github-actions[bot]
a3b4d14288
Merge staging-next into staging 2021-03-10 18:23:23 +00:00
github-actions[bot]
6a3a358b0d
Merge master into staging-next 2021-03-10 18:23:15 +00:00
Léo Gaspard
4ee87cfead
Merge pull request #113620 from imlonghao/borgmatic 
borgmatic: init at 1.5.12
 2021-03-10 18:13:04 +01:00
Naïm Favier
d4d5fc6bd7
nixos/stage-1: make cpio quiet 2021-03-10 17:46:53 +01:00
Cabia Rangris
352405c0f6 nixos.spotifyd: fixed file not found error 
When using password_cmd, there's a 'file not found' error due to missing sh binary in path.
For some reason, adding `path = [ "/bin" ]` doesn't fix the issue, but setting `SHELL` does.
Related documentation: https://spotifyd.github.io/spotifyd/config/File.html#shell-used-to-run-commands-indicated-by-password_cmd-or-on_song_changed_hook----omit-in-toc---
 2021-03-10 13:26:10 +01:00
Sarah Brofeldt
fd02940262 nixos/apache-kafka: Use version-matched jre 2021-03-10 08:10:30 +01:00