Merge branch 'master' into import-overlays-from-config

overlays/diffnav.nix

@@ -12,14 +12,14 @@ in {
       owner = "dlvhdr";
       repo = "diffnav";
       rev = "v${version}";
-      hash = "sha256-6VtAQzZNLQrf8QYVXxLUgb3F6xguFDbwaE9kahPhbSE=";
+      hash = "sha256-DrEbo9YYg4FCXQXuIkbPxO5Z3ZOPZJYeGoLoP/vT0Y0=";
     };
 
-    vendorHash = "sha256-gmmckzR0D1oFuTG5TAb6gLMoNbcZl9EsjbFjhPfJqnQ=";
+    vendorHash = "sha256-2OzHyBPsylQVXhPlqk2owEhiibFi3H1UENvGGDdzGss";
 
     ldflags = [
       "-s"
       "-w"
     ];
   }); 
-}
+}

overlays/gh-dash.nix

@@ -12,10 +12,10 @@ in {
       owner = "dlvhdr";
       repo = "gh-dash";
       rev = "v${version}";
-      hash = "sha256-C06LPVoE23ITJpMG0x75Djgeup+eb5uYwA8wL7xxvWU=";
+      hash = "sha256-FUb4zrGT0L7S1O5EcOCop4n0zlx1ODsANzBcEl9bvOU=";
     };
 
-    vendorHash = "sha256-4AbeoH0l7eIS7d0yyJxM7+woC7Q/FCh0BOJj3d1zyX4=";
+    vendorHash = "sha256-3iUBuMvA2Xh7UjTiFNEs3tuZMCnSt/bIhTSEDD92yCU=";
     doCheck = false;
     checkFlags = [
       "-skip=TestFullOutput"
@@ -33,4 +33,4 @@ in {
       };
     };
   });
-}
+}

overlays/k9s.nix

@@ -5,12 +5,14 @@ final: prev: {
       owner = "derailed";
       repo = "k9s";
       rev = "v${version}";
-      hash = "sha256-1z6r6v3n1p6vd2q6n4pl5q3f7q3q7q1p7j5j1k3l4m5n6o7p8q9r";
+      hash = "sha256-70Rfu1BVd/QnwWXRRpwIeZ2UJNWIGixpdiOHo4v7adA=";
     };
 
+    vendorHash = "sha256-PkYDJK2oGl+siCG9p4R8shC0e5BhGFdJsc+ksL9J5zw=";
+
     ldflags = [
       "-X github.com/derailed/k9s/version.Version=${version}"
       "-X github.com/derailed/k9s/version.BuildSource=nix"
     ];
   });
-}
+}

overlays/lazygit.nix

@@ -1,11 +1,11 @@
 final: prev: {
     lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
-    version = "0.64.1";
+    version = "0.65.0";
     src = prev.fetchFromGitHub {
       owner = "jesseduffield";
       repo = "lazygit";
       rev = "v${version}";
-      hash = "sha256-G7JulCK9WUVWbp1V7lYuM3fehCdn1cNAJHYjr3aKDvQ=";
+      hash = "sha256-W/Z/BnA5L8tXYrKn3bnekNnx7bEaaJRoHSGAeygcK0E=";
     };
 
     vendorHash = null;
@@ -15,4 +15,4 @@ final: prev: {
       "-X main.buildSource=nix"
     ];
   });
-}
+}

pkgs/default.nix

@@ -18,7 +18,7 @@
   inherit caitsith;
 
   # any packages that build instructions are in this repo, they go here
-  # sable-web = pkgs.callPackage ./common/sable.nix {};
+  sable-web = pkgs.callPackage ./common/sable.nix { };
   swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix { };
   musicpresence = pkgs.callPackage ./linux/musicpresence.nix { };
   vintage-story = pkgs.callPackage ./linux/vintage-story.nix { };