From 5a53f745b4dc9c961ea69c850b29ace2d431f512 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 18 Apr 2023 10:03:44 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 42 ++++++++--------- patches/226528.patch | 36 --------------- patches/226543.patch | 107 ------------------------------------------- 3 files changed, 21 insertions(+), 164 deletions(-) delete mode 100644 patches/226528.patch delete mode 100644 patches/226543.patch diff --git a/flake.lock b/flake.lock index 7bb73c2f..fb2aee47 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1681684913, - "narHash": "sha256-EnqbfBiFel4RGXvn6SrI0/yj+EUH2GZ9ljbzzAtYdus=", + "lastModified": 1681771242, + "narHash": "sha256-fhM3ASItJy4tReyyCvjpMN1QiyfG5lFvTazYrCs8/f4=", "owner": "accentor", "repo": "api", - "rev": "0d5ac5d983e8dd1e058ce38e1d3dbd75418cdb05", + "rev": "b145d409b74103bc7072b6fcfb1c52a3359ce80f", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1681725074, - "narHash": "sha256-E8DTWW2R4NO2c1qmpYnpqX2ScdQqzqzOOyVkDO6aRrs=", + "lastModified": 1681771322, + "narHash": "sha256-ph3G6dK3dnB5e5eAQ8oEvkVB8HeDFJDytU37hHvTPTw=", "owner": "accentor", "repo": "web", - "rev": "04de3ed3232b2bf9eff5495c43179ffb579fa47f", + "rev": "0713990866b4155822f88b15b88413529522b9f2", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1681751556, - "narHash": "sha256-+ht3wdxYhanqknByZRk5OubrSw/0a+kwzqGLZN25aRw=", + "lastModified": 1681783787, + "narHash": "sha256-YqZd9wzx+io5FJnjgR4ADOYsB0NZJbFt1w99TbDfH3g=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3b912580d054557e959d0b282fd12f5c473103f3", + "rev": "20248af9c7408b3bb5d5db892a586de3e760834d", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1681759968, - "narHash": "sha256-hW5MdNfnZa8ayAor4vLvlZobvsyT1WEJ6tirN/cBsVY=", + "lastModified": 1681799488, + "narHash": "sha256-aAK/Mzf2yZ20stXkmPmtvtDQFy2XaEjAyZ3Fo56FbQc=", "owner": "nix-community", "repo": "home-manager", - "rev": "cd690d202176c251f2a5ed31b621937f8a95268d", + "rev": "2dcb61d396b45f10d9e0621a7358b361f94323ff", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1681648924, - "narHash": "sha256-pzi3HISK8+7mpEtv08Yr80wswyHKsz+RP1CROG1Qf6s=", + "lastModified": 1681737997, + "narHash": "sha256-pHhjgsIkRMu80LmVe8QoKIZB6VZGRRxFmIvsC5S89k4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f294325aed382b66c7a188482101b0f336d1d7db", + "rev": "f00994e78cd39e6fc966f0c4103f908e63284780", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nur": { "locked": { - "lastModified": 1681760769, - "narHash": "sha256-8ilqnx1tcCI+Nk1NgI1Oqxa3CBEJV9/NIkv31LhZGkE=", + "lastModified": 1681789523, + "narHash": "sha256-6hNQ6487xA4vpMxUj13kOYj6VhLUC9iZAcGUuQIfLTg=", "owner": "nix-community", "repo": "NUR", - "rev": "69d0c9359e81476af01b08e1b7767bdf3ce7f9c4", + "rev": "bf5c9a12078291dd4667e0e0ebd152f991e52a89", "type": "github" }, "original": { @@ -382,11 +382,11 @@ ] }, "locked": { - "lastModified": 1681680933, - "narHash": "sha256-qF8VMDlnjxqCYL982Q250ob3SqmeiKgd2uqE2FyZFgo=", + "lastModified": 1681767346, + "narHash": "sha256-AD9Y6IV+YHnugVxVFuMEdP6OuOjBzIyeUWuYPcxotcU=", "owner": "chvp", "repo": "tetris", - "rev": "4c977a6a2e77decaef653615b79761c3748f1162", + "rev": "8710169605a4cd706446669bd160904283259f84", "type": "github" }, "original": { diff --git a/patches/226528.patch b/patches/226528.patch deleted file mode 100644 index 55c0a87d..00000000 --- a/patches/226528.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7a40725f9eb291bb11a46122d93faeb661e536d6 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sun, 16 Apr 2023 22:51:44 +0200 -Subject: [PATCH] mautrix-whatsapp: 0.8.3 -> 0.8.4 - -https://github.com/mautrix/whatsapp/releases/tag/v0.8.4 ---- - pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix -index 06821636099f7..6e537b88ec7f2 100644 ---- a/pkgs/servers/mautrix-whatsapp/default.nix -+++ b/pkgs/servers/mautrix-whatsapp/default.nix -@@ -2,18 +2,18 @@ - - buildGoModule rec { - pname = "mautrix-whatsapp"; -- version = "0.8.3"; -+ version = "0.8.4"; - - src = fetchFromGitHub { - owner = "mautrix"; - repo = "whatsapp"; - rev = "v${version}"; -- hash = "sha256-rSyKKWg9PiAZAdmUfWWxU4ZXGHP+LR1kcDXMbkB3wYA="; -+ hash = "sha256-4dOkSnurg2Sk36Z2WNjPaO092IiRlzc9oWM6sQ+wUwM="; - }; - - buildInputs = [ olm ]; - -- vendorSha256 = "sha256-eHY6YBPDA2uJyhvB/3bd+W2PEfGjyx3BEAlbJvVV0Yo="; -+ vendorSha256 = "sha256-48C9aaOe148emSsxzfKFKtnXyC39IFO8Ge7d+rIhDac="; - - doCheck = false; - diff --git a/patches/226543.patch b/patches/226543.patch deleted file mode 100644 index 7fc2e738..00000000 --- a/patches/226543.patch +++ /dev/null @@ -1,107 +0,0 @@ -From ec5ee07b1b29070475284ada1eee05ec5b7ad821 Mon Sep 17 00:00:00 2001 -From: Lily Foster -Date: Sun, 16 Apr 2023 18:40:28 -0400 -Subject: [PATCH 1/2] teams-for-linux: 1.0.59 -> 1.0.65 - ---- - .../networking/instant-messengers/teams-for-linux/default.nix | 4 ++-- - pkgs/top-level/all-packages.nix | 4 +--- - 2 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -index 2ea2de235bb2a..a38ddcd85b7cb 100644 ---- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -@@ -16,13 +16,13 @@ - - stdenv.mkDerivation rec { - pname = "teams-for-linux"; -- version = "1.0.59"; -+ version = "1.0.65"; - - src = fetchFromGitHub { - owner = "IsmaelMartinez"; - repo = pname; - rev = "v${version}"; -- sha256 = "sha256-82uRZEktKHMQhozG5Zpa2DFu1VZOEDBWpsbfgMzoXY8="; -+ sha256 = "sha256-Rj6A1h5R4w8zacoTV0WKTbTD67qwsw4zHP+KQ6h7/gs="; - }; - - offlineCache = fetchYarnDeps { -diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix -index 68b2c7bec67df..10d596059a4ba 100644 ---- a/pkgs/top-level/all-packages.nix -+++ b/pkgs/top-level/all-packages.nix -@@ -33935,9 +33935,7 @@ with pkgs; - - teams = callPackage ../applications/networking/instant-messengers/teams { }; - -- teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { -- electron = electron_21; -- }; -+ teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { }; - - teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; - teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { }; - -From 6c15c20d94bbd454bdc7c8e7e8b58779409fe9ff Mon Sep 17 00:00:00 2001 -From: Lily Foster -Date: Sun, 16 Apr 2023 19:22:51 -0400 -Subject: [PATCH 2/2] teams-for-linux: add hack fix for wayland screen-sharing - ---- - .../teams-for-linux/default.nix | 5 ++++ - .../screensharing-wayland-hack-fix.patch | 28 +++++++++++++++++++ - 2 files changed, 33 insertions(+) - create mode 100644 pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch - -diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -index a38ddcd85b7cb..92fffd4a36fab 100644 ---- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -@@ -30,6 +30,11 @@ stdenv.mkDerivation rec { - sha256 = "sha256-3zjmVIPQ+F2jPQ2xkAv5hQUjr8k5jIHTsa73J+IMayw="; - }; - -+ patches = [ -+ # Can be removed once Electron upstream resolves https://github.com/electron/electron/issues/36660 -+ ./screensharing-wayland-hack-fix.patch -+ ]; -+ - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; - - configurePhase = '' -diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch b/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch -new file mode 100644 -index 0000000000000..3e5d993e869ec ---- /dev/null -+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch -@@ -0,0 +1,28 @@ -+diff --git a/app/index.js b/app/index.js -+index 20ccf43..b251f62 100644 -+--- a/app/index.js -++++ b/app/index.js -+@@ -1,4 +1,4 @@ -+-const { app, ipcMain, desktopCapturer, systemPreferences, powerMonitor } = require('electron'); -++const { app, ipcMain, desktopCapturer, nativeImage, systemPreferences, powerMonitor } = require('electron'); -+ const path = require('path'); -+ const { LucidLog } = require('lucid-log'); -+ const isDev = require('electron-is-dev'); -+@@ -93,7 +93,16 @@ if (!gotTheLock) { -+ ipcMain.handle('getSystemIdleState', handleGetSystemIdleState); -+ ipcMain.handle('getZoomLevel', handleGetZoomLevel); -+ ipcMain.handle('saveZoomLevel', handleSaveZoomLevel); -+- ipcMain.handle('desktopCapturerGetSources', (event, opts) => desktopCapturer.getSources(opts)); -++ ipcMain.handle('desktopCapturerGetSources', (event, opts) => process.env.XDG_SESSION_TYPE == 'wayland' ? -++ // Port wayland electron 22+ screenshare "fix" from webcord -++ Promise.resolve([{ -++ id: "screen:1:0", -++ appIcon: nativeImage.createEmpty(), -++ display_id: "", -++ name: "Entire Screen", -++ thumbnail: nativeImage.createEmpty() -++ }]) -++ : desktopCapturer.getSources(opts)); -+ ipcMain.on('play-notification-sound', playNotificationSound); -+ } -+