From da0479599a34af456f621896355b6a81a52deb6d Mon Sep 17 00:00:00 2001
From: Ivan Petkov <ivanppetkov@gmail.com>
Date: Sun, 22 Sep 2024 19:12:11 -0700
Subject: [PATCH] flake: drop nixpkgs-darwin

---
 .github/workflows/test.yml |  2 --
 test/flake.lock            | 28 +++-------------------------
 test/flake.nix             |  1 -
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1ee35ccb..c7d1290d 100644
--- 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
index 1b85d727..6bd4485d 100644
--- a/test/flake.lock
+++ b/test/flake.lock
@@ -17,17 +17,12 @@
       }
     },
     "crane": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1724377159,
-        "narHash": "sha256-ixjje1JO8ucKT41hs6n2NCde1Vc0+Zc2p2gUbJpCsMw=",
+        "lastModified": 1725409566,
+        "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "3e47b7a86c19142bd3675da49d6acef488b4dac1",
+        "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c",
         "type": "github"
       },
       "original": {
@@ -107,22 +102,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-darwin": {
-      "locked": {
-        "lastModified": 1723920526,
-        "narHash": "sha256-USs6A60raDKZ/8BEpqja1XjZIsRzADX+NtWKH6wIxIw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "1cbd3d585263dc620c483e138d352a39b9f0e3ec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-24.05-darwin",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-for-wasm-bindgen": {
       "locked": {
         "lastModified": 1691495139,
@@ -163,7 +142,6 @@
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-darwin": "nixpkgs-darwin",
         "nixpkgs-for-wasm-bindgen": "nixpkgs-for-wasm-bindgen",
         "nixpkgs-latest-release": "nixpkgs-latest-release",
         "rust-overlay": "rust-overlay"
diff --git a/test/flake.nix b/test/flake.nix
index ab828e8a..79e53970 100644
--- 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