diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-06-02 23:10:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-02 23:10:26 +0200 |
| commit | 6f02edec1a24d025b3249803cee6b0ae51c24d5b (patch) | |
| tree | f8498d8fba9cd4eaf7164afe62a723fa8ed740e5 /nixos/modules | |
| parent | fa7656236f424e29caaa18d0be5d6198df4ca1cd (diff) | |
| parent | d11d18df304bb7c51aba7e889621c7685daca4e8 (diff) | |
Merge pull request #316358 from majewsky/portunus-remove-libxcrypt-legacy
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/misc/portunus.nix | 5 |
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."; }; |