From 58c32bcc0a085a245203dc30f3330c3e1dfb335a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 20 Dec 2015 21:07:37 +0100
Subject: cac: 1.0."0" -> 1.0.2

---
 krebs/5pkgs/cac/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/cac/default.nix b/krebs/5pkgs/cac/default.nix
index 40dd56412..5e48cce74 100644
--- a/krebs/5pkgs/cac/default.nix
+++ b/krebs/5pkgs/cac/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, coreutils, curl, gnused, inotifyTools, jq, ncurses, sshpass, ... }:
 
 stdenv.mkDerivation {
-  name = "cac-1.0.0";
+  name = "cac-1.0.2";
 
   src = fetchgit {
-    url = http://cgit.gum/cac;
-    rev = "fe3b2ecb0aaf7d863842b896e18cd2b829f2297b";
-    sha256 = "05bnd7wyjhqy8srmpnc8d234rv3jxdjgb4z0hlfb9kg7mb12w1ya";
+    url = http://cgit.cd.retiolum/cac;
+    rev = "3d6aef3631aa2e0becba447ed9c36a268dcf8bb5";
+    sha256 = "4f584ef8d53a003818ec6608d2cccda42fc7806cd6f9fa9ad179346f3f59744c";
   };
 
   phases = [
@@ -29,10 +29,7 @@ stdenv.mkDerivation {
     ''
       mkdir -p $out/bin
 
-      sed \
-        's,^\(  true) \)\(cac "$@";;\)$,\1 PATH=${path}${PATH+:$PATH} \2,' \
-        < ./cac \
-        > $out/bin/cac
+      sed 's;^_main .*;PATH=${path} &;' < ./cac > $out/bin/cac
 
       chmod +x $out/bin/cac
     '';
-- 
cgit v1.2.3


From 9d88191a70e0b8b4c050329a58a0922c8d075822 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 20 Dec 2015 21:13:54 +0100
Subject: cac: 1.0.2 -> 1.0.3

---
 krebs/5pkgs/cac/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/cac/default.nix b/krebs/5pkgs/cac/default.nix
index 5e48cce74..4d39ce2fb 100644
--- a/krebs/5pkgs/cac/default.nix
+++ b/krebs/5pkgs/cac/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchgit, coreutils, curl, gnused, inotifyTools, jq, ncurses, sshpass, ... }:
+{ stdenv, fetchgit, bc, coreutils, curl, gnused, inotifyTools, jq, ncurses, sshpass, ... }:
 
 stdenv.mkDerivation {
-  name = "cac-1.0.2";
+  name = "cac-1.0.3";
 
   src = fetchgit {
     url = http://cgit.cd.retiolum/cac;
-    rev = "3d6aef3631aa2e0becba447ed9c36a268dcf8bb5";
-    sha256 = "4f584ef8d53a003818ec6608d2cccda42fc7806cd6f9fa9ad179346f3f59744c";
+    rev = "22acc1b990ac7d97c16344fbcbc2621e24cdf915";
+    sha256 = "135b740617c983b3f46a1983d4744be17340d5146a0a0de0dff4bb7a53688f2f";
   };
 
   phases = [
@@ -17,6 +17,7 @@ stdenv.mkDerivation {
   installPhase =
     let
       path = stdenv.lib.makeSearchPath "bin" [
+        bc
         coreutils
         curl
         gnused
@@ -29,7 +30,9 @@ stdenv.mkDerivation {
     ''
       mkdir -p $out/bin
 
-      sed 's;^_main .*;PATH=${path} &;' < ./cac > $out/bin/cac
+      sed < ./cac > $out/bin/cac '
+        s;^_cac_main .*;PATH=${path}''${PATH+:$PATH} &;
+      '
 
       chmod +x $out/bin/cac
     '';
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/a1000000.lock: No such file or directory (2)