diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-31 19:13:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-31 19:13:14 +0100 |
| commit | 9e81867a53bfc437406ccbf399a6dcd66d894d46 (patch) | |
| tree | 793728961f22ee0db166dd33bf58254d9ad70133 | |
| parent | 93519c773652ee7d5300aae32b5d8aa6508b4e67 (diff) | |
| parent | 4b4628c7fc9a78353b6671e66d15568b98c728a2 (diff) | |
Merge pull request #111355 from fabaff/libwebsockets
| -rw-r--r-- | pkgs/development/libraries/libwebsockets/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 8f749d9fe6aa..33c1cecfbc81 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/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"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c67d1338c72c..e096bc1e36a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5954,7 +5954,8 @@ in inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 - libwebsockets_4_0; + libwebsockets_4_0 + libwebsockets_4_1; libwebsockets = libwebsockets_3_2; licensee = callPackage ../tools/package-management/licensee { }; |