From 81d21979ef8b167eff264efdf9316431dbca6fd4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 13 Feb 2025 20:21:06 -0500 Subject: [PATCH] Clean up flake lockfile stuff MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `flake = false;` for `nix-eval-jobs` didn't fully take before. Flake lock file updates: • Removed input 'nix-eval-jobs/flake-parts' • Removed input 'nix-eval-jobs/flake-parts/nixpkgs-lib' • Removed input 'nix-eval-jobs/nix-github-actions' • Removed input 'nix-eval-jobs/nixpkgs' • Removed input 'nix-eval-jobs/treefmt-nix' • Removed input 'nix-eval-jobs/treefmt-nix/nixpkgs' --- flake.lock | 51 +-------------------------------------------------- flake.nix | 6 ------ 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index baa5e8be1..1d78e0c18 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "libgit2": { "flake": false, "locked": { @@ -68,14 +47,7 @@ } }, "nix-eval-jobs": { - "inputs": { - "flake-parts": "flake-parts", - "nix-github-actions": [], - "nixpkgs": [ - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, + "flake": false, "locked": { "lastModified": 1739426028, "narHash": "sha256-1dZLPw+nlFQzzswfyTxW+8VF1AJ4ZvoYvLTjlHiz1SA=", @@ -113,27 +85,6 @@ "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": "nixpkgs" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1723303070, - "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "14c092e0326de759e16b37535161b3cb9770cea3", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5b48879f7..6e2d51a22 100644 --- a/flake.nix +++ b/flake.nix @@ -25,12 +25,6 @@ url = "github:nix-community/nix-eval-jobs"; # We want to control the deps precisely flake = false; - - # Hide nix-eval-jobs dev tooling from our lock file. - # - # TODO why is this needed with `flake = false`? - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nix-github-actions.follows = ""; }; outputs = { self, nixpkgs, nix, nix-eval-jobs, ... }: