From b848fd61fe9f0ed9cf4bb1f85ad9daee98ee4592 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 5 Jan 2023 11:42:22 +0800 Subject: [PATCH] Revert "do not use specialArgs" This reverts commit 10d529da0a5b1d82fd8f93544f565f7bdeacde51. --- final/configuration.nix | 2 +- final/flake.nix | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/final/configuration.nix b/final/configuration.nix index 8dc0482..b8e7c3a 100644 --- a/final/configuration.nix +++ b/final/configuration.nix @@ -1,4 +1,4 @@ -{ artiq }: { config, pkgs, ... }: +{ config, pkgs, artiq, ... }: { imports = diff --git a/final/flake.nix b/final/flake.nix index e603293..9bcd5a1 100644 --- a/final/flake.nix +++ b/final/flake.nix @@ -3,9 +3,8 @@ outputs = { self, artiq }: { nixosConfigurations.artiq = artiq.inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - # Do not use specialArgs to pass the ARTIQ flake - this evaluates many attributes - # and bloats the installation. https://git.m-labs.hk/M-Labs/defenestrate/issues/1 - modules = [ ( import ./configuration.nix { inherit artiq; } ) ]; + specialArgs = { inherit artiq; }; + modules = [ ./configuration.nix ]; }; }; }