From 8170b281964688b542fb151054c5d86d819008b3 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 28 Jul 2015 20:40:25 +0200
Subject: tv: reintroduce directory numbers

---
 tv/4lib/default.nix |  22 +++++++
 tv/4lib/git.nix     | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tv/4lib/modules.nix |  21 ++++++
 3 files changed, 225 insertions(+)
 create mode 100644 tv/4lib/default.nix
 create mode 100644 tv/4lib/git.nix
 create mode 100644 tv/4lib/modules.nix

(limited to 'tv/4lib')

diff --git a/tv/4lib/default.nix b/tv/4lib/default.nix
new file mode 100644
index 000000000..dbc0c29b7
--- /dev/null
+++ b/tv/4lib/default.nix
@@ -0,0 +1,22 @@
+{ lib, pkgs, ... }:
+
+with lib;
+
+lib // rec {
+
+  git = import ./git.nix {
+    inherit lib pkgs;
+  };
+
+  # "7.4.335" -> "74"
+  majmin = with lib; x : concatStrings (take 2 (splitString "." x));
+
+  shell-escape =
+    let
+      isSafeChar = c: match "[-./0-9_a-zA-Z]" c != null;
+    in
+    stringAsChars (c:
+      if isSafeChar c then c
+      else if c == "\n" then "'\n'"
+      else "\\${c}");
+}
diff --git a/tv/4lib/git.nix b/tv/4lib/git.nix
new file mode 100644
index 000000000..2b25debdc
--- /dev/null
+++ b/tv/4lib/git.nix
@@ -0,0 +1,182 @@
+{ lib, pkgs, ... }:
+
+let
+  inherit (lib) addNames escapeShellArg makeSearchPath;
+
+  commands = addNames {
+    git-receive-pack = {};
+    git-upload-pack = {};
+  };
+
+  receive-modes = addNames {
+    fast-forward = {};
+    non-fast-forward = {};
+    create = {};
+    delete = {};
+    merge = {}; # TODO implement in git.nix
+  };
+
+  permissions = {
+    fetch = {
+      allow-commands = [
+        commands.git-upload-pack
+      ];
+    };
+
+    push = ref: extra-modes: {
+      allow-commands = [
+        commands.git-receive-pack
+        commands.git-upload-pack
+      ];
+      allow-receive-ref = ref;
+      allow-receive-modes = [ receive-modes.fast-forward ] ++ extra-modes;
+    };
+  };
+
+  refs = {
+    master = "refs/heads/master";
+    all-heads = "refs/heads/*";
+  };
+
+  irc-announce-script = pkgs.writeScript "irc-announce-script" ''
+    #! /bin/sh
+    set -euf
+
+    export PATH=${makeSearchPath "bin" (with pkgs; [
+      coreutils
+      gawk
+      gnused
+      netcat
+      nettools
+    ])}
+
+    IRC_SERVER=$1
+    IRC_PORT=$2
+    IRC_NICK=$3$$
+    IRC_CHANNEL=$4
+    message=$5
+
+    export IRC_CHANNEL # for privmsg_cat
+
+    # echo2 and cat2 are used output to both, stdout and stderr
+    # This is used to see what we send to the irc server. (debug output)
+    echo2() { echo "$*"; echo "$*" >&2; }
+    cat2() { tee /dev/stderr; }
+
+    # privmsg_cat transforms stdin to a privmsg
+    privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; }
+
+    # ircin is used to feed the output of netcat back to the "irc client"
+    # so we can implement expect-like behavior with sed^_^
+    # XXX mkselfdestructingtmpfifo would be nice instead of this cruft
+    tmpdir="$(mktemp -d irc-announce_XXXXXXXX)"
+    cd "$tmpdir"
+    mkfifo ircin
+    trap "
+      rm ircin
+      cd '$OLDPWD'
+      rmdir '$tmpdir'
+      trap - EXIT INT QUIT
+    " EXIT INT QUIT
+
+    {
+      echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)"
+      echo2 "NICK $IRC_NICK"
+
+      # wait for MODE message
+      sed -n '/^:[^ ]* MODE /q'
+
+      echo2 "JOIN $IRC_CHANNEL"
+
+      printf '%s' "$message" \
+        | privmsg_cat \
+        | cat2
+
+      echo2 "PART $IRC_CHANNEL"
+
+      # wait for PART confirmation
+      sed -n '/:'"$IRC_NICK"'![^ ]* PART /q'
+
+      echo2 'QUIT :Gone to have lunch'
+    } < ircin \
+      | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin
+  '';
+
+  hooks = {
+    # TODO make this a package?
+    irc-announce = { nick, channel, server, port ? 6667 }: ''
+      #! /bin/sh
+      set -euf
+
+      export PATH=${makeSearchPath "bin" (with pkgs; [
+        coreutils
+        git
+        gnused
+      ])}
+
+      nick=${escapeShellArg nick}
+      channel=${escapeShellArg channel}
+      server=${escapeShellArg server}
+      port=${toString port}
+
+      host=$nick
+      cgit_endpoint=http://cgit.$host
+
+      empty=0000000000000000000000000000000000000000
+
+      unset message
+      while read oldrev newrev ref; do
+
+        if [ $oldrev = $empty ]; then
+          receive_mode=create
+        elif [ $newrev = $empty ]; then
+          receive_mode=delete
+        elif [ "$(git merge-base $oldrev $newrev)" = $oldrev ]; then
+          receive_mode=fast-forward
+        else
+          receive_mode=non-fast-forward
+        fi
+
+        h=$(echo $ref | sed 's:^refs/heads/::')
+
+        # empty_tree=$(git hash-object -t tree /dev/null
+        empty_tree=4b825dc6
+
+        id=$(echo $newrev | cut -b-7)
+        id2=$(echo $oldrev | cut -b-7)
+        if [ $newrev = $empty ]; then id=$empty_tree; fi
+        if [ $oldrev = $empty ]; then id2=$empty_tree; fi
+
+        case $receive_mode in
+          create)
+            #git log --oneline $id2
+            link="$cgit_endpoint/$GIT_SSH_REPO/?h=$h"
+            ;;
+          delete)
+            #git log --oneline $id2
+            link="$cgit_endpoint/$GIT_SSH_REPO/ ($h)"
+            ;;
+          fast-forward|non-fast-forward)
+            #git diff --stat $id..$id2
+            link="$cgit_endpoint/$GIT_SSH_REPO/diff/?h=$h&id=$id&id2=$id2"
+            ;;
+        esac
+
+        #$host $GIT_SSH_REPO $ref $link
+        message="''${message+$message
+      }$GIT_SSH_USER $receive_mode $link"
+      done
+
+      if test -n "''${message-}"; then
+        exec ${irc-announce-script} \
+          "$server" \
+          "$port" \
+          "$nick" \
+          "$channel" \
+          "$message"
+      fi
+    '';
+  };
+
+in
+commands // receive-modes // permissions // refs // hooks
diff --git a/tv/4lib/modules.nix b/tv/4lib/modules.nix
new file mode 100644
index 000000000..248e638ea
--- /dev/null
+++ b/tv/4lib/modules.nix
@@ -0,0 +1,21 @@
+let
+  pkgs = import <nixpkgs> {};
+  inherit (pkgs.lib) concatMap hasAttr;
+in rec {
+
+  no-touch-args = {
+    config = throw "no-touch-args: can't touch config!";
+    lib = throw "no-touch-args: can't touch lib!";
+    pkgs = throw "no-touch-args: can't touch pkgs!";
+  };
+
+  # list-imports : path -> [path]
+  # Return a module's transitive list of imports.
+  # XXX duplicates won't get eliminated from the result.
+  list-imports = path:
+    let module = import path no-touch-args;
+        imports = if hasAttr "imports" module
+                    then concatMap list-imports module.imports
+                    else [];
+    in [path] ++ imports;
+}
-- 
cgit v1.2.3


From f98248672e1aeacf5d6665d252ce251fe1703249 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 28 Jul 2015 21:00:53 +0200
Subject: Revert "default.nix: lib = import 4lib/krebs"

This reverts commit 981664337fef772422cbc3ca8bcb8ebb85d79b02
---
 tv/4lib/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'tv/4lib')

diff --git a/tv/4lib/default.nix b/tv/4lib/default.nix
index dbc0c29b7..e0a295f17 100644
--- a/tv/4lib/default.nix
+++ b/tv/4lib/default.nix
@@ -1,11 +1,16 @@
 { lib, pkgs, ... }:
 
-with lib;
+let
+  krebs = import ../../4lib/krebs { inherit lib; };
+in
 
-lib // rec {
+with krebs;
+
+krebs // rec {
 
   git = import ./git.nix {
-    inherit lib pkgs;
+    lib = krebs;
+    inherit pkgs;
   };
 
   # "7.4.335" -> "74"
-- 
cgit v1.2.3