beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-11-24 20:10:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

clean darwin fix

Browse source 
commit 994515f3dbd3fa41c50fb5a080d584a7be365601
Author: Clément DOUIN <clement.douin@posteo.net>
Date:   Tue Oct 29 19:38:43 2024 +0100

    clean

commit ac3d181628
Author: Clément DOUIN <clement.douin@posteo.net>
Date:   Tue Oct 29 19:25:35 2024 +0100

    replace buildInputs by NIX_LDFLAGS

commit 4d69fd56e2
Author: Clément DOUIN <clement.douin@posteo.net>
Date:   Tue Oct 29 19:06:03 2024 +0100

    remove NIX_LDFLAGS

commit 69a6d17570
Author: Clément DOUIN <clement.douin@posteo.net>
Date:   Tue Oct 29 18:50:52 2024 +0100

    use framework 11.0

commit 97ee430bc8
Author: Clément DOUIN <clement.douin@posteo.net>
Date:   Tue Oct 29 18:19:42 2024 +0100

    revert flake lock

commit 61905bb849
Author: Clément DOUIN <clement.douin@posteo.net>
Date:   Tue Oct 29 18:01:21 2024 +0100

    clean aarch64 nix conf

commit 55594cc6a7
Author: Clément DOUIN <clement.douin@posteo.net>
Date:   Tue Oct 29 17:41:48 2024 +0100

    replace rustls-native-certs by rustls-platform-verifier
This commit is contained in:
Clément DOUIN 2024-10-29 19:39:43 +01:00
parent ff1996107b
commit fecbae001c
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
4 changed files with 13 additions and 36 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" }

8
flake.lock
View file

@ -79,16 +79,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729880355, "lastModified": 1730137625,
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

17
flake.nix
View file

@ -2,7 +2,7 @@
description = "CLI to manage emails"; description = "CLI to manage emails";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
gitignore = { gitignore = {
url = "github:hercules-ci/gitignore.nix"; url = "github:hercules-ci/gitignore.nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -66,30 +66,21 @@
}; };
}; };
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_11_0.frameworks) Security;
in package // { in package // {
buildInputs = [ AppKit Cocoa CoreFoundation ]; NIX_LDFLAGS = "-F${Security}/Library/Frameworks -framework Security";
NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit -F${Cocoa}/Library/Frameworks -framework Cocoa -F${CoreFoundation}/Library/Frameworks -framework CoreFoundation";
}; };
}; };
aarch64-darwin.aarch64-darwin = { aarch64-darwin.aarch64-darwin = {
rustTarget = "aarch64-apple-darwin"; rustTarget = "aarch64-apple-darwin";
mkPackage = { pkgs, ... }: package:
let inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Cocoa;
in package // {
buildInputs = [ Cocoa ];
NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit";
};
}; };
}; };