Merge pull request #299869 from jtbx/halloy-2024.5

halloy: 2024.3 -> 2024.5
This commit is contained in:
Fabian Affolter 2024-03-30 10:39:42 +01:00 committed by GitHub
commit 0bcbd226cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 927 additions and 1060 deletions

View File

@ -15,19 +15,19 @@
rustPlatform.buildRustPackage rec {
pname = "halloy";
version = "2024.3";
version = "2024.5";
src = fetchFromGitHub {
owner = "squidowl";
repo = "halloy";
rev = "refs/tags/${version}";
hash = "sha256-9yEkM65c8R71oQ0C54xZqwRh609+HSaq4Hb8izNM52A=";
hash = "sha256-F/yQYLYrq3MZFV6igQe4sQi84ChIKCCPdS5151nD6hs=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"iced-0.12.0" = "sha256-LtmAJDUMp42S4E+CjOM6Q7doAKOZkmJCN/49gsq3v/A=";
"iced-0.13.0-dev" = "sha256-8L0AoHPwRUeCiJK/N0NTs1Nl4BX0wbM7SLgundhvra0=";
"winit-0.29.10" = "sha256-YoXJEvEhMvk3pK5EbXceVFeJEJLL6KTjiw0kBJxgHIE=";
};
};
@ -83,7 +83,8 @@ rustPlatform.buildRustPackage rec {
'');
postInstall = ''
install -Dm644 assets/linux/org.squidowl.halloy.png $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png
install -Dm644 assets/linux/icons/hicolor/128x128/apps/org.squidowl.halloy.png \
$out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png
'';
meta = with lib; {

View File

@ -8775,8 +8775,6 @@ with pkgs;
halftone = callPackage ../applications/graphics/halftone { };
halloy = callPackage ../applications/networking/irc/halloy { };
harminv = callPackage ../development/libraries/science/chemistry/harminv { };
igrep = callPackage ../tools/text/igrep {