From 734972e6a8a8f14f1066fd8bfc9ff2b2b07670d5 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Tue, 11 Feb 2025 15:52:12 -0600 Subject: [PATCH] don't define hyprland deps --- flake.lock | 79 ++++++++++++++++++++++++++++++++++++++++++++---------- flake.nix | 22 +++++++-------- 2 files changed, 76 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 315e7a2..16f2cbf 100644 --- a/flake.lock +++ b/flake.lock @@ -189,11 +189,9 @@ "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": [ - "hyprland-qtutils" - ], - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", + "hyprland-qtutils": "hyprland-qtutils", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" @@ -270,14 +268,17 @@ "inputs": { "hyprlang": [ "hyprland", + "hyprland-qtutils", "hyprlang" ], "nixpkgs": [ "hyprland", + "hyprland-qtutils", "nixpkgs" ], "systems": [ "hyprland", + "hyprland-qtutils", "systems" ] }, @@ -297,13 +298,8 @@ }, "hyprland-qtutils": { "inputs": { - "hyprland-qt-support": [ - "hyprland-qt-support" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], + "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": "hyprlang", "hyprutils": [ "hyprland", "hyprutils" @@ -332,6 +328,34 @@ } }, "hyprlang": { + "inputs": { + "hyprutils": "hyprutils", + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { "inputs": { "hyprutils": [ "hyprland", @@ -384,6 +408,35 @@ } }, "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "hyprlang", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "hyprlang", + "systems" + ] + }, + "locked": { + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -735,8 +788,6 @@ "flake-utils": "flake-utils", "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", - "hyprland-qt-support": "hyprland-qt-support", - "hyprland-qtutils": "hyprland-qtutils", "hyprman": "hyprman", "jj": "jj", "lib-aggregate": "lib-aggregate", diff --git a/flake.nix b/flake.nix index cb33854..f6a66f0 100644 --- a/flake.nix +++ b/flake.nix @@ -77,17 +77,17 @@ # zls.inputs.zig-overlay.follows = "zig-overlay"; # further flake.lock minimization shenanigans - hyprland-qt-support.url = "github:hyprwm/hyprland-qt-support"; - hyprland-qt-support.inputs.hyprlang.follows = "hyprland/hyprlang"; - hyprland-qt-support.inputs.nixpkgs.follows = "hyprland/nixpkgs"; - hyprland-qt-support.inputs.systems.follows = "hyprland/systems"; - hyprland-qtutils.url = "github:hyprwm/hyprland-qtutils"; - hyprland-qtutils.inputs.hyprland-qt-support.follows = "hyprland-qt-support"; - hyprland-qtutils.inputs.hyprlang.follows = "hyprland/hyprlang"; - hyprland-qtutils.inputs.hyprutils.follows = "hyprland/hyprutils"; - hyprland-qtutils.inputs.nixpkgs.follows = "hyprland/nixpkgs"; - hyprland-qtutils.inputs.systems.follows = "hyprland/systems"; - hyprland.inputs.hyprland-qtutils.follows = "hyprland-qtutils"; + # hyprland-qt-support.url = "github:hyprwm/hyprland-qt-support"; + # hyprland-qt-support.inputs.hyprlang.follows = "hyprland/hyprlang"; + # hyprland-qt-support.inputs.nixpkgs.follows = "hyprland/nixpkgs"; + # hyprland-qt-support.inputs.systems.follows = "hyprland/systems"; + # hyprland-qtutils.url = "github:hyprwm/hyprland-qtutils"; + # hyprland-qtutils.inputs.hyprland-qt-support.follows = "hyprland-qt-support"; + # hyprland-qtutils.inputs.hyprlang.follows = "hyprland/hyprlang"; + # hyprland-qtutils.inputs.hyprutils.follows = "hyprland/hyprutils"; + # hyprland-qtutils.inputs.nixpkgs.follows = "hyprland/nixpkgs"; + # hyprland-qtutils.inputs.systems.follows = "hyprland/systems"; + # hyprland.inputs.hyprland-qtutils.follows = "hyprland-qtutils"; systems.url = "github:nix-systems/x86_64-linux"; hyprland.inputs.systems.follows = "systems";