From f1242006c9674520e0a733885cf6f7d67908ad19 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 10 Jun 2021 01:10:52 -0300 Subject: [PATCH] Change all alsaUtils references to alsa-utils --- pkgs/applications/audio/MMA/default.nix | 12 ++++++------ pkgs/applications/audio/rakarrack/default.nix | 4 ++-- .../instant-messengers/mikutter/default.nix | 6 +++--- pkgs/applications/window-managers/dwm/dwm-status.nix | 4 ++-- pkgs/applications/window-managers/i3/blocks-gaps.nix | 4 ++-- .../development/python-modules/notify-py/default.nix | 4 ++-- .../development/python-modules/py3status/default.nix | 4 ++-- pkgs/misc/solfege/default.nix | 4 ++-- pkgs/servers/roon-server/default.nix | 6 +++--- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index 25cb96965092..3034de750cf9 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: +{ lib, stdenv, fetchurl, makeWrapper, python3, alsa-utils, timidity }: stdenv.mkDerivation rec { version = "20.12"; @@ -10,13 +10,13 @@ }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python3 alsaUtils timidity ]; + buildInputs = [ python3 alsa-utils timidity ]; patchPhase = '' - sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec - sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' util/mma-splitrec.py - sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' mma-splitrec - sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' util/mma-splitrec.py + sed -i 's@/usr/bin/aplaymidi@/${alsa-utils}/bin/aplaymidi@g' mma-splitrec + sed -i 's@/usr/bin/aplaymidi@/${alsa-utils}/bin/aplaymidi@g' util/mma-splitrec.py + sed -i 's@/usr/bin/arecord@/${alsa-utils}/bin/arecord@g' mma-splitrec + sed -i 's@/usr/bin/arecord@/${alsa-utils}/bin/arecord@g' util/mma-splitrec.py sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g' diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index d1166752fb04..6d5d1ca860d0 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsa-lib, alsaUtils, fltk, libjack2, libXft, +{ lib, stdenv, fetchurl, alsa-lib, alsa-utils, fltk, libjack2, libXft, libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./fltk-path.patch ]; - buildInputs = [ alsa-lib alsaUtils fltk libjack2 libXft libXpm libjpeg + buildInputs = [ alsa-lib alsa-utils fltk libjack2 libXft libXpm libjpeg libpng libsamplerate libsndfile zlib ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 111a3ed091e1..c20ec46f266d 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , bundlerEnv -, alsaUtils +, alsa-utils , atk , copyDesktopItems , gobject-introspection @@ -87,11 +87,11 @@ with mikutterPaths; stdenv.mkDerivation rec { libnotify which # some plugins use it at runtime wrappedRuby - ] ++ lib.optionals stdenv.isLinux [ alsaUtils ]; + ] ++ lib.optionals stdenv.isLinux [ alsa-utils ]; scriptPath = lib.makeBinPath ( [ wrappedRuby libnotify which ] - ++ lib.optionals stdenv.isLinux [ alsaUtils ] + ++ lib.optionals stdenv.isLinux [ alsa-utils ] ); postUnpack = '' diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index ba284b76867d..7b22eb399251 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,9 +1,9 @@ { lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg -, enableAlsaUtils ? true, alsaUtils, coreutils +, enableAlsaUtils ? true, alsa-utils, coreutils , enableNetwork ? true, dnsutils, iproute2, wirelesstools }: let - bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ] + bins = lib.optionals enableAlsaUtils [ alsa-utils coreutils ] ++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ]; in diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index df774aa417f3..4acc2fb669c6 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, lib, stdenv, perl, makeWrapper -, iproute2, acpi, sysstat, alsaUtils +, iproute2, acpi, sysstat, alsa-utils , scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" "load_average" "memory" "volume" "wifi" ] }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { wrapProgram $out/libexec/i3blocks/iface \ --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute2)} wrapProgram $out/libexec/i3blocks/volume \ - --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} + --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsa-utils)} ''; meta = with lib; { diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index ea9f0485bef8..ba4725c9aaa4 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, coreutils, alsaUtils +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, coreutils, alsa-utils , libnotify, which, jeepney, loguru, pytestCheckHook }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { }; propagatedNativeBuildInputs = [ which ] - ++ lib.optionals stdenv.isLinux [ alsaUtils libnotify ]; + ++ lib.optionals stdenv.isLinux [ alsa-utils libnotify ]; propagatedBuildInputs = [ loguru ] ++ lib.optionals stdenv.isLinux [ jeepney ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 9967394d28e0..b41b7ddf320c 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -14,7 +14,7 @@ , file , acpi , coreutils -, alsaUtils +, alsa-utils , i3 , procps , lm_sensors @@ -40,7 +40,7 @@ buildPythonPackage rec { sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py sed -i -e "s|notify-send|${libnotify}/bin/notify-send|" py3status/modules/battery_level.py sed -i -e "s|/usr/bin/whoami|${coreutils}/bin/whoami|" py3status/modules/external_script.py - sed -i -e "s|'amixer|'${alsaUtils}/bin/amixer|" py3status/modules/volume_status.py + sed -i -e "s|'amixer|'${alsa-utils}/bin/amixer|" py3status/modules/volume_status.py sed -i -e "s|'i3-nagbar|'${i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py sed -i -e "s|'free|'${procps}/bin/free|" py3status/modules/sysdata.py sed -i -e "s|'sensors|'${lm_sensors}/bin/sensors|" py3status/modules/sysdata.py diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index af2ce3f53cf2..fc7062d904c3 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook , buildPythonApplication, pycairo, pygobject3 , gobject-introspection, gtk3, librsvg -, alsaUtils, timidity, mpg123, vorbis-tools, csound, lilypond +, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond }: buildPythonApplication rec { @@ -24,7 +24,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pycairo pygobject3 ]; preBuild = '' - sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \ + sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \ -e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \ -e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \ -e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \ diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 771f6606ca7f..c26ae1e6416c 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -1,5 +1,5 @@ { alsa-lib -, alsaUtils +, alsa-utils , autoPatchelfHook , cifs-utils , fetchurl @@ -24,7 +24,7 @@ buildInputs = [ alsa-lib - alsaUtils + alsa-utils cifs-utils ffmpeg freetype @@ -48,7 +48,7 @@ ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin} ''; wrapFix = bin: '' - wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsaUtils cifs-utils ffmpeg ]} + wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]} ''; in '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9af719b2e926..3eb72cefa122 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -47,6 +47,7 @@ mapAliases ({ alsaPlugins = alsa-plugins; # added 2021-06-10 alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10 alsaTools = alsa-tools; # added 2021-06-10 + alsaUtils = alsa-utils; # added 2021-06-10 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6387f80c01b4..cad86d7a6fc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20108,7 +20108,7 @@ in alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; alsa-tools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; - alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; + alsa-utils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { };