tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
Change all alsaUtils references to alsa-utils
AndersonTorres
4 years ago
f1242006
7b8a56a5
+26
-25
11 changed files
expand all
collapse all
unified
split
pkgs
applications
audio
MMA
default.nix
rakarrack
default.nix
networking
instant-messengers
mikutter
default.nix
window-managers
dwm
dwm-status.nix
i3
blocks-gaps.nix
development
python-modules
notify-py
default.nix
py3status
default.nix
misc
solfege
default.nix
servers
roon-server
default.nix
top-level
aliases.nix
all-packages.nix
+6
-6
pkgs/applications/audio/MMA/default.nix
···
1
1
-
{ lib, stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }:
1
1
+
{ lib, stdenv, fetchurl, makeWrapper, python3, alsa-utils, timidity }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
version = "20.12";
···
10
10
};
11
11
12
12
nativeBuildInputs = [ makeWrapper ];
13
13
-
buildInputs = [ python3 alsaUtils timidity ];
13
13
+
buildInputs = [ python3 alsa-utils timidity ];
14
14
15
15
patchPhase = ''
16
16
-
sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec
17
17
-
sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' util/mma-splitrec.py
18
18
-
sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' mma-splitrec
19
19
-
sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' util/mma-splitrec.py
16
16
+
sed -i 's@/usr/bin/aplaymidi@/${alsa-utils}/bin/aplaymidi@g' mma-splitrec
17
17
+
sed -i 's@/usr/bin/aplaymidi@/${alsa-utils}/bin/aplaymidi@g' util/mma-splitrec.py
18
18
+
sed -i 's@/usr/bin/arecord@/${alsa-utils}/bin/arecord@g' mma-splitrec
19
19
+
sed -i 's@/usr/bin/arecord@/${alsa-utils}/bin/arecord@g' util/mma-splitrec.py
20
20
sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec
21
21
sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py
22
22
find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g'
+2
-2
pkgs/applications/audio/rakarrack/default.nix
···
1
1
-
{ lib, stdenv, fetchurl, alsa-lib, alsaUtils, fltk, libjack2, libXft,
1
1
+
{ lib, stdenv, fetchurl, alsa-lib, alsa-utils, fltk, libjack2, libXft,
2
2
libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }:
3
3
4
4
stdenv.mkDerivation rec {
···
14
14
15
15
patches = [ ./fltk-path.patch ];
16
16
17
17
-
buildInputs = [ alsa-lib alsaUtils fltk libjack2 libXft libXpm libjpeg
17
17
+
buildInputs = [ alsa-lib alsa-utils fltk libjack2 libXft libXpm libjpeg
18
18
libpng libsamplerate libsndfile zlib ];
19
19
20
20
meta = with lib; {
+3
-3
pkgs/applications/networking/instant-messengers/mikutter/default.nix
···
2
2
, stdenv
3
3
, fetchurl
4
4
, bundlerEnv
5
5
-
, alsaUtils
5
5
+
, alsa-utils
6
6
, atk
7
7
, copyDesktopItems
8
8
, gobject-introspection
···
87
87
libnotify
88
88
which # some plugins use it at runtime
89
89
wrappedRuby
90
90
-
] ++ lib.optionals stdenv.isLinux [ alsaUtils ];
90
90
+
] ++ lib.optionals stdenv.isLinux [ alsa-utils ];
91
91
92
92
scriptPath = lib.makeBinPath (
93
93
[ wrappedRuby libnotify which ]
94
94
-
++ lib.optionals stdenv.isLinux [ alsaUtils ]
94
94
+
++ lib.optionals stdenv.isLinux [ alsa-utils ]
95
95
);
96
96
97
97
postUnpack = ''
+2
-2
pkgs/applications/window-managers/dwm/dwm-status.nix
···
1
1
{ lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg
2
2
-
, enableAlsaUtils ? true, alsaUtils, coreutils
2
2
+
, enableAlsaUtils ? true, alsa-utils, coreutils
3
3
, enableNetwork ? true, dnsutils, iproute2, wirelesstools }:
4
4
5
5
let
6
6
-
bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ]
6
6
+
bins = lib.optionals enableAlsaUtils [ alsa-utils coreutils ]
7
7
++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ];
8
8
in
9
9
+2
-2
pkgs/applications/window-managers/i3/blocks-gaps.nix
···
1
1
{ fetchFromGitHub, lib, stdenv, perl, makeWrapper
2
2
-
, iproute2, acpi, sysstat, alsaUtils
2
2
+
, iproute2, acpi, sysstat, alsa-utils
3
3
, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
4
4
"load_average" "memory" "volume" "wifi" ]
5
5
}:
···
38
38
wrapProgram $out/libexec/i3blocks/iface \
39
39
--prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute2)}
40
40
wrapProgram $out/libexec/i3blocks/volume \
41
41
-
--prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}
41
41
+
--prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsa-utils)}
42
42
'';
43
43
44
44
meta = with lib; {
+2
-2
pkgs/development/python-modules/notify-py/default.nix
···
1
1
-
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, coreutils, alsaUtils
1
1
+
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, coreutils, alsa-utils
2
2
, libnotify, which, jeepney, loguru, pytestCheckHook }:
3
3
4
4
buildPythonPackage rec {
···
15
15
};
16
16
17
17
propagatedNativeBuildInputs = [ which ]
18
18
-
++ lib.optionals stdenv.isLinux [ alsaUtils libnotify ];
18
18
+
++ lib.optionals stdenv.isLinux [ alsa-utils libnotify ];
19
19
propagatedBuildInputs = [ loguru ]
20
20
++ lib.optionals stdenv.isLinux [ jeepney ];
21
21
+2
-2
pkgs/development/python-modules/py3status/default.nix
···
14
14
, file
15
15
, acpi
16
16
, coreutils
17
17
-
, alsaUtils
17
17
+
, alsa-utils
18
18
, i3
19
19
, procps
20
20
, lm_sensors
···
40
40
sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py
41
41
sed -i -e "s|notify-send|${libnotify}/bin/notify-send|" py3status/modules/battery_level.py
42
42
sed -i -e "s|/usr/bin/whoami|${coreutils}/bin/whoami|" py3status/modules/external_script.py
43
43
-
sed -i -e "s|'amixer|'${alsaUtils}/bin/amixer|" py3status/modules/volume_status.py
43
43
+
sed -i -e "s|'amixer|'${alsa-utils}/bin/amixer|" py3status/modules/volume_status.py
44
44
sed -i -e "s|'i3-nagbar|'${i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py
45
45
sed -i -e "s|'free|'${procps}/bin/free|" py3status/modules/sysdata.py
46
46
sed -i -e "s|'sensors|'${lm_sensors}/bin/sensors|" py3status/modules/sysdata.py
+2
-2
pkgs/misc/solfege/default.nix
···
1
1
{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook
2
2
, buildPythonApplication, pycairo, pygobject3
3
3
, gobject-introspection, gtk3, librsvg
4
4
-
, alsaUtils, timidity, mpg123, vorbis-tools, csound, lilypond
4
4
+
, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond
5
5
}:
6
6
7
7
buildPythonApplication rec {
···
24
24
propagatedBuildInputs = [ pycairo pygobject3 ];
25
25
26
26
preBuild = ''
27
27
-
sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \
27
27
+
sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \
28
28
-e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \
29
29
-e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \
30
30
-e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \
+3
-3
pkgs/servers/roon-server/default.nix
···
1
1
{ alsa-lib
2
2
-
, alsaUtils
2
2
+
, alsa-utils
3
3
, autoPatchelfHook
4
4
, cifs-utils
5
5
, fetchurl
···
24
24
25
25
buildInputs = [
26
26
alsa-lib
27
27
-
alsaUtils
27
27
+
alsa-utils
28
28
cifs-utils
29
29
ffmpeg
30
30
freetype
···
48
48
ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin}
49
49
'';
50
50
wrapFix = bin: ''
51
51
-
wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsaUtils cifs-utils ffmpeg ]}
51
51
+
wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]}
52
52
'';
53
53
in
54
54
''
+1
pkgs/top-level/aliases.nix
···
47
47
alsaPlugins = alsa-plugins; # added 2021-06-10
48
48
alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10
49
49
alsaTools = alsa-tools; # added 2021-06-10
50
50
+
alsaUtils = alsa-utils; # added 2021-06-10
50
51
amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30
51
52
ammonite-repl = ammonite; # added 2017-05-02
52
53
amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09
+1
-1
pkgs/top-level/all-packages.nix
···
20108
20108
alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { };
20109
20109
alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { };
20110
20110
alsa-tools = callPackage ../os-specific/linux/alsa-project/alsa-tools { };
20111
20111
-
alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; };
20111
20111
+
alsa-utils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; };
20112
20112
alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { };
20113
20113
alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { };
20114
20114