flake: drop nixpkgs-darwin

ipetkov · Sep 23, 2024 · da04795 · da04795
1 parent 7e4586b
commit da04795
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 28 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -115,7 +115,6 @@ jobs:
         rm ./examples/.gitignore
         nix develop .# --accept-flake-config --command bash -c '
           set -euo pipefail
-          chosenNixpkgs="$(./ci/ref-from-lock.sh ./test#nixpkgs-darwin)"
           for f in $(find ./examples -maxdepth 1 -mindepth 1 -type d -not -name build-std -not -name cross-musl -not -name cross-rust-overlay | sort -u); do
             # NB: nix-eval-jobs appears broken on darwin atm?
             # /nix/store/2419grj384lg233jqchamm73il9iyjxg-libcxx-16.0.6-dev/include/c++/v1/optional:962: assertion this->has_value() failed: optional operator* called on a disengaged valueerror: error: while checking worker process, evaluation worker got killed by signal 6 (Abort trap: 6)
@@ -124,7 +123,6 @@ jobs:
               --print-build-logs \
               --reference-lock-file ./test/flake.lock \
               --override-input crane ./. \
-              --override-input nixpkgs "${chosenNixpkgs}" \
               "${f}"
           done
         '

diff --git a/test/flake.lock b/test/flake.lock
diff --git a/test/flake.nix b/test/flake.nix
@@ -3,7 +3,6 @@
     # NB: nixpkgs-unstable testing will come from the root flake
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     nixpkgs-latest-release.url = "github:NixOS/nixpkgs/release-24.05";
-    nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin";
 
     # The version of wasm-bindgen-cli needs to match the version in Cargo.lock
     # Update this to include the version you need