From 49aa817e4f7f4839545ff8bc482b226820b3d8e3 Mon Sep 17 00:00:00 2001 From: Alex David Date: Thu, 2 Apr 2026 12:18:47 -0700 Subject: [PATCH] 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. --- lib/combinators.nix | 26 -------------------------- website/flake.nix | 11 +---------- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/lib/combinators.nix b/lib/combinators.nix index 90e1673..3b00c24 100644 --- a/lib/combinators.nix +++ b/lib/combinators.nix @@ -74,33 +74,7 @@ let wrap-entry = ./combinators/wrap-entry.nix; write-text = ./combinators/write-text.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; in { diff --git a/website/flake.nix b/website/flake.nix index 7709709..e518d10 100644 --- a/website/flake.nix +++ b/website/flake.nix @@ -75,7 +75,7 @@ ${hr} - ${formatSection (v: !(is "deprecated" v || is "includedInBasePermissions" v || is "internal" v))} + ${formatSection (v: !(is "includedInBasePermissions" v || is "internal" v))} ${hr} @@ -86,15 +86,6 @@ `basePermissions`](advanced-configuration.md#basepermissions). ${formatSection (is "includedInBasePermissions")} - - ${hr} - - ## Deprecated Combinators - - The following combinators have been deprecated, and may be removed in the - future. - - ${formatSection (is "deprecated")} ''; mkdocsSettings = {