diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 1112a3215c9..03f8f7b961a 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,18 +1,19 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake +{ lib, mkDerivation, fetchFromGitHub, cmake , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine -, libidn, qca-qt5, libsecret, libXScrnSaver, hunspell -, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c +, libidn, qca-qt5, libXScrnSaver, hunspell +, libsecret, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c +, usrsctp }: mkDerivation rec { pname = "psi-plus"; - version = "1.4.1473"; + version = "1.5.1520"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "03f28zwbjn6fnsm0fqg8lmc11rpfdfvzjf7k7xydc3lzy8pxbds5"; + sha256 = "0cj811qv0n8xck2qrnps2ybzrpvyjqz7nxkyccpaivq6zxj6mc12"; }; cmakeFlags = [ @@ -23,15 +24,16 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtx11extras qtwebengine - libidn qca-qt5 libsecret libXScrnSaver hunspell - libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c + libidn qca-qt5 libXScrnSaver hunspell + libsecret libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c + usrsctp ]; meta = with lib; { - homepage = "https://sourceforge.net/projects/psiplus/"; + homepage = "https://psi-plus.com"; description = "XMPP (Jabber) client"; maintainers = with maintainers; [ orivej misuzu ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/development/libraries/usrsctp/default.nix new file mode 100644 index 00000000000..64b1debc0ce --- /dev/null +++ b/pkgs/development/libraries/usrsctp/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2b673dec48..34f294ed21a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18053,6 +18053,8 @@ in ustr = callPackage ../development/libraries/ustr { }; + usrsctp = callPackage ../development/libraries/usrsctp { }; + usbredir = callPackage ../development/libraries/usbredir { }; uthash = callPackage ../development/libraries/uthash { };