From 899028779a6fd98f6015d22c64299dc998d8614d Mon Sep 17 00:00:00 2001
From: Magic_RB <magic_rb@redalder.org>
Date: Wed, 3 May 2023 00:30:57 +0200
Subject: [PATCH] Fix maildrop not building

Signed-off-by: Magic_RB <magic_rb@redalder.org>
---
 containers/getmail/default.nix | 18 +++++++++++-------
 flake.nix                      |  4 +++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/containers/getmail/default.nix b/containers/getmail/default.nix
index abba010..ef9adb5 100644
--- a/containers/getmail/default.nix
+++ b/containers/getmail/default.nix
@@ -26,11 +26,11 @@ nglib.makeSystem {
             courier-unicode = with pkgs;
               stdenv.mkDerivation rec {
                 name = "courier-unicode";
-                version = "2.2.3";
+                version = "2.2.6";
 
                 src = pkgs.fetchurl {
                   url = "mirror://sourceforge/courier/courier-unicode/${version}/${name}-${version}.tar.bz2";
-                  sha256 = "sha256-COz13JdSnOOqncqghYYHYt5jbr75aL9LbgzfqvGMev8=";
+                  sha256 = "sha256-UT9oBm7RkqzmMPYBmExWW1wdHIHZjGR46+Tts6Fb4Do=";
                 };
 
                 nativeBuildInputs = [ perl ];
@@ -41,13 +41,17 @@ nglib.makeSystem {
                   [ ./dont-reset-path.patch
                     ./maildrop.configure.hack.patch
                   ];
-                version = "3.0.7";
+                version = "3.1.5";
                 src = pkgs.fetchurl {
-                  url = "mirror://sourceforge/courier/maildrop/3.0.7/maildrop-3.0.7.tar.bz2";
-                  sha256 = "sha256-YFzoHDk5BEcy2uRyQhlTTl27UVyAdgvjYRkUq1wfeCU=";
+                  url = "mirror://sourceforge/courier/maildrop/3.1.5/maildrop-3.1.5.tar.bz2";
+                  sha256 = "sha256-Izg/s5uSaQRWRpOXSO5zfnXJ8jmU+MBnI/MEyXp42lo=";
                 };
-                nativeBuildInputs = with pkgs; [ pcre2 pkg-config ];
-                buildInputs = with pkgs; [ libidn courier-unicode ];
+                nativeBuildInputs = with pkgs; [ pkg-config ];
+                buildInputs = with pkgs; [ perl pcre2.dev libidn2.dev courier-unicode ];
+                configureFlags = [
+                  "--enable-maildrop-uid="
+                  "--enable-maildrop-gid="
+                ];
               });
 
             getmail6-fixed = pkgs.getmail6.overrideAttrs (
diff --git a/flake.nix b/flake.nix
index 6675d48..8fdd5ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,7 +69,9 @@
                 type = "app";
                 program = toString (pkgs.writeShellScript "terraform" ''
                   export PATH="${pkgs.lib.makeBinPath (with pkgs; [ terraform bash coreutils jq nix git ])}"
-                  _flake_metadata="$(nix flake metadata git+file://$PWD?rev="$(git rev-parse HEAD)" --json)"
+                  _rev=$TERRANIX_REV
+                  : ''${_rev:=$(git rev-parse HEAD)}
+                  _flake_metadata="$(nix flake metadata git+file://$PWD?rev="''$_rev" --json)"
                   export TF_VAR_flake_rev="$(echo "$_flake_metadata" | jq .locked.rev -r)"
                   export TF_VAR_flake_sha="$(echo "$_flake_metadata" | jq .locked.narHash -r)"
                   export TF_VAR_flake_ref="$(git rev-parse --abbrev-ref HEAD)"