prepare v0.6.2

soywod · soywod · commit 9bfd85bf3373 · 2022-12-21T15:50:04.000+01:00
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -13124,6 +13124,16 @@
     githubId = 6277322;
     name = "Wei Tang";
   };
+  soywod = {
+    name = "Clément DOUIN";
+    email = "clement.douin@posteo.net";
+    matrix = "@soywod:matrix.org";
+    github = "soywod";
+    githubId = 10437171;
+    keys = [{
+      fingerprint = "75F0 AB7C FE01 D077 AEE6  CAFD 353E 4A18 EE0F AB72";
+    }];
+  };
   spacefrogg = {
     email = "spacefrogg-nixos@meterriblecrew.net";
     github = "spacefrogg";
diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -2,8 +2,9 @@
 , rustPlatform
 , fetchFromGitHub
 , stdenv
-, enableCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
 , installShellFiles
+, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
+, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
 , pkg-config
 , Security
 , libiconv
@@ -12,7 +13,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "himalaya";
-  version = "0.6.0";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "soywod";
@@ -23,7 +24,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-ICaahkIP1uSm4iXvSPMo8uVTtSa1nCyJdDihGdVEQvg=";
 
-  nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ]
+  nativeBuildInputs = [ ]
+    ++ lib.optionals (installManPages || installShellCompletions) [ installShellFiles ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];
 
   buildInputs =
@@ -38,8 +40,14 @@ rustPlatform.buildRustPackage rec {
   # additional tooling and servers to test
   cargoTestFlags = [ "--lib" ];
 
-  postInstall = lib.optionalString enableCompletions ''
-    # Install shell function
+
+  postInstall = lib.optionalString installManPages ''
+    # Install man pages
+    mkdir -p $out/man
+    $out/bin/himalaya man $out/man
+    installManPage $out/man/*
+  '' ++ lib.optionalString installShellCompletions ''
+    # Install shell completions
     installShellCompletion --cmd himalaya \
       --bash <($out/bin/himalaya completion bash) \
       --fish <($out/bin/himalaya completion fish) \
@@ -50,7 +58,7 @@ rustPlatform.buildRustPackage rec {
     description = "Command-line interface for email management";
     homepage = "https://github.com/soywod/himalaya";
     changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md";
-    license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ toastal yanganto ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ soywod toastal yanganto ];
   };
 }
