diff --git a/flake.nix b/flake.nix index f95d1a0..4c888ed 100644 --- a/flake.nix +++ b/flake.nix @@ -2,21 +2,23 @@ description = "basic rust flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - rust-overlay.url = "github:oxalica/rust-overlay"; - flake-utils.url = "github:numtide/flake-utils"; - flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; }; + flake-utils.url = "github:numtide/flake-utils"; gitignoresrc = { url = "github:hercules-ci/gitignore.nix"; flake = false; }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, flake-compat, gitignoresrc, rust-overlay, ... }@inputs: + outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, gitignoresrc, rust-overlay, ... }@inputs: { #overlay = import ./nix { inherit gitignoresrc; }; } // (flake-utils.lib.eachDefaultSystem (system: @@ -35,11 +37,13 @@ buildInputs = [ pkgs.rust-bin.nightly.latest.rustfmt pkgs.rust-bin.stable.latest.default - unstable.rust-analyzer + pkgs.rust-analyzer pkgs.cargo-audit pkgs.cargo-license pkgs.cargo-tarpaulin pkgs.cargo-kcov + pkgs.valgrind + pkgs.gnuplot pkgs.kcov ]; };