Commit 055ffe5e authored by Adam Joseph's avatar Adam Joseph
Browse files

notmuch: move gmime==3 constraint into the package 

Using a top-level/all-packages.nix override to select the version is
confusing, and circumvents user overlays.
parent e3bbbfaf

pkgs/applications/networking/mailreaders/notmuch/default.nix

+3 −3
Original line number Diff line number Diff line 
{ fetchurl, lib, stdenv

, pkg-config, gnupg

, xapian, gmime, talloc, zlib

, xapian, gmime3, talloc, zlib

, doxygen, perl, texinfo

, notmuch

, pythonPackages
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    gnupg                     # undefined dependencies

    xapian gmime talloc zlib  # dependencies described in INSTALL

    xapian gmime3 talloc zlib  # dependencies described in INSTALL

    perl

    pythonPackages.python

  ] ++ lib.optional withRuby ruby;
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec { 
    ln -s ${test-database} test/test-databases/database-v1.tar.xz

  '';



  doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3");

  doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime3.version "3.0.3");

  checkTarget = "test";

  nativeCheckInputs = [

    which dtach openssl bash

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -32601,7 +32601,6 @@ with pkgs; 
  notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };















  notmuch = callPackage ../applications/networking/mailreaders/notmuch {













    gmime = gmime3;















    pythonPackages = python3Packages;















  };