public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"

Browse Source 
This reverts commit 4e6bf03504, reversing
changes made to afd997aab6.

Instead we propagate those frameworks from the compiler again
This commit is contained in:
Jörg Thalheim
2020-03-27 07:33:21 +00:00
parent 0bba7474b3
commit 066db11215
133 changed files with 443 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
+1 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "dnsmasq_exporter";
@@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "1ag1k0z35zkazaxj8hh2wxfj73xg63xdybfm1565il2vxs5986dh";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "A dnsmasq exporter for Prometheus";
pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
+1 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "mikrotik-exporter-unstable";
@@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Prometheus MikroTik device(s) exporter";
pkgs/servers/monitoring/prometheus/varnish-exporter.nix
+4 -6
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, varnish, Security }:
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish }:
buildGoModule rec {
pname = "prometheus_varnish_exporter";
@@ -15,8 +15,6 @@ buildGoModule rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
postInstall = ''
wrapProgram $out/bin/prometheus_varnish_exporter \
--prefix PATH : "${varnish}/bin"
@@ -24,10 +22,10 @@ buildGoModule rec {
doCheck = true;
meta = with stdenv.lib; {
meta = {
homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter";
description = "Varnish exporter for Prometheus";
license = licenses.mit;
maintainers = with maintainers; [ MostAwesomeDude willibutz ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ];
};
}