From dc5eb450b2683a3787b595e9bcf86a3d14395de3 Mon Sep 17 00:00:00 2001 From: Alois Date: Sun, 28 Jun 2026 18:48:49 +0200 Subject: [PATCH] (fix): nix related stuff --- flake.lock | 40 +++------------------------------------- flake.nix | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 0244fe2..aeb3d70 100644 --- 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": 1782467914, @@ -52,7 +34,6 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" } @@ -62,11 +43,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1782443907, - "narHash": "sha256-P+pADLtK7qC1mz0/5Xq9uF77oahUR4zYLTaitiHsUHg=", + "lastModified": 1782616745, + "narHash": "sha256-NN5B1cKBXF6h1Ec681gMGZ2o/99d7vKXAAfFNEvyOKA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4b06ff4acf3491ff69721df852507fcc51d0a13d", + "rev": "b916d014dc57eb555f84e51172a82f7f6fb560d7", "type": "github" }, "original": { @@ -74,21 +55,6 @@ "repo": "rust-overlay", "type": "github" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 0e6e463..0790316 100644 --- a/flake.nix +++ b/flake.nix @@ -4,16 +4,25 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; rust-overlay.url = "github:oxalica/rust-overlay"; - flake-utils.url = "github:numtide/flake-utils"; }; outputs = { self, nixpkgs, rust-overlay, - flake-utils, - }: - flake-utils.lib.eachDefaultSystem ( + }: let + systems = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + ]; + eachSystem = f: + nixpkgs.lib.foldl' nixpkgs.lib.recursiveUpdate {} ( + map (system: nixpkgs.lib.mapAttrs (_: value: {${system} = value;}) (f system)) systems + ); + in + eachSystem ( system: let overlays = [rust-overlay.overlays.default]; pkgs = import nixpkgs {inherit system overlays;};