From 6c8737ce002e9353cb8e373235c8c85260320d32 Mon Sep 17 00:00:00 2001
From: John Lewis <github@jlewis.sh>
Date: Thu, 29 Feb 2024 13:50:10 -0600
Subject: [PATCH] fix: fixed cargo-leptos & md watching

---
 Cargo.toml |  2 +-
 flake.lock | 34 +++++++++++++++++-----------------
 flake.nix  | 18 +++++-------------
 3 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index dcd3fd7..f18e5fc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,7 +81,7 @@ tailwind-input-file = "style/main.scss"
 # Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
 watch = false
 
-watch-additional-files = [ "content/*" ]
+watch-additional-files = [ "content" ]
 
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"
diff --git a/flake.lock b/flake.lock
index 088ad62..c60547f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,15 +3,15 @@
     "cargo-leptos": {
       "flake": false,
       "locked": {
-        "lastModified": 1699832556,
-        "narHash": "sha256-7o/yQanBBSA+MmMiGCYSjar4hZ8TRZoPiUniF5ELzXU=",
-        "owner": "benwis",
+        "lastModified": 1709079481,
+        "narHash": "sha256-Syo+s+Cc/IsvIDAA3ZmHwTnlku/bVxvOwNmotsvxloE=",
+        "owner": "leptos-rs",
         "repo": "cargo-leptos",
-        "rev": "e98b478b0c82af1469151eff30f4246b9af4a539",
+        "rev": "bb94afd6b3474e9c7ec7ebfd996fc1d1324009fd",
         "type": "github"
       },
       "original": {
-        "owner": "benwis",
+        "owner": "leptos-rs",
         "repo": "cargo-leptos",
         "type": "github"
       }
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704300976,
-        "narHash": "sha256-QLMpTrHxsND2T8+khAhLCqzOY/h2SzWS0s4Z7N2ds/E=",
+        "lastModified": 1708794349,
+        "narHash": "sha256-jX+B1VGHT0ruHHL5RwS8L21R6miBn4B6s9iVyUJsJJY=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "0efe36f9232e0961512572883ba9c995aa1f54b1",
+        "rev": "2c94ff9a6fbeb9f3ea0107f28688edbe9c81deaa",
         "type": "github"
       },
       "original": {
@@ -41,11 +41,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
         "type": "github"
       },
       "original": {
@@ -56,11 +56,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1704161960,
-        "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
+        "lastModified": 1709200309,
+        "narHash": "sha256-lKdtMbhnBNU1lr978T+wEYet3sfIXXgyiDZNEgx8CV8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "63143ac2c9186be6d9da6035fa22620018c85932",
+        "rev": "ebe6e807793e7c9cc59cf81225fdee1a03413811",
         "type": "github"
       },
       "original": {
@@ -89,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704507282,
-        "narHash": "sha256-PDfS8fj40mm2QWpbd/aiocgwcI/WHzqLKERRJkoEvXU=",
+        "lastModified": 1709172595,
+        "narHash": "sha256-0oYeE5VkhnPA7YBl+0Utq2cYoHcfsEhSGwraCa27Vs8=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "a127cccf7943beae944953963ba118d643299c3b",
+        "rev": "72fa0217f76020ad3aeb2dd9dd72490905b23b6f",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 04b7e28..fbd33bc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,8 +13,8 @@
     flake-utils.url = "github:numtide/flake-utils";
     
     cargo-leptos = {
-      #url= "github:leptos-rs/cargo-leptos/v1.7";
-      url = "github:benwis/cargo-leptos";
+      url= "github:leptos-rs/cargo-leptos";
+      # url = "github:benwis/cargo-leptos";
       flake = false;
     };
 
@@ -114,14 +114,14 @@
           APP_ENVIRONMENT = "production";
         });
         
-        cargo-leptos = pkgs.rustPlatform.buildRustPackage rec {
+        cargo-leptos = pkgs.rustPlatform.buildRustPackage {
           pname = "cargo-leptos";
-          version = "0.1.8.1";
+          version = "0.2.7";
           buildFeatures = ["no_downloads"]; # cargo-leptos will try to download Ruby and other things without this feature
 
           src = inputs.cargo-leptos; 
 
-          cargoSha256 = "sha256-XgKr1XLGHtCZbc4ZQJuko4dsJPl+hWmsIBex62tKEJ8=";
+          cargoSha256 = "sha256-jy1bWIXOjVwUhT5GAkIvTw/lPrvw6szAQflnfmhfgow=";
           # cargoSha256 = "";
 
           nativeBuildInputs = [pkgs.pkg-config pkgs.openssl];
@@ -133,14 +133,6 @@
           ];
 
           doCheck = false; # integration tests depend on changing cargo config
-
-          meta = with lib; {
-            description = "A build tool for the Leptos web framework";
-            homepage = "https://github.com/leptos-rs/cargo-leptos";
-            changelog = "https://github.com/leptos-rs/cargo-leptos/blob/v${version}/CHANGELOG.md";
-            license = with licenses; [mit];
-            maintainers = with maintainers; [benwis];
-          };
 	      };
 
         flyConfig = ./fly.toml;