Commit 300f91c4 authored by urlordjames's avatar urlordjames
Browse files

drogon: 1.8.2 -> 1.8.3

parent 798513fd
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
{ 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