Merge remote-tracking branch 'cd/master'
This commit is contained in:
commit
f338d3d4d1
@ -28,6 +28,7 @@ in
|
|||||||
gnumake
|
gnumake
|
||||||
parallel
|
parallel
|
||||||
Zpkgs.genid
|
Zpkgs.genid
|
||||||
|
Zpkgs.hashPassword
|
||||||
Zpkgs.lentil
|
Zpkgs.lentil
|
||||||
|
|
||||||
# root
|
# root
|
||||||
|
@ -6,6 +6,9 @@ in
|
|||||||
|
|
||||||
pkgs //
|
pkgs //
|
||||||
{
|
{
|
||||||
|
dic = callPackage ./dic.nix {};
|
||||||
|
genid = callPackage ./genid.nix {};
|
||||||
github-hosts-sync = callPackage ./github-hosts-sync.nix {};
|
github-hosts-sync = callPackage ./github-hosts-sync.nix {};
|
||||||
github-known_hosts = callPackage ./github-known_hosts.nix {};
|
github-known_hosts = callPackage ./github-known_hosts.nix {};
|
||||||
|
hashPassword = callPackage ./hashPassword.nix {};
|
||||||
}
|
}
|
||||||
|
16
Zpkgs/krebs/hashPassword.nix
Normal file
16
Zpkgs/krebs/hashPassword.nix
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
|
pkgs.writeScriptBin "hashPassword" ''
|
||||||
|
#! /bin/sh
|
||||||
|
# usage: hashPassword
|
||||||
|
set -euf
|
||||||
|
|
||||||
|
export PATH=${lib.makeSearchPath "bin" (with pkgs; [
|
||||||
|
coreutils
|
||||||
|
mkpasswd
|
||||||
|
openssl
|
||||||
|
])}
|
||||||
|
|
||||||
|
salt=$(openssl rand -base64 16 | tr -d '+=' | head -c 16)
|
||||||
|
exec mkpasswd -m sha-512 -S "$salt"
|
||||||
|
''
|
@ -2,13 +2,11 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
inherit (pkgs) callPackage;
|
inherit (pkgs) callPackage;
|
||||||
|
krebs = import ../../Zpkgs/krebs { inherit pkgs; };
|
||||||
in
|
in
|
||||||
|
|
||||||
pkgs //
|
krebs // {
|
||||||
{
|
|
||||||
charybdis = callPackage ./charybdis {};
|
charybdis = callPackage ./charybdis {};
|
||||||
dic = callPackage ./dic.nix {};
|
|
||||||
genid = callPackage ./genid.nix {};
|
|
||||||
lentil = callPackage ./lentil {};
|
lentil = callPackage ./lentil {};
|
||||||
much = callPackage ./much.nix {};
|
much = callPackage ./much.nix {};
|
||||||
viljetic-pages = callPackage ./viljetic-pages {};
|
viljetic-pages = callPackage ./viljetic-pages {};
|
||||||
|
Loading…
Reference in New Issue
Block a user