From e3b72bb66e7c6bf410c8db81ff04e355a7b22116 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 24 Jul 2015 12:03:51 +0200
Subject: 3: {tv -> krebs}.github-hosts-sync

---
 Zpkgs/krebs/default.nix            | 11 +++++++++++
 Zpkgs/krebs/github-hosts-sync.nix  | 40 ++++++++++++++++++++++++++++++++++++++
 Zpkgs/krebs/github-known_hosts.nix | 13 +++++++++++++
 Zpkgs/tv/default.nix               |  2 --
 Zpkgs/tv/github-hosts-sync.nix     | 40 --------------------------------------
 Zpkgs/tv/github-known_hosts.nix    | 13 -------------
 6 files changed, 64 insertions(+), 55 deletions(-)
 create mode 100644 Zpkgs/krebs/default.nix
 create mode 100644 Zpkgs/krebs/github-hosts-sync.nix
 create mode 100644 Zpkgs/krebs/github-known_hosts.nix
 delete mode 100644 Zpkgs/tv/github-hosts-sync.nix
 delete mode 100644 Zpkgs/tv/github-known_hosts.nix

(limited to 'Zpkgs')

diff --git a/Zpkgs/krebs/default.nix b/Zpkgs/krebs/default.nix
new file mode 100644
index 000000000..be8f72011
--- /dev/null
+++ b/Zpkgs/krebs/default.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+let
+  inherit (pkgs) callPackage;
+in
+
+pkgs //
+{
+  github-hosts-sync = callPackage ./github-hosts-sync.nix {};
+  github-known_hosts = callPackage ./github-known_hosts.nix {};
+}
diff --git a/Zpkgs/krebs/github-hosts-sync.nix b/Zpkgs/krebs/github-hosts-sync.nix
new file mode 100644
index 000000000..d69b2b12b
--- /dev/null
+++ b/Zpkgs/krebs/github-hosts-sync.nix
@@ -0,0 +1,40 @@
+{ 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/krebs/github-known_hosts.nix b/Zpkgs/krebs/github-known_hosts.nix
new file mode 100644
index 000000000..302fdd8d5
--- /dev/null
+++ b/Zpkgs/krebs/github-known_hosts.nix
@@ -0,0 +1,13 @@
+{ 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))
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