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: 74008e2c3c06
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 13e3b03d1b48
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 11, 2019

  1. chromium: restore versionRange utility 

    This partially reverts commit
f45798e.

cc @ivan I'd like to have that left in, because it's very useful for
gcc compiles, when necessary patches often span multiple releases,
i.e. for aarch64 builds
    @bendlas
    bendlas committed Oct 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dimkl Dimitris Klouvas
    GPG key ID: 0931F5B7A6BC310B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    13e3b03 View commit details
Showing with 10 additions and 0 deletions.
  1. +10 −0 pkgs/applications/networking/browsers/chromium/common.nix
10 changes: 10 additions & 0 deletions pkgs/applications/networking/browsers/chromium/common.nix
View file
Original file line number Diff line number Diff line change
@@ -96,6 +96,15 @@ let
buildPath = "out/${buildType}";
libExecPath = "$out/libexec/${packageName}";

versionRange = min-version: upto-version:
let inherit (upstream-info) version;
result = versionAtLeast version min-version && versionOlder version upto-version;
stable-version = (import ./upstream-info.nix).stable.version;
in if versionAtLeast stable-version upto-version
then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
result
else result;

base = rec {
name = "${packageName}-unwrapped-${version}";
inherit (upstream-info) channel version;
@@ -148,6 +157,7 @@ let
# - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits
#
# ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
] ++ optionals (useVaapi) [
# source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi
./patches/chromium-vaapi.patch