net-cpp: Fix FTBFS (#380547)

This commit is contained in:
Wolfgang Walther
2025-02-09 17:37:10 +01:00
committed by GitHub
2 changed files with 11 additions and 3 deletions

View File

@@ -5,7 +5,8 @@
fetchpatch, fetchpatch,
gitUpdater, gitUpdater,
testers, testers,
boost, # https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/issues/5
boost186,
cmake, cmake,
curl, curl,
doxygen, doxygen,
@@ -50,11 +51,18 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/941d9eceaa66a06eabb1eb79554548b47d4a60ab/debian/patches/1007_wait-for-flask.patch"; url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/941d9eceaa66a06eabb1eb79554548b47d4a60ab/debian/patches/1007_wait-for-flask.patch";
hash = "sha256-nsGkZBuqahsg70PLUxn5EluDjmfZ0/wSnOYimfAI4ag="; hash = "sha256-nsGkZBuqahsg70PLUxn5EluDjmfZ0/wSnOYimfAI4ag=";
}) })
# Bump std version to 14 for gtest 1.13+ # Bump std version to 14 for gtest 1.13+
(fetchpatch { (fetchpatch {
url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/f3a031eb7e4ce7df00781100f16de58a4709afcb/debian/patches/0001-Bump-std-version-to-14-needed-for-googletest-1.13.0.patch"; url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/f3a031eb7e4ce7df00781100f16de58a4709afcb/debian/patches/0001-Bump-std-version-to-14-needed-for-googletest-1.13.0.patch";
hash = "sha256-3ykqCfZjtTx7zWQ5rkMhVp7D5fkpoCjl0CVFwwEd4U4="; hash = "sha256-3ykqCfZjtTx7zWQ5rkMhVp7D5fkpoCjl0CVFwwEd4U4=";
}) })
# Fix newer flask rejecting large chunks by default
(fetchpatch {
url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/f2050b5318cba3860fa1042e9b81e1b792b972c4/debian/patches/1008_set-MAX-CONTENT-LENGTH-for-flask-server-to-let-it-accept-big-chunks-of-data.patch";
hash = "sha256-lfMRjpmysrhzdG6OOSpBGvYJCi1hrERI/SRf+rAakbA=";
})
]; ];
postPatch = lib.optionalString finalAttrs.finalPackage.doCheck '' postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
@@ -73,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
buildInputs = [ buildInputs = [
boost boost186
curl curl
]; ];

View File

@@ -4,7 +4,7 @@
fetchFromGitLab, fetchFromGitLab,
gitUpdater, gitUpdater,
testers, testers,
# Pin Boost 1.86 due to use of boost::asio::io_service. # https://gitlab.com/ubports/development/core/biometryd/-/issues/8
boost186, boost186,
cmake, cmake,
cmake-extras, cmake-extras,