From 8384baff6e4fa0f6e951b24e18e1456e81ed3e1a Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Fri, 5 Sep 2025 10:27:05 +0200 Subject: [PATCH] Simplified flake dependencies --- flake.lock | 43 +++++++------------------------------------ flake.nix | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 417eaa8..bf1476d 100644 --- a/flake.lock +++ b/flake.lock @@ -95,8 +95,6 @@ ], "naersk": "naersk", "nixpkgs": [ - "cute-api", - "dotfiles", "nixpkgs" ], "systems": "systems_6", @@ -545,7 +543,7 @@ "inputs": { "flake-compat": "flake-compat_8", "gitignore": "gitignore_4", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1742649964, @@ -565,7 +563,9 @@ "inputs": { "flake-compat": "flake-compat_7", "gitignore": "gitignore_3", - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1755960406, @@ -884,7 +884,9 @@ "flake-parts": "flake-parts_4", "git-hooks-nix": "git-hooks-nix_2", "kitty-themes-src": "kitty-themes-src_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-lib": "nixpkgs-lib_6", "systems": "systems_9" }, @@ -1225,22 +1227,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1754340878, - "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cab778239e705082fe97bb4990e0d24c50924c04", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", @@ -1256,21 +1242,6 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1742907609, - "narHash": "sha256-V8BiKso8ffRuN243R5qtacQcY7rSz40x/c4Z8zhoQBU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dad0bf139b2db8d258deb21424454db24285d531", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, "ragenix": { "inputs": { "agenix": "agenix", diff --git a/flake.nix b/flake.nix index c055f4d..8d551a2 100644 --- a/flake.nix +++ b/flake.nix @@ -11,17 +11,26 @@ # agenix.url = "github:ryantm/agenix"; ragenix = { url = "github:yaxitech/ragenix"; inputs.nixpkgs.follows = "nixpkgs"; }; deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-rice.url = "github:bertof/nix-rice/modules"; + nix-rice = { + url = "github:bertof/nix-rice/modules"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware"; systems.url = "github:nix-systems/default"; flake-parts.url = "github:hercules-ci/flake-parts"; - git-hooks.url = "github:cachix/git-hooks.nix"; + git-hooks = { + url = "github:cachix/git-hooks.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # agenix-shell.url = "github:aciceri/agenix-shell"; # TODO # agenix-rekey.url = "github:oddlama/agenix-rekey"; # TODO # emanote.url = "github:srid/emanote"; - cute-api.url = "git+ssh://git@gitlab.com/bertof/cute-api.git?ref=main"; + cute-api = { + url = "git+ssh://git@gitlab.com/bertof/cute-api.git?ref=main"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: