From 2b8f88d5f5d6b9478edea367a34a7da1a9dc4db5 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Fri, 18 Jul 2025 14:14:53 -0400 Subject: [PATCH] chore: nix build improvements --- flake.lock | 19 ++++++++++--------- flake.nix | 12 ++++++++---- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index e2a53c2..be61f33 100644 --- a/flake.lock +++ b/flake.lock @@ -56,7 +56,9 @@ "naersk": { "inputs": { "fenix": "fenix", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1752689277, @@ -74,25 +76,24 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752077645, - "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", + "lastModified": 1752747119, + "narHash": "sha256-2Kp9St3Pbsmu+xMsobLcgzzUxPvZR7alVJWyuk2BAPc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", + "rev": "fa0ef8a6bb1651aa26c939aeb51b5f499e86b0ec", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "root": { "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "naersk": "naersk" + "naersk": "naersk", + "nixpkgs": "nixpkgs" } }, "rust-analyzer-src": { diff --git a/flake.nix b/flake.nix index de5dcf6..ed8a619 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,15 @@ { inputs = { + nixpkgs.url = "nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; - naersk.url = "github:nix-community/naersk"; - flake-compat = { url = github:edolstra/flake-compat; flake = false; }; + naersk = { + url = "github:nix-community/naersk"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; }; - outputs = {self, flake-utils, naersk, flake-compat}: + outputs = {self, flake-utils, naersk, flake-compat, nixpkgs}: flake-utils.lib.eachDefaultSystem (system: let naersk-lib = naersk.lib."${system}"; @@ -18,4 +22,4 @@ } ); -} \ No newline at end of file +}