summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorj-k <dev@j-k.io>2022-03-18 04:47:19 +0000
committerGitHub <noreply@github.com>2022-03-18 12:47:19 +0800
commitc12cec8bc39c3c1153a42032a03a83d149d1e2ac (patch)
tree6241538b3e93cc8c6a2d2dd4f9a137a9f741d93b /nixos/doc
parent056ce434a2a5eff5dceff22083cdbcb1b07e5244 (diff)
downloadnixpkgs-c12cec8bc39c3c1153a42032a03a83d149d1e2ac.tar
nixpkgs-c12cec8bc39c3c1153a42032a03a83d149d1e2ac.tar.gz
nixpkgs-c12cec8bc39c3c1153a42032a03a83d149d1e2ac.tar.bz2
nixpkgs-c12cec8bc39c3c1153a42032a03a83d149d1e2ac.tar.lz
nixpkgs-c12cec8bc39c3c1153a42032a03a83d149d1e2ac.tar.xz
nixpkgs-c12cec8bc39c3c1153a42032a03a83d149d1e2ac.tar.zst
nixpkgs-c12cec8bc39c3c1153a42032a03a83d149d1e2ac.zip
_7zz: correct license (#163999)
* _7zz: correct license and remove p7zip dependency

The code under Compress/Rar* is licensed under a specific unRAR license
Also Compress/LzfseDecoder.cpp is covered by BSD3

The unRAR code is removed from the `.tar.xz` since the license posits you
agree or remove the code from your hard drive
This adds some complexity to updating 7zz so there is also an update
script

Meta has been updated and tweaked

Source is now downloaded from sourceforge in the `.tar.xz` version to
avoid depending on p7zip

* _7zz: add notice of the license updates and optional unRAR licenced code
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2205.section.xml6
-rw-r--r--nixos/doc/manual/release-notes/rl-2205.section.md2
2 files changed, 8 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 7ef03b1f5e1..ee0f94bfce3 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -762,6 +762,12 @@
       </listitem>
       <listitem>
         <para>
+          <literal>pkgs._7zz</literal> is now correctly licensed as
+          LGPL3+ and BSD3 with optional unfree unRAR licensed code
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <literal>tilp2</literal> was removed together with its module
         </para>
       </listitem>
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index d592d689611..148543802d0 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -304,6 +304,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `pkgs.docbookrx` was removed since it's unmaintained
 
+- `pkgs._7zz` is now correctly licensed as LGPL3+ and BSD3 with optional unfree unRAR licensed code
+
 - `tilp2` was removed together with its module
 
 - The F-PROT antivirus (`fprot` package) and its service module were removed because it