From bfa5e70b482a5288428d650d86a92991a2e5c044 Mon Sep 17 00:00:00 2001 From: Khue Doan Date: Sun, 15 Jun 2025 02:59:30 +0000 Subject: [PATCH] build: remove flake-utils dependency --- flake.lock | 34 ---------------------------------- flake.nix | 68 ++++++++++++++++++++++++++++++++++++-------------------------------- 2 file(s) changed, 36 insertion(s)(+), 66 deletion(s)(-) diff --git a/flake.lock b/flake.lock --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "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" - } - }, "nixpkgs": { "locked": { "lastModified": 1748162331, @@ -36,23 +18,7 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" } } }, diff --git a/flake.nix b/flake.nix --- a/flake.nix +++ b/flake.nix @@ -1,39 +1,43 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: - with nixpkgs.legacyPackages.${system}; - { - devShells.default = mkShell { - packages = [ - age - ansible - ansible-lint - gnumake - go - k3d - kubectl - openssh - opentofu - oras - pre-commit - shellcheck - sops - temporal-cli - terragrunt - wireguard-tools - yamlfmt - yamllint + outputs = { self, nixpkgs }: + let + supportedSystems = nixpkgs.lib.genAttrs [ + "x86_64-linux" + "aarch64-linux" + ]; + in + { + devShells = supportedSystems (system: { + default = with nixpkgs.legacyPackages.${system}; mkShell { + packages = [ + age + ansible + ansible-lint + gnumake + go + k3d + kubectl + openssh + opentofu + oras + pre-commit + shellcheck + sops + temporal-cli + terragrunt + wireguard-tools + yamlfmt + yamllint - (python3.withPackages (p: with p; [ - kubernetes - ])) - ]; - }; - } - ); + (python3.withPackages (p: with p; [ + kubernetes + ])) + ]; + }; + }); + }; } -- tangled.sh