From 3c291371c7045b46ac18ef7f256962f464785bbf Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 12 May 2022 09:37:20 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 30 +++++++++++++-------------- patches/172319.patch | 48 -------------------------------------------- 2 files changed, 15 insertions(+), 63 deletions(-) delete mode 100644 patches/172319.patch diff --git a/flake.lock b/flake.lock index ce4983ea..2618bdef 100644 --- a/flake.lock +++ b/flake.lock @@ -15,11 +15,11 @@ "web": "web" }, "locked": { - "lastModified": 1652237021, - "narHash": "sha256-3VjVGDHuBNwz+F0jj1CSjz7+ctR4IBuG4iSODRKQdeI=", + "lastModified": 1652302223, + "narHash": "sha256-EDK2XRnZ+8WRWkxp8Mm5d48v1H/pnmJkxNBFwt0AXDM=", "owner": "accentor", "repo": "flake", - "rev": "88e97f2e7f3a818264f4154361d26cc313c17314", + "rev": "8b3a0ccb0bc6184407c8af9f8bd273c9624f3c3f", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1652243546, - "narHash": "sha256-Etm7bqPCNwucjTBWSfEeqkcpNE6e1+0JrqFygTT2A9o=", + "lastModified": 1652332826, + "narHash": "sha256-rFR8zc81TlOcuHFWhm7hy1KIbRB2t6lzWVX4uS8xJPM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4daa399a9895ce76441f696be993c339d4096341", + "rev": "e6ec42b61a1a151d1f7adec951138597448007e6", "type": "github" }, "original": { @@ -266,11 +266,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1652172129, - "narHash": "sha256-8e2JMrswaKe02P8rYfvIMoc59pNuw6h/GYu8DBE1c+0=", + "lastModified": 1652231724, + "narHash": "sha256-MjalcXFZgcgchp4QqnF05JTkFBBGad5hbksA1EKoP98=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f419dc5763c2b3c5580e396dea065b6d8b58ee27", + "rev": "41ff747f882914c1f8c233207ce280ac9d0c867f", "type": "github" }, "original": { @@ -282,11 +282,11 @@ }, "nur": { "locked": { - "lastModified": 1652242075, - "narHash": "sha256-SxETLAElqmyoJoGCD3vwJk3KYA4d1LdP1yCRH+Wxehs=", + "lastModified": 1652333580, + "narHash": "sha256-Wl1ZDf++BPnUzSFWNoHg8r5ykAOleNfKKIPO96lO6D8=", "owner": "nix-community", "repo": "NUR", - "rev": "c8f576f19209c1e1c78f79130e67c60f63bb7343", + "rev": "e2d412257d71e7aaca36f1e066371af09afa23b7", "type": "github" }, "original": { @@ -319,11 +319,11 @@ ] }, "locked": { - "lastModified": 1652236297, - "narHash": "sha256-S5Qzf3jzCHpVuabxoRima0enxxpEr4JSdfAls89BL+o=", + "lastModified": 1652301582, + "narHash": "sha256-6OXVyKH+JJvlxn5FuQkAGtguUwZVqCuRo1FyQeyRMrM=", "owner": "chvp", "repo": "tetris", - "rev": "60be6076238065d1ef20ec193e7d9d5d802d284e", + "rev": "79be929b48ea76f98bfe6a58fc8d0932542a2d02", "type": "github" }, "original": { diff --git a/patches/172319.patch b/patches/172319.patch deleted file mode 100644 index 1a1cc033..00000000 --- a/patches/172319.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b4a61b636a21c7e4608ae9003ccb3865176f395c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Na=C3=AFm=20Favier?= -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" - ''; - }; -