Merge pull request 'switch back to upstream waypipe' (#1025) from waypipe into main
Reviewed-on: #1025
This commit is contained in:
commit
e3c608c16d
18
flake.lock
18
flake.lock
@ -42,11 +42,11 @@
|
|||||||
},
|
},
|
||||||
"nixlib": {
|
"nixlib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710636348,
|
"lastModified": 1711241261,
|
||||||
"narHash": "sha256-/kB+ZWSdkZjbZ0FTqm0u84sf2jFS+30ysaEajmBjtoY=",
|
"narHash": "sha256-knrTvpl81yGFHIpm1SsLDApe0thFkw1cl3ISAMPmP/0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "fa827dda806c5aa98f454da4c567991ab8ce422c",
|
"rev": "b2a1eeef8c185f6bd27432b053ff09d773244cbc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -63,11 +63,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711108213,
|
"lastModified": 1711327729,
|
||||||
"narHash": "sha256-Q8cwpA2LQOInqeXVckrfFlbzHB8HOWrYntuOxqn3A3g=",
|
"narHash": "sha256-RzOXI1kBlK7HkeZfRjUnsBUJEmlMYgLEG7CziZN0lgs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixos-generators",
|
"repo": "nixos-generators",
|
||||||
"rev": "417a857dfb824e60930881a254dd67d6796f5884",
|
"rev": "d3e8145766dad6b47f6e37ce28731a05144dec26",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -78,11 +78,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711297276,
|
"lastModified": 1711333969,
|
||||||
"narHash": "sha256-KtHBr73Z729krfueBV6pUsEyq/4vILGP77DPmrKOTrI=",
|
"narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3d41d1087707826b3a90685ab69147f8dc8145d5",
|
"rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -26,7 +26,7 @@ def start_waypipe(cid: int | None, title_prefix: str) -> Iterator[None]:
|
|||||||
yield
|
yield
|
||||||
return
|
return
|
||||||
waypipe = nix_shell(
|
waypipe = nix_shell(
|
||||||
["git+https://git.clan.lol/clan/clan-core#waypipe"],
|
["nixpkgs#waypipe"],
|
||||||
[
|
[
|
||||||
"waypipe",
|
"waypipe",
|
||||||
"--vsock",
|
"--vsock",
|
||||||
|
@ -25,16 +25,6 @@
|
|||||||
}
|
}
|
||||||
// lib.optionalAttrs pkgs.stdenv.isLinux {
|
// lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||||
wayland-proxy-virtwl = pkgs.callPackage ./wayland-proxy-virtwl { };
|
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
|
# halalify zerotierone
|
||||||
zerotierone = pkgs.zerotierone.overrideAttrs (_old: {
|
zerotierone = pkgs.zerotierone.overrideAttrs (_old: {
|
||||||
meta = _old.meta // {
|
meta = _old.meta // {
|
||||||
|
Loading…
Reference in New Issue
Block a user