Skip to content

Commit 1c07e15

Browse files
authored
postgrest: fix build on darwin (NixOS#353375)
2 parents d2b6995 + c47859a commit 1c07e15

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

pkgs/development/haskell-modules/configuration-common.nix

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2839,18 +2839,32 @@ self: super: {
28392839
postgrest = lib.pipe super.postgrest [
28402840
# 2023-12-20: New version needs extra dependencies
28412841
(addBuildDepends [ self.extra self.fuzzyset_0_2_4 self.cache self.timeit ])
2842-
# 2022-12-02: Too strict bounds: https://github.com/PostgREST/postgrest/issues/2580
2842+
# 2022-12-02: Too strict bounds.
28432843
doJailbreak
28442844
# 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
28452845
(overrideSrc rec {
2846-
version = "12.0.2";
2846+
version = "12.0.3";
28472847
src = pkgs.fetchFromGitHub {
28482848
owner = "PostgREST";
28492849
repo = "postgrest";
28502850
rev = "v${version}";
2851-
hash = "sha256-fpGeL8R6hziEtIgHUMfWLF7JAjo3FDYQw3xPSeQH+to=";
2851+
hash = "sha256-peXM5/K034Phcy5vNhc5AT3/9oGXohVogFN9gRsSosY=";
28522852
};
28532853
})
2854+
# 2024-11-03: Needed for the patch below. Can be dropped after updating to 12.2+.
2855+
(appendPatches [
2856+
(fetchpatch {
2857+
url = "https://github.com/PostgREST/postgrest/commit/d311fb17c46ad2ab9064c7aba1954d3500ef0e54.patch";
2858+
hash = "sha256-O/bBm93V6GIPSB5dwhNUFgX3vXA01LPJapZQoeJmbIU=";
2859+
})
2860+
])
2861+
# 2024-11-03: Fixes build on aarch64-darwin. Can be removed after updating to 13+.
2862+
(appendPatches [
2863+
(fetchpatch {
2864+
url = "https://github.com/PostgREST/postgrest/commit/c045b261c4f7d2c2514e858120950be6b3ddfba8.patch";
2865+
hash = "sha256-6SeteL5sb+/K1y3f9XL7yNzXDdD1KQp91RNP4kutSLE=";
2866+
})
2867+
])
28542868
];
28552869

28562870
# Too strict bounds on hspec < 2.11

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,8 @@ package-maintainers:
652652
- minio-hs
653653
- smtp-mail
654654
- pdftotext
655+
wolfgangwalther:
656+
- postgrest
655657

656658
unsupported-platforms:
657659
Allure: [ platforms.darwin ]

pkgs/development/haskell-modules/hackage-packages.nix

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)