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: 074d336b7f66
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: ece8a6766572
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Aug 28, 2019

  1. chromium: 76.0.3809.100 -> 76.0.3809.132 

    CVE-2019-5869
    @ivan
    ivan committed Aug 28, 2019
    Copy the full SHA
    7133611 View commit details

Commits on Aug 31, 2019

  1. patchutils: add perl to buildInputs 

    This was silently producing perl scripts with empty shebang lines,
breaking a bunch of the binaries.

(backported from commit e54931b6d70e7a383670a0b040c235d60a3c6c6c)
    @edef1c
    edef1c committed Aug 31, 2019
    Copy the full SHA
    16d4885 View commit details

  2. Merge pull request #67611 from ivan/chromium-76.0.3809.132-backport 

    [19.03] chromium: 76.0.3809.100 -> 76.0.3809.132
    @samueldr
    samueldr authored Aug 31, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ece8a67 View commit details
Showing with 12 additions and 10 deletions.
  1. +9 −9 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  2. +3 −1 pkgs/tools/text/patchutils/default.nix
18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "1521vh38mfgy7aj1lw1vpbdm8m6wyh52d5p7bz4x6kvvxsnacp11";
sha256bin64 = "0rbc0ld655szg42mqjdby8749d2jg34nlpp4cpq66qb4zi6vvb04";
version = "76.0.3809.87";
sha256 = "0m7xdpi1f2a33csd7bsp91g5klz0hmr83ksfwsd2fki3iipvfs4w";
sha256bin64 = "1b4cyf4v55sy52mxxl8d70abg5ck5k45jaqdjsjw7dvh3s2x4bwp";
version = "77.0.3865.42";
};
dev = {
sha256 = "15v25nwcdxqgw6n0ym7fz5qaq0a74p0wiwcq155xy6zvr3q8q1nw";
sha256bin64 = "1qawl0hsl6qpc10avli8raw4nzwcpmp6dyada5pga7i4k5jpsr95";
version = "77.0.3860.5";
sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k";
sha256bin64 = "03yymhbpd1snycmcv7wkg5j6zbydvyc365gy5myp7wgas7cd0mb6";
version = "78.0.3887.7";
};
stable = {
sha256 = "0vfjfxsqf8jrmd7y08ln1lpbilwi150875zn2bawwdq87vd3mncc";
sha256bin64 = "1c5rlqgshv5295wg5cji12z2b38l6a81l94spmzr46h5z9nn1gqx";
version = "76.0.3809.100";
sha256 = "0hajwjf7swlgh1flpf8ljfrb2zhmcpzvrigvvxqd36g3nm04cknm";
sha256bin64 = "0hdsla8i3q0zbczia64ghqsf420alcc31xdishx1sv48x3rlrxkk";
version = "76.0.3809.132";
};
}
4 changes: 3 additions & 1 deletion pkgs/tools/text/patchutils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, perl }:

stdenv.mkDerivation rec {
name = "patchutils-0.3.3";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {

patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one

buildInputs = [ perl ];

hardeningDisable = [ "format" ];

doCheck = false; # fails