Update dependencies

flake.lock

@@ -15,11 +15,11 @@
         "web": "web"
       },
       "locked": {
-        "lastModified": 1651794891,
+        "lastModified": 1652176709,
-        "narHash": "sha256-akdEp8/9OBCQV10Hkf0nMrtAwpZo0LDHapuuWLwobvQ=",
+        "narHash": "sha256-11Sjz9xw+RSjslH9B31kGhFfjaVyq9bUnRNsM4UR0e4=",
         "owner": "accentor",
         "repo": "flake",
-        "rev": "5f00f835630d64eb599b293f79e19626bdb881d9",
+        "rev": "571bf0f8ee6b6ea8a098c637ed1a1f3b5b40b52b",
         "type": "github"
       },
       "original": {
@@ -172,14 +172,16 @@
     "emacs-overlay": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1652157318,
+        "lastModified": 1652183402,
-        "narHash": "sha256-sgrp+9/YXkiGFoJEiu8nREXh9/qRIgX8m/WKS8EdhFQ=",
+        "narHash": "sha256-aOxl1X8jpwlIL00lKMSp6UsLSmYVBiZWzhJvt42j35A=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "3a0704d6ae03c5db954697b6c0873ebc14e324f5",
+        "rev": "0646f7ce8d90faadd752ea8037ed4d3c82b7576e",
         "type": "github"
       },
       "original": {
@@ -264,25 +266,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1652133925,
+        "lastModified": 1652082323,
-        "narHash": "sha256-kfATGChLe9/fQVZkXN9G71JAVMlhePv1qDbaRKklkQs=",
+        "narHash": "sha256-7GSVLvfCJtH9dJ3om9Lg4fsi9UKvoxxR69gUTcx0ol8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "51d859cdab1ef58755bd342d45352fc607f5e59b",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1651726670,
-        "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01",
+        "rev": "2a3aac479caeba0a65b2ad755fe5f284f1fde74d",
         "type": "github"
       },
       "original": {
@@ -318,7 +306,7 @@
         "flake-utils": "flake-utils_2",
         "home-manager": "home-manager",
         "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nur": "nur",
         "tetris": "tetris",
         "utils": "utils"
@@ -331,11 +319,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1651794013,
+        "lastModified": 1652175690,
-        "narHash": "sha256-SblAPYR8ze0xjnbUqGJbKsGEO6nHOOCT1Kv3R9nz9I0=",
+        "narHash": "sha256-pRpj5mUSgUTqpK8HdOMvFwLjmIhk/i/LWcUhstpF88A=",
         "owner": "chvp",
         "repo": "tetris",
-        "rev": "59e37e61e90faf51e9d2007c7344664b89110f7d",
+        "rev": "1f0edf7a482892a9702a54b47e95fb559ea3d2e4",
         "type": "github"
       },
       "original": {

flake.nix

@@ -37,7 +37,10 @@
         nixpkgs.follows = "nixpkgs";
       };
     };
-    emacs-overlay.url = "github:nix-community/emacs-overlay";
+    emacs-overlay = {
+      url = "github:nix-community/emacs-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     flake-utils.url = "github:numtide/flake-utils";
     home-manager = {
       url = "github:nix-community/home-manager";

patches/172319.patch

@@ -0,0 +1,48 @@
+From b4a61b636a21c7e4608ae9003ccb3865176f395c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
+Date: Tue, 10 May 2022 12:43:06 +0200
+Subject: [PATCH] teams: fix wrapper workaround
+
+We can't rely on the wrapper being a shell script, so we make our own
+wrapper to append the needed args.
+---
+ .../networking/instant-messengers/teams/default.nix | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
+index 684fb8454d673..07462b4cc26f8 100644
+--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
++++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
+@@ -1,5 +1,6 @@
+ { lib
+ , stdenv
++, runtimeShell
+ , fetchurl
+ , autoPatchelfHook
+ , wrapGAppsHook
+@@ -57,8 +58,6 @@ let
+ 
+     preFixup = ''
+       gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin")
+-      gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox)
+-      gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox)
+     '';
+ 
+ 
+@@ -121,9 +120,13 @@ let
+       done;
+ 
+       # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406
+-      # while we create the wrapper ourselves, gappsWrapperArgs leads to the same issue
+-      # another option would be to introduce gappsWrapperAppendedArgs, to allow control of positioning
+-      substituteInPlace "$out/bin/teams" --replace '.teams-wrapped"  --disable-namespace-sandbox --disable-setuid-sandbox "$@"' '.teams-wrapped" "$@" --disable-namespace-sandbox --disable-setuid-sandbox'
++      wrapped=$out/bin/.teams-old
++      mv "$out/bin/teams" "$wrapped"
++      cat > "$out/bin/teams" << EOF
++      #! ${runtimeShell}
++      exec $wrapped "\$@" --disable-namespace-sandbox --disable-setuid-sandbox
++      EOF
++      chmod +x "$out/bin/teams"
+     '';
+   };
+