public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122448 from misuzu/psi-plus-update

Browse Source 
psi-plus: 1.4.1473 -> 1.5.1520
This commit is contained in:
Sandro 2021-05-18 01:29:50 +02:00 committed by GitHub
commit 17e3fb2e23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
View File

@ -1,18 +1,19 @@
{ mkDerivation, lib, fetchFromGitHub, cmake { lib, mkDerivation, fetchFromGitHub, cmake
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
, libidn, qca-qt5, libsecret, libXScrnSaver, hunspell , libidn, qca-qt5, libXScrnSaver, hunspell
, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c , libsecret, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
, usrsctp
}: }:
mkDerivation rec { mkDerivation rec {
pname = "psi-plus"; pname = "psi-plus";
version = "1.4.1473"; version = "1.5.1520";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "psi-plus"; owner = "psi-plus";
repo = "psi-plus-snapshots"; repo = "psi-plus-snapshots";
rev = version; rev = version;
sha256 = "03f28zwbjn6fnsm0fqg8lmc11rpfdfvzjf7k7xydc3lzy8pxbds5"; sha256 = "0cj811qv0n8xck2qrnps2ybzrpvyjqz7nxkyccpaivq6zxj6mc12";
}; };
cmakeFlags = [ cmakeFlags = [
@ -23,15 +24,16 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
qtbase qtmultimedia qtx11extras qtwebengine qtbase qtmultimedia qtx11extras qtwebengine
libidn qca-qt5 libsecret libXScrnSaver hunspell libidn qca-qt5 libXScrnSaver hunspell
libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c libsecret libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
usrsctp
]; ];
meta = with lib; { meta = with lib; {
homepage = "https://sourceforge.net/projects/psiplus/"; homepage = "https://psi-plus.com";
description = "XMPP (Jabber) client"; description = "XMPP (Jabber) client";
maintainers = with maintainers; [ orivej misuzu ]; maintainers = with maintainers; [ orivej misuzu ];
license = licenses.gpl2; license = licenses.gpl2Only;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

23
pkgs/development/libraries/usrsctp/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, lib, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "usrsctp";
version = "0.9.5.0";
src = fetchFromGitHub {
owner = "sctplab";
repo = "usrsctp";
rev = version;
sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
homepage = "https://github.com/sctplab/usrsctp";
description = "A portable SCTP userland stack";
maintainers = with maintainers; [ misuzu ];
license = licenses.bsd3;
platforms = platforms.unix;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -18053,6 +18053,8 @@ in
ustr = callPackage ../development/libraries/ustr { }; ustr = callPackage ../development/libraries/ustr { };
usrsctp = callPackage ../development/libraries/usrsctp { };
usbredir = callPackage ../development/libraries/usbredir { }; usbredir = callPackage ../development/libraries/usbredir { };
uthash = callPackage ../development/libraries/uthash { }; uthash = callPackage ../development/libraries/uthash { };