From 0917caa4007de86b9ac6bf8ef60d7c1552e85a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Wed, 27 Nov 2024 20:39:13 +0100
Subject: [PATCH] fix features and workflows

---
 .github/workflows/build-on-demand.yml | 16 +++++++---------
 .github/workflows/pre-release.yml     |  3 ++-
 Cargo.toml                            | 10 +++++-----
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-on-demand.yml b/.github/workflows/build-on-demand.yml
index 1d34bb2d..8dce8052 100644
--- a/.github/workflows/build-on-demand.yml
+++ b/.github/workflows/build-on-demand.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       target:
-        description: "Target"
+        description: Target
         required: true
         type: choice
         options:
@@ -19,11 +19,11 @@ on:
           - x86_64-unknown-linux-musl
           - x86_64-w64-mingw32
       defaultFeatures:
-        description: "Enable default cargo features"
+        description: Enable default cargo features
         default: true
         type: bool
       features:
-        description: "Cargo features (comma-separated)"
+        description: Cargo features (comma-separated)
         type: string
 
 jobs:
@@ -42,7 +42,7 @@ jobs:
         uses: cachix/cachix-action@v15
         with:
           name: soywod
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
           extraPullNames: nix-community
       - name: Build release
         run: |
@@ -51,10 +51,8 @@ jobs:
             --arg fenix 'import (fetchTarball "https://github.com/soywod/fenix/archive/main.tar.gz") { }' \
             --arg defaultFeatures ${{ inputs.defaultFeatures }} \
             --argstr features ${{ inputs.features }}
-      - name: Upload release artifact
+      - name: Upload release
         uses: actions/upload-artifact@v4
         with:
-          name: "himalaya-${{ inputs.target }}"
-          path: |
-            result/bin/himalaya*
-            result/bin/share
+          name: himalaya-${{ inputs.target }}
+          path: result/*
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index d1a241d7..5404047d 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -35,7 +35,8 @@ jobs:
       - name: Install Nix
         uses: cachix/install-nix-action@v27
         with:
-          nix_path: nixpkgs=channel:nixos-24.05
+          # TODO: nix_path: nixpkgs=channel:nixos-unstable
+          nix_path: nixpkgs=https://github.com/soywod/nixpkgs/archive/master.tar.gz
           enable_kvm: true
           extra_nix_config: experimental-features = nix-command flakes
       - name: Cache Nix store
diff --git a/Cargo.toml b/Cargo.toml
index 2f66bc18..bf3a1d12 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,14 +18,14 @@ rustdoc-args = ["--cfg", "docsrs"]
 [features]
 default = [
   "imap",
-  #"maildir",
+  "maildir",
   #"notmuch",
-  #"smtp",
-  #"sendmail",
+  "smtp",
+  "sendmail",
   #"keyring",
   #"oauth2",
-  #"wizard",
-  #"pgp-commands",
+  "wizard",
+  "pgp-commands",
   #"pgp-gpg",
   #"pgp-native",
 ]