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: 4e3c94381056
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: acaa67312348
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 1, 2020

  1. re2c: 1.2.1 -> 1.3 

    (cherry picked from commit 2e9c802)
    @mmilata
    mmilata committed May 1, 2020
    Copy the full SHA
    8134bd1 View commit details

  2. re2c: add patch for CVE-2020-11958 

    https://nvd.nist.gov/vuln/detail/CVE-2020-11958
(cherry picked from commit 7263c89)
    @mmilata
    mmilata committed May 1, 2020
    Copy the full SHA
    9c14030 View commit details

Commits on Jun 22, 2020

  1. Merge #86447: re2c: 1.2.1 -> 1.3 + patch 

    ...into staging-20.03
    @vcunat
    vcunat committed Jun 22, 2020
    Copy the full SHA
    acaa673 View commit details
Showing with 11 additions and 3 deletions.
  1. +11 −3 pkgs/development/tools/parsing/re2c/default.nix
14 changes: 11 additions & 3 deletions pkgs/development/tools/parsing/re2c/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:

stdenv.mkDerivation rec {
pname = "re2c";
version = "1.2.1";
version = "1.3";

src = fetchFromGitHub {
owner = "skvadrik";
repo = "re2c";
rev = version;
sha256 = "1qj0ck9msb9h8g9qb1lr57jmlj8x68ini3y3ccdifjjahhhr0hd4";
sha256 = "0aqlf2h6i2m3dq11dkq89p4w4c9kp4x66s5rhp84gmpz5xqv1x5h";
};

patches = [
(fetchpatch {
name = "CVE-2020-11958.patch";
url = "https://github.com/skvadrik/re2c/commit/c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a.patch";
sha256 = "1d95ahxk92g7k87sda9gxgmr3blyfzwd2y7h9jxj8zkd74knd9zh";
})
];

nativeBuildInputs = [ autoreconfHook ];

doCheck = true;