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: 9ec7625cee53
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: 647761e80e7b
Choose a head ref
  • 4 commits
  • 1 file changed
  • 3 contributors

Commits on Jul 3, 2019

  1. expat: add patch for CVE-2018-20843

    @risicle
    risicle committed Jul 3, 2019
    Copy the full SHA
    b4bc984 View commit details

Commits on Jul 4, 2019

  1. Merge branch 'release-19.03' into staging-19.03

    @worldofpeace
    worldofpeace committed Jul 4, 2019
    Copy the full SHA
    1956582 View commit details

  2. Merge pull request #64266 from risicle/ris-expat-CVE-2018-20843-r19.03 

    [r19.03] expat: add patch for CVE-2018-20843
    @worldofpeace
    worldofpeace authored Jul 4, 2019
    Copy the full SHA
    21ac8a1 View commit details

Commits on Jul 9, 2019

  1. Merge branch 'staging-19.03' into release-19.03

    @vcunat
    vcunat committed Jul 9, 2019
    Copy the full SHA
    647761e View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 pkgs/development/libraries/expat/default.nix
11 changes: 10 additions & 1 deletion pkgs/development/libraries/expat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, fetchpatch }:

stdenv.mkDerivation rec {
name = "expat-2.2.6";
@@ -8,6 +8,15 @@ stdenv.mkDerivation rec {
sha256 = "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p";
};

patches = [
(fetchpatch {
name = "CVE-2018-20843.patch";
url = "https://github.com/libexpat/libexpat/commit/11f8838bf99ea0a6f0b76f9760c43704d00c4ff6.patch";
sha256 = "1i7bq9sp2k5348dvbfv26bprzv6ka1abf0j5ixjaff9alndm4f19";
stripLen = 1;
})
];

outputs = [ "out" "dev" ]; # TODO: fix referrers
outputBin = "dev";