Merge pull request #212206 from urlordjames/drogon-bump

drogon: 1.8.2 -> 1.8.3
This commit is contained in:
Nick Cao 2023-01-29 07:52:25 +08:00 committed by GitHub
commit 8448a6eaaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib
{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib, fetchpatch
# optional but of negligible size
, openssl, brotli, c-ares
# optional databases
@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "drogon";
version = "1.8.2";
version = "1.8.3";
src = fetchFromGitHub {
owner = "drogonframework";
repo = "drogon";
rev = "v${version}";
sha256 = "sha256-IpECYpPuheoLelEdgV+J26b+95fMfRmeQ44q6JvqRtw=";
sha256 = "sha256-I3f/8TMGm1G4CFMJJLyiVYso9yTHjeLefS5eaGySvC4=";
fetchSubmodules = true;
};
@ -43,6 +43,12 @@ stdenv.mkDerivation rec {
# this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself
# this patch makes drogon and trantor visible to the test
./fix_find_package.patch
# see https://github.com/drogonframework/drogon/issues/1491
(fetchpatch {
url = "https://github.com/drogonframework/drogon/commit/7d87d7e0b264ce53aa5ee006fb022d3516c9d666.patch";
sha256 = "sha256-C4zH9oNMfhkaeVNvZuBuzu1v2vNgg/t+YPitbrmHg+Y=";
})
];
# modifying PATH here makes drogon_ctl visible to the test