summaryrefslogtreecommitdiffhomepage
path: root/flake.nix
diff options
context:
space:
mode:
authorPercy Wegmann <percy@tailscale.com>2023-12-21 15:57:01 -0600
committerPercy Wegmann <percy@tailscale.com>2024-02-02 12:33:48 -0600
commit857cef70c97fe019ea24f7b4f24252f4746ebcc3 (patch)
tree257a7ec87af6ad29c06cdfe0e8774259f5e83cc3 /flake.nix
parent60657ac83f415555c19027b0b18c0fe2d15bf40a (diff)
downloadtailscale-flyingsquirrel_bak.tar.xz
tailscale-flyingsquirrel_bak.zip
tailfs: initial implementationflyingsquirrel_bak
Implemented WebDAV-based core of Tailfs Updates tailscale/corp#16827 Signed-off-by: Percy Wegmann <percy@tailscale.com>
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/flake.nix b/flake.nix
index cee5b9429..725f12b0f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -120,4 +120,12 @@
in
flake-utils.lib.eachDefaultSystem (system: flakeForSystem nixpkgs system);
}
-# nix-direnv cache busting line: sha256-b/iffKOn7nMiWvM0AIGGzZaJ15NTaBlJff+aja3NQio=
+<<<<<<< HEAD
+# nix-direnv cache busting line: sha256-3NzfNgqSjDILsm2kzP9S0lc+Xmej0gAdDqGJOsWrKdk=
+=======
+<<<<<<< HEAD
+# nix-direnv cache busting line: sha256-3NzfNgqSjDILsm2kzP9S0lc+Xmej0gAdDqGJOsWrKdk=
+=======
+# nix-direnv cache busting line: sha256-3NzfNgqSjDILsm2kzP9S0lc+Xmej0gAdDqGJOsWrKdk=
+>>>>>>> 3bc261cc (tailfs: initial implementation)
+>>>>>>> db634a9b (tailfs: initial implementation)