From 1d3f28acef416b6bc2e0333596fa75e4b1e49b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 7 Jan 2024 08:55:39 +0100 Subject: [PATCH] Revert "feat(flake): perform final fixups to the flake outputs" This reverts commit b7f3d6070869a9ffde75a9788a752a93f358ed20. CI now supports aarch64-linux. --- flake.nix | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index 705ee7e..61a98c3 100644 --- a/flake.nix +++ b/flake.nix @@ -36,25 +36,7 @@ }; outputs = inputs@{ self, nixpkgs, crane, rust-overlay, flake-parts, ... }: - let - # Systems supported in CI - supportedSystems = [ "x86_64-linux" ]; - fixupFlakes = outputs: nixpkgs.lib.updateManyAttrsByPath [ - # Apply post-flakeparts massaging for limited supported systems, e.g. systems for which - # we don't have KVM support and cannot test in CI, but we still can meaningfully - # build packages. - { - path = [ "legacyPackages" "unsupportedChecks" ]; - update = checks: checks // (nixpkgs.lib.filterAttrs (name: _: !builtins.elem name supportedSystems) outputs.checks); - } - { - path = [ "checks" ]; - update = nixpkgs.lib.filterAttrs (name: _: builtins.elem name supportedSystems); - } - ] - outputs; - in - fixupFlakes (flake-parts.lib.mkFlake { inherit inputs; } ({ moduleWithSystem, ... }: { + flake-parts.lib.mkFlake { inherit inputs; } ({ moduleWithSystem, ... }: { imports = [ # Derive the output overlay automatically from all packages that we define. inputs.flake-parts.flakeModules.easyOverlay @@ -273,5 +255,5 @@ TEST_SYSTEMD = pkgs.systemd; }; }; - })); + }); }