From 71b8b0c3c576c383ee3ca884258cf878f8390ee1 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 23:16:48 +0200 Subject: Zpkgs krebs: add hashPassword --- Zpkgs/krebs/default.nix | 1 + Zpkgs/krebs/hashPassword.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 Zpkgs/krebs/hashPassword.nix diff --git a/Zpkgs/krebs/default.nix b/Zpkgs/krebs/default.nix index be8f720..8838904 100644 --- a/Zpkgs/krebs/default.nix +++ b/Zpkgs/krebs/default.nix @@ -8,4 +8,5 @@ pkgs // { github-hosts-sync = callPackage ./github-hosts-sync.nix {}; github-known_hosts = callPackage ./github-known_hosts.nix {}; + hashPassword = callPackage ./hashPassword.nix {}; } diff --git a/Zpkgs/krebs/hashPassword.nix b/Zpkgs/krebs/hashPassword.nix new file mode 100644 index 0000000..a10340c --- /dev/null +++ b/Zpkgs/krebs/hashPassword.nix @@ -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" +'' -- cgit v1.2.3 From 5dbfb4277c61d0339f688797ca4655056d58ee22 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 23:18:12 +0200 Subject: 1 tv wu: systemPackages += hashPassword --- 1systems/tv/wu.nix | 1 + Zpkgs/tv/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix index 4a74d55..5ca64ce 100644 --- a/1systems/tv/wu.nix +++ b/1systems/tv/wu.nix @@ -28,6 +28,7 @@ in gnumake parallel Zpkgs.genid + Zpkgs.hashPassword Zpkgs.lentil # root diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix index e3e12bd..bad7e9d 100644 --- a/Zpkgs/tv/default.nix +++ b/Zpkgs/tv/default.nix @@ -2,10 +2,10 @@ let inherit (pkgs) callPackage; + krebs = import ../../Zpkgs/krebs { inherit pkgs; }; in -pkgs // -{ +krebs // { charybdis = callPackage ./charybdis {}; dic = callPackage ./dic.nix {}; genid = callPackage ./genid.nix {}; -- cgit v1.2.3 From 9e91101fa5d3ab57fc1ce69127a9ccbdf125899e Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 23:19:49 +0200 Subject: Zpkgs {tv -> krebs} genid --- Zpkgs/krebs/default.nix | 1 + Zpkgs/krebs/genid.nix | 22 ++++++++++++++++++++++ Zpkgs/tv/default.nix | 1 - Zpkgs/tv/genid.nix | 22 ---------------------- 4 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 Zpkgs/krebs/genid.nix delete mode 100644 Zpkgs/tv/genid.nix diff --git a/Zpkgs/krebs/default.nix b/Zpkgs/krebs/default.nix index 8838904..e07b96b 100644 --- a/Zpkgs/krebs/default.nix +++ b/Zpkgs/krebs/default.nix @@ -6,6 +6,7 @@ in pkgs // { + genid = callPackage ./genid.nix {}; github-hosts-sync = callPackage ./github-hosts-sync.nix {}; github-known_hosts = callPackage ./github-known_hosts.nix {}; hashPassword = callPackage ./hashPassword.nix {}; diff --git a/Zpkgs/krebs/genid.nix b/Zpkgs/krebs/genid.nix new file mode 100644 index 0000000..c75bec3 --- /dev/null +++ b/Zpkgs/krebs/genid.nix @@ -0,0 +1,22 @@ +{ lib, pkgs, ... }: + +pkgs.writeScriptBin "genid" '' + #! /bin/sh + # usage: genid NAME + set -euf + + export PATH=${lib.makeSearchPath "bin" (with pkgs; [ + bc + coreutils + ])} + + name=$1 + hash=$(printf %s "$name" | sha1sum | cut -d\ -f1 | tr a-f A-F) + echo " + min=2^24 # bigger than nobody and nogroup, see + # and some spare for stuff like lxd. + max=2^32 # see 2^(8*sizeof(uid_t)) + ibase=16 + ($hash + min) % max + " | bc +'' diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix index bad7e9d..a8ca2b2 100644 --- a/Zpkgs/tv/default.nix +++ b/Zpkgs/tv/default.nix @@ -8,7 +8,6 @@ in krebs // { charybdis = callPackage ./charybdis {}; dic = callPackage ./dic.nix {}; - genid = callPackage ./genid.nix {}; lentil = callPackage ./lentil {}; much = callPackage ./much.nix {}; viljetic-pages = callPackage ./viljetic-pages {}; diff --git a/Zpkgs/tv/genid.nix b/Zpkgs/tv/genid.nix deleted file mode 100644 index c75bec3..0000000 --- a/Zpkgs/tv/genid.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, pkgs, ... }: - -pkgs.writeScriptBin "genid" '' - #! /bin/sh - # usage: genid NAME - set -euf - - export PATH=${lib.makeSearchPath "bin" (with pkgs; [ - bc - coreutils - ])} - - name=$1 - hash=$(printf %s "$name" | sha1sum | cut -d\ -f1 | tr a-f A-F) - echo " - min=2^24 # bigger than nobody and nogroup, see - # and some spare for stuff like lxd. - max=2^32 # see 2^(8*sizeof(uid_t)) - ibase=16 - ($hash + min) % max - " | bc -'' -- cgit v1.2.3 From 3453edadf2ac2fb76e9e690655dd9f4981e7e9c1 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 23:24:46 +0200 Subject: Zpkgs {tv -> krebs} dic --- Zpkgs/krebs/default.nix | 1 + Zpkgs/krebs/dic.nix | 36 ++++++++++++++++++++++++++++++++++++ Zpkgs/tv/default.nix | 1 - Zpkgs/tv/dic.nix | 36 ------------------------------------ 4 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 Zpkgs/krebs/dic.nix delete mode 100644 Zpkgs/tv/dic.nix diff --git a/Zpkgs/krebs/default.nix b/Zpkgs/krebs/default.nix index e07b96b..231fda7 100644 --- a/Zpkgs/krebs/default.nix +++ b/Zpkgs/krebs/default.nix @@ -6,6 +6,7 @@ in pkgs // { + dic = callPackage ./dic.nix {}; genid = callPackage ./genid.nix {}; github-hosts-sync = callPackage ./github-hosts-sync.nix {}; github-known_hosts = callPackage ./github-known_hosts.nix {}; diff --git a/Zpkgs/krebs/dic.nix b/Zpkgs/krebs/dic.nix new file mode 100644 index 0000000..571773d --- /dev/null +++ b/Zpkgs/krebs/dic.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, coreutils, curl, gnused, gnugrep, ... }: + +stdenv.mkDerivation { + name = "dic"; + + src = fetchgit { + url = https://github.com/krebscode/painload; + rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3"; + sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35"; + }; + + phases = [ + "unpackPhase" + "installPhase" + ]; + + installPhase = + let + path = stdenv.lib.makeSearchPath "bin" [ + coreutils + curl + gnused + gnugrep + ]; + in + '' + mkdir -p $out/bin + + sed \ + 's,^main() {$,&\n PATH=${path}; export PATH,' \ + < ./util/bin/dic \ + > $out/bin/dic + + chmod +x $out/bin/dic + ''; +} diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix index a8ca2b2..50625f8 100644 --- a/Zpkgs/tv/default.nix +++ b/Zpkgs/tv/default.nix @@ -7,7 +7,6 @@ in krebs // { charybdis = callPackage ./charybdis {}; - dic = callPackage ./dic.nix {}; lentil = callPackage ./lentil {}; much = callPackage ./much.nix {}; viljetic-pages = callPackage ./viljetic-pages {}; diff --git a/Zpkgs/tv/dic.nix b/Zpkgs/tv/dic.nix deleted file mode 100644 index 571773d..0000000 --- a/Zpkgs/tv/dic.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchgit, coreutils, curl, gnused, gnugrep, ... }: - -stdenv.mkDerivation { - name = "dic"; - - src = fetchgit { - url = https://github.com/krebscode/painload; - rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3"; - sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35"; - }; - - phases = [ - "unpackPhase" - "installPhase" - ]; - - installPhase = - let - path = stdenv.lib.makeSearchPath "bin" [ - coreutils - curl - gnused - gnugrep - ]; - in - '' - mkdir -p $out/bin - - sed \ - 's,^main() {$,&\n PATH=${path}; export PATH,' \ - < ./util/bin/dic \ - > $out/bin/dic - - chmod +x $out/bin/dic - ''; -} -- cgit v1.2.3