Unverified Commit 55f5a7d2 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

matrix-conduit: 0.9.0 -> 0.10.3 (#409425)

parents f449a6e4 f94efea4

pkgs/by-name/ma/matrix-conduit/package.nix

+11 −10
Original line number Diff line number Diff line
@@ -10,23 +10,23 @@ 
  rust-jemalloc-sys,

}:



rustPlatform.buildRustPackage rec {

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "matrix-conduit";

  version = "0.9.0";

  version = "0.10.3";



  src = fetchFromGitLab {

    owner = "famedly";

    repo = "conduit";

    rev = "v${version}";

    hash = "sha256-mQLfRAun2G/LDnw3jyFGJbOqpxh2PL8IGzFELRfAgAI=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-cLPfgRchYLJXA13Xr1Yg3v+O/7SvxWYIAxaKvnsm7HM=";

  };



  useFetchCargoVendor = true;

  cargoHash = "sha256-r7fOzTug0cKQUGrpXDn1JKb6/lLQDgnA3/colmldA4c=";

  cargoHash = "sha256-i/x6V/0WgMUuZoG8znREmAnLqw/9lYPk4F5i2SA5mmo=";



  # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite.

  preBuild = ''

    substituteInPlace Cargo.toml --replace "features = [\"bundled\"]" "features = []"

    substituteInPlace Cargo.toml --replace-fail "features = [\"bundled\"]" "features = []"

    cargo update --offline -p rusqlite

  '';
@@ -38,6 +38,7 @@ rustPlatform.buildRustPackage rec { 
  buildInputs = [

    sqlite

    rust-jemalloc-sys

    rocksdb

  ];



  env = {
@@ -52,14 +53,14 @@ rustPlatform.buildRustPackage rec { 
    inherit (nixosTests) matrix-conduit;

  };



  meta = with lib; {

  meta = {

    description = "Matrix homeserver written in Rust";

    homepage = "https://conduit.rs/";

    license = licenses.asl20;

    maintainers = with maintainers; [

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [

      pstn

      pimeys

    ];

    mainProgram = "conduit";

  };

}
 
})

pkgs/by-name/ro/rocksdb/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "rocksdb";

  version = "9.10.0";

  version = "10.2.1";



  src = fetchFromGitHub {

    owner = "facebook";

    repo = "rocksdb";

    rev = "v${finalAttrs.version}";

    hash = "sha256-G+DlQwEUyd7JOCjS1Hg1cKWmA/qAiK8UpUIKcP+riGQ=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-v8kZShgz0O3nHZwWjTvhcM56qAs/le1XgMVYyvVd4tg=";

  };



  patches = lib.optional (

pkgs/by-name/st/stalwart-mail/package.nix

+6 −3
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ 
  stalwartEnterprise ? false,

}:



rustPlatform.buildRustPackage rec {

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise");

  version = "0.11.8";



  src = fetchFromGitHub {

    owner = "stalwartlabs";

    repo = "mail-server";

    tag = "v${version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-VqGosbSQxNeOS+kGtvXAmz6vyz5mJlXvKZM57B1Xue4=";

  };
@@ -149,6 +149,9 @@ rustPlatform.buildRustPackage rec { 


  doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);



  # Allow network access during tests on Darwin/macOS

  __darwinAllowLocalNetworking = true;



  passthru = {

    inherit rocksdb; # make used rocksdb version available (e.g., for backup scripts)

    webadmin = callPackage ./webadmin.nix { };
@@ -178,4 +181,4 @@ rustPlatform.buildRustPackage rec { 
      pandapip1

    ];

  };

}
 
})