From cd3f5d28096754cb91c79c94fb67b82d7760f414 Mon Sep 17 00:00:00 2001 From: Adminy <22717869+adminy@users.noreply.github.com> Date: Sun, 16 Feb 2025 08:39:06 +0000 Subject: [PATCH 1/4] surrealdb: 2.0.2 -> 2.2.0 Version Bump --- pkgs/by-name/su/surrealdb/package.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 83416ddc8aac..8f7022301761 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -5,29 +5,23 @@ fetchFromGitHub, pkg-config, openssl, - rocksdb_8_3, + rocksdb, testers, surrealdb, darwin, protobuf, -}: - -let - rocksdb = rocksdb_8_3; -in -rustPlatform.buildRustPackage rec { +}: rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "2.0.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-kTTZx/IXXJrkC0qm4Nx0hYPbricNjwFshCq0aFYCTo0="; + hash = "sha256-gsIeoxSfbHHSdpPn6xAB/t5w3cLtpu6MjTuf5xsI6wI="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-yJfpxklHD/qbEoUS4OMAzlc9/0d/iW3EABU6AK/Maqo="; + cargoHash = "sha256-OXcQsDCiT3seMQhyKEKfC8pcd4MXwbql5+ZDGGkhPMI="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' @@ -54,8 +48,6 @@ rustPlatform.buildRustPackage rec { doCheck = false; checkFlags = [ - # flaky - "--skip=ws_integration::none::merge" # requires docker "--skip=database_upgrade" ]; From 040ad6961fd3c4316ed1750bf4d1d1f4f000991b Mon Sep 17 00:00:00 2001 From: Adminy <22717869+adminy@users.noreply.github.com> Date: Mon, 17 Feb 2025 09:58:02 +0000 Subject: [PATCH 2/4] Update pkgs/by-name/su/surrealdb/package.nix Co-authored-by: raf --- pkgs/by-name/su/surrealdb/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 8f7022301761..2711eb83c15c 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -17,7 +17,7 @@ src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-gsIeoxSfbHHSdpPn6xAB/t5w3cLtpu6MjTuf5xsI6wI="; }; From 7402a62392d16d84317256cc0cac12de3dd53587 Mon Sep 17 00:00:00 2001 From: Adminy <22717869+adminy@users.noreply.github.com> Date: Mon, 17 Feb 2025 09:58:19 +0000 Subject: [PATCH 3/4] Update pkgs/by-name/su/surrealdb/package.nix Co-authored-by: raf --- pkgs/by-name/su/surrealdb/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 2711eb83c15c..d072b61769ef 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -21,6 +21,7 @@ hash = "sha256-gsIeoxSfbHHSdpPn6xAB/t5w3cLtpu6MjTuf5xsI6wI="; }; + useFetchCargoVendor = true; cargoHash = "sha256-OXcQsDCiT3seMQhyKEKfC8pcd4MXwbql5+ZDGGkhPMI="; # error: linker `aarch64-linux-gnu-gcc` not found From 825a12f1803711466c297ecfe5d8c8b29f0f1cc4 Mon Sep 17 00:00:00 2001 From: Adminy <22717869+adminy@users.noreply.github.com> Date: Mon, 17 Feb 2025 10:05:33 +0000 Subject: [PATCH 4/4] formatting --- pkgs/by-name/su/surrealdb/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index d072b61769ef..e9e40d9c0922 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -10,7 +10,8 @@ surrealdb, darwin, protobuf, -}: rustPlatform.buildRustPackage rec { +}: +rustPlatform.buildRustPackage rec { pname = "surrealdb"; version = "2.2.0"; @@ -21,7 +22,7 @@ hash = "sha256-gsIeoxSfbHHSdpPn6xAB/t5w3cLtpu6MjTuf5xsI6wI="; }; - useFetchCargoVendor = true; + useFetchCargoVendor = true; cargoHash = "sha256-OXcQsDCiT3seMQhyKEKfC8pcd4MXwbql5+ZDGGkhPMI="; # error: linker `aarch64-linux-gnu-gcc` not found