From 3f685f3e4b8b62e555e723daeef84dceda7f847d Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Mon, 3 Jan 2022 11:42:18 -0300 Subject: [PATCH 1/5] lean: 3.35.0 -> 3.35.1 (cherry picked from commit 5b3eac3130bb68737b8f433722515acc5a6c24b1) --- pkgs/applications/science/logic/lean/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 218a27541877..0b53c2ed8e68 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.35.0"; + version = "3.35.1"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "a68d251bfc57341d8f1f6d8c6e548a0b08ff3b92"; - sha256 = "0f91kvd4z7rsjyagfx56y1vxmf4wjds7bnz6yh3sd4xx770z58d4"; + rev = "4887d8a30621941c883f208e151e61ab268c006d"; + sha256 = "0xmiysmq80dnzq1lw9jmprc85kfimw0sl8m5rbi05z8f782gzv1z"; }; nativeBuildInputs = [ cmake ]; From 714460c14f944a737be9def1906389d15fd19c89 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 3 Jan 2022 22:53:56 +0000 Subject: [PATCH 2/5] mpv: 0.34.0 -> 0.34.1 (cherry picked from commit ddc858382c160e14b9c896ffc347c8db43476415) --- pkgs/applications/video/mpv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 3183ca9bbe92..576f79c47793 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -81,7 +81,7 @@ let in stdenv.mkDerivation rec { pname = "mpv"; - version = "0.34.0"; + version = "0.34.1"; outputs = [ "out" "dev" "man" ]; @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "sha256-qa6xZV4aLcHBMa2bIqoKjte4+KWEGGZre4L0u1+eDE8="; + sha256 = "12qxwm1ww5vhjddl8yvj1xa0n1fi9z3lmzwhaiday2v59ca0qgsk"; }; postPatch = '' From 9d23eef82c3a5b8886c0972c26fbfdf7d11bab35 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Wed, 22 Dec 2021 15:06:54 +0800 Subject: [PATCH 3/5] vivaldi: 4.3.2439.44-1 -> 5.0.2497.32-1 (cherry picked from commit 402296bca8933e6f90e71f0469b51b9578b18352) --- 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 4e44e5841805..2aec1abda864 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "4.3.2439.44-1"; + version = "5.0.2497.32-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1bsx8axs438f4p019mdq66pmpimf575r31rv6cibpgv85366xhh9"; + sha256 = "1l333q002z9rr08np0r0j89j26shmsl8y2clyqwh54h22h7hmypz"; }; unpackPhase = '' From 685549357b03872a216dc8a3a9fff0f576144a55 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Wed, 22 Dec 2021 16:10:55 +0800 Subject: [PATCH 4/5] vivaldi: add vaapi support (cherry picked from commit 645d8b2ddf5676d285e6780d6040a367264752df) --- 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 2aec1abda864..dab4423eb876 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsa-lib, dbus, cups, libexif, ffmpeg, systemd +, alsa-lib, dbus, cups, libexif, ffmpeg, systemd, libva , freetype, fontconfig, libXft, libXrender, libxcb, expat , libuuid , libxml2 @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd + atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd libva freetype fontconfig libXrender libuuid expat glib nss nspr libxml2 pango cairo gnome2.GConf libdrm mesa From 17c7e5126fc4670205a6847cb1209f421893f38c Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Wed, 22 Dec 2021 17:02:58 +0800 Subject: [PATCH 5/5] vivaldi: add commandLineArgs (cherry picked from commit ce08f09cc9612e1d78838799d94ce0cd7e7cdba1) --- pkgs/applications/networking/browsers/vivaldi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index dab4423eb876..bf220c02b4e4 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -11,6 +11,7 @@ , isSnapshot ? false , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , enableWidevine ? false, vivaldi-widevine ? null +, commandLineArgs ? "" }: let @@ -85,6 +86,7 @@ in stdenv.mkDerivation rec { "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png done wrapProgram "$out/bin/vivaldi" \ + --add-flags ${lib.escapeShellArg commandLineArgs} \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} '' + lib.optionalString enableWidevine ''