Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

aerogramme: fix build #344205

Merged
merged 1 commit into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions pkgs/by-name/ae/aerogramme/0001-update-time-rs.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
From ad754664a05808bdbb976906a86ad0b08f16eb32 Mon Sep 17 00:00:00 2001
From: wxt <[email protected]>
Date: Tue, 24 Sep 2024 20:38:19 +0800
Subject: [PATCH] update time-rs

---
Cargo.lock | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0a159ae..cf6b1c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2468,6 +2468,12 @@ dependencies = [
"num-traits",
]

+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-integer"
version = "0.1.45"
@@ -3579,12 +3585,13 @@ dependencies = [

[[package]]
name = "time"
-version = "0.3.31"
+version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
"deranged",
"itoa",
+ "num-conv",
"powerfmt",
"serde",
"time-core",
@@ -3599,10 +3606,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

[[package]]
name = "time-macros"
-version = "0.2.16"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
+ "num-conv",
"time-core",
]

--
2.46.0

16 changes: 12 additions & 4 deletions pkgs/by-name/ae/aerogramme/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 11 additions & 5 deletions pkgs/by-name/ae/aerogramme/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,20 @@
openssl,
}:

rustPlatform.buildRustPackage {
RUSTC_BOOTSTRAP = true;

rustPlatform.buildRustPackage rec {
pname = "aerogramme";
version = "0.3.0";

src = fetchgit {
url = "https://git.deuxfleurs.fr/Deuxfleurs/aerogramme/";
rev = "refs/tags/${version}";
hash = "sha256-ER+P/XGqNzTLwDLK5EBZq/Dl29ZZKl2FdxDb+oLEJ8Y=";
};

cargoPatches = [
./0001-update-time-rs.patch
];

# must use our own Cargo.lock due to git dependencies
cargoLock = {
lockFile = ./Cargo.lock;
Expand All @@ -31,8 +34,11 @@ rustPlatform.buildRustPackage {
# disable network tests as Nix sandbox breaks them
doCheck = false;

# get openssl-sys to use pkg-config
OPENSSL_NO_VENDOR = 1;
env = {
# get openssl-sys to use pkg-config
OPENSSL_NO_VENDOR = true;
RUSTC_BOOTSTRAP = true;
};

nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
Expand Down