Navigation Menu

Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
base: 4e03e34b3b1c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 10bfa0159c2f
Choose a head ref
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Apr 22, 2020

  1. p7zip: remove non-free RAR support

    7-Zip's RAR implementation is built on the non-free UnRAR source code;
    DOC/License.txt says:
    
          Licenses for files are:
    
            1) CPP/7zip/Compress/Rar* files:  GNU LGPL + unRAR restriction
            2) All other files:  GNU LGPL
    
          The GNU LGPL + unRAR restriction means that you must follow both
          GNU LGPL rules and unRAR restriction rules.
    
        ...
    
          unRAR restriction
          -----------------
    
            The decompression engine for RAR archives was developed using source
            code of unRAR program.
            All copyrights to original unRAR code are owned by Alexander Roshal.
    
            The license for original unRAR code has the following restriction:
    
            The unRAR sources cannot be used to re-create the RAR compression algorithm,
            which is proprietary. Distribution of modified unRAR sources in separate form
            or as a part of other software is permitted, provided that it is clearly
            stated in the documentation and source comments that the code may
            not be used to develop a RAR (WinRAR) compatible archiver.
    
    The unrar licensing is [infamously restrictive and non-free][fedora];
    it's inappropriate for us to keep the RAR support while labelling the
    package as free software (and indeed there's a commented-out line
    pointing out that the current `meta.license` is false). Unfortunately,
    the 7-Zip upstream seems uninterested in replacing the code with a
    freely-licensed alternative (see [7-Zip ticket #1229][7zip]).
    
    [fedora]: https://fedoraproject.org/wiki/Licensing:Unrar
    [7zip]: https://sourceforge.net/p/sevenzip/feature-requests/1229/
    
    An alternative solution would be to mark the p7zip package as non-free
    instead; I decided not to because its other functionality (especially
    `.7z` support) is freely-licensed and useful, and there are free
    software alternatives for extracting RAR files (e.g. in nixpkgs there's
    `archiver`, which is written in a memory-safe language, and `unar`,
    which at least doesn't have two patches for CVEs that haven't been
    addressed upstream...).
    
    I checked that `7z(1)` fails gracefully on `.rar` files now:
    
        emily@renko ~/tmp> curl -L -O https://www.philippwinterberg.com/download/example.rar
          % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                         Dload  Upload   Total   Spent    Left  Speed
        100 5715k  100 5715k    0     0  6716k      0 --:--:-- --:--:-- --:--:-- 6716k
        emily@renko ~/tmp> 7z x example.rar
    
        7-Zip [64] 16.02 : Copyright (c) 1999-2016 Igor Pavlov : 2016-05-21
        p7zip Version 16.02 (locale=en_CA.UTF-8,Utf16=on,HugeFiles=on,64 bits,8 CPUs x64)
    
        Scanning the drive for archives:
        1 file, 5853119 bytes (5716 KiB)
    
        Extracting archive: example.rar
        ERROR: example.rar
        Can not open the file as archive
    
        Can't open as archive: 1
        Files: 0
        Size:       0
        Compressed: 0
    
    (cherry picked from commit 95f82e2)
    emilazy authored and adisbladis committed Apr 22, 2020
    Copy the full SHA
    93dd26f View commit details
    Browse the repository at this point in the history
  2. p7zip: Make unfree features (rar support) optional

    (cherry picked from commit 955e235)
    adisbladis committed Apr 22, 2020
    Copy the full SHA
    72c6332 View commit details
    Browse the repository at this point in the history
  3. pythonPackages.pyside2: unmark as broken

    It builds fine.
    
    Fixes: c6be4c1 ("treewide: mark broken packages for 20.03")
    bjornfor committed Apr 22, 2020
    Copy the full SHA
    56e8991 View commit details
    Browse the repository at this point in the history
  4. pythonPackages.pyside2-tools: unmark as broken

    It builds fine.
    
    Fixes: c6be4c1 ("treewide: mark broken packages for 20.03")
    bjornfor committed Apr 22, 2020
    Copy the full SHA
    150b510 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #85786 from adisbladis/p7zip-free-backport

    p7zip: remove non-free RAR support (20.03 backport)
    adisbladis committed Apr 22, 2020
    Copy the full SHA
    10bfa01 View commit details
    Browse the repository at this point in the history