diff options
| author | lassulus <lass@aidsballs.de> | 2015-08-30 10:45:40 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-08-30 10:45:40 +0200 |
| commit | 954f122d383ad18c68fcfb9497727bec9746166d (patch) | |
| tree | 941655e7308d476f7e9cb34ad0a896c8dc6fe011 | |
| parent | 814d6852916ae99d95a4a440f5a2592017c9445b (diff) | |
| parent | 0714ed3ea6c889c0576edd8075dc7c2b50d3e8b5 (diff) | |
Merge branch 'tv'
| -rw-r--r-- | krebs/5pkgs/default.nix | 1 | ||||
| -rw-r--r-- | krebs/5pkgs/nq.nix | 16 | ||||
| -rw-r--r-- | tv/1systems/wu.nix | 1 | ||||
| -rw-r--r-- | tv/2configs/charybdis.nix | 1 |
4 files changed, 19 insertions, 0 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 062f0a515..2454c19c8 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -12,6 +12,7 @@ pkgs // github-hosts-sync = callPackage ./github-hosts-sync.nix {}; github-known_hosts = callPackage ./github-known_hosts.nix {}; hashPassword = callPackage ./hashPassword.nix {}; + nq = callPackage ./nq.nix {}; posix-array = callPackage ./posix-array.nix {}; youtube-tools = callPackage ./youtube-tools.nix {}; } diff --git a/krebs/5pkgs/nq.nix b/krebs/5pkgs/nq.nix new file mode 100644 index 000000000..0f397a43c --- /dev/null +++ b/krebs/5pkgs/nq.nix @@ -0,0 +1,16 @@ +{ fetchgit, stdenv }: + +stdenv.mkDerivation rec { + name = "nq-${rev}"; + rev = "0eae839cb1"; + + src = fetchgit { + url = https://github.com/chneukirchen/nq; + inherit rev; + sha256 = "1150274750cde934932d65bd6053d7a0ba2404a59eadfb87fc6bd8a4fb70febb"; + }; + + configurePhase = '' + sed -i "s:^PREFIX=.*:PREFIX=$out:" Makefile + ''; +} diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 2233b48d1..e48da90ad 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -92,6 +92,7 @@ in tmux tvpkgs.cac tvpkgs.dic + tvpkgs.nq zathura #ack diff --git a/tv/2configs/charybdis.nix b/tv/2configs/charybdis.nix index bf45bf294..a2952219d 100644 --- a/tv/2configs/charybdis.nix +++ b/tv/2configs/charybdis.nix @@ -590,6 +590,7 @@ let throttle_count = 4; max_ratelimit_tokens = 30; away_interval = 30; + disable_auth = yes; }; modules { |