pyrox.dev
Merge pull request #212206 from urlordjames/drogon-bump
drogon: 1.8.2 -> 1.8.3
+9
-3
pkgs/development/libraries/drogon/default.nix
+9
-3
pkgs/development/libraries/drogon/default.nix
···
1
-
{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib
2
# optional but of negligible size
3
, openssl, brotli, c-ares
4
# optional databases
···
9
10
stdenv.mkDerivation rec {
11
pname = "drogon";
12
-
version = "1.8.2";
13
14
src = fetchFromGitHub {
15
owner = "drogonframework";
16
repo = "drogon";
17
rev = "v${version}";
18
-
sha256 = "sha256-IpECYpPuheoLelEdgV+J26b+95fMfRmeQ44q6JvqRtw=";
19
fetchSubmodules = true;
20
};
21
···
43
# this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself
44
# this patch makes drogon and trantor visible to the test
45
./fix_find_package.patch
46
];
47
48
# modifying PATH here makes drogon_ctl visible to the test
···
1
+
{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib, fetchpatch
2
# optional but of negligible size
3
, openssl, brotli, c-ares
4
# optional databases
···
9
10
stdenv.mkDerivation rec {
11
pname = "drogon";
12
+
version = "1.8.3";
13
14
src = fetchFromGitHub {
15
owner = "drogonframework";
16
repo = "drogon";
17
rev = "v${version}";
18
+
sha256 = "sha256-I3f/8TMGm1G4CFMJJLyiVYso9yTHjeLefS5eaGySvC4=";
19
fetchSubmodules = true;
20
};
21
···
43
# this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself
44
# this patch makes drogon and trantor visible to the test
45
./fix_find_package.patch
46
+
47
+
# see https://github.com/drogonframework/drogon/issues/1491
48
+
(fetchpatch {
49
+
url = "https://github.com/drogonframework/drogon/commit/7d87d7e0b264ce53aa5ee006fb022d3516c9d666.patch";
50
+
sha256 = "sha256-C4zH9oNMfhkaeVNvZuBuzu1v2vNgg/t+YPitbrmHg+Y=";
51
+
})
52
];
53
54
# modifying PATH here makes drogon_ctl visible to the test