From fa1df304a6ff3929488be908ea46526fe23707c5 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Sun, 22 Mar 2026 23:40:19 +1000 Subject: [PATCH] git merge with upstream --- flake.lock | 368 ++++++----------------------------------------------- 1 file changed, 37 insertions(+), 331 deletions(-) diff --git a/flake.lock b/flake.lock index e79a42f..f378aea 100644 --- a/flake.lock +++ b/flake.lock @@ -1,22 +1,5 @@ { "nodes": { - "abseil-src": { - "flake": false, - "locked": { - "lastModified": 1722535511, - "narHash": "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4=", - "owner": "abseil", - "repo": "abseil-cpp", - "rev": "4447c7562e3bc702ade25105912dce503f0c4010", - "type": "github" - }, - "original": { - "owner": "abseil", - "ref": "20240722.0", - "repo": "abseil-cpp", - "type": "github" - } - }, "aquamarine": { "inputs": { "hyprutils": [ @@ -50,23 +33,6 @@ "type": "github" } }, - "asio-src": { - "flake": false, - "locked": { - "lastModified": 1702548444, - "narHash": "sha256-8Xo6J6+dTvDtsthjbLMMTInHMDnMMM0rQwzbZu70J/s=", - "owner": "chriskohlhoff", - "repo": "asio", - "rev": "22ccfc94fc77356f7820601f9f33b9129a337d2d", - "type": "github" - }, - "original": { - "owner": "chriskohlhoff", - "ref": "asio-1-30-0", - "repo": "asio", - "type": "github" - } - }, "awww": { "inputs": { "flake-compat": "flake-compat", @@ -119,23 +85,6 @@ "type": "github" } }, - "curl-src": { - "flake": false, - "locked": { - "lastModified": 1743572790, - "narHash": "sha256-huAGWNm2rYBmgzUuYQ21IYp2skyQECelEkXPMBJY3cE=", - "owner": "curl", - "repo": "curl", - "rev": "1c3149881769e7bd79b072e48374e4c2b3678b2f", - "type": "github" - }, - "original": { - "owner": "curl", - "ref": "curl-8_13_0", - "repo": "curl", - "type": "github" - } - }, "deploy-rs": { "inputs": { "flake-compat": "flake-compat_2", @@ -273,11 +222,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -326,23 +275,6 @@ "type": "github" } }, - "fmt-src": { - "flake": false, - "locked": { - "lastModified": 1758127535, - "narHash": "sha256-AZDmIeU1HbadC+K0TIAGogvVnxt0oE9U6ocpawIgl6g=", - "owner": "fmtlib", - "repo": "fmt", - "rev": "e424e3f2e607da02742f73db84873b8084fc714c", - "type": "github" - }, - "original": { - "owner": "fmtlib", - "ref": "12.0.0", - "repo": "fmt", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -392,11 +324,11 @@ ] }, "locked": { - "lastModified": 1770260404, - "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", + "lastModified": 1772985280, + "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", + "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", "type": "github" }, "original": { @@ -729,91 +661,6 @@ "type": "github" } }, - "incbin-src": { - "flake": false, - "locked": { - "lastModified": 1748303270, - "narHash": "sha256-vgOfViZnWTKpBB6vDNDJSB3YuuGGVhg++zsi9Ubatno=", - "owner": "graphitemaster", - "repo": "incbin", - "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", - "type": "github" - }, - "original": { - "owner": "graphitemaster", - "repo": "incbin", - "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", - "type": "github" - } - }, - "json-src": { - "flake": false, - "locked": { - "lastModified": 1744360948, - "narHash": "sha256-cECvDOLxgX7Q9R3IE86Hj9JJUxraDQvhoyPDF03B2CY=", - "owner": "nlohmann", - "repo": "json", - "rev": "55f93686c01528224f448c19128836e7df245f72", - "type": "github" - }, - "original": { - "owner": "nlohmann", - "ref": "v3.12.0", - "repo": "json", - "type": "github" - } - }, - "libgit2-src": { - "flake": false, - "locked": { - "lastModified": 1749227175, - "narHash": "sha256-/xI3v7LNhpgfjv/m+sZwYDhhYvS6kQYxiiiG3+EF8Mw=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "0060d9cf5666f015b1067129bd874c6cc4c9c7ac", - "type": "github" - }, - "original": { - "owner": "libgit2", - "ref": "v1.9.1", - "repo": "libgit2", - "type": "github" - } - }, - "luajit-src": { - "flake": false, - "locked": { - "lastModified": 1763177035, - "narHash": "sha256-oYD86MqmlJpiCuEs4LwVtxvarPtz1RPWm8nJqNE0sBs=", - "owner": "SteamClientHomebrew", - "repo": "LuaJIT", - "rev": "89550023569c3e195e75e12951c067fe5591e0d2", - "type": "github" - }, - "original": { - "owner": "SteamClientHomebrew", - "ref": "v2.1", - "repo": "LuaJIT", - "type": "github" - } - }, - "luajson-src": { - "flake": false, - "locked": { - "lastModified": 1763065879, - "narHash": "sha256-5Mdp4jp+rqz2ufkBa1gMfd8nep+Um+mBdr6+Ut6yz9I=", - "owner": "SteamClientHomebrew", - "repo": "LuaJSON", - "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", - "type": "github" - }, - "original": { - "owner": "SteamClientHomebrew", - "repo": "LuaJSON", - "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", - "type": "github" - } - }, "mango": { "inputs": { "flake-parts": "flake-parts", @@ -823,11 +670,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1771732288, - "narHash": "sha256-N1H7LMWXYNn7zN9ghp4vHlBs4O/Rw/+ZEoPUpm9ozw4=", + "lastModified": 1773034081, + "narHash": "sha256-tH1yy1LQYtmGWnCU7whsdX0iGpc2dvaJ+7p6rvuKkHg=", "owner": "DreamMaoMao", "repo": "mango", - "rev": "6b2d694b234cae9876eb81e27991439eb51860f1", + "rev": "db30977196b91cfe2e5db8e9829faafe13417bd9", "type": "github" }, "original": { @@ -877,112 +724,6 @@ "type": "github" } }, - "millennium": { - "inputs": { - "abseil-src": "abseil-src", - "asio-src": "asio-src", - "curl-src": "curl-src", - "fmt-src": "fmt-src", - "incbin-src": "incbin-src", - "json-src": "json-src", - "libgit2-src": "libgit2-src", - "luajit-src": "luajit-src", - "luajson-src": "luajson-src", - "millennium-src": "millennium-src", - "minhook-src": "minhook-src", - "mini-src": "mini-src", - "minizip-src": "minizip-src", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "re2-src": "re2-src", - "websocketpp-src": "websocketpp-src", - "zlib-src": "zlib-src" - }, - "locked": { - "dir": "packages/nix", - "lastModified": 1772390578, - "narHash": "sha256-3yQlDZz9JZqPFiYYj8fQkpCXUzjlAw4s7zaZ2n0wFmE=", - "owner": "SteamClientHomebrew", - "repo": "millennium", - "rev": "41d8c701e1f1ed4362e8378d12bbe5cb0cb811d6", - "type": "github" - }, - "original": { - "dir": "packages/nix", - "owner": "SteamClientHomebrew", - "repo": "millennium", - "type": "github" - } - }, - "millennium-src": { - "flake": false, - "locked": { - "lastModified": 1770463863, - "narHash": "sha256-MceGTpXobCAh5Ll/1iTWcEf6/nHY3Ll1t06JxbYc+Co=", - "owner": "SteamClientHomebrew", - "repo": "Millennium", - "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", - "type": "github" - }, - "original": { - "owner": "SteamClientHomebrew", - "repo": "Millennium", - "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", - "type": "github" - } - }, - "minhook-src": { - "flake": false, - "locked": { - "lastModified": 1743163800, - "narHash": "sha256-0eGFfg365bb4zic1WTHMvKHbxuhhGp72/clu8OklHXs=", - "owner": "TsudaKageyu", - "repo": "minhook", - "rev": "c3fcafdc10146beb5919319d0683e44e3c30d537", - "type": "github" - }, - "original": { - "owner": "TsudaKageyu", - "ref": "v1.3.4", - "repo": "minhook", - "type": "github" - } - }, - "mini-src": { - "flake": false, - "locked": { - "lastModified": 1743356736, - "narHash": "sha256-zBFFOlECbie7+62fTGf+NP4gNmfv2Qddw3ys6xn7o9U=", - "owner": "metayeti", - "repo": "mINI", - "rev": "52b66e987cb56171dc91d96115cdf094b6e4d7a0", - "type": "github" - }, - "original": { - "owner": "metayeti", - "ref": "0.9.18", - "repo": "mINI", - "type": "github" - } - }, - "minizip-src": { - "flake": false, - "locked": { - "lastModified": 1746408966, - "narHash": "sha256-I3CZwtfJMsZYQOMdGhooUN8vssnQj6rCzv8F+rne3vg=", - "owner": "zlib-ng", - "repo": "minizip-ng", - "rev": "f3ed731e27a97e30dffe076ed5e0537daae5c1bd", - "type": "github" - }, - "original": { - "owner": "zlib-ng", - "ref": "4.0.10", - "repo": "minizip-ng", - "type": "github" - } - }, "nix-flatpak": { "locked": { "lastModified": 1767983141, @@ -1069,11 +810,11 @@ ] }, "locked": { - "lastModified": 1771375681, - "narHash": "sha256-qDDw0ruBZ1kt63j4uVP5Xrd1OxGKIYrSFnig0z6ozSw=", + "lastModified": 1772891434, + "narHash": "sha256-+MUN+5lOvWS6T4pvIZBGL4AKJkflLXGgVRYTlNeZEiE=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "d030dbb48ab020092681a39c878c1d48a553ffc1", + "rev": "fc63af2dbc92cdcfeb6c650d986280057b0f135c", "type": "github" }, "original": { @@ -1084,11 +825,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771903837, - "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", + "lastModified": 1772822230, + "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", + "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", "type": "github" }, "original": { @@ -1115,11 +856,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -1130,11 +871,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1772170669, - "narHash": "sha256-ClBvX0YzaJOaGZInNi0e3mFknzr/rAdwKbWrjO1j1sg=", + "lastModified": 1773068446, + "narHash": "sha256-MCEmktH6AFJH8Pg1rBGB2Q0FhS5z5K87IsMbUU8uzHI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee234284495a7ff3ecffb062595102fdc4fbe617", + "rev": "70b7278e2c0acc26ad3360551bf9c15c5ccc0acd", "type": "github" }, "original": { @@ -1146,11 +887,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -1219,23 +960,6 @@ "type": "github" } }, - "re2-src": { - "flake": false, - "locked": { - "lastModified": 1762353507, - "narHash": "sha256-0J1HVk+eR7VN0ymucW9dNlT36j16XIfCzcs1EVyEIEU=", - "owner": "google", - "repo": "re2", - "rev": "927f5d53caf8111721e734cf24724686bb745f55", - "type": "github" - }, - "original": { - "owner": "google", - "ref": "2025-11-05", - "repo": "re2", - "type": "github" - } - }, "root": { "inputs": { "awww": "awww", @@ -1309,11 +1033,11 @@ ] }, "locked": { - "lastModified": 1769900466, - "narHash": "sha256-WeoJBj/PhqFCCJEIycTipqPbKm5BpQT2uzFTYcYZ30I=", + "lastModified": 1771956684, + "narHash": "sha256-+EtzmEzGA2xqwIvKrP0euYaOzrmTQWEWAiWV+k2WBEM=", "owner": "uiriansan", "repo": "SilentSDDM", - "rev": "a44caf771b4cb72f5c2514f7d488455b0fa860d2", + "rev": "34f82e1fb8412fff78b82a0dcce763492b36054c", "type": "github" }, "original": { @@ -1369,11 +1093,11 @@ ] }, "locked": { - "lastModified": 1772494187, - "narHash": "sha256-6ksgNAFXVK+Cg/6ww7bB2nJUPZlnS75UwZC7G+L03EE=", + "lastModified": 1773007504, + "narHash": "sha256-4NtiCDH3RunKbrlWvPCB6dyTjCwqdrHaBDeMCzG6gIA=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "915ab06b046d05613041780c575c62a32fe67cea", + "rev": "434e63b851f9139aaeddc3b8de44d47992828b3b", "type": "github" }, "original": { @@ -1467,23 +1191,6 @@ "type": "github" } }, - "websocketpp-src": { - "flake": false, - "locked": { - "lastModified": 1587320717, - "narHash": "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=", - "owner": "zaphoyd", - "repo": "websocketpp", - "rev": "56123c87598f8b1dd471be83ca841ceae07f95ba", - "type": "github" - }, - "original": { - "owner": "zaphoyd", - "ref": "0.8.2", - "repo": "websocketpp", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1551,17 +1258,16 @@ "zlib-src": { "flake": false, "locked": { - "lastModified": 1754565515, - "narHash": "sha256-c2RYqHi3hj/ViBzJcYWoNib27GAbq/B1SJUfvG7CPG4=", - "owner": "zlib-ng", - "repo": "zlib-ng", - "rev": "425439062b114a0f6cf625022c41d929c7e879f9", + "lastModified": 1772945022, + "narHash": "sha256-Fv14NttjL/7xfi6eVwrSEBAyBvDjI00RLiRNqA5apcw=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "3a6a5ca7fb48cc8fd8183386506a06579d1d79dc", "type": "github" }, "original": { - "owner": "zlib-ng", - "ref": "2.2.5", - "repo": "zlib-ng", + "owner": "0xc000022070", + "repo": "zen-browser-flake", "type": "github" } }