cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #107799 from schmittlauch/linphonebump-master

Browse source
This commit is contained in:
Sandro 2020-12-28 21:10:01 +01:00 committed by GitHub
commit 226c94c73b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 25 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/networking/instant-messengers/linphone/default.nix
View file

@ -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 ];
};

30
pkgs/development/libraries/bcg729/default.nix
View file

@ -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;
};

6
pkgs/development/libraries/bctoolbox/default.nix
View file

@ -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;
};

2
pkgs/development/libraries/belcard/default.nix
View file

@ -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 ];
};

8
pkgs/development/libraries/belle-sip/default.nix
View file

@ -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 ];
};

10
pkgs/development/libraries/belr/default.nix
View file

@ -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 ];
};

6
pkgs/development/libraries/bzrtp/default.nix
View file

@ -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 ];
};

2
pkgs/development/libraries/liblinphone/default.nix
View file

@ -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 ];
};

2
pkgs/development/libraries/ortp/default.nix
View file

@ -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 ];
};