From e3b72bb66e7c6bf410c8db81ff04e355a7b22116 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 12:03:51 +0200 Subject: 3: {tv -> krebs}.github-hosts-sync --- Zpkgs/tv/default.nix | 2 -- Zpkgs/tv/github-hosts-sync.nix | 40 ---------------------------------------- Zpkgs/tv/github-known_hosts.nix | 13 ------------- 3 files changed, 55 deletions(-) delete mode 100644 Zpkgs/tv/github-hosts-sync.nix delete mode 100644 Zpkgs/tv/github-known_hosts.nix (limited to 'Zpkgs/tv') diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix index fa9fff84c..e3e12bd18 100644 --- a/Zpkgs/tv/default.nix +++ b/Zpkgs/tv/default.nix @@ -9,8 +9,6 @@ pkgs // charybdis = callPackage ./charybdis {}; dic = callPackage ./dic.nix {}; genid = callPackage ./genid.nix {}; - github-hosts-sync = callPackage ./github-hosts-sync.nix {}; - github-known_hosts = callPackage ./github-known_hosts.nix {}; lentil = callPackage ./lentil {}; much = callPackage ./much.nix {}; viljetic-pages = callPackage ./viljetic-pages {}; diff --git a/Zpkgs/tv/github-hosts-sync.nix b/Zpkgs/tv/github-hosts-sync.nix deleted file mode 100644 index d69b2b12b..000000000 --- a/Zpkgs/tv/github-hosts-sync.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchgit, pkgs, ... }: - -stdenv.mkDerivation { - name = "github-hosts-sync"; - - src = fetchgit { - url = https://github.com/krebscode/painload; - rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3"; - sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35"; - }; - - phases = [ - "unpackPhase" - "installPhase" - ]; - - installPhase = - let - ca-bundle = "${pkgs.cacert}/etc/ca-bundle.crt"; - path = stdenv.lib.makeSearchPath "bin" (with pkgs; [ - coreutils - findutils - git - gnugrep - gnused - openssh - socat - ]); - in - '' - mkdir -p $out/bin - - sed \ - 's,^main() {$,&\n export PATH=${path} GIT_SSL_CAINFO=${ca-bundle},' \ - < ./retiolum/scripts/github_hosts_sync/hosts-sync \ - > $out/bin/github-hosts-sync - - chmod +x $out/bin/github-hosts-sync - ''; -} diff --git a/Zpkgs/tv/github-known_hosts.nix b/Zpkgs/tv/github-known_hosts.nix deleted file mode 100644 index 302fdd8d5..000000000 --- a/Zpkgs/tv/github-known_hosts.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ lib, ... }: - -with builtins; -with lib; - -let - github-pubkey = removeSuffix "\n" (readFile ../../Zpubkeys/github.ssh.pub); -in - -toFile "github-known_hosts" - (concatMapStrings - (i: "github.com,192.30.252.${toString i} ${github-pubkey}\n") - (range 0 255)) -- cgit v1.2.3 From 103c00849e126aa592af0a7fb47c84312ca50304 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 23:18:12 +0200 Subject: 1 tv wu: systemPackages += hashPassword --- Zpkgs/tv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Zpkgs/tv') diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix index e3e12bd18..bad7e9d23 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 78c12a8adca9f55e8faa5c86f102050c8a557b64 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 23:19:49 +0200 Subject: Zpkgs {tv -> krebs} genid --- Zpkgs/tv/default.nix | 1 - Zpkgs/tv/genid.nix | 22 ---------------------- 2 files changed, 23 deletions(-) delete mode 100644 Zpkgs/tv/genid.nix (limited to 'Zpkgs/tv') diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix index bad7e9d23..a8ca2b2ab 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 c75bec317..000000000 --- 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 99527e88aec089b4fea496248cf03f738bfed257 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 23:24:46 +0200 Subject: Zpkgs {tv -> krebs} dic --- Zpkgs/tv/default.nix | 1 - Zpkgs/tv/dic.nix | 36 ------------------------------------ 2 files changed, 37 deletions(-) delete mode 100644 Zpkgs/tv/dic.nix (limited to 'Zpkgs/tv') diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix index a8ca2b2ab..50625f868 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 571773d22..000000000 --- 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