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: efe4afd0420e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d628521d0b79
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 7, 2019

  1. expat: fetch the patch from "my private mirror" 

    Fixes #71075.  I'm really tired of these, so lemme try this approach.
    @vcunat
    vcunat committed Nov 7, 2019
    Copy the full SHA
    d628521 View commit details
Showing with 3 additions and 6 deletions.
  1. +3 −6 pkgs/development/libraries/expat/default.nix
9 changes: 3 additions & 6 deletions pkgs/development/libraries/expat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch }:
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "expat-2.2.7";
@@ -9,12 +9,9 @@ stdenv.mkDerivation rec {
};

patches = [
(fetchpatch {
name = "CVE-2019-15903.patch";
url = "https://sources.debian.org/data/main/e/expat/2.2.7-2/debian/patches/CVE-2019-15903_Deny_internal_entities_closing_the_doctype.patch";
(fetchurl {
url = "https://raw.githubusercontent.com/vcunat/patch-mirror/master/CVE-2019-15903.patch";
sha256 = "0lv4392ihpk71fgaf1fz03gandqkaqisal8xrzvcqnvnq4mnmwxp";
stripLen = 1;
excludes = [ "tests/runtests.c" "Changes" ];
})
];