Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cd/master'

Browse Source
This commit is contained in:
makefu 2015-12-22 16:44:38 +01:00
commit 8d82f52c8a
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
krebs/5pkgs/cac/default.nix
View File

@ -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 { stdenv.mkDerivation {
name = "cac-1.0.0"; name = "cac-1.0.3";
src = fetchgit { src = fetchgit {
url = http://cgit.gum/cac; url = http://cgit.cd.retiolum/cac;
rev = "fe3b2ecb0aaf7d863842b896e18cd2b829f2297b"; rev = "22acc1b990ac7d97c16344fbcbc2621e24cdf915";
sha256 = "05bnd7wyjhqy8srmpnc8d234rv3jxdjgb4z0hlfb9kg7mb12w1ya"; sha256 = "135b740617c983b3f46a1983d4744be17340d5146a0a0de0dff4bb7a53688f2f";
}; };
phases = [ phases = [
@ -17,6 +17,7 @@ stdenv.mkDerivation {
installPhase = installPhase =
let let
path = stdenv.lib.makeSearchPath "bin" [ path = stdenv.lib.makeSearchPath "bin" [
bc
coreutils coreutils
curl curl
gnused gnused
@ -29,10 +30,9 @@ stdenv.mkDerivation {
'' ''
mkdir -p $out/bin mkdir -p $out/bin
sed \ sed < ./cac > $out/bin/cac '
's,^\( true) \)\(cac "$@";;\)$,\1 PATH=${path}${PATH+:$PATH} \2,' \ s;^_cac_main .*;PATH=${path}''${PATH+:$PATH} &;
< ./cac \ '
> $out/bin/cac
chmod +x $out/bin/cac chmod +x $out/bin/cac
''; '';

3
tv/2configs/git.nix
View File

@ -33,6 +33,9 @@ let
nixpkgs = {}; nixpkgs = {};
push = {}; push = {};
regfish = {}; regfish = {};
soundcloud = {
desc = "SoundCloud command line interface";
};
stockholm = { stockholm = {
desc = "take all the computers hostage, they'll love you!"; desc = "take all the computers hostage, they'll love you!";
}; };