5 files changed, 2 insertions, 117 deletions
diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix
index fa9fff84..50625f86 100644
--- a/Zpkgs/tv/default.nix
+++ b/Zpkgs/tv/default.nix
@@ -2,15 +2,11 @@
 
 let
   inherit (pkgs) callPackage;
+  krebs = import ../../Zpkgs/krebs { inherit pkgs; };
 in
 
-pkgs //
-{
+krebs // {
   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/dic.nix b/Zpkgs/tv/dic.nix
deleted file mode 100644
index 571773d2..00000000
--- 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
-    '';
-}
diff --git a/Zpkgs/tv/genid.nix b/Zpkgs/tv/genid.nix
deleted file mode 100644
index c75bec31..00000000
--- 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 <nixos/modules/misc/ids.nix>
-              # 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/github-hosts-sync.nix b/Zpkgs/tv/github-hosts-sync.nix
deleted file mode 100644
index d69b2b12..00000000
--- 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 302fdd8d..00000000
--- 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))