chore(deps): update nixpkgs to latest nixpkgs-unstable

This allows building TemplateHaskell with GHC 9.6+ via iserv-proxy.
This commit is contained in:
Wolfgang Walther
2026-04-19 13:16:55 +00:00
parent 1b74b93466
commit 051b4799de
11 changed files with 14 additions and 40 deletions
-6
View File
@@ -1,6 +0,0 @@
# TODO: Remove this once a new actionlint release has been cut
# and made its way to us through nixpkgs.
self-hosted-runner:
labels:
- macos-15-intel
- ubuntu-24.04-arm
@@ -8,7 +8,6 @@ inputs:
required: true required: true
save-prs: save-prs:
description: Whether to additionally store the cache in a pull request, too. Should only be used for very small caches. description: Whether to additionally store the cache in a pull request, too. Should only be used for very small caches.
type: boolean
prefix: prefix:
description: Cache key prefix to be used in both primary key and restore-keys. description: Cache key prefix to be used in both primary key and restore-keys.
required: true required: true
Generated
+4 -4
View File
@@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1752006229, "lastModified": 1776329215,
"narHash": "sha256-BeuAPwNM2RBc5bvUTb0j4GRs2yBkDeRCw/8Y3v9Xesc=", "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c80edd02003fe3d8af527215a3ac069be9cfd47f", "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixpkgs-25.05-darwin", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
+1 -1
View File
@@ -2,7 +2,7 @@
description = "REST API for any Postgres database"; description = "REST API for any Postgres database";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
}; };
nixConfig = { nixConfig = {
+2 -20
View File
@@ -49,26 +49,6 @@ let
# Before upgrading fuzzyset to 0.3, check: https://github.com/PostgREST/postgrest/issues/3329 # Before upgrading fuzzyset to 0.3, check: https://github.com/PostgREST/postgrest/issues/3329
fuzzyset = prev.fuzzyset_0_2_4; fuzzyset = prev.fuzzyset_0_2_4;
# TODO: Remove once available in nixpkgs haskellPackages
configurator-pg =
prev.callHackageDirect
{
pkg = "configurator-pg";
ver = "0.2.11";
sha256 = "sha256-mtGtNawDJgz2ZIEVca+IYXVu4oNw9xsfJiYWAqAbbgc=";
}
{ };
# TODO: Remove once available in nixpkgs haskellPackages
streaming-commons =
prev.callHackageDirect
{
pkg = "streaming-commons";
ver = "0.2.3.1";
sha256 = "sha256-Gl2eaJcWe1sxmcE/octWlH9uSnERguf+5H66K4fV87s=";
}
{ };
# Downgrade hasql and related packages while we are still on GHC 9.4 for the static build. # Downgrade hasql and related packages while we are still on GHC 9.4 for the static build.
hasql = lib.dontCheck (lib.doJailbreak prev.hasql_1_6_4_4); hasql = lib.dontCheck (lib.doJailbreak prev.hasql_1_6_4_4);
hasql-dynamic-statements = lib.dontCheck prev.hasql-dynamic-statements_0_3_1_5; hasql-dynamic-statements = lib.dontCheck prev.hasql-dynamic-statements_0_3_1_5;
@@ -77,6 +57,8 @@ let
hasql-pool = lib.dontCheck prev.hasql-pool_1_0_1; hasql-pool = lib.dontCheck prev.hasql-pool_1_0_1;
hasql-transaction = lib.dontCheck prev.hasql-transaction_1_1_0_1; hasql-transaction = lib.dontCheck prev.hasql-transaction_1_1_0_1;
postgresql-binary = lib.dontCheck (lib.doJailbreak prev.postgresql-binary_0_13_1_3); postgresql-binary = lib.dontCheck (lib.doJailbreak prev.postgresql-binary_0_13_1_3);
text-builder = prev.text-builder_0_6_10;
text-builder-dev = prev.text-builder-dev_0_3_10;
}; };
in in
{ {
+1 -1
View File
@@ -172,7 +172,7 @@ let
# The following unsets all GIT_ variables. # The following unsets all GIT_ variables.
unset "''${!GIT_@}" unset "''${!GIT_@}"
# shellcheck disable=SC2317 # shellcheck disable=SC2329
function restore () { function restore () {
ref="$(git stash list --format=format:%gD --grep "$1" -n1)" ref="$(git stash list --format=format:%gD --grep "$1" -n1)"
# this will avoid merge conflicts when applying the stash # this will avoid merge conflicts when applying the stash
+1 -1
View File
@@ -83,7 +83,7 @@ let
# ruff has gaps in scanning for unused code, so we use vulture # ruff has gaps in scanning for unused code, so we use vulture
echo "Scanning python files for unused code..." echo "Scanning python files for unused code..."
${silver-searcher}/bin/ag -l --vimgrep -g '\.l?py$' . \ ${silver-searcher}/bin/ag -l --vimgrep -g '\.l?py$' . \
| xargs ${python3Packages.vulture}/bin/vulture --exclude docs/conf.py | xargs ${python3Packages.vulture}/bin/vulture --exclude docs/conf.py --min-confidence 80
echo "Linting python files..." echo "Linting python files..."
${ruff}/bin/ruff check . ${ruff}/bin/ruff check .
+1 -2
View File
@@ -7,7 +7,6 @@
, glibcLocales ? null , glibcLocales ? null
, gnugrep , gnugrep
, hpc-codecov , hpc-codecov
, hostPlatform
, jq , jq
, lib , lib
, postgrest , postgrest
@@ -159,7 +158,7 @@ let
} }
( (
# required for `hpc markup` in CI; glibcLocales is not available e.g. on Darwin # required for `hpc markup` in CI; glibcLocales is not available e.g. on Darwin
lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' lib.optionalString (stdenv.isLinux && stdenv.hostPlatform.libc == "glibc") ''
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
'' + '' +
+2 -2
View File
@@ -116,7 +116,7 @@ let
export PGRST_DB_URI="postgres:///$PGDATABASE?host=$PGREPLICAHOST,$PGHOST" export PGRST_DB_URI="postgres:///$PGDATABASE?host=$PGREPLICAHOST,$PGHOST"
fi fi
# shellcheck disable=SC2317 # shellcheck disable=SC2329
stop () { stop () {
log "Stopping the database cluster..." log "Stopping the database cluster..."
pg_ctl stop --mode=immediate >> "$setuplog" pg_ctl stop --mode=immediate >> "$setuplog"
@@ -329,7 +329,7 @@ let
$PGRST_CMD ${legacyConfig} > "$tmpdir"/run.log 2>&1 & $PGRST_CMD ${legacyConfig} > "$tmpdir"/run.log 2>&1 &
pid=$! pid=$!
# shellcheck disable=SC2317 # shellcheck disable=SC2329
cleanup() { cleanup() {
# Send INT to all postgrest processes. # Send INT to all postgrest processes.
# Workaround to trigger dumping postgrest.prof for postgrest-profiled-run # Workaround to trigger dumping postgrest.prof for postgrest-profiled-run
+1 -1
View File
@@ -362,7 +362,7 @@ parser optPath env dbSettings roleSettings roleIsolationLvl =
| otherwise -> pure $ fromList schemas | otherwise -> pure $ fromList schemas
where where
schemas = splitOnCommas s schemas = splitOnCommas s
errMsg x = ("db-schemas does not allow schema: '" <> x <> "'") errMsg x = "db-schemas does not allow schema: '" <> x <> "'"
parseSocketFileMode :: C.Key -> C.Parser C.Config FileMode parseSocketFileMode :: C.Key -> C.Parser C.Config FileMode
parseSocketFileMode k = parseSocketFileMode k =
+1 -1
View File
@@ -87,7 +87,7 @@ def metapostgrest():
class YamlSnapshotExtension(SingleFileSnapshotExtension): class YamlSnapshotExtension(SingleFileSnapshotExtension):
_file_extension = "yaml" file_extension = "yaml"
@pytest.fixture @pytest.fixture