Unverified Commit 729d9dde authored by h7x4's avatar h7x4 Committed by GitHub
Browse files

Upgrade matrix-sdk-crypto-nodejs and reverse-deps to fix build with new rust version (#348448)

parents 0988cc13 3da8e64e

nixos/modules/services/matrix/mjolnir.nix

+4 −0
Original line number Diff line number Diff line
@@ -186,6 +186,10 @@ in 
      }

    ];



    # This defaults to true in the application,

    # which breaks older configs using pantalaimon or access tokens

    services.mjolnir.settings.encryption.use = lib.mkDefault false;



    services.pantalaimon-headless.instances."mjolnir" = lib.mkIf cfg.pantalaimon.enable

      {

        homeserver = cfg.homeserverUrl;

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

deleted100644 → 0
+0 −6253

File deleted.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+2309 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+68 −5
Original line number Diff line number Diff line 
import ./generic.nix {

{

  lib,

  stdenv,

  fetchFromGitHub,

  cargo,

  rustPlatform,

  rustc,

  napi-rs-cli,

  nodejs,

  libiconv,

}:



stdenv.mkDerivation rec {

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

  version = "0.1.0-beta.3";



  src = fetchFromGitHub {

    owner = "matrix-org";

    repo = "matrix-rust-sdk";

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

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

  outputHashes = {

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

  };

  cargoLock = ./Cargo-beta.3.lock;



  patches = [

    # This is needed because two versions of indexed_db_futures are present (which will fail to vendor, see https://github.com/rust-lang/cargo/issues/10310).

    # (matrix-sdk-crypto-nodejs doesn't use this dependency, we only need to remove it to vendor the dependencies successfully.)

    ./remove-duplicate-dependency.patch

  ];



  cargoDeps = rustPlatform.importCargoLock {

    lockFile = ./Cargo-beta.3.lock;

    outputHashes = {

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

    };

  };



  nativeBuildInputs = [

    rustPlatform.cargoSetupHook

    cargo

    rustc

    napi-rs-cli

    nodejs

  ];



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];



  buildPhase = ''

    runHook preBuild



    cd bindings/${pname}

    npm run release-build --offline



    runHook postBuild

  '';



  installPhase = ''

    runHook preInstall



    local -r outPath="$out/lib/node_modules/@matrix-org/${pname}"

    mkdir -p "$outPath"

    cp package.json index.js index.d.ts matrix-sdk-crypto.*.node "$outPath"



    runHook postInstall

  '';



  meta = with lib; {

    description = "No-network-IO implementation of a state machine that handles E2EE for Matrix clients";

    homepage = "https://github.com/matrix-org/matrix-rust-sdk/tree/${src.rev}/bindings/matrix-sdk-crypto-nodejs";

    license = licenses.asl20;

    maintainers = with maintainers; [

      winter

      dandellion

    ];

    inherit (nodejs.meta) platforms;

  };

}

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

+70 −9
Original line number Diff line number Diff line 
import ./generic.nix {

  version = "0.1.0-beta.6";

  hash = "sha256-0oLk7yq/XELS0GkeZj7PxY3KKXfzws0djF3KmxYisY0=";

{

  lib,

  stdenv,

  fetchFromGitHub,

  cargo,

  rustPlatform,

  rustc,

  napi-rs-cli,

  nodejs,

  libiconv,

}:



stdenv.mkDerivation rec {

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

  version = "0.2.0-beta.1";



  src = fetchFromGitHub {

    owner = "matrix-org";

    repo = "matrix-rust-sdk-crypto-nodejs";

    rev = "v${version}";

    hash = "sha256-g86RPfhF9XHpbXhHRbyhl920VazCrQyRQrYV6tVCHy4=";

  };



  cargoDeps = rustPlatform.importCargoLock {

    lockFile = ./Cargo.lock;

    outputHashes = {

    "ruma-0.8.2" = "sha256-bKvcElIVugj+gZZhPFPGfCqva4fo1IqW/e9gf+q/Tfw=";

    "uniffi-0.23.0" = "sha256-4WUp3PQm3ZgqHNMvz9+PBtNAeiq6m4PBViwXpQDglLk=";

    "vodozemac-0.3.0" = "sha256-tAimsVD8SZmlVybb7HvRffwlNsfb7gLWGCplmwbLIVE=";

      "matrix-sdk-base-0.7.0" = "sha256-nCiG4T/MB7gvGrmadKOEbh8+54081PHee9Bm8oY/nl0=";

      "ruma-0.10.1" = "sha256-Yc5RKk4aRjNIoQsMl30fFehTDCkRO9VvenAvLoVHzXo=";

      "vodozemac-0.6.0" = "sha256-jJgrJJ0SFcy2oRRZ3ubuKnM2pLO8Tx6NyXordWJjz8o=";

    };

  };



  nativeBuildInputs = [

    rustPlatform.cargoSetupHook

    cargo

    rustc

    napi-rs-cli

    nodejs

  ];



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];



  buildPhase = ''

    runHook preBuild



    npm run release-build --offline



    runHook postBuild

  '';



  installPhase = ''

    runHook preInstall



    local -r outPath="$out/lib/node_modules/@matrix-org/${pname}"

    mkdir -p "$outPath"

    cp package.json index.js index.d.ts matrix-sdk-crypto.*.node "$outPath"



    runHook postInstall

  '';



  meta = with lib; {

    description = "No-network-IO implementation of a state machine that handles E2EE for Matrix clients";

    homepage = "https://github.com/matrix-org/matrix-rust-sdk-crypto-nodejs";

    changelog = "https://github.com/matrix-org/matrix-rust-sdk-crypto-nodejs/blob/main/CHANGELOG.md";

    license = licenses.asl20;

    maintainers = with maintainers; [

      winter

      dandellion

    ];

    inherit (nodejs.meta) platforms;

  };

  cargoLock = ./Cargo-beta.6.lock;

  patches = [];

}