From fab5704a295415bf15b97d671a92efd85b917448 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 9 Feb 2026 11:45:03 +0100 Subject: [PATCH] chore: uniformize on the same nixpkgs... --- flake.lock | 77 +++++++++++++----------------------------------------- flake.nix | 20 +++++++++++--- 2 files changed, 34 insertions(+), 63 deletions(-) diff --git a/flake.lock b/flake.lock index 3108941..9c56699 100644 --- a/flake.lock +++ b/flake.lock @@ -109,7 +109,9 @@ "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "nix": "nix", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1766415291, @@ -259,7 +261,9 @@ "generators": { "inputs": { "nixlib": "nixlib", - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1764234087, @@ -427,17 +431,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761313199, - "narHash": "sha256-wCIACXbNtXAlwvQUo1Ed++loFALPjYUA3dpcUJiXO44=", - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "d1c30452ebecfc55185ae6d1c983c09da0c274ff", + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "type": "github" }, "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", "type": "github" } }, @@ -456,53 +460,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1736657626, - "narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1766309749, - "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1728956102, - "narHash": "sha256-J8zo+UYNjHATsxn2/ROl8iaji2RgLm+sG7b3VcD36YM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3d85bae2431f20ab1ac5cf14d03d314dffe629af", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, "pyproject-build-systems": { "inputs": { "nixpkgs": [ @@ -560,7 +517,7 @@ "devenv": "devenv", "flake-utils": "flake-utils_2", "generators": "generators", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "terranix": "terranix" } }, @@ -627,7 +584,9 @@ "terranix": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_4" }, "locked": { diff --git a/flake.nix b/flake.nix index bc58d82..7560b1b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,22 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - generators.url = "github:nix-community/nixos-generators"; - terranix.url = "github:terranix/terranix"; - devenv.url = "github:cachix/devenv"; + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + generators = { + url = "github:nix-community/nixos-generators"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + terranix = { + url = "github:terranix/terranix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + devenv = { + url = "github:cachix/devenv"; + inputs.nixpkgs.follows = "nixpkgs"; + }; authentik-nix = { url = "github:nix-community/authentik-nix"; inputs.nixpkgs.follows = "nixpkgs";