From af832f8ceb0caae69d95532c8f15ba8b9c27eab4 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 29 Jul 2024 16:00:38 +0300 Subject: [PATCH 1/5] pavucontrol: format with nixfmt-rfc-style --- .../audio/pavucontrol/default.nix | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index f6b8d20f91d2..074ba705ca97 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,15 +1,16 @@ -{ fetchurl -, lib -, stdenv -, pkg-config -, intltool -, libpulseaudio -, gtkmm3 -, libsigcxx -, libcanberra-gtk3 -, json-glib -, adwaita-icon-theme -, wrapGAppsHook3 +{ + fetchurl, + lib, + stdenv, + pkg-config, + intltool, + libpulseaudio, + gtkmm3, + libsigcxx, + libcanberra-gtk3, + json-glib, + adwaita-icon-theme, + wrapGAppsHook3, }: stdenv.mkDerivation rec { @@ -30,7 +31,11 @@ stdenv.mkDerivation rec { adwaita-icon-theme ]; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; + nativeBuildInputs = [ + pkg-config + intltool + wrapGAppsHook3 + ]; configureFlags = [ "--disable-lynx" ]; From ca6667b535fdbcf1682056aa77e70b17ce4a3cc3 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 29 Jul 2024 16:02:11 +0300 Subject: [PATCH 2/5] pavucontrol: use finalAttrs pattern --- pkgs/applications/audio/pavucontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 074ba705ca97..a52f3e83c994 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -13,12 +13,12 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pavucontrol"; version = "5.0"; src = fetchurl { - url = "https://freedesktop.org/software/pulseaudio/${pname}/${pname}-${version}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; sha256 = "sha256-zityw7XxpwrQ3xndgXUPlFW9IIcNHTo20gU2ry6PTno="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "pavucontrol"; }; -} +}) From e21cf452e251522b3952f4aba1a4ac9fb05a767e Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 29 Jul 2024 16:03:36 +0300 Subject: [PATCH 3/5] pavucontrol: refactor meta - Remove empty lines - Sort alphabetically - Add `changelog` - Remove `with lib;` --- pkgs/applications/audio/pavucontrol/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index a52f3e83c994..f6830469f6c7 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -41,21 +41,18 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - meta = with lib; { + meta = { + changelog = "https://freedesktop.org/software/pulseaudio/pavucontrol/#news"; description = "PulseAudio Volume Control"; - + homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/"; + license = lib.licenses.gpl2Plus; longDescription = '' PulseAudio Volume Control (pavucontrol) provides a GTK graphical user interface to connect to a PulseAudio server and easily control the volume of all clients, sinks, etc. ''; - - homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/"; - - license = lib.licenses.gpl2Plus; - - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; mainProgram = "pavucontrol"; + maintainers = with lib.maintainers; [ abbradar ]; + platforms = lib.platforms.linux; }; }) From 56956e39dde7233422c8e0a47800820ce6c726bf Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 29 Jul 2024 16:24:10 +0300 Subject: [PATCH 4/5] pavucontrol: 5.0 -> 6.0 Diff: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/compare/v5.0...v6.0 --- .../audio/pavucontrol/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index f6830469f6c7..dca90a8f5fd0 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -5,39 +5,50 @@ pkg-config, intltool, libpulseaudio, - gtkmm3, + gtkmm4, libsigcxx, + # Since version 6.0, libcanberra is optional + withLibcanberra ? true, libcanberra-gtk3, json-glib, adwaita-icon-theme, - wrapGAppsHook3, + wrapGAppsHook4, + meson, + ninja, + libpressureaudio, }: stdenv.mkDerivation (finalAttrs: { pname = "pavucontrol"; - version = "5.0"; + version = "6.0"; src = fetchurl { url = "https://freedesktop.org/software/pulseaudio/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-zityw7XxpwrQ3xndgXUPlFW9IIcNHTo20gU2ry6PTno="; + sha256 = "sha256-hchg1o/x+CzZjHKpJXGEvuOSmVeKsSLSm8Uey+z79ls="; }; buildInputs = [ libpulseaudio - gtkmm3 + gtkmm4 libsigcxx - libcanberra-gtk3 + (lib.optionals withLibcanberra libcanberra-gtk3) json-glib adwaita-icon-theme + libpressureaudio ]; nativeBuildInputs = [ pkg-config intltool - wrapGAppsHook3 + wrapGAppsHook4 + meson + ninja ]; - configureFlags = [ "--disable-lynx" ]; + mesonFlags = [ + "--prefix=${placeholder "out"}" + (lib.mesonBool "lynx" false) + ]; enableParallelBuilding = true; From f7856360504d399afd58c1a431884bd8e883a26d Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 29 Jul 2024 17:32:14 +0300 Subject: [PATCH 5/5] pavucontrol: fetchurl -> fetchFromGitLab --- pkgs/applications/audio/pavucontrol/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index dca90a8f5fd0..027d3880bd9d 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { - fetchurl, + fetchFromGitLab, lib, stdenv, pkg-config, @@ -22,9 +22,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "pavucontrol"; version = "6.0"; - src = fetchurl { - url = "https://freedesktop.org/software/pulseaudio/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-hchg1o/x+CzZjHKpJXGEvuOSmVeKsSLSm8Uey+z79ls="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pulseaudio"; + repo = "pavucontrol"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-nxzFvD/KUevIJOw9jgcr0Hfvg7KiSOmTBfKN3jLu3Cg="; }; buildInputs = [