git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #122448 from misuzu/psi-plus-update

psi-plus: 1.4.1473 -> 1.5.1520

commit17e3fb2e23fe147f93c301e7515214b73520415d authorSandro <sandro.jaeckel@gmail.com> dateTue 18 May 2021, 01:29 (6 years ago) parent778247dab76abe
3 files changed+36−9
pkgs/applications/networking/instant-messengers/psi-plus/default.nix+11−9 pkgs/development/libraries/usrsctp/default.nix+23 pkgs/top-level/all-packages.nix+2
pkgs/applications/networking/instant-messengers/psi-plus/default.nix+11−9
@@ -1,18 +1,19 @@
1−{ mkDerivation, lib, fetchFromGitHub, cmake
1+{ lib, mkDerivation, fetchFromGitHub, cmake
22, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
3−, libidn, qca-qt5, libsecret, libXScrnSaver, hunspell
4−, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
3+, libidn, qca-qt5, libXScrnSaver, hunspell
4+, libsecret, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
5+, usrsctp
56}:
67
78mkDerivation rec {
89 pname = "psi-plus";
9− version = "1.4.1473";
10+ version = "1.5.1520";
1011
1112 src = fetchFromGitHub {
1213 owner = "psi-plus";
1314 repo = "psi-plus-snapshots";
1415 rev = version;
15− sha256 = "03f28zwbjn6fnsm0fqg8lmc11rpfdfvzjf7k7xydc3lzy8pxbds5";
16+ sha256 = "0cj811qv0n8xck2qrnps2ybzrpvyjqz7nxkyccpaivq6zxj6mc12";
1617 };
1718
1819 cmakeFlags = [
@@ -23,15 +24,16 @@ mkDerivation rec {
2324
2425 buildInputs = [
2526 qtbase qtmultimedia qtx11extras qtwebengine
26− libidn qca-qt5 libsecret libXScrnSaver hunspell
27− libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
27+ libidn qca-qt5 libXScrnSaver hunspell
28+ libsecret libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
29+ usrsctp
2830 ];
2931
3032 meta = with lib; {
31− homepage = "https://sourceforge.net/projects/psiplus/";
33+ homepage = "https://psi-plus.com";
3234 description = "XMPP (Jabber) client";
3335 maintainers = with maintainers; [ orivej misuzu ];
34− license = licenses.gpl2;
36+ license = licenses.gpl2Only;
3537 platforms = platforms.linux;
3638 };
3739}
pkgs/development/libraries/usrsctp/default.nixnew file+23
@@ -0,0 +1,23 @@
1+{ stdenv, lib, fetchFromGitHub, cmake }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "usrsctp";
5+ version = "0.9.5.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "sctplab";
9+ repo = "usrsctp";
10+ rev = version;
11+ sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9";
12+ };
13+
14+ nativeBuildInputs = [ cmake ];
15+
16+ meta = with lib; {
17+ homepage = "https://github.com/sctplab/usrsctp";
18+ description = "A portable SCTP userland stack";
19+ maintainers = with maintainers; [ misuzu ];
20+ license = licenses.bsd3;
21+ platforms = platforms.unix;
22+ };
23+}
pkgs/top-level/all-packages.nix+2
@@ -18053,6 +18053,8 @@ in
1805318053
1805418054 ustr = callPackage ../development/libraries/ustr { };
1805518055
18056+ usrsctp = callPackage ../development/libraries/usrsctp { };
18057+
1805618058 usbredir = callPackage ../development/libraries/usbredir { };
1805718059
1805818060 uthash = callPackage ../development/libraries/uthash { };