diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 8a26dbb315c7..3c555f11239e 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,15 +5,15 @@ , withContrib ? true }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation rec { + version = "20231221"; pname = "neomutt"; - version = "20240425"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; - rev = finalAttrs.version; - hash = "sha256-QBqPFteoAm3AdQN0XTWpho8DEW2BFCCzBcHUZIiSxyQ="; + rev = version; + sha256 = "sha256-IXly2N/DD2+XBXVIXJw1sE/0eJwbUaONDNRMi7n1T44="; }; buildInputs = [ @@ -73,35 +73,30 @@ stdenv.mkDerivation (finalAttrs: { '' # https://github.com/neomutt/neomutt-contrib # Contains vim-keys, keybindings presets and more. - + lib.optionalString withContrib "${lib.getExe lndir} ${finalAttrs.passthru.contrib} $out/share/doc/neomutt"; + + lib.optionalString withContrib "${lib.getExe lndir} ${passthru.contrib} $out/share/doc/neomutt"; doCheck = true; preCheck = '' - cp -r ${finalAttrs.passthru.test-files} $(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 - - # 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 = "00efc8388110208e77e6ed9d8294dfc333753d54"; - hash = "sha256-/ELowuMq67v56MAJBtO73g6OqV0DVwW4+x+0u4P5mB0="; + rev = "1569b826a56c39fd09f7c6dd5fc1163ff5a356a2"; + sha256 = "sha256-MaH2zEH1Wq3C0lFxpEJ+b/A+k2aKY/sr1EtSPAuRPp8="; }; contrib = fetchFromGitHub { owner = "neomutt"; repo = "neomutt-contrib"; rev = "8e97688693ca47ea1055f3d15055a4f4ecc5c832"; - hash = "sha256-tx5Y819rNDxOpjg3B/Y2lPcqJDArAxVwjbYarVmJ79k="; + sha256 = "sha256-tx5Y819rNDxOpjg3B/Y2lPcqJDArAxVwjbYarVmJ79k="; }; }; @@ -109,11 +104,11 @@ stdenv.mkDerivation (finalAttrs: { postCheck = "unset NEOMUTT_TEST_DIR"; meta = { - description = "Small but very powerful text-based mail client"; + description = "A small but very powerful text-based mail client"; mainProgram = "neomutt"; homepage = "https://www.neomutt.org"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ erikryb vrthra raitobezarius ]; platforms = lib.platforms.unix; }; -}) +}