From 9fca7b4624755954c41edd1f5b35331f48c3c992 Mon Sep 17 00:00:00 2001 From: sefidel Date: Sun, 4 Aug 2024 01:30:23 +0900 Subject: feat(flake): make inputs follow our nixpkgs input --- flake.lock | 48 ++++++++++-------------------------------------- flake.nix | 2 ++ 2 files changed, 12 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index fafb011..2d3424d 100644 --- a/flake.lock +++ b/flake.lock @@ -5,7 +5,9 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "unstable" + ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -438,7 +440,9 @@ "hydra": { "inputs": { "nix": "nix", - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "unstable" + ] }, "locked": { "lastModified": 1722499110, @@ -576,7 +580,7 @@ "inputs": { "flake-parts": "flake-parts_5", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -639,11 +643,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711401922, - "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", + "lastModified": 1720781449, + "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", + "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", "type": "github" }, "original": { @@ -783,38 +787,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1712848736, - "narHash": "sha256-CzZwhqyLlebljv1zFS2KWVH/3byHND0LfaO1jKsGuVo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1d6a23f11e44d0fb64b3237569b87658a9eb5643", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1720781449, - "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1722689791, diff --git a/flake.nix b/flake.nix index c6c7350..d15bdc4 100644 --- a/flake.nix +++ b/flake.nix @@ -27,8 +27,10 @@ flake-compat.flake = false; hydra.url = "github:NixOS/hydra"; + hydra.inputs.nixpkgs.follows = "unstable"; attic.url = "github:zhaofengli/attic"; + attic.inputs.nixpkgs.follows = "unstable"; neovim-nightly.url = "github:nix-community/neovim-nightly-overlay"; neovim-nightly.inputs.nixpkgs.follows = "unstable"; -- cgit 1.4.1