summary refs log tree commit diff
path: root/pkgs/tools/archivers/p7zip
diff options
context:
space:
mode:
authorBenjamin Hipple <bhipple@protonmail.com>2018-06-09 19:08:59 -0400
committerOrivej Desh <orivej@gmx.fr>2018-06-09 23:08:59 +0000
commite20abf829a1582f93486f929a14b8151ec9ac0c7 (patch)
tree92f01bb242fa0fc676c1225588ab704524cdd1a1 /pkgs/tools/archivers/p7zip
parent350f49734b161895803df1e3eb712df4f9c0e81e (diff)
downloadnixpkgs-e20abf829a1582f93486f929a14b8151ec9ac0c7.tar
nixpkgs-e20abf829a1582f93486f929a14b8151ec9ac0c7.tar.gz
nixpkgs-e20abf829a1582f93486f929a14b8151ec9ac0c7.tar.bz2
nixpkgs-e20abf829a1582f93486f929a14b8151ec9ac0c7.tar.lz
nixpkgs-e20abf829a1582f93486f929a14b8151ec9ac0c7.tar.xz
nixpkgs-e20abf829a1582f93486f929a14b8151ec9ac0c7.tar.zst
nixpkgs-e20abf829a1582f93486f929a14b8151ec9ac0c7.zip
p7zip: fix src URL for debian gitlab move (#41769)
Another broken URL related to: https://github.com/NixOS/nixpkgs/issues/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
Diffstat (limited to 'pkgs/tools/archivers/p7zip')
-rw-r--r--pkgs/tools/archivers/p7zip/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 886ed817909..6cabd8ff976 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -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";
     })
   ];