[nix-darwin] Pin to 25.05

2025-11-10 08:12:05 -08:00
parent 0c15aad5c0
commit 79ae42f41d
3 changed files with 42 additions and 2 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -64,15 +64,30 @@
        ]
      },
      "locked": {
+<<<<<<< Updated upstream
        "lastModified": 1762501326,
        "narHash": "sha256-QbhsksHaIN6qU3oXhwUFbYycKX1GRxObpQSWAM5fhRY=",
+||||||| Stash base
+        "lastModified": 1761339987,
+        "narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=",
+=======
+        "lastModified": 1759509947,
+        "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
+>>>>>>> Stashed changes
        "owner": "nix-darwin",
        "repo": "nix-darwin",
+<<<<<<< Updated upstream
        "rev": "e2b82ebd0f990a5d1b68fcc761b3d6383c86ccfd",
+||||||| Stash base
+        "rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de",
+=======
+        "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
+>>>>>>> Stashed changes
        "type": "github"
      },
      "original": {
        "owner": "nix-darwin",
+        "ref": "nix-darwin-25.05",
        "repo": "nix-darwin",
        "type": "github"
      }