From f74bedfcd475e5f1b7c4e2b59253f5b3c1515d69 Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Fri, 25 Aug 2023 23:27:25 -0700 Subject: [PATCH] remove Mac-incompatible Nix Flake dependency Squashed commit of the following: commit ab42f6c05bbe85caf1aac7d49772aa105d4bb5bb Author: Peter Becich Date: Fri Aug 25 23:25:03 2023 -0700 `nix flake check` should succeed commit 112b5d931decc1c1c75bc936f334814efdc26883 Author: Peter Becich Date: Fri Aug 25 23:12:08 2023 -0700 remove other dev shell dependencies commit c24534ce6bd89120f4bc27851a822ffabc563e72 Author: Peter Becich Date: Fri Aug 25 23:00:51 2023 -0700 remove pkg-config commit bf4c4000bcc8da1cb28fd5a70c57ca69de2efcee Author: Peter Becich Date: Fri Aug 25 22:50:44 2023 -0700 try to fix `nix develop` on Mac https://github.com/haskell/hackage-server/issues/1247 --- .github/workflows/nix-flake.yml | 3 +-- flake.nix | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nix-flake.yml b/.github/workflows/nix-flake.yml index 257dbf61..39fe13b5 100644 --- a/.github/workflows/nix-flake.yml +++ b/.github/workflows/nix-flake.yml @@ -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 diff --git a/flake.nix b/flake.nix index 728138d7..27d24584 100644 --- a/flake.nix +++ b/flake.nix @@ -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