diff options
author | Nick Cao <nickcao@nichi.co> | 2023-01-29 07:52:25 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-29 07:52:25 +0800 |
commit | 8448a6eaaad4bc6de02602a12f7a94e1968abd30 (patch) | |
tree | 4fff7adc20ae95972bf887e863dda6f339ceca8a | |
parent | 4d9b5b79a6b0beb6fa96884b06484b173e88b4e2 (diff) | |
parent | 300f91c41d04395fa2b9bf3dca79e8fe89912c75 (diff) | |
download | nixpkgs-8448a6eaaad4bc6de02602a12f7a94e1968abd30.tar nixpkgs-8448a6eaaad4bc6de02602a12f7a94e1968abd30.tar.gz nixpkgs-8448a6eaaad4bc6de02602a12f7a94e1968abd30.tar.bz2 nixpkgs-8448a6eaaad4bc6de02602a12f7a94e1968abd30.tar.lz nixpkgs-8448a6eaaad4bc6de02602a12f7a94e1968abd30.tar.xz nixpkgs-8448a6eaaad4bc6de02602a12f7a94e1968abd30.tar.zst nixpkgs-8448a6eaaad4bc6de02602a12f7a94e1968abd30.zip |
Merge pull request #212206 from urlordjames/drogon-bump
drogon: 1.8.2 -> 1.8.3
-rw-r--r-- | pkgs/development/libraries/drogon/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 3df87efba19..0eca838dfce 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -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 |