Merge remote-tracking branch 'cd/master' into before-merge

3 files changed, 41 insertions, 3 deletions

diff --git a/krebs/5pkgs/cac/default.nix b/krebs/5pkgs/cac/default.nix
index 838eddd2f..e29f091e4 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";
+  name = "cac-1.0.0";
 
   src = fetchgit {
     url = http://cgit.cd.retiolum/cac;
-    rev = "f4589158572ab35969b9bccf801ea07e115705e1";
-    sha256 = "9d761cd1d7ff68507392cbfd6c3f6000ddff9cc540293da2b3c4ee902321fb27";
+    rev = "14de1d3c78385e3f8b6d694f5d799eb1b613159e";
+    sha256 = "9b2a3d47345d6f8f27d9764c4f2f2acff17d3dde145dd0e674e4183e9312fec3";
   };
 
   phases = [
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 39d3d69ce..52b5dc78c 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -11,6 +11,7 @@ rec {
   charybdis = callPackage ./charybdis {};
   dic = callPackage ./dic {};
   genid = callPackage ./genid {};
+  get = callPackage ./get {};
   github-hosts-sync = callPackage ./github-hosts-sync {};
   github-known_hosts = callPackage ./github-known_hosts {};
   hashPassword = callPackage ./hashPassword {};
diff --git a/krebs/5pkgs/get/default.nix b/krebs/5pkgs/get/default.nix
new file mode 100644
index 000000000..e2591db73
--- /dev/null
+++ b/krebs/5pkgs/get/default.nix
@@ -0,0 +1,37 @@
+{ coreutils, gnugrep, gnused, fetchgit, jq, nix, stdenv, ... }:
+
+stdenv.mkDerivation {
+  name = "get-1.1.1";
+
+  src = fetchgit {
+    url = http://cgit.cd.retiolum/get;
+    rev = "e64826a4f5f74cbaa895e538b97d0e523e9709f9";
+    sha256 = "4d1aa07bba52f697cf7aa7ad1b02b9ff41598dfea83c578e77b8d81e3e8830d2";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase =
+    let
+      path = stdenv.lib.makeSearchPath "bin" [
+        coreutils
+        gnugrep
+        gnused
+        jq
+        nix
+      ];
+    in
+    ''
+      mkdir -p $out/bin
+
+      sed \
+        '1s,.*,&\nPATH=${path},' \
+        < ./get \
+        > $out/bin/get
+
+      chmod +x $out/bin/get
+    '';
+}