Skip to content

Commit

Permalink
remove Mac-incompatible Nix Flake dependency
Browse files Browse the repository at this point in the history
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
  • Loading branch information
peterbecich committed Aug 26, 2023
1 parent f52a15d commit f74bedf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/nix-flake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@ jobs:
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix build

# allow error until Flake check is improved
- continue-on-error: true
- continue-on-error: false
run: nix flake check
6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@

# https://github.com/haskell/hackage-server/pull/1219#issuecomment-1597140858
# glibc
# icu67
# zlib
icu67
zlib
openssl
cryptodev
# cryptodev
pkg-config
brotli

Expand Down

0 comments on commit f74bedf

Please sign in to comment.