From d056148928b5c0ca4cdcb663fca7e143e97a3a41 Mon Sep 17 00:00:00 2001 From: Vika Date: Mon, 27 Feb 2023 00:09:48 +0300 Subject: Flake stuff --- flake.nix | 8 +++++++- shell.nix | 11 +++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index c4063b8..908f778 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,12 @@ ref = "master"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixpkgs = { + type = "github"; + owner = "nixos"; + repo = "nixpkgs"; + ref = "nixos-22.11"; + }; }; outputs = { self, nixpkgs, flake-utils, naersk }: let supportedSystems = ["aarch64-linux" "x86_64-linux"]; @@ -42,7 +48,7 @@ }; devShells.default = pkgs.callPackage ./shell.nix { - inherit (pkgs.nodePackages) typescript; + inherit (pkgs.nodePackages) typescript typescript-language-server; }; }); } diff --git a/shell.nix b/shell.nix index 75fd790..91b2c54 100644 --- a/shell.nix +++ b/shell.nix @@ -1,15 +1,18 @@ { mkShell, rustc, cargo, rust-analyzer, clippy, rustfmt -, cargo-watch, cargo-edit, cargo-outdated, cargo-crev +, cargo-watch, cargo-edit, cargo-outdated +, cargo-crev, cargo-audit , xh, systemfd, tokio-console -, pkg-config, protobuf, typescript +, pkg-config, protobuf, typescript, typescript-language-server }: mkShell { name = "rust-dev-shell"; nativeBuildInputs = [ rustc cargo rust-analyzer clippy rustfmt - cargo-watch cargo-edit cargo-outdated cargo-crev - xh systemfd typescript #tokio-console + cargo-watch cargo-edit cargo-outdated + cargo-crev cargo-audit + xh systemfd typescript typescript-language-server + #tokio-console # required for tokio-console's console-subscriber #pkg-config protobuf ]; -- cgit 1.4.1