diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-10 21:45:18 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-10 21:45:18 +0200 |
| commit | 294201004fe344a10684be4d592c0c22d3caebfc (patch) | |
| tree | 1b708587af55ca0861a93ffa96f19c0cdc8f93fe /pkgs/servers | |
| parent | 265121ef549be513ffddda5e69704238691649b9 (diff) | |
| parent | c606d772abab3612fadad3a067f65fb1846ad26b (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/matrix-conduit/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/minio/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix index d328a8d5c2332..de6ce56072c91 100644 --- a/pkgs/servers/matrix-conduit/default.nix +++ b/pkgs/servers/matrix-conduit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, rustPlatform, pkgs }: +{ stdenv, lib, fetchFromGitLab, rustPlatform, pkg-config, rocksdb }: rustPlatform.buildRustPackage rec { pname = "matrix-conduit"; @@ -13,12 +13,12 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-vE44I8lQ5VAfZB4WKLRv/xudoZJaFJGTT/UuumTePBU="; - nativeBuildInputs = with pkgs; [ + nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ]; - buildInputs = with pkgs; [ + buildInputs = [ rocksdb ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 2c783e5fc492c..b7171a4bdecf6 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-10-05T14-58-27Z"; + version = "2022-10-08T20-11-00Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-LDBv00l+f6tLDxS8JRh+l0SGfKvqd/dcxDrw268qFbU="; + sha256 = "sha256-mLyhKiCSQcGXykoGUA+alzOadyI68MNlg0WL7ko8D7c="; }; - vendorSha256 = "sha256-tePKsEiUHeHgxtTP0wbRGVkYOQFMwgVkpXOYLnP13NA="; + vendorSha256 = "sha256-POls1yyNRdXeMgis5otcVFNf3w/x4QGKDtxVfRoQJck="; doCheck = false; |