diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 73d386b379d..2869401b596 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "4.4.10"; + version = "5.0.8"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-V3vycO0kV6RTFZWi6uiCFSNfLq/09dBfyLk/5zw3kRA="; + hash = "sha256-e/0yGHtOHMgPhaF5xELodKS9/v/mbnT3ZpE12lXAocU="; }; patches = [ @@ -54,7 +54,7 @@ mkDerivation rec { postPatch = '' echo "project(linphoneqt VERSION ${version})" >linphone-app/linphoneqt_version.cmake substituteInPlace linphone-app/src/app/AppController.cpp \ - --replace "LINPHONE_QT_GIT_VERSION" "\"${version}\"" + --replace "APPLICATION_SEMVER" "\"${version}\"" ''; # TODO: After linphone-desktop and liblinphone split into separate packages, diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 9091749db44..97072fc4ad3 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.2.0"; + version = "5.2.16"; nativeBuildInputs = [ cmake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-HbKo5E1K+W5tPqRbcG4+ymUXv87iqc094pTeng94Aao="; + hash = "sha256-M2apFibqSKp8ojXl82W+vQb7CUxdbWsmw8PLL/ByYuM="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 3a6ef0e3562..4bccc0c5cf2 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "5.1.12"; + version = "5.2.16"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-GsHVuNXzLkbKUaHtnyXAr7bR9Emc55zcmKt3RGjCMtA="; + hash = "sha256-nrnGmJxAeobejS6zdn5Z/kOFOxyepZcxW/G4nXAt2DY="; }; buildInputs = [ bctoolbox sqlite ]; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 10c2bfb272c..fe3ddba36b8 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -15,11 +15,12 @@ , lib , stdenv , xercesc +, zxing-cpp }: stdenv.mkDerivation rec { pname = "liblinphone"; - version = "5.1.22"; + version = "5.2.17"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -27,10 +28,14 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-hTyp/fUA1+7J1MtqX33kH8Vn1XNjx51Wy5REvrpdJTY="; + hash = "sha256-zxp+jcClfKm+VsylRtydF2rlDCkO+sa9vw8GpwAfKHM="; }; - patches = [ ./use-normal-jsoncpp.patch ]; + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace "jsoncpp_object" "jsoncpp" \ + --replace "jsoncpp_static" "jsoncpp" + ''; cmakeFlags = [ "-DENABLE_STATIC=NO" # Do not build static libraries @@ -52,6 +57,7 @@ stdenv.mkDerivation rec { (python3.withPackages (ps: [ ps.pystache ps.six ])) sqlite xercesc + zxing-cpp ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch b/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch deleted file mode 100644 index 4685b327ecd..00000000000 --- a/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ea6901c9ed0f804bd2d6d09e514610518c2f4f09 Mon Sep 17 00:00:00 2001 -From: Lorenz Brun -Date: Fri, 18 Mar 2022 17:36:22 +0100 -Subject: [PATCH] Use normal jsoncpp - ---- - src/CMakeLists.txt | 6 +++--- - tester/CMakeLists.txt | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5cd87fe9a..822b2151e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI) - if (XCODE) - list(APPEND LINK_LIBS jsoncpp_static) - else() -- list(APPEND LINK_LIBS jsoncpp_object) -+ list(APPEND LINK_LIBS jsoncpp) - endif() - endif() - -@@ -592,7 +592,7 @@ if(ENABLE_STATIC) - if (XCODE) - target_link_libraries(linphone PRIVATE jsoncpp_static) - else() -- target_link_libraries(linphone PRIVATE jsoncpp_object) -+ target_link_libraries(linphone PRIVATE jsoncpp) - endif() - endif() - -@@ -646,7 +646,7 @@ if(ENABLE_SHARED) - if (XCODE) - target_link_libraries(linphone PRIVATE jsoncpp_static) - else() -- target_link_libraries(linphone PRIVATE jsoncpp_object) -+ target_link_libraries(linphone PRIVATE jsoncpp) - endif() - endif() - -diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt -index b97042678..b4c5a5794 100644 ---- a/tester/CMakeLists.txt -+++ b/tester/CMakeLists.txt -@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI) - if (XCODE) - list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_static) - else() -- list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_object) -+ list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp) - endif() - endif() - --- -2.25.1 - diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index fd6df20fb89..fade17507ca 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "5.1.20"; + version = "5.2.16"; dontWrapQtApps = true; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-u8YqF5BzyYIF9+XB90Eu6DlwXuu1FDOJUzxebj0errU="; + hash = "sha256-K4EBZC3zuLKF9Qw4i24f0hYKlOgRM7MR4Ck2ZoTYi6I="; }; patches = [ diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index e896717644a..4a0edf08a7e 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "5.1.55"; + version = "5.2.16"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-FsPbpKkC1qhsZ4QBRzyV64H+lo/802qlaggDGCgbPlw="; + hash = "sha256-zGguzrWXSjjrJdFnlAeC6U6w10BucXjeUg7/2D4OxM4="; }; # Do not build static libraries