chore(deps): update nixpkgs pin

Nixpkgs has removed support for x86_64-darwin, so removing that from
CI's flake check.

A x86_64-darwin binary is still built via Stack.
This commit is contained in:
Wolfgang Walther
2026-08-02 14:51:50 +00:00
parent 57e8d20811
commit 42754cb6c9
7 changed files with 15 additions and 20 deletions
-1
View File
@@ -191,7 +191,6 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
runs-on: runs-on:
- macos-15-intel # x86_64-darwin
- macos-14 # aarch64-darwin - macos-14 # aarch64-darwin
- ubuntu-24.04 # x86_64-linux - ubuntu-24.04 # x86_64-linux
- ubuntu-24.04-arm # aarch64-linux - ubuntu-24.04-arm # aarch64-linux
Generated
+3 -3
View File
@@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1782918843, "lastModified": 1784115452,
"narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", "narHash": "sha256-BoYPdqk6jlKXy+DyUzyGV/CtRGfAhk2MmIgBhsemTGI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e8273b29fe1390ec8d4603f2477357555291432e", "rev": "35d3407a3816f3b341d8cf1d60abaf2b7b8166ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
+2 -1
View File
@@ -21,6 +21,7 @@ let
name = "postgrest-style"; name = "postgrest-style";
docs = "Automatically format Haskell, Nix and Python files."; docs = "Automatically format Haskell, Nix and Python files.";
workingDir = "/"; workingDir = "/";
withTmpDir = true;
} }
'' ''
# Format Nix files # Format Nix files
@@ -32,7 +33,7 @@ let
| xargs ${stylish-haskell}/bin/stylish-haskell -i | xargs ${stylish-haskell}/bin/stylish-haskell -i
# Format Python files # Format Python files
${black}/bin/black . TMPDIR="$tmpdir" ${black}/bin/black .
''; '';
# Script to check whether any uncommitted changes result from postgrest-style # Script to check whether any uncommitted changes result from postgrest-style
-1
View File
@@ -4,7 +4,6 @@ import shutil
import uuid import uuid
import yaml import yaml
BASEDIR = pathlib.Path(os.path.realpath(__file__)).parent BASEDIR = pathlib.Path(os.path.realpath(__file__)).parent
CONFIGSDIR = BASEDIR / "configs" CONFIGSDIR = BASEDIR / "configs"
FIXTURES = yaml.load( FIXTURES = yaml.load(
+1 -1
View File
@@ -215,7 +215,7 @@ def run_pgproxy(env=None, proxy_timeout="1s"):
) )
if process.poll() is not None: if process.poll() is not None:
(_, stderr_output) = process.communicate(timeout=1) _, stderr_output = process.communicate(timeout=1)
raise RuntimeError( raise RuntimeError(
f"{NGINX_BIN} exited with {process.returncode}: {stderr_output}" f"{NGINX_BIN} exited with {process.returncode}: {stderr_output}"
) )
+5 -5
View File
@@ -62,7 +62,7 @@ def cli(args, env=None, stdin=None, expect_error=False):
process.stdin.write(stdin or b"") process.stdin.write(stdin or b"")
try: try:
(stdout_output, stderr_output) = process.communicate(timeout=5) stdout_output, stderr_output = process.communicate(timeout=5)
if expect_error: # When expected to fail, return stderr, else stdout if expect_error: # When expected to fail, return stderr, else stdout
if process.returncode == 0: if process.returncode == 0:
raise PostgrestError( raise PostgrestError(
@@ -310,7 +310,7 @@ def test_cli_ready_flag_success(host, defaultenv):
with run(env=defaultenv, host=host, port=port, admin_port=admin_port) as postgrest: with run(env=defaultenv, host=host, port=port, admin_port=admin_port) as postgrest:
output = cli(["--ready"], env=postgrest.config) output = cli(["--ready"], env=postgrest.config)
(admin_host, admin_port) = get_admin_host_and_port_from_config(postgrest.config) admin_host, admin_port = get_admin_host_and_port_from_config(postgrest.config)
if is_ipv6(host): if is_ipv6(host):
assert f"OK: http://[{admin_host}]:{admin_port}/ready" in output assert f"OK: http://[{admin_host}]:{admin_port}/ready" in output
@@ -344,7 +344,7 @@ def test_cli_ready_flag_fail_when_schema_cache_not_loaded(defaultenv, metapostgr
postgrest.wait_until_scache_starts_loading() postgrest.wait_until_scache_starts_loading()
output = cli(["--ready"], env=postgrest.config, expect_error=True) output = cli(["--ready"], env=postgrest.config, expect_error=True)
(admin_host, admin_port) = get_admin_host_and_port_from_config(postgrest.config) admin_host, admin_port = get_admin_host_and_port_from_config(postgrest.config)
assert f"ERROR: http://{admin_host}:{admin_port}/ready" in output assert f"ERROR: http://{admin_host}:{admin_port}/ready" in output
@@ -362,7 +362,7 @@ def test_cli_ready_flag_fail_with_http_exception(defaultenv):
postgrest.config["PGRST_ADMIN_SERVER_PORT"] = str(freeport(used_ports)) postgrest.config["PGRST_ADMIN_SERVER_PORT"] = str(freeport(used_ports))
output = cli(["--ready"], env=postgrest.config, expect_error=True) output = cli(["--ready"], env=postgrest.config, expect_error=True)
(admin_host, admin_port) = get_admin_host_and_port_from_config(postgrest.config) admin_host, admin_port = get_admin_host_and_port_from_config(postgrest.config)
assert ( assert (
f"ERROR: connection refused to http://{admin_host}:{admin_port}/ready" f"ERROR: connection refused to http://{admin_host}:{admin_port}/ready"
@@ -373,7 +373,7 @@ def test_cli_ready_flag_fail_with_http_exception(defaultenv):
with run(env=defaultenv, port=port, admin_port=admin_port) as postgrest: with run(env=defaultenv, port=port, admin_port=admin_port) as postgrest:
postgrest.config["PGRST_ADMIN_SERVER_PORT"] = str(-1) postgrest.config["PGRST_ADMIN_SERVER_PORT"] = str(-1)
output = cli(["--ready"], env=postgrest.config, expect_error=True) output = cli(["--ready"], env=postgrest.config, expect_error=True)
(admin_host, admin_port) = get_admin_host_and_port_from_config(postgrest.config) admin_host, admin_port = get_admin_host_and_port_from_config(postgrest.config)
assert f"ERROR: invalid url - http://{admin_host}:{admin_port}/ready" in output assert f"ERROR: invalid url - http://{admin_host}:{admin_port}/ready" in output
+4 -8
View File
@@ -896,25 +896,21 @@ def test_stale_schema_cache_dropped_table_returns_database_error(defaultenv):
} }
try: try:
psql_as_superuser( psql_as_superuser("""
"""
drop table if exists stale_schema_cache_items; drop table if exists stale_schema_cache_items;
create table stale_schema_cache_items(id int primary key); create table stale_schema_cache_items(id int primary key);
insert into stale_schema_cache_items values (1); insert into stale_schema_cache_items values (1);
grant select on stale_schema_cache_items to postgrest_test_anonymous; grant select on stale_schema_cache_items to postgrest_test_anonymous;
""" """)
)
with run(env=env, wait_max_seconds=10) as postgrest: with run(env=env, wait_max_seconds=10) as postgrest:
response = postgrest.session.get("/stale_schema_cache_items") response = postgrest.session.get("/stale_schema_cache_items")
assert response.status_code == 200 assert response.status_code == 200
psql_as_superuser( psql_as_superuser("""
"""
drop table stale_schema_cache_items; drop table stale_schema_cache_items;
notify pgrst, 'reload schema'; notify pgrst, 'reload schema';
""" """)
)
response = postgrest.session.get("/stale_schema_cache_items") response = postgrest.session.get("/stale_schema_cache_items")
payload = response.json() payload = response.json()