From 4d97659b1b7e613022463698036bb74e7f60f4fc Mon Sep 17 00:00:00 2001 From: Lander Van den Bulcke Date: Sun, 28 Sep 2025 11:17:57 +0200 Subject: [PATCH] chore: align flake input nixpkgs Signed-off-by: Lander Van den Bulcke --- flake.lock | 138 +++++++++++------------------------------------------ flake.nix | 40 +++++++++++----- 2 files changed, 56 insertions(+), 122 deletions(-) diff --git a/flake.lock b/flake.lock index 8a6cd5b..8a712ba 100644 --- a/flake.lock +++ b/flake.lock @@ -18,7 +18,9 @@ }, "catppuccin": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1754766435, @@ -40,8 +42,12 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2", - "stable": "stable" + "nixpkgs": [ + "nixpkgs-unstable" + ], + "stable": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1755272288, @@ -461,7 +467,9 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs-unstable" + ] }, "locked": { "lastModified": 1758785683, @@ -480,15 +488,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753749649, - "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", - "owner": "NixOS", + "lastModified": 1758791193, + "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", + "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" @@ -542,70 +550,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1758446476, "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", @@ -621,7 +565,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_3": { "locked": { "lastModified": 1758029226, "narHash": "sha256-TjqVmbpoCqWywY9xIZLTf6ANFvDCXdctCjoYuYPYdMI=", @@ -637,26 +581,12 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "nixpkgs" + ], "nixvim": "nixvim_2", "pre-commit-hooks": "pre-commit-hooks" }, @@ -677,7 +607,7 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_2", "nuschtosSearch": "nuschtosSearch", "systems": "systems_3" }, @@ -723,7 +653,7 @@ "inputs": { "flake-compat": "flake-compat_4", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1758108966, @@ -748,7 +678,7 @@ "home-manager": "home-manager", "nixos-mailserver": "nixos-mailserver", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "sops-nix": "sops-nix", @@ -775,22 +705,6 @@ "type": "github" } }, - "stable": { - "locked": { - "lastModified": 1750133334, - "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "36ab78dab7da2e4e27911007033713bab534187b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "superdirt-src": { "flake": false, "locked": { @@ -872,7 +786,9 @@ "tidalcycles": { "inputs": { "dirt-samples-src": "dirt-samples-src", - "nixpkgs": "nixpkgs_8", + "nixpkgs": [ + "nixpkgs-unstable" + ], "superdirt-src": "superdirt-src", "tidal-src": "tidal-src", "vim-tidal-src": "vim-tidal-src", diff --git a/flake.nix b/flake.nix index e26acf6..2028238 100644 --- a/flake.nix +++ b/flake.nix @@ -13,31 +13,48 @@ }; # disko - disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs"; + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # theme - catppuccin.url = "github:catppuccin/nix/release-25.05"; + catppuccin = { + url = "github:catppuccin/nix/release-25.05"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Home manager - home-manager.url = "github:nix-community/home-manager/release-25.05"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager = { + url = "github:nix-community/home-manager/release-25.05"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # colmena - colmena.url = "github:zhaofengli/colmena"; + colmena = { + url = "github:zhaofengli/colmena"; + inputs = { + nixpkgs.follows = "nixpkgs-unstable"; + stable.follows = "nixpkgs"; + }; + }; # nixos-wsl - nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; + nixos-wsl = { + url = "github:nix-community/NixOS-WSL/main"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; # neovim - nixvim.url = "git+https://git.escapeangle.com/lander/nixvim.git"; + nixvim = { + url = "git+https://git.escapeangle.com/lander/nixvim.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # mailserver nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; + inputs.nixpkgs.follows = "nixpkgs"; }; # headplane @@ -49,6 +66,7 @@ # tidalcycles tidalcycles = { url = "github:mitchmindtree/tidalcycles.nix"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; };