diff options
| author | Nicolas Benes <nbenes.gh@xandea.de> | 2024-02-23 11:11:09 +0100 |
|---|---|---|
| committer | Nicolas Benes <nbenes.gh@xandea.de> | 2024-02-23 11:11:09 +0100 |
| commit | bf9230c4bc5075392951b3e223c588e995259824 (patch) | |
| tree | 013b8bc747e5aa823ffce5df9cac4f0055d2d81b | |
| parent | 2571e9c054248e59cdd6cf931c272c7564a36a88 (diff) | |
fastcdr: 2.1.3 -> 2.2.0
https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.0
| -rw-r--r-- | pkgs/by-name/fa/fastcdr/0001-Do-not-require-wget-and-unzip.patch (renamed from pkgs/development/libraries/fastcdr/0001-Do-not-require-wget-and-unzip.patch) | 0 | ||||
| -rw-r--r-- | pkgs/by-name/fa/fastcdr/package.nix (renamed from pkgs/development/libraries/fastcdr/default.nix) | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 2 insertions, 12 deletions
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 index 8908beb082408..8908beb082408 100644 --- 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 diff --git a/pkgs/development/libraries/fastcdr/default.nix b/pkgs/by-name/fa/fastcdr/package.nix index a5f87ec7b3120..ef9042b0982ee 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 561247510148c..acae2e3c9f64b 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 { }; |