update and merge conflicts

2024-10-13 15:20:26 +02:00
parent 5701b5fd20
commit 13cf1e25aa
9 changed files with 158 additions and 107 deletions
@@ -24,7 +24,11 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    ghostty = {
-        url = "git+ssh://git@github.com/ghostty-org/ghostty";
+      inputs = {
+        nixpkgs-stable.follows = "nixpkgs";
+        nixpkgs-unstable.follows = "nixpkgs";
+      };
+      url = "git+ssh://git@github.com/ghostty-org/ghostty";
    };
  };