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

Merge pull request #111355 from fabaff/libwebsockets

This commit is contained in:
Sandro 2021-01-31 19:13:14 +01:00 committed by GitHub
parent 93519c7736 4b4628c7fc
commit 9e81867a53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/libwebsockets/default.nix
View File

@ -32,7 +32,9 @@ let
throughput in both directions. throughput in both directions.
''; '';
homepage = "https://libwebsockets.org/"; homepage = "https://libwebsockets.org/";
license = licenses.lgpl21; # Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation
# is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE
license = with licenses; [ mit publicDomain bsd3 asl20 ];
platforms = platforms.all; platforms = platforms.all;
}; };
}; };
@ -50,7 +52,12 @@ rec {
}; };
libwebsockets_4_0 = generic { libwebsockets_4_0 = generic {
version = "4.0.1"; version = "4.0.21";
sha256 = "1pf7km0w5q7dqlwcwqizdpfqgg10prfq8g2c093f5nghwsfv8mmf"; sha256 = "01k05x4711ngin598jr9dag4ml3m7hi6pkgr4dsb02ryh1kc6146";
};
libwebsockets_4_1 = generic {
version = "4.1.6";
sha256 = "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg";
}; };
} }

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

@ -5954,7 +5954,8 @@ in
inherit (callPackages ../development/libraries/libwebsockets { }) inherit (callPackages ../development/libraries/libwebsockets { })
libwebsockets_3_1 libwebsockets_3_1
libwebsockets_3_2 libwebsockets_3_2
libwebsockets_4_0; libwebsockets_4_0
libwebsockets_4_1;
libwebsockets = libwebsockets_3_2; libwebsockets = libwebsockets_3_2;
licensee = callPackage ../tools/package-management/licensee { }; licensee = callPackage ../tools/package-management/licensee { };