From f1bd855c23e73e04597695ca37ae54671a7e07b1 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Sat, 7 Sep 2024 22:09:21 +0200 Subject: [PATCH] flake: make systems overridable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Added input 'systems': 'github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68' (2023-07-14) --- flake.lock | 35 +++++++++++++---------------------- flake.nix | 12 +++++++----- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 12cc919..ccbc7b0 100644 --- a/flake.lock +++ b/flake.lock @@ -53,7 +53,9 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1710146030, @@ -150,7 +152,9 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2", + "systems": [ + "systems" + ], "treefmt-nix": "treefmt-nix" }, "locked": { @@ -175,38 +179,25 @@ "flake-utils": "flake-utils", "napalm": "napalm", "nixpkgs": "nixpkgs", - "poetry2nix": "poetry2nix" + "poetry2nix": "poetry2nix", + "systems": "systems" } }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "id": "systems", - "type": "indirect" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index c765426..77625fc 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,11 @@ description = "Nix package, NixOS module and VM integration test for authentik"; inputs = { - flake-utils.url = "github:numtide/flake-utils"; + systems.url = "github:nix-systems/default-linux"; + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.systems.follows = "systems"; + }; flake-parts.url = "github:hercules-ci/flake-parts"; flake-compat = { url = "github:edolstra/flake-compat"; @@ -17,6 +21,7 @@ inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; + systems.follows = "systems"; }; }; napalm = { @@ -48,10 +53,7 @@ let authentik-version = "2024.8.1"; # to pass to the drvs of some components in { - systems = [ - "x86_64-linux" - "aarch64-linux" # not tested - ]; + systems = import inputs.systems; flake = { self, ... }: { nixosModules.default = { pkgs, ... }: { imports = [ ./module.nix ];