diff --git a/flake.lock b/flake.lock index 5b4eb297..68cbea4d 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "nixlib": { "locked": { - "lastModified": 1710636348, - "narHash": "sha256-/kB+ZWSdkZjbZ0FTqm0u84sf2jFS+30ysaEajmBjtoY=", + "lastModified": 1711241261, + "narHash": "sha256-knrTvpl81yGFHIpm1SsLDApe0thFkw1cl3ISAMPmP/0=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "fa827dda806c5aa98f454da4c567991ab8ce422c", + "rev": "b2a1eeef8c185f6bd27432b053ff09d773244cbc", "type": "github" }, "original": { @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1711108213, - "narHash": "sha256-Q8cwpA2LQOInqeXVckrfFlbzHB8HOWrYntuOxqn3A3g=", + "lastModified": 1711327729, + "narHash": "sha256-RzOXI1kBlK7HkeZfRjUnsBUJEmlMYgLEG7CziZN0lgs=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "417a857dfb824e60930881a254dd67d6796f5884", + "rev": "d3e8145766dad6b47f6e37ce28731a05144dec26", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711297276, - "narHash": "sha256-KtHBr73Z729krfueBV6pUsEyq/4vILGP77DPmrKOTrI=", + "lastModified": 1711333969, + "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d41d1087707826b3a90685ab69147f8dc8145d5", + "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", "type": "github" }, "original": { diff --git a/pkgs/clan-cli/clan_cli/vms/waypipe.py b/pkgs/clan-cli/clan_cli/vms/waypipe.py index feb44343..c8748874 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 f03cd1e9..6964d535 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 // {