diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-04-13T10·21+0200 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-05-25T17·09+0000 |
| commit | 65be8f20e0508cb8f81a7b42a240ebb8a03d8a93 (patch) | |
| tree | da67033efba7be7e25c3ca87eb3cf30bb0695a6e /ops/modules/tvl-slapd | |
| parent | fb36bc321b593d4ab7ecba15d73a6eb959bddecc (diff) | |
chore(nixpkgs): Bump channels to 2021-05-25 r/2630
* users/grfn/system/home/yeren: remove obsolete awscli2 overrides * ops: make new isSystemUser || isNormalUser assertion happy * users/grfn/system/system/mugwump: make buildkite agents system users * users/tazjin/nixos/camden: set isSystemUser = true for git * users/tazjin/emacs: Remove missing & broken packages * third_party/openldap: remove, as the argon2 module is now enabled upstream * third_party/gerrit_plugins: Pinned new unstable hashes * third_party/nix, third_party/grpc: Disabled CI as these are broken * third_party/overlays/emacs: Bumped version to stay in sync with channel * third_party/buzz: Update LIBCLANG_PATH to reference libclang.lib, since libclang's default output no longer contains libclang.so * users/grfn/system/home: Install julia-stable instead of julia (which aliases to julia-lts), as the latter depends on an insecure version of libgit Change-Id: Iff33b0ecb0ef07a82d1de35e23c40d2f4bf0f8ed Reviewed-on: https://cl.tvl.fyi/c/depot/+/3001 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'ops/modules/tvl-slapd')
| -rw-r--r-- | ops/modules/tvl-slapd/default.nix | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/ops/modules/tvl-slapd/default.nix b/ops/modules/tvl-slapd/default.nix index cbfdeff31eb0..dbcf139338ea 100644 --- a/ops/modules/tvl-slapd/default.nix +++ b/ops/modules/tvl-slapd/default.nix @@ -27,17 +27,6 @@ let inherit (depot.ops) users; in { - # Use our patched OpenLDAP derivation which enables stronger password hashing. - # - # Unfortunately the module for OpenLDAP has no package option, so we - # need to override it system-wide. Be aware that this triggers a - # *large* number of rebuilds of packages such as GPG and Python. - nixpkgs.overlays = [ - (_: _: { - inherit (depot.third_party) openldap; - }) - ]; - services.openldap = { enable = true; @@ -58,7 +47,7 @@ in { }; "cn=schema".includes = - map (schema: "${depot.third_party.openldap}/etc/schema/${schema}.ldif") + map (schema: "${pkgs.openldap}/etc/schema/${schema}.ldif") [ "core" "cosine" "inetorgperson" "nis" ]; }; |