From 675d77f1ce553c04f209fcb0fb352d2246c32af2 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 16 Jun 2024 02:30:23 +0800 Subject: [PATCH] flake: run github:linyinfeng/flat-flake --- flake.lock | 42 +++++++----------------------------------- flake.nix | 2 ++ 2 files changed, 9 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 323e4c6..a44d384 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "aagl": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": [ + "flake-compat" + ], "nixpkgs": [ "nixpkgs" ] @@ -85,22 +87,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -337,7 +323,9 @@ "nixpkgs-docs": [ "nixpkgs" ], - "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", + "nixpkgs-for-bootstrap": [ + "nixpkgs" + ], "nmd": [ "nmd" ] @@ -423,22 +411,6 @@ "type": "github" } }, - "nixpkgs-for-bootstrap": { - "locked": { - "lastModified": 1708105575, - "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1718229064, @@ -570,7 +542,7 @@ "berberman": "berberman", "crane": "crane", "disko": "disko", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "flake-utils": "flake-utils", "gitignore": "gitignore", diff --git a/flake.nix b/flake.nix index d06daef..1d27d5c 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ aagl = { url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-compat.follows = "flake-compat"; }; berberman = { url = "github:berberman/flakes"; @@ -64,6 +65,7 @@ nix-on-droid = { url = "github:nix-community/nix-on-droid/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-for-bootstrap.follows = "nixpkgs"; inputs.nixpkgs-docs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; inputs.nix-formatter-pack.follows = "nix-formatter-pack";