mirror of
https://github.com/nix-community/home-manager.git
synced 2025-12-03 07:31:03 +01:00
treewide: substituteAll -> replaceVars/substitute
substituteAll is now officially deprecated.
This commit is contained in:
parent
d31710fb2c
commit
abfad3d295
12 changed files with 56 additions and 43 deletions
|
|
@ -15,9 +15,8 @@
|
|||
};
|
||||
|
||||
nmt.script = "source ${
|
||||
pkgs.substituteAll {
|
||||
pkgs.replaceVars ./emacs-default-editor.sh {
|
||||
inherit (pkgs) coreutils;
|
||||
src = ./emacs-default-editor.sh;
|
||||
}
|
||||
}";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,9 +29,13 @@
|
|||
|
||||
assertFileContent \
|
||||
home-files/.config/systemd/user/emacs.service \
|
||||
${pkgs.substituteAll {
|
||||
inherit (pkgs) runtimeShell;
|
||||
${pkgs.substitute {
|
||||
src = ./emacs-service-emacs.service;
|
||||
substitutions = [
|
||||
"--replace"
|
||||
"@runtimeShell@"
|
||||
pkgs.runtimeShell
|
||||
];
|
||||
}}
|
||||
|
||||
assertFileContent \
|
||||
|
|
|
|||
|
|
@ -30,9 +30,13 @@
|
|||
|
||||
assertFileContent \
|
||||
home-files/.config/systemd/user/emacs.service \
|
||||
${pkgs.substituteAll {
|
||||
inherit (pkgs) runtimeShell;
|
||||
${pkgs.substitute {
|
||||
src = ./emacs-service-emacs-after-graphical-session-target.service;
|
||||
substitutions = [
|
||||
"--replace"
|
||||
"@runtimeShell@"
|
||||
pkgs.runtimeShell
|
||||
];
|
||||
}}
|
||||
|
||||
assertFileContent \
|
||||
|
|
|
|||
|
|
@ -30,9 +30,13 @@
|
|||
|
||||
assertFileContent \
|
||||
home-files/.config/systemd/user/emacs.service \
|
||||
${pkgs.substituteAll {
|
||||
inherit (pkgs) runtimeShell;
|
||||
${pkgs.substitute {
|
||||
src = ./emacs-service-emacs.service;
|
||||
substitutions = [
|
||||
"--replace"
|
||||
"@runtimeShell@"
|
||||
pkgs.runtimeShell
|
||||
];
|
||||
}}
|
||||
|
||||
assertFileContent \
|
||||
|
|
|
|||
|
|
@ -35,9 +35,16 @@
|
|||
|
||||
assertFileContent \
|
||||
home-files/.config/systemd/user/emacs.service \
|
||||
${pkgs.substituteAll {
|
||||
inherit (pkgs) runtimeShell coreutils;
|
||||
${pkgs.substitute {
|
||||
src = ./emacs-socket-27-emacs.service;
|
||||
substitutions = [
|
||||
"--replace"
|
||||
"@runtimeShell@"
|
||||
pkgs.runtimeShell
|
||||
"--replace"
|
||||
"@coreutils@"
|
||||
pkgs.coreutils
|
||||
];
|
||||
}}
|
||||
|
||||
assertFileContent \
|
||||
|
|
|
|||
|
|
@ -35,9 +35,13 @@
|
|||
|
||||
assertFileContent \
|
||||
home-files/.config/systemd/user/emacs.service \
|
||||
${pkgs.substituteAll {
|
||||
inherit (pkgs) runtimeShell coreutils;
|
||||
${pkgs.substitute {
|
||||
src = ./emacs-socket-28-emacs.service;
|
||||
substitutions = [
|
||||
"--replace"
|
||||
"@runtimeShell@"
|
||||
pkgs.runtimeShell
|
||||
];
|
||||
}}
|
||||
|
||||
assertFileContent \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue