Merge pull request #296379 from sikmir/surrealdb

surrealdb: 1.2.1 → 1.3.1
This commit is contained in:
Yt 2024-03-18 23:23:23 +00:00 committed by GitHub
commit e6bf74e26a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 9 deletions

View File

@ -7,22 +7,22 @@
, rocksdb
, testers
, surrealdb
, SystemConfiguration
, darwin
, protobuf
}:
rustPlatform.buildRustPackage rec {
pname = "surrealdb";
version = "1.2.1";
version = "1.3.1";
src = fetchFromGitHub {
owner = "surrealdb";
repo = "surrealdb";
rev = "v${version}";
hash = "sha256-ICQvAyBV+7cyHiwwiPEaoGT/W/pM4yiSpqByzkByRK4=";
hash = "sha256-dnfgU7nTX3vvqN9Mox6USRfpFdEI/dAOKIVZ2Jd4t9o=";
};
cargoHash = "sha256-a9ZRr6U7mKCk2uaXJmCJMaCQxJ9adbRLMRUpJrsookk=";
cargoHash = "sha256-B+x+xEcwHqoYMolAuMQzSiO/QA1FiBGO3eis9kgN1S4=";
# error: linker `aarch64-linux-gnu-gcc` not found
postPatch = ''
@ -41,13 +41,19 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
doCheck = false;
checkFlags = [
# flaky
"--skip=ws_integration::none::merge"
# requires docker
"--skip=database_upgrade"
];
__darwinAllowLocalNetworking = true;
passthru.tests.version = testers.testVersion {
package = surrealdb;
command = "surreal version";

View File

@ -27025,10 +27025,6 @@ with pkgs;
storm = callPackage ../servers/computing/storm { };
surrealdb = callPackage ../servers/nosql/surrealdb {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { };
slurm = callPackage ../servers/computing/slurm { };