diff options
| author | makefu <github@syntax-fehler.de> | 2015-12-22 16:44:38 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-12-22 16:44:38 +0100 |
| commit | 8d82f52c8a5f9e3adf0e15a5bbb62e538657e718 (patch) | |
| tree | f7685018f4fa554ddbced5ab9f145a7d1bec7f2e | |
| parent | 9ec4c5df3d132db078e89cb577860b6ec416be04 (diff) | |
| parent | 9d88191a70e0b8b4c050329a58a0922c8d075822 (diff) | |
Merge remote-tracking branch 'cd/master'
| -rw-r--r-- | krebs/5pkgs/cac/default.nix | 18 | ||||
| -rw-r--r-- | tv/2configs/git.nix | 3 |
2 files changed, 12 insertions, 9 deletions
diff --git a/krebs/5pkgs/cac/default.nix b/krebs/5pkgs/cac/default.nix index 40dd56412..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.0"; + name = "cac-1.0.3"; src = fetchgit { - url = http://cgit.gum/cac; - rev = "fe3b2ecb0aaf7d863842b896e18cd2b829f2297b"; - sha256 = "05bnd7wyjhqy8srmpnc8d234rv3jxdjgb4z0hlfb9kg7mb12w1ya"; + url = http://cgit.cd.retiolum/cac; + rev = "22acc1b990ac7d97c16344fbcbc2621e24cdf915"; + sha256 = "135b740617c983b3f46a1983d4744be17340d5146a0a0de0dff4bb7a53688f2f"; }; phases = [ @@ -17,6 +17,7 @@ stdenv.mkDerivation { installPhase = let path = stdenv.lib.makeSearchPath "bin" [ + bc coreutils curl gnused @@ -29,10 +30,9 @@ stdenv.mkDerivation { '' mkdir -p $out/bin - sed \ - 's,^\( true) \)\(cac "$@";;\)$,\1 PATH=${path}${PATH+:$PATH} \2,' \ - < ./cac \ - > $out/bin/cac + sed < ./cac > $out/bin/cac ' + s;^_cac_main .*;PATH=${path}''${PATH+:$PATH} &; + ' chmod +x $out/bin/cac ''; diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 4387be36a..800deff1b 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -33,6 +33,9 @@ let nixpkgs = {}; push = {}; regfish = {}; + soundcloud = { + desc = "SoundCloud command line interface"; + }; stockholm = { desc = "take all the computers hostage, they'll love you!"; }; |