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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e33ddf0fec30
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1f0de2dce26b
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 3, 2017

  1. p7zip: Update CVE-2016-9296 patch URL. 

    The debian source for this patch file has gone away, rendering this derivation
unbuildable from scratch.
This change updates the URL to a src.fedoraproject.org location that is still
serving a p7zip patch. This file is not the same bytewise, so I'm also updating
the hash; I didn't manage to find a location still serving a file with the
original hash, and my best guess is that this one is functionally equivalent.
    @sh01
    es_github authored and sh01 committed Jul 3, 2017
    Copy the full SHA
    674e46d View commit details

  2. p7zip: add commit ID to the patch 

    We still do mirror the patch (I think), as `nix-build -Q -A p7zip.patches`
downloaded it on my machine.  I verified that only the diff headers differ;
it's still better to have another working download and Fedora's URLs are
less likely to disappear than Debian's.
/cc #27075.
    @vcunat
    vcunat committed Jul 3, 2017
    Copy the full SHA
    6cad339 View commit details

  3. Merge #27075: p7zip: Update CVE-2016-9296 patch URL

    @vcunat
    vcunat committed Jul 3, 2017
    Copy the full SHA
    1f0de2d View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 pkgs/tools/archivers/p7zip/default.nix
7 changes: 4 additions & 3 deletions pkgs/tools/archivers/p7zip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,9 +10,10 @@ stdenv.mkDerivation rec {
};

patches = [
(fetchpatch {
url = "https://sources.debian.net/data/main/p/p7zip/16.02+dfsg-2/debian/patches/12-CVE-2016-9296.patch";
sha256 = "1i7099h27gmb9dv0lb7jnqfm504gs1c3129r6kvi94yb2gzrzk41";
(fetchpatch rec {
name = "CVE-2016-9296.patch";
url = "https://src.fedoraproject.org/cgit/rpms/p7zip.git/plain/${name}?id=4b3973f6a5d";
sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m";
})
];