From 503df1ef98e71271b3df2c6f4096573cef7490bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Sun, 25 Feb 2024 11:39:00 +0100 Subject: [PATCH] himalaya: 1.0.0-beta.2 -> 1.0.0-beta.3 --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 +- .../networking/mailreaders/himalaya/default.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index ac3d2b69a4a2..8b8501011930 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -93,7 +93,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m -- `himalaya` was updated to v1.0.0-beta, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta) for details. +- `himalaya` was updated to `v1.0.0-beta.3`, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.3) for details. - The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS. diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index e200148cc076..02da88ba6a32 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -3,6 +3,9 @@ , fetchFromGitHub , stdenv , pkg-config +, AppKit +, Cocoa +, Security , installShellFiles , installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform , installManPages ? stdenv.hostPlatform == stdenv.buildPlatform @@ -16,22 +19,23 @@ rustPlatform.buildRustPackage rec { inherit buildNoDefaultFeatures buildFeatures; pname = "himalaya"; - version = "1.0.0-beta.2"; + version = "1.0.0-beta.3"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - hash = "sha256-dLj/bEPz3SD1v54yXbtVdUJKQsyw0OJxmQh10ql+3iI="; + hash = "sha256-B7eswDq4tKyg881i3pLd6h+HsObK0c2dQnYuvPAGJHk="; }; - cargoSha256 = "0IYpuKq5amAcYtsDMzJGghbxkuldAulsgUmChTl2DIg="; + cargoSha256 = "jOzuCXsrtXp8dmJTBqrEq4nog6smEPbdsFAy+ruPtY8="; nativeBuildInputs = [ ] ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) pkg-config ++ lib.optional (installManPages || installShellCompletions) installShellFiles; buildInputs = [ ] + ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Security ] ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afd7b9b2eb4b..c3d1bc76d620 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32155,7 +32155,9 @@ with pkgs; hexedit = callPackage ../applications/editors/hexedit { }; - himalaya = callPackage ../applications/networking/mailreaders/himalaya { }; + himalaya = callPackage ../applications/networking/mailreaders/himalaya { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; + }; hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { };