From 29ea37374dd50cf2033b9e1e52d32a63100d5051 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 6 Aug 2021 23:33:19 +0200 Subject: [PATCH] fish: use dummy fish package in tests --- tests/modules/programs/fish/functions.nix | 7 +++++++ tests/modules/programs/fish/no-functions.nix | 9 ++++++++- tests/modules/programs/fish/plugins.nix | 7 +++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/tests/modules/programs/fish/functions.nix b/tests/modules/programs/fish/functions.nix index 424d0a288..9bca418e7 100644 --- a/tests/modules/programs/fish/functions.nix +++ b/tests/modules/programs/fish/functions.nix @@ -30,6 +30,13 @@ in { }; }; + # Needed to avoid error with dummy fish package. + xdg.dataFile."fish/home-manager_generated_completions".source = + lib.mkForce (builtins.toFile "empty" ""); + + nixpkgs.overlays = + [ (self: super: { fish = pkgs.writeScriptBin "dummy" ""; }) ]; + nmt = { description = "if fish.function is set, check file exists and contents match"; diff --git a/tests/modules/programs/fish/no-functions.nix b/tests/modules/programs/fish/no-functions.nix index c817b3889..7cd2966e7 100644 --- a/tests/modules/programs/fish/no-functions.nix +++ b/tests/modules/programs/fish/no-functions.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -10,6 +10,13 @@ with lib; functions = { }; }; + # Needed to avoid error with dummy fish package. + xdg.dataFile."fish/home-manager_generated_completions".source = + lib.mkForce (builtins.toFile "empty" ""); + + nixpkgs.overlays = + [ (self: super: { fish = pkgs.writeScriptBin "dummy" ""; }) ]; + nmt = { description = "if fish.functions is blank, the functions folder should not exist."; diff --git a/tests/modules/programs/fish/plugins.nix b/tests/modules/programs/fish/plugins.nix index 657c33f39..61e1603f0 100644 --- a/tests/modules/programs/fish/plugins.nix +++ b/tests/modules/programs/fish/plugins.nix @@ -46,6 +46,13 @@ in { }]; }; + # Needed to avoid error with dummy fish package. + xdg.dataFile."fish/home-manager_generated_completions".source = + lib.mkForce (builtins.toFile "empty" ""); + + nixpkgs.overlays = + [ (self: super: { fish = pkgs.writeScriptBin "dummy" ""; }) ]; + nmt = { description = "if fish.plugins set, check conf.d file exists and contents match";