nur-packages

commit 966a51a90133426c3b1bae053972fa34280c3470
parent 820e68c02e59b7026441e8ec709b2c1c62c515a6
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Mon, 26 Feb 2024 08:07:25 +0400

Move influxdb-cxx to nixpkgs

Diffstat:
M
flake.lock
 | 
6
+++---
M
pkgs/default.nix
 | 
1
-
D
pkgs/mqtt/influxdb-cxx/default.nix
 | 
41
-----------------------------------------

3 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708751719,
-        "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=",
+        "lastModified": 1708847675,
+        "narHash": "sha256-RUZ7KEs/a4EzRELYDGnRB6i7M1Izii3JD/LyzH0c6Tg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89",
+        "rev": "2a34566b67bef34c551f204063faeecc444ae9da",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -426,7 +426,6 @@ lib.makeScope newScope (
 
     emitter = callPackage ./mqtt/emitter { };
     go-mqtt-to-influxdb = callPackage ./mqtt/go-mqtt-to-influxdb { };
-    influxdb-cxx = callPackage ./mqtt/influxdb-cxx { };
     ioxy = callPackage ./mqtt/ioxy { };
     janus-mqtt-proxy = callPackage ./mqtt/janus-mqtt-proxy { };
     libumqtt = callPackage ./mqtt/libumqtt { };
diff --git a/pkgs/mqtt/influxdb-cxx/default.nix b/pkgs/mqtt/influxdb-cxx/default.nix
@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, catch2_3, libcpr, trompeloeil }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "influxdb-cxx";
-  version = "0.7.2";
-
-  src = fetchFromGitHub {
-    owner = "offa";
-    repo = "influxdb-cxx";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-DFslPrbgqS3JGx62oWlsC+AN5J2CsFjGcDaDRCadw7E=";
-  };
-
-  patches = [
-    # Fix unclosed test case tag
-    (fetchpatch {
-      url = "https://github.com/offa/influxdb-cxx/commit/b31f94982fd1d50e89ce04f66c694bec108bf470.patch";
-      hash = "sha256-oSdpNlWV744VpzfiWzp0ziNKaReLTlyfJ+SF2qyH+TU=";
-    })
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [ boost libcpr ]
-    ++ lib.optionals finalAttrs.doCheck [ catch2_3 trompeloeil ];
-
-  cmakeFlags = [
-    (lib.cmakeBool "INFLUXCXX_TESTING" finalAttrs.doCheck)
-    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "-E;BoostSupportTest") # requires network access
-  ];
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "InfluxDB C++ client library";
-    inherit (finalAttrs.src.meta) homepage;
-    license = licenses.mit;
-    maintainers = [ maintainers.sikmir ];
-    platforms = platforms.unix;
-  };
-})