From 2fb2e966a514789f332d8c9fe61f34b4a6075722 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sun, 4 Sep 2022 03:14:19 +0800 Subject: [PATCH 1/3] vivaldi: ignore unused debian revision number --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- pkgs/applications/networking/browsers/vivaldi/update.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 69cb5562109a..9fdaa586db2c 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,10 +20,10 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.4.2753.37-1"; + version = "5.4.2753.37"; src = fetchurl { - url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; + url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb"; sha256 = "05aaprv1bqnb7iml1m6vlzv038dizy05ycwkrgb5nw1wiz9w6cyw"; }; diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh index ab072340173a..ec8a9d7d6624 100755 --- a/pkgs/applications/networking/browsers/vivaldi/update.sh +++ b/pkgs/applications/networking/browsers/vivaldi/update.sh @@ -12,7 +12,7 @@ version() { } vivaldi_version_old=$(version vivaldi) -vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[0-9]+)_amd64\.deb.*/\1/p') +vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p') if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then echo "vivaldi is already up-to-date" @@ -20,7 +20,7 @@ if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then fi # Download vivaldi and save hash and file path. -url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}_amd64.deb" +url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}-1_amd64.deb" mapfile -t prefetch < <(nix-prefetch-url --print-path "$url") hash=${prefetch[0]} path=${prefetch[1]} From a04201bb98abe7390ab992d32d5963834fcef097 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sun, 4 Sep 2022 03:21:08 +0800 Subject: [PATCH 2/3] vivaldi: 5.4.2753.37 -> 5.4.2753.47 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 9fdaa586db2c..53c01b977e4e 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.4.2753.37"; + version = "5.4.2753.47"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb"; - sha256 = "05aaprv1bqnb7iml1m6vlzv038dizy05ycwkrgb5nw1wiz9w6cyw"; + sha256 = "1p155mcrmfz395yajxa6fqjk1paac216kim26i3r56wah5329gmr"; }; unpackPhase = '' From 1eab439e4b9f7b54340e0a98d05a170cf0a739f6 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sun, 4 Sep 2022 03:21:23 +0800 Subject: [PATCH 3/3] vivaldi-ffmepg-codecs: 104.0.5112.79 -> 104.0.5112.101 --- .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index a49f2fe1307a..b5c9cd02e792 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "104.0.5112.79"; + version = "104.0.5112.101"; src = fetchurl { - url = "https://launchpadlibrarian.net/616178945/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; - sha256 = "sha256-JL14+2TsX1qXfRpA/tAADC0iujPj37ld6T9yPUD8R38="; + url = "https://launchpadlibrarian.net/618703258/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; + sha256 = "sha256-V+zqLhI8L/8ssxSR6S2v4gUAtoK3fB8Fi9bajBFEauU="; }; buildInputs = [ dpkg ];