Merge branch 'py-postgres' into 'master'

Update stuff in db and python

See merge request redox-os/redox!2004

recipes/wip/db/postgresql18/recipe.toml

@@ -0,0 +1,15 @@
+#TODO require sys/ipc.h
+[source]
+tar = "https://ftp.postgresql.org/pub/source/v18.3/postgresql-18.3.tar.bz2"
+blake3 = "52696c9d474ce3e2073f97d4ba891af59ffc67a9dfb8f9f5adac409d1fe0dc28"
+patches = [
+    "redox.patch"
+]
+[build]
+template = "meson"
+mesonflags = [
+]
+dependencies = [
+    "zstd",
+    "readline",
+]

recipes/wip/db/postgresql18/redox.patch

@@ -0,0 +1,40 @@
+diff --color -ruwN source/meson.build source-new/meson.build
+--- source/meson.build	2026-02-24 04:56:43.000000000 +0700
++++ source-new/meson.build	2026-03-14 10:58:35.570033768 +0700
+@@ -256,6 +256,10 @@
+   # LDFLAGS.
+   ldflags += ['-Wl,-z,now', '-Wl,-z,relro']
+ 
++elif host_system == 'redox'
++  sema_kind = 'unnamed_posix'
++  shmem_kind = 'sysv'
++
+ elif host_system == 'openbsd'
+   # you're ok
+ 
+diff --color -ruwN source/src/include/port/redox.h source-new/src/include/port/redox.h
+--- source/src/include/port/redox.h	1970-01-01 07:00:00.000000000 +0700
++++ source-new/src/include/port/redox.h	2026-03-14 10:50:26.877146350 +0700
+@@ -0,0 +1 @@
++/* src/include/port/redox.h */
+diff --color -ruwN source/src/makefiles/Makefile.redox source-new/src/makefiles/Makefile.redox
+--- source/src/makefiles/Makefile.redox	1970-01-01 07:00:00.000000000 +0700
++++ source-new/src/makefiles/Makefile.redox	2026-03-14 10:51:25.313879766 +0700
+@@ -0,0 +1,6 @@
++rpath = -Wl,-R'$(rpathdir)'
++
++
++# Rule for building a shared library from a single .o file
++%.so: %.o
++	$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@
+diff --color -ruwN source/src/template/redox source-new/src/template/redox
+--- source/src/template/redox	1970-01-01 07:00:00.000000000 +0700
++++ source-new/src/template/redox	2026-03-14 10:55:40.896750233 +0700
+@@ -0,0 +1,7 @@
++# src/template/redox
++
++# Prefer unnamed POSIX semaphores
++PREFERRED_SEMAPHORES=UNNAMED_POSIX
++
++# Extra CFLAGS for code that will go into a shared library
++CFLAGS_SL="-fPIC"

recipes/wip/db/valkey/recipe.toml

@@ -1,12 +1,13 @@
-#TODO Compiling, server crashes in page fault
+#TODO compiled but not tested
 [source]
 git = "https://github.com/valkey-io/valkey"
-rev = "a47e8fa1505578d78cef5c5e11da0972c3dae560" # 8.1.3
+shallow_clone = true
+rev = "9.0.3"
 
 [build]
 template = "custom"
 dependencies = [
-    "openssl1"
+    "openssl3"
 ]
 
 script = """
@@ -14,6 +15,6 @@ rsync -av --delete "${COOKBOOK_SOURCE}"/* ./
 ${COOKBOOK_MAKE} MALLOC=libc BUILD_TLS=yes \
     WARN="-Wall -W -Wno-missing-field-initializers" \
     WARNINGS="-Wall -W -Wno-missing-field-initializers" \
-    AR="${TARGET}-gcc-ar"
+    AR="${TARGET}-gcc-ar" CFLAGS="${CFLAGS} ${CPPFLAGS}"
 ${COOKBOOK_MAKE} install PREFIX="${COOKBOOK_STAGE}"/usr
 """

recipes/wip/dev/lang/nodejs-21/recipe.toml

@@ -1,4 +1,4 @@
-#TODO node is working but ld.so crashing with npm
+#TODO promote
 [source]
 tar = "https://nodejs.org/dist/v21.7.3/node-v21.7.3.tar.xz"
 blake3 = "95a56db4f9729b2f8384ab58ccb2ec0c41da05991f7400ef97bd76748d77870b"

recipes/wip/dev/python/ruff/recipe.toml

@@ -1,8 +1,14 @@
-#TODO tikv-jemalloc-sys crate error
+#TODO compiled but not tested
 [source]
-git = "https://github.com/charliermarsh/ruff"
+git = "https://github.com/astral-sh/ruff"
+rev = "93a16bd05fba249439848beb6fbcbf3e8a436f03"
+shallow_clone = true
+patches = [
+    "redox.patch"
+]
+
 [build]
-template = "custom"
-script = """
-cookbook_cargo_packages ruff_cli
-"""
+template = "cargo"
+cargopackages = [
+    "ruff"
+]

recipes/wip/dev/python/ruff/redox.patch

@@ -0,0 +1,140 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 2fe49f0b..aa1a7c85 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -573,14 +573,13 @@ checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
+ [[package]]
+ name = "clearscreen"
+ version = "4.0.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5def4343d62f01f67ff1a49147e4a15112e936c6a6a3f8ff7a29394e76468244"
++source = "git+https://github.com/willnode/clearscreen?branch=redox#f4c6937931b51daaf5ed15e60ecfde5c55e40c18"
+ dependencies = [
+  "nix 0.31.1",
+  "terminfo",
+  "thiserror 2.0.18",
+  "which",
+- "windows-sys 0.60.2",
++ "windows-sys 0.61.0",
+ ]
+ 
+ [[package]]
+@@ -710,7 +709,7 @@ version = "3.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34"
+ dependencies = [
+- "windows-sys 0.59.0",
++ "windows-sys 0.52.0",
+ ]
+ 
+ [[package]]
+@@ -1077,7 +1076,7 @@ dependencies = [
+  "libc",
+  "option-ext",
+  "redox_users",
+- "windows-sys 0.60.2",
++ "windows-sys 0.61.0",
+ ]
+ 
+ [[package]]
+@@ -1169,7 +1168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+ dependencies = [
+  "libc",
+- "windows-sys 0.59.0",
++ "windows-sys 0.52.0",
+ ]
+ 
+ [[package]]
+@@ -1835,7 +1834,7 @@ dependencies = [
+  "portable-atomic",
+  "portable-atomic-util",
+  "serde_core",
+- "windows-sys 0.59.0",
++ "windows-sys 0.52.0",
+ ]
+ 
+ [[package]]
+@@ -3731,7 +3730,7 @@ dependencies = [
+  "errno",
+  "libc",
+  "linux-raw-sys",
+- "windows-sys 0.59.0",
++ "windows-sys 0.52.0",
+ ]
+ 
+ [[package]]
+@@ -4139,7 +4138,7 @@ dependencies = [
+  "getrandom 0.4.1",
+  "once_cell",
+  "rustix",
+- "windows-sys 0.59.0",
++ "windows-sys 0.52.0",
+ ]
+ 
+ [[package]]
+@@ -5344,7 +5343,7 @@ version = "0.1.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+ dependencies = [
+- "windows-sys 0.59.0",
++ "windows-sys 0.52.0",
+ ]
+ 
+ [[package]]
+diff --git a/Cargo.toml b/Cargo.toml
+index 5bedb191..ff6aa34a 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -73,7 +73,7 @@ cachedir = { version = "0.3.1" }
+ camino = { version = "1.1.7" }
+ clap = { version = "4.5.3", features = ["derive"] }
+ clap_complete_command = { version = "0.6.0" }
+-clearscreen = { version = "4.0.0" }
++clearscreen = { git = "https://github.com/willnode/clearscreen", branch = "redox" }
+ codspeed-criterion-compat = { version = "4.0.4", default-features = false }
+ colored = { version = "3.0.0" }
+ compact_str = "0.9.0"
+@@ -282,8 +282,7 @@ if_not_else = "allow"
+ large_stack_arrays = "allow"
+ 
+ [profile.release]
+-lto = "fat"
+-codegen-units = 16
++lto = "thin"
+ 
+ # Some crates don't change as much but benefit more from
+ # more expensive optimization passes, so we selectively
+diff --git a/crates/ruff/Cargo.toml b/crates/ruff/Cargo.toml
+index b972d4b0..4172e1bd 100644
+--- a/crates/ruff/Cargo.toml
++++ b/crates/ruff/Cargo.toml
+@@ -70,7 +70,7 @@ tracing = { workspace = true, features = ["log"] }
+ walkdir = { workspace = true }
+ wild = { workspace = true }
+ 
+-[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), not(target_os = "aix"), not(target_os = "android"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dependencies]
++[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), not(target_os = "aix"), not(target_os = "android"), not(target_os = "redox"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dependencies]
+ tikv-jemallocator = { workspace = true }
+ 
+ [target.'cfg(target_os = "windows")'.dependencies]
+diff --git a/crates/ruff/src/main.rs b/crates/ruff/src/main.rs
+index 4342a360..19211e58 100644
+--- a/crates/ruff/src/main.rs
++++ b/crates/ruff/src/main.rs
+@@ -17,6 +17,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
+     not(target_os = "openbsd"),
+     not(target_os = "aix"),
+     not(target_os = "android"),
++    not(target_os = "redox"),
+     any(
+         target_arch = "x86_64",
+         target_arch = "aarch64",
+diff --git a/rust-toolchain.toml b/rust-toolchain.toml
+deleted file mode 100644
+index 79d20990..00000000
+--- a/rust-toolchain.toml
++++ /dev/null
+@@ -1,2 +0,0 @@
+-[toolchain]
+-channel = "1.93"

recipes/wip/dev/python/rye/recipe.toml

@@ -1,13 +0,0 @@
-#TODO openssl-sys crate error
-[source]
-git = "https://github.com/mitsuhiko/rye"
-[build]
-template = "custom"
-dependencies = [
-    "openssl1",
-]
-script = """
-export OPENSSL_DIR="${COOKBOOK_SYSROOT}"
-export OPENSSL_STATIC="true"
-cookbook_cargo_packages rye
-"""

recipes/wip/dev/python/uv/recipe.toml

@@ -1,11 +1,12 @@
-#TODO fs2 crate error
+#TODO nix and rustix crate error
 [source]
 git = "https://github.com/astral-sh/uv"
+shallow_clone = true
 [build]
-template = "custom"
+template = "cargo"
 dependencies = [
-    "openssl1",
+    "openssl3",
+]
+cargopackages = [
+    "uv"
 ]
-script = """
-cookbook_cargo_packages uv
-"""