summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
Diffstat (limited to 'krebs')
-rw-r--r--krebs/2configs/news.nix4
-rw-r--r--krebs/3modules/makefu/default.nix9
-rw-r--r--krebs/5pkgs/haskell/brockman.nix20
-rw-r--r--krebs/nixpkgs.json8
4 files changed, 25 insertions, 16 deletions
diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix
index 3bf991433..7f4020ca2 100644
--- a/krebs/2configs/news.nix
+++ b/krebs/2configs/news.nix
@@ -42,7 +42,7 @@
krebs.reaktor2.news = {
hostname = "localhost";
port = "6667";
- nick = "brockman-helper";
+ nick = "candyman";
plugins = [
{
plugin = "register";
@@ -71,7 +71,7 @@
exit 1
fi
reddit_channel=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
- echo "brockman: add r_$reddit_channel http://rss.r/?action=display&bridge=Telegram&username=$reddit_channel&format=Mrss"
+ echo "brockman: add r_$reddit_channel http://rss.r/?action=display&bridge=Reddit&context=single&r=$reddit_channel&format=Atom"
'';
add-telegram.filename = pkgs.writeDash "add-telegram" ''
set -euf
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 2cb70eec4..c8e1e0386 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -197,6 +197,15 @@ in {
wg.euer IN A ${nets.internet.ip4.addr}
wiki.euer IN A ${nets.internet.ip4.addr}
wikisearch IN A ${nets.internet.ip4.addr}
+
+ meet.euer IN A ${nets.internet.ip4.addr}
+ work.euer IN A ${nets.internet.ip4.addr}
+ admin.work.euer IN A ${nets.internet.ip4.addr}
+ push.work.euer IN A ${nets.internet.ip4.addr}
+ api.work.euer IN A ${nets.internet.ip4.addr}
+ maps.work.euer IN A ${nets.internet.ip4.addr}
+ play.work.euer IN A ${nets.internet.ip4.addr}
+ ul.work.euer IN A ${nets.internet.ip4.addr}
'';
};
cores = 8;
diff --git a/krebs/5pkgs/haskell/brockman.nix b/krebs/5pkgs/haskell/brockman.nix
index 5f1166a25..aec89b7ad 100644
--- a/krebs/5pkgs/haskell/brockman.nix
+++ b/krebs/5pkgs/haskell/brockman.nix
@@ -1,26 +1,26 @@
-{ mkDerivation, aeson, aeson-pretty, base, bloomfilter, bytestring
+{ mkDerivation, aeson, aeson-pretty, base, bytestring
, case-insensitive, conduit, containers, directory, feed, filepath
-, hslogger, html-entity, http-client, irc-conduit, lens, network
-, optparse-applicative, random, safe, stdenv, text, time, timerep
-, wreq
+, hslogger, html-entity, http-client, irc-conduit, lens, lrucache
+, network, optparse-applicative, random, safe, stdenv, text, time
+, timerep, wreq
, fetchFromGitHub
}:
mkDerivation rec {
pname = "brockman";
- version = "3.2.3";
+ version = "3.2.4";
src = fetchFromGitHub {
owner = "kmein";
repo = "brockman";
rev = version;
- sha256 = "1qbjbf0l1ikfzmvky4cnvv7nlcwi2in4afliifh618j0a4f7j427";
+ sha256 = "1jh2i3rxbw8x0p5xs9ph95ixpsa6h6qm0msjb9xqnw9j8by2fkk2";
};
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- aeson aeson-pretty base bloomfilter bytestring case-insensitive
- conduit containers directory feed filepath hslogger html-entity
- http-client irc-conduit lens network optparse-applicative random
- safe text time timerep wreq
+ aeson aeson-pretty base bytestring case-insensitive conduit
+ containers directory feed filepath hslogger html-entity http-client
+ irc-conduit lens lrucache network optparse-applicative random safe
+ text time timerep wreq
];
license = stdenv.lib.licenses.mit;
}
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 97afb10f8..d40e678cc 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/NixOS/nixpkgs",
- "rev": "a058d005b3cbb370bf171ebce01839dd6ff52222",
- "date": "2021-01-23T17:41:51-05:00",
- "path": "/nix/store/6ps307ghgrp10q3mwgw4lq143pmz0h25-nixpkgs",
- "sha256": "154mpqw0ya31hzgz9hggg1rb26yx8d00rsj9l90ndsdldrssgvbb",
+ "rev": "6e7f25001fe6874f7ae271891f709bbf50a22c45",
+ "date": "2021-01-29T09:54:18+01:00",
+ "path": "/nix/store/prpymxalqbhadpl734jpr4wsscj9hsvi-nixpkgs",
+ "sha256": "1x04j4351pqiqbpkq6g308mxcvb5aqnwv8l2vmlxkgvq5phzky7z",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false