diff --git a/lib/licenses.nix b/lib/licenses.nix index eef9c67068869a3..c557884459ed915 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1223,6 +1223,13 @@ in mkLicense lset) ({ fullName = "The Unlicense"; }; + unrar = { + fullName = "UnRAR - free utility for RAR archives: License for use and distribution of FREEWARE version"; + # also contained the in the source of the unrar package + url = "https://fedoraproject.org/wiki/Licensing:Unrar"; + free = false; + }; + upl = { spdxId = "UPL-1.0"; fullName = "Universal Permissive License"; diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 815bee892d6de63..e91640e292b2f2e 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -32,7 +32,7 @@ mkDerivation { homepage = "https://apps.kde.org/ark/"; description = "Graphical file compression/decompression utility"; mainProgram = "ark"; - license = with licenses; [ gpl2 lgpl3 ] ++ optional unfreeEnableUnrar unfree; + license = with licenses; [ gpl2 lgpl3 ] ++ optional unfreeEnableUnrar unrar; maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index dcea5ecb52c9cc7..6bf3620e1907792 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -196,9 +196,8 @@ stdenv.mkDerivation (finalAttrs: { free and open source and great for both casual users and computer experts. ''; changelog = "https://github.com/kovidgoyal/calibre/releases/tag/v${finalAttrs.version}"; - license = if unrarSupport - then lib.licenses.unfreeRedistributable - else lib.licenses.gpl3Plus; + license = [ lib.licenses.gpl3Plus ] + ++ lib.optional unrarSupport lib.licenses.unrar; maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix index 6a71c63d9e2d7e5..4957c2d0b8010f5 100644 --- a/pkgs/by-name/un/unrar/package.nix +++ b/pkgs/by-name/un/unrar/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Utility for RAR archives"; homepage = "https://www.rarlab.com/"; - license = licenses.unfreeRedistributable; + license = licenses.unrar; mainProgram = "unrar"; maintainers = with maintainers; [ wegank ]; platforms = platforms.all; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 3408ce8c08d1ae9..9b2557819901cb3 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -118,8 +118,7 @@ stdenv.mkDerivation (finalAttrs: { # CPP/7zip/Compress/LzfseDecoder.cpp is bsd3 [ lgpl2Plus /* and */ bsd3 ] ++ # and CPP/7zip/Compress/Rar* are unfree with the unRAR license restriction - # the unRAR compression code is disabled by default - lib.optionals enableUnfree [ unfree ]; + lib.optionals enableUnfree [ unrar ]; maintainers = with lib.maintainers; [ anna328p eclairevoyant jk peterhoeg ]; platforms = with lib.platforms; unix ++ windows; mainProgram = "7zz"; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 3ced84bed025f4f..3c0462c1bfcde71 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -67,8 +67,7 @@ stdenv.mkDerivation (finalAttrs: { # CPP/7zip/Compress/LzfseDecoder.cpp is bsd3 [ lgpl2Plus /* and */ bsd3 ] ++ # and CPP/7zip/Compress/Rar* are unfree with the unRAR license restriction - # the unRAR compression code is disabled by default - lib.optionals enableUnfree [ unfree ]; + lib.optionals enableUnfree [ unrar ]; maintainers = with maintainers; [ raskin jk ]; platforms = platforms.unix; mainProgram = "7z";