diff options
| author | Raito Bezarius <masterancpp@gmail.com> | 2023-04-21 14:08:00 +0200 |
|---|---|---|
| committer | Raito Bezarius <masterancpp@gmail.com> | 2023-04-21 14:08:00 +0200 |
| commit | eb0c4ad1b880d577e5bf539e422dd23d08e12819 (patch) | |
| tree | 669e5d97cfe3a141aef4d47cac68be27dbd3da48 | |
| parent | neomutt: 20220429 -> 20230407 (diff) | |
| download | nixpkgs-origin/neomutt-update.tar.gz | |
neomutt: add contrib repositories and expose misc repos as passthruorigin/neomutt-update
In the previous release, NeoMutt had its contrib folder in its main
repository, this fixes people who depended on vim-keys and other stuff
through the contrib repository now.
| -rw-r--r-- | pkgs/applications/networking/mailreaders/neomutt/default.nix | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index e83bcf6ef378..c070c05e9bf7 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl -, lua, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib +, lua, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib, lndir , pkg-config, zstd, enableZstd ? true, enableMixmaster ? false, enableLua ? false +, withContrib ? true }: stdenv.mkDerivation rec { @@ -69,23 +70,36 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt" - ''; + '' + # 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"; doCheck = true; preCheck = '' - cp -r ${fetchFromGitHub { - owner = "neomutt"; - repo = "neomutt-test-files"; - rev = "1569b826a56c39fd09f7c6dd5fc1163ff5a356a2"; - sha256 = "sha256-MaH2zEH1Wq3C0lFxpEJ+b/A+k2aKY/sr1EtSPAuRPp8="; - }} $(pwd)/test-files + cp -r ${passthru.test-files} $(pwd)/test-files chmod -R +w test-files (cd test-files && ./setup.sh) export NEOMUTT_TEST_DIR=$(pwd)/test-files ''; + passthru = { + test-files = fetchFromGitHub { + owner = "neomutt"; + repo = "neomutt-test-files"; + rev = "1569b826a56c39fd09f7c6dd5fc1163ff5a356a2"; + sha256 = "sha256-MaH2zEH1Wq3C0lFxpEJ+b/A+k2aKY/sr1EtSPAuRPp8="; + }; + contrib = fetchFromGitHub { + owner = "neomutt"; + repo = "neomutt-contrib"; + rev = "8e97688693ca47ea1055f3d15055a4f4ecc5c832"; + sha256 = "sha256-tx5Y819rNDxOpjg3B/Y2lPcqJDArAxVwjbYarVmJ79k="; + }; + }; + checkTarget = "test"; postCheck = "unset NEOMUTT_TEST_DIR"; |