NixOS · Apr 28, 2020 · Jun 22, 2020 · Jun 22, 2020 · Jun 22, 2020 · Jun 23, 2020
Showing with 55 additions and 36 deletions.

+48 −0 pkgs/development/libraries/libprom/default.nix

+5 −0 pkgs/servers/home-assistant/default.nix

+0 −34 pkgs/tools/networking/connman/connmanui/default.nix

+2 −2 pkgs/top-level/all-packages.nix
diff --git a/pkgs/development/libraries/libprom/default.nix b/pkgs/development/libraries/libprom/default.nix
@@ -0,0 +1,48 @@
+{ gccStdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+}:
+let
+  stdenv = gccStdenv; # Darwin is clang by default and it doesn't work for this.
+in
+stdenv.mkDerivation rec {
+  pname = "libprom";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "digitalocean";
+    repo = "prometheus-client-c";
+    rev = "v${version}";
+    sha256 = "0g69s24xwrv5974acshrhnp6i8rpby8c6bhz15m3d8kpgjw3cm8f";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  doCheck = false;
+
+  patches = [
+     # Required so CMAKE_INSTALL_PREFIX is honored, otherwise it
+     # installs headers in /usr/include (absolute)
+    (fetchpatch {
+      url = "https://github.com/digitalocean/prometheus-client-c/commit/5fcedeb506b7d47dd7bab35797f2c3f23db6fe10.patch";
+      sha256 = "10hzg8v5jcgxz224kdq0nha9vs78wz098b0ys7gig2iwgrg018fy";
+    }) 
+    (fetchpatch {
+      url = "https://github.com/digitalocean/prometheus-client-c/commit/0c15e7e45ad0c3726593591fdd7d8f2fde845fe3.patch";
+      sha256 = "06899v1xz3lpsdxww4p3q7pv8nrymnibncdc472056znr5fidlp0";
+    }) 
+  ];
+
+  preConfigure = ''
+    cd prom
+  '';
+
+  meta = {
+    homepage = "https://github.com/digitalocean/prometheus-client-c/";
+    description = "A Prometheus Client in C";
+    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.cfsmp3 ];
+  };
+
+}
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
@@ -27,6 +27,11 @@ let
     (mkOverride "astral" "1.10.1"
       "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
 
+    # We have 3.x in nixpkgs which is incompatible with home-assistant atm:
+    # https://github.com/home-assistant/core/blob/dev/requirements_all.txt
+    (mkOverride "pyowm" "2.10.0"
+      "1xvcv3sbcn9na8cwz21nnjlixysfk5lymnf65d1nqkbgacc1mm4g")
+
     # required by aioesphomeapi
     (self: super: {
       protobuf = super.protobuf.override {

diff --git a/pkgs/tools/networking/connman/connmanui/default.nix b/pkgs/tools/networking/connman/connmanui/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -2589,8 +2589,6 @@ in
 
   connman-notify = callPackage ../tools/networking/connman/connman-notify { };
 
-  connmanui = callPackage ../tools/networking/connman/connmanui { };
-
   connman_dmenu = callPackage ../tools/networking/connman/connman_dmenu  { };
 
   convertlit = callPackage ../tools/text/convertlit { };
@@ -13427,6 +13425,8 @@ in
 
   libpqxx = callPackage ../development/libraries/libpqxx { };
 
+  libprom = callPackage ../development/libraries/libprom { };
+
   libproxy = callPackage ../development/libraries/libproxy {
     inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore;
   };