Unverified Commit f69e050c authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #188192 from kouyk/update/vivaldi

parents 9b214e6d 1eab439e

pkgs/applications/networking/browsers/vivaldi/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ 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.47";



  src = fetchurl {

    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";

    sha256 = "05aaprv1bqnb7iml1m6vlzv038dizy05ycwkrgb5nw1wiz9w6cyw";

    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb";

    sha256 = "1p155mcrmfz395yajxa6fqjk1paac216kim26i3r56wah5329gmr";

  };



  unpackPhase = ''

pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix

+3 −3
Original line number Diff line number Diff line
@@ -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 ];

pkgs/applications/networking/browsers/vivaldi/update.sh

+2 −2
Original line number Diff line number Diff line
@@ -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]}