update
This commit is contained in:
parent
1c588599d4
commit
dea6ccd422
1 changed files with 24 additions and 0 deletions
24
flake.lock
24
flake.lock
|
@ -8,11 +8,19 @@
|
|||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1678967335,
|
||||
"narHash": "sha256-oFppZaAVRA0G/aVPvjtWaQI5EQ2dZ5LgbEKfsBmKQgA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "b832390db376fbbf44115904cfab6680fb42e076",
|
||||
=======
|
||||
"lastModified": 1678916824,
|
||||
"narHash": "sha256-YPQAQ0x0wLvbQ/vaEj8o+0hRfbBNR0teTJ6QsG0yzw4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c8cb60b8a15c90b2bbc416c182532620602edb48",
|
||||
>>>>>>> c368c3e (update)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -29,11 +37,19 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1678928694,
|
||||
"narHash": "sha256-IyMKsbwRP1+9KcPR9exTD3zkPW6ivykpvGAM25mdmoI=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "d9d57ce39ac25fd8bbfe88ec9d3bccb1e2df8650",
|
||||
=======
|
||||
"lastModified": 1678926607,
|
||||
"narHash": "sha256-8KOQLIYC/zqR+cJgQEJqmpKddNINd3F3HiPbxAkeh4w=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "3e261b1fa78d13daeda8bede7df3f2c6af032c46",
|
||||
>>>>>>> c368c3e (update)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -81,11 +97,19 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1678898370,
|
||||
"narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ac718d02867a84b42522a0ece52d841188208f2c",
|
||||
=======
|
||||
"lastModified": 1678819893,
|
||||
"narHash": "sha256-lfA6WGdxPsPkBK5Y19ltr5Sn7v7MlT+jpZ4nUgco0Xs=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7067edc68c035e21780259ed2d26e1f164addaa2",
|
||||
>>>>>>> c368c3e (update)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
Loading…
Reference in a new issue