please work now
This commit is contained in:
parent
67677a1c32
commit
5e1b84f5e2
GPG key ID:
AB2BD8DAF2E37122
3 changed files with 33 additions and 87 deletions
|
|
@ -1,15 +1,14 @@
|
|||
{ system
|
||||
, pkgs
|
||||
, nixpkgs
|
||||
, nixpkgs-noto-variable
|
||||
, nix-packages
|
||||
, rnix-lsp
|
||||
, ...
|
||||
{
|
||||
system,
|
||||
pkgs,
|
||||
nixpkgs,
|
||||
nixpkgs-noto-variable,
|
||||
nix-packages,
|
||||
...
|
||||
}:
|
||||
with pkgs; let
|
||||
noto-variable = import nixpkgs-noto-variable { inherit system; };
|
||||
in
|
||||
{
|
||||
noto-variable = import nixpkgs-noto-variable {inherit system;};
|
||||
in {
|
||||
nixpkgs.overlays = [
|
||||
(self: prev: {
|
||||
hydra-unstable = nix-packages.packages.${system}.hydra;
|
||||
|
|
@ -56,9 +55,30 @@ in
|
|||
sed 's/getBoolAttr."allowSubstitutes", true./true/' src/libstore/parsed-derivations.cc
|
||||
'';
|
||||
});
|
||||
rnix-lsp = rnix-lsp.packages.${system}.rnix-lsp.override {
|
||||
cargoBuildOptions = [ "--no-default-features" "--features" "alejandra" ];
|
||||
};
|
||||
rnix-lsp = with prev;
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rnix-lsp";
|
||||
version = "0.3.0-alejandra";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "rnix-lsp";
|
||||
# https://github.com/nix-community/rnix-lsp/pull/89
|
||||
rev = "9189b50b34285b2a9de36a439f6c990fd283c9c7";
|
||||
sha256 = "sha256-ZnUtvwkcz7QlAiqQxhI4qVUhtVR+thLhG3wQlle7oZg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-VhE+DspQ0IZKf7rNkERA/gD7iMzjW4TnRSnYy1gdV0s=";
|
||||
cargoBuildFlags = ["--no-default-features" "--features" "alejandra"];
|
||||
|
||||
checkInputs = lib.optional (!stdenv.isDarwin) nix;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A work-in-progress language server for Nix, with syntax checking and basic completion";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ma27];
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
73
flake.lock
73
flake.lock
|
|
@ -667,27 +667,6 @@
|
|||
"url": "https://git.chir.rs/CarolineHusky/MiiFox.net"
|
||||
}
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"rnix-lsp",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1655042882,
|
||||
"narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "naersk",
|
||||
"rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "naersk",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nasin-nanpa": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -997,22 +976,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1656753965,
|
||||
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1616989418,
|
||||
|
|
@ -1203,26 +1166,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rnix-lsp": {
|
||||
"inputs": {
|
||||
"naersk": "naersk",
|
||||
"nixpkgs": "nixpkgs_10",
|
||||
"utils": "utils_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1658963292,
|
||||
"narHash": "sha256-4OIpATLdPQvryyhRQPELeqNYC0n6PCyjD6LCPdwOztc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "rnix-lsp",
|
||||
"rev": "ff18e04551a39ccdab0ff9c83926db3807b23478",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "rnix-lsp",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"chir-rs": "chir-rs",
|
||||
|
|
@ -1237,7 +1180,6 @@
|
|||
"nixpkgs-noto-variable": "nixpkgs-noto-variable",
|
||||
"nur": "nur",
|
||||
"polymc": "polymc",
|
||||
"rnix-lsp": "rnix-lsp",
|
||||
"sops-nix": "sops-nix"
|
||||
}
|
||||
},
|
||||
|
|
@ -1367,21 +1309,6 @@
|
|||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1656928814,
|
||||
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ rec {
|
|||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
nixpkgs-noto-variable.url = "github:NixOS/nixpkgs/1988f9a17fc1c2ab11f5817adf34a4eb8d06454d";
|
||||
emanote.url = "github:EmaApps/emanote";
|
||||
rnix-lsp.url = "github:nix-community/rnix-lsp";
|
||||
|
||||
nix-packages.url = "git+https://git.chir.rs/DarkKirb/nix-packages?ref=main";
|
||||
nix-packages.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
|
|||
Loading…
Reference in a new issue