Commit bb291395 authored by jopejoe1's avatar jopejoe1 Committed by Alyssa Ross
Browse files

lib.licenses: replace wxWindows with wxWindowsException31

wxWindows git deprecated by spedx and got replaced with an exeption that needs to be combined with other licenses https://spdx.org/licenses/wxWindows.html
parent ec03e1d4
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1444,8 +1444,8 @@ lib.mapAttrs mkLicense (
      fullName = "Do What The F*ck You Want To Public License";
    };

    wxWindows = {
      spdxId = "wxWindows";
    wxWindowsException31 = {
      spdxId = "WxWindows-exception-3.1";
      fullName = "wxWindows Library Licence, Version 3.1";
    };

+4 −1
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ python3Packages.buildPythonApplication rec {
    description = "Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers (client tools)";
    homepage = "https://www.frida.re/";
    maintainers = with lib.maintainers; [ s1341 ];
    license = lib.licenses.wxWindows;
    license = with lib.licenses; [
      lgpl2Plus
      wxWindowsException31
    ];
  };
}
+4 −1
Original line number Diff line number Diff line
@@ -126,7 +126,10 @@ stdenv.mkDerivation rec {
      multithreading, image loading and saving in a variety of popular formats,
      database support, HTML viewing and printing, and much more.
    '';
    license = licenses.wxWindows;
    license = with licenses; [
      lgpl2Plus
      wxWindowsException31
    ];
    maintainers = with maintainers; [ tfmoraes ];
    platforms = platforms.unix;
  };
+4 −1
Original line number Diff line number Diff line
@@ -147,7 +147,10 @@ stdenv.mkDerivation rec {
      multithreading, image loading and saving in a variety of popular formats,
      database support, HTML viewing and printing, and much more.
    '';
    license = licenses.wxWindows;
    license = with licenses; [
      lgpl2Plus
      wxWindowsException31
    ];
    maintainers = with maintainers; [
      tfmoraes
      fliegendewurst
+4 −1
Original line number Diff line number Diff line
@@ -37,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
  meta = {
    description = "C language binding for wxWidgets";
    homepage = "https://wiki.haskell.org/WxHaskell";
    license = lib.licenses.wxWindows;
    license = with lib.licenses; [
      lgpl2Plus
      wxWindowsException31
    ];
    maintainers = with lib.maintainers; [ fgaz ];
    platforms = wxGTK32.meta.platforms;
  };
Loading