Remove deprecated combinators
These have been deprecated for some time now, and were deprecated before I gave my nixcon talk which brought attention to this library. So I think it's pretty doubtful that anyone is still using these.
This commit is contained in:
parent
da894f6e13
commit
49aa817e4f
2 changed files with 1 additions and 36 deletions
|
|
@ -74,33 +74,7 @@ let
|
||||||
wrap-entry = ./combinators/wrap-entry.nix;
|
wrap-entry = ./combinators/wrap-entry.nix;
|
||||||
write-text = ./combinators/write-text.nix;
|
write-text = ./combinators/write-text.nix;
|
||||||
xwayland = ./combinators/xwayland.nix;
|
xwayland = ./combinators/xwayland.nix;
|
||||||
}
|
|
||||||
//
|
|
||||||
############################################
|
|
||||||
# deprecated combinators:
|
|
||||||
{
|
|
||||||
persisthome = {
|
|
||||||
deprecated = true;
|
|
||||||
sig = "Permission";
|
|
||||||
doc = "This was reworked to store data under `~/.local/share/jail.nix` and renamed to [persist-home](#persist-home).";
|
|
||||||
impl =
|
|
||||||
with combinators;
|
|
||||||
name:
|
|
||||||
lib.warn
|
|
||||||
"persisthome is deprecated, use persist-home instead. When doing so, rename ~/.local/share/jails/${name} to ${helpers.dataDirSubPath "home/${name}"}"
|
|
||||||
(compose [
|
|
||||||
(add-runtime "mkdir -p ~/.local/share/jails/${lib.escapeShellArg name}")
|
|
||||||
(rw-bind (noescape "~/.local/share/jails/${lib.escapeShellArg name}") (noescape "~"))
|
|
||||||
]);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
dbus-unsafe = {
|
|
||||||
deprecated = true;
|
|
||||||
sig = "Permission";
|
|
||||||
doc = "This was renamed to [unsafe-dbus](#unsafe-dbus).";
|
|
||||||
impl = lib.warn "dbus-unsafe is deprecated, use unsafe-dbus instead" combinators.unsafe-dbus;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
combinators = lib.mapAttrs (_: combinatorObj: combinatorObj.impl) rawCombinators;
|
combinators = lib.mapAttrs (_: combinatorObj: combinatorObj.impl) rawCombinators;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@
|
||||||
|
|
||||||
${hr}
|
${hr}
|
||||||
|
|
||||||
${formatSection (v: !(is "deprecated" v || is "includedInBasePermissions" v || is "internal" v))}
|
${formatSection (v: !(is "includedInBasePermissions" v || is "internal" v))}
|
||||||
|
|
||||||
${hr}
|
${hr}
|
||||||
|
|
||||||
|
|
@ -86,15 +86,6 @@
|
||||||
`basePermissions`](advanced-configuration.md#basepermissions).
|
`basePermissions`](advanced-configuration.md#basepermissions).
|
||||||
|
|
||||||
${formatSection (is "includedInBasePermissions")}
|
${formatSection (is "includedInBasePermissions")}
|
||||||
|
|
||||||
${hr}
|
|
||||||
|
|
||||||
## Deprecated Combinators
|
|
||||||
|
|
||||||
The following combinators have been deprecated, and may be removed in the
|
|
||||||
future.
|
|
||||||
|
|
||||||
${formatSection (is "deprecated")}
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
mkdocsSettings = {
|
mkdocsSettings = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue