Fix flake.lock

This commit is contained in:
2025-11-10 08:48:55 -08:00
parent d62bae0ddb
commit f995240153

26
flake.lock generated
View File

@@ -64,25 +64,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1762501326,
"narHash": "sha256-QbhsksHaIN6qU3oXhwUFbYycKX1GRxObpQSWAM5fhRY=",
||||||| Stash base
"lastModified": 1761339987,
"narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=",
=======
"lastModified": 1759509947, "lastModified": 1759509947,
"narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=", "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
>>>>>>> Stashed changes
"owner": "nix-darwin", "owner": "nix-darwin",
"repo": "nix-darwin", "repo": "nix-darwin",
<<<<<<< Updated upstream
"rev": "e2b82ebd0f990a5d1b68fcc761b3d6383c86ccfd",
||||||| Stash base
"rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de",
=======
"rev": "000eadb231812ad6ea6aebd7526974aaf4e79355", "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
>>>>>>> Stashed changes
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -130,11 +116,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1762363567, "lastModified": 1762596750,
"narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -170,11 +156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762274591, "lastModified": 1762784320,
"narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=", "narHash": "sha256-odsk96Erywk5hs0dhArF38zb7Oe0q6LZ70gXbxAPKno=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6", "rev": "7911a0f8a44c7e8b29d031be3149ee8943144321",
"type": "github" "type": "github"
}, },
"original": { "original": {