From acd6ceaf096df7ccd321b202409b385d09a6a130 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Tue, 6 Sep 2022 12:18:12 +0300 Subject: [PATCH] exportarr: switch category Applied suggestions[1] from @mweinelt and did a small refactor. [1]: https://github.com/NixOS/nixpkgs/pull/183772#issuecomment-1237014790 --- .../{ => prometheus}/exportarr/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/servers/monitoring/{ => prometheus}/exportarr/default.nix (79%) diff --git a/pkgs/servers/monitoring/exportarr/default.nix b/pkgs/servers/monitoring/prometheus/exportarr/default.nix similarity index 79% rename from pkgs/servers/monitoring/exportarr/default.nix rename to pkgs/servers/monitoring/prometheus/exportarr/default.nix index 911708a53c0c..f0ca48ac5bd5 100644 --- a/pkgs/servers/monitoring/exportarr/default.nix +++ b/pkgs/servers/monitoring/prometheus/exportarr/default.nix @@ -12,22 +12,22 @@ buildGoModule rec { owner = "onedr0p"; repo = "exportarr"; rev = "v${version}"; - hash = "sha256-KTuOhyBFS6fgA9N70vq+5fJIGVsgEZ7Uxls8efqLuII="; + sha256 = "sha256-KTuOhyBFS6fgA9N70vq+5fJIGVsgEZ7Uxls8efqLuII="; }; vendorSha256 = "sha256-Yox3LAVbTZqsDmk45uSuKgITRz3zE+HTAKxVf9wdtjE="; subPackages = [ "cmd/exportarr" ]; - ldflags = [ - "-s" - "-w" - ] ++ lib.optionals stdenv.isLinux [ - "-extldflags=-static" - ]; + CGO_ENABLE = 0; + + ldflags = [ "-s" "-w" ]; tags = lib.optionals stdenv.isLinux [ "netgo" ]; + # There are no tests for this package. + doCheck = false; + meta = with lib; { description = "AIO Prometheus Exporter for Sonarr, Radarr or Lidarr"; homepage = "https://github.com/onedr0p/exportarr"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e74db21f7572..a7a297621b5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6178,7 +6178,7 @@ with pkgs; expect = callPackage ../tools/misc/expect { }; - exportarr = callPackage ../servers/monitoring/exportarr { }; + exportarr = callPackage ../servers/monitoring/prometheus/exportarr { }; expliot = callPackage ../tools/security/expliot { };