From bd482cb65c549b23964efdeede6a820467d9c23c Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sun, 30 Jan 2022 18:06:36 +0100 Subject: [PATCH 1/3] libcef: add update script --- pkgs/development/libraries/libcef/default.nix | 2 ++ pkgs/development/libraries/libcef/update.sh | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100755 pkgs/development/libraries/libcef/update.sh diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index d2ac5ef214ce..c6f2ba7f7228 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -102,6 +102,8 @@ stdenv.mkDerivation rec { cp -r ../include $out/ ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Simple framework for embedding Chromium-based browsers in other applications"; homepage = "https://cef-builds.spotifycdn.com/index.html"; diff --git a/pkgs/development/libraries/libcef/update.sh b/pkgs/development/libraries/libcef/update.sh new file mode 100755 index 000000000000..545f7c702052 --- /dev/null +++ b/pkgs/development/libraries/libcef/update.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused jq + +set -x -eu -o pipefail + +cd $(dirname "${BASH_SOURCE[0]}") + +VERSION_JSON=$(curl --silent https://cef-builds.spotifycdn.com/index.json | jq '[.linux64.versions[] | select (.channel == "stable")][0]') + +CEF_VERSION=$(echo ${VERSION_JSON} | jq -r '.cef_version' | cut -d'+' -f1) +GIT_REVISION=$(echo ${VERSION_JSON} | jq -r '.cef_version' | cut -d'+' -f2 | cut -c 2-) +CHROMIUM_VERSION=$(echo ${VERSION_JSON} | jq -r '.chromium_version') + +SHA256_LINUX64=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linux64_minimal.tar.bz2) +SHA256_LINUX32=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linux32_minimal.tar.bz2) +SHA256_LINUXARM64=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linuxarm64_minimal.tar.bz2) + +setKV () { + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix +} + +setKV version ${CEF_VERSION} +setKV gitRevision ${GIT_REVISION} +setKV chromiumVersion ${CHROMIUM_VERSION} +setKV 'platforms."aarch64-linux".sha256' ${SHA256_LINUXARM64} +setKV 'platforms."i686-linux".sha256' ${SHA256_LINUX32} +setKV 'platforms."x86_64-linux".sha256' ${SHA256_LINUX64} From 972547089f4b56ec0edefb3b6d30405e9e501fbb Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Mon, 31 Jan 2022 09:44:56 +0100 Subject: [PATCH 2/3] libcef: add test that obs-studio builds --- pkgs/development/libraries/libcef/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index c6f2ba7f7228..62d67f0edbaa 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -26,6 +26,7 @@ , at-spi2-core , cups , libxshmfence +, obs-studio }: let @@ -102,6 +103,9 @@ stdenv.mkDerivation rec { cp -r ../include $out/ ''; + passthru.tests = { + inherit obs-studio; # frequently breaks on CEF updates + }; passthru.updateScript = ./update.sh; meta = with lib; { From 4b55264c8584b4bddb31961867db3d4ef174ebce Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 18 Feb 2022 09:59:31 +0100 Subject: [PATCH 3/3] libcef: 96.0.18 -> 98.1.21 --- pkgs/development/libraries/libcef/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 62d67f0edbaa..7dfafe6bd06d 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -60,27 +60,27 @@ let "aarch64-linux" = { platformStr = "linuxarm64"; projectArch = "arm64"; - sha256 = "01ny1k10dklsqrrqmxqd9433413wmpk4ddsmkjp9dzv52dvpcl08"; }; "i686-linux" = { platformStr = "linux32"; projectArch = "x86"; - sha256 = "000j6pc336c43xczl1rs5zf8nsf17y76f1kpy14gqgpwyzl8my0w"; }; "x86_64-linux" = { platformStr = "linux64"; projectArch = "x86_64"; - sha256 = "1ydjckld89dkpy5zrvk7jjpz70mnlmbm8yinkfpzgcwbkcakk6k7"; }; }; + platforms."aarch64-linux".sha256 = "0m12adzcs6xsmgnqsdc5g0xs6xmjbj560x4d9rnv9fpf1p7jv2fa"; + platforms."i686-linux".sha256 = "00cy5kxx8hpifkwhn9qbfch7ng3crx0zb6ypllzip6qms956mama"; + platforms."x86_64-linux".sha256 = "1f1hxx4xl0wljyrgj0m3zq47yz2cyqd52qigrkpcvavr1d2sx6m3"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "96.0.18"; - gitRevision = "fe551e4"; - chromiumVersion = "96.0.4664.110"; + version = "98.1.21"; + gitRevision = "9782362"; + chromiumVersion = "98.0.4758.102"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";