summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-01-09 18:03:04 +0100
committerlassulus <lassulus@lassul.us>2022-01-09 18:03:04 +0100
commit66bcb802f5a4fe9dac92b0387ba3ad5a2915a173 (patch)
tree3ff4d6dac5303f1177fe8c958c17d27c9e40f336 /krebs/5pkgs
parent42906bb7793312544fae6d485f1c9c9d426be014 (diff)
parent16aad34f14755faa6657cbb8d8dbb95cacccee39 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/5pkgs')
-rw-r--r--krebs/5pkgs/haskell/much.nix6
-rw-r--r--krebs/5pkgs/simple/git-hooks/default.nix1
2 files changed, 4 insertions, 3 deletions
diff --git a/krebs/5pkgs/haskell/much.nix b/krebs/5pkgs/haskell/much.nix
index f3aad2ee6..5045465e6 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;
diff --git a/krebs/5pkgs/simple/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix
index 00a593be3..c9dcc7541 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