Skip to content

Commit 1845c6d

Browse files
committed
Make nix build work
1 parent 4a71a13 commit 1845c6d

5 files changed

Lines changed: 8 additions & 9 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/target
22
test.nix
33
test/
4+
result

flake.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
craneLib = (crane.mkLib pkgs).overrideToolchain (p: p.rust-bin.nightly.latest.default.override {});
2626

2727
commonArgs = {
28-
src = craneLib.cleanCargoSource ./.;
28+
src = pkgs.lib.cleanSource ./.;
2929
strictDeps = true;
3030

31-
buildInputs = with pkgs; [
31+
nativeBuildInputs = with pkgs; [
3232
protobuf
3333
];
3434

@@ -42,6 +42,7 @@
4242
crate = craneLib.buildPackage (commonArgs
4343
// {
4444
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
45+
doCheck = false;
4546
});
4647
in {
4748
packages.default = crate;

src/analyzer.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use crate::file_types::{init_file_info, FileInfo, FileType, LockedFlake};
66
use crate::flakes::get_flake_inputs;
77
use crate::hover::HoverResult;
88
use crate::safe_stringification::safe_stringify_flake;
9-
use crate::schema::{Schema, HOME_MANAGER_SCHEMA};
109
use crate::syntax::parse;
1110
use crate::{completion, hover};
1211
use anyhow::{anyhow, bail, Context, Result};
@@ -16,7 +15,6 @@ use ropey::Rope;
1615
use std::collections::HashMap;
1716
use std::path::{Path, PathBuf};
1817
use std::process::Stdio;
19-
use std::sync::Arc;
2018
use tokio::process::Command;
2119

2220
#[derive(Debug)]

src/hover.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ use lsp_types::Range;
33
use rnix::{ast::Expr, TextRange};
44
use ropey::Rope;
55
use rowan::ast::AstNode;
6-
use std::{ops::Not, path::PathBuf};
7-
use tokio::sync::OwnedRwLockWriteGuard;
6+
use std::path::PathBuf;
87

98
use crate::{
109
evaluator::{proto::HoverRequest, Evaluator},

src/lsp.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ use lsp_server::{Connection, ExtractError, Message, Notification, Request, Reque
33
use lsp_types::{
44
notification::{DidChangeTextDocument, DidOpenTextDocument},
55
request::{Completion, Formatting, GotoDefinition, HoverRequest},
6-
CompletionOptions, CompletionResponse, GotoDefinitionParams, GotoDefinitionResponse, Hover,
7-
HoverContents, HoverProviderCapability, InitializeParams, Location, MarkupContent, MarkupKind,
8-
OneOf, Position, Range, ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind,
6+
CompletionOptions, CompletionResponse, GotoDefinitionResponse, Hover, HoverContents,
7+
HoverProviderCapability, InitializeParams, Location, MarkupContent, MarkupKind, OneOf,
8+
Position, Range, ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind,
99
TextEdit, Uri, WorkDoneProgressOptions,
1010
};
1111
use std::{

0 commit comments

Comments
 (0)