diff options
| author | éclairevoyant <848000+eclairevoyant@users.noreply.github.com> | 2024-07-20 12:43:28 -0400 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-09-11 01:07:25 +0200 |
| commit | cf9c87559fd59f00ae57390ddf5fd25e5c1127e2 (patch) | |
| tree | c77f269bba3ad1744544b11d9c92a4365f5823c7 | |
| parent | lib/licenses: add unrar (diff) | |
| download | nixpkgs-origin/unrar-license-entry.tar.gz | |
treewide: use unrar license where applicableorigin/unrar-license-entry
| -rw-r--r-- | pkgs/applications/kde/ark/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/by-name/un/unrar/package.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/archivers/7zz/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/archivers/p7zip/default.nix | 3 |
5 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 815bee892d6d..e91640e292b2 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 dcea5ecb52c9..788c643b4b03 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -197,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://github.com/kovidgoyal/calibre/releases/tag/v${finalAttrs.version}"; license = if unrarSupport - then lib.licenses.unfreeRedistributable + then lib.licenses.unrar else lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix index 6a71c63d9e2d..4957c2d0b801 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 3408ce8c08d1..9b2557819901 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 3ced84bed025..3c0462c1bfcd 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"; |