From f4998f0adccc60a2b463f1892e3eb42b9715a8ee Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 27 Jun 2021 14:20:13 +0200
Subject: [PATCH] tests: bump nmt
---
tests/default.nix | 4 ++--
tests/modules/programs/neovim/plugin-config.nix | 10 ++++------
tests/modules/programs/neovim/plugin-config.vim | 4 ++--
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/tests/default.nix b/tests/default.nix
index 1c3892e4f..ef49cc397 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -7,8 +7,8 @@ let
nmt = pkgs.fetchFromGitLab {
owner = "rycee";
repo = "nmt";
- rev = "873ac8cbd362376088b306cee769db37c3cd9b43";
- sha256 = "0s0r0hj6046k6kvfh4j8cvxcq8dv5c4801hs81b11cqlvalyf9y4";
+ rev = "89924d8e6e0fcf866a11324d32c6bcaa89cda506";
+ sha256 = "02wzrbmpdpgig58a1rhz8sb0p2rvbapnlcmhi4d4bi8w9md6pmdl";
};
modules = import ../modules/modules.nix {
diff --git a/tests/modules/programs/neovim/plugin-config.nix b/tests/modules/programs/neovim/plugin-config.nix
index 2ae0ba499..f4f81d8d3 100644
--- a/tests/modules/programs/neovim/plugin-config.nix
+++ b/tests/modules/programs/neovim/plugin-config.nix
@@ -24,12 +24,10 @@ with lib;
nmt.script = ''
vimrc="$TESTED/home-files/.config/nvim/init.vim"
- ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > $out/generated.vim
- assertFileExists home-files/.config/nvim/init.vim
- # We need to remove the unkown store paths in the config
- assertFileContent \
- $out/generated.vim \
- "${./plugin-config.vim}"
+ vimrcNormalized="$(normalizeStorePaths "$vimrc")"
+
+ assertFileExists "$vimrc"
+ assertFileContent "$vimrcNormalized" "${./plugin-config.vim}"
'';
};
}
diff --git a/tests/modules/programs/neovim/plugin-config.vim b/tests/modules/programs/neovim/plugin-config.vim
index 9c1739444..89278a0a9 100644
--- a/tests/modules/programs/neovim/plugin-config.vim
+++ b/tests/modules/programs/neovim/plugin-config.vim
@@ -1,5 +1,5 @@
-set packpath^=/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-vim-pack-dir
-set runtimepath^=/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-vim-pack-dir
+set packpath^=/nix/store/00000000000000000000000000000000-vim-pack-dir
+set runtimepath^=/nix/store/00000000000000000000000000000000-vim-pack-dir
" vim-commentary {{{
" This should be present too