From 412b5484c955b315bad2d3a26016f3d752a9cbd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 29 Jul 2024 09:00:01 +0200 Subject: [PATCH] [chore] flake.lock: update inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: ``` • Updated input 'devshell': 'github:numtide/devshell/1ebbe68d57457c8cae98145410b164b5477761f4' (2024-06-03) → 'github:numtide/devshell/67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae' (2024-07-27) • Removed input 'devshell/flake-utils' • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c716603a63aca44f39bef1986c13402167450e0a' (2024-07-17) → 'github:NixOS/nixpkgs/8c50662509100d53229d4be607f1a3a31157fa12' (2024-07-27) • Updated input 'nixvim': 'github:nix-community/nixvim/55bda0cc3b230255d271e5eef82f3279dae9f859' (2024-07-17) → 'github:nix-community/nixvim/2415edc0cb749bf81c9b142138c2bb705514f6cc' (2024-07-29) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/8d6a17d0cdf411c55f12602624df6368ad86fac1' (2024-07-09) → 'github:cachix/git-hooks.nix/f451c19376071a90d8c58ab1a953c6e9840527fd' (2024-07-15) • Added input 'nixvim/nuschtosSearch': 'github:NuschtOS/search/16565307c267ec219c2b5d3494ba66df08e7d403' (2024-07-28) • Added input 'nixvim/nuschtosSearch/flake-utils': 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) • Added input 'nixvim/nuschtosSearch/flake-utils/systems': 'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09) • Added input 'nixvim/nuschtosSearch/nixpkgs': follows 'nixvim/nixpkgs' • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/5b002f8a53ed04c1a4177e7b00809d57bd2c696f' (2024-07-12) → 'github:numtide/treefmt-nix/8db8970be1fb8be9c845af7ebec53b699fe7e009' (2024-07-23) • Updated input 'unstable': 'github:NixOS/nixpkgs/ad0b5eed1b6031efaed382844806550c3dcb4206' (2024-07-16) → 'github:NixOS/nixpkgs/b73c2221a46c13557b1b3be9c2070cc42cf01eb3' (2024-07-27) ``` Also fixed some input duplication. --- flake.lock | 89 ++++++++++++++++++++++++++++++++++++------------------ flake.nix | 22 +++----------- 2 files changed, 64 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 55877b4..4c2d43f 100644 --- a/flake.lock +++ b/flake.lock @@ -116,19 +116,17 @@ }, "devshell": { "inputs": { - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ + "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "owner": "numtide", "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "type": "github" }, "original": { @@ -242,11 +240,11 @@ ] }, "locked": { - "lastModified": 1720524665, - "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -331,9 +329,7 @@ }, "lix-module": { "inputs": { - "flake-utils": [ - "flake-utils" - ], + "flake-utils": "flake-utils", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -354,11 +350,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721226092, - "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", + "lastModified": 1722087241, + "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c716603a63aca44f39bef1986c13402167450e0a", + "rev": "8c50662509100d53229d4be607f1a3a31157fa12", "type": "github" }, "original": { @@ -367,11 +363,25 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { - "devshell": [ - "devshell" - ], + "devshell": "devshell", "flake-compat": [ "stylix", "flake-compat" @@ -385,14 +395,15 @@ "nixpkgs": [ "unstable" ], + "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1721224205, - "narHash": "sha256-W0+l7HNzZfEmIx/1Yp3Tow/GZILVjrMjWfTt1Mos7mI=", + "lastModified": 1722232048, + "narHash": "sha256-TjBk/EECLYfPscxOW9yWEuoI4mzoYOok/qMiod/Xx8M=", "owner": "nix-community", "repo": "nixvim", - "rev": "55bda0cc3b230255d271e5eef82f3279dae9f859", + "rev": "2415edc0cb749bf81c9b142138c2bb705514f6cc", "type": "github" }, "original": { @@ -401,10 +412,30 @@ "type": "github" } }, + "nuschtosSearch": { + "inputs": { + "flake-utils": [ + "lix-module", + "flake-utils" + ], + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1722144272, + "narHash": "sha256-olZbfaEdd+zNPuuyYcYGaRzymA9rOmth8yXOlVm+LUs=", + "owner": "NuschtOS", + "repo": "search", + "rev": "16565307c267ec219c2b5d3494ba66df08e7d403", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "root": { "inputs": { - "devshell": "devshell", - "flake-utils": "flake-utils", "home-manager": "home-manager", "lix-module": "lix-module", "nixpkgs": "nixpkgs", @@ -470,11 +501,11 @@ ] }, "locked": { - "lastModified": 1720818892, - "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", + "lastModified": 1721769617, + "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", + "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", "type": "github" }, "original": { @@ -485,11 +516,11 @@ }, "unstable": { "locked": { - "lastModified": 1721138476, - "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 06653ba..3f11370 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; + flake-utils.inputs.systems.follows = "systems"; }; }; # Modules @@ -30,25 +30,14 @@ url = "github:nix-community/nixvim"; inputs = { nixpkgs.follows = "unstable"; - devshell.follows = "devshell"; nix-darwin.follows = ""; # disable MacOS stuff home-manager.follows = "home-manager"; flake-compat.follows = "stylix/flake-compat"; + nuschtosSearch.inputs.flake-utils.follows = "lix-module/flake-utils"; }; }; # For deduplication systems.url = "github:nix-systems/default"; - flake-utils = { - url = "github:numtide/flake-utils"; - inputs.systems.follows = "systems"; - }; - devshell = { - url = "github:numtide/devshell"; - inputs = { - flake-utils.follows = "flake-utils"; - nixpkgs.follows = "nixpkgs"; - }; - }; }; # Flake outputs that other flakes can use @@ -61,15 +50,12 @@ home-manager, nixvim, lix-module, - ... + systems, }: let inherit (nixpkgs) lib; # Helpers for producing system-specific outputs - supportedSystems = [ - "x86_64-linux" - "aarch64-linux" - ]; + supportedSystems = import systems; forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems ( -- 2.46.0