diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2019-10-11 22:55:11 +0200 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2019-10-11 23:00:29 +0200 |
| commit | 13e3b03d1b485cda90197f5330c15c7f7ec8dcba (patch) | |
| tree | 929d338f8518dc3b2cadf4f7f31ebc0a8dc2e603 /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | 74008e2c3c06c1526bae722529ce929078c54eb0 (diff) | |
| download | nixpkgs-13e3b03d1b485cda90197f5330c15c7f7ec8dcba.tar nixpkgs-13e3b03d1b485cda90197f5330c15c7f7ec8dcba.tar.gz nixpkgs-13e3b03d1b485cda90197f5330c15c7f7ec8dcba.tar.bz2 nixpkgs-13e3b03d1b485cda90197f5330c15c7f7ec8dcba.tar.lz nixpkgs-13e3b03d1b485cda90197f5330c15c7f7ec8dcba.tar.xz nixpkgs-13e3b03d1b485cda90197f5330c15c7f7ec8dcba.tar.zst nixpkgs-13e3b03d1b485cda90197f5330c15c7f7ec8dcba.zip | |
chromium: restore versionRange utility
This partially reverts commit f45798e544c6fc7dc9fe5494330d98406687fa85. 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
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8caf159fe66..01793c4ee63 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -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 |