From a8852918fbdf8eeaf00b63924b9bf0eeb3bfc121 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 11 Apr 2026 00:32:08 +0400 Subject: [PATCH] =?UTF-8?q?nchat:=205.13.17=20=E2=86=92=205.14.44?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/nc/nchat/fix-darwin.patch | 105 +++++++++++++++++----- pkgs/by-name/nc/nchat/go-libs-build.patch | 26 +++--- pkgs/by-name/nc/nchat/package.nix | 6 +- 3 files changed, 99 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/nc/nchat/fix-darwin.patch b/pkgs/by-name/nc/nchat/fix-darwin.patch index c7c5ad14c8cc..d5acedafba5d 100644 --- a/pkgs/by-name/nc/nchat/fix-darwin.patch +++ b/pkgs/by-name/nc/nchat/fix-darwin.patch @@ -1,34 +1,95 @@ -diff --git i/CMakeLists.txt w/CMakeLists.txt -index ceff715b..143659fb 100644 ---- i/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -31,30 +31,6 @@ endif() +diff --git c/CMakeLists.txt i/CMakeLists.txt +index bc227885..143382b3 100644 +--- c/CMakeLists.txt ++++ i/CMakeLists.txt +@@ -30,91 +30,6 @@ endif() + # Platform specifics if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") add_definitions(-D_XOPEN_SOURCE_EXTENDED) - +- - # ncurses -- execute_process(COMMAND sh "-c" -- "command -v brew &> /dev/null && brew --prefix ncurses 2> /dev/null | tr -d '\n'" -- OUTPUT_VARIABLE NCURSES_ROOT_DIR) -- if (EXISTS "${NCURSES_ROOT_DIR}") -- message(STATUS "Ncurses cmake prefix '${NCURSES_ROOT_DIR}' (detected).") +- if (DEFINED NCURSES_ROOT_DIR AND EXISTS "${NCURSES_ROOT_DIR}") +- message(STATUS "Ncurses cmake prefix '${NCURSES_ROOT_DIR}' (user-specified)") - else() -- set(NCURSES_ROOT_DIR /opt/local) -- message(STATUS "Ncurses cmake prefix '${NCURSES_ROOT_DIR}' (default).") +- execute_process(COMMAND sh "-c" +- "command -v brew &> /dev/null && brew --prefix ncurses 2> /dev/null | tr -d '\n'" +- OUTPUT_VARIABLE NCURSES_ROOT_DIR) +- if (EXISTS "${NCURSES_ROOT_DIR}") +- message(STATUS "Ncurses cmake prefix '${NCURSES_ROOT_DIR}' (homebrew)") +- else() +- foreach(FALLBACK_DIR /opt/homebrew/opt/ncurses /usr/local/opt/ncurses) +- if (EXISTS "${FALLBACK_DIR}") +- set(NCURSES_ROOT_DIR "${FALLBACK_DIR}") +- break() +- endif() +- endforeach() +- if (EXISTS "${NCURSES_ROOT_DIR}") +- message(STATUS "Ncurses cmake prefix '${NCURSES_ROOT_DIR}' (fallback)") +- elseif (EXISTS "/opt/local") +- set(NCURSES_ROOT_DIR "/opt/local") +- message(STATUS "Ncurses cmake prefix '${NCURSES_ROOT_DIR}' (macports)") +- endif() +- endif() +- endif() +- if (EXISTS "${NCURSES_ROOT_DIR}") +- list(APPEND CMAKE_PREFIX_PATH ${NCURSES_ROOT_DIR}) - endif() -- list(APPEND CMAKE_PREFIX_PATH ${NCURSES_ROOT_DIR}) - - # openssl -- execute_process(COMMAND sh "-c" -- "command -v brew &> /dev/null && brew --prefix openssl 2> /dev/null | tr -d '\n'" -- OUTPUT_VARIABLE OPENSSL_ROOT_DIR) -- if (EXISTS "${OPENSSL_ROOT_DIR}") -- message(STATUS "OpenSSL cmake prefix '${OPENSSL_ROOT_DIR}' (detected).") +- if (DEFINED OPENSSL_ROOT_DIR AND EXISTS "${OPENSSL_ROOT_DIR}") +- message(STATUS "OpenSSL cmake prefix '${OPENSSL_ROOT_DIR}' (user-specified)") - else() -- set(OPENSSL_ROOT_DIR /opt/local) -- message(STATUS "OpenSSL cmake prefix '${OPENSSL_ROOT_DIR}' (default).") +- execute_process(COMMAND sh "-c" +- "command -v brew &> /dev/null && brew --prefix openssl 2> /dev/null | tr -d '\n'" +- OUTPUT_VARIABLE OPENSSL_ROOT_DIR) +- if (EXISTS "${OPENSSL_ROOT_DIR}") +- message(STATUS "OpenSSL cmake prefix '${OPENSSL_ROOT_DIR}' (homebrew)") +- else() +- foreach(FALLBACK_DIR /opt/homebrew/opt/openssl /usr/local/opt/openssl) +- if (EXISTS "${FALLBACK_DIR}") +- set(OPENSSL_ROOT_DIR "${FALLBACK_DIR}") +- break() +- endif() +- endforeach() +- if (EXISTS "${OPENSSL_ROOT_DIR}") +- message(STATUS "OpenSSL cmake prefix '${OPENSSL_ROOT_DIR}' (fallback)") +- elseif (EXISTS "/opt/local") +- set(OPENSSL_ROOT_DIR "/opt/local") +- message(STATUS "OpenSSL cmake prefix '${OPENSSL_ROOT_DIR}' (macports)") +- endif() +- endif() +- endif() +- if (EXISTS "${OPENSSL_ROOT_DIR}") +- list(APPEND CMAKE_PREFIX_PATH ${OPENSSL_ROOT_DIR}) +- endif() +- +- # sqlite +- if (DEFINED SQLITE_ROOT_DIR AND EXISTS "${SQLITE_ROOT_DIR}") +- message(STATUS "SQLite cmake prefix '${SQLITE_ROOT_DIR}' (user-specified)") +- else() +- execute_process(COMMAND sh "-c" +- "command -v brew &> /dev/null && brew --prefix sqlite 2> /dev/null | tr -d '\n'" +- OUTPUT_VARIABLE SQLITE_ROOT_DIR) +- if (EXISTS "${SQLITE_ROOT_DIR}") +- message(STATUS "SQLite cmake prefix '${SQLITE_ROOT_DIR}' (homebrew)") +- else() +- foreach(FALLBACK_DIR /opt/homebrew/opt/sqlite /usr/local/opt/sqlite) +- if (EXISTS "${FALLBACK_DIR}") +- set(SQLITE_ROOT_DIR "${FALLBACK_DIR}") +- break() +- endif() +- endforeach() +- if (EXISTS "${SQLITE_ROOT_DIR}") +- message(STATUS "SQLite cmake prefix '${SQLITE_ROOT_DIR}' (fallback)") +- elseif (EXISTS "/opt/local") +- set(SQLITE_ROOT_DIR "/opt/local") +- message(STATUS "SQLite cmake prefix '${SQLITE_ROOT_DIR}' (macports)") +- endif() +- endif() +- endif() +- if (EXISTS "${SQLITE_ROOT_DIR}") +- list(APPEND CMAKE_PREFIX_PATH ${SQLITE_ROOT_DIR}) - endif() -- list(APPEND CMAKE_PREFIX_PATH ${OPENSSL_ROOT_DIR}) - elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android") add_compile_definitions(_XOPEN_SOURCE_EXTENDED) diff --git a/pkgs/by-name/nc/nchat/go-libs-build.patch b/pkgs/by-name/nc/nchat/go-libs-build.patch index 7adcef2dcd50..0f0e137e8064 100644 --- a/pkgs/by-name/nc/nchat/go-libs-build.patch +++ b/pkgs/by-name/nc/nchat/go-libs-build.patch @@ -1,22 +1,22 @@ -diff --git i/CMakeLists.txt w/CMakeLists.txt -index a1928ee3..26157e56 100644 ---- i/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -126,10 +126,6 @@ message(STATUS "Static Go: ${HAS_STATICGOLIB}") +diff --git c/CMakeLists.txt i/CMakeLists.txt +index bc227885..d37cafe9 100644 +--- c/CMakeLists.txt ++++ i/CMakeLists.txt +@@ -182,10 +182,6 @@ message(STATUS "Static Go: ${HAS_STATICGOLIB}") # Check Golang version for whatsmeow minimum requirement set(GO_VERSION_MIN 1.23) -execute_process(COMMAND bash "-c" "go version 2> /dev/null | cut -c14- | cut -d' ' -f1 | tr -d '\n'" OUTPUT_VARIABLE GO_VERSION) -if((HAS_WHATSAPP OR HAS_SIGNAL) AND (NOT GO_VERSION VERSION_GREATER_EQUAL GO_VERSION_MIN)) -- message(FATAL_ERROR "Go version ${GO_VERSION} (need >= ${GO_VERSION_MIN} to build WhatsApp or Signal).") +- message(FATAL_ERROR "Go version ${GO_VERSION} (need >= ${GO_VERSION_MIN} to build WhatsApp or Signal)") -endif() # Check Little/Big Endian for tdlib requirement test_big_endian(IS_BIG_ENDIAN) -diff --git i/lib/tgchat/ext/td/CMakeLists.txt w/lib/tgchat/ext/td/CMakeLists.txt -index 795f1f4b..7e41549c 100644 ---- i/lib/tgchat/ext/td/CMakeLists.txt -+++ w/lib/tgchat/ext/td/CMakeLists.txt +diff --git c/lib/tgchat/ext/td/CMakeLists.txt i/lib/tgchat/ext/td/CMakeLists.txt +index f65c6e45..46b08fdd 100644 +--- c/lib/tgchat/ext/td/CMakeLists.txt ++++ i/lib/tgchat/ext/td/CMakeLists.txt @@ -140,7 +140,6 @@ if (CLANG OR GCC) endif() @@ -25,10 +25,10 @@ index 795f1f4b..7e41549c 100644 message(STATUS "Git state: ${TD_GIT_COMMIT_HASH}") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/td/telegram/GitCommitHash.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/td/telegram/GitCommitHash.cpp" @ONLY) -diff --git i/lib/wmchat/CMakeLists.txt w/lib/wmchat/CMakeLists.txt +diff --git c/lib/wmchat/CMakeLists.txt i/lib/wmchat/CMakeLists.txt index 84a42ef9..556df050 100644 ---- i/lib/wmchat/CMakeLists.txt -+++ w/lib/wmchat/CMakeLists.txt +--- c/lib/wmchat/CMakeLists.txt ++++ i/lib/wmchat/CMakeLists.txt @@ -20,8 +20,8 @@ install(TARGETS wmchat DESTINATION ${CMAKE_INSTALL_LIBDIR}) target_common_config(wmchat) diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix index 156dcbb63bad..d300e4656007 100644 --- a/pkgs/by-name/nc/nchat/package.nix +++ b/pkgs/by-name/nc/nchat/package.nix @@ -17,13 +17,13 @@ }: let - version = "5.13.17"; + version = "5.14.44"; src = fetchFromGitHub { owner = "d99kris"; repo = "nchat"; tag = "v${version}"; - hash = "sha256-VSya6s3/+vII/M76tHmeJEZh7/gv9L5tYdILuthdO5s="; + hash = "sha256-gG0YkahHP/6KjM+5uzdTRxsonn83cxlJDvdn5HE3h0Q="; }; libcgowm = buildGoModule { @@ -31,7 +31,7 @@ let inherit version src; sourceRoot = "${src.name}/lib/wmchat/go"; - vendorHash = "sha256-lfy7uHH3rLYx6kzIy72ftEiO1CkJkEr7rRXHhuFU/ac="; + vendorHash = "sha256-5Id5+DehV2juLJnEHYvcI67/ykFUQehSrfFW+toZRM0="; buildPhase = '' runHook preBuild