From 70faf84ba34e2b1d400d9b4c3fe8645504451fe6 Mon Sep 17 00:00:00 2001 From: winston Date: Tue, 13 Jun 2023 08:59:25 +0200 Subject: [PATCH] chore: rearrange inputs --- flake.lock | 94 +++++++++++++----------------------------------------- flake.nix | 6 ++-- 2 files changed, 26 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index 4ba80d9..5eb62b7 100644 --- a/flake.lock +++ b/flake.lock @@ -150,24 +150,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -196,11 +178,11 @@ ] }, "locked": { - "lastModified": 1686391840, - "narHash": "sha256-5S0APl6Mfm6a37taHwvuf11UHnAX0+PnoWQbsYbMUnc=", + "lastModified": 1686604884, + "narHash": "sha256-AkfxSmGGvNMtyXt1us9Lm8cMeIwqxpkSTeNeBQ00SL8=", "owner": "nix-community", "repo": "home-manager", - "rev": "0144ac418ef633bfc9dbd89b8c199ad3a617c59f", + "rev": "b01eb1eb3b579c74e6a4189ef33cc3fa24c40613", "type": "github" }, "original": { @@ -216,11 +198,11 @@ "wezterm-src": "wezterm-src" }, "locked": { - "lastModified": 1686467098, - "narHash": "sha256-M3QFKrqJNrr0Y9+/Oc4K0tbmohn/c/0n0btzEukaqjc=", + "lastModified": 1686553559, + "narHash": "sha256-3GpWAkqKzo2L1WO4e9iWom8CxpompgH6le5tP1KG80o=", "owner": "nekowinston", "repo": "nur", - "rev": "60418c2cae799fdae71daf3dfaf746b94d43393f", + "rev": "69fef37c252ac8c21aaf4192e1b7d1b87a525054", "type": "github" }, "original": { @@ -236,11 +218,11 @@ ] }, "locked": { - "lastModified": 1685764721, - "narHash": "sha256-CIy1iwQTEKfZRrid4gBLA+r/LPGA9IUFo0lKJVyECGI=", + "lastModified": 1686574167, + "narHash": "sha256-hxE8z+S9E4Qw03D2VQRaJUmj9zep3FvhKz316JUZuPA=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "669ca1f2e2bc401abab6b837ae9c51503edc9b49", + "rev": "7e83b70f31f4483c07e6939166cb667ecb8d05d5", "type": "github" }, "original": { @@ -251,11 +233,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686398752, - "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=", + "lastModified": 1686488075, + "narHash": "sha256-2otSBt2hbeD+5yY25NF3RhWx7l5SDt1aeU3cJ/9My4M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6", + "rev": "9401a0c780b49faf6c28adf55764f230301d0dce", "type": "github" }, "original": { @@ -265,29 +247,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1686536960, - "narHash": "sha256-P5VTmM/lOI2DXjn54eoTE322rhCQfxHy/twHNypV8PE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "63e752bbac363c48481fe054339e35d636dc2694", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1686488075, - "narHash": "sha256-2otSBt2hbeD+5yY25NF3RhWx7l5SDt1aeU3cJ/9My4M=", + "lastModified": 1686519857, + "narHash": "sha256-VkBhuq67aXXiCoEmicziuDLUPPjeOTLQoj6OeVai5zM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9401a0c780b49faf6c28adf55764f230301d0dce", + "rev": "6b1b72c0f887a478a5aac355674ff6df0fc44f44", "type": "github" }, "original": { @@ -299,11 +265,11 @@ }, "nur": { "locked": { - "lastModified": 1686541497, - "narHash": "sha256-6ijjY+jNP53F0iVZZ6QesLJ6ic6rGC93FgBUA46Qbm8=", + "lastModified": 1686634533, + "narHash": "sha256-YszZkcJfhQL3m2zBNT8hLpA+DNCcVxSHK2/3jNa9EMY=", "owner": "nix-community", "repo": "nur", - "rev": "bf20fd39704e093378009777fa4f90041b4fe1cc", + "rev": "875deba73f2360a885d1b81c3d88218bce4c1230", "type": "github" }, "original": { @@ -315,13 +281,15 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": [ + "flake-utils" + ], "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" ], "nixpkgs-stable": [ - "nixpkgs-stable" + "nixpkgs" ] }, "locked": { @@ -347,7 +315,6 @@ "nekowinston-nur": "nekowinston-nur", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", "sops": "sops", @@ -387,7 +354,7 @@ "nixpkgs" ], "nixpkgs-stable": [ - "nixpkgs-stable" + "nixpkgs" ] }, "locked": { @@ -455,21 +422,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "wezterm-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 3cba4dc..1d93406 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/release-23.05"; darwin.url = "github:lnl7/nix-darwin"; darwin.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; @@ -17,7 +16,7 @@ sops.url = "github:Mic92/sops-nix"; sops.inputs.nixpkgs.follows = "nixpkgs"; - sops.inputs.nixpkgs-stable.follows = "nixpkgs-stable"; + sops.inputs.nixpkgs-stable.follows = "nixpkgs"; nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; @@ -26,7 +25,8 @@ pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; - pre-commit-hooks.inputs.nixpkgs-stable.follows = "nixpkgs-stable"; + pre-commit-hooks.inputs.flake-utils.follows = "flake-utils"; + pre-commit-hooks.inputs.nixpkgs-stable.follows = "nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; };