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: a7cad45d9333
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 97677fa34fee
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 20, 2020

  1. chromiumDev: Unmark the build as broken 

    The build succeeds again as dirmd is no longer required for building.
    @primeos
    primeos committed Nov 20, 2020
    Copy the full SHA
    97677fa View commit details
Showing with 6 additions and 7 deletions.
  1. +0 −1 pkgs/applications/networking/browsers/chromium/browser.nix
  2. +6 −6 pkgs/applications/networking/browsers/chromium/upstream-info.json
1 change: 0 additions & 1 deletion pkgs/applications/networking/browsers/chromium/browser.nix
View file
Original file line number Diff line number Diff line change
@@ -82,6 +82,5 @@ mkChromiumDerivation (base: rec {
platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
broken = channel == "dev"; # Blocked on https://bugs.chromium.org/p/chromium/issues/detail?id=1141896
};
})
12 changes: 6 additions & 6 deletions pkgs/applications/networking/browsers/chromium/upstream-info.json
View file
Original file line number Diff line number Diff line change
@@ -26,15 +26,15 @@
}
},
"dev": {
"version": "88.0.4315.5",
"sha256": "0k6man2xq8vmnk73dqv3fcc9929agqq8j6s6nvc9z653q4jdphkw",
"sha256bin64": "0m139w8lwaawridk8in24ss1g1i6ah5298xky226k3vhk5i4mn3j",
"version": "88.0.4324.11",
"sha256": "123gqbxrn508wxdj3is0kzccml5zwnf8pfl90xdizvzcm3wy5315",
"sha256bin64": "11bswhxpnw7qi6lagfpgxh4yh56w7l0bc3rqwf975cbq2cnzpjby",
"deps": {
"gn": {
"version": "2020-10-21",
"version": "2020-11-05",
"url": "https://gn.googlesource.com/gn",
"rev": "f5f465b52e5df6d4de9fbe67cc79f1914ba4dbfc",
"sha256": "1xb31vsvg27ivvcdyiq93h8wj4d90qdrpagfh1dvm6xszkajsca1"
"rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
"sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
}
}
}