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: b6c7259c4d03
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: 95b9c99f6d09
Choose a head ref
  • 6 commits
  • 5 files changed
  • 3 contributors

Commits on Apr 22, 2020

  1. pythonPackages.namedlist: unmark broken, mark disabled for Python 3.8 

    https://nix-cache.s3.amazonaws.com/log/a4mdvyjbsy157i1v97rg6avp5a8inm0g-python3.8-namedlist-1.7.drv
    @ivan
    ivan committed Apr 22, 2020
    Copy the full SHA
    3f7a5cb View commit details

  2. pythonPackages.ludios_wpull: unmark broken, mark disabled for Python 3.8 

    ludios_wpull depends on namedlist, which currently has failing tests
on Python 3.8.
    @ivan
    ivan committed Apr 22, 2020
    Copy the full SHA
    dd2570d View commit details

  3. chromium: Fix the VA-API build 

    (cherry picked from commit b533f10)
    @primeos
    primeos committed Apr 22, 2020
    Copy the full SHA
    9ad0025 View commit details

  4. chromium{Beta,Dev}: M81 -> M83 -> M84 

    (cherry picked from commit cb5c0a4)
    @primeos
    primeos committed Apr 22, 2020
    Copy the full SHA
    fc3722a View commit details

  5. chromium: 81.0.4044.113 -> 81.0.4044.122 

    https://chromereleases.googleblog.com/2020/04/stable-channel-update-for-desktop_21.html

This update includes 8 security fixes.

CVEs: CVE-2020-6459 CVE-2020-6460 CVE-2020-645
(cherry picked from commit a2df977)
Backport of #85729.
    @primeos
    primeos committed Apr 22, 2020
    Copy the full SHA
    bd8e084 View commit details

  6. Merge pull request #85533 from ivan/mark-some-unbroken 

    [20.03] pythonPackages.{namedlist, ludios_wpull}: mark broken only on Python 3.8
    @worldofpeace
    worldofpeace authored Apr 22, 2020
    Copy the full SHA
    95b9c99 View commit details
7 changes: 5 additions & 2 deletions pkgs/applications/networking/browsers/chromium/common.nix
View file
Original file line number Diff line number Diff line change
@@ -149,10 +149,13 @@ let
#
# ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
] ++ optionals (useVaapi) [
] ++ optionals (useVaapi) ([
# source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi
./patches/vaapi-fix.patch
];
] ++ optionals (versionRange "81" "82") [
(githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902")
(githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064")
]);

postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/chromium/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
}:

let
llvmPackages = if channel == "dev"
llvmPackages = if channel != "stable"
then llvmPackages_10
else llvmPackages_9;
stdenv = llvmPackages.stdenv;
@@ -35,7 +35,7 @@ let
mkChromiumDerivation = callPackage ./common.nix ({
inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone;
gnChromium = gn;
} // lib.optionalAttrs (channel == "dev") {
} // lib.optionalAttrs (channel != "stable") {
# TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-03-23";
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 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17";
sha256bin64 = "1iwn0yyhk0jn47pn7rx9kadli47xyvz3xilfl4faifmasin2fq8v";
version = "81.0.4044.113";
};
dev = {
sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf";
sha256bin64 = "1hn2hjni5k370jhc0nikmx5ypwzcqnmr02h185a5ry697643abdd";
sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax";
version = "83.0.4103.14";
};
dev = {
sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny";
sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf";
version = "84.0.4115.5";
};
stable = {
sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17";
sha256bin64 = "0ap7flrw3h885454fa2r7psa4sh8567ql7v7x96q11gh9gjrdvp3";
version = "81.0.4044.113";
sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg";
sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w";
version = "81.0.4044.122";
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ludios_wpull/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, isPy38
, chardet
, dnspython
, html5-parser
@@ -16,7 +17,7 @@ buildPythonPackage rec {
pname = "ludios_wpull";
version = "3.0.7";

disabled = !isPy3k;
disabled = !isPy3k || isPy38;

src = fetchFromGitHub {
rev = version;
@@ -35,6 +36,5 @@ buildPythonPackage rec {
homepage = https://github.com/ludios/wpull;
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ivan ];
broken = true;
};
}
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/namedlist/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,15 @@
, buildPythonPackage
, fetchPypi
, pytest
, isPy38
}:

buildPythonPackage rec {
pname = "namedlist";
version = "1.7";

disabled = isPy38;

src = fetchPypi {
inherit pname version;
sha256 = "11n9c4a5ak9971awkf1g92m6mcmiprhrw98ik2cmjsqxmz73j2qr";
@@ -29,6 +32,5 @@ buildPythonPackage rec {
homepage = https://bitbucket.org/ericvsmith/namedlist;
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ivan ];
broken = true;
};
}