From 65be8f20e0508cb8f81a7b42a240ebb8a03d8a93 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 13 Apr 2021 12:21:42 +0200 Subject: chore(nixpkgs): Bump channels to 2021-05-25 * 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 Reviewed-by: grfn --- third_party/openldap/default.nix | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 third_party/openldap/default.nix (limited to 'third_party/openldap/default.nix') diff --git a/third_party/openldap/default.nix b/third_party/openldap/default.nix deleted file mode 100644 index aed051c4e067..000000000000 --- a/third_party/openldap/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -# OpenLDAP by default uses a simple shalted SHA1-hash for passwords, -# which is less than ideal. -# -# It does however include a contrib module which adds support for the -# Argon2 password hashing scheme. This overrides then OpenLDAP build -# derivation to include this module. -{ pkgs, ... }: - -pkgs.openldap.overrideAttrs(old: { - buildInputs = old.buildInputs ++ [ pkgs.libsodium ]; - - postBuild = '' - ${old.postBuild} - make $makeFlags -C contrib/slapd-modules/passwd/argon2 - ''; - - # This is required because the Makefile for this module hardcodes - # /usr/bin/install, which is not a valid path - we want it to be - # looked up from $PATH because it is included in stdenv. - installFlags = old.installFlags ++ [ "INSTALL=install" ]; - - postInstall = '' - ${old.postInstall} - make $installFlags install-lib -C contrib/slapd-modules/passwd/argon2 - ''; - -}) -- cgit 1.4.1