dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #291335 from soywod/himalaya-v1.0.0-beta.3

Browse Source 
himalaya: 1.0.0-beta.2 -> 1.0.0-beta.3
This commit is contained in:
Yt 2024-02-27 23:15:17 +00:00 committed by GitHub
commit f35896eab2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -107,7 +107,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- `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. - 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.

10
pkgs/applications/networking/mailreaders/himalaya/default.nix
View File

@ -3,6 +3,9 @@
, fetchFromGitHub , fetchFromGitHub
, stdenv , stdenv
, pkg-config , pkg-config
, AppKit
, Cocoa
, Security
, installShellFiles , installShellFiles
, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform , installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform , installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
@ -16,22 +19,23 @@ rustPlatform.buildRustPackage rec {
inherit buildNoDefaultFeatures buildFeatures; inherit buildNoDefaultFeatures buildFeatures;
pname = "himalaya"; pname = "himalaya";
version = "1.0.0-beta.2"; version = "1.0.0-beta.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "soywod"; owner = "soywod";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-dLj/bEPz3SD1v54yXbtVdUJKQsyw0OJxmQh10ql+3iI="; hash = "sha256-B7eswDq4tKyg881i3pLd6h+HsObK0c2dQnYuvPAGJHk=";
}; };
cargoSha256 = "0IYpuKq5amAcYtsDMzJGghbxkuldAulsgUmChTl2DIg="; cargoSha256 = "jOzuCXsrtXp8dmJTBqrEq4nog6smEPbdsFAy+ruPtY8=";
nativeBuildInputs = [ ] nativeBuildInputs = [ ]
++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) pkg-config ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) pkg-config
++ lib.optional (installManPages || installShellCompletions) installShellFiles; ++ lib.optional (installManPages || installShellCompletions) installShellFiles;
buildInputs = [ ] buildInputs = [ ]
++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Security ]
++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch
++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme; ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme;

4
pkgs/top-level/all-packages.nix
View File

@ -32112,7 +32112,9 @@ with pkgs;
hexedit = callPackage ../applications/editors/hexedit { }; 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 { }; hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { };