diff --git a/devshell.toml b/devshell.toml deleted file mode 100644 index 6877e1e..0000000 --- a/devshell.toml +++ /dev/null @@ -1,10 +0,0 @@ -# https://numtide.github.io/devshell -[[commands]] -package = "devshell.cli" -help = "Per project developer environments" - -[[commands]] -package = "cargo" - -[[commands]] -package = "rustc" diff --git a/flake.lock b/flake.lock index 9a27645..a5df7a7 100644 --- a/flake.lock +++ b/flake.lock @@ -1,20 +1,5 @@ { "nodes": { - "devshell": { - "locked": { - "lastModified": 1622013274, - "narHash": "sha256-mK/Lv0lCbl07dI5s7tR/7nb79HunKnJik3KyR6yeI2k=", - "owner": "numtide", - "repo": "devshell", - "rev": "e7faf69e6bf8546517cc936c7f6d31c7eb3abcb2", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1620759905, @@ -46,7 +31,6 @@ }, "root": { "inputs": { - "devshell": "devshell", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index fb42e8a..5b01989 100644 --- a/flake.nix +++ b/flake.nix @@ -1,20 +1,14 @@ { description = "virtual environments"; - inputs.devshell.url = "github:numtide/devshell"; inputs.flake-utils.url = "github:numtide/flake-utils"; - outputs = { self, flake-utils, devshell, nixpkgs }: - flake-utils.lib.eachDefaultSystem (system: { - devShell = - let pkgs = import nixpkgs { - inherit system; - - overlays = [ devshell.overlay ]; + outputs = { self, flake-utils, nixpkgs, ... }@inputs: + flake-utils.lib.eachDefaultSystem (system: + let pkgs = nixpkgs.legacyPackages.${system}; + in { + devShell = pkgs.mkShell { + buildInputs = with pkgs; [ cargo rustc pkgconfig openssl.dev ]; }; - in - pkgs.devshell.mkShell { - imports = [ (pkgs.devshell.importTOML ./devshell.toml) ]; - }; - }); + }); }