Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 43c77db3aa58
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 08d245eb31a3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 10, 2018

  1. p7zip: fix src URL for debian gitlab move (#41769) 

    Another broken URL related to: NixOS/nixpkgs#39927

Note that the patch file has legitimately changed, because ~4 months ago Debian
replaced their CVE security fix with a newer version that fixes some additional
bugs: https://salsa.debian.org/debian/p7zip/commit/d6fd3b37345489ec2907fcf70aabf0c754f5371f

(cherry picked from commit e20abf8)
    @bhipple @vcunat
    bhipple authored and vcunat committed Jun 10, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    GPG key ID: B37E0F2371016A4C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    08d245e View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/tools/archivers/p7zip/default.nix
6 changes: 3 additions & 3 deletions pkgs/tools/archivers/p7zip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch rec {
name = "CVE-2016-9296.patch";
url = "https://src.fedoraproject.org/cgit/rpms/p7zip.git/plain/${name}?id=4b3973f6a5d";
url = "https://salsa.debian.org/debian/p7zip/raw/debian/${version}+dfsg-6/debian/patches/12-${name}";
sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m";
})
(fetchpatch rec {
name = "CVE-2017-17969.patch";
url = "https://anonscm.debian.org/cgit/users/robert/p7zip.git/plain/debian/patches/13-${name}?h=debian/16.02%2bdfsg-5";
sha256 = "16lbf6rgyl7xwxfjgg1243jvi39yb3i5pgqfnxswyc0jzhxv81d7";
url = "https://salsa.debian.org/debian/p7zip/raw/debian/${version}+dfsg-6/debian/patches/13-${name}";
sha256 = "00pycdwx6gw7w591bg54ym6zhbxgn47p3zhms6mnmaycfzw09mkn";
})
];