summaryrefslogtreecommitdiffstats
path: root/Zpkgs/tv
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-07-24 13:28:35 +0200
committermakefu <github@syntax-fehler.de>2015-07-24 13:28:35 +0200
commit2cecdcd6bbf749f4752a949645a9193ab61da9c6 (patch)
tree39ada4548a0aecb8ef85344f2d86bafd7b9bede1 /Zpkgs/tv
parentdfe10c84047ab8e684da8b3567a04fca338036c3 (diff)
parentee52522cc139670c3eeaeeb462dff98ea870d2e4 (diff)
Merge branch 'master' of http://cgit.cd/stockholm
Diffstat (limited to 'Zpkgs/tv')
-rw-r--r--Zpkgs/tv/default.nix2
-rw-r--r--Zpkgs/tv/github-hosts-sync.nix40
-rw-r--r--Zpkgs/tv/github-known_hosts.nix13
3 files changed, 0 insertions, 55 deletions
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))