f8a8458663fe2b61796a2f10264aa09e362fa6a5
- Author
- outfoxxed <outfoxxed@outfoxxed.me>
- Committer
- outfoxxed <outfoxxed@outfoxxed.me>
- Date
Message
version: update to hyprland 0.46.0
Diff
This diff is truncated to protect this page.
1diff --git a/CHANGELOG.md b/CHANGELOG.md
2index 92e9ac0102c87a5337ec8faf3ce8c27b53d470b7..43a8dbb1e4a7dd0f8a0d2d08f6aa7ee038784400 100644
3--- a/CHANGELOG.md
4+++ b/CHANGELOG.md
5@@ -1,5 +1,9 @@
6 # Changelog
7
8+# hl0.46.0 and before
9+
10+- Only compatibility fixes.
11+
12 # hl0.45.0 and before
13
14 - Added hyprsplit compatibility for hy3:movetoworkspace
15diff --git a/compile_commands_bear.sh b/compile_commands_bear.sh
16index 246669388b432c5c7cb636799c1e1f008e94d44c..36c028981769c8f544e6eec173449283971266e9 100755
17--- a/compile_commands_bear.sh
18+++ b/compile_commands_bear.sh
19@@ -1,4 +1,3 @@
20 rm -rf build
21 cmake -DCMAKE_BUILD_TYPE=Debug -DHY3_NO_VERSION_CHECK=TRUE -B build
22 bear -- cmake --build build -j16
23-sed -i 's/-std=gnu++23/-std=gnu++2b/g' compile_commands.json
24diff --git a/default.nix b/default.nix
25index 1925ec5fc022af79a49a982647fe54c1691cea79..a327ff378452f2b901d6a93b84d547e3027ec7ef 100644
26--- a/default.nix
27+++ b/default.nix
28@@ -15,7 +15,7 @@
29 debug ? false,
30 hlversion ? "git",
31 versionCheck ? true,
32-}: stdenv.mkDerivation {
33+}: hyprland.stdenv.mkDerivation {
34 pname = "hy3";
35 version = "hl${hlversion}${lib.optionalString debug "-debug"}";
36 src = nix-gitignore.gitignoreSource [] ./.;
37diff --git a/flake.lock b/flake.lock
38index 6d701a58c0795c9da22f9c431291ff8318ea54b7..01a8d03f684132b361ec329ef3876f8bf0a3a6b1 100644
39--- a/flake.lock
40+++ b/flake.lock
41@@ -20,11 +20,11 @@
42 ]
43 },
44 "locked": {
45- "lastModified": 1731959031,
46- "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=",
47+ "lastModified": 1734400729,
48+ "narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=",
49 "owner": "hyprwm",
50 "repo": "aquamarine",
51- "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52",
52+ "rev": "a132fa41be7ebe797ad758e84d9df068151a723b",
53 "type": "github"
54 },
55 "original": {
56@@ -87,11 +87,11 @@
57 ]
58 },
59 "locked": {
60- "lastModified": 1728669738,
61- "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
62+ "lastModified": 1734364709,
63+ "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=",
64 "owner": "hyprwm",
65 "repo": "hyprcursor",
66- "rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
67+ "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a",
68 "type": "github"
69 },
70 "original": {
71@@ -116,11 +116,11 @@
72 ]
73 },
74 "locked": {
75- "lastModified": 1733248371,
76- "narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=",
77+ "lastModified": 1733684019,
78+ "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=",
79 "owner": "hyprwm",
80 "repo": "hyprgraphics",
81- "rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13",
82+ "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d",
83 "type": "github"
84 },
85 "original": {
86@@ -145,18 +145,18 @@
87 "xdph": "xdph"
88 },
89 "locked": {
90- "lastModified": 1733683959,
91- "narHash": "sha256-+tHGw4fimhZ9LtGUTpXV8V1EH5AWY6FC/3u5OmZ4I5A=",
92- "ref": "refs/heads/main",
93- "rev": "0a27af8cd190315c1f13363ebd11e83d30455d48",
94- "revCount": 5525,
95- "type": "git",
96- "url": "https://github.com/hyprwm/Hyprland"
97+ "lastModified": 1734423633,
98+ "narHash": "sha256-iCbptYR35ifgIwkvU44u6Pbub72wlq7wmlNtemqABOk=",
99+ "owner": "hyprwm",
100+ "repo": "Hyprland",
101+ "rev": "c7d97199103fd1ca43c2a9810c085df5500169ac",
102+ "type": "github"
103 },
104 "original": {
105- "rev": "0a27af8cd190315c1f13363ebd11e83d30455d48",
106- "type": "git",
107- "url": "https://github.com/hyprwm/Hyprland"
108+ "owner": "hyprwm",
109+ "repo": "Hyprland",
110+ "rev": "c7d97199103fd1ca43c2a9810c085df5500169ac",
111+ "type": "github"
112 }
113 },
114 "hyprland-protocols": {
115@@ -200,11 +200,11 @@
116 ]
117 },
118 "locked": {
119- "lastModified": 1733472316,
120- "narHash": "sha256-PvXiFLIExJEJj+goLbIuXLTN5CSDSAUsAfiYSdbbWg0=",
121+ "lastModified": 1733940128,
122+ "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=",
123 "owner": "hyprwm",
124 "repo": "hyprland-qtutils",
125- "rev": "969427419276c7ee170301ef1ebe0f68eb6eb2e2",
126+ "rev": "3833097e50473a152dd614d4b468886840b4ea78",
127 "type": "github"
128 },
129 "original": {
130@@ -229,11 +229,11 @@
131 ]
132 },
133 "locked": {
134- "lastModified": 1728168612,
135- "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",
136+ "lastModified": 1734364628,
137+ "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=",
138 "owner": "hyprwm",
139 "repo": "hyprlang",
140- "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",
141diff --git a/flake.nix b/flake.nix
142index 99844cdf69152ed6dc7221dd782ec35adbf37573..7293ddad885f339a3f694708f1b83ff7b34b37b9 100644
143--- a/flake.nix
144+++ b/flake.nix
145@@ -1,6 +1,6 @@
146 {
147 inputs = {
148- hyprland.url = "git+https://github.com/hyprwm/Hyprland?rev=0a27af8cd190315c1f13363ebd11e83d30455d48";
149+ hyprland.url = "github:hyprwm/Hyprland?rev=c7d97199103fd1ca43c2a9810c085df5500169ac";
150 };
151
152 outputs = { self, hyprland, ... }: let
153diff --git a/hyprpm.toml b/hyprpm.toml
154index 085d4d3097ae8bfe459f784cf39848606446ea46..5e58b7f664b02979650d52884d23056702279d1e 100644
155--- a/hyprpm.toml
156+++ b/hyprpm.toml
157@@ -19,6 +19,10 @@ commit_pins = [
158 ["0c7a7e2d569eeed9d6025f3eef4ea0690d90845d", "4bc32709c7b8f831e39ec2a7921030c08dbdf500"], # 0.44.0
159 ["4520b30d498daca8079365bdb909a8dea38e8d55", "4bc32709c7b8f831e39ec2a7921030c08dbdf500"], # 0.44.0
160 ["a425fbebe4cf4238e48a42f724ef2208959d66cf", "4c79361db9c065886c163d1cf873889e1e641e44"], # 0.45.0
161+ ["500d2a3580388afc8b620b0a3624147faa34f98b", "4c79361db9c065886c163d1cf873889e1e641e44"], # 0.45.1
162+ ["12f9a0d0b93f691d4d9923716557154d74777b0a", "4c79361db9c065886c163d1cf873889e1e641e44"], # 0.45.2
163+ ["788ae588979c2a1ff8a660f16e3c502ef5796755", "d9eb126b2475a3b60445be8b2ef0bce4eb1ae8b2"], # 0.46.0
164+ ["254fc2bc6000075f660b4b8ed818a6af544d1d64", "d9eb126b2475a3b60445be8b2ef0bce4eb1ae8b2"], # 0.46.1
165 ]
166
167 [hy3]
168diff --git a/shell.nix b/shell.nix
169index 1cd716ece743343db0d4369f32ac248a050ee9c6..797b7f15635105fb1b6cf4f769e8bc16ef8050fd 100644
170--- a/shell.nix
171+++ b/shell.nix
172@@ -6,11 +6,13 @@
173 inherit hyprland hlversion;
174 versionCheck = false;
175 },
176-}: pkgs.mkShell {
177+}: pkgs.mkShell.override {
178+ inherit (hy3) stdenv;
179+} {
180 inputsFrom = [ hy3 ];
181
182 nativeBuildInputs = with pkgs; [
183- clang-tools_17
184+ clang-tools
185 bear
186 ];
187 }