fix: switch to nixpkgs cavalier

Suya1671 · May 27, 2024 · 8bf4ccc · 8bf4ccc
1 parent 200e31e
commit 8bf4ccc
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 272 deletions.
diff --git a/nvfetcher.toml b/nvfetcher.toml
@@ -1,7 +1,3 @@
-[cavalier]
-src.github = "NickvisionApps/Cavalier"
-fetch.github = "NickvisionApps/Cavalier"
-
 [fennel-ls]
 src.git = "https://git.sr.ht/~xerool/fennel-ls"
 fetch.git = "https://git.sr.ht/~xerool/fennel-ls"
diff --git a/pkgs/cavalier/default.nix b/pkgs/cavalier/default.nix
diff --git a/pkgs/cavalier/deps.nix b/pkgs/cavalier/deps.nix
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -10,9 +10,6 @@
       fennel-ls = pkgs.callPackage ./fennel-ls {
         inherit (getPackage "fennel-ls") src version pname;
       };
-      cavalier = pkgs.callPackage ./cavalier {
-        inherit (getPackage "cavalier") src version pname;
-      };
       firefox-pwa = pkgs.callPackage ./firepwa {};
       default = pkgs.writeText "cachix-deploy.json" (builtins.toJSON {
         agents = {

diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
@@ -4,7 +4,7 @@
   ];
   perSystem = { config, pkgs, final, ... }: {
     overlayAttrs = {
-      inherit (config.packages) fennel-ls cavalier firefox-pwa;
+      inherit (config.packages) fennel-ls firefox-pwa;
     };
   };
 }
diff --git a/systems/modules/core/nix.nix b/systems/modules/core/nix.nix
@@ -26,7 +26,7 @@
         super.makeModulesClosure (x // {allowMissing = true;});
 
       craneLib = inputs.crane.lib.${pkgs.system};
-      inherit (packages.${pkgs.system}) fennel-ls cavalier firefox-pwa;
+      inherit (packages.${pkgs.system}) fennel-ls firefox-pwa;
     })
   ];