Vladimír Čunát
b4729bad3d
Merge #165406 : staging-next 2022-03-23
2022-04-05 20:34:08 +02:00
Aaron Jheng
dc2750c88c
heapster: remove
2022-04-05 12:36:23 +00:00
Aaron Jheng
d528fabf88
mesos-exporter: remove
2022-04-05 12:35:18 +00:00
github-actions[bot]
27a4e52731
Merge master into staging-next
2022-04-05 12:05:41 +00:00
Rick van Schijndel
9f98b2bd7c
makeWrapper to nativeBuildInputs ( #167225 )
2022-04-05 10:34:48 +03:00
github-actions[bot]
120925b5cb
Merge master into staging-next
2022-04-05 00:02:06 +00:00
Lassulus
8866ccbe1f
Merge pull request #164929 from r-ryantm/auto-update/thanos
...
thanos: 0.24.0 -> 0.25.1
2022-04-04 21:05:01 +01:00
Martin Weinelt
c6476294e1
Merge remote-tracking branch 'origin/master' into staging-next
2022-04-04 18:40:34 +02:00
Maximilian Bosch
74d3d12130
Merge pull request #167010 from Ma27/blackbox-exporter-version
...
prometheus-backbox-exporter: correctly expose version info
2022-04-04 18:00:32 +02:00
Maximilian Bosch
f81b05ab46
prometheus-backbox-exporter: correctly expose version info
2022-04-03 10:03:43 +02:00
github-actions[bot]
fc17fe6417
Merge master into staging-next
2022-04-02 18:01:07 +00:00
R. Ryantm
376d67e1cd
prometheus-wireguard-exporter: 3.6.2 -> 3.6.3
2022-04-02 13:10:31 -04:00
7c6f434c
8188f10752
Merge pull request #166430 from alyssais/openssl-static-retry
...
treewide: use lib.getLib for OpenSSL libraries
2022-04-02 12:59:55 +00:00
github-actions[bot]
8b4f11bb87
Merge master into staging-next
2022-04-02 00:02:09 +00:00
Pascal Bach
b88a99ae9c
Merge pull request #166607 from Ma27/bump-grafana
...
grafana: 8.4.4 -> 8.4.5
2022-04-01 21:51:25 +02:00
github-actions[bot]
27e49cc5a4
Merge master into staging-next
2022-04-01 18:01:22 +00:00
adisbladis
9511feef72
prometheus-dmarc-exporter: Add missing build-system dependencies with overrides
...
I will add these upstream in poetry2nix and remove them from here once released.
2022-04-01 23:38:46 +12:00
Maximilian Bosch
bab7f65636
grafana: 8.4.4 -> 8.4.5
...
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.4.5
2022-03-31 20:45:55 +02:00
Alyssa Ross
fd78240ac8
treewide: use lib.getLib for OpenSSL libraries
...
At some point, I'd like to make another attempt at
71f1f4884b
("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07d
. One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries. This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.
This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching. The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.
I started by making the following global replacements:
${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
${openssl.out}/lib -> ${lib.getLib openssl}/lib
Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.
Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.
Then I manually investigated and fixed the following packages:
- pycurl
- citrix-workspace
- ppp
- wraith
- unbound
- gambit
- acl2
I'm reasonably confindent in my fixes for all of them.
For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all. Removing it doesn't make a difference to the output size, the
file list, or the closure.
I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
2022-03-30 15:10:00 +00:00
github-actions[bot]
80ddf916da
Merge master into staging-next
2022-03-29 00:02:04 +00:00
Fabian Affolter
221dfa0857
Merge pull request #165831 from r-ryantm/auto-update/check_ssl_cert
...
checkSSLCert: 2.22.0 -> 2.23.0
2022-03-28 21:08:57 +02:00
Jan Tojnar
997bb5e42c
Merge branch 'master' into staging-next
...
; Conflicts:
; pkgs/development/python-modules/dnspython/default.nix
; pkgs/development/python-modules/googleapis-common-protos/default.nix
2022-03-28 17:55:31 +02:00
Maximilian Bosch
1411b20576
Merge pull request #165779 from r-ryantm/auto-update/redis_exporter
...
prometheus-redis-exporter: 1.36.0 -> 1.37.0
2022-03-28 10:11:28 +02:00
Martin Weinelt
d68657af92
Merge remote-tracking branch 'origin/master' into staging-next
2022-03-27 15:54:05 +02:00
Sandro
305985df3e
Merge pull request #165577 from Mic92/telegraf
2022-03-27 12:49:20 +02:00
github-actions[bot]
3b6f03e497
Merge master into staging-next
2022-03-26 18:01:22 +00:00
R. RyanTM
972dbe303a
prometheus-alertmanager: 0.23.0 -> 0.24.0 ( #165813 )
2022-03-26 13:40:30 -04:00
R. Ryantm
a89197a11d
checkSSLCert: 2.22.0 -> 2.23.0
2022-03-26 10:48:54 +00:00
R. Ryantm
cccc419102
prometheus-redis-exporter: 1.36.0 -> 1.37.0
2022-03-25 19:18:33 +00:00
Vladimír Čunát
0a8b4eddd2
Merge branch 'master' into staging-next
2022-03-25 10:16:56 +01:00
peter woodman
6af081ad33
prometheus-node-exporter: fix build on darwin ( #165546 )
2022-03-24 12:24:40 -04:00
Jörg Thalheim
9741586d6a
telegraf: 1.21.4 -> 1.22.0
2022-03-24 09:08:17 +01:00
Fabian Affolter
cc777a7684
Merge pull request #165135 from r-ryantm/auto-update/blackbox_exporter
...
prometheus-blackbox-exporter: 0.19.0 -> 0.20.0
2022-03-23 20:48:34 +01:00
github-actions[bot]
c80dabe3b1
Merge staging-next into staging
2022-03-23 06:01:55 +00:00
Armeen Mahdian
3901b14926
munin: switch to python3
2022-03-21 21:57:00 -05:00
R. Ryantm
e40e7f5bab
prometheus-blackbox-exporter: 0.19.0 -> 0.20.0
2022-03-21 16:53:52 +00:00
R. Ryantm
ae5d022389
thanos: 0.24.0 -> 0.25.1
2022-03-20 03:35:50 +00:00
github-actions[bot]
3df8e35539
Merge staging-next into staging
2022-03-20 00:02:45 +00:00
Martin Weinelt
f4f3622cb1
Merge remote-tracking branch 'origin/staging-next' into staging
2022-03-20 00:00:32 +01:00
Martin Weinelt
b9acbc4b40
Merge pull request #164896 from mdlayher/mdl-apcupsd
2022-03-19 23:52:12 +01:00
Matt Layher
0f89cfb395
prometheus-apcupsd-exporter: 0.2.0 -> 0.3.0
...
Signed-off-by: Matt Layher <mdlayher@gmail.com>
2022-03-19 17:00:38 -04:00
R. Ryantm
b250ca540e
prometheus-wireguard-exporter: 3.5.0 -> 3.6.2
2022-03-19 16:56:12 -04:00
Maximilian Bosch
bee12c4c5e
grafana: 8.4.3 -> 8.4.4
...
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.4.4
2022-03-17 20:09:17 +01:00
zowoq
6431086967
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/symengine/default.nix
2022-03-16 16:03:43 +10:00
R. Ryantm
c42d6df03a
prometheus-redis-exporter: 1.35.1 -> 1.36.0
2022-03-15 06:36:47 +00:00
Alyssa Ross
d7e181ff83
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/development/compilers/ocaml/4.12.nix
pkgs/development/python-modules/oci/default.nix
pkgs/tools/admin/bubblewrap/default.nix
2022-03-14 12:33:16 +00:00
Maximilian Bosch
0c5586c2f2
Merge pull request #162254 from Ma27/init-dmarc-exporter
...
prometheus-dmarc-exporter: init at 0.5.1
2022-03-14 09:02:08 +01:00
R. Ryantm
313b5b581e
checkSSLCert: 2.21.0 -> 2.22.0
2022-03-12 03:53:18 +00:00
github-actions[bot]
eaea048b2a
Merge staging-next into staging
2022-03-11 00:02:48 +00:00
Martin Weinelt
76721f5e5e
Merge pull request #159986 from NukaDuka/pve_exporter
2022-03-10 22:41:45 +01:00