diff options
| author | Yt <raphael@megzari.com> | 2024-03-18 23:23:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-18 23:23:23 +0000 |
| commit | e6bf74e26a1292ca83a65a8bb27b2b22224dcb26 (patch) | |
| tree | b3ac0431068fad38c73b0b1d022167310a988e52 | |
| parent | 142d2b81d037fbb10f12b80af23a853a6d256ad6 (diff) | |
| parent | 33f3c988220217dad6325f1945b25d516fcec7f1 (diff) | |
Merge pull request #296379 from sikmir/surrealdb
surrealdb: 1.2.1 → 1.3.1
| -rw-r--r-- | pkgs/by-name/su/surrealdb/package.nix (renamed from pkgs/servers/nosql/surrealdb/default.nix) | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/servers/nosql/surrealdb/default.nix b/pkgs/by-name/su/surrealdb/package.nix index ce1ed67d20464..f5c8fecc1b09e 100644 --- a/pkgs/servers/nosql/surrealdb/default.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37a66afda18e9..e538b399da7da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |