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: 9c42eb70cfdb
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: fb6c3a6831ca
Choose a head ref
  • 6 commits
  • 3 files changed
  • 5 contributors

Commits on Jun 18, 2020

  1. chromedriver: 81.0.4044.69 -> 83.0.4103.39

    @bennyandresen @nixy
    bennyandresen authored and nixy committed Jun 18, 2020
    Copy the full SHA
    4ac4a23 View commit details

  2. root5: fix CVE-2017-1000203 

    Fixes: https://nvd.nist.gov/vuln/detail/CVE-2017-1000203
    @veprbl
    veprbl committed Jun 18, 2020
    Copy the full SHA
    7e37d80 View commit details

Commits on Jun 22, 2020

  1. Merge pull request #91053 from veprbl/pr/root5_CVE-2017-1000203 

    [20.03] root5: fix CVE-2017-1000203
    Christian Kauhaus authored Jun 22, 2020
    Copy the full SHA
    0e22213 View commit details

  2. ansible: v2.9.9 -> v2.9.10 

    (cherry picked from commit 11e5ca3caac59de44674056e90f6c5d7dbdcb795)
    @mweinelt
    mweinelt authored and Jon committed Jun 22, 2020
    Copy the full SHA
    86810c4 View commit details

  3. ansible: add myself as maintainer 

    (cherry picked from commit 9f98f41)
    @mweinelt
    mweinelt authored and Jon committed Jun 22, 2020
    Copy the full SHA
    7d1c0e7 View commit details

Commits on Jun 23, 2020

  1. Merge pull request #91012 from nixy/chromedriver-backport 

    [20.03] chromedriver: 81.0.4044.69 -> 83.0.4103.39
    @marsam
    marsam authored Jun 23, 2020
    Copy the full SHA
    fb6c3a6 View commit details
6 changes: 6 additions & 0 deletions pkgs/applications/science/misc/root/5.nix
View file
Original file line number Diff line number Diff line change
@@ -32,6 +32,12 @@ stdenv.mkDerivation rec {
# disable dictionary generation for stuff that includes libc headers
# our glibc requires a modern compiler
./disable_libc_dicts_root5.patch

(fetchpatch {
name = "CVE-2017-1000203.patch";
url = "https://github.com/root-project/root/commit/a568e80022ae6ffbfa0a908d625c986ee857cc0f.diff";
sha256 = "0fxiwh36ry2w98a7sw74z9rnp686vrddxmd34wkvjnj9alry9i5f";
})
];

preConfigure = ''
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/ansible/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,13 +18,13 @@

buildPythonPackage rec {
pname = "ansible";
version = "2.9.9";
version = "2.9.10";

src = fetchFromGitHub {
owner = "ansible";
repo = "ansible";
rev = "v${version}";
sha256 = "06a9iq7w2cm0hsxaw5irsja8w44gffiw09ly27jxklpa8gv57rml";
sha256 = "1979522k57gafvq9vx3lbc3zah7jq3kiy98ji9x5bmxyddmgr9ch";
};

prePatch = ''
@@ -51,7 +51,7 @@ buildPythonPackage rec {
homepage = http://www.ansible.com;
description = "Radically simple IT automation";
license = [ licenses.gpl3 ] ;
maintainers = with maintainers; [ joamaki costrouc ];
maintainers = with maintainers; [ joamaki costrouc hexa ];
platforms = platforms.linux ++ platforms.darwin;
};
}
6 changes: 3 additions & 3 deletions pkgs/development/tools/selenium/chromedriver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@ let
allSpecs = {
x86_64-linux = {
system = "linux64";
sha256 = "1mqsangjindfqgvjxgmpgfrcd8a2lqmwl587l0ip0p5wwz8yq5wi";
sha256 = "149p43zaz45malmff1274r2bwjcyjwsdickivk3pd0mvnjbfid2r";
};

x86_64-darwin = {
system = "mac64";
sha256 = "18ydf2bk5aiin3yffb9z8215idz65nkhgxq0mmlvwb8gwsdvnwi1";
sha256 = "1xpyqxpsz3r653ls67s6alv4g2vr4lxf29gyxc162ikywyrx80nr";
};
};

@@ -28,7 +28,7 @@ let
in
stdenv.mkDerivation rec {
pname = "chromedriver";
version = "81.0.4044.69";
version = "83.0.4103.39";

src = fetchurl {
url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";