diff options
| author | makefu <github@syntax-fehler.de> | 2017-05-09 23:17:30 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-05-09 23:17:30 +0200 |
| commit | fb1fff243a100757391552f7caa691bd9fe36097 (patch) | |
| tree | 48d87558a609b9f45d43a37aa27bb04293b32689 /tv | |
| parent | 991687f7428440356403b6c63d695397b33078a6 (diff) | |
| parent | 689399546d38b6dc5a643cc2efad9c1d0ae76058 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/2configs/git.nix | 4 | ||||
| -rw-r--r-- | tv/5pkgs/netcup/default.nix | 32 |
2 files changed, 2 insertions, 34 deletions
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index d45321cd8..293a00e78 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -36,8 +36,8 @@ let { htgen = { cgit.desc = "toy HTTP server"; }; - irc = { - cgit.desc = "toy IRC client"; + kirk = { + cgit.desc = "IRC tools"; }; load-env = {}; loldns = { diff --git a/tv/5pkgs/netcup/default.nix b/tv/5pkgs/netcup/default.nix deleted file mode 100644 index d1f46299d..000000000 --- a/tv/5pkgs/netcup/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ coreutils, curl, fetchgit, gawk, gnugrep, gnused, jq, stdenv, w3m, ... }: -with import <stockholm/lib>; -let - readJSON = path: fromJSON (readFile path); - sed.escape = replaceChars ["/"] ["\\/"]; # close enough - PATH = makeBinPath [ - coreutils - curl - gawk - gnugrep - gnused - jq - w3m - ]; -in -stdenv.mkDerivation { - name = "netcup-1.0.0"; - src = fetchgit { - url = "http://cgit.ni.krebsco.de/netcup"; - rev = "refs/tags/v1.0.0"; - sha256 = "1rn7bncfhjw0bqjbvj38m7lks4nyf5qcvkj9dg0zr99ba6dylzx5"; - }; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - patchPhase = '' - path=${shell.escape (sed.escape PATH)} - sed -i "1s/.*/&\nPATH=$path/" vcp - ''; - installPhase = '' - mkdir -p $out/bin - cp vcp $out/bin - ''; -} |