From ca34220b1c4fa615dee576b4ca571694d9730384 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 5 Jun 2024 13:16:32 -0700 Subject: [PATCH] Bump flake --- flake.lock | 6 +++--- flake.nix | 6 +++++- nix/nix-template.nix | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 5b4ca64..a96afae 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1661353537, - "narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=", + "lastModified": 1717399147, + "narHash": "sha256-eCWaE/q1VItpFAxxLVt171MdtDcjEnwi6QB/yuF73JU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e304ff0d9db453a4b230e9386418fd974d5804a", + "rev": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f647fbc..03d44c6 100644 --- a/flake.nix +++ b/flake.nix @@ -23,11 +23,15 @@ legacyPackages = pkgsForSystem system; packages = utils.lib.flattenTree { inherit (legacyPackages) devShell nix-template; + default = legacyPackages.nix-template; }; - defaultPackage = packages.nix-template; apps.nix-template = utils.lib.mkApp { drv = packages.nix-template; }; # use as `nix run ` hydraJobs = { inherit (legacyPackages) nix-template; }; checks = { inherit (legacyPackages) nix-template; }; # items to be ran as part of `nix flake check` + devShells.default = with legacyPackages; mkShell { + nativeBuildInputs = [ rustc cargo clippy pkg-config ]; + buildInputs = [ openssl ]; + }; }) // { # non-system suffixed items should go here overlays.default = localOverlay; diff --git a/nix/nix-template.nix b/nix/nix-template.nix index 6ee1417..7b139ac 100644 --- a/nix/nix-template.nix +++ b/nix/nix-template.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; doCheck = true; - checkInputs = [ clippy ]; + nativeCheckInputs = [ clippy ]; postCheck = '' cargo clippy '';