Merge remote-tracking branch 'ni/master'

krebs/3modules/external/mic92.nix

@@ -675,6 +675,25 @@ in {
         };
       };
     };
+    jarvis = {
+      owner = config.krebs.users.mic92;
+      nets = rec {
+        retiolum = {
+          aliases = [ "jarvis.r" ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIIBCgKCAQEA7PtJlYBpBr2TK5CAvAukkGvj+esC+sMPKd3mO9iDwdViBrqKdf+D
+            yEy8SI80Y02dpkL97NjvnzepKpyGQWpG1ZQflJLhCTj7oFyVpWd4XsbIuzYp5ES6
+            r8qKWs2xcItc1pbW0ZmrCBzdWsC1B0VAHlYkiz+7vM6pCTvg6hNQugP4c1TRCtJC
+            Sr+n+EjTXN/NTaKl+f7eoHJGnT5liDO3/xZVxm8AuLnron1xPPDghXClVHfDj5mt
+            f66f+CLwZhq3BrZuptwXp7TerMfrNtPyTx96b+EyuLPjrYxKeKL/+Nbr3VmmiDIV
+            tsraNc+0a8OBpVsYh4MQLp55NYwqxAoetQIDAQAB
+            -----END RSA PUBLIC KEY-----
+          '';
+          tinc.pubkey_ed25519 = "RRkMnGSg+nMkz4L2iqmdFf2fIf4wIfcTM0TlTWLLNCE";
+        };
+      };
+    };
     bernie = {
       owner = config.krebs.users.mic92;
       nets = rec {

krebs/5pkgs/haskell/much.nix

@@ -9,11 +9,11 @@
 }:
 mkDerivation {
   pname = "much";
-  version = "1.2.0";
+  version = "1.3.1";
   src = fetchgit {
     url = "https://cgit.krebsco.de/much";
-    sha256 = "0rf27d7gki5hgivy49xi59ld0j6jw3v7nxi4w1gx6byj1xsarwwl";
-    rev = "29749366052a8f6c05b314f1ff17201717855ad7";
+    sha256 = "0gwyhqcvg9ywna8fhb9hnx97qh5inglj3l0pcwkgwcvm27mfpcqa";
+    rev = "77357335a3a88a4b93f91a46ab939a1a9b192977";
     fetchSubmodules = true;
   };
   isLibrary = true;

krebs/5pkgs/simple/git-hooks/default.nix

@@ -100,6 +100,7 @@ with stockholm.lib;
         add_message "$(
           git log \
               --format="$(orange %h) %s $(gray '(%ar)')" \
+              --no-merges \
               --reverse \
               $id2..$id