From a886fd9b2d55620a8df450e84235bda9d4bd6de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 22 Mar 2024 15:32:06 +0100
Subject: [PATCH] switch back to upstream waypipe

---
 pkgs/clan-cli/clan_cli/vms/waypipe.py |  2 +-
 pkgs/flake-module.nix                 | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/clan-cli/clan_cli/vms/waypipe.py b/pkgs/clan-cli/clan_cli/vms/waypipe.py
index feb443439..c8748874d 100644
--- a/pkgs/clan-cli/clan_cli/vms/waypipe.py
+++ b/pkgs/clan-cli/clan_cli/vms/waypipe.py
@@ -26,7 +26,7 @@ def start_waypipe(cid: int | None, title_prefix: str) -> Iterator[None]:
         yield
         return
     waypipe = nix_shell(
-        ["git+https://git.clan.lol/clan/clan-core#waypipe"],
+        ["nixpkgs#waypipe"],
         [
             "waypipe",
             "--vsock",
diff --git a/pkgs/flake-module.nix b/pkgs/flake-module.nix
index f03cd1e93..6964d5358 100644
--- a/pkgs/flake-module.nix
+++ b/pkgs/flake-module.nix
@@ -25,16 +25,6 @@
         }
         // lib.optionalAttrs pkgs.stdenv.isLinux {
           wayland-proxy-virtwl = pkgs.callPackage ./wayland-proxy-virtwl { };
-          waypipe = pkgs.waypipe.overrideAttrs (_old: {
-            # https://gitlab.freedesktop.org/mstoeckl/waypipe
-            src = pkgs.fetchFromGitLab {
-              domain = "gitlab.freedesktop.org";
-              owner = "mstoeckl";
-              repo = "waypipe";
-              rev = "4e4ff3bc1943cf7f6aeb56b06c060f40578d3570";
-              hash = "sha256-dxz4AmeJAweffyPCayvykworQNntHtHeq6PXMXWsM5k=";
-            };
-          });
           # halalify zerotierone
           zerotierone = pkgs.zerotierone.overrideAttrs (_old: {
             meta = _old.meta // {