Merge pull request #225110 from amjoseph-nixpkgs/pr/notmuch/gmime3

authored by Artturi and committed by GitHub 1cd2bb91 bce3efaf

+3 -4
+3 -3
pkgs/applications/networking/mailreaders/notmuch/default.nix
··· 1 1 { fetchurl, lib, stdenv 2 2 , pkg-config, gnupg 3 - , xapian, gmime, talloc, zlib 3 + , xapian, gmime3, talloc, zlib 4 4 , doxygen, perl, texinfo 5 5 , notmuch 6 6 , pythonPackages ··· 32 32 33 33 buildInputs = [ 34 34 gnupg # undefined dependencies 35 - xapian gmime talloc zlib # dependencies described in INSTALL 35 + xapian gmime3 talloc zlib # dependencies described in INSTALL 36 36 perl 37 37 pythonPackages.python 38 38 ] ++ lib.optional withRuby ruby; ··· 81 81 ln -s ${test-database} test/test-databases/database-v1.tar.xz 82 82 ''; 83 83 84 - doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3"); 84 + doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime3.version "3.0.3"); 85 85 checkTarget = "test"; 86 86 nativeCheckInputs = [ 87 87 which dtach openssl bash
-1
pkgs/top-level/all-packages.nix
··· 32625 32625 notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; 32626 32626 32627 32627 notmuch = callPackage ../applications/networking/mailreaders/notmuch { 32628 - gmime = gmime3; 32629 32628 pythonPackages = python3Packages; 32630 32629 }; 32631 32630