3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

10098 commits

Author SHA1 Message Date
Robert Schütz 683f374529 nixos/wireguard: don't use alias 2021-03-24 11:27:36 +01: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
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
Jan Tojnar 0136206b12
Merge branch 'master' into staging-next 2021-03-18 13:35:59 +01: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
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
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] 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
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] 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
Samuel Gräfenstein 87f4d7a07a
nixos/printing: simplify filterGutenprint function 2021-03-14 11:59:00 +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
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
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
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] 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
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
Sarah Brofeldt 08ef827056 nixos/apache-kafka: Drop default jvmOptions 2021-03-10 08:09:34 +01:00
github-actions[bot] 149a81c88d
Merge master into staging-next 2021-03-10 00:39:07 +00:00
ajs124 2d3200e010 nixos/nginx: fix eval for tengine 2021-03-10 01:23:11 +01:00
Sandro 7a4d404e0f
Merge pull request #112689 from iblech/patch-whitebophir180 2021-03-09 22:12:24 +01:00
rnhmjoj df6d7f3142
nixos/privoxy: document repeated settings 2021-03-09 17:59:12 +01:00
github-actions[bot] 5d13702776
Merge master into staging-next 2021-03-09 12:25:54 +00:00
rnhmjoj 8e21a1c51b
nixos/privoxy: set temporary directory
This is needed for working external filters, otherwise privoxy will fail
without a clear error message.
2021-03-09 11:02:59 +01:00
rnhmjoj 3673ded392
nixos/privoxy: add https and settings options
This is a major rewrite of the Privoxy module:

- As per RFC0042, remove privoxy.extraConfig and replace it
  with a privoxy.settings option, which maps a NixOS freeform
  submodule to the Privoxy configuration format.

- Move all top-level options that mirrored a setting to
  the real ones in privoxy.settings. This still keeps the
  type-checking, default values and examples in places.

- Add two convenience options: userActions and userFilters, which
  simplify the operation of creating a file with pkgs.writeText,
  converting it to a string and adding it to the actionsfile/
  filterfile list.

- Add a privoxy.inspectHttps option to automagically setup TLS
  decryption support. I don't know how long have been waiting
  for this feature: can't believe it has just happened.

- Also add a privoxy.certsLifetime to control the periodical
  cleanup of the temporary certificates generate by Privoxy.
2021-03-09 11:02:59 +01:00
Michele Guerini Rocco af6037b338
Merge pull request #111551 from xaverdh/xserver-modern-drivers
nixos/xserver: use modern video drivers
2021-03-09 08:14:24 +01:00