From 8236802a7402d0660bff5f1acf2b4fd13454d729 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Wed, 25 Sep 2024 12:02:45 +0200 Subject: [PATCH] don't pass around self needlessly --- flake.nix | 4 ++-- tests/mastodon-garage.nix | 4 ++-- tests/pixelfed-garage.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 83d24b2..0bd5a79 100644 --- a/flake.nix +++ b/flake.nix @@ -91,8 +91,8 @@ nixpkgs.lib.mapAttrs (name: config: deployCommand name config) self.nixosConfigurations; checks.${system} = { - mastodon-garage = import ./tests/mastodon-garage.nix { inherit pkgs self; }; - pixelfed-garage = import ./tests/pixelfed-garage.nix { inherit pkgs self; }; + mastodon-garage = import ./tests/mastodon-garage.nix { inherit pkgs; }; + pixelfed-garage = import ./tests/pixelfed-garage.nix { inherit pkgs; }; }; devShells.${system}.default = pkgs.mkShell { diff --git a/tests/mastodon-garage.nix b/tests/mastodon-garage.nix index 672b70f..5d9822f 100644 --- a/tests/mastodon-garage.nix +++ b/tests/mastodon-garage.nix @@ -1,4 +1,4 @@ -{ pkgs, self }: +{ pkgs }: let lib = pkgs.lib; rebuildableTest = import ./rebuildableTest.nix pkgs; @@ -37,7 +37,7 @@ pkgs.nixosTest { nodes = { server = { config, ... }: { virtualisation.memorySize = lib.mkVMOverride 4096; - imports = with self.nixosModules; [ mastodon-vm ]; + imports = [ ./../vm/mastodon-vm.nix ]; # TODO: pair down environment.systemPackages = with pkgs; [ python3 diff --git a/tests/pixelfed-garage.nix b/tests/pixelfed-garage.nix index b25bc66..7707b10 100644 --- a/tests/pixelfed-garage.nix +++ b/tests/pixelfed-garage.nix @@ -1,4 +1,4 @@ -{ pkgs, self }: +{ pkgs }: let lib = pkgs.lib; rebuildableTest = import ./rebuildableTest.nix pkgs; @@ -136,7 +136,7 @@ pkgs.nixosTest { memorySize = lib.mkVMOverride 8192; cores = 8; }; - imports = with self.nixosModules; [ pixelfed-vm ]; + imports = [ ../../vm/pixelfed-vm.nix ]; # TODO: pair down environment.systemPackages = with pkgs; [ python3