Update flake to include the language server (#185)

jfecher · Jan 25, 2024 · 5bed8cc · 5bed8cc
1 parent dbfee06
commit 5bed8cc
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 37 deletions.
diff --git a/ante-ls/Cargo.toml b/ante-ls/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ante = { path = ".." }
+ante = { path = "..", default-features = false }
 dashmap = "5.5.3"
 env_logger = "0.10.2"
 futures = "0.3.30"

diff --git a/crates.nix b/crates.nix
@@ -1,53 +1,76 @@
-{ ... }: {
-  perSystem = { pkgs, lib, ... }: {
+{
+  perSystem = { pkgs, lib, config, ... }: {
     nci =
       let
         llvmPackages = pkgs.llvmPackages_16;
         major = lib.versions.major llvmPackages.llvm.version;
         minor = lib.versions.minor llvmPackages.llvm.version;
         llvm-sys-ver = "${major}${builtins.substring 0 1 minor}";
-        env = {
-          "LLVM_SYS_${llvm-sys-ver}_PREFIX" = llvmPackages.llvm.dev;
+        env = { "LLVM_SYS_${llvm-sys-ver}_PREFIX" = llvmPackages.llvm.dev; };
+
+        stdlib = pkgs.stdenv.mkDerivation {
+          pname = "ante-stdlib";
+          version = config.packages.ante.version;
+          src = ./stdlib;
+          phases = [ "unpackPhase" "installPhase" ];
+          installPhase = ''
+            find . -type f -exec install -Dm644 "{}" -t $out/lib \;
+          '';
         };
       in
       {
         toolchainConfig = {
           channel = "stable";
           components = [ "rust-analyzer" "clippy" "rustfmt" "rust-src" ];
         };
-        projects.ante.path = ./.;
-        crates.ante = {
-          depsDrvConfig = {
-            inherit env;
-          };
-          drvConfig = {
-            inherit env;
-            mkDerivation = {
-              nativeBuildInputs = [ pkgs.installShellFiles ];
-              buildInputs = lib.attrValues
-                {
-                  inherit (pkgs)
-                    libffi
-                    libxml2
-                    ncurses;
-                } ++ [ llvmPackages.llvm ];
 
-              postPatch = ''
-                substituteInPlace tests/golden_tests.rs --replace \
-                  'target/debug' "target/$(rustc -vV | sed -n 's|host: ||p')/release"
-              '';
+        projects.ante = {
+          export = false;
+          path = ./.;
+        };
 
+        crates = {
+          ante-ls = {
+            profiles.release.features = [ ];
+            drvConfig.mkDerivation = {
               preBuild = ''
-                export ANTE_STDLIB_DIR=$out/lib
-                find stdlib -type f -exec install -Dm644 "{}" -t $ANTE_STDLIB_DIR \;
+                export ANTE_STDLIB_DIR=${stdlib}/lib
               '';
+            };
+          };
 
-              postInstall = ''
-                installShellCompletion --cmd ante \
-                  --bash <($out/bin/ante --shell-completion bash) \
-                  --fish <($out/bin/ante --shell-completion fish) \
-                  --zsh <($out/bin/ante --shell-completion zsh)
-              '';
+          ante = {
+            depsDrvConfig = {
+              inherit env;
+            };
+            drvConfig = {
+              inherit env;
+              mkDerivation = {
+                nativeBuildInputs = [ pkgs.installShellFiles ];
+                buildInputs = lib.attrValues
+                  {
+                    inherit (pkgs)
+                      libffi
+                      libxml2
+                      ncurses;
+                  } ++ [ llvmPackages.llvm stdlib ];
+
+                postPatch = ''
+                  substituteInPlace tests/golden_tests.rs --replace \
+                    'target/debug' "target/$(rustc -vV | sed -n 's|host: ||p')/release"
+                '';
+
+                preBuild = ''
+                  export ANTE_STDLIB_DIR=${stdlib}/lib
+                '';
+
+                postInstall = ''
+                  installShellCompletion --cmd ante \
+                    --bash <($out/bin/ante --shell-completion bash) \
+                    --fish <($out/bin/ante --shell-completion fish) \
+                    --zsh <($out/bin/ante --shell-completion zsh)
+                '';
+              };
             };
           };
         };

diff --git a/flake.nix b/flake.nix
@@ -31,11 +31,22 @@
       ];
 
       perSystem = { config, ... }:
-        let crateOutputs = config.nci.outputs.ante; in
+        let
+          anteCrate = config.nci.outputs.ante;
+          ante-lsCrate = config.nci.outputs.ante-ls;
+        in
         {
-          overlayAttrs.ante = config.packages.default;
-          packages.default = crateOutputs.packages.release;
-          devShells.default = crateOutputs.devShell.overrideAttrs (_: {
+          overlayAttrs = {
+            inherit (config.packages)
+              ante
+              ante-ls;
+          };
+          packages = rec {
+            default = ante;
+            ante = anteCrate.packages.release;
+            ante-ls = ante-lsCrate.packages.release;
+          };
+          devShells.default = anteCrate.devShell.overrideAttrs (_: {
             shellHook = ''
               PATH=$PATH:$PWD/target/debug
             '';