From 0a9fe3f605fd8a58547d6fbbea91c8ce472b5a93 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 27 Dec 2020 22:55:50 +0100 Subject: [PATCH 1/9] atop: 2.4.0 -> 2.6.0 --- pkgs/os-specific/linux/atop/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 0d8392cbcd8..7557497b959 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -1,22 +1,24 @@ {stdenv, fetchurl, zlib, ncurses}: stdenv.mkDerivation rec { - version = "2.4.0"; pname = "atop"; + version = "2.6.0"; src = fetchurl { url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; - sha256 = "0s9xlxlzz688a80zxld840zkrmzw998rdkkg6yc7ssq8fw50275y"; + sha256 = "nsLKOlcWkvfvqglfmaUQZDK8txzCLNbElZfvBIEFj3I="; }; buildInputs = [zlib ncurses]; makeFlags = [ - ''SCRPATH=$out/etc/atop'' - ''LOGPATH=/var/log/atop'' - ''INIPATH=$out/etc/rc.d/init.d'' - ''CRNPATH=$out/etc/cron.d'' - ''ROTPATH=$out/etc/logrotate.d'' + "SCRPATH=$out/etc/atop" + "LOGPATH=/var/log/atop" + "INIPATH=$out/etc/rc.d/init.d" + "SYSDPATH=$out/lib/systemd/system" + "CRNPATH=$out/etc/cron.d" + "DEFPATH=$out/etc/default" + "ROTPATH=$out/etc/logrotate.d" ]; preConfigure = '' @@ -28,9 +30,9 @@ stdenv.mkDerivation rec { sed -e 's/chmod 04711/chmod 0711/g' -i Makefile ''; + installTargets = [ "systemdinstall" ]; preInstall = '' mkdir -p "$out"/{bin,sbin} - make systemdinstall $makeFlags ''; meta = with stdenv.lib; { @@ -42,7 +44,7 @@ stdenv.mkDerivation rec { Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. ''; inherit version; - license = licenses.gpl2; + license = licenses.gpl2Plus; downloadPage = "http://atoptool.nl/downloadatop.php"; }; } From 1c43806e4bb309b1e6828e9d0ca6affa9ec4c511 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 28 Dec 2020 13:34:02 +0100 Subject: [PATCH 2/9] bcg729: 1.0.4 -> 1.1.1 part of updating linphone and its major dependencies --- pkgs/development/libraries/bcg729/default.nix | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/bcg729/default.nix b/pkgs/development/libraries/bcg729/default.nix index 4363948e830..f178c192de5 100644 --- a/pkgs/development/libraries/bcg729/default.nix +++ b/pkgs/development/libraries/bcg729/default.nix @@ -1,42 +1,28 @@ { stdenv -, fetchFromGitHub -, fetchpatch +, fetchFromGitLab , cmake }: stdenv.mkDerivation rec { pname = "bcg729"; - version = "1.0.4"; + version = "1.1.1"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; rev = version; - sha256 = "05s0c5ps3a763y0v34wg5zghj0cdjnq4ch7g81848xxry7q90fwa"; + sha256 = "1hal6b3w6f8y5r1wa0xzj8sj2jjndypaxyw62q50p63garp2h739"; }; - patches = [ - (fetchpatch { - url = "https://github.com/BelledonneCommunications/bcg729/commit/a5907daf1b111e4ad7aab4f558f57e2af1e37e55.patch"; - sha256 = "0445syfwj4w4chh8ak80rq77iqcr27924n1ld5snshk3d21nxd64"; - }) - (fetchpatch { - url = "https://github.com/BelledonneCommunications/bcg729/commit/697bf6653a8c7421f0e821ee8d42471246e6850f.patch"; - sha256 = "1h3gf5sj2sg5cs5iv1lcav3lkqmd5jf4agvjzz83l89wd5f5hp5l"; - }) - (fetchpatch { - url = "https://github.com/BelledonneCommunications/bcg729/commit/d63ce04a93711820d9a6985b1d11d8d91ed8e6b6.patch"; - sha256 = "1piwf63ci2gma6jd6b4adkvxirysvazf0vklb5pc6vx1g93nkgxs"; - }) - ]; - nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec"; homepage = "https://linphone.org/technical-corner/bcg729"; changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ c0bw3b ]; platforms = platforms.all; }; From 4ea84190f1d3fdf7b21831a65ddfc48a5babd10c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 28 Dec 2020 13:36:01 +0100 Subject: [PATCH 3/9] bctoolbox: 4.4.13 -> 4.4.21 part of updating linphone and its major dependencies --- pkgs/development/libraries/bctoolbox/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 0f99484f5a0..655d3a5808a 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.13"; + version = "4.4.21"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -30,9 +30,7 @@ stdenv.mkDerivation rec { inherit version; description = "Utilities library for Linphone"; homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; - # Still using GPLv2 but as the rest of the Linphone projects have switched - # to GPLv3, this might too, so check this when bumping the version number. - license = licenses.gpl3Only; + license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin jluttine ]; platforms = platforms.linux; }; From 418dc08cea493a317db81830d082fdb1177b6a95 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 28 Dec 2020 14:10:22 +0100 Subject: [PATCH 4/9] belle-sip: 4.4.13 -> 4.4.21 part of updating linphone and its major dependencies --- pkgs/development/libraries/belle-sip/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 788e656301b..8a028b5e0a0 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.13"; + version = "4.4.21"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1ad7sqc5y4f3gc8glwmb3rvfzapnvhg981g13x90cg4nzikjvka0"; + sha256 = "0ylv1jsqnfhw23i6p3lfqqzw48lwii8zwkq3y34q0hhnngn26iiw"; }; - nativeBuildInputs = [ cmake antlr3_4 ]; + nativeBuildInputs = [ antlr3_4 cmake ]; buildInputs = [ zlib ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://linphone.org/technical-corner/belle-sip"; description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; From c7cac5ea9adbe7fa5a83653ad188052deb07e229 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 28 Dec 2020 14:11:38 +0100 Subject: [PATCH 5/9] belr: unstable-2020-03-09 -> 4.3.2 part of updating linphone and its major dependencies --- pkgs/development/libraries/belr/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index 546949d9f21..ab3df9bae7e 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -6,17 +6,15 @@ stdenv.mkDerivation rec { pname = "belr"; - # Using master branch for linphone-desktop caused a chain reaction that many - # of its dependencies needed to use master branch too. - version = "unstable-2020-03-09"; + version = "4.3.2"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; group = "BC"; repo = pname; - rev = "326d030ca9db12525c2a6d2a65f386f36f3c2ed5"; - sha256 = "1cdblb9smncq3al0crqp5651b02k1g6whlw1ib769p61gad0rs3v"; + rev = version; + sha256 = "1lda0f89vas38xgmc4yvnrigmrbril3dyqxgb5jh1zfx1xczfh1q"; }; buildInputs = [ bctoolbox ]; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belledonne Communications' language recognition library"; homepage = "https://gitlab.linphone.org/BC/public/belr"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; From ccb88fd162405f9b63bb201e1222ce911262a544 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 28 Dec 2020 14:12:29 +0100 Subject: [PATCH 6/9] bzrtp: 4.4.0 -> 4.4.9 part of updating linphone and its major dependencies --- pkgs/development/libraries/bzrtp/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 4fe53a5d629..3eb99549246 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.0"; + version = "4.4.9"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An opensource implementation of ZRTP keys exchange protocol"; homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; - # They have switched to GPLv3 on git HEAD so probably the next release will - # be GPL3. - license = licenses.lgpl21; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; From bf2a93e5079018178d1b2cfb20b94dd338220929 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 28 Dec 2020 14:13:39 +0100 Subject: [PATCH 7/9] linphone: 4.2.4 -> 4.2.5 fixes a crash on incoming calls part of updating linphone and its major dependencies --- .../networking/instant-messengers/linphone/default.nix | 5 ++--- pkgs/development/libraries/liblinphone/default.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index c055718f47f..1344440eafc 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -52,7 +52,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "4.2.4"; + version = "4.2.5"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -175,13 +175,12 @@ mkDerivation rec { ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ mkdir -p $out/share/linphone ln -s ${liblinphone}/share/linphone/* $out/share/linphone/ - mkdir $out/lib # prevent warning ''; meta = with lib; { homepage = "https://www.linphone.org/"; description = "Open source SIP phone for voice/video calls and instant messaging"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 21f9833a5d5..7d7f035f77f 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://www.linphone.org/technical-corner/liblinphone"; description = "Library for SIP calls and instant messaging"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; From 4459b412ddbe76546463fea63f19e170c3864e6b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 28 Dec 2020 17:32:14 +0100 Subject: [PATCH 8/9] ortp: specifiy the exact gpl3 license variant --- pkgs/development/libraries/ortp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index f84f3ab1d83..ecd15498432 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Real-Time Transport Protocol (RFC3550) stack"; homepage = "https://linphone.org/technical-corner/ortp"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; From 14027887fe69e7d8999831e8a476670f29c1aab4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 28 Dec 2020 17:32:54 +0100 Subject: [PATCH 9/9] belcard: specifiy the exact gpl3 license variant --- pkgs/development/libraries/belcard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index ae9b1e6e43c..35de9fb9347 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ library to manipulate VCard standard format"; homepage = "https://gitlab.linphone.org/BC/public/belcard"; - license = licenses.lgpl21; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; };