dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #305817 from afh/update-neomutt

Browse Source
This commit is contained in:
Sandro 2024-06-05 01:30:38 +02:00 committed by GitHub
commit 81658cb9a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/applications/networking/mailreaders/neomutt/default.nix
View File

@ -5,15 +5,15 @@
, withContrib ? true
}:
stdenv.mkDerivation rec {
version = "20231221";
stdenv.mkDerivation (finalAttrs: {
pname = "neomutt";
version = "20240425";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = version;
sha256 = "sha256-IXly2N/DD2+XBXVIXJw1sE/0eJwbUaONDNRMi7n1T44=";
rev = finalAttrs.version;
hash = "sha256-QBqPFteoAm3AdQN0XTWpho8DEW2BFCCzBcHUZIiSxyQ=";
};
buildInputs = [
@ -73,42 +73,47 @@ stdenv.mkDerivation rec {
''
# https://github.com/neomutt/neomutt-contrib
# Contains vim-keys, keybindings presets and more.
+ lib.optionalString withContrib "${lib.getExe lndir} ${passthru.contrib} $out/share/doc/neomutt";
+ lib.optionalString withContrib "${lib.getExe lndir} ${finalAttrs.passthru.contrib} $out/share/doc/neomutt";
doCheck = true;
preCheck = ''
cp -r ${passthru.test-files} $(pwd)/test-files
cp -r ${finalAttrs.passthru.test-files} $(pwd)/test-files
chmod -R +w test-files
(cd test-files && ./setup.sh)
export NEOMUTT_TEST_DIR=$(pwd)/test-files
# The test fails with: node_padding.c:135: Check rc == 15... failed
substituteInPlace test/main.c \
--replace-fail "NEOMUTT_TEST_ITEM(test_expando_node_padding)" ""
'';
passthru = {
test-files = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt-test-files";
rev = "1569b826a56c39fd09f7c6dd5fc1163ff5a356a2";
sha256 = "sha256-MaH2zEH1Wq3C0lFxpEJ+b/A+k2aKY/sr1EtSPAuRPp8=";
rev = "00efc8388110208e77e6ed9d8294dfc333753d54";
hash = "sha256-/ELowuMq67v56MAJBtO73g6OqV0DVwW4+x+0u4P5mB0=";
};
contrib = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt-contrib";
rev = "8e97688693ca47ea1055f3d15055a4f4ecc5c832";
sha256 = "sha256-tx5Y819rNDxOpjg3B/Y2lPcqJDArAxVwjbYarVmJ79k=";
hash = "sha256-tx5Y819rNDxOpjg3B/Y2lPcqJDArAxVwjbYarVmJ79k=";
};
};
checkTarget = "test";
postCheck = "unset NEOMUTT_TEST_DIR";
meta = with lib; {
description = "A small but very powerful text-based mail client";
meta = {
description = "Small but very powerful text-based mail client";
mainProgram = "neomutt";
homepage = "http://www.neomutt.org";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ erikryb vrthra ma27 raitobezarius ];
platforms = platforms.unix;
homepage = "https://www.neomutt.org";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ erikryb vrthra ma27 raitobezarius ];
platforms = lib.platforms.unix;
};
}
})