From 59163eefa3fe2788e41e01566a7e5b4f6ef07590 Mon Sep 17 00:00:00 2001 From: Yuri Albuquerque Date: Wed, 12 Mar 2025 11:05:34 -0300 Subject: [PATCH 1/2] anchor: 0.30.1 -> 0.31.0 --- .../an/anchor/0001-update-time-rs.patch | 88 ------------------- pkgs/by-name/an/anchor/package.nix | 8 +- 2 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 pkgs/by-name/an/anchor/0001-update-time-rs.patch diff --git a/pkgs/by-name/an/anchor/0001-update-time-rs.patch b/pkgs/by-name/an/anchor/0001-update-time-rs.patch deleted file mode 100644 index 7b6a5852889f..000000000000 --- a/pkgs/by-name/an/anchor/0001-update-time-rs.patch +++ /dev/null @@ -1,88 +0,0 @@ -From ff4dfb52767695c066b4ad027983c0d4958094b3 Mon Sep 17 00:00:00 2001 -From: wxt <3264117476@qq.com> -Date: Tue, 24 Sep 2024 17:20:19 +0800 -Subject: [PATCH] update time-rs - ---- - Cargo.lock | 30 ++++++++++++++++++++++++------ - 1 file changed, 24 insertions(+), 6 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index d588e86c..f09caad8 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1432,9 +1432,12 @@ dependencies = [ - - [[package]] - name = "deranged" --version = "0.3.8" -+version = "0.3.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", -+] - - [[package]] - name = "derivation-path" -@@ -2629,6 +2632,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-derive" - version = "0.3.3" -@@ -3014,6 +3023,12 @@ dependencies = [ - "rand 0.8.5", - ] - -+[[package]] -+name = "powerfmt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -+ - [[package]] - name = "ppv-lite86" - version = "0.2.17" -@@ -5276,12 +5291,14 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.29" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", -+ "num-conv", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -5295,10 +5312,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.15" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - --- -2.46.0 - diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix index 700b3f9bcd75..089b37f66499 100644 --- a/pkgs/by-name/an/anchor/package.nix +++ b/pkgs/by-name/an/anchor/package.nix @@ -6,20 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "anchor"; - version = "0.30.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "coral-xyz"; repo = "anchor"; rev = "v${version}"; - hash = "sha256-NL8ySfvnCGKu1PTU4PJKTQt+Vsbcj+F1YYDzu0mSUoY="; + hash = "sha256-rwf2PWHoUl8Rkmktb2u7veRrIcLT3syi7M2OZxdxjG4="; fetchSubmodules = true; }; - cargoPatches = [ ./0001-update-time-rs.patch ]; - useFetchCargoVendor = true; - cargoHash = "sha256-CeTkYqRD5Xk61evYLGn8Gtdn2fTUmpKKPyPLtmABv6A="; + cargoHash = "sha256-ack2/WFrycfYHYVnZt0Q94WJdQrvLU/VZYm1KeqOjIQ="; checkFlags = [ # the following test cases try to access network, skip them From 866d932dc82b5eab35156d368c2fb0a1dbff77e5 Mon Sep 17 00:00:00 2001 From: Yuri Albuquerque Date: Wed, 12 Mar 2025 13:15:29 -0300 Subject: [PATCH 2/2] anchor: add Denommus as maintainer --- pkgs/by-name/an/anchor/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix index 089b37f66499..0c497b16f119 100644 --- a/pkgs/by-name/an/anchor/package.nix +++ b/pkgs/by-name/an/anchor/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/coral-xyz/anchor"; changelog = "https://github.com/coral-xyz/anchor/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ Denommus ]; mainProgram = "anchor"; }; }