Use latest rust-analyzer

This commit is contained in:
Natsu Kagami 2022-05-05 14:06:43 -04:00
parent 431c67e14c
commit 0663d34cce
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
2 changed files with 22 additions and 3 deletions

18
flake.lock generated
View file

@ -51,11 +51,27 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1651773324,
"narHash": "sha256-+tzXzgZQMCxacRmEDRjdbYulorD40BI+YK6aWBwgCcM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a1439bc96590dae913369f4515ca3df6ca1a1556",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"naersk": "naersk",
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
}
}
},

View file

@ -2,13 +2,15 @@
description = "A discord bot for D Tuyn Tng Hp server";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/21.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs";
naersk.url = "github:nix-community/naersk";
naersk.inputs.nixpkgs.follows = "nixpkgs";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, naersk, flake-utils }: flake-utils.lib.eachDefaultSystem (system:
outputs = { self, nixpkgs, nixpkgs-unstable, naersk, flake-utils }: flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages."${system}";
pkgs-unstable = nixpkgs-unstable.legacyPackages."${system}";
naersk-lib = naersk.lib."${system}";
in
rec {
@ -38,7 +40,8 @@
devShell = pkgs.mkShell
{
nativeBuildInputs =
(with pkgs; [ rustc cargo rust-analyzer rustfmt ])
(with pkgs; [ rustc cargo ])
++ (with pkgs-unstable; [ rust-analyzer rustfmt ])
++ nixpkgs.lib.optionals (nixpkgs.lib.strings.hasSuffix "darwin" system) (with pkgs; [
libiconv
darwin.apple_sdk.frameworks.Security