Fix maildrop not building

Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2023-05-03 00:30:57 +02:00
parent 4503255754
commit 899028779a
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 14 additions and 8 deletions

View file

@ -26,11 +26,11 @@ nglib.makeSystem {
courier-unicode = with pkgs; courier-unicode = with pkgs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "courier-unicode"; name = "courier-unicode";
version = "2.2.3"; version = "2.2.6";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://sourceforge/courier/courier-unicode/${version}/${name}-${version}.tar.bz2"; url = "mirror://sourceforge/courier/courier-unicode/${version}/${name}-${version}.tar.bz2";
sha256 = "sha256-COz13JdSnOOqncqghYYHYt5jbr75aL9LbgzfqvGMev8="; sha256 = "sha256-UT9oBm7RkqzmMPYBmExWW1wdHIHZjGR46+Tts6Fb4Do=";
}; };
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
@ -41,13 +41,17 @@ nglib.makeSystem {
[ ./dont-reset-path.patch [ ./dont-reset-path.patch
./maildrop.configure.hack.patch ./maildrop.configure.hack.patch
]; ];
version = "3.0.7"; version = "3.1.5";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://sourceforge/courier/maildrop/3.0.7/maildrop-3.0.7.tar.bz2"; url = "mirror://sourceforge/courier/maildrop/3.1.5/maildrop-3.1.5.tar.bz2";
sha256 = "sha256-YFzoHDk5BEcy2uRyQhlTTl27UVyAdgvjYRkUq1wfeCU="; sha256 = "sha256-Izg/s5uSaQRWRpOXSO5zfnXJ8jmU+MBnI/MEyXp42lo=";
}; };
nativeBuildInputs = with pkgs; [ pcre2 pkg-config ]; nativeBuildInputs = with pkgs; [ pkg-config ];
buildInputs = with pkgs; [ libidn courier-unicode ]; buildInputs = with pkgs; [ perl pcre2.dev libidn2.dev courier-unicode ];
configureFlags = [
"--enable-maildrop-uid="
"--enable-maildrop-gid="
];
}); });
getmail6-fixed = pkgs.getmail6.overrideAttrs ( getmail6-fixed = pkgs.getmail6.overrideAttrs (

View file

@ -69,7 +69,9 @@
type = "app"; type = "app";
program = toString (pkgs.writeShellScript "terraform" '' program = toString (pkgs.writeShellScript "terraform" ''
export PATH="${pkgs.lib.makeBinPath (with pkgs; [ terraform bash coreutils jq nix git ])}" 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_rev="$(echo "$_flake_metadata" | jq .locked.rev -r)"
export TF_VAR_flake_sha="$(echo "$_flake_metadata" | jq .locked.narHash -r)" export TF_VAR_flake_sha="$(echo "$_flake_metadata" | jq .locked.narHash -r)"
export TF_VAR_flake_ref="$(git rev-parse --abbrev-ref HEAD)" export TF_VAR_flake_ref="$(git rev-parse --abbrev-ref HEAD)"