From d7f18dda5e511749fa1511185db3536208fb1a63 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 23 Dec 2024 00:29:56 +0200 Subject: [PATCH] flake.lock: update overlays: remove gcc14Stdenv, no longer needed --- flake.lock | 24 ++++++++++++------------ nix/overlays.nix | 15 --------------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 68ec596..08274ca 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ ] }, "locked": { - "lastModified": 1734364628, - "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", + "lastModified": 1734906259, + "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", + "rev": "0404833ea18d543df44df935ebf1b497310eb046", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1733502241, - "narHash": "sha256-KAUNC4Dgq8WQjYov5auBw/usaHixhacvb7cRDd0AG/k=", + "lastModified": 1734796073, + "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "104117aed6dd68561be38b50f218190aa47f2cd8", + "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1734793513, + "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", "type": "github" }, "original": { @@ -97,11 +97,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { diff --git a/nix/overlays.nix b/nix/overlays.nix index f69893a..e9110cc 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -17,7 +17,6 @@ in { default = lib.composeManyExtensions [ self.overlays.xdg-desktop-portal-hyprland self.overlays.sdbus-cpp_2 - self.overlays.hypr-gcc14Stdenv inputs.hyprland-protocols.overlays.default inputs.hyprwayland-scanner.overlays.default inputs.hyprlang.overlays.default @@ -60,18 +59,4 @@ in { }; })); }; - - # TODO: remove this when the next version of Hyprland is available (in Nixpkgs) - hypr-gcc14Stdenv = final: prev: { - hyprcursor = (prev.hyprcursor.override {stdenv = prev.gcc14Stdenv;}).overrideAttrs (self: super: { - src = final.fetchFromGitHub { - owner = "hyprwm"; - repo = "hyprcursor"; - rev = "f388aacd22be4a6e4d634fbaf6f75eb0713d239a"; - hash = "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo="; - }; - }); - hyprlang = prev.hyprlang.override {stdenv = prev.gcc14Stdenv;}; - hyprutil = prev.hyprutil.override {stdenv = prev.gcc14Stdenv;}; - }; }