From 4f9349afce945070b249f093909e4afd23d6a1de Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sun, 17 Sep 2023 19:50:19 +0200
Subject: [PATCH] Deduplicate some inputs
---
flake.lock | 53 ++++++++++-------------------------------------------
flake.nix | 3 +++
2 files changed, 13 insertions(+), 43 deletions(-)
diff --git a/flake.lock b/flake.lock
index 7a58f5a..0ac8fc2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -76,21 +76,6 @@
"type": "github"
}
},
- "flake-utils_2": {
- "locked": {
- "lastModified": 1623875721,
- "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -115,7 +100,9 @@
"homePage": {
"inputs": {
"hugo-theme-anubis": "hugo-theme-anubis",
- "nixpkgs": "nixpkgs"
+ "nixpkgs": [
+ "nixpkgs"
+ ]
},
"locked": {
"lastModified": 1655227494,
@@ -200,19 +187,6 @@
}
},
"nixpkgs": {
- "locked": {
- "lastModified": 1629226339,
- "narHash": "sha256-szvgmQcUJM3Kv/wNyIn+wtMrrvsks0bk9JOqI2Ij8Ao=",
- "path": "/nix/store/vy5l0dvdwwhyc988z185f9i7rqbc1n8y-source",
- "rev": "2435ea48c3b295d9cd490535730bb13ab8cfd8a5",
- "type": "path"
- },
- "original": {
- "id": "nixpkgs",
- "type": "indirect"
- }
- },
- "nixpkgs_2": {
"locked": {
"lastModified": 1694499547,
"narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=",
@@ -228,21 +202,14 @@
"type": "github"
}
},
- "nixpkgs_3": {
- "locked": {
- "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
- "path": "/nix/store/n04lw5nrskzmz7rv17p09qrnjanfkg5d-source",
- "type": "path"
- },
- "original": {
- "id": "nixpkgs",
- "type": "indirect"
- }
- },
"recipemd": {
"inputs": {
- "flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_3"
+ "flake-utils": [
+ "flake-utils"
+ ],
+ "nixpkgs": [
+ "nixpkgs"
+ ]
},
"locked": {
"lastModified": 1647022391,
@@ -269,7 +236,7 @@
"homePage": "homePage",
"nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs",
"recipemd": "recipemd"
}
},
diff --git a/flake.nix b/flake.nix
index 3016008..e92996e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,9 +11,12 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
homePage = {
url = "github:dadada/dadada.li";
+ inputs.nixpkgs.follows = "nixpkgs";
};
recipemd = {
url = "github:dadada/recipemd/nix-flake";
+ inputs.nixpkgs.follows = "nixpkgs";
+ inputs.flake-utils.follows = "flake-utils";
};
agenix = {
url = "github:ryantm/agenix/0.13.0";