Merge pull request #202609 from archer-65/update/mongoc

mongoc: 1.8.0 -> 1.23.1

authored by

Guillaume Girol and committed by
GitHub
2058a48b 017dafba

+31 -7
+6
maintainers/maintainer-list.nix
··· 1071 1071 githubId = 56009; 1072 1072 name = "Arcadio Rubio García"; 1073 1073 }; 1074 + archer-65 = { 1075 + email = "mario.liguori.056@gmail.com"; 1076 + github = "archer-65"; 1077 + githubId = 76066109; 1078 + name = "Mario Liguori"; 1079 + }; 1074 1080 archseer = { 1075 1081 email = "blaz@mxxn.io"; 1076 1082 github = "archseer";
+25 -7
pkgs/development/libraries/mongoc/default.nix
··· 1 - { lib, stdenv, fetchzip, perl, pkg-config, libbson 2 - , openssl, which, zlib, snappy 1 + { 2 + lib, 3 + stdenv, 4 + fetchzip, 5 + cmake, 6 + pkg-config, 7 + perl, 8 + openssl, 9 + zlib, 10 + cyrus_sasl, 11 + libbson, 12 + snappy, 3 13 }: 4 - 5 14 stdenv.mkDerivation rec { 6 15 pname = "mongoc"; 7 - version = "1.8.0"; 16 + version = "1.23.1"; 8 17 9 18 src = fetchzip { 10 19 url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; 11 20 sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; 12 21 }; 13 22 14 - nativeBuildInputs = [ pkg-config which perl ]; 15 - buildInputs = [ openssl zlib ]; 16 - propagatedBuildInputs = [ libbson snappy ]; 23 + # https://github.com/NixOS/nixpkgs/issues/25585 24 + preFixup = ''rm -rf "$(pwd)" ''; 25 + 26 + nativeBuildInputs = [cmake pkg-config perl]; 27 + buildInputs = [openssl zlib cyrus_sasl]; 28 + propagatedBuildInputs = [libbson snappy]; 29 + 30 + # -DMONGOC_TEST_USE_CRYPT_SHARED=OFF 31 + # The `mongodl.py` script is causing issues, and you also need to disabled sandboxing for it. However, it is used only to run some tests. 32 + # https://www.mongodb.com/community/forums/t/problem-downloading-crypt-shared-when-installing-the-mongodb-c-driver/189370 33 + cmakeFlags = ["-DCMAKE_BUILD_TYPE=Release" "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF" "-DMONGOC_TEST_USE_CRYPT_SHARED=OFF"]; 17 34 18 35 enableParallelBuilding = true; 19 36 ··· 22 39 homepage = "http://mongoc.org"; 23 40 license = licenses.asl20; 24 41 mainProgram = "mongoc-stat"; 42 + maintainers = with maintainers; [archer-65]; 25 43 platforms = platforms.all; 26 44 }; 27 45 }