merged flake.lock changes

This commit is contained in:
Nickiel12 2024-08-22 19:20:04 -07:00
parent a13150440e
commit fc1934791b

View file

@ -246,6 +246,7 @@
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
>>>>>>> ed56ac1 (flake update)
"type": "github"
},
"original": {
@ -352,6 +353,7 @@
"owner": "kmonad",
"repo": "kmonad",
"rev": "840af41fab33829ed03ba932aa017f8912e6fb75",
>>>>>> ed56ac1 (flake update)
"type": "github"
},
"original": {
@ -520,11 +522,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1722087241,
"narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
"lastModified": 1723688146,
"narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8c50662509100d53229d4be607f1a3a31157fa12",
"rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
"type": "github"
},
"original": {