From e486a90bcd3be6cbd0e3fa5bb2d56aa48d21e2d5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 24 May 2022 10:22:17 +0800 Subject: [PATCH 01/10] pantheon.gala: save/restore easing on workspace switch (cherry picked from commit 7d48c204efd169837a75c752d8c13515388c2a1b) --- pkgs/desktops/pantheon/desktop/gala/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 1cd8ef9bb465..a76895559d8d 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -39,6 +40,13 @@ stdenv.mkDerivation rec { # We look for plugins in `/run/current-system/sw/lib/` because # there are multiple plugin providers (e.g. gala and wingpanel). ./plugins-dir.patch + + # WindowManager: save/restore easing on workspace switch + # https://github.com/elementary/gala/pull/1430 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/1f94db16c627f73af5dc69714611815e4691b5e8.patch"; + sha256 = "sha256-PLNbAXyOG0TMn1y2QIBnL6BOQVqBA+DBgPOVJo4nDr8="; + }) ]; nativeBuildInputs = [ From 0ebc81a314684090a8760e39718193b450a3c516 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 24 May 2022 08:23:42 -0600 Subject: [PATCH 02/10] element-{web,desktop}: 1.10.12 -> 1.10.13 (cherry picked from commit 402e5fe40d1184154e6ace4d2743fe53e7e83842) --- .../element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/pin.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 46a64d1b533c..b470f658042f 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.12", + "version": "1.10.13", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 77058ce04c31..c2bc3d8a89ee 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.10.12", - "desktopSrcHash": "K1p/+dZRtKb+AiU2EcikAsmiTIKPw0zaVzAfUDzsYZY=", - "desktopYarnHash": "09ri87ynfgxrv22sykggiy6nlcf20qwj7zj9qq0rz3c2acr6g9mn", - "webHash": "1m7pvliymyggg6qx8gj6l3j2f4rml0km1vmk1zdspxa4l6p0qxd8" + "version": "1.10.13", + "desktopSrcHash": "tTvpjSIipvmJIfZF1RiRtlDjsKJYHoPQ6XSqI8TGH14=", + "desktopYarnHash": "105bphn4ga4f0n60cvrlppf8wim2c1qy09g8arraadcxymds98n6", + "webHash": "1zxjlzlxh2gbswa1063zbw6ahwlcnvyqkvbwj92vk873c3g8ba72" } From 5a2f45bcb7a6be615d5e4655d240561b18697320 Mon Sep 17 00:00:00 2001 From: Thomas Nixon Date: Fri, 25 Mar 2022 02:38:23 +0000 Subject: [PATCH 03/10] zoom-us: 5.9.6.2225 -> 5.10.4.2845 on x86_64-linux (cherry picked from commit bb17d93a56ae3bc47255c6f2136f56afee87d231) --- .../instant-messengers/zoom-us/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 4aa9dbc9b10c..429025c953f8 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,20 @@ }: let - version = "5.9.6.2225"; + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + # Zoom versions are released at different times for each platform + version = { + aarch64-darwin = "5.10.4.6592"; + x86_64-darwin = "5.10.4.6592"; + x86_64-linux = "5.10.4.2845"; + }.${system} or throwSystem; + srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53"; + sha256 = "9gspydrGaEjzAM0nK1u0XNm07HTupJ2wnPxCFWy+Nts="; }; }; From 9c8e0d220d6097d65e236f34b2949d73d36560af Mon Sep 17 00:00:00 2001 From: Clemens Lutz Date: Mon, 28 Mar 2022 16:17:59 +0200 Subject: [PATCH 04/10] zoom-us: Update dependencies (cherry picked from commit 5791f1c43f97a00ed4c6daf2394e759448620636) --- .../instant-messengers/zoom-us/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 429025c953f8..b0247326e0c8 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -5,14 +5,22 @@ # Dynamic libraries , alsa-lib , atk +, at-spi2-atk +, at-spi2-core , cairo +, cups , dbus +, expat +, libdrm , libGL , fontconfig , freetype , gtk3 , gdk-pixbuf , glib +, mesa +, nspr +, nss , pango , wayland , xorg @@ -49,23 +57,34 @@ let # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' alsa-lib atk + at-spi2-atk + at-spi2-core cairo + cups dbus + expat + libdrm libGL fontconfig freetype gtk3 gdk-pixbuf glib + mesa + nspr + nss pango stdenv.cc.cc wayland xorg.libX11 xorg.libxcb xorg.libXcomposite + xorg.libXdamage xorg.libXext libxkbcommon + xorg.libXrandr xorg.libXrender + xorg.libxshmfence zlib xorg.xcbutilimage xorg.xcbutilkeysyms From 7647f191559c0325caf01419a434cd84f1e24f36 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 4 Apr 2022 14:00:40 -0500 Subject: [PATCH 05/10] zoom: add dep for udev, fix launching (cherry picked from commit 215155b44065e6b2652535f720fa04ac20e8980f) --- .../networking/instant-messengers/zoom-us/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index b0247326e0c8..4ac13d928a42 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -25,6 +25,7 @@ , wayland , xorg , libxkbcommon +, udev , zlib # Runtime , coreutils @@ -85,11 +86,12 @@ let xorg.libXrandr xorg.libXrender xorg.libxshmfence - zlib xorg.xcbutilimage xorg.xcbutilkeysyms xorg.libXfixes xorg.libXtst + udev + zlib ] ++ lib.optional (pulseaudioSupport) libpulseaudio); in From 742f1bdea64539ea15d05ef59f6a36306199edb6 Mon Sep 17 00:00:00 2001 From: Thomas Nixon Date: Mon, 16 May 2022 18:32:31 +0100 Subject: [PATCH 06/10] zoom-us: change wrapper name to fix IPC (cherry picked from commit fa585a07f65f4ee954758c67db6c75463a6f6560) --- .../networking/instant-messengers/zoom-us/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 4ac13d928a42..6f2c3171e1b0 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -125,7 +125,9 @@ stdenv.mkDerivation rec { done # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom - wrapProgram $out/opt/zoom/zoom \ + # IPC breaks if the executable name does not end in 'zoom' + mv $out/opt/zoom/zoom $out/opt/zoom/.zoom + makeWrapper $out/opt/zoom/.zoom $out/opt/zoom/zoom \ --prefix LD_LIBRARY_PATH ":" ${libs} rm $out/bin/zoom From e0c7ffdb651cf12c765df945351fbf8f43124a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Reu=C3=9Fe?= Date: Tue, 24 May 2022 16:39:19 +0200 Subject: [PATCH 07/10] zoom-us: 5.10.4.2845 -> 5.10.6.3192 on x86_64-linux Fixes #174147 (cherry picked from commit 1b27e162e537681b318b4610d0bffb2a74c47b70) --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 6f2c3171e1b0..257a85c0a1e8 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -44,13 +44,13 @@ let version = { aarch64-darwin = "5.10.4.6592"; x86_64-darwin = "5.10.4.6592"; - x86_64-linux = "5.10.4.2845"; + x86_64-linux = "5.10.6.3192"; }.${system} or throwSystem; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "9gspydrGaEjzAM0nK1u0XNm07HTupJ2wnPxCFWy+Nts="; + sha256 = "8QIkF5+875VFoGK6T0CROsqML6bJDG934c1gkuz8Klk="; }; }; From 244c3c00bb6f2fbf59372ed73cd5134d3ff2f84d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 14:19:15 +0000 Subject: [PATCH 08/10] linuxPackages.netatop: fix build with Linux 5.18 With 5.18, implicit fallthrough is an error, and netatop hasn't caught up yet. (cherry picked from commit 197e9ba286917cf32ed85efa117a14285b21a998) --- pkgs/os-specific/linux/netatop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 28f989929a4c..fce58fe08d13 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation { buildInputs = [ kmod zlib ]; hardeningDisable = [ "pic" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; patches = [ # fix paths in netatop.service From b5633cb915d23b74cc1f8d91530db9f984324410 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 15:13:48 +0000 Subject: [PATCH 09/10] linuxPackages.vendor-reset: patch for Linux 5.18 (cherry picked from commit d851e2f78a2c270e0f8ba1954cd884830796c8d0) --- pkgs/os-specific/linux/vendor-reset/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix index 8f1bde7ecbd5..1d5832dba22a 100644 --- a/pkgs/os-specific/linux/vendor-reset/default.nix +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, lib }: +{ stdenv, fetchFromGitHub, fetchpatch, kernel, lib }: stdenv.mkDerivation rec { name = "vendor-reset-${version}-${kernel.version}"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-xa7P7+mRk4FVgi+YYCcsFLfyNqPmXvy3xhGoTDVqPxw="; }; + patches = [ + # Fix build with Linux 5.18. + # https://github.com/gnif/vendor-reset/pull/58 + (fetchpatch { + url = "https://github.com/gnif/vendor-reset/commit/5bbffcd6fee5348e8808bdbfcb5b21d455b02f55.patch"; + sha256 = "sha256-L1QxVpcZAVYiaMFCBfL2EJgeMyOR8sDa1UqF1QB3bns="; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; From 454c54d7b611dd855b877bffd6273c5d598ebf17 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 15:14:01 +0000 Subject: [PATCH 10/10] linuxPackages.vendor-reset: enable parallel building Tested at -j48. (cherry picked from commit 9dab6bc07744790f5ca081fd9af07db1547bfaf5) --- pkgs/os-specific/linux/vendor-reset/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix index 1d5832dba22a..14f189d378ab 100644 --- a/pkgs/os-specific/linux/vendor-reset/default.nix +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { install -D vendor-reset.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/misc/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "Linux kernel vendor specific hardware reset module"; homepage = "https://github.com/gnif/vendor-reset";