himalaya: 0.7.3 -> 0.8.0

This commit is contained in:
Clément DOUIN 2023-05-31 17:36:57 +02:00
parent 09720cc41f
commit be53021199
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
3 changed files with 8 additions and 24 deletions

View file

@ -26,6 +26,8 @@
- `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides
- `himalaya` has been updated to `0.8.0`, which drops the native TLS support (in favor of Rustls) and add OAuth 2.0 support. See the [release note](https://github.com/soywod/himalaya/releases/tag/v0.8.0) for more details.
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
- `fileSystems.<name>.autoFormat` now uses `systemd-makefs`, which does not accept formatting options. Therefore, `fileSystems.<name>.formatOptions` has been removed.

View file

@ -5,15 +5,7 @@
, installShellFiles
, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
, pkg-config
, Security
, libiconv
, openssl
, notmuch
, withRusttlsTls ? true
, withRusttlsNativeCerts ? withRusttlsTls
, withNativeTls ? false
, withNativeTlsVendored ? withNativeTls
, withImapBackend ? true
, withNotmuchBackend ? false
, withSmtpSender ? true
@ -21,31 +13,23 @@
rustPlatform.buildRustPackage rec {
pname = "himalaya";
version = "0.7.3";
version = "0.8.0";
src = fetchFromGitHub {
owner = "soywod";
repo = pname;
rev = "v${version}";
sha256 = "HmH4qL70ii8rS8OeUnUxsy9/wMx+f2SBd1AyRqlfKfc=";
hash = "sha256-kK/F3Geiuz0CgGSE0sCOfSZjg9gEPLyUEilzb+SdIM8=";
};
cargoSha256 = "NJFOtWlfKZRLr9vvDvPQjpT4LGMeytk0JFJb0r77bwE=";
cargoSha256 = "4L09lWD8tRJvBPzQlSdk4aa1QY7sVw26OwgMzscN1j8=";
nativeBuildInputs = [ ]
++ lib.optional (installManPages || installShellCompletions) installShellFiles
++ lib.optional (withNativeTls && !stdenv.hostPlatform.isDarwin) pkg-config;
nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles;
buildInputs = [ ]
++ lib.optional withNativeTls (if stdenv.hostPlatform.isDarwin then [ Security libiconv ] else [ openssl ])
++ lib.optional withNotmuchBackend notmuch;
buildInputs = lib.optional withNotmuchBackend notmuch;
buildNoDefaultFeatures = true;
buildFeatures = [ ]
++ lib.optional withRusttlsTls "rustls-tls"
++ lib.optional withRusttlsNativeCerts "rustls-native-certs"
++ lib.optional withNativeTls "native-tls"
++ lib.optional withNativeTlsVendored "native-tls-vendored"
++ lib.optional withImapBackend "imap-backend"
++ lib.optional withNotmuchBackend "notmuch-backend"
++ lib.optional withSmtpSender "smtp-sender";

View file

@ -31314,9 +31314,7 @@ with pkgs;
hexedit = callPackage ../applications/editors/hexedit { };
himalaya = callPackage ../applications/networking/mailreaders/himalaya {
inherit (darwin.apple_sdk.frameworks) Security;
};
himalaya = callPackage ../applications/networking/mailreaders/himalaya { };
hipchat = callPackage ../applications/networking/instant-messengers/hipchat { };