gitignore: fix bug introduced by 68d3c92HEADmaster

7 files changed, 35 insertions, 21 deletions

diff --git a/krebs/5pkgs/simple/TabFS/src.json b/krebs/5pkgs/simple/TabFS/src.json
index 24e36aef3..931c9ecb8 100644
--- a/krebs/5pkgs/simple/TabFS/src.json
+++ b/krebs/5pkgs/simple/TabFS/src.json
@@ -1,8 +1,6 @@
 {
   "url": "https://cgit.krebsco.de/TabFS",
   "rev": "a6045e0e29b85e3e66c468f3561009ded1db6ec5",
-  "date": "2021-01-14T23:56:09+01:00",
-  "path": "/nix/store/mbcywm1yq5vr7awxqb533faz34minfax-TabFS",
   "sha256": "1z0kj95zh0jl8laa0whra1jys8pws3199sy29vmlv2nxrkz13blv",
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/krebs/5pkgs/simple/airdcpp-webclient/default.nix b/krebs/5pkgs/simple/airdcpp-webclient/default.nix
index 754fecf9c..f4634b595 100644
--- a/krebs/5pkgs/simple/airdcpp-webclient/default.nix
+++ b/krebs/5pkgs/simple/airdcpp-webclient/default.nix
@@ -4,7 +4,7 @@
 stdenv.mkDerivation rec {
   name = "airdcpp-webclient-${version}";
   version = "2.3.0";
-  
+
   src = fetchurl {
     url = http://web-builds.airdcpp.net/stable/airdcpp_2.3.0_webui-2.3.0_64-bit_portable.tar.gz;
     sha256 = "0yvcl0nc70fghc7vfsgvbpryi5q97arld8adql4way4qa0mdnyv1";
diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix
index a07e88c3b..e0b9ffdae 100644
--- a/krebs/5pkgs/simple/default.nix
+++ b/krebs/5pkgs/simple/default.nix
@@ -13,5 +13,15 @@ let
         lib.compareVersions upstream.name override.name != -1
     then lib.trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
     else override;
+
+  ## This callPackage will try to detect obsolete overrides.
+  #callPackage = path: args: let
+  #  pname = (parseDrvName override.name).name;
+  #  override = self.callPackage path args;
+  #  upstream = super.${pname} or { name = ""; };
+  #in
+  #  override.overrideAttrs (old: {
+  #    name = warnOldVersion upstream.name old.name;
+  #  });
 in
   lib.mapNixDir (path: callPackage path {}) ./.
diff --git a/krebs/5pkgs/simple/font-size.nix b/krebs/5pkgs/simple/font-size.nix
index 21097ed6a..829325192 100644
--- a/krebs/5pkgs/simple/font-size.nix
+++ b/krebs/5pkgs/simple/font-size.nix
@@ -1,3 +1,4 @@
+# TODO kill me in favor of urxvt-resize-font
 { writeDashBin }:
 writeDashBin "font-size" ''
   set -efu
diff --git a/krebs/5pkgs/simple/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix
index 51b4babfc..fe159c833 100644
--- a/krebs/5pkgs/simple/git-hooks/default.nix
+++ b/krebs/5pkgs/simple/git-hooks/default.nix
@@ -114,6 +114,7 @@ with stockholm.lib;
           git diff --stat $id2..$id \
             | sed '$!s/\(+*\)\(-*\)$/'$(green '\1')$(red '\2')'/'
         )"
+        echo "$(red "$message")"
       ''}
 
     done
diff --git a/krebs/5pkgs/simple/gitignore.nix b/krebs/5pkgs/simple/gitignore.nix
index b7a9f7eb5..50c8d6190 100644
--- a/krebs/5pkgs/simple/gitignore.nix
+++ b/krebs/5pkgs/simple/gitignore.nix
@@ -1,4 +1,4 @@
-{ pkgs, writeDash }:
+{ pkgs, writeDashBin }:
 
 /* gitignore - Filter for intentionally untracked lines or blocks of code
 
@@ -34,7 +34,7 @@ Installation:
   [2]: For more information about assigning filters see gitattributes(5).
 */
 
-writeDash "gitignore" ''
+writeDashBin "gitignore" ''
   exec ${pkgs.gnused}/bin/sed '
     /#gitignore-begin/,/#gitignore-end/d
     /#gitignore/d
diff --git a/krebs/5pkgs/simple/htgen-imgur/src/htgen-imgur b/krebs/5pkgs/simple/htgen-imgur/src/htgen-imgur
index 696d1c00d..bdfb3eb61 100644
--- a/krebs/5pkgs/simple/htgen-imgur/src/htgen-imgur
+++ b/krebs/5pkgs/simple/htgen-imgur/src/htgen-imgur
@@ -1,3 +1,4 @@
+# TODO dedup with paste
 find_item() {
   if test ${#1} -ge 7; then
     set -- "$(find "$STATEDIR/items" -mindepth 1 -maxdepth 1 \
@@ -58,6 +59,9 @@ read_uri() {
     $uri |
     capture("^((?<scheme>[^:]*):)?(//(?<authority>[^/]*))?(?<path>[^?#]*)([?](?<query>[^#]*))?([#](?<fragment>.*))?$") |
     . + {
+      #authority: (.authority | if . != null then
+      #  capture("^((?<userinfo>[^@]*)@)?(?<host>[^:]*)(:(?<port>.*))?$")
+      #else . end),
       query: (.query | if . != null then
         split("&") |
         map(split("=") | {key:.[0],value:.[1]}) |
@@ -141,26 +145,26 @@ case "$Method $path" in
           description: $uri.query.description,
           datetime: now,
           type: $info["MIME type"],
-          animated: false,
+          animated: false, # TODO
           width: $info.width,
           height: $info.height,
           size: $info.size,
-          views: 0,
-          bandwidth: 0,
-          vote: null,
-          favorite: false,
-          nsfw: null,
-          section: null,
-          account_url: null,
-          acount_id: 0,
-          is_ad: false,
-          is_most_viral: false,
-          tags: [],
-          ad_type: 0,
-          ad_url: "",
-          in_gallery: false,
+          views: 0, # TODO
+          bandwidth: 0, # TODO
+          vote: null, # TODO
+          favorite: false, # TODO
+          nsfw: null, # TODO
+          section: null, # TODO
+          account_url: null, # TODO
+          acount_id: 0, # TODO
+          is_ad: false, # TODO
+          is_most_viral: false, # TODO
+          tags: [], # TODO
+          ad_type: 0, # TODO
+          ad_url: "", # TODO
+          in_gallery: false, # TODO
           deletehash: @uri "\($id)?deletehash=\($deletehash)",
-          name: "",
+          name: "", # TODO
           link: $link,
         }
       ')