Unverified Commit e57875a2 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #248409 from CobaltCause/conduit-0.6.0 

matrix-conduit: 0.5.0 -> 0.6.0
parents 200eeb9e 02fd938f

nixos/modules/services/matrix/conduit.nix

+10 −0
Original line number Diff line number Diff line
@@ -94,6 +94,16 @@ in 
                instance will require manual migration of data.

              '';

            };

            global.allow_check_for_updates = mkOption {

              type = types.bool;

              default = false;

              description = lib.mdDoc ''

                Whether to allow Conduit to automatically contact

                <https://conduit.rs> hourly to check for important Conduit news.



                Disabled by default because nixpkgs handles updates.

              '';

            };

          };

        };

        default = {};

pkgs/servers/matrix-conduit/Cargo.lock

+811 −586

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/servers/matrix-conduit/default.nix

+17 −6
Original line number Diff line number Diff line 
{ lib, rustPlatform, fetchFromGitLab, pkg-config, sqlite, stdenv, darwin, nixosTests, rocksdb_6_23 }:

{ lib

, rustPlatform

, fetchFromGitLab

, pkg-config

, sqlite

, stdenv

, darwin

, nixosTests

, rocksdb

}:



rustPlatform.buildRustPackage rec {

  pname = "matrix-conduit";

  version = "0.5.0";

  version = "0.6.0";



  src = fetchFromGitLab {

    owner = "famedly";

    repo = "conduit";

    rev = "v${version}";

    sha256 = "sha256-GSCpmn6XRbmnfH31R9c6QW3/pez9KHPjI99dR+ln0P4=";

    hash = "sha256-TpNssMHvSKcxJMas5lQNWEbIv09u4/niBN2C27Mp0JY=";

  };



  # We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace
@@ -18,7 +27,7 @@ rustPlatform.buildRustPackage rec { 
    outputHashes = {

      "heed-0.10.6" = "sha256-rm02pJ6wGYN4SsAbp85jBVHDQ5ITjZZd+79EC2ubRsY=";

      "reqwest-0.11.9" = "sha256-wH/q7REnkz30ENBIK5Rlxnc1F6vOyuEANMHFmiVPaGw=";

      "ruma-0.7.4" = "sha256-ztobLdOXSGyK1YcPMMIycO3ZmnjxG5mLkHltf0Fbs8s=";

      "ruma-0.8.2" = "sha256-GkHLY5unh7uyFNe0RS+3xQ4Ou8qBhzd+kEnCC7xUnMo=";

    };

  };
@@ -37,8 +46,10 @@ rustPlatform.buildRustPackage rec { 
    darwin.apple_sdk.frameworks.Security

  ];



  ROCKSDB_INCLUDE_DIR = "${rocksdb_6_23}/include";

  ROCKSDB_LIB_DIR = "${rocksdb_6_23}/lib";

  env = {

    ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";

    ROCKSDB_LIB_DIR = "${rocksdb}/lib";

  };



  # tests failed on x86_64-darwin with SIGILL: illegal instruction

  doCheck = !(stdenv.isx86_64 && stdenv.isDarwin);