From fecbae001c723bd13c2d65de07988db9222b9b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Tue, 29 Oct 2024 19:39:43 +0100 Subject: [PATCH] clean darwin fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 994515f3dbd3fa41c50fb5a080d584a7be365601 Author: Clément DOUIN Date: Tue Oct 29 19:38:43 2024 +0100 clean commit ac3d181628a0475434b16b245e00f51f691c2e8b Author: Clément DOUIN Date: Tue Oct 29 19:25:35 2024 +0100 replace buildInputs by NIX_LDFLAGS commit 4d69fd56e27306e2da7a5dce08f42893f3dbee4a Author: Clément DOUIN Date: Tue Oct 29 19:06:03 2024 +0100 remove NIX_LDFLAGS commit 69a6d17570e76f5536a7fe386a06112fd7648c03 Author: Clément DOUIN Date: Tue Oct 29 18:50:52 2024 +0100 use framework 11.0 commit 97ee430bc86578bb7779032a01727d2d4ec7963a Author: Clément DOUIN Date: Tue Oct 29 18:19:42 2024 +0100 revert flake lock commit 61905bb849ae61c842296ed51096e49db87c6211 Author: Clément DOUIN Date: Tue Oct 29 18:01:21 2024 +0100 clean aarch64 nix conf commit 55594cc6a777cadd22c8fae2a6e44457b515f90f Author: Clément DOUIN Date: Tue Oct 29 17:41:48 2024 +0100 replace rustls-native-certs by rustls-platform-verifier --- Cargo.lock | 21 +++------------------ Cargo.toml | 1 + flake.lock | 8 ++++---- flake.nix | 19 +++++-------------- 4 files changed, 13 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 36ea5f1..773859c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1912,12 +1912,10 @@ dependencies = [ [[package]] name = "imap-client" version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e667382fe3b5f75c78af4f7028a44435ed5f6da8e91500037115cee1569d8c5" +source = "git+https://github.com/pimalaya/imap-client#c7e7dfb4779a2166d09ce18d8575f4e09e55e184" dependencies = [ "imap-next", - "once_cell", - "rustls-native-certs 0.8.0", + "rustls-platform-verifier", "thiserror", "tokio", "tokio-rustls 0.26.0", @@ -3370,19 +3368,6 @@ dependencies = [ "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]] name = "rustls-pemfile" version = "1.0.4" @@ -3419,7 +3404,7 @@ dependencies = [ "log", "once_cell", "rustls 0.23.16", - "rustls-native-certs 0.7.3", + "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki 0.102.8", "security-framework 2.11.1", diff --git a/Cargo.toml b/Cargo.toml index 46983b6..d83c23e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,6 +67,7 @@ url = "2.2" uuid = { version = "0.8", features = ["v4"] } [patch.crates-io] +imap-client = { git = "https://github.com/pimalaya/imap-client" } email-lib = { git = "https://github.com/pimalaya/core" } process-lib = { git = "https://github.com/pimalaya/core" } secret-lib = { git = "https://github.com/pimalaya/core" } diff --git a/flake.lock b/flake.lock index ebc91aa..86a4dc9 100644 --- a/flake.lock +++ b/flake.lock @@ -79,16 +79,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1730137625, + "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 1b7dc9b..41362cc 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "CLI to manage emails"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; gitignore = { url = "github:hercules-ci/gitignore.nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -66,30 +66,21 @@ }; }; - aarch64-linux = { - aarch64-linux = { - rustTarget = "aarch64-unknown-linux-musl"; - }; + aarch64-linux.aarch64-linux = { + rustTarget = "aarch64-unknown-linux-musl"; }; x86_64-darwin.x86_64-darwin = { rustTarget = "x86_64-apple-darwin"; 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 // { - buildInputs = [ AppKit Cocoa CoreFoundation ]; - NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit -F${Cocoa}/Library/Frameworks -framework Cocoa -F${CoreFoundation}/Library/Frameworks -framework CoreFoundation"; + NIX_LDFLAGS = "-F${Security}/Library/Frameworks -framework Security"; }; }; aarch64-darwin.aarch64-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"; - }; }; };