From 42ef963cd221a5fb294a844c7af40e1a00738815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 15 Mar 2014 17:00:10 +0100 Subject: [PATCH] libarchive: *permanently* fix patch source and hash Unfortunately github's *.patch URIs contain version of git generating them, which changes from time to time. It seems that *.diff doesn't suffer from that. Conflicts: pkgs/development/libraries/libarchive/default.nix --- pkgs/development/libraries/libarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index b7b001e44eb2..5e728d9b3dd1 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { }; patches = [(fetchurl { - url = "https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.patch"; - sha256 = "0c1a0prlpq5nn7zgs7cqvw9xnmhkkc8l0mpsip86k1lafircqhzh"; + url = "https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.diff"; + sha256 = "1466ddrkdh2r8idmj3v7fk2gwnhc1kdxvyczdpnqms0qlmas6fj5"; name = "CVE-2013-0211.patch"; })];