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
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
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
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
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
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