From 13db0ce256ec67c6e21bd85a7d398ccdb180988f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 6 Jan 2022 14:44:29 +0100
Subject: much: 1.3.0 -> 1.3.1

---
 krebs/5pkgs/haskell/much.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/haskell/much.nix b/krebs/5pkgs/haskell/much.nix
index f3aad2ee..5045465e 100644
--- a/krebs/5pkgs/haskell/much.nix
+++ b/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;
-- 
cgit v1.2.3


From 16aad34f14755faa6657cbb8d8dbb95cacccee39 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 7 Jan 2022 20:59:37 +0100
Subject: git-hooks irc-announce: don't show merges

---
 krebs/5pkgs/simple/git-hooks/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix
index 00a593be..c9dcc754 100644
--- a/krebs/5pkgs/simple/git-hooks/default.nix
+++ b/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
 
-- 
cgit v1.2.3