From 155e0efff1f8413b9208b2c2f06e2a4b956d0654 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 22 Jun 2023 17:03:22 +0800 Subject: [PATCH 1/2] rsyslog: remove dependency on libmongo-client The dependencies has been dropped in https://github.com/rsyslog/rsyslog/pull/1917 --- pkgs/tools/system/rsyslog/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 75f9b62148b2..364ce66de8c5 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -49,7 +49,6 @@ , withRdkafka ? true , rdkafka , withMongo ? true -, libmongo-client , mongoc , withCzmq ? true , czmq @@ -97,7 +96,7 @@ stdenv.mkDerivation rec { ++ lib.optional withNet libnet ++ lib.optional withHadoop hadoop ++ lib.optional withRdkafka rdkafka - ++ lib.optionals withMongo [ libmongo-client mongoc ] + ++ lib.optionals withMongo [ mongoc ] ++ lib.optional withCzmq czmq ++ lib.optional withRabbitmq rabbitmq-c ++ lib.optional withHiredis hiredis From 485f278c558be723aabcf0fdb22f4f8a49ce49e1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 22 Jun 2023 17:05:09 +0800 Subject: [PATCH 2/2] libmongo-client: drop as upstream has gone --- .../libraries/libmongo-client/default.nix | 29 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/development/libraries/libmongo-client/default.nix diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix deleted file mode 100644 index a6a20141cc62..000000000000 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }: - -stdenv.mkDerivation rec { - pname = "libmongo-client"; - version = "0.1.8"; - - src = fetchFromGitHub { - owner = "algernon"; - repo = "libmongo-client"; - rev = "${pname}-${version}"; - sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ ]; - propagatedBuildInputs = [ glib ]; - - postPatch = '' - # Fix when uses glib in public headers - sed -i 's/Requires.private/Requires/g' src/libmongo-client.pc.in - ''; - - meta = with lib; { - homepage = "http://algernon.github.io/libmongo-client/"; - description = "An alternative C driver for MongoDB"; - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b900ab03e9ed..220a06196132 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -879,6 +879,7 @@ mapAliases ({ liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22 libmicrohttpd_0_9_70 = throw "'libmicrohttpd_0_9_70' has been removed because it is insecure, and has been replaced by 'libmicrohttpd_0_9_69' and 'libmicrohttpd_0_9_71'"; # Added 2022-10-10 + libmongo-client = throw "'libmongo-client' has been removed, upstream gone"; # Added 2023-06-22 libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22 libnih = throw "'libnih' has been removed"; # Converted to throw 2022-05-17 libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d874c8c9a74..2d24796bd0f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9904,8 +9904,6 @@ with pkgs; libmbim = callPackage ../development/libraries/libmbim { }; - libmongo-client = callPackage ../development/libraries/libmongo-client { }; - libmongocrypt = callPackage ../development/libraries/libmongocrypt { }; libmesode = callPackage ../development/libraries/libmesode { };