summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-05-02 09:44:08 +0200
committermakefu <github@syntax-fehler.de>2017-05-02 09:44:08 +0200
commitf1b266e05c61710a0b4b657f5916ac84d579e358 (patch)
tree432633b6b2c5f27102ffa46b38d915af9983ec7e /krebs
parentcc8efe15822d15d0cb4315b0d0c308474ef3343f (diff)
parentd18c4022d277dd45ffc388b8f3868a42ab9592ad (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/tv/default.nix1
-rw-r--r--krebs/5pkgs/goify/default.nix17
-rw-r--r--krebs/5pkgs/much/cabal.nix28
-rw-r--r--krebs/5pkgs/much/default.nix31
4 files changed, 48 insertions, 29 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 2da38e08..e387fabc 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -358,6 +358,7 @@ with import <stockholm/lib>;
ip6.addr = "42::1338";
aliases = [
"xu.r"
+ "cgit.xu.r"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
diff --git a/krebs/5pkgs/goify/default.nix b/krebs/5pkgs/goify/default.nix
new file mode 100644
index 00000000..e2849b5c
--- /dev/null
+++ b/krebs/5pkgs/goify/default.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+
+pkgs.writeDashBin "goify" ''
+ set -euf
+
+ GO_HOST=''${GO_HOST:-go}
+
+ while read line; do
+ echo "$line" | sed -E 's|https?://\S*|\n&\n|g' | while read word; do
+ if echo "$word" | grep -Eq ^https?:; then
+ ${pkgs.curl}/bin/curl -Ss -F uri="$word" http://"$GO_HOST" | tr -d '\r'
+ else
+ echo "$word";
+ fi;
+ done | sed '/^$/d' | tr '\n' ' '; echo;
+ done
+''
diff --git a/krebs/5pkgs/much/cabal.nix b/krebs/5pkgs/much/cabal.nix
new file mode 100644
index 00000000..09bc7b5d
--- /dev/null
+++ b/krebs/5pkgs/much/cabal.nix
@@ -0,0 +1,28 @@
+{ mkDerivation, aeson, attoparsec, base, base64-bytestring
+, blaze-builder, blessings, bytestring, case-insensitive
+, containers, deepseq, directory, docopt, email-header, fetchgit
+, filepath, friendly-time, hyphenation, linebreak, old-locale
+, process, random, rosezipper, safe, scanner, split, stdenv
+, terminal-size, text, time, transformers, transformers-compat
+, unix, vector
+}:
+mkDerivation {
+ pname = "much";
+ version = "1.1.0";
+ src = fetchgit {
+ url = "http://cgit.ni.krebsco.de/much";
+ sha256 = "1325554zymr1dd0clj8c5ygl70c791csvs0hz33jcfr6b8wysdrl";
+ rev = "dfec37d848e11c00d9b7f03295af1fc7b0e83ef5";
+ };
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson attoparsec base base64-bytestring blaze-builder blessings
+ bytestring case-insensitive containers deepseq directory docopt
+ email-header filepath friendly-time hyphenation linebreak
+ old-locale process random rosezipper safe scanner split
+ terminal-size text time transformers transformers-compat unix
+ vector
+ ];
+ license = stdenv.lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/much/default.nix b/krebs/5pkgs/much/default.nix
index aa3c56fe..cf55eb53 100644
--- a/krebs/5pkgs/much/default.nix
+++ b/krebs/5pkgs/much/default.nix
@@ -1,30 +1,3 @@
-{ pkgs, ... }:
+{ haskellPackages, ... }:
-pkgs.haskellPackages.callPackage (
-{ mkDerivation, aeson, attoparsec, base, base64-bytestring
-, blaze-builder, blessings, bytestring, case-insensitive, containers, deepseq
-, directory, docopt, email-header, fetchgit, filepath
-, friendly-time, hyphenation, linebreak, old-locale, process
-, random, rosezipper, safe, scanner, split, stdenv, terminal-size, text
-, time, transformers, transformers-compat, unix, vector
-}:
-mkDerivation {
- pname = "much";
- version = "1.0.0";
- src = fetchgit {
- url = "http://cgit.ni.krebsco.de/much";
- rev = "045dc986b4de225a927175f81c8ccfdab450202c";
- sha256 = "17jbw7x82a3bgn1qv5k764f103knrf865dmx48h7192vdh8gz766";
- };
- isLibrary = false;
- isExecutable = true;
- buildDepends = [
- aeson attoparsec base base64-bytestring blaze-builder blessings bytestring
- case-insensitive containers deepseq directory docopt email-header filepath
- friendly-time hyphenation linebreak old-locale process random rosezipper
- safe scanner split terminal-size text time transformers transformers-compat
- unix vector
- ];
- license = stdenv.lib.licenses.mit;
-}
-) {}
+haskellPackages.callPackage ./cabal.nix {}