Unverified Commit 79f934c8 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #220317 from linyinfeng/update-matrix-sdk-crypto-nodejs 

matrix-sdk-crypto-nodejs: 0.1.0-beta.2 -> 0.1.0-beta.3
parents 0957bca8 53a63959

pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock

0 → 100644
+5564 −0

File added.

Preview size limit exceeded, changes collapsed.

pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix

+7 −6
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


stdenv.mkDerivation rec {

  pname = "matrix-sdk-crypto-nodejs";

  version = "0.1.0-beta.2";

  version = "0.1.0-beta.3";



  src = fetchFromGitHub {

    owner = "matrix-org";

    repo = "matrix-rust-sdk";

    rev = "${pname}-v${version}";

    hash = "sha256-E++0tm/2d8/3zAXwovJ71uF2sxDORWyJNnA3e1Q3NLA=";

    hash = "sha256-0p+1cMn9PU+Jk2JW7G+sdzxhMaI3gEAk5w2nm05oBSU=";

  };



  patches = [
@@ -17,10 +17,11 @@ stdenv.mkDerivation rec { 
    ./remove-duplicate-dependency.patch

  ];



  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src patches;

    name = "${pname}-${version}";

    hash = "sha256-G2Um7vHinOuOx9U2BH14LAx+s/0Sxtlc9Nz6nPJfmU8=";

  cargoDeps = rustPlatform.importCargoLock {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "uniffi-0.21.0" = "sha256-blKCfCsSNtr8NtO7Let7VJ/9oGuW9Eu8j9A6/oHUcP0=";

    };

  };



  nativeBuildInputs = [

pkgs/development/libraries/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch

+25 −17
Original line number Diff line number Diff line 
diff --git a/Cargo.lock b/Cargo.lock

index 2ddfdd0..3fcca5f 100644

index 208ef4ff..b5045040 100644

--- a/Cargo.lock

+++ b/Cargo.lock

@@ -1985,20 +1985,6 @@ version = "0.3.3"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"

@@ -2124,19 +2124,6 @@ dependencies = [

  "web-sys",

 ]

 

-[[package]]

-name = "indexed_db_futures"

-version = "0.2.3"

-source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "d26ac735f676c52305becf53264b91cea9866a8de61ccbf464405b377b9cbca9"

-source = "git+https://github.com/Hywan/rust-indexed-db?branch=feat-factory-nodejs#5dab67890cea0ab88b967031adc09179a537d77c"

-dependencies = [

- "cfg-if",

- "js-sys",
@@ -21,12 +20,12 @@ index 2ddfdd0..3fcca5f 100644 
-]

-

 [[package]]

 name = "indexed_db_futures"

 version = "0.2.3"

@@ -2558,8 +2544,7 @@ dependencies = [

 name = "indexmap"

 version = "1.9.1"

@@ -2726,8 +2713,7 @@ dependencies = [

  "derive_builder",

  "futures-util",

  "getrandom 0.2.7",

  "gloo-utils",

- "indexed_db_futures 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",

- "indexed_db_futures 0.2.3 (git+https://github.com/Hywan/rust-indexed-db?branch=feat-factory-nodejs)",

+ "indexed_db_futures",
@@ -34,14 +33,23 @@ index 2ddfdd0..3fcca5f 100644 
  "matrix-sdk-base",

  "matrix-sdk-common",

diff --git a/crates/matrix-sdk-indexeddb/Cargo.toml b/crates/matrix-sdk-indexeddb/Cargo.toml

index 7f23dfc..c57e29a 100644

index 5b0ef4f4..da73979b 100644

--- a/crates/matrix-sdk-indexeddb/Cargo.toml

+++ b/crates/matrix-sdk-indexeddb/Cargo.toml

@@ -30,7 +30,6 @@ js-sys = { version = "0.3.58" }

@@ -16,7 +16,7 @@ rustdoc-args = ["--cfg", "docsrs"]

 [features]

 default = ["e2e-encryption"]

 e2e-encryption = ["matrix-sdk-base/e2e-encryption", "dep:matrix-sdk-crypto", "dashmap"]

-experimental-nodejs = ["indexed_db_futures_nodejs"]

+experimental-nodejs = []

 

 [dependencies]

 anyhow = "1.0.57"

@@ -26,7 +26,6 @@ dashmap = { version = "5.2.0", optional = true }

 derive_builder = "0.11.2"

 gloo-utils = { version = "0.1", features = ["serde"] }

 indexed_db_futures = "0.2.3"

-indexed_db_futures_nodejs = { version = "0.2.3", package = "indexed_db_futures", git = "https://github.com/Hywan/rust-indexed-db", branch = "feat-factory-nodejs", optional = true }

 js-sys = { version = "0.3.58" }

 matrix-sdk-base = { version = "0.6.0", path = "../matrix-sdk-base", features = ["js"] }

 matrix-sdk-crypto = { version = "0.6.0", path = "../matrix-sdk-crypto", features = ["js"], optional = true }
 
 matrix-sdk-store-encryption = { version = "0.2.0", path = "../matrix-sdk-store-encryption" }

-indexed_db_futures = "0.2.3"

 indexed_db_futures_nodejs = { package = "indexed_db_futures", git = "https://github.com/Hywan/rust-indexed-db", branch = "feat-factory-nodejs", optional = true }

 ruma = "0.7.0"

 serde = "1.0.136"