Unverified Commit 06e93417 authored by Jeffrey Lau's avatar Jeffrey Lau
Browse files

sexp: 0.8.6 -> sexpp 0.8.7

Package has been renamed from 'sexp' to 'sexpp' since v0.8.7.
parent 0d5682ac
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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 ];
+6 −3
Original line number Diff line number Diff line
@@ -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"}"
+50 −0
Original line number Diff line number Diff line
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 "$<LINK_ONLY:sexp>")
+    list(REMOVE_ITEM val "$<LINK_ONLY:sexpp>")
     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")
+1 −0
Original line number Diff line number Diff line
@@ -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
Loading