From 0067a7b15e621a5ddfaf3c4f62eb82bc28c2b159 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sun, 10 Jul 2022 05:40:56 +0800 Subject: [PATCH] flake.nix: follow inputs to original nixpkgs All of the inputs are safe to follow the original nixpkgs. This is the case for Neovim overlay that the lockfile is automatically updated and the Emacs overlay simply has no lockfile. --- flake.lock | 38 +++++++------------------------------- flake.nix | 3 +++ 2 files changed, 10 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 10ee6376..60a3ff73 100644 --- a/flake.lock +++ b/flake.lock @@ -74,7 +74,9 @@ "emacs-overlay": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1657189126, @@ -265,7 +267,9 @@ "inputs": { "flake-compat": "flake-compat", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1657181836, @@ -395,34 +399,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 0, - "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=", - "path": "/nix/store/ab40lgr2lfs53qf2k64xqwhmjbfj41wf-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1657020478, - "narHash": "sha256-sU5hXEGcOcvz2xoPAuNLBQJLXjwvPpTkoddyXE8gw20=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "71a4f0dc3d80ba76f437c888c1c3d59f1df98163", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1657177452, "narHash": "sha256-CojBqno3Zbw9/788+kCjRXXornpc4jJGC6RYvTYdVkg=", @@ -492,7 +468,7 @@ "nix-colors": "nix-colors", "nix-ld": "nix-ld", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nur": "nur", "rust-overlay": "rust-overlay" } diff --git a/flake.nix b/flake.nix index 8595922f..47eeec6f 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,10 @@ # 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"; + neovim-nightly-overlay.inputs.nixpkgs.follows = "nixpkgs"; + emacs-overlay.url = "github:nix-community/emacs-overlay"; + emacs-overlay.inputs.nixpkgs.follows = "nixpkgs"; # Guix in NixOS?! guix-overlay.url = "github:foo-dogsquared/nix-overlay-guix";