From 4cea570a84a492482f205711a5ce886bd0cff70d Mon Sep 17 00:00:00 2001 From: LeMarsu Date: Sat, 3 May 2025 04:54:44 +0200 Subject: [PATCH] chore(nix): remove unneeded flake deps --- flake.lock | 178 ++--------------------------------------------------- flake.nix | 13 +--- shell.nix | 9 +-- 3 files changed, 9 insertions(+), 191 deletions(-) diff --git a/flake.lock b/flake.lock index 2c60bfd..6ef1fba 100644 --- a/flake.lock +++ b/flake.lock @@ -1,121 +1,6 @@ { "nodes": { - "alejandra": { - "inputs": { - "fenix": "fenix", - "flakeCompat": "flakeCompat", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660592437, - "narHash": "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "e7eac49074b70814b542fee987af2987dd0520b5", - "type": "github" - }, - "original": { - "owner": "kamadorueda", - "ref": "3.0.0", - "repo": "alejandra", - "type": "github" - } - }, - "fenix": { - "inputs": { - "nixpkgs": [ - "alejandra", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1657607339, - "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", - "owner": "nix-community", - "repo": "fenix", - "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "nil": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1732053863, - "narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=", - "owner": "oxalica", - "repo": "nil", - "rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1739020877, "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", @@ -131,7 +16,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1660438583, "narHash": "sha256-rJUTYxFKlWUJI3njAwEc1pKAVooAViZGJvsgqfh/q/E=", @@ -148,51 +33,11 @@ }, "root": { "inputs": { - "alejandra": "alejandra", - "nil": "nil", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "utils": "utils", "yants": "yants" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1657557289, - "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "caf23f29144b371035b864a1017dbc32573ad56d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731983527, - "narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "71287228d96e9568e1e70c6bbfa3f992d145947b", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -208,24 +53,9 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -243,7 +73,7 @@ }, "yants": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1686863218, diff --git a/flake.nix b/flake.nix index 1df47c7..40b0b57 100644 --- a/flake.nix +++ b/flake.nix @@ -4,17 +4,11 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; utils.url = "github:numtide/flake-utils"; - nil.url = "github:oxalica/nil"; yants.url = "github:divnix/yants"; - alejandra = { - url = "github:kamadorueda/alejandra/3.0.0"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { self, - alejandra, nixpkgs, utils, yants, @@ -30,12 +24,11 @@ forSystem = system: let pkgs = nixpkgs.legacyPackages.${system}; - formatter = alejandra.defaultPackage.${system}; - inherit (inputs.nil.packages.${system}) nil; + inherit (pkgs) nil; in { - inherit formatter; + formatter = pkgs.alejandra; devShells.default = import ./shell.nix { - inherit pkgs nil formatter; + inherit pkgs; }; }; in diff --git a/shell.nix b/shell.nix index 4f060dc..0f01d70 100644 --- a/shell.nix +++ b/shell.nix @@ -1,13 +1,8 @@ -{ - formatter, - nil, - pkgs, - ... -}: +{pkgs, ...}: with pkgs; mkShell { buildInputs = [ - formatter + alejandra git-cliff nil sumneko-lua-language-server