From 9182306d81fcdc3cd010787ef8e36c4868b25f8a Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 14 Jul 2022 09:10:34 +0800 Subject: [PATCH] flake.nix: reduce number of inputs from lockfile Though, be sure to check it periodically to see if it's safe to follow with our own inputs. --- flake.lock | 129 +++++++++++------------------------------------------ flake.nix | 6 +++ 2 files changed, 31 insertions(+), 104 deletions(-) diff --git a/flake.lock b/flake.lock index 60a3ff73..90a1ae0d 100644 --- a/flake.lock +++ b/flake.lock @@ -38,8 +38,12 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1655976588, @@ -73,7 +77,9 @@ }, "emacs-overlay": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ] @@ -110,11 +116,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", "owner": "numtide", "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", "type": "github" }, "original": { @@ -124,36 +130,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -168,36 +144,6 @@ "type": "github" } }, - "flake-utils_5": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "locked": { - "lastModified": 1656065134, - "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "guix-overlay": { "inputs": { "nixpkgs": [ @@ -223,7 +169,9 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils" + "utils": [ + "flake-utils" + ] }, "locked": { "lastModified": 1657176901, @@ -241,7 +189,7 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_2", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -287,7 +235,9 @@ }, "nix-alien": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ], @@ -330,7 +280,7 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "utils": "utils" }, "locked": { "lastModified": 1652641841, @@ -383,22 +333,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1643381941, - "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1657177452, "narHash": "sha256-CojBqno3Zbw9/788+kCjRXXornpc4jJGC6RYvTYdVkg=", @@ -460,7 +394,7 @@ "devshell": "devshell", "dotfiles": "dotfiles", "emacs-overlay": "emacs-overlay", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils", "guix-overlay": "guix-overlay", "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", @@ -468,14 +402,16 @@ "nix-colors": "nix-colors", "nix-ld": "nix-ld", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nur": "nur", "rust-overlay": "rust-overlay" } }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ] @@ -495,21 +431,6 @@ } }, "utils": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { "locked": { "lastModified": 1652372896, "narHash": "sha256-lURGussfF3mGrFPQT3zgW7+RC0pBhbHzco0C7I+ilow=", diff --git a/flake.nix b/flake.nix index d237e886..ae21e366 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,7 @@ # Managing home configurations. home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.inputs.utils.follows = "flake-utils"; # This is what AUR strives to be. nur.url = "github:nix-community/NUR"; @@ -33,6 +34,7 @@ nix-ld.inputs.nixpkgs.follows = "nixpkgs"; nix-alien.url = "github:thiagokokada/nix-alien"; nix-alien.inputs.nixpkgs.follows = "nixpkgs"; + nix-alien.inputs.flake-utils.follows = "flake-utils"; # Generate your NixOS systems to various formats! nixos-generators.url = "github:nix-community/nixos-generators"; @@ -44,6 +46,8 @@ # Easy access to development environments. devshell.url = "github:numtide/devshell"; + devshell.inputs.nixpkgs.follows = "nixpkgs"; + devshell.inputs.flake-utils.follows = "flake-utils"; # We're getting more unstable there should be a black hole at my home right now. neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; @@ -51,6 +55,7 @@ emacs-overlay.url = "github:nix-community/emacs-overlay"; emacs-overlay.inputs.nixpkgs.follows = "nixpkgs"; + emacs-overlay.inputs.flake-utils.follows = "flake-utils"; # Guix in NixOS?! guix-overlay.url = "github:foo-dogsquared/nix-overlay-guix"; @@ -59,6 +64,7 @@ # The more recommended Rust overlay so I'm going with it. rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; + rust-overlay.inputs.flake-utils.follows = "flake-utils"; # Generating an entire flavored themes with Nix? nix-colors.url = "github:misterio77/nix-colors";