From 63d5152be36b267bb33346c338fd3b6deee9da04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jan 2025 13:35:34 +0000 Subject: [PATCH 1/3] aegisub: 3.4.1 -> 3.4.2 --- pkgs/by-name/ae/aegisub/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index bef7a20979630..3aede1eb5fde3 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aegisub"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "TypesettingTools"; repo = "aegisub"; tag = "v${finalAttrs.version}"; - hash = "sha256-3yWtBuCwr1OPOg/nh2s8SFg62vt8zuBMMp0gfOZrjqk="; + hash = "sha256-ho+JG570FWbiYZ86CbCKa52j6UNyPIUh8fxpM3vVU/M="; }; nativeBuildInputs = [ From 84d15ed549b44146240841483a251f988daf8167 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 13 Jan 2025 16:07:23 +0100 Subject: [PATCH 2/3] aegisub: drop attribute without version suffix --- pkgs/by-name/ae/aegisub/package.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index 3aede1eb5fde3..476fdacd91859 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -28,7 +28,7 @@ python3, stdenv, wrapGAppsHook3, - wxGTK, + wxGTK32, zlib, # Boolean guard flags alsaSupport ? stdenv.hostPlatform.isLinux, @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config python3 - wxGTK + wxGTK32 wrapGAppsHook3 ]; @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { libGL libass libuchardet - wxGTK + wxGTK32 zlib ] ++ lib.optionals alsaSupport [ alsa-lib ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 770d6c409fabd..10940f34ce4e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -924,7 +924,6 @@ with pkgs; aegisub = callPackage ../by-name/ae/aegisub/package.nix ({ luajit = luajit.override { enable52Compat = true; }; - wxGTK = wxGTK32; } // (config.aegisub or {})); acme-client = callPackage ../tools/networking/acme-client { From 8813a9db059d3264c883ccc84fae55134d472598 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 13 Jan 2025 16:07:41 +0100 Subject: [PATCH 3/3] aegisub: reformat with nixfmt --- pkgs/by-name/ae/aegisub/package.nix | 47 +++++++++++++++-------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index 476fdacd91859..5a9bdcd317870 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -60,29 +60,30 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 ]; - buildInputs = [ - boost - expat - ffmpeg - ffms - fftw - fontconfig - freetype - fribidi - harfbuzz - icu - libGL - libass - libuchardet - wxGTK32 - zlib - ] - ++ lib.optionals alsaSupport [ alsa-lib ] - ++ lib.optionals (openalSupport && !stdenv.hostPlatform.isDarwin) [ openal ] - ++ lib.optionals portaudioSupport [ portaudio ] - ++ lib.optionals pulseaudioSupport [ libpulseaudio ] - ++ lib.optionals spellcheckSupport [ hunspell ] - ++ lib.optionals (!useBundledLuaJIT) [ luajit ]; + buildInputs = + [ + boost + expat + ffmpeg + ffms + fftw + fontconfig + freetype + fribidi + harfbuzz + icu + libGL + libass + libuchardet + wxGTK32 + zlib + ] + ++ lib.optionals alsaSupport [ alsa-lib ] + ++ lib.optionals (openalSupport && !stdenv.hostPlatform.isDarwin) [ openal ] + ++ lib.optionals portaudioSupport [ portaudio ] + ++ lib.optionals pulseaudioSupport [ libpulseaudio ] + ++ lib.optionals spellcheckSupport [ hunspell ] + ++ lib.optionals (!useBundledLuaJIT) [ luajit ]; mesonFlags = [ (lib.mesonEnable "alsa" alsaSupport)