From 433e26edaa5ed8962a8456d546eceb4de604dd28 Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Mon, 4 Aug 2025 19:59:56 +0800 Subject: [PATCH] feat: unfollow nixpkgs for niri, use binary cache; update flake.lock --- flake.lock | 158 +++++++++++++++++++++++++++++++---------------------- flake.nix | 2 - 2 files changed, 93 insertions(+), 67 deletions(-) diff --git a/flake.lock b/flake.lock index cd14409..0935654 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1753875761, - "narHash": "sha256-FqsfIWS0mQ5OzLRLFgVEBWew/7WROSNr8lvTJJ7AQ4w=", + "lastModified": 1754215849, + "narHash": "sha256-GHTc3TlGSJ1DsPujJHRlNQOgBeotW+RPY9fcc6d4bRs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b184ca87254844a6c2098b27b4ab493e6faf6cf7", + "rev": "8456c9ee811787540b33890120476a7ea8de0ec0", "type": "github" }, "original": { @@ -128,11 +128,11 @@ ] }, "locked": { - "lastModified": 1753219021, - "narHash": "sha256-wYL0oMGwFPbhYT0G2NcR4ud00TI06TEWOrvPpN4eNl0=", + "lastModified": 1754000084, + "narHash": "sha256-m3UMp3dJfGptOR8WDGYgaHfax7Wpad0wKfOI8xZLC1s=", "owner": "Bali10050", "repo": "Darkly", - "rev": "79ec260ff2a9af1f4de10e670c75b31b7fbcd5da", + "rev": "39b4100b86c4531a5729e00e1584df9970b02468", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1753858083, - "narHash": "sha256-9eNLBxVBaOLGTOC1QkwrzRtnb1x9MB/3PYLb+CiALZY=", + "lastModified": 1754290399, + "narHash": "sha256-KwYm1/FeLqP9uE4Sbw+j2nI2/ErNbc9Mn+LPcrEOpX0=", "owner": "nix-community", "repo": "fenix", - "rev": "2c5508b7563b9138a00cd82e213febfc9cbbb36c", + "rev": "f53ddf7518d85d59b58df6e9955b25b0ac25f569", "type": "github" }, "original": { @@ -500,11 +500,11 @@ ] }, "locked": { - "lastModified": 1753761827, - "narHash": "sha256-mrVNT+aF4yR8P8Fx570W2vz+LzukSlf68Yr2YhUJHjo=", + "lastModified": 1754174776, + "narHash": "sha256-Sp3FRM6xNwNtGzYH/HByjzJYHSQvwsW+lDMMZNF43PQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "50adf8fcaa97c9d64309f2d507ed8be54ea23110", + "rev": "e6e2f43a62b7dbc8aa8b1adb7101b0d8b9395445", "type": "github" }, "original": { @@ -520,11 +520,11 @@ ] }, "locked": { - "lastModified": 1753943136, - "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=", + "lastModified": 1754263839, + "narHash": "sha256-ck7lILfCNuunsLvExPI4Pw9OOCJksxXwozum24W8b+8=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c", + "rev": "1d7abbd5454db97e0af51416f4960b3fb64a4773", "type": "github" }, "original": { @@ -595,11 +595,11 @@ ] }, "locked": { - "lastModified": 1753764272, - "narHash": "sha256-8/tZ3ZJpplWaVxgMeRg26cUclBZ27UUnnJdzd+RQKqE=", + "lastModified": 1754110197, + "narHash": "sha256-N7GWK2084EsNdwzwg6FCIgMrSau1WwzxGSNdPHx5Tak=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "448688ae3df3152fec412e583239473934109486", + "rev": "04ce5c103eb621220d69102bc0ee27c3abd89204", "type": "github" }, "original": { @@ -658,21 +658,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixpkgs-stable" - ], + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1753839324, - "narHash": "sha256-ipcsHV+XE7gaItRhqLsjLCYKIk57IAP1s9BHajQRotA=", + "lastModified": 1754303580, + "narHash": "sha256-nAfOEv4uo+v9QjDEqJhyg4QfesTjYNlI2pOE17Qums4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0108605855b3222c8965fa23fc05d713b77d0564", + "rev": "24251fba7cd98d47e02c597a9dff9b28e7a7e2db", "type": "github" }, "original": { @@ -701,11 +697,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752870529, - "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", + "lastModified": 1753983552, + "narHash": "sha256-xnPPjASWt4/u+GmRdrHADBKKSCtIhTFY53CSKM+Xtfk=", "owner": "YaLTeR", "repo": "niri", - "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", + "rev": "91b6a111cf228fadaabba706d8f4d155efc63b3a", "type": "github" }, "original": { @@ -804,11 +800,11 @@ ] }, "locked": { - "lastModified": 1753704990, - "narHash": "sha256-5E14xuNWy2Un1nFR55k68hgbnD8U2x/rE5DXJtYKusw=", + "lastModified": 1754260137, + "narHash": "sha256-IViMH6Fwj8nwO1nuYCqOTpjm9OK9rQ0w8nmoOwPlo98=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "58c814cc6d4a789191f9c12e18277107144b0c91", + "rev": "57ba096649fa4e12dc564e8e3c529255baf89b35", "type": "github" }, "original": { @@ -819,11 +815,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1753939845, + "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "94def634a20494ee057c76998843c015909d6311", "type": "github" }, "original": { @@ -847,11 +843,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1753941802, - "narHash": "sha256-pQt2gqpCCA0GWEqcm4IzvkbLw4fNMn6JNq+5BBPpyAM=", + "lastModified": 1754308354, + "narHash": "sha256-d14QlvGnylLicAIyPmzaysXayTW49RJxl/fyVXCpU34=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed33ba16ce8e8605d8e9ef2dc6e802bc3134781d", + "rev": "fa154dda31ab1a92efb0d1b79bacc6c6174c5333", "type": "github" }, "original": { @@ -863,11 +859,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1753907720, - "narHash": "sha256-rkoY2MZqt8qZbL/R+kUAm9unGXeEBaRpyls/mvImbJQ=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1754307408, + "narHash": "sha256-rt9CztaeSiXr1lwJ4O+mSpJc/T2QY3s7Zsp7qeKzQ8k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22e6141f9c24030dbbd0a7b7c55f5714830e22b5", + "rev": "c33582214e37a77e2b36737ece61df25f505ac93", "type": "github" }, "original": { @@ -879,11 +891,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1753904442, - "narHash": "sha256-XHeb6yarZ9YLd3aQsnc0c8FrpnBGtHckQGZBPYXF7Uk=", + "lastModified": 1754284898, + "narHash": "sha256-wzM6HN0xxyooekXfl7p5P4Bn0LieOKOfsLg4DqY7XLk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d02f407d2bb5a5cb2f2f75c2a7c30d5b854be11b", + "rev": "114484ca7213ac06fa7907e58dd8ef9d801d39f0", "type": "github" }, "original": { @@ -943,11 +955,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "type": "github" }, "original": { @@ -960,14 +988,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1753944818, - "narHash": "sha256-RmW3BYRDdHoIX/LSA3+XNMhhyGT+lO/bgs+fYxb01Bw=", + "lastModified": 1754303234, + "narHash": "sha256-ZHx9RfMyPvW7efozz8JaMRoBG/2grSBIMi6o3PctOqU=", "owner": "nix-community", "repo": "NUR", - "rev": "448277e46c96f6b29c386b00510082dd86165548", + "rev": "c6f06c7960982b40be721ccad3a4c295fce4d14d", "type": "github" }, "original": { @@ -1017,7 +1045,7 @@ "nixpkgs-unstable" ], "nixpkgs-master": "nixpkgs-master", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "sops-nix": "sops-nix", @@ -1028,11 +1056,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1753789923, - "narHash": "sha256-z45szWoM2UZJuo2791LnkI6agdtBhZFSo87elnhp/eI=", + "lastModified": 1754218780, + "narHash": "sha256-M+bLCsYRYA7iudlZkeOf+Azm/1TUvihIq51OKia6KJ8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "e57f18480dc3b1a0f46cd83e2aaa1cf3b53d8ece", + "rev": "8d75311400a108d7ffe17dc9c38182c566952e6e", "type": "github" }, "original": { @@ -1050,11 +1078,11 @@ ] }, "locked": { - "lastModified": 1753757591, - "narHash": "sha256-3okLvry8fRWZhJZP75pPC9P6U1dcu84VOCPhPLXYozI=", + "lastModified": 1754189623, + "narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b372cf71b4125d420d7648cbd898ab8f5c355be2", + "rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a", "type": "github" }, "original": { @@ -1105,11 +1133,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1753919664, - "narHash": "sha256-U7Ts8VbVD4Z6n67gFx00dkpQJu27fMu173IUopX3pNI=", + "lastModified": 1754264048, + "narHash": "sha256-Yg1W0sFhBpnglfhWGlFmxzSmte1F157luHAADp5Hguk=", "owner": "danth", "repo": "stylix", - "rev": "30f5022236cf8dd257941cb0f910e198e7e464c7", + "rev": "1b5e1c5642cf96e07daf14ae4c5ddd23d7ed5623", "type": "github" }, "original": { @@ -1270,11 +1298,11 @@ ] }, "locked": { - "lastModified": 1753933355, - "narHash": "sha256-4QxMcKS6oc+cG8efwwAin4M+YOokBak1dVS8u5P3b5M=", + "lastModified": 1754193284, + "narHash": "sha256-ZGLXnpXy7vcTDLC1yLQSJOclsilvK+RNFVVEeO0ei/0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "fa795a139a8c92b140bc21f11f61da1c97ad5b1d", + "rev": "ac2b25e76f5bfe1e30ae39409dfa450c5c1bc945", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 29e9e0a..c91bdca 100644 --- a/flake.nix +++ b/flake.nix @@ -30,8 +30,6 @@ # Niri niri.url = "github:sodiboo/niri-flake"; - niri.inputs.nixpkgs.follows = "nixpkgs"; - niri.inputs.nixpkgs-stable.follows = "nixpkgs-stable"; darkly.url = "github:Bali10050/Darkly"; darkly.inputs.nixpkgs.follows = "nixpkgs";