From 56e36a836eb5ef92bd2a5ceffcd759315da60b1f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 16:13:50 +0000 Subject: [PATCH 01/13] soci: 4.0.0 -> 4.0.1 --- pkgs/development/libraries/soci/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index f561864a7502..2c87d421babe 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -6,17 +6,17 @@ stdenv.mkDerivation rec { pname = "soci"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "SOCI"; repo = pname; rev = version; - sha256 = "06faswdxd2frqr9xnx6bxc7zwarlzsbdi3bqpz7kwdxsjvq41rnb"; + sha256 = "sha256-d4GtxDaB+yGfyCnbvnLRUYcrPSMkUF7Opu6+SZd8opM="; }; # Do not build static libraries - cmakeFlags = [ "-DSOCI_STATIC=OFF" ]; + cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ sqlite ]; From 67c0595753af7c2f427ccd32cdf969adf3388e2e Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Thu, 18 Mar 2021 20:08:01 +0200 Subject: [PATCH 02/13] bctoolbox: 4.4.24 -> 4.4.34 --- pkgs/development/libraries/bctoolbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 700fe4f46860..dc585217cea7 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.4.24"; + version = "4.4.34"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-RfjD+E8FLFNBkwpOohNAKDINHAhSNEkeVArqtjfn2i0="; + sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25"; }; # Do not build static libraries From 07be34e059169e584e193ea2eda716c5d5fd8f7c Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Thu, 18 Mar 2021 20:08:45 +0200 Subject: [PATCH 03/13] ortp: 4.4.32 -> 4.4.34 --- pkgs/development/libraries/ortp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 2b99f29f4c0d..e760868524fa 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "4.4.32"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-tcSrDfo1AZM7yQarwfV4n6p1UOShXGKjMW5u57/cM+Q="; + sha256 = "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m"; }; # Do not build static libraries From de8658c0e65a032014be00c08d83b88e2f853751 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Thu, 18 Mar 2021 20:09:34 +0200 Subject: [PATCH 04/13] mediastreamer: 4.4.32 -> 4.4.35 --- pkgs/development/libraries/mediastreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 6321e35f7f46..ad770046d338 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "4.4.32"; + version = "4.4.35"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-kaNQuhxsUx74hBhfpB76NuNTT+8h74nfiv1re43tHps="; + sha256 = "18qmg678m087k7qsaxwfcv2p875z2kpy91pqryiv955km40drl0g"; }; patches = [ From 674ad1501ad9d3a71d3fe485274a239500c04ade Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Thu, 18 Mar 2021 20:10:35 +0200 Subject: [PATCH 05/13] lime: 4.4.21 -> 4.4.34 --- pkgs/development/libraries/lime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index e6996a53c832..ad4fb661a392 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "lime"; - version = "4.4.21"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-3whr2KSAULRe3McgOtJlA3NEPF8NO6YHp+4vqeMPT5I="; + sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z"; }; buildInputs = [ bctoolbox soci belle-sip sqlite ]; From 174bb45e8d073aae3f0ac32a8f22fce2d1b77fc8 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Thu, 18 Mar 2021 20:10:57 +0200 Subject: [PATCH 06/13] belcard: 4.4.24 -> 4.4.34 --- pkgs/development/libraries/belcard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 03f6e96e187d..5ce7ad477bfa 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "4.4.24"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-FTHtd93LOnRek9fqvI+KBkk/+53Bwy9GKCEo0NDtops="; + sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m"; }; buildInputs = [ bctoolbox belr ]; From 95b192e0d54215f1ef6cdadc2647615ed8314cc3 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Thu, 18 Mar 2021 20:11:23 +0200 Subject: [PATCH 07/13] belr: 4.3.2 -> 4.4.34 --- pkgs/development/libraries/belr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index b38757525abd..acd2393f75ed 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "belr"; - version = "4.3.2"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1lda0f89vas38xgmc4yvnrigmrbril3dyqxgb5jh1zfx1xczfh1q"; + sha256 = "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h"; }; buildInputs = [ bctoolbox ]; From fc31e95415eb3917dd45e8c31a3e6584f811fedc Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Thu, 18 Mar 2021 20:11:48 +0200 Subject: [PATCH 08/13] bzrtp: 4.4.9 -> 4.4.34 --- pkgs/development/libraries/bzrtp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 0adcb327cc4d..f29295bb130f 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.4.9"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; From fb1b82cce575c083bb1df647943886afef1a0b30 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Thu, 18 Mar 2021 20:12:12 +0200 Subject: [PATCH 09/13] belle-sip: 4.4.26 -> 4.4.34 --- pkgs/development/libraries/belle-sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 833d200ffa3b..3bb41bf59e83 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.4.26"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-30w5X/S5VY4zSHs2G4KXOP8mEvC78xakwrcd/Bm1ds4="; + sha256 = "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z"; }; nativeBuildInputs = [ antlr3_4 cmake ]; From 5c1e77bdf92d8fd88a8819832212971be6079c4c Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Thu, 18 Mar 2021 20:12:38 +0200 Subject: [PATCH 10/13] liblinphone: 4.4.21 -> 4.4.35 --- pkgs/development/libraries/liblinphone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 647fb6825afb..2822b45f8719 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.4.21"; + version = "4.4.35"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-vs65lBRTYYhx2F90n32qnf0CvcPJUIXc16hmggTF/JI="; + sha256 = "1sysr8wnf1kvq87h2ymr5qk9qcjapayvlmcmzcx3zxk8vhqp83d8"; }; # Do not build static libraries From a961aa0f4b3c376989e31837d823f634976c598c Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Fri, 19 Mar 2021 08:01:47 +0200 Subject: [PATCH 11/13] libantlr3c: mark broken on aarch64 The package failed to build with error: gcc: error: unrecognized command line option '-m64' See: https://gist.github.com/r-rmcgibbo/15bf2ca9b297e8357887e146076fff7d https://gist.github.com/r-rmcgibbo/a362535e4b174d4bfb68112503a49fcd --- pkgs/development/libraries/libantlr3c/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index d51eac7bdb6e..6cbf1d204376 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -15,5 +15,12 @@ stdenv.mkDerivation { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ vbgl ]; + # The package failed to build with error: + # gcc: error: unrecognized command line option '-m64' + # + # See: + # https://gist.github.com/r-rmcgibbo/15bf2ca9b297e8357887e146076fff7d + # https://gist.github.com/r-rmcgibbo/a362535e4b174d4bfb68112503a49fcd + broken = stdenv.hostPlatform.isAarch64; }; } From 8137d46d882be4647a3086849de710a2a05b18e5 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Fri, 19 Mar 2021 08:06:05 +0200 Subject: [PATCH 12/13] belle-sip: apply nixpkgs-fmt --- pkgs/development/libraries/belle-sip/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 3bb41bf59e83..8f0a116f1aa3 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -2,9 +2,10 @@ , bctoolbox , cmake , fetchFromGitLab +, lib , libantlr3c , mbedtls -, lib, stdenv +, stdenv , zlib }: From 574d38c0090ce3455ff4fcda4c4db4c5a60d2702 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Fri, 19 Mar 2021 08:06:59 +0200 Subject: [PATCH 13/13] lime: apply nixpkgs-fmt --- pkgs/development/libraries/lime/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index ad4fb661a392..b9ca94056180 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -2,9 +2,10 @@ , belle-sip , cmake , fetchFromGitLab +, lib , soci , sqlite -, lib, stdenv +, stdenv }: stdenv.mkDerivation rec {