net-cpp: 3.1.1 -> 3.2.0 (#444658)

pkgs/by-name/ne/net-cpp/package.nix

@@ -2,8 +2,8 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
+  makeFontsConf,
   testers,
   # https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/issues/5
   boost186,
@@ -19,6 +19,7 @@
   properties-cpp,
   python3,
   validatePkgConfig,
+  writableTmpDirAsHomeHook,
 }:
 
 let
@@ -30,13 +31,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "net-cpp";
-  version = "3.1.1";
+  version = "3.2.0";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/net-cpp";
     rev = finalAttrs.version;
-    hash = "sha256-MSqdP3kGI9hDdxFv2a0yd5ZkFkf1lMurB+KDIZLR9jg=";
+    hash = "sha256-JfVSAwBWtHw7a0CtY5C1xuxThO3FbS4MgNuIO1CGuts=";
   };
 
   outputs = [
@@ -45,26 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  patches = [
-    # Be more lenient with how quickly HTTP test server must be up, for slower hardware / archs
-    (fetchpatch {
-      url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/941d9eceaa66a06eabb1eb79554548b47d4a60ab/debian/patches/1007_wait-for-flask.patch";
-      hash = "sha256-nsGkZBuqahsg70PLUxn5EluDjmfZ0/wSnOYimfAI4ag=";
-    })
-
-    # Bump std version to 14 for gtest 1.13+
-    (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";
-      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 ''
     # Use wrapped python. Removing just the /usr/bin doesn't seem to work?
     substituteInPlace tests/httpbin.h.in \
@@ -78,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     doxygen
     graphviz
     validatePkgConfig
+    writableTmpDirAsHomeHook # makes doc generation quieter
   ];
 
   buildInputs = [
@@ -99,10 +81,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    # https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/issues/4
-    (lib.cmakeBool "ENABLE_WERROR" false)
+    (lib.cmakeBool "ENABLE_WERROR" true)
   ];
 
+  env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
+
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
   # Tests start HTTP server in separate process with fixed URL, parallelism breaks things
@@ -113,13 +96,13 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple yet beautiful networking API for C++11";
     homepage = "https://gitlab.com/ubports/development/core/lib-cpp/net-cpp";
     changelog = "https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/blob/${finalAttrs.version}/ChangeLog";
-    license = licenses.lgpl3Only;
-    teams = [ teams.lomiri ];
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl3Only;
+    teams = [ lib.teams.lomiri ];
+    platforms = lib.platforms.linux;
     pkgConfigModules = [
       "net-cpp"
     ];