diff options
Diffstat (limited to 'nixpkgs/pkgs/by-name/fa')
| -rw-r--r-- | nixpkgs/pkgs/by-name/fa/fangfrisch/package.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/fa/fastcdr/0001-Do-not-require-wget-and-unzip.patch | 34 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/fa/fastcdr/package.nix | 56 |
3 files changed, 92 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/by-name/fa/fangfrisch/package.nix b/nixpkgs/pkgs/by-name/fa/fangfrisch/package.nix index e49633ae01b7..500794ff4c16 100644 --- a/nixpkgs/pkgs/by-name/fa/fangfrisch/package.nix +++ b/nixpkgs/pkgs/by-name/fa/fangfrisch/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: let - version = "1.8.0"; + version = "1.8.1"; in python3.pkgs.buildPythonApplication { pname = "fangfrisch"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication { owner = "rseichter"; repo = "fangfrisch"; rev = "refs/tags/${version}"; - hash = "sha256-lZDChg7og98LY20IaafVGM487F/anrVIBB39dp2r2g0="; + hash = "sha256-j5IUAMDXndLttQZQV3SZXdDka8bKDcwbotY2Nop3izc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/by-name/fa/fastcdr/0001-Do-not-require-wget-and-unzip.patch b/nixpkgs/pkgs/by-name/fa/fastcdr/0001-Do-not-require-wget-and-unzip.patch new file mode 100644 index 000000000000..8908beb08240 --- /dev/null +++ b/nixpkgs/pkgs/by-name/fa/fastcdr/0001-Do-not-require-wget-and-unzip.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +Date: Sat, 5 Jun 2021 14:50:26 +0200 +Subject: [PATCH] Do not require wget and unzip + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2261fe7..ce8edad 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -243,21 +243,6 @@ if(BUILD_DOCUMENTATION) + set(DOXYFILE_MAKE make.bat) + endif() + +- if(NOT CHECK_DOCUMENTATION) +- find_program(WGET_EXE wget) +- if(WGET_EXE) +- message(STATUS "Found WGet: ${WGET_EXE}") +- else() +- message(FATAL_ERROR "wget is needed to build the documentation. Please install it correctly") +- endif() +- find_program(UNZIP_EXE unzip) +- if(UNZIP_EXE) +- message(STATUS "Found Unzip: ${UNZIP_EXE}") +- else() +- message(FATAL_ERROR "unzip is needed to build the documentation. Please install it correctly") +- endif() +- endif() +- + # Target to create documentation directories + add_custom_target(docdirs + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/doc +-- +2.40.1 + diff --git a/nixpkgs/pkgs/by-name/fa/fastcdr/package.nix b/nixpkgs/pkgs/by-name/fa/fastcdr/package.nix new file mode 100644 index 000000000000..ef9042b0982e --- /dev/null +++ b/nixpkgs/pkgs/by-name/fa/fastcdr/package.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, gtest +, withDocs ? true +, doxygen +, graphviz-nox +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fastcdr"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "eProsima"; + repo = "Fast-CDR"; + rev = "v${finalAttrs.version}"; + hash = "sha256-hhYNgBLJCTZV/fgHEH7rxlTy+qpShAykxHLbPtPA/Uw="; + }; + + patches = [ + ./0001-Do-not-require-wget-and-unzip.patch + ]; + + 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" + ++ lib.optional withDocs "-DBUILD_DOCUMENTATION=ON"; + + outputs = [ "out" ] ++ lib.optional withDocs "doc"; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals withDocs [ + doxygen + graphviz-nox + ]; + + doCheck = true; + + checkInputs = [ gtest ]; + + meta = with lib; { + homepage = "https://github.com/eProsima/Fast-CDR"; + description = "Serialization library for OMG's Common Data Representation (CDR)"; + longDescription = '' + A C++ library that provides two serialization mechanisms. One is the + standard CDR serialization mechanism, while the other is a faster + implementation that modifies the standard. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ panicgh ]; + platforms = platforms.unix; + }; +}) |