chore: Update to latest nixos-unstable release

- Removed ironbar overlay as it's no longer needed
- Removed broken packages that don't build with Ruts 1.80.0
This commit is contained in:
Donovan Glover 2024-08-15 13:46:21 -04:00
parent 76955215b6
commit 7b7028ed68
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
4 changed files with 3 additions and 52 deletions

View File

@ -1,25 +0,0 @@
From 2bc741d197867cd5f0c391b9532b4cf9c4d378f6 Mon Sep 17 00:00:00 2001
From: Jake Stanger <mail@jstanger.dev>
Date: Sun, 4 Aug 2024 13:38:29 +0100
Subject: [PATCH] fix(tray): crash when provided empty pixmap
Fixes #675
---
src/modules/tray/icon.rs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/modules/tray/icon.rs b/src/modules/tray/icon.rs
index c42ff4a5..87a77e50 100644
--- a/src/modules/tray/icon.rs
+++ b/src/modules/tray/icon.rs
@@ -90,6 +90,10 @@ fn get_image_from_pixmap(item: &TrayMenu, size: u32) -> Result<Image> {
.and_then(|pixmap| pixmap.first())
.ok_or_else(|| Report::msg("Failed to get pixmap from tray icon"))?;
+ if pixmap.width == 0 || pixmap.height == 0 {
+ return Err(Report::msg("empty pixmap"));
+ }
+
let mut pixels = pixmap.pixels.to_vec();
for i in (0..pixels.len()).step_by(4) {

View File

@ -201,11 +201,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723244258, "lastModified": 1723733645,
"narHash": "sha256-gr540qGBzdILcjqGub+GbKgMtvjUuNVKLdb3nxGGuQQ=", "narHash": "sha256-eeatoDlOvM2IiIOGfZTJybUfyxGlYSmfpheSSywl2pk=",
"owner": "donovanglover", "owner": "donovanglover",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0a9614120bcc9badef84d25477f71652f0d5c093", "rev": "a622d4381e24fc193048d7ff88385deec0f96386",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -74,7 +74,6 @@ in
diskonaut diskonaut
pgcli pgcli
litecli litecli
iamb
; ;
inherit (pkgs) inherit (pkgs)
p7zip p7zip
@ -94,7 +93,6 @@ in
; ;
inherit (pkgs) inherit (pkgs)
nixpkgs-review nixpkgs-review
nix-init
nix-update nix-update
statix statix
nvd nvd

View File

@ -1,22 +0,0 @@
final: prev: {
ironbar = prev.ironbar.overrideAttrs (oldAttrs: rec {
version = "0.15.1-unstable-2024-08-04";
src = prev.fetchFromGitHub {
owner = "JakeStanger";
repo = "ironbar";
rev = "92c690dcd14c21272f89bfde292546a2ee828e23";
hash = "sha256-YFarQSZEIFpA1/9eRK4tm88mZYvWGIaAgCEAjazBO38=";
};
patches = (oldAttrs.patches or [ ]) ++ [ ../assets/ironbar-fix-tray-crash.patch ];
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (
prev.lib.const {
name = "${oldAttrs.pname}-${version}-vendor.tar.gz";
inherit src;
outputHash = "sha256-wvjxKn2xS3qDJb7xVkLObr+Pz1djx+KHNSI66aonzpI=";
}
);
});
}