diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
| commit | 9becdcc5df71b47a5da84ad670e9a7eae9e0c65a (patch) | |
| tree | 2ddf0335eb393f89501e3753b50c3f7ab0552d12 /nixpkgs/pkgs/development/libraries/libwebsockets | |
| parent | 49f2a77ac9abc88c253f68952eda26557fc3b555 (diff) | |
| parent | ff96a0fa5635770390b184ae74debea75c3fd534 (diff) | |
| download | nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.gz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.bz2 nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.lz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.xz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.zst nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.zip | |
nixpkgs: merge nixos-unstable
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libwebsockets')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libwebsockets/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix index 8f749d9fe6aa..33c1cecfbc81 100644 --- a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix @@ -32,7 +32,9 @@ let throughput in both directions. ''; 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; }; }; @@ -50,7 +52,12 @@ rec { }; libwebsockets_4_0 = generic { - version = "4.0.1"; - sha256 = "1pf7km0w5q7dqlwcwqizdpfqgg10prfq8g2c093f5nghwsfv8mmf"; + version = "4.0.21"; + sha256 = "01k05x4711ngin598jr9dag4ml3m7hi6pkgr4dsb02ryh1kc6146"; + }; + + libwebsockets_4_1 = generic { + version = "4.1.6"; + sha256 = "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg"; }; } |