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 --- tools/hash-password.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/hash-password.nix b/tools/hash-password.nix index fcf8abda78..9893d52178 100644 --- a/tools/hash-password.nix +++ b/tools/hash-password.nix @@ -1,7 +1,7 @@ # Utility for invoking slappasswd with the correct options for # creating an ARGON2 password hash. -{ depot, pkgs, ... }: +{ pkgs, ... }: pkgs.writeShellScriptBin "hash-password" '' - ${depot.third_party.openldap}/bin/slappasswd -o module-load=pw-argon2 -h '{ARGON2}' + ${pkgs.openldap}/bin/slappasswd -o module-load=pw-argon2 -h '{ARGON2}' '' -- cgit 1.4.1