about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorStefan Majewsky <majewsky@gmx.net>2024-06-01 10:28:21 +0200
committerStefan Majewsky <majewsky@gmx.net>2024-06-01 10:28:21 +0200
commitd11d18df304bb7c51aba7e889621c7685daca4e8 (patch)
tree534b73d7abeaf11150dd21c4fe3ec056d8919531 /nixos/modules
parentfc2390fa15d6d0b28a30571fedf1b9cad65a03fb (diff)
portunus: remove libxcrypt-legacy usage
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/misc/portunus.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix
index 335806b261a23..c7abb2cfa2a3e 100644
--- a/nixos/modules/services/misc/portunus.nix
+++ b/nixos/modules/services/misc/portunus.nix
@@ -115,10 +115,7 @@ in
     ldap = {
       package = mkOption {
         type = types.package;
-        # needs openldap built with a libxcrypt that support crypt sha256 until users have had time to migrate to newer hashes
-        # Ref: <https://github.com/majewsky/portunus/issues/2>
-        # TODO: remove in NixOS 24.11 (cf. same note on pkgs/servers/portunus/default.nix)
-        default = pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; };
+        default = pkgs.openldap;
         defaultText = lib.literalExpression "pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; }";
         description = "The OpenLDAP package to use.";
       };