Skip to content

Commit f74bedf

Browse files
committed
remove Mac-incompatible Nix Flake dependency
Squashed commit of the following: commit ab42f6c Author: Peter Becich <peterbecich@gmail.com> Date: Fri Aug 25 23:25:03 2023 -0700 `nix flake check` should succeed commit 112b5d9 Author: Peter Becich <peterbecich@gmail.com> Date: Fri Aug 25 23:12:08 2023 -0700 remove other dev shell dependencies commit c24534c Author: Peter Becich <peterbecich@gmail.com> Date: Fri Aug 25 23:00:51 2023 -0700 remove pkg-config commit bf4c400 Author: Peter Becich <peterbecich@gmail.com> Date: Fri Aug 25 22:50:44 2023 -0700 try to fix `nix develop` on Mac #1247
1 parent f52a15d commit f74bedf

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/workflows/nix-flake.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,5 @@ jobs:
3030
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
3131
- run: nix build
3232

33-
# allow error until Flake check is improved
34-
- continue-on-error: true
33+
- continue-on-error: false
3534
run: nix flake check

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040

4141
# https://github.com/haskell/hackage-server/pull/1219#issuecomment-1597140858
4242
# glibc
43-
# icu67
44-
# zlib
43+
icu67
44+
zlib
4545
openssl
46-
cryptodev
46+
# cryptodev
4747
pkg-config
4848
brotli
4949

0 commit comments

Comments
 (0)