beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-11-22 02:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

replace rustls-native-certs by rustls-platform-verifier

Browse source
This commit is contained in:
Clément DOUIN 2024-10-29 17:41:48 +01:00
parent ff1996107b
commit 55594cc6a7
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
3 changed files with 11 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Cargo.lock generated
View file

@ -1912,12 +1912,10 @@ dependencies = [
[[package]] [[package]]
name = "imap-client" name = "imap-client"
version = "0.1.5" version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/pimalaya/imap-client#c7e7dfb4779a2166d09ce18d8575f4e09e55e184"
checksum = "5e667382fe3b5f75c78af4f7028a44435ed5f6da8e91500037115cee1569d8c5"
dependencies = [ dependencies = [
"imap-next", "imap-next",
"once_cell", "rustls-platform-verifier",
"rustls-native-certs 0.8.0",
"thiserror", "thiserror",
"tokio", "tokio",
"tokio-rustls 0.26.0", "tokio-rustls 0.26.0",
@ -3370,19 +3368,6 @@ dependencies = [
"security-framework 2.11.1", "security-framework 2.11.1",
] ]
[[package]]
name = "rustls-native-certs"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
dependencies = [
"openssl-probe",
"rustls-pemfile 2.2.0",
"rustls-pki-types",
"schannel",
"security-framework 2.11.1",
]
[[package]] [[package]]
name = "rustls-pemfile" name = "rustls-pemfile"
version = "1.0.4" version = "1.0.4"
@ -3419,7 +3404,7 @@ dependencies = [
"log", "log",
"once_cell", "once_cell",
"rustls 0.23.16", "rustls 0.23.16",
"rustls-native-certs 0.7.3", "rustls-native-certs",
"rustls-platform-verifier-android", "rustls-platform-verifier-android",
"rustls-webpki 0.102.8", "rustls-webpki 0.102.8",
"security-framework 2.11.1", "security-framework 2.11.1",

1
Cargo.toml
View file

@ -67,6 +67,7 @@ url = "2.2"
uuid = { version = "0.8", features = ["v4"] } uuid = { version = "0.8", features = ["v4"] }
[patch.crates-io] [patch.crates-io]
imap-client = { git = "https://github.com/pimalaya/imap-client" }
email-lib = { git = "https://github.com/pimalaya/core" } email-lib = { git = "https://github.com/pimalaya/core" }
process-lib = { git = "https://github.com/pimalaya/core" } process-lib = { git = "https://github.com/pimalaya/core" }
secret-lib = { git = "https://github.com/pimalaya/core" } secret-lib = { git = "https://github.com/pimalaya/core" }

16
flake.nix
View file

@ -66,19 +66,17 @@
}; };
}; };
aarch64-linux = { aarch64-linux.aarch64-linux = {
aarch64-linux = { rustTarget = "aarch64-unknown-linux-musl";
rustTarget = "aarch64-unknown-linux-musl";
};
}; };
x86_64-darwin.x86_64-darwin = { x86_64-darwin.x86_64-darwin = {
rustTarget = "x86_64-apple-darwin"; rustTarget = "x86_64-apple-darwin";
mkPackage = { pkgs, ... }: package: mkPackage = { pkgs, ... }: package:
let inherit (pkgs.darwin.apple_sdk_11_0.frameworks) AppKit Cocoa CoreFoundation; let inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Cocoa Security;
in package // { in package // {
buildInputs = [ AppKit Cocoa CoreFoundation ]; buildInputs = [ ];
NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit -F${Cocoa}/Library/Frameworks -framework Cocoa -F${CoreFoundation}/Library/Frameworks -framework CoreFoundation"; # NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit -F${Cocoa}/Library/Frameworks -framework Cocoa -F${CoreFoundation}/Library/Frameworks -framework CoreFoundation";
}; };
}; };
@ -87,8 +85,8 @@
mkPackage = { pkgs, ... }: package: mkPackage = { pkgs, ... }: package:
let inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Cocoa; let inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Cocoa;
in package // { in package // {
buildInputs = [ Cocoa ]; # buildInputs = [ Cocoa ];
NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit"; # NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit";
}; };
}; };
}; };