diff --git a/pkgs/by-name/cr/cromite/package.nix b/pkgs/by-name/cr/cromite/package.nix index 118bee32b0a0..93af344c49bb 100644 --- a/pkgs/by-name/cr/cromite/package.nix +++ b/pkgs/by-name/cr/cromite/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - makeBinaryWrapper, + makeWrapper, patchelf, copyDesktopItems, makeDesktopItem, @@ -166,15 +166,15 @@ let qt6.qtbase qt6.qtwayland ]; - commit = "0ffdb845a6a3308cbd9826bb78269d1d05cfb8aa"; in stdenv.mkDerivation (finalAttrs: { pname = "cromite"; - version = "135.0.7049.100"; + version = "137.0.7151.44"; + commit = "1abdac0aff0916b1e4a4bd52f1896eec00834262"; src = fetchurl { - url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${commit}/chrome-lin64.tar.gz"; - hash = "sha256-bB6CPqgwT1p7aXIKauOrRhG4dhCQ9tyO+HHRrkbrsPQ="; + url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${finalAttrs.commit}/chrome-lin64.tar.gz"; + hash = "sha256-33GS4uD3RJHy9M0S5TRB6kRb1SZR+ABLyOR1oeVLQto="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = false; nativeBuildInputs = [ - makeBinaryWrapper + makeWrapper patchelf copyDesktopItems ]; @@ -234,6 +234,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ --set CHROME_WRAPPER "cromite" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \ + --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ --add-flags ${lib.escapeShellArg commandLineArgs} # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so @@ -247,6 +248,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = { changelog = "https://github.com/uazo/cromite/releases"; description = "Bromite fork with ad blocking and privacy enhancements"; diff --git a/pkgs/by-name/cr/cromite/update.sh b/pkgs/by-name/cr/cromite/update.sh new file mode 100755 index 000000000000..5e604bc242db --- /dev/null +++ b/pkgs/by-name/cr/cromite/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix bash coreutils nix-update common-updater-scripts + +set -eou pipefail + +latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/uazo/cromite/releases/latest | jq --raw-output .tag_name | sed 's/^v//') +latestVersion="${latestTag%-*}" +commit="${latestTag#*-}" + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; cromite.version or (lib.getVersion cromite)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +update-source-version cromite $commit --version-key=commit || true +nix-update cromite --version $latestVersion