From bf9230c4bc5075392951b3e223c588e995259824 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Fri, 23 Feb 2024 11:11:09 +0100
Subject: [PATCH] fastcdr: 2.1.3 -> 2.2.0

https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.0
---
 .../fastcdr/0001-Do-not-require-wget-and-unzip.patch |  0
 .../default.nix => by-name/fa/fastcdr/package.nix}   | 12 ++----------
 pkgs/top-level/all-packages.nix                      |  2 --
 3 files changed, 2 insertions(+), 12 deletions(-)
 rename pkgs/{development/libraries => by-name/fa}/fastcdr/0001-Do-not-require-wget-and-unzip.patch (100%)
 rename pkgs/{development/libraries/fastcdr/default.nix => by-name/fa/fastcdr/package.nix} (79%)

diff --git a/pkgs/development/libraries/fastcdr/0001-Do-not-require-wget-and-unzip.patch b/pkgs/by-name/fa/fastcdr/0001-Do-not-require-wget-and-unzip.patch
similarity index 100%
rename from pkgs/development/libraries/fastcdr/0001-Do-not-require-wget-and-unzip.patch
rename to pkgs/by-name/fa/fastcdr/0001-Do-not-require-wget-and-unzip.patch
diff --git a/pkgs/development/libraries/fastcdr/default.nix b/pkgs/by-name/fa/fastcdr/package.nix
similarity index 79%
rename from pkgs/development/libraries/fastcdr/default.nix
rename to pkgs/by-name/fa/fastcdr/package.nix
index a5f87ec7b312..ef9042b0982e 100644
--- a/pkgs/development/libraries/fastcdr/default.nix
+++ b/pkgs/by-name/fa/fastcdr/package.nix
@@ -10,27 +10,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastcdr";
-  version = "2.1.3";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "eProsima";
     repo = "Fast-CDR";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eSf6LNTVsGEBXjTmTBjjWKBqs68pbnVcw1p2bi1Asgg=";
+    hash = "sha256-hhYNgBLJCTZV/fgHEH7rxlTy+qpShAykxHLbPtPA/Uw=";
   };
 
   patches = [
     ./0001-Do-not-require-wget-and-unzip.patch
   ];
 
-  # Fix doc generation error with doxygen >= 1.10.0
-  # see https://github.com/eProsima/Fast-CDR/issues/193
-  postPatch = ''
-    substituteInPlace ./doxyfile.in --replace \
-      "WARN_AS_ERROR          = YES" \
-      "WARN_AS_ERROR          = NO"
-  '';
-
   cmakeFlags = lib.optional (stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=OFF"
   # upstream turns BUILD_TESTING=OFF by default and doesn't honor cmake's default (=ON)
   ++ lib.optional (finalAttrs.finalPackage.doCheck) "-DBUILD_TESTING=ON"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 561247510148..acae2e3c9f64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21055,8 +21055,6 @@ with pkgs;
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  fastcdr = callPackage ../development/libraries/fastcdr { };
-
   fbthrift = callPackage ../development/libraries/fbthrift { };
 
   fb303 = callPackage ../development/libraries/fb303 { };