Merge remote-tracking branch 'origin/master' into ane-2484-vendor-bins

Author: james-fossa

.github/workflows/bench.yml

@@ -96,7 +96,7 @@ jobs:
         mkdir vendor-bins
         ./vendor_download.sh
       env:
-        GITHUB_TOKEN: ${{ secrets.BASIS_ACCESS_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.ANALYSIS_VENDOR_DOWNLOAD_TOKEN }}
 
     - name: Build
       env:

.github/workflows/build-all.yml

@@ -167,7 +167,7 @@ jobs:
         mkdir vendor-bins
         ./vendor_download.sh
       env:
-        GITHUB_TOKEN: ${{ secrets.BASIS_ACCESS_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.ANALYSIS_VENDOR_DOWNLOAD_TOKEN }}
 
     - name: Build and Unit Test (Linux ARM)
       if: ${{ matrix.os == 'LinuxARM' }}

.github/workflows/integrations-test.yml

@@ -103,7 +103,7 @@ jobs:
         mkdir vendor-bins
         ./vendor_download.sh
       env:
-        GITHUB_TOKEN: ${{ secrets.BASIS_ACCESS_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.ANALYSIS_VENDOR_DOWNLOAD_TOKEN }}
 
     - name: Build
       env:

shell.nix

@@ -9,7 +9,7 @@
     gmp_static =
       gmp.overrideAttrs (old: { dontDisableStatic = true; });
     lzma_static =
-      lzma.overrideAttrs (old: { dontDisableStatic = true; });
+      xz.overrideAttrs (old: { dontDisableStatic = true; });
   in mkShell {
     nativeBuildInputs = [
         cabal-install
@@ -19,15 +19,18 @@
         haskellPackages.cabal-fmt
         hlint
         zlib.dev
-        zlib.static
         git
-        glibc.dev
-        glibc.static
+        pkg-config
+        xz
         bzip2_static
         bzip2_static.dev
         libffi_static.dev
         gmp_static.dev
         lzma_static.dev
+    ] ++ lib.optionals stdenv.isLinux [
+        zlib.static
+        glibc.dev
+        glibc.static
     ];
     shellHook = ''
       export LANG=C.UTF-8