Merge pull request #448 from tweag/update_flake_lock_action

Use nixos-24.05 instead of nixos-unstable and fix a few issues

.github/workflows/workflow.yaml

@@ -27,8 +27,14 @@ jobs:
           - true
           - false
         withNixRemote:
-          - true
+          # FIXME: disable nix-remote checks as they don't work
+          #        see https://github.com/tweag/rules_nixpkgs/issues/564
+          #- true
           - false
+        exclude:
+          # skip nix remote jobs on MacOS
+          - os: macos-12
+            withNixRemote: true
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -39,7 +45,7 @@ jobs:
         with:
           buildbuddy_api_key: ${{ secrets.BUILDBUDDY_API_KEY }}
       - name: Start remote Nix server
-        if: matrix.withNixRemote && matrix.os == 'ubuntu-latest'
+        if: matrix.withNixRemote
         run: |
           # Generate temporary SSH keys.
           mkdir -p $HOME/.ssh
@@ -52,22 +58,22 @@ jobs:
           cp .github/nix-server/keys/* $HOME/.ssh/
 
           sudo cp .github/nix-server/config /etc/ssh/ssh_config
+
+          echo "Setting BAZEL_NIX_REMOTE env variable"
+          echo BAZEL_NIX_REMOTE=nix-server >> "$GITHUB_ENV"
       - name: Build & test
         env:
           BZLMOD_ENABLED: ${{ matrix.bzlmodEnabled }}
-          NIX_REMOTE_ENABLED: matrix.withNixRemote && matrix.os == 'ubuntu-latest'
         run: |
-          if [ "$NIX_REMOTE_ENABLED" = "true" ]; then
-            echo "Setting BAZEL_NIX_REMOTE env variable"
-            export BAZEL_NIX_REMOTE=nix-server
-          fi
-
           nix-shell --pure \
             --keep GITHUB_STEP_SUMMARY \
             --keep GITHUB_REPOSITORY \
             --keep BZLMOD_ENABLED \
             --keep BAZEL_NIX_REMOTE \
             --run 'bash .github/build-and-test'
+      - name: Setup tmate session
+        if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3
   test-examples:
     name: Build & Test - Examples
     strategy:

WORKSPACE

@@ -28,8 +28,8 @@ load(
 )
 
 nixpkgs_package(
-    name = "nix_2_10",
-    attribute_path = "nixVersions.nix_2_10",
+    name = "nix_2_18",
+    attribute_path = "nixVersions.nix_2_18",
     repositories = {"nixpkgs": "@nixpkgs"},
 )
 

nix/flake.nix

@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;

testing/go-bzlmod/tests/cc-patched.nix

@@ -36,10 +36,12 @@ let
         echo "-F${Security}/Library/Frameworks" >> $out/nix-support/cc-cflags
         echo "-F${Foundation}/Library/Frameworks" >> $out/nix-support/cc-cflags
         echo "-L${pkgs.llvmPackages.libcxx}/lib" >> $out/nix-support/cc-cflags
-        echo "-L${pkgs.llvmPackages.libcxxabi}/lib" >> $out/nix-support/cc-cflags
         echo "-L${pkgs.libiconv}/lib" >> $out/nix-support/cc-cflags
         echo "-L${pkgs.darwin.libobjc}/lib" >> $out/nix-support/cc-cflags
         echo "-resource-dir=${pkgs.stdenv.cc}/resource-root" >> $out/nix-support/cc-cflags
+      '' +
+      pkgs.lib.optionalString (pkgs.llvmPackages ? libcxxabi) ''
+        echo "-L${pkgs.llvmPackages.libcxxabi}/lib" >> $out/nix-support/cc-cflags
       '';
     };
 in