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

authored by Gaétan Lepage and committed by GitHub 55f5a7d2 f449a6e4

+20 -16
+11 -10
pkgs/by-name/ma/matrix-conduit/package.nix
··· 10 10 rust-jemalloc-sys, 11 11 }: 12 12 13 - rustPlatform.buildRustPackage rec { 13 + rustPlatform.buildRustPackage (finalAttrs: { 14 14 pname = "matrix-conduit"; 15 - version = "0.9.0"; 15 + version = "0.10.3"; 16 16 17 17 src = fetchFromGitLab { 18 18 owner = "famedly"; 19 19 repo = "conduit"; 20 - rev = "v${version}"; 21 - hash = "sha256-mQLfRAun2G/LDnw3jyFGJbOqpxh2PL8IGzFELRfAgAI="; 20 + tag = "v${finalAttrs.version}"; 21 + hash = "sha256-cLPfgRchYLJXA13Xr1Yg3v+O/7SvxWYIAxaKvnsm7HM="; 22 22 }; 23 23 24 24 useFetchCargoVendor = true; 25 - cargoHash = "sha256-r7fOzTug0cKQUGrpXDn1JKb6/lLQDgnA3/colmldA4c="; 25 + cargoHash = "sha256-i/x6V/0WgMUuZoG8znREmAnLqw/9lYPk4F5i2SA5mmo="; 26 26 27 27 # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite. 28 28 preBuild = '' 29 - substituteInPlace Cargo.toml --replace "features = [\"bundled\"]" "features = []" 29 + substituteInPlace Cargo.toml --replace-fail "features = [\"bundled\"]" "features = []" 30 30 cargo update --offline -p rusqlite 31 31 ''; 32 32 ··· 38 38 buildInputs = [ 39 39 sqlite 40 40 rust-jemalloc-sys 41 + rocksdb 41 42 ]; 42 43 43 44 env = { ··· 52 53 inherit (nixosTests) matrix-conduit; 53 54 }; 54 55 55 - meta = with lib; { 56 + meta = { 56 57 description = "Matrix homeserver written in Rust"; 57 58 homepage = "https://conduit.rs/"; 58 - license = licenses.asl20; 59 - maintainers = with maintainers; [ 59 + license = lib.licenses.asl20; 60 + maintainers = with lib.maintainers; [ 60 61 pstn 61 62 pimeys 62 63 ]; 63 64 mainProgram = "conduit"; 64 65 }; 65 - } 66 + })
+3 -3
pkgs/by-name/ro/rocksdb/package.nix
··· 20 20 21 21 stdenv.mkDerivation (finalAttrs: { 22 22 pname = "rocksdb"; 23 - version = "9.10.0"; 23 + version = "10.2.1"; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "facebook"; 27 27 repo = "rocksdb"; 28 - rev = "v${finalAttrs.version}"; 29 - hash = "sha256-G+DlQwEUyd7JOCjS1Hg1cKWmA/qAiK8UpUIKcP+riGQ="; 28 + tag = "v${finalAttrs.version}"; 29 + hash = "sha256-v8kZShgz0O3nHZwWjTvhcM56qAs/le1XgMVYyvVd4tg="; 30 30 }; 31 31 32 32 patches = lib.optional (
+6 -3
pkgs/by-name/st/stalwart-mail/package.nix
··· 19 19 stalwartEnterprise ? false, 20 20 }: 21 21 22 - rustPlatform.buildRustPackage rec { 22 + rustPlatform.buildRustPackage (finalAttrs: { 23 23 pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise"); 24 24 version = "0.11.8"; 25 25 26 26 src = fetchFromGitHub { 27 27 owner = "stalwartlabs"; 28 28 repo = "mail-server"; 29 - tag = "v${version}"; 29 + tag = "v${finalAttrs.version}"; 30 30 hash = "sha256-VqGosbSQxNeOS+kGtvXAmz6vyz5mJlXvKZM57B1Xue4="; 31 31 }; 32 32 ··· 149 149 150 150 doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); 151 151 152 + # Allow network access during tests on Darwin/macOS 153 + __darwinAllowLocalNetworking = true; 154 + 152 155 passthru = { 153 156 inherit rocksdb; # make used rocksdb version available (e.g., for backup scripts) 154 157 webadmin = callPackage ./webadmin.nix { }; ··· 178 181 pandapip1 179 182 ]; 180 183 }; 181 - } 184 + })