From 4630d10b3151f689247c0e8e7488917ee6313c7f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 17 May 2019 12:50:48 +0200
Subject: github-hosts-sync: import 1.0.0 from painload

---
 krebs/5pkgs/simple/github-hosts-sync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs/simple/github-hosts-sync/default.nix')

diff --git a/krebs/5pkgs/simple/github-hosts-sync/default.nix b/krebs/5pkgs/simple/github-hosts-sync/default.nix
index cdfed468..8caa5e1e 100644
--- a/krebs/5pkgs/simple/github-hosts-sync/default.nix
+++ b/krebs/5pkgs/simple/github-hosts-sync/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "github-hosts-sync";
 
-  src = pkgs.painload;
+  src = ./src;
 
   phases = [
     "unpackPhase"
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
       sed \
         's,^main() {$,&\n  export PATH=${path} GIT_SSL_CAINFO=${ca-bundle},' \
-        < ./retiolum/scripts/github_hosts_sync/hosts-sync \
+        < hosts-sync \
         > $out/bin/github-hosts-sync
 
       chmod +x $out/bin/github-hosts-sync
-- 
cgit v1.2.3


From acb3f95fa6586a9c9b1b1ffa76368c1b39edb8aa Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 17 May 2019 13:06:36 +0200
Subject: github-hosts-sync: 1.0.0 -> 2.0.0

---
 krebs/5pkgs/simple/github-hosts-sync/default.nix | 36 ++++++++++--------------
 1 file changed, 15 insertions(+), 21 deletions(-)

(limited to 'krebs/5pkgs/simple/github-hosts-sync/default.nix')

diff --git a/krebs/5pkgs/simple/github-hosts-sync/default.nix b/krebs/5pkgs/simple/github-hosts-sync/default.nix
index 8caa5e1e..5caf225c 100644
--- a/krebs/5pkgs/simple/github-hosts-sync/default.nix
+++ b/krebs/5pkgs/simple/github-hosts-sync/default.nix
@@ -1,7 +1,8 @@
 { pkgs, stdenv, ... }:
 
-stdenv.mkDerivation {
-  name = "github-hosts-sync";
+stdenv.mkDerivation rec {
+  name = "github-hosts-sync-${version}";
+  version = "2.0.0";
 
   src = ./src;
 
@@ -10,28 +11,21 @@ stdenv.mkDerivation {
     "installPhase"
   ];
 
-  installPhase =
-    let
-      ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-      path = stdenv.lib.makeBinPath (with pkgs; [
-        coreutils
-        findutils
-        git
-        gnugrep
-        gnused
-        nettools
-        openssh
-        socat
-      ]);
-    in
+  installPhase = let
+    ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+    path = stdenv.lib.makeBinPath [
+      pkgs.git
+      pkgs.openssh
+      pkgs.rsync
+    ];
+  in
     ''
       mkdir -p $out/bin
 
-      sed \
-        's,^main() {$,&\n  export PATH=${path} GIT_SSL_CAINFO=${ca-bundle},' \
-        < hosts-sync \
-        > $out/bin/github-hosts-sync
+      cp hosts-sync $out/bin/github-hosts-sync
 
-      chmod +x $out/bin/github-hosts-sync
+      sed -i \
+        '1s,$,\nPATH=${path}''${PATH+:$PATH} GIT_SSL_CAINFO=${ca-bundle},' \
+        $out/bin/github-hosts-sync
     '';
 }
-- 
cgit v1.2.3


From 2950b893b03253ef8000e939915bb9c8c1f1f524 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 17 May 2019 13:53:55 +0200
Subject: github-hosts-sync: add nettools

---
 krebs/5pkgs/simple/github-hosts-sync/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs/5pkgs/simple/github-hosts-sync/default.nix')

diff --git a/krebs/5pkgs/simple/github-hosts-sync/default.nix b/krebs/5pkgs/simple/github-hosts-sync/default.nix
index 5caf225c..fbc48fa3 100644
--- a/krebs/5pkgs/simple/github-hosts-sync/default.nix
+++ b/krebs/5pkgs/simple/github-hosts-sync/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
     ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
     path = stdenv.lib.makeBinPath [
       pkgs.git
+      pkgs.nettools
       pkgs.openssh
       pkgs.rsync
     ];
-- 
cgit v1.2.3