From 06e9341752d178a2cd42ba3ba714504825dcdb6c Mon Sep 17 00:00:00 2001 From: Jeffrey Lau Date: Mon, 3 Jul 2023 19:08:56 +0800 Subject: [PATCH] sexp: 0.8.6 -> sexpp 0.8.7 Package has been renamed from 'sexp' to 'sexpp' since v0.8.7. --- .../libraries/{sexp => sexpp}/default.nix | 8 +-- pkgs/tools/security/rnp/default.nix | 9 ++-- .../security/rnp/sexp_sexpp_rename.patch | 50 +++++++++++++++++++ ...bundle-sexp.patch => unbundle-sexpp.patch} | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 62 insertions(+), 8 deletions(-) rename pkgs/development/libraries/{sexp => sexpp}/default.nix (88%) create mode 100644 pkgs/tools/security/rnp/sexp_sexpp_rename.patch rename pkgs/tools/security/rnp/{unbundle-sexp.patch => unbundle-sexpp.patch} (100%) diff --git a/pkgs/development/libraries/sexp/default.nix b/pkgs/development/libraries/sexpp/default.nix similarity index 88% rename from pkgs/development/libraries/sexp/default.nix rename to pkgs/development/libraries/sexpp/default.nix index 9f9eb1f8973c..dd41d520d28c 100644 --- a/pkgs/development/libraries/sexp/default.nix +++ b/pkgs/development/libraries/sexpp/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "sexp"; - version = "0.8.6"; + pname = "sexpp"; + version = "0.8.7"; src = fetchFromGitHub { owner = "rnpgp"; - repo = "sexp"; + repo = "sexpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-NpDSoBxEM8g/SugLmT8E5+YZPDFIGHa4eXLjdzQxaiw="; + hash = "sha256-E1ESN3JKCWYBt1o37d7EVcgARnwGKS6mxua+0m1RMlM="; }; buildInputs = [ zlib bzip2 ]; diff --git a/pkgs/tools/security/rnp/default.nix b/pkgs/tools/security/rnp/default.nix index b0a7a0f166f5..9a3796aeb42e 100644 --- a/pkgs/tools/security/rnp/default.nix +++ b/pkgs/tools/security/rnp/default.nix @@ -10,7 +10,7 @@ , json_c , pkg-config , python3 -, sexp +, sexpp , zlib }: @@ -25,9 +25,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4fB7Sl9+ATrJTRnhbNG5BoW3XLxR7IP167RK96+gxj0="; }; - buildInputs = [ zlib bzip2 json_c botan2 sexp ]; + buildInputs = [ zlib bzip2 json_c botan2 sexpp ]; - patches = [ ./unbundle-sexp.patch ]; + patches = [ + ./unbundle-sexpp.patch + ./sexp_sexpp_rename.patch + ]; cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" diff --git a/pkgs/tools/security/rnp/sexp_sexpp_rename.patch b/pkgs/tools/security/rnp/sexp_sexpp_rename.patch new file mode 100644 index 000000000000..a86d205139f7 --- /dev/null +++ b/pkgs/tools/security/rnp/sexp_sexpp_rename.patch @@ -0,0 +1,50 @@ +diff --git i/src/lib/CMakeLists.txt w/src/lib/CMakeLists.txt +index 086ac57d..2ce59ca1 100755 +--- i/src/lib/CMakeLists.txt ++++ w/src/lib/CMakeLists.txt +@@ -328,7 +328,7 @@ elseif (CRYPTO_BACKEND_OPENSSL) + target_link_libraries(librnp-obj PRIVATE OpenSSL::Crypto) + endif() + +-target_link_libraries(librnp-obj PRIVATE sexp) ++target_link_libraries(librnp-obj PRIVATE sexpp) + + set_target_properties(librnp-obj PROPERTIES CXX_VISIBILITY_PRESET hidden) + if (TARGET BZip2::BZip2) +@@ -384,7 +384,7 @@ foreach (prop LINK_LIBRARIES INTERFACE_LINK_LIBRARIES INCLUDE_DIRECTORIES INTERF + get_target_property(val librnp-obj ${prop}) + if (BUILD_SHARED_LIBS) + set_property(TARGET librnp-static PROPERTY ${prop} ${val}) +- list(REMOVE_ITEM val "$") ++ list(REMOVE_ITEM val "$") + set_property(TARGET librnp PROPERTY ${prop} ${val}) + else() + set_property(TARGET librnp PROPERTY ${prop} ${val}) +diff --git i/src/librekey/g23_sexp.hpp w/src/librekey/g23_sexp.hpp +index b888680f..b062c52f 100644 +--- i/src/librekey/g23_sexp.hpp ++++ w/src/librekey/g23_sexp.hpp +@@ -27,8 +27,8 @@ + #ifndef RNP_G23_SEXP_HPP + #define RNP_G23_SEXP_HPP + +-#include "sexp/sexp.h" +-#include "sexp/ext-key-format.h" ++#include "sexpp/sexp.h" ++#include "sexpp/ext-key-format.h" + + #define SXP_MAX_DEPTH 30 + +diff --git i/src/tests/CMakeLists.txt w/src/tests/CMakeLists.txt +index 7d2a6b0c..88aeaf9f 100644 +--- i/src/tests/CMakeLists.txt ++++ w/src/tests/CMakeLists.txt +@@ -176,7 +176,7 @@ target_link_libraries(rnp_tests + PRIVATE + librnp-static + JSON-C::JSON-C +- sexp ++ sexpp + ${GTestMain} + ) + if (CRYPTO_BACKEND_LOWERCASE STREQUAL "openssl") diff --git a/pkgs/tools/security/rnp/unbundle-sexp.patch b/pkgs/tools/security/rnp/unbundle-sexpp.patch similarity index 100% rename from pkgs/tools/security/rnp/unbundle-sexp.patch rename to pkgs/tools/security/rnp/unbundle-sexpp.patch diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dac19c2f4da4..0abb5bd02b10 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1543,6 +1543,7 @@ mapAliases ({ sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 session-desktop-appimage = session-desktop; sequoia = sequoia-sq; # Added 2023-06-26 + sexp = sexpp; # Added 2023-07-03 sget = throw "sget has been removed from nixpkgs, as it is not supported upstream anymore see https://github.com/sigstore/sget/issues/145"; # Added 2023-05-26 shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb773146d539..5ee5bf43d681 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12514,7 +12514,7 @@ with pkgs; sewer = callPackage ../tools/admin/sewer { }; - sexp = callPackage ../development/libraries/sexp { }; + sexpp = callPackage ../development/libraries/sexpp { }; sfeed = callPackage ../tools/misc/sfeed { };