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 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 tv/4lib/default.nix

(limited to 'tv/4lib/default.nix')

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}");
+}
-- 
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/default.nix')

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

[cgit] Unable to lock slot /tmp/cgit/d4100000.lock: No such file or directory (2)