diff options
| author | Rory&::Emma <root@rory.gay> | 2024-09-06 20:25:12 +0000 |
|---|---|---|
| committer | Rory&::Emma <root@rory.gay> | 2024-09-06 20:25:12 +0000 |
| commit | ae88f56e9c401e69129aa58432f4132bb4e7264a (patch) | |
| tree | ddb3d377688db0320bec5232d5f77354011be425 /flake.lock | |
| parent | Server changes (diff) | |
| download | Rory-Open-Architecture-ae88f56e9c401e69129aa58432f4132bb4e7264a.tar.xz | |
Update flake.lock to fix merge conflict
Diffstat (limited to 'flake.lock')
| -rw-r--r-- | flake.lock | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/flake.lock b/flake.lock index ca10eda..9280b63 100644 --- a/flake.lock +++ b/flake.lock @@ -422,11 +422,11 @@ }, "locked": { "host": "gitlab.computer.surgery", - "lastModified": 1725218530, - "narHash": "sha256-mCBFFaOPNBnWXHugjD63qMvb2AruqJMgvSNZWY3yatY=", + "lastModified": 1725643214, + "narHash": "sha256-WgSmd60jmqRg5fEccK+3OKRiUL7RgdZ3FrOZDDjmNiM=", "owner": "matrix", "repo": "grapevine-fork", - "rev": "be14f5bddcf7ac7b2ab97f353efd61ae56704ab2", + "rev": "b0f33207fef2fc89e03861d98b2983eebfc59a89", "type": "gitlab" }, "original": { @@ -441,11 +441,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1725180166, - "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", + "lastModified": 1725628988, + "narHash": "sha256-Y6TBMTGu4bddUwszGjlcOuN0soVc1Gv43hp+1sT/GNI=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", + "rev": "127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6", "type": "github" }, "original": { @@ -590,11 +590,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1725492194, - "narHash": "sha256-LMaAYIBEqzhsinhFGlkWnNxtSsBYkSGbiBBiWoGo7xE=", + "lastModified": 1725653428, + "narHash": "sha256-g9T5PA5IT9oyez0mKsp0HtJMDugFlcM/cxwcLR1TFmY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8802725063e41bf09f049017fcf8d358b6e3ba11", + "rev": "4d3dc2d0983eefc226feac4f00dde0a608242130", "type": "github" }, "original": { @@ -702,11 +702,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -734,11 +734,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { @@ -750,11 +750,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1721466660, - "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "type": "github" }, "original": { @@ -833,11 +833,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1725201042, - "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=", + "lastModified": 1725540166, + "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7", + "rev": "d9d781523a1463965cd1e1333a306e70d9feff07", "type": "github" }, "original": { |