From 6145cee0eb7395931d0c7854d922b3f92b605e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org> Date: Wed, 29 Jan 2025 02:21:04 +0100 Subject: [PATCH] Modify subxt and add nix file --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- default.nix | 8 ++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 default.nix diff --git a/Cargo.lock b/Cargo.lock index 574da92..79c3d6e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5466,7 +5466,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "subxt" version = "0.37.0" -source = "git+https://github.com/duniter/subxt?branch=subxt-v0.37.0-duniter-substrate-v1.14.0#00f181c1a5d8986e7146ddc72a745c793a9a1d8e" +source = "git+https://github.com/immae/subxt?branch=no-rename#ef2ff00f866a1557d824ddee501ad0254e37a567" dependencies = [ "async-trait", "derive-where", @@ -5501,7 +5501,7 @@ dependencies = [ [[package]] name = "subxt-codegen" version = "0.37.0" -source = "git+https://github.com/duniter/subxt?branch=subxt-v0.37.0-duniter-substrate-v1.14.0#00f181c1a5d8986e7146ddc72a745c793a9a1d8e" +source = "git+https://github.com/immae/subxt?branch=no-rename#ef2ff00f866a1557d824ddee501ad0254e37a567" dependencies = [ "frame-metadata 16.0.0", "heck 0.5.0", @@ -5521,7 +5521,7 @@ dependencies = [ [[package]] name = "subxt-core" version = "0.37.0" -source = "git+https://github.com/duniter/subxt?branch=subxt-v0.37.0-duniter-substrate-v1.14.0#00f181c1a5d8986e7146ddc72a745c793a9a1d8e" +source = "git+https://github.com/immae/subxt?branch=no-rename#ef2ff00f866a1557d824ddee501ad0254e37a567" dependencies = [ "base58", "blake2", @@ -5549,7 +5549,7 @@ dependencies = [ [[package]] name = "subxt-lightclient" version = "0.37.0" -source = "git+https://github.com/duniter/subxt?branch=subxt-v0.37.0-duniter-substrate-v1.14.0#00f181c1a5d8986e7146ddc72a745c793a9a1d8e" +source = "git+https://github.com/immae/subxt?branch=no-rename#ef2ff00f866a1557d824ddee501ad0254e37a567" dependencies = [ "futures", "futures-util", @@ -5565,7 +5565,7 @@ dependencies = [ [[package]] name = "subxt-macro" version = "0.37.0" -source = "git+https://github.com/duniter/subxt?branch=subxt-v0.37.0-duniter-substrate-v1.14.0#00f181c1a5d8986e7146ddc72a745c793a9a1d8e" +source = "git+https://github.com/immae/subxt?branch=no-rename#ef2ff00f866a1557d824ddee501ad0254e37a567" dependencies = [ "darling 0.20.10", "parity-scale-codec", @@ -5579,7 +5579,7 @@ dependencies = [ [[package]] name = "subxt-metadata" version = "0.37.0" -source = "git+https://github.com/duniter/subxt?branch=subxt-v0.37.0-duniter-substrate-v1.14.0#00f181c1a5d8986e7146ddc72a745c793a9a1d8e" +source = "git+https://github.com/immae/subxt?branch=no-rename#ef2ff00f866a1557d824ddee501ad0254e37a567" dependencies = [ "frame-metadata 16.0.0", "hashbrown 0.14.5", diff --git a/Cargo.toml b/Cargo.toml index 9487a8e..a1fde22 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ version = "0.3.0" [dependencies] # subxt is main dependency -subxt = { git = 'https://github.com/duniter/subxt', branch = 'subxt-v0.37.0-duniter-substrate-v1.14.0', default-features = false, features = [ +subxt = { git = 'https://github.com/immae/subxt', branch = 'no-rename', default-features = false, features = [ "substrate-compat", "native", "jsonrpsee", diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..22da660 --- /dev/null +++ b/default.nix @@ -0,0 +1,8 @@ +{ pkgs ? import <nixpkgs> {} }: with pkgs; +rustPlatform.buildRustPackage { + pname = "gcli"; + version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version; + src = lib.cleanSource ./.; + cargoHash = "sha256-RTlCWeFMJw1LFLhTYofwLHlpFGmV168DAloiqbkeBig="; + useFetchCargoVendor = true; +} -- GitLab