Skip to content
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
base: efd8f66119f8
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 61e57e8fd756
Choose a head ref
  • 6 commits
  • 7 files changed
  • 2 contributors

Commits on Jun 11, 2020

  1. p7zip: switch to maintained fork 

    This the fork that true-upstream seems to prefer, see:
https://www.7-zip.org/links.html
    @magnetophon
    magnetophon committed Jun 11, 2020
    Copy the full SHA
    9557017 View commit details
    Browse the repository at this point in the history

  2. Revert "dtrx: remove p7zip, since it's unsafe" 

    This reverts commit 9b3ca0c.
p7zip is now switched to a maintained fork
    @magnetophon
    magnetophon committed Jun 11, 2020
    Copy the full SHA
    1683a5f View commit details
    Browse the repository at this point in the history

  3. Revert "python.pkgs.binwalk: remove p7zip from propagatedBuildInputs" 

    This reverts commit 9a2ec56.
p7zip is now switched to a maintained fork
    @magnetophon
    magnetophon committed Jun 11, 2020
    Copy the full SHA
    133e10f View commit details
    Browse the repository at this point in the history

  4. Revert "ark: remove p7zip" 

    This reverts commit 06fa14f.
p7zip is now switched to a maintained fork
    @magnetophon
    magnetophon committed Jun 11, 2020
    Copy the full SHA
    331fb4c View commit details
    Browse the repository at this point in the history

  5. Revert "woeusb: remove p7zip" 

    This reverts commit 5e52a39.
p7zip is now switched to a maintained fork
    @magnetophon
    magnetophon committed Jun 11, 2020
    Copy the full SHA
    334b347 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #90140 from magnetophon/p7zip 

    p7zip: switch to maintained fork
    @7c6f434c
    7c6f434c committed Jun 11, 2020
    Copy the full SHA
    61e57e8 View commit details
    Browse the repository at this point in the history