Unverified Commit f35896ea authored by Yt's avatar Yt Committed by GitHub
Browse files

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

himalaya: 1.0.0-beta.2 -> 1.0.0-beta.3
parents 15231e8f 503df1ef

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

+1 −1
Original line number Diff line number Diff line
@@ -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. -->



- `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.

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

+7 −3
Original line number Diff line number Diff line
@@ -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;

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -32112,7 +32112,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 { };