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

Merge pull request #304747 from soywod/himalaya-v1.0.0-beta.4 

himalaya: 1.0.0-beta.3 -> 1.0.0-beta.4
parents a792d254 36fbcec3

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

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- `k3s`: was updated to version [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2), all previous versions (k3s_1_26, k3s_1_27, k3s_1_28) will be removed. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information.



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

- `himalaya` was updated to `v1.0.0-beta.4`, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.4) 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→pkgs/by-name/hi/himalaya/package.nix

+14 −8
Original line number Diff line number Diff line
@@ -3,9 +3,7 @@ 
, fetchFromGitHub

, stdenv

, pkg-config

, AppKit

, Cocoa

, Security

, darwin

, installShellFiles

, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform

, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
@@ -16,26 +14,34 @@ 
}:



rustPlatform.buildRustPackage rec {

  # Learn more about available cargo features at:

  #  - <https://pimalaya.org/himalaya/cli/latest/installation.html#cargo>

  inherit buildNoDefaultFeatures buildFeatures;



  pname = "himalaya";

  version = "1.0.0-beta.3";

  version = "1.0.0-beta.4";



  src = fetchFromGitHub {

    owner = "soywod";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-B7eswDq4tKyg881i3pLd6h+HsObK0c2dQnYuvPAGJHk=";

    hash = "sha256-NrWBg0sjaz/uLsNs8/T4MkUgHOUvAWRix1O5usKsw6o=";

  };



  cargoSha256 = "jOzuCXsrtXp8dmJTBqrEq4nog6smEPbdsFAy+ruPtY8=";

  cargoSha256 = "YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8=";



  nativeBuildInputs = [ ]

  NIX_LDFLAGS = lib.optionals stdenv.isDarwin [

    "-F${darwin.apple_sdk.frameworks.AppKit}/Library/Frameworks"

    "-framework"

    "AppKit"

  ];



  nativeBuildInputs = [ pkg-config ]

    ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) pkg-config

    ++ lib.optional (installManPages || installShellCompletions) installShellFiles;



  buildInputs = [ ]

    ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Security ]

    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa Security ])

    ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch

    ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme;

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -31725,10 +31725,6 @@ with pkgs; 














  hexedit = callPackage ../applications/editors/hexedit { };



























  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 = callPackage ../applications/networking/instant-messengers/hydrogen-web/wrapper.nix {