Drop x86_64-darwin

Implements DeterminateSystems/nix-src#224

Author: grahamc

.github/workflows/build-x86_64-darwin.yml

@@ -14,9 +14,6 @@ jobs:
   build-x86_64-linux:
     uses: ./.github/workflows/build-x86_64-linux.yml
 
-  build-x86_64-darwin:
-    uses: ./.github/workflows/build-x86_64-darwin.yml
-
   build-aarch64-linux:
     uses: ./.github/workflows/build-aarch64-linux.yml
 
@@ -292,95 +289,6 @@ jobs:
             exit 1
           fi
 
-  run-x86_64-darwin:
-    name: Run x86_64 Darwin${{ matrix.determinate && ' (--determinate)' || ''}}
-    runs-on: macos-13
-    needs: [lints, build-x86_64-darwin]
-    strategy:
-      matrix:
-        determinate: [true, false]
-    permissions:
-      id-token: "write"
-      contents: "read"
-    steps:
-      - uses: actions/checkout@v4
-      - name: Restore Github cache artifacts
-        uses: actions/download-artifact@v6
-        with:
-          name: nix-installer-x86_64-darwin
-      - name: Move & set executable
-        run: |
-          mkdir install-root
-          cp nix-installer.sh install-root/nix-installer.sh
-          mv ./nix-installer-x86_64-darwin install-root/
-          chmod +x install-root/nix-installer-x86_64-darwin install-root/nix-installer.sh
-      - run: brew install fish coreutils
-      - name: Initial install
-        uses: DeterminateSystems/nix-installer-action@main
-        with:
-          backtrace: full
-          determinate: ${{ matrix.determinate }}
-          local-root: install-root/
-          log-directives: nix_installer=debug
-          logger: pretty
-      - name: "Validate dnixd is ${{ matrix.determinate && 'installed' || 'uninstalled' }}"
-        run: |
-          if test -x /usr/local/bin/determinate-nixd; then
-            echo "determinate-nixd is present"
-            ${{ matrix.determinate }}
-          else
-            echo "determinate-nixd is not present"
-            ${{ !matrix.determinate }}
-          fi
-      - name: Initial uninstall (without a `nix run` first)
-        run: sudo -E /nix/nix-installer uninstall
-        env:
-          NIX_INSTALLER_NO_CONFIRM: true
-          NIX_INSTALLER_LOGGER: pretty
-          NIX_INSTALLER_LOG_DIRECTIVES: nix_installer=debug
-          RUST_BACKTRACE: full
-      - name: Repeated install
-        uses: DeterminateSystems/nix-installer-action@main
-        with:
-          backtrace: full
-          determinate: ${{ matrix.determinate }}
-          local-root: install-root/
-          log-directives: nix_installer=debug
-          logger: pretty
-      - name: echo $PATH
-        run: echo $PATH
-      - name: Test `nix` with `$GITHUB_PATH`
-        if: success() || failure()
-        run: |
-          nix run nixpkgs#hello
-          nix profile install nixpkgs#hello
-          hello
-          nix store gc
-          nix run nixpkgs#hello
-      - name: Test bash
-        run: nix-instantiate -E 'builtins.currentTime' --eval
-        if: success() || failure()
-        shell: bash --login {0}
-      - name: Test sh
-        run: nix-instantiate -E 'builtins.currentTime' --eval
-        if: success() || failure()
-        shell: sh -l {0}
-      - name: Test zsh
-        run: nix-instantiate -E 'builtins.currentTime' --eval
-        if: success() || failure()
-        shell: zsh --login --interactive {0}
-      - name: Test fish
-        run: nix-instantiate -E 'builtins.currentTime' --eval
-        if: success() || failure()
-        shell: fish --login {0}
-      - name: Repeated uninstall
-        run: sudo -E /nix/nix-installer uninstall
-        env:
-          NIX_INSTALLER_NO_CONFIRM: true
-          NIX_INSTALLER_LOGGER: pretty
-          NIX_INSTALLER_LOG_DIRECTIVES: nix_installer=debug
-          RUST_BACKTRACE: full
-
   run-aarch64-linux:
     name: Run aarch64 Linux${{ matrix.determinate && ' (--determinate)' || ''}}
     runs-on: namespace-profile-default-arm64

.github/workflows/ci.yml

@@ -16,8 +16,6 @@ jobs:
     uses: ./.github/workflows/build-x86_64-linux.yml
   build-aarch64-linux:
     uses: ./.github/workflows/build-aarch64-linux.yml
-  build-x86_64-darwin:
-    uses: ./.github/workflows/build-x86_64-darwin.yml
   build-aarch64-darwin:
     uses: ./.github/workflows/build-aarch64-darwin.yml
 
@@ -28,7 +26,6 @@ jobs:
     needs:
       - build-x86_64-linux
       - build-aarch64-linux
-      - build-x86_64-darwin
       - build-aarch64-darwin
     steps:
       - name: Checkout
@@ -44,10 +41,6 @@ jobs:
         uses: actions/download-artifact@v6
         with:
           name: nix-installer-aarch64-linux
-      - name: Fetch x86_64-darwin binary artifact
-        uses: actions/download-artifact@v6
-        with:
-          name: nix-installer-x86_64-darwin
       - name: Fetch aarch64-darwin binary artifact
         uses: actions/download-artifact@v6
         with:
@@ -56,7 +49,6 @@ jobs:
         run: |
           mv nix-installer-x86_64-linux artifacts/
           mv nix-installer-aarch64-linux artifacts/
-          mv nix-installer-x86_64-darwin artifacts/
           mv nix-installer-aarch64-darwin artifacts/
 
       - name: Configure AWS Credentials

.github/workflows/release-branches.yml

@@ -35,17 +35,6 @@ jobs:
         || (github.event.action != 'labeled' && contains(github.event.pull_request.labels.*.name, 'upload to s3'))
       )
     uses: ./.github/workflows/build-aarch64-linux.yml
-  build-x86_64-darwin:
-    # Only intra-repo PRs are allowed to have PR artifacts uploaded
-    # We only want to trigger once the upload once in the case the upload label is added, not when any label is added
-    if: |
-      always() && !failure() && !cancelled()
-      && github.event.pull_request.head.repo.full_name == 'DeterminateSystems/nix-installer'
-      && (
-        (github.event.action == 'labeled' && github.event.label.name == 'upload to s3')
-        || (github.event.action != 'labeled' && contains(github.event.pull_request.labels.*.name, 'upload to s3'))
-      )
-    uses: ./.github/workflows/build-x86_64-darwin.yml
   build-aarch64-darwin:
     # Only intra-repo PRs are allowed to have PR artifacts uploaded
     # We only want to trigger once the upload once in the case the upload label is added, not when any label is added
@@ -72,7 +61,6 @@ jobs:
     needs:
       - build-x86_64-linux
       - build-aarch64-linux
-      - build-x86_64-darwin
       - build-aarch64-darwin
     steps:
       - name: Checkout
@@ -88,10 +76,6 @@ jobs:
         uses: actions/download-artifact@v6
         with:
           name: nix-installer-aarch64-linux
-      - name: Fetch x86_64-darwin binary artifact
-        uses: actions/download-artifact@v6
-        with:
-          name: nix-installer-x86_64-darwin
       - name: Fetch aarch64-darwin binary artifact
         uses: actions/download-artifact@v6
         with:
@@ -100,7 +84,6 @@ jobs:
         run: |
           mv nix-installer-x86_64-linux artifacts/
           mv nix-installer-aarch64-linux artifacts/
-          mv nix-installer-x86_64-darwin artifacts/
           mv nix-installer-aarch64-darwin artifacts/
 
       - name: Configure AWS Credentials

.github/workflows/release-prs.yml

@@ -14,8 +14,6 @@ jobs:
     uses: ./.github/workflows/build-x86_64-linux.yml
   build-aarch64-linux:
     uses: ./.github/workflows/build-aarch64-linux.yml
-  build-x86_64-darwin:
-    uses: ./.github/workflows/build-x86_64-darwin.yml
   build-aarch64-darwin:
     uses: ./.github/workflows/build-aarch64-darwin.yml
 
@@ -25,7 +23,6 @@ jobs:
     needs:
       - build-x86_64-linux
       - build-aarch64-linux
-      - build-x86_64-darwin
       - build-aarch64-darwin
     steps:
       - name: Checkout
@@ -41,10 +38,6 @@ jobs:
         uses: actions/download-artifact@v6
         with:
           name: nix-installer-aarch64-linux
-      - name: Fetch x86_64-darwin binary artifact
-        uses: actions/download-artifact@v6
-        with:
-          name: nix-installer-x86_64-darwin
       - name: Fetch aarch64-darwin binary artifact
         uses: actions/download-artifact@v6
         with:
@@ -53,7 +46,6 @@ jobs:
         run: |
           mv nix-installer-x86_64-linux artifacts/
           mv nix-installer-aarch64-linux artifacts/
-          mv nix-installer-x86_64-darwin artifacts/
           mv nix-installer-aarch64-darwin artifacts/
 
       - name: Configure AWS Credentials

.github/workflows/release-tags.yml

@@ -35,8 +35,8 @@
     } @ inputs:
     let
       nix_tarball_url_prefix = "https://releases.nixos.org/nix/nix-2.32.2/nix-2.32.2-";
-      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
-      systemsSupportedByDeterminateNixd = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+      supportedSystems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
+      systemsSupportedByDeterminateNixd = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
 
       forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: (forSystem system f));
 

flake.nix

@@ -95,8 +95,6 @@ impl Shell {
         const SYSTEM: &str = "x86_64-linux";
         #[cfg(all(target_os = "linux", target_arch = "aarch64"))]
         const SYSTEM: &str = "aarch64-linux";
-        #[cfg(all(target_os = "macos", target_arch = "x86_64"))]
-        const SYSTEM: &str = "x86_64-darwin";
         #[cfg(all(target_os = "macos", target_arch = "aarch64"))]
         const SYSTEM: &str = "aarch64-darwin";