diff options
526 files changed, 2622 insertions, 2670 deletions
diff --git a/doc/builders/special/fhs-environments.section.md b/doc/builders/special/fhs-environments.section.md index 512a31cae0f..146ded53240 100644 --- a/doc/builders/special/fhs-environments.section.md +++ b/doc/builders/special/fhs-environments.section.md @@ -28,7 +28,7 @@ One can create a simple environment using a `shell.nix` like that: name = "simple-x11-env"; targetPkgs = pkgs: (with pkgs; [ udev - alsaLib + alsa-lib ]) ++ (with pkgs.xorg; [ libX11 libXcursor @@ -36,7 +36,7 @@ One can create a simple environment using a `shell.nix` like that: ]); multiPkgs = pkgs: (with pkgs; [ udev - alsaLib + alsa-lib ]); runScript = "bash"; }).env diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8cc9d1a981..42e81ce82a1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2683,6 +2683,16 @@ githubId = 10198051; name = "Drew Risinger"; }; + drupol = { + name = "Pol Dellaiera"; + email = "pol.dellaiera@protonmail.com"; + github = "drupol"; + githubId = 252042; + keys = [{ + longkeyid = "ed25519/0x0AAF2901E8040715"; + fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715"; + }]; + }; dschrempf = { name = "Dominik Schrempf"; email = "dominik.schrempf@gmail.com"; diff --git a/nixos/doc/manual/configuration/gpu-accel.xml b/nixos/doc/manual/configuration/gpu-accel.xml index 3695a5ff445..9aa9be86a06 100644 --- a/nixos/doc/manual/configuration/gpu-accel.xml +++ b/nixos/doc/manual/configuration/gpu-accel.xml @@ -178,9 +178,9 @@ GPU1: Core Next</link> (GCN) GPUs are supported through either radv, which is part of <package>mesa</package>, or the <package>amdvlk</package> package. Adding the <package>amdvlk</package> package to - <xref linkend="opt-hardware.opengl.extraPackages"/> makes both drivers - available for applications and lets them choose. A specific driver can - be forced as follows: + <xref linkend="opt-hardware.opengl.extraPackages"/> makes amdvlk the + default driver and hides radv and lavapipe from the device list. A + specific driver can be forced as follows: <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [ pkgs.<package>amdvlk</package> @@ -191,10 +191,9 @@ GPU1: pkgs.driversi686Linux.<package>amdvlk</package> ]; - # For amdvlk - <xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES = - "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json"; - # For radv + # Force radv + <xref linkend="opt-environment.variables"/>.AMD_VULKAN_ICD = "RADV"; + # Or <xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; </programlisting> diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 0266bbfb121..3f7ae109e8c 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -17,9 +17,9 @@ let binary = "${getBin overriddenPackage}/bin/pulseaudio"; binaryNoDaemon = "${binary} --daemonize=no"; - # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps + # Forces 32bit pulseaudio and alsa-plugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsaLib != null && pkgs.pkgsi686Linux.libpulseaudio != null); + enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null); myConfigFile = @@ -62,18 +62,18 @@ let # plugin. alsaConf = writeText "asound.conf" ('' pcm_type.pulse { - libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ; + libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ; ${lib.optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"} } pcm.!default { type pulse hint.description "Default Audio Device (via PulseAudio)" } ctl_type.pulse { - libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ; + libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ; ${lib.optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.alsa-plugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"} } ctl.!default { type pulse diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 7ea2940292b..2cbbbc522e1 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -252,7 +252,7 @@ in postsrsd = 220; opendkim = 221; dspam = 222; - gale = 223; + # gale = 223; removed 2021-06-10 matrix-synapse = 224; rspamd = 225; # rmilter = 226; # unused, removed 2019-08-22 @@ -562,7 +562,7 @@ in postsrsd = 220; opendkim = 221; dspam = 222; - gale = 223; + # gale = 223; removed 2021-06-10 matrix-synapse = 224; rspamd = 225; # rmilter = 226; # unused, removed 2019-08-22 diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 120ba2b004f..805f92e6793 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -692,7 +692,6 @@ ./services/networking/flannel.nix ./services/networking/freenet.nix ./services/networking/freeradius.nix - ./services/networking/gale.nix ./services/networking/gateone.nix ./services/networking/gdomap.nix ./services/networking/ghostunnel.nix diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index aff3fe2ba42..0d743ed31da 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -5,7 +5,7 @@ with lib; let - inherit (pkgs) alsaUtils; + inherit (pkgs) alsa-utils; pulseaudioEnabled = config.hardware.pulseaudio.enable; @@ -88,13 +88,13 @@ in config = mkIf config.sound.enable { - environment.systemPackages = [ alsaUtils ]; + environment.systemPackages = [ alsa-utils ]; environment.etc = mkIf (!pulseaudioEnabled && config.sound.extraConfig != "") { "asound.conf".text = config.sound.extraConfig; }; # ALSA provides a udev rule for restoring volume settings. - services.udev.packages = [ alsaUtils ]; + services.udev.packages = [ alsa-utils ]; boot.kernelModules = optional config.sound.enableOSSEmulation "snd_pcm_oss"; @@ -107,7 +107,7 @@ in Type = "oneshot"; RemainAfterExit = true; ExecStart = "${pkgs.coreutils}/bin/mkdir -p /var/lib/alsa"; - ExecStop = "${alsaUtils}/sbin/alsactl store --ignore"; + ExecStop = "${alsa-utils}/sbin/alsactl store --ignore"; }; }; @@ -115,16 +115,16 @@ in enable = true; bindings = [ # "Mute" media key - { keys = [ 113 ]; events = [ "key" ]; command = "${alsaUtils}/bin/amixer -q set Master toggle"; } + { keys = [ 113 ]; events = [ "key" ]; command = "${alsa-utils}/bin/amixer -q set Master toggle"; } # "Lower Volume" media key - { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute"; } + { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute"; } # "Raise Volume" media key - { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute"; } + { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute"; } # "Mic Mute" media key - { keys = [ 190 ]; events = [ "key" ]; command = "${alsaUtils}/bin/amixer -q set Capture toggle"; } + { keys = [ 190 ]; events = [ "key" ]; command = "${alsa-utils}/bin/amixer -q set Capture toggle"; } ]; }; diff --git a/nixos/modules/services/audio/jack.nix b/nixos/modules/services/audio/jack.nix index f341b432f75..d0a95b87ee1 100644 --- a/nixos/modules/services/audio/jack.nix +++ b/nixos/modules/services/audio/jack.nix @@ -8,7 +8,7 @@ let pcmPlugin = cfg.jackd.enable && cfg.alsa.enable; loopback = cfg.jackd.enable && cfg.loopback.enable; - enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 && pkgs.pkgsi686Linux.alsaLib != null; + enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 && pkgs.pkgsi686Linux.alsa-lib != null; umaskNeeded = versionOlder cfg.jackd.package.version "1.9.12"; bridgeNeeded = versionAtLeast cfg.jackd.package.version "1.9.12"; @@ -129,9 +129,9 @@ in { (mkIf pcmPlugin { sound.extraConfig = '' pcm_type.jack { - libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_jack.so ; + libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_jack.so ; ${lib.optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_jack.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_jack.so ;"} } pcm.!default { @func getenv @@ -234,7 +234,7 @@ in { environment = { systemPackages = [ cfg.jackd.package ]; - etc."alsa/conf.d/50-jack.conf".source = "${pkgs.alsaPlugins}/etc/alsa/conf.d/50-jack.conf"; + etc."alsa/conf.d/50-jack.conf".source = "${pkgs.alsa-plugins}/etc/alsa/conf.d/50-jack.conf"; variables.JACK_PROMISCUOUS_SERVER = "jackaudio"; }; diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixos/modules/services/hardware/actkbd.nix index daa407ca1f0..f7770f85da3 100644 --- a/nixos/modules/services/hardware/actkbd.nix +++ b/nixos/modules/services/hardware/actkbd.nix @@ -75,7 +75,7 @@ in type = types.listOf (types.submodule bindingCfg); default = []; example = lib.literalExample '' - [ { keys = [ 113 ]; events = [ "key" ]; command = "''${pkgs.alsaUtils}/bin/amixer -q set Master toggle"; } + [ { keys = [ 113 ]; events = [ "key" ]; command = "''${pkgs.alsa-utils}/bin/amixer -q set Master toggle"; } ] ''; description = '' diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix deleted file mode 100644 index cb954fd836b..00000000000 --- a/nixos/modules/services/networking/gale.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.gale; - # we convert the path to a string to avoid it being copied to the nix store, - # otherwise users could read the private key as all files in the store are - # world-readable - keyPath = toString cfg.keyPath; - # ...but we refer to the pubkey file using a path so that we can ensure the - # config gets rebuilt if the public key changes (we can assume the private key - # will never change without the public key having changed) - gpubFile = cfg.keyPath + "/${cfg.domain}.gpub"; - home = "/var/lib/gale"; - keysPrepared = cfg.keyPath != null && lib.pathExists cfg.keyPath; -in -{ - options = { - services.gale = { - enable = mkEnableOption "the Gale messaging daemon"; - - user = mkOption { - default = "gale"; - type = types.str; - description = "Username for the Gale daemon."; - }; - - group = mkOption { - default = "gale"; - type = types.str; - description = "Group name for the Gale daemon."; - }; - - setuidWrapper = mkOption { - default = null; - description = "Configuration for the Gale gksign setuid wrapper."; - }; - - domain = mkOption { - default = ""; - type = types.str; - description = "Domain name for the Gale system."; - }; - - keyPath = mkOption { - default = null; - type = types.nullOr types.path; - description = '' - Directory containing the key pair for this Gale domain. The expected - filename will be taken from the domain option with ".gpri" and ".gpub" - appended. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Additional text to be added to <filename>/etc/gale/conf</filename>. - ''; - }; - }; - }; - - config = mkMerge [ - (mkIf cfg.enable { - assertions = [{ - assertion = cfg.domain != ""; - message = "A domain must be set for Gale."; - }]; - - warnings = mkIf (!keysPrepared) [ - "You must run gale-install in order to generate a domain key." - ]; - - system.activationScripts.gale = mkIf cfg.enable ( - stringAfter [ "users" "groups" ] '' - chmod 755 ${home} - mkdir -m 0777 -p ${home}/auth/cache - mkdir -m 1777 -p ${home}/auth/local # GALE_DOMAIN.gpub - mkdir -m 0700 -p ${home}/auth/private # ROOT.gpub - mkdir -m 0755 -p ${home}/auth/trusted # ROOT - mkdir -m 0700 -p ${home}/.gale - mkdir -m 0700 -p ${home}/.gale/auth - mkdir -m 0700 -p ${home}/.gale/auth/private # GALE_DOMAIN.gpri - - ln -sf ${pkgs.gale}/etc/gale/auth/trusted/ROOT "${home}/auth/trusted/ROOT" - chown ${cfg.user}:${cfg.group} ${home} ${home}/auth ${home}/auth/* - chown ${cfg.user}:${cfg.group} ${home}/.gale ${home}/.gale/auth ${home}/.gale/auth/private - '' - ); - - environment = { - etc = { - "gale/auth".source = home + "/auth"; # symlink /var/lib/gale/auth - "gale/conf".text = '' - GALE_USER ${cfg.user} - GALE_DOMAIN ${cfg.domain} - ${cfg.extraConfig} - ''; - }; - - systemPackages = [ pkgs.gale ]; - }; - - users.users.${cfg.user} = { - description = "Gale daemon"; - uid = config.ids.uids.gale; - group = cfg.group; - home = home; - createHome = true; - }; - - users.groups = [{ - name = cfg.group; - gid = config.ids.gids.gale; - }]; - }) - (mkIf (cfg.enable && keysPrepared) { - assertions = [ - { - assertion = cfg.keyPath != null - && lib.pathExists (cfg.keyPath + "/${cfg.domain}.gpub"); - message = "Couldn't find a Gale public key for ${cfg.domain}."; - } - { - assertion = cfg.keyPath != null - && lib.pathExists (cfg.keyPath + "/${cfg.domain}.gpri"); - message = "Couldn't find a Gale private key for ${cfg.domain}."; - } - ]; - - services.gale.setuidWrapper = { - program = "gksign"; - source = "${pkgs.gale}/bin/gksign"; - owner = cfg.user; - group = cfg.group; - setuid = true; - setgid = false; - }; - - security.wrappers.gksign = cfg.setuidWrapper; - - systemd.services.gale-galed = { - description = "Gale messaging daemon"; - wantedBy = [ "multi-user.target" ]; - wants = [ "gale-gdomain.service" ]; - after = [ "network.target" ]; - - preStart = '' - install -m 0640 -o ${cfg.user} -g ${cfg.group} ${keyPath}/${cfg.domain}.gpri "${home}/.gale/auth/private/" - install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/.gale/auth/private/${cfg.domain}.gpub" - install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/auth/local/${cfg.domain}.gpub" - ''; - - serviceConfig = { - Type = "forking"; - ExecStart = "@${pkgs.gale}/bin/galed galed"; - User = cfg.user; - Group = cfg.group; - PermissionsStartOnly = true; - }; - }; - - systemd.services.gale-gdomain = { - description = "Gale AKD daemon"; - wantedBy = [ "multi-user.target" ]; - requires = [ "gale-galed.service" ]; - after = [ "gale-galed.service" ]; - - serviceConfig = { - Type = "forking"; - ExecStart = "@${pkgs.gale}/bin/gdomain gdomain"; - User = cfg.user; - Group = cfg.group; - }; - }; - }) - ]; -} diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 101c64c7b3e..d201c1a5334 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -198,6 +198,7 @@ in environment.systemPackages = (with pkgs // pkgs.gnome // pkgs.cinnamon; pkgs.gnome.removePackagesByName [ # cinnamon team apps + bulky blueberry warpinator diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 4262f5443bf..2e27ac302af 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -46,7 +46,7 @@ import ./make-test-python.nix ({ pkgs, esr ? false, ... }: { systemd.services.audio-recorder = { description = "Record NixOS test audio to /tmp/record.wav"; - script = "${pkgs.alsaUtils}/bin/arecord -D recorder -f S16_LE -r48000 /tmp/record.wav"; + script = "${pkgs.alsa-utils}/bin/arecord -D recorder -f S16_LE -r48000 /tmp/record.wav"; }; }; diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index b2f2540fb7a..badcb99a57a 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -63,7 +63,7 @@ in { ): serviceClient.sleep(20) socketActivatedClient.wait_until_succeeds( - "systemctl status ensure-printers | grep -q -E 'code=exited, status=0/SUCCESS'" + "systemctl show ensure-printers | grep -q -E 'code=exited ; status=0'" ) diff --git a/pkgs/applications/audio/CHOWTapeModel/default.nix b/pkgs/applications/audio/CHOWTapeModel/default.nix index 025563f98be..9b9649cf9f8 100644 --- a/pkgs/applications/audio/CHOWTapeModel/default.nix +++ b/pkgs/applications/audio/CHOWTapeModel/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , curl , fetchFromGitHub , freeglut @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib curl freeglut freetype diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index 25cb9696509..3034de750cf 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/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 4f76178a29d..eafbfec9664 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsaLib, dbus, libjack2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 , python3Packages , meson, ninja }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config makeWrapper meson ninja ]; - buildInputs = [ alsaLib dbus libjack2 ] ++ + buildInputs = [ alsa-lib dbus libjack2 ] ++ (with python3Packages; [ python dbus-python ]); postInstall = '' diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index 8d396d7f2a3..9b0fe1d80ff 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjack2, alsaLib +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjack2, alsa-lib , freetype, libX11, libXrandr, libXinerama, libXext, libXcursor , fetchpatch, fmt , adlplugChip ? "-DADLplug_CHIP=OPL3" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ adlplugChip "-DADLplug_USE_SYSTEM_FMT=ON" ]; buildInputs = [ - libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext + libjack2 alsa-lib freetype libX11 libXrandr libXinerama libXext libXcursor ]; nativeBuildInputs = [ cmake pkg-config fmt ]; diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index 000108b6de1..d8ef7d2b4fa 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsaLib, libjack2 +{ lib, stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsa-lib, libjack2 , libclxclient, libX11, libXft, readline }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libclthreads zita-alsa-pcmi alsaLib libjack2 libclxclient + libclthreads zita-alsa-pcmi alsa-lib libjack2 libclxclient libX11 libXft readline ]; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 418426530bf..00fde01859c 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, jack2, minixml, pkg-config }: +{ lib, stdenv, fetchurl, alsa-lib, jack2, minixml, pkg-config }: stdenv.mkDerivation rec { name = packageName + "-" + version ; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = false; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib minixml jack2 ]; + buildInputs = [ alsa-lib minixml jack2 ]; meta = with lib; { description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix index 188584b8e73..388d8b44dcf 100644 --- a/pkgs/applications/audio/ams/default.nix +++ b/pkgs/applications/audio/ams/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchgit , automake -, alsaLib +, alsa-lib , ladspaH , libjack2 , fftw @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib ladspaH libjack2 fftw diff --git a/pkgs/applications/audio/ardour/5.nix b/pkgs/applications/audio/ardour/5.nix index 9e8c075bfb0..b25f9339da1 100644 --- a/pkgs/applications/audio/ardour/5.nix +++ b/pkgs/applications/audio/ardour/5.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchgit -, alsaLib +, alsa-lib , aubio , boost , cairomm @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib aubio boost cairomm diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 8bb7430650d..8ebf4bf0fc4 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchgit -, alsaLib +, alsa-lib , aubio , boost , cairomm @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib aubio boost cairomm diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 82a2303e26b..db6e03f4741 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -2,7 +2,7 @@ mkDerivation, lib, fetchurl, fetchpatch, gettext, pkg-config, qtbase, - alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, + alsa-lib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug, libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, @@ -29,7 +29,7 @@ mkDerivation rec { qtbase # Plugin dependencies - alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb + alsa-lib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 0fee289021e..354bc0ebd76 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -18,7 +18,7 @@ , sqlite , sratom , suil -, alsaLib +, alsa-lib , libsndfile , soxr , flac @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib expat ffmpeg file diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index b1625868933..a66a5e6c9dc 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf +{ stdenv, fetchurl, alsa-lib, bzip2, cairo, dpkg, freetype, gdk-pixbuf , wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg , libbsd, libjack2, libpng, ffmpeg , libxkbcommon @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; # we only want $gappsWrapperArgs here buildInputs = with xorg; [ - alsaLib bzip2.out cairo freetype gdk-pixbuf gtk2 gtk3 harfbuzz libX11 libXau + alsa-lib bzip2.out cairo freetype gdk-pixbuf gtk2 gtk3 harfbuzz libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm zlib ]; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 93fa00b827b..b041d7e1910 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cairo, dpkg, freetype +{ stdenv, fetchurl, alsa-lib, cairo, dpkg, freetype , gdk-pixbuf, glib, gtk3, lib, xorg , libglvnd, libjack2, ffmpeg , libxkbcommon, xdg-utils, zlib, pulseaudio @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; # we only want $gappsWrapperArgs here buildInputs = with xorg; [ - alsaLib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib ]; binPath = lib.makeBinPath [ diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index e86341a608e..0c9248b5f0b 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, pkg-config, libpulseaudio, xorg }: +{ lib, stdenv, fetchurl, alsa-lib, libjack2, pkg-config, libpulseaudio, xorg }: stdenv.mkDerivation rec { pname = "bristol"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext + alsa-lib libjack2 libpulseaudio xorg.libX11 xorg.libXext xorg.xorgproto ]; diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index 6529cd860c8..0cc1ccd2aca 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -5,7 +5,7 @@ , ninja , pkg-config , glib -, alsaLib +, alsa-lib , libpulseaudio }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib libpulseaudio glib ]; diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 04c15eca599..38514e40d00 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, jack2, +{ lib, stdenv, fetchFromGitHub, alsa-lib, file, fluidsynth, jack2, liblo, libpulseaudio, libsndfile, pkg-config, python3Packages, which, withFrontend ? true, withQt ? true, qtbase ? null, wrapQtAppsHook ? null, @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ] ++ optional withFrontend pyqt5; buildInputs = [ - file liblo alsaLib fluidsynth jack2 libpulseaudio libsndfile + file liblo alsa-lib fluidsynth jack2 libpulseaudio libsndfile ] ++ optional withQt qtbase ++ optional withGtk2 gtk2 ++ optional withGtk3 gtk3; diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index b32eb1b627d..cc431ff46b9 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, alsaLib, fftw, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, alsa-lib, fftw, libpulseaudio, ncurses }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.7.4"; buildInputs = [ - alsaLib + alsa-lib fftw libpulseaudio ncurses diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index f30b5dba5b6..e051d8585b5 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, alsaLib, bison, flex, libsndfile, which +{ stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which , AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison which ]; buildInputs = [ libsndfile ] - ++ lib.optional (!stdenv.isDarwin) alsaLib + ++ lib.optional (!stdenv.isDarwin) alsa-lib ++ lib.optional stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ]; patches = [ ./darwin-limits.patch ]; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 4184f0eea8c..550100574db 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -42,7 +42,7 @@ , libsepol , orc -, alsaLib +, alsa-lib }: let @@ -107,7 +107,7 @@ let sqlite taglib - alsaLib + alsa-lib ] ++ lib.optionals (withIpod) [ libgpod libplist usbmuxd ] ++ lib.optionals (withMTP) [ libmtp ] diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index bfa8317c9f9..ea7ad1015be 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,12 +1,12 @@ { config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config , libiconv, CoreAudio, AudioUnit -, alsaSupport ? stdenv.isLinux, alsaLib ? null +, alsaSupport ? stdenv.isLinux, alsa-lib ? null # simple fallback for everyone else , aoSupport ? !stdenv.isLinux, libao ? null , jackSupport ? false, libjack ? null , samplerateSupport ? jackSupport, libsamplerate ? null -, ossSupport ? false, alsaOss ? null +, ossSupport ? false, alsa-oss ? null , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null , mprisSupport ? stdenv.isLinux, systemd ? null @@ -55,11 +55,11 @@ let opts = [ # Audio output - (mkFlag alsaSupport "CONFIG_ALSA=y" alsaLib) + (mkFlag alsaSupport "CONFIG_ALSA=y" alsa-lib) (mkFlag aoSupport "CONFIG_AO=y" libao) (mkFlag jackSupport "CONFIG_JACK=y" libjack) (mkFlag samplerateSupport "CONFIG_SAMPLERATE=y" libsamplerate) - (mkFlag ossSupport "CONFIG_OSS=y" alsaOss) + (mkFlag ossSupport "CONFIG_OSS=y" alsa-oss) (mkFlag pulseaudioSupport "CONFIG_PULSE=y" libpulseaudio) (mkFlag mprisSupport "CONFIG_MPRIS=y" systemd) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index a63f7518494..13de229452e 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, libsndfile, libsamplerate, flex, bison, boost, gettext -, alsaLib ? null +, alsa-lib ? null , libpulseaudio ? null , libjack2 ? null , liblo ? null @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] ++ builtins.filter (optional: optional != null) [ - alsaLib libpulseaudio libjack2 + alsa-lib libpulseaudio libjack2 liblo ladspa-sdk fluidsynth eigen curl tcltk fltk ]; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 10b4256a858..c1cecc13ec5 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -25,7 +25,7 @@ , hotkeysSupport ? true, libX11 ? null , osdSupport ? true, dbus ? null # output plugins -, alsaSupport ? true, alsaLib ? null +, alsaSupport ? true, alsa-lib ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null # effect plugins , resamplerSupport ? true, libsamplerate ? null @@ -50,7 +50,7 @@ assert apeSupport -> yasm != null; assert artworkSupport -> imlib2 != null; assert hotkeysSupport -> libX11 != null; assert osdSupport -> dbus != null; -assert alsaSupport -> alsaLib != null; +assert alsaSupport -> alsa-lib != null; assert pulseSupport -> libpulseaudio != null; assert resamplerSupport -> libsamplerate != null; assert overloadSupport -> zlib != null; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ++ optional artworkSupport imlib2 ++ optional hotkeysSupport libX11 ++ optional osdSupport dbus - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional pulseSupport libpulseaudio ++ optional resamplerSupport libsamplerate ++ optional overloadSupport zlib diff --git a/pkgs/applications/audio/diopser/default.nix b/pkgs/applications/audio/diopser/default.nix index 0c97d64945b..339eae1a7ca 100644 --- a/pkgs/applications/audio/diopser/default.nix +++ b/pkgs/applications/audio/diopser/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config -, libjack2, alsaLib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor +, libjack2, alsa-lib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor }: let @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext + libjack2 alsa-lib freetype libX11 libXrandr libXinerama libXext libXcursor ]; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 35825833330..258eec83724 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, alsaLib +, alsa-lib , fetchFromGitHub , fftwFloat , freetype @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = rpathLibs ++ [ - alsaLib + alsa-lib freetype libGL libX11 diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index ef4970a1608..7dd78e51318 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, expat, glib, libjack2, libXext, libX11, libpng +{ lib, stdenv, fetchurl, alsa-lib, expat, glib, libjack2, libXext, libX11, libpng , libpthreadstubs, libsmf, libsndfile, lv2, pkg-config, zita-resampler }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs + alsa-lib expat glib libjack2 libXext libX11 libpng libpthreadstubs libsmf libsndfile lv2 zita-resampler ]; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index c175804a026..e15e4550e0e 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: +{ mkDerivation, lib, fetchurl, pkg-config, libjack2, alsa-lib, libsndfile, liblo, lv2, qt5 }: mkDerivation rec { pname = "drumkv1"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "1bzkaz7sqx1pvirja8zm7i2ckzl5ad6xspr4840389ik3l8qpnr5"; }; - buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; + buildInputs = [ libjack2 alsa-lib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index e2ec9bf8ab2..47db2201648 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , pkg-config -, alsaLib +, alsa-lib , audiofile , libjack2 , liblo @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib audiofile libjack2 liblo diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix index 6a974abb8aa..0c48c582c4f 100644 --- a/pkgs/applications/audio/eflite/default.nix +++ b/pkgs/applications/audio/eflite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }: +{ lib, stdenv, fetchurl, fetchpatch, flite, alsa-lib, debug ? false }: stdenv.mkDerivation rec { pname = "eflite"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci"; }; - buildInputs = [ flite alsaLib ]; + buildInputs = [ flite alsa-lib ]; configureFlags = [ "flite_dir=${flite}" diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix index 7858da25b7c..b3255126205 100644 --- a/pkgs/applications/audio/ensemble-chorus/default.nix +++ b/pkgs/applications/audio/ensemble-chorus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fltk, alsa-lib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "ensemble-chorus"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - fltk alsaLib freetype libXrandr libXinerama libXcursor lv2 libjack2 + fltk alsa-lib freetype libXrandr libXinerama libXcursor lv2 libjack2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/faust/faust2alqt.nix b/pkgs/applications/audio/faust/faust2alqt.nix index 8ac26e488b3..111d1c9e557 100644 --- a/pkgs/applications/audio/faust/faust2alqt.nix +++ b/pkgs/applications/audio/faust/faust2alqt.nix @@ -1,5 +1,5 @@ { faust -, alsaLib +, alsa-lib , qt4 }: @@ -8,7 +8,7 @@ faust.wrapWithBuildEnv { baseName = "faust2alqt"; propagatedBuildInputs = [ - alsaLib + alsa-lib qt4 ]; diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/pkgs/applications/audio/faust/faust2alsa.nix index 6af5af9bbaf..bb6121a5d70 100644 --- a/pkgs/applications/audio/faust/faust2alsa.nix +++ b/pkgs/applications/audio/faust/faust2alsa.nix @@ -1,5 +1,5 @@ { faust -, alsaLib +, alsa-lib , atk , cairo , fontconfig @@ -15,7 +15,7 @@ faust.wrapWithBuildEnv { baseName = "faust2alsa"; propagatedBuildInputs = [ - alsaLib + alsa-lib atk cairo fontconfig diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index ab2450f1e52..bd213bfcadb 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -1,7 +1,7 @@ { faust , gtk2 , jack2 -, alsaLib +, alsa-lib , opencv , libsndfile , which @@ -19,7 +19,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ gtk2 jack2 - alsaLib + alsa-lib opencv libsndfile which diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index f6bc4d485fd..6bebd97ddd2 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -2,7 +2,7 @@ , jack2 , qt4 , libsndfile -, alsaLib +, alsa-lib , which }: @@ -19,7 +19,7 @@ faust.wrapWithBuildEnv { jack2 qt4 libsndfile - alsaLib + alsa-lib which ]; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 2b4602f78cf..46d63c84314 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl +, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsa-lib, faust, curl , bc, coreutils, which, libsndfile, pkg-config, libxcb }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook ]; buildInputs = [ - llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsaLib faust curl + llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsa-lib faust curl bc coreutils which libsndfile libxcb ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index a1fee315d44..1a6471397de 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkg-config, cmake -, alsaLib, glib, libjack2, libsndfile, libpulseaudio +, alsa-lib, glib, libjack2, libsndfile, libpulseaudio , AudioUnit, CoreAudio, CoreMIDI, CoreServices , version ? "2" }: @@ -33,7 +33,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ glib libsndfile libpulseaudio libjack2 ] - ++ lib.optionals stdenv.isLinux [ alsaLib ] + ++ lib.optionals stdenv.isLinux [ alsa-lib ] ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ]; cmakeFlags = [ "-Denable-framework=off" ]; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index b91c72a5c75..967c984bc50 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,9 +1,9 @@ { lib, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook -, alsaSupport ? true, alsaLib ? null +, alsaSupport ? true, alsa-lib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: -assert alsaSupport -> alsaLib != null; +assert alsaSupport -> alsa-lib != null; assert jackSupport -> libjack2 != null; assert portaudioSupport -> portaudio != null; @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; buildInputs = [ fftw qtbase qtmultimedia ] - ++ optionals alsaSupport [ alsaLib ] + ++ optionals alsaSupport [ alsa-lib ] ++ optionals jackSupport [ libjack2 ] ++ optionals portaudioSupport [ portaudio ]; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 7bd063d9f53..75e44d8c4fa 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype -, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis +, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsa-lib, libjack2, libvorbis , libSM, libsndfile, libogg, libtool }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook libtool ]; buildInputs = [ freetype SDL SDL_gfx SDL_ttf - liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM + liblo libxml2 libjack2 alsa-lib libvorbis libsndfile libogg libSM (gnutls.overrideAttrs (oldAttrs: { configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; })) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 781889f9fe3..5155a91e725 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , nixosTests -, alsaLib +, alsa-lib , SDL2 , libiconv , CoreAudio @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index c9b3216edef..b49335298e0 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -7,7 +7,7 @@ , libsamplerate , libsndfile , jack2 -, alsaLib +, alsa-lib , libpulseaudio , libXpm , libXinerama @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { rtmidi libXpm jack2 - alsaLib + alsa-lib libpulseaudio libXinerama libXcursor diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 9d891d30234..74286073b90 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype +{ lib, stdenv, alsa-lib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype , fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr , nss, pango, udev, xorg }: @@ -7,7 +7,7 @@ let version = "4.7.1"; deps = [ - alsaLib + alsa-lib atk at-spi2-atk cairo diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 2d660bc736c..30c6e57188a 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsaLib +{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsa-lib , zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2 , includeDemo ? true }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pkg-config fftwFloat alsaLib zlib wavpack wxGTK31 udev ] + buildInputs = [ pkg-config fftwFloat alsa-lib zlib wavpack wxGTK31 udev ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optional (!jackaudioSupport) [ diff --git a/pkgs/applications/audio/gwc/default.nix b/pkgs/applications/audio/gwc/default.nix index 175d5e4cb51..aeb64b92c88 100644 --- a/pkgs/applications/audio/gwc/default.nix +++ b/pkgs/applications/audio/gwc/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, alsaLib +, alsa-lib , libpulseaudio , gtk2 , hicolor-icon-theme @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib libpulseaudio gtk2 hicolor-icon-theme diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 6378a97f31d..012838eb436 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome +, alsa-lib, freetype, xorg, curl, libGL, libjack2, gnome , pkg-config, makeWrapper }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr + alsa-lib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome.zenity ]; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 172f134907c..86497e090f4 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -3,7 +3,7 @@ , fetchpatch , xorg , freetype -, alsaLib +, alsa-lib , curl , libjack2 , lv2 @@ -26,7 +26,7 @@ buildInputs = [ xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXinerama xorg.libXrender xorg.libXrandr - freetype alsaLib curl libjack2 pkg-config libGLU libGL lv2 + freetype alsa-lib curl libjack2 pkg-config libGLU libGL lv2 ]; CXXFLAGS = "-DHAVE_LROUND"; diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index b887615a30f..c539a316422 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsaLib, libjack2, +{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsa-lib, libjack2, freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core, dbus, curl, fftwFloat }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ lv2 alsaLib libjack2 freetype libX11 gtk3 pcre + buildInputs = [ lv2 alsa-lib libjack2 freetype libX11 gtk3 pcre libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus curl fftwFloat ]; cmakeFlags = [ diff --git a/pkgs/applications/audio/hydrogen/0.nix b/pkgs/applications/audio/hydrogen/0.nix index 1746715b834..ad3566571b0 100644 --- a/pkgs/applications/audio/hydrogen/0.nix +++ b/pkgs/applications/audio/hydrogen/0.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, cmake -, alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 +, alsa-lib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4 + alsa-lib boost glib lash libjack2 libarchive libsndfile lrdf qt4 ]; meta = with lib; { diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 490591ec9e6..319ee7a5f98 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook -, alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf +, alsa-lib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf , qtbase, qttools, qtxmlpatterns }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ - alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf + alsa-lib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf qtbase qttools qtxmlpatterns ]; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index 304f67e85aa..f37150994fc 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkg-config, qtbase, qtscript, qmake +{ mkDerivation, lib, fetchFromGitHub, alsa-lib, pkg-config, qtbase, qtscript, qmake }: mkDerivation rec { @@ -13,7 +13,7 @@ mkDerivation rec { }; nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ alsaLib qtbase qtscript ]; + buildInputs = [ alsa-lib qtbase qtscript ]; qmakeFlags = [ "PREFIX=/" ]; diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix index f638eba3210..91f7175e391 100644 --- a/pkgs/applications/audio/industrializer/default.nix +++ b/pkgs/applications/audio/industrializer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, alsaLib +, alsa-lib , audiofile , autoconf , automake @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - alsaLib + alsa-lib audiofile autoconf automake diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 035e15abb23..48ffd5df515 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }: +{ lib, stdenv, fetchurl, alsa-lib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }: stdenv.mkDerivation rec { pname = "jaaa"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat libjack2 zita-alsa-pcmi + alsa-lib libclthreads libclxclient libX11 libXft libXrender fftwFloat libjack2 zita-alsa-pcmi ]; makeFlags = [ diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index ec62cb04c85..520b55e96da 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsa-lib, libxml2, lrdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 lrdf ]; + buildInputs = [ libjack2 ladspaH gtk2 alsa-lib libxml2 lrdf ]; NIX_LDFLAGS = "-ldl -lm -lpthread"; meta = { diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index eecafe9e501..e9d2abee91c 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsa-lib }: mkDerivation rec { pname = "jackmix"; @@ -18,7 +18,7 @@ mkDerivation rec { qtbase lash jack - alsaLib + alsa-lib ]; installPhase = '' diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix index f45395eefa6..016f515ce13 100644 --- a/pkgs/applications/audio/japa/default.nix +++ b/pkgs/applications/audio/japa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, fftwFloat, libclthreads, libclxclient, libX11, libXft, zita-alsa-pcmi, }: +{ lib, stdenv, fetchurl, alsa-lib, libjack2, fftwFloat, libclthreads, libclxclient, libX11, libXft, zita-alsa-pcmi, }: stdenv.mkDerivation rec { version = "0.9.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1zmi4wg23hwsypg3h6y3qb72cbrihqcs19qrbzgs5a67d13q4897"; }; - buildInputs = [ alsaLib libjack2 fftwFloat libclthreads libclxclient libX11 libXft zita-alsa-pcmi ]; + buildInputs = [ alsa-lib libjack2 fftwFloat libclthreads libclxclient libX11 libXft zita-alsa-pcmi ]; preConfigure = '' cd ./source/ diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index 51c853809fd..70b06e72fba 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, qttools, alsaLib, drumstick, qtbase, qtsvg }: +{ lib, stdenv, fetchurl, cmake, pkg-config, qttools, alsa-lib, drumstick, qtbase, qtsvg }: stdenv.mkDerivation rec { pname = "kmetronome"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools ]; - buildInputs = [ alsaLib drumstick qtbase qtsvg ]; + buildInputs = [ alsa-lib drumstick qtbase qtsvg ]; dontWrapQtApps = true; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index 74bbeb9b7bb..6c8ea6528f9 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2 +{ lib, stdenv, fetchurl, alsa-lib, gtk2, libjack2, libuuid, libxml2 , makeWrapper, pkg-config, readline }: assert libuuid != null; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./socket.patch ./gcc-47.patch ]; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ alsaLib gtk2 libjack2 libxml2 readline ]; + buildInputs = [ alsa-lib gtk2 libjack2 libxml2 readline ]; propagatedBuildInputs = [ libuuid ]; NIX_LDFLAGS = "-lm -lpthread -luuid"; diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 858d8e795e1..61f709b33e1 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true -, withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null +, withALSA ? true, alsa-lib ? null, withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null }: rustPlatform.buildRustPackage rec { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional withALSA alsaLib + buildInputs = [ openssl ] ++ lib.optional withALSA alsa-lib ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 17a28315f19..22cab165ccf 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -4,7 +4,7 @@ , intltool , gtk3 , wrapGAppsHook -, alsaLib +, alsa-lib , libjack2 , libpulseaudio , fftw @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - alsaLib + alsa-lib libpulseaudio fftw ] ++ lib.optional jackSupport libjack2; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 91f14879dc7..1c33bff5b76 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoconf, automake, bison, libtool, pkg-config, which -, alsaLib, asio, libjack2, libgig, libsndfile, lv2 }: +, alsa-lib, asio, libjack2, libgig, libsndfile, lv2 }: stdenv.mkDerivation rec { pname = "linuxsampler"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake bison libtool pkg-config which ]; - buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ]; + buildInputs = [ alsa-lib asio libjack2 libgig libsndfile lv2 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 11a7d0cf3c6..f791ad51bf9 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13 +{ lib, fetchFromGitHub, cmake, pkg-config, alsa-lib ? null, fftwFloat, fltk13 , fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }: @@ -18,7 +18,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools pkg-config ]; buildInputs = [ - alsaLib + alsa-lib fftwFloat fltk13 fluidsynth_1 diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index 04d5bb0a6dd..6f518dac9ca 100644 --- a/pkgs/applications/audio/mamba/default.nix +++ b/pkgs/applications/audio/mamba/default.nix @@ -6,7 +6,7 @@ , fluidsynth , libX11 , libjack2 -, alsaLib +, alsa-lib , liblo , libsigcxx , libsmf @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config xxd ]; - buildInputs = [ cairo fluidsynth libX11 libjack2 alsaLib liblo libsigcxx libsmf ]; + buildInputs = [ cairo fluidsynth libX11 libjack2 alsa-lib liblo libsigcxx libsmf ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 82f9b70c618..e6b21dff2dc 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH +{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsa-lib, autoreconfHook, gtk2, libjack2, ladspaH , ladspaPlugins, libsamplerate, libsndfile, pkg-config, libpulseaudio, lame , vorbis-tools }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preAutoreconf = "(cd docgen && sh gendocs.sh)"; buildInputs = [ - SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile libpulseaudio + SDL alsa-lib gtk2 libjack2 ladspaH libsamplerate libsndfile libpulseaudio ]; configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ]; diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index 2e72a011921..5db17b99d1c 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xorgproto }: +{ lib, stdenv, fetchurl, alsa-lib, libX11, libXi, libXtst, xorgproto }: stdenv.mkDerivation rec { name = "mid2key-r1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { unpackPhase = "tar xvzf $src"; - buildInputs = [ alsaLib libX11 libXi libXtst xorgproto ]; + buildInputs = [ alsa-lib libX11 libXi libXtst xorgproto ]; buildPhase = "make"; diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index 8f2e29ee95b..93a215e46b1 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, libX11, libXext, alsaLib, freetype, brand, type, version, homepage, url, sha256, ... }: +{ stdenv, fetchurl, lib, libX11, libXext, alsa-lib, freetype, brand, type, version, homepage, url, sha256, ... }: stdenv.mkDerivation rec { inherit type; baseName = "${type}-Edit"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ libX11 # libX11.so.6 libXext # libXext.so.6 - alsaLib # libasound.so.2 + alsa-lib # libasound.so.2 freetype # libfreetype.so.6 stdenv.cc.cc.lib # libstdc++.so.6 ]; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index b43694eb9c0..ce29a587d23 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper -, SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: +, SDL2, alsa-lib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: stdenv.mkDerivation rec { version = "1.03.00"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ]; + buildInputs = [ SDL2 alsa-lib libjack2 lhasa perl rtmidi zlib zziplib ]; # Somehow this does not get set automatically cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ]; diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index 57af7a469a0..5ed51a99895 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config -, alsaLib, libtool, icu +, alsa-lib, libtool, icu , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib libtool icu ] ++ lib.optional pulseaudioSupport libpulseaudio; diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix index 9c49f26bb4a..90821b01476 100644 --- a/pkgs/applications/audio/miniaudicle/default.nix +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -4,7 +4,7 @@ , bison , flex , which -, alsaLib +, alsa-lib , libsndfile , qt4 , qscintilla @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib libsndfile qt4 qscintilla diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 783ef2dbb7d..1d26782b6ae 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config , ncurses, db , popt, libtool # Sound sub-systems -, alsaSupport ? true, alsaLib +, alsaSupport ? true, alsa-lib , pulseSupport ? true, libpulseaudio, autoreconfHook , jackSupport ? true, libjack2 , ossSupport ? true @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses db popt libtool ] # Sound sub-systems - ++ opt alsaSupport alsaLib + ++ opt alsaSupport alsa-lib ++ opt pulseSupport libpulseaudio ++ opt jackSupport libjack2 # Audio formats diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 153e8b9940b..8f9489befc5 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , makeWrapper -, alsaLib +, alsa-lib , perl , withConplay ? !stdenv.targetPlatform.isWindows }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optionals withConplay [ makeWrapper ]; buildInputs = lib.optionals withConplay [ perl ] - ++ lib.optionals (!stdenv.isDarwin && !stdenv.targetPlatform.isWindows) [ alsaLib ]; + ++ lib.optionals (!stdenv.isDarwin && !stdenv.targetPlatform.isWindows) [ alsa-lib ]; configureFlags = lib.optional (stdenv.hostPlatform ? mpg123) diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 37f647a4a47..03aee52f2a9 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, fetchpatch, libao, libmad, libid3tag, zlib, alsaLib +{lib, stdenv, fetchurl, fetchpatch, libao, libmad, libid3tag, zlib, alsa-lib # Specify default libao output plugin to use (e.g. "alsa", "pulse" …). # If null, it will use the libao system default. , defaultAudio ? null @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--with-default-audio=${defaultAudio}"); buildInputs = [libao libid3tag libmad zlib] - ++ lib.optional stdenv.isLinux alsaLib; + ++ lib.optional stdenv.isLinux alsa-lib; installTargets = [ "install" "install-man" ]; diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index da8dcb0b0c1..773a9178c0b 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsa-lib, makeDesktopItem, libjack2 }: let desktopItem = makeDesktopItem rec { @@ -26,7 +26,7 @@ in mkDerivation rec { dontFixCmake = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase alsaLib libjack2 ]; + buildInputs = [ qtbase alsa-lib libjack2 ]; meta = with lib; { description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 22d66b18ddd..f5a6bafe792 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools, wrapQtAppsHook -, alsaLib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo +, alsa-lib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo , libsamplerate, libsndfile, lilv, lrdf, lv2, qtsvg, rtaudio, rubberband, sord }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ - alsaLib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo + alsa-lib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo libsamplerate libsndfile lilv lrdf lv2 qtsvg rtaudio rubberband sord ]; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index b43b770b24f..c2a2e7b9603 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkg-config -, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis +, alsa-lib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects , qtquickcontrols2, qtscript, qtsvg, qttools , qtwebengine, qtxmlpatterns @@ -35,7 +35,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis + alsa-lib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis portaudio portmidi # tesseract qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2 qtscript qtsvg qttools qtwebengine qtxmlpatterns diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index c8e18c03c1e..2824832ef60 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -1,6 +1,6 @@ { cmake , pkg-config -, alsaLib +, alsa-lib , boost , curl , fetchFromGitHub @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pkg-config ]; buildInputs = [ - alsaLib + alsa-lib boost curl ffmpeg diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index aa56c983558..0a887ebaf3d 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv -, withALSA ? true, alsaLib ? null +, withALSA ? true, alsa-lib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null , withMPRIS ? false, dbus ? null @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin libiconv - ++ lib.optional withALSA alsaLib + ++ lib.optional withALSA alsa-lib ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio ++ lib.optional withMPRIS dbus; diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix index 61353f45fec..bf7d680ff15 100644 --- a/pkgs/applications/audio/netease-music-tui/default.nix +++ b/pkgs/applications/audio/netease-music-tui/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, lib, alsaLib, pkg-config, openssl }: +{ fetchFromGitHub, rustPlatform, lib, alsa-lib, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "netease-music-tui"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib openssl ]; + buildInputs = [ alsa-lib openssl ]; cargoSha256 = "1pca0sz4rz8qls6k2vhf70ixhnvgk81c4hbx81q3pv106g5k205f"; diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix index 11424c0be18..8b2284f9b30 100644 --- a/pkgs/applications/audio/nootka/default.nix +++ b/pkgs/applications/audio/nootka/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake -, alsaLib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch, qtbase +, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch, qtbase }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - alsaLib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch qtbase + alsa-lib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch qtbase ]; cmakeFlags = [ diff --git a/pkgs/applications/audio/nootka/unstable.nix b/pkgs/applications/audio/nootka/unstable.nix index aa49daaa1e7..edfb1948364 100644 --- a/pkgs/applications/audio/nootka/unstable.nix +++ b/pkgs/applications/audio/nootka/unstable.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake -, alsaLib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch +, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch , qtbase, qtdeclarative, qtquickcontrols2 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - alsaLib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch + alsa-lib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch qtbase qtdeclarative qtquickcontrols2 ]; diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 68edf99e010..7ad1e319bff 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -5,7 +5,7 @@ , dpkg , qt5 , libjack2 -, alsaLib +, alsa-lib , bzip2 , libpulseaudio }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libjack2 libpulseaudio bzip2 - alsaLib + alsa-lib ]; buildInputs = [ dpkg ]; diff --git a/pkgs/applications/audio/osmid/default.nix b/pkgs/applications/audio/osmid/default.nix index f16b146e616..1a65826dca3 100644 --- a/pkgs/applications/audio/osmid/default.nix +++ b/pkgs/applications/audio/osmid/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake -, alsaLib +, alsa-lib , libX11 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ alsaLib libX11 ]; + buildInputs = [ alsa-lib libX11 ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index f238a687609..90e80f13ac4 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: +{ lib, fetchurl, pkg-config, libjack2, alsa-lib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: mkDerivation rec { pname = "padthv1"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "1karrprb3ijrbiwpr43rl3nxnzc33lnmwrd1832psgr3flnr9fp5"; }; - buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ]; + buildInputs = [ libjack2 alsa-lib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 573b2262e73..f37cf8c5b32 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm +{ lib, stdenv, alsa-lib, boost, dbus-glib, fetchsvn, ganv, glibmm , gtkmm2, libjack2, pkg-config, python2, wafHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ - alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2 + alsa-lib boost dbus-glib ganv glibmm gtkmm2 libjack2 pkg-config python2 wafHook ]; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index fb29f9b13e2..f76720aff90 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas +{ lib, stdenv, fetchurl, alsa-lib, cmake, gtk2, libjack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 , pkg-config, openssl }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ alsaLib gtk2 libjack2 libgnomecanvas libpthreadstubs + buildInputs = [ alsa-lib gtk2 libjack2 libgnomecanvas libpthreadstubs libsamplerate libsndfile libtool libxml2 openssl ]; meta = with lib; { diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index f1d35d7e78e..2c58ecc5dcb 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools -, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook +, alsa-lib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; - buildInputs = [ alsaLib ftgl libGLU libjack2 qtbase rtmidi ]; + buildInputs = [ alsa-lib ftgl libGLU libjack2 qtbase rtmidi ]; cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=GLVND" diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/applications/audio/picoloop/default.nix index 519888982ce..bd956963a46 100644 --- a/pkgs/applications/audio/picoloop/default.nix +++ b/pkgs/applications/audio/picoloop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libpulseaudio, SDL2, SDL2_image, SDL2_ttf, alsaLib, libjack2 }: +{ lib, stdenv, fetchFromGitHub, libpulseaudio, SDL2, SDL2_image, SDL2_ttf, alsa-lib, libjack2 }: stdenv.mkDerivation rec { pname = "picoloop"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { SDL2.dev SDL2_image SDL2_ttf - alsaLib + alsa-lib libjack2 ]; diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix index 28e9788acbf..43f38ff84ed 100644 --- a/pkgs/applications/audio/pmidi/default.nix +++ b/pkgs/applications/audio/pmidi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib +{ lib, stdenv, fetchurl, alsa-lib , version ? "1.7.1" , sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055" }: @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = sourceSha256; }; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; meta = with lib; { homepage = "https://www.parabola.me.uk/alsa/pmidi.html"; diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index a331952aa81..4656db7257e 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: +{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: mkDerivation rec { version = "2.2.0"; @@ -12,7 +12,7 @@ mkDerivation rec { }; buildInputs = [ - alsaLib + alsa-lib libjack2 portaudio libogg diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 1d3fd534dd2..239b62a4026 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, gtk2, pkg-config }: +{ lib, stdenv, fetchurl, alsa-lib, gtk2, pkg-config }: stdenv.mkDerivation rec { pname = "praat"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib gtk2 ]; + buildInputs = [ alsa-lib gtk2 ]; meta = { description = "Doing phonetics by computer"; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 72e8ba135dd..22b2a355b5e 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , nixosTests -, alsaLib +, alsa-lib , SDL2 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsaLib; + buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsa-lib; passthru.tests = { pt2-clone-opens = nixosTests.pt2-clone; diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 9bc6903e51b..ebdc0388b96 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, gettext, makeWrapper -, alsaLib, libjack2, tk, fftw +, alsa-lib, libjack2, tk, fftw }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; - buildInputs = [ alsaLib libjack2 fftw ]; + buildInputs = [ alsa-lib libjack2 fftw ]; configureFlags = [ "--enable-alsa" diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 586dfeae733..7196829afa0 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub -, pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras +, pkg-config, cmake, alsa-lib, libjack2, dbus, qtbase, qttools, qtx11extras # Enable jack session support , jackSession ? false }: @@ -21,7 +21,7 @@ mkDerivation rec { qtbase qtx11extras qttools - alsaLib + alsa-lib libjack2 dbus ]; diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix index 4fa165a05a9..618062dc2f3 100644 --- a/pkgs/applications/audio/qmidiarp/default.nix +++ b/pkgs/applications/audio/qmidiarp/default.nix @@ -5,7 +5,7 @@ , lv2 , pkg-config , qt5 -, alsaLib +, alsa-lib , libjack2 }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib lv2 libjack2 ] ++ (with qt5; [ diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index ea5430a82a2..51772cc135b 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsaLib, libjack2 }: +{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsa-lib, libjack2 }: mkDerivation rec { version = "0.9.1"; @@ -11,7 +11,7 @@ mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ qtbase qttools alsaLib libjack2 ]; + buildInputs = [ qtbase qttools alsa-lib libjack2 ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index e24824985fa..35aea5bd086 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, qt4, alsaLib }: +{ lib, stdenv, fetchurl, pkg-config, qt4, alsa-lib }: stdenv.mkDerivation rec { version = "0.4.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ qt4 alsaLib ]; + buildInputs = [ qt4 alsa-lib ]; meta = with lib; { description = "MIDI event processor and router"; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 2ff145d45cf..25d7857c353 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -6,7 +6,7 @@ , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile , libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi # output plugins -, alsaLib, libpulseaudio +, alsa-lib, libpulseaudio # effect plugins , libsamplerate }: @@ -46,7 +46,7 @@ mkDerivation rec { libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile libcdio cdparanoia libcddb faad2 ffmpeg wildmidi # output plugins - alsaLib libpulseaudio + alsa-lib libpulseaudio # effect plugins libsamplerate ]; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 417c478e9e5..6d75c32a666 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config +{ lib, fetchurl, alsa-lib, fluidsynth, libjack2, autoconf, pkg-config , mkDerivation, qtbase, qttools, qtx11extras }: @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ autoconf pkg-config ]; - buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ]; + buildInputs = [ alsa-lib fluidsynth libjack2 qtbase qttools qtx11extras ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index f19d0f70fdf..b1d0928b86a 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , aubio , cmake , dssi @@ -45,7 +45,7 @@ mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib aubio dssi flac diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index 8b5dd869e82..6d5d1ca860d 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, 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 = [ alsaLib 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/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 48504a312c4..705685811ff 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -3,7 +3,7 @@ , autoPatchelfHook , makeWrapper -, alsaLib +, alsa-lib , gtk3 , lame , ffmpeg @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6 gtk3 ]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index e874b63898a..acd1d80c86d 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib +{ lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsa-lib , mpg123, releasePath ? null }: with lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { releasePath else throw "Platform is not supported. Use instalation native to your platform https://www.renoise.com/"; - buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ]; + buildInputs = [ alsa-lib libjack2 libX11 libXcursor libXext libXrandr ]; installPhase = '' cp -r Resources $out diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index b95e5fdc76d..38d8a876962 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, makedepend, perl, pkg-config, qttools, wrapQtAppsHook -, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsaLib +, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsa-lib , liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }: stdenv.mkDerivation (rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation (rec { lirc lrdf qtbase - alsaLib + alsa-lib ]; meta = with lib; { diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix index 9f63dbe7bc2..92d3151c835 100644 --- a/pkgs/applications/audio/rymcast/default.nix +++ b/pkgs/applications/audio/rymcast/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper -, alsaLib, curl, gtk3, webkitgtk, zenity }: +, alsa-lib, curl, gtk3, webkitgtk, zenity }: stdenv.mkDerivation rec { pname = "rymcast"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ alsaLib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ]; + buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ]; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 8f0a4808121..8c707051686 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, pkg-config, libjack2 -, alsaLib, liblo, libsndfile, lv2, qtbase, qttools +, alsa-lib, liblo, libsndfile, lv2, qtbase, qttools , rubberband }: @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ qttools pkg-config ]; - buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ]; + buildInputs = [ libjack2 alsa-lib liblo libsndfile lv2 qtbase rubberband ]; meta = with lib; { description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 7e276e07224..ba193f70194 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , autoreconfHook -, alsaLib +, alsa-lib , python , SDL }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook python ]; - buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsaLib; + buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsa-lib; meta = with lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; diff --git a/pkgs/applications/audio/scream/default.nix b/pkgs/applications/audio/scream/default.nix index 976ede5803d..fb0ba9408d9 100644 --- a/pkgs/applications/audio/scream/default.nix +++ b/pkgs/applications/audio/scream/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, config, fetchFromGitHub, cmake, pkg-config -, alsaSupport ? stdenv.isLinux, alsaLib +, alsaSupport ? stdenv.isLinux, alsa-lib , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = lib.optional pulseSupport libpulseaudio - ++ lib.optional alsaSupport alsaLib; + ++ lib.optional alsaSupport alsa-lib; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 84eebfac695..f586a1592f9 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkg-config }: +{ lib, stdenv, fetchurl, alsa-lib, gtkmm2, libjack2, pkg-config }: stdenv.mkDerivation rec { pname = "seq24"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./mutex_no_nameclash.patch ]; - buildInputs = [ alsaLib gtkmm2 libjack2 ]; + buildInputs = [ alsa-lib gtkmm2 libjack2 ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 71d70c2dd58..0132b967900 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, qttools, which -, alsaLib, libjack2, liblo, qtbase +, alsa-lib, libjack2, liblo, qtbase }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config qttools which ]; - buildInputs = [ alsaLib libjack2 liblo qtbase ]; + buildInputs = [ alsa-lib libjack2 liblo qtbase ]; postPatch = '' for d in libseq66/include libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/include seq_rtmidi/src Seqtool/src; do diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 613abbf3c12..67851611f76 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2 +{ lib, stdenv, fetchzip, alsa-lib, freetype, ftgl, libjack2, libX11, lv2 , libGLU, libGL, pkg-config, ttf_bitstream_vera }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - alsaLib freetype ftgl libjack2 libX11 lv2 libGLU libGL + alsa-lib freetype ftgl libjack2 libX11 lv2 libGLU libGL ttf_bitstream_vera ]; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 65f21c13612..4f7e43ca004 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -6,7 +6,7 @@ , pkg-config , libsidplayfp , alsaSupport ? stdenv.hostPlatform.isLinux -, alsaLib +, alsa-lib , pulseSupport ? stdenv.hostPlatform.isLinux , libpulseaudio , out123Support ? stdenv.hostPlatform.isDarwin @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook perl pkg-config ]; buildInputs = [ libsidplayfp ] - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio ++ lib.optional out123Support mpg123; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 9351d1b0db7..0299f66191e 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config -, alsaLib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr +, alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr , nixosTests }: let @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { # not needed buildInputs = [ boost17x - alsaLib asio avahi flac libogg libvorbis + alsa-lib asio avahi flac libogg libvorbis aixlog popl soxr ]; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 164f266462a..4881360b82e 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, alsaLib, fftw, gsl, motif, xorg +, alsa-lib, fftw, gsl, motif, xorg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib fftw gsl motif ] + buildInputs = [ alsa-lib fftw gsl motif ] ++ (with xorg; [ libXext libXft libXpm libXt ]); configureFlags = [ "--with-motif" ]; diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix index a8dfe759d62..39f706d1f24 100644 --- a/pkgs/applications/audio/sndpeek/default.nix +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libsndfile, freeglut, alsaLib, mesa, libGLU, libX11, libXmu +{ lib, stdenv, fetchurl, libsndfile, freeglut, alsa-lib, mesa, libGLU, libX11, libXmu , libXext, libXi }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ freeglut - alsaLib + alsa-lib mesa libGLU libsndfile diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/applications/audio/songrec/default.nix index 81bd3c67d7d..2928771b3ec 100644 --- a/pkgs/applications/audio/songrec/default.nix +++ b/pkgs/applications/audio/songrec/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , gtk3 , openssl -, alsaLib +, alsa-lib , pkg-config , ffmpeg }: @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib gtk3 openssl ffmpeg ]; + buildInputs = [ alsa-lib gtk3 openssl ffmpeg ]; meta = with lib; { description = "An open-source Shazam client for Linux, written in Rust"; diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index b88165f693a..711444651c3 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound +{ lib, stdenv, fetchurl, alsa-lib, boost, bzip2, fftw, fftwFloat, libfishsound , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto , wrapQtAppsHook, pkg-config @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo + [ alsa-lib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo libmad liboggz libpulseaudio libsamplerate libsndfile lrdf opusfile portaudio rubberband serd sord capnproto ]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index f2df119fcc6..43254e6c2b0 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,6 +1,6 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html -{ lib, stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo +{ lib, stdenv, fetchurl, alsa-lib, bzip2, fftw, libjack2, libX11, liblo , libmad, lrdf, librdf_raptor, librdf_rasqal, libsamplerate , libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland , rubberband, serd, sord, vamp-plugin-sdk, fftwFloat @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; buildInputs = [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband - libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland + libsamplerate vamp-plugin-sdk alsa-lib librdf_raptor librdf_rasqal redland serd sord # optional diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 135c042d538..1cad71ae297 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -14,7 +14,7 @@ , rubberband , gettext , ncurses -, alsaLib +, alsa-lib , fftw }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { rubberband gettext ncurses - alsaLib + alsa-lib fftw ]; diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index 71fc763a5c5..3dc9089b241 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -3,7 +3,7 @@ , pkg-config , autoconf , gtk2 -, alsaLib +, alsa-lib , SDL , jack2 , audiofile @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { jack2 audiofile goocanvas - ] ++ lib.optional stdenv.isLinux alsaLib; + ] ++ lib.optional stdenv.isLinux alsa-lib; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index afe669f3862..2859a2e942e 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -13,7 +13,7 @@ , libhandy , gtk3 , openssl -, alsaLib +, alsa-lib , libpulseaudio , wrapGAppsHook }: @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { gtk3 libhandy openssl - alsaLib + alsa-lib libpulseaudio ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 8656deb2f6a..db0f69c80ab 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype +{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon @@ -20,7 +20,7 @@ let rev = "46"; deps = [ - alsaLib + alsa-lib atk at-spi2-atk at-spi2-core diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 8a077918d4f..e9de6cb3cf7 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPackages, pkg-config, openssl -, withALSA ? true, alsaLib +, withALSA ? true, alsa-lib , withPulseAudio ? false, libpulseaudio , withPortAudio ? false, portaudio , withMpris ? false @@ -29,7 +29,7 @@ rustPackages.rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optional withALSA alsaLib + ++ lib.optional withALSA alsa-lib ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio ++ lib.optional (withMpris || withKeyring) dbus; diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 600ba95947a..31fe69b00de 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, alsaLib, flac, libmad, libvorbis, mpg123 +, alsa-lib, flac, libmad, libvorbis, mpg123 , dsdSupport ? true , faad2Support ? true, faad2 , ffmpegSupport ? true, ffmpeg @@ -33,7 +33,7 @@ in stdenv.mkDerivation { sha256 = "024ypr1da2r079k3hgiifzd3d3wcfprhbl5zdm40zm0c7frzmr8i"; }; - buildInputs = [ alsaLib flac libmad libvorbis mpg123 ] + buildInputs = [ alsa-lib flac libmad libvorbis mpg123 ] ++ optional faad2Support faad2 ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix index aa4b4acf514..d295689716b 100644 --- a/pkgs/applications/audio/stochas/default.nix +++ b/pkgs/applications/audio/stochas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libXrandr, libXinerama, libXext, libXcursor, freetype, alsaLib, libjack2 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libXrandr, libXinerama, libXext, libXcursor, freetype, alsa-lib, libjack2 }: stdenv.mkDerivation rec { pname = "stochas"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - libX11 libXrandr libXinerama libXext libXcursor freetype alsaLib libjack2 + libX11 libXrandr libXinerama libXext libXcursor freetype alsa-lib libjack2 ]; installPhase = '' diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index c8ffba2c2a7..5a5671ec773 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , cmake , pkg-config -, alsaLib +, alsa-lib , boost , chromaprint , fftw @@ -45,7 +45,7 @@ mkDerivation rec { }; buildInputs = [ - alsaLib + alsa-lib boost chromaprint fftw diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 577175fcff2..7c5c378d2fa 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, unzip, alsaLib, libX11, libXi, SDL2 }: +{ lib, stdenv, fetchurl, unzip, alsa-lib, libX11, libXi, SDL2 }: let - libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsa-lib libX11 libXi SDL2 ]; arch = if stdenv.isAarch64 then "arm64" diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 50e16c355e2..eecf8caee37 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: +{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, libjack2, alsa-lib, liblo, lv2 }: mkDerivation rec { pname = "synthv1"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "047y2l7ipzv00ly54f074v6p043xjml7vz0svc7z81bhx74vs0ix"; }; - buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; + buildInputs = [ qtbase qttools libjack2 alsa-lib liblo lv2 ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix index d8265c3161b..aa18a5e397e 100644 --- a/pkgs/applications/audio/tony/default.nix +++ b/pkgs/applications/audio/tony/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, wrapQtAppsHook -, alsaLib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag +, alsa-lib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag , libjack2, liblo, libmad, libogg, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, qtbase, qtsvg, rubberband, serd, sord }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; buildInputs = [ - alsaLib boost bzip2 fftw fftwFloat libX11 libfishsound libid3tag + alsa-lib boost bzip2 fftw fftwFloat libX11 libfishsound libid3tag libjack2 liblo libmad libogg liboggz libpulseaudio libsamplerate libsndfile lrdf opusfile qtbase qtsvg rubberband serd sord ]; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 26cfb818980..9061c38f19c 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, lib, wrapGAppsHook, alsaLib, atk, cairo, gdk-pixbuf +{ stdenv, fetchzip, lib, wrapGAppsHook, alsa-lib, atk, cairo, gdk-pixbuf , glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; libPath = with gst_all_1; lib.makeLibraryPath [ - stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsaLib + stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsa-lib libX11 libSM libpng12 gstreamer gst-plugins-base zlib ]; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 71a91dc3105..698a03b4a71 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, cmake, pkg-config -, alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio +, alsa-lib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: mkDerivation { @@ -12,7 +12,7 @@ mkDerivation { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ alsaLib fftw flac.dev libjack2 lame + buildInputs = [ alsa-lib fftw flac.dev libjack2 lame libmad libpulseaudio libsamplerate.dev libsndfile.dev libvorbis portaudio qtbase wavpack ]; diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix index 6dc1eb33962..df7564abcf0 100644 --- a/pkgs/applications/audio/tunefish/default.nix +++ b/pkgs/applications/audio/tunefish/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, python3 -, alsaLib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk +, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = [ alsaLib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ]; + buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ]; postPatch = '' patchShebangs src/tunefish4/generate-lv2-ttl.py diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index c7e24b926c0..789b97507a1 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkg-config -, alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi +, alsa-lib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi , libzip, rtaudio, rtmidi, speex, libsamplerate }: let @@ -75,7 +75,7 @@ with lib; stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = [ alsaLib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ]; + buildInputs = [ alsa-lib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ]; buildFlags = [ "Rack" ]; diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index 1cb9c0f18bf..c1e41e41284 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -3,7 +3,7 @@ , libX11 , libXi , libGL -, alsaLib +, alsa-lib , SDL2 , autoPatchelfHook }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libX11 libXi libGL - alsaLib + alsa-lib SDL2 ]; diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix index 943bd0d8032..ec639156217 100644 --- a/pkgs/applications/audio/vkeybd/default.nix +++ b/pkgs/applications/audio/vkeybd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libX11, makeWrapper, tcl, tk }: +{ lib, stdenv, fetchurl, alsa-lib, libX11, makeWrapper, tcl, tk }: stdenv.mkDerivation rec { pname = "vkeybd"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ alsaLib libX11 tcl tk ]; + buildInputs = [ alsa-lib libX11 tcl tk ]; configurePhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index b6accf1993a..6158f33713a 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, alsaLib, libxmp }: +{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }: stdenv.mkDerivation rec { name = "xmp-4.1.0"; @@ -16,5 +16,5 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib libxmp ]; + buildInputs = [ alsa-lib libxmp ]; } diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index b994f197e67..0802a79df04 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2, +{ lib, stdenv, fetchurl, alsa-lib, autoconf, automake, dssi, gtk2, libjack2, ladspaH, ladspaPlugins, liblo, pkg-config }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; - buildInputs = [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH + buildInputs = [ alsa-lib autoconf automake dssi gtk2 libjack2 ladspaH ladspaPlugins liblo pkg-config ]; installPhase = '' diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index e9e191112f9..dfb6a419c3d 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre +{ lib, stdenv, fetchFromGitHub , alsa-lib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre , libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkg-config, zlib, xorg }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0bgcc5fbgwpdjircq00wlii30pakf45yzligpbnf02a554hh4j01"; }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL + alsa-lib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL minixml zlib xorg.libpthreadstubs pcre ]; diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/applications/audio/zita-ajbridge/default.nix index 4b094864607..db6fc7d3381 100644 --- a/pkgs/applications/audio/zita-ajbridge/default.nix +++ b/pkgs/applications/audio/zita-ajbridge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, zita-alsa-pcmi, zita-resampler }: +{ lib, stdenv, fetchurl, alsa-lib, libjack2, zita-alsa-pcmi, zita-resampler }: stdenv.mkDerivation rec { name = "zita-ajbridge-0.8.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0g5v0l0zmqh049mhv62n8s5bpm0yrlby7mkxxhs5qwadp8v4w9mw"; }; - buildInputs = [ alsaLib libjack2 zita-alsa-pcmi zita-resampler ]; + buildInputs = [ alsa-lib libjack2 zita-alsa-pcmi zita-resampler ]; preConfigure = '' cd ./source/ diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index dfc3e600ec2..986e3215b93 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -16,7 +16,7 @@ # Optional dependencies , alsaSupport ? true -, alsaLib +, alsa-lib , dssiSupport ? false , dssi , ladspaH @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ fftw liblo minixml zlib ] - ++ lib.optionals alsaSupport [ alsaLib ] + ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals dssiSupport [ dssi ladspaH ] ++ lib.optionals jackSupport [ libjack2 ] ++ lib.optionals lashSupport [ lash ] diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 8e32798dc43..08eeac760c0 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango, -atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsaLib, dbus, at-spi2-atk, +atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsa-lib, dbus, at-spi2-atk, cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { util-linux xorg.libXrandr xorg.libXScrnSaver - alsaLib + alsa-lib dbus.lib at-spi2-atk at-spi2-core diff --git a/pkgs/applications/blockchains/parity-ui/env.nix b/pkgs/applications/blockchains/parity-ui/env.nix index a878bbf2e3e..8b7d706c013 100644 --- a/pkgs/applications/blockchains/parity-ui/env.nix +++ b/pkgs/applications/blockchains/parity-ui/env.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig +{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr , nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }: let packages = [ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 - fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss + fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 6d9182b9d61..42e3b7588af 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,6 +1,6 @@ { channel, pname, version, build ? null, sha256Hash }: -{ alsaLib +{ alsa-lib , bash , buildFHSUserEnv , cacert @@ -121,7 +121,7 @@ let libXrandr # For Android emulator - alsaLib + alsa-lib dbus expat libpulseaudio diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 875f8612fde..03a46479871 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -3,14 +3,14 @@ let versions = { atom = { - version = "1.54.0"; - sha256 = "sha256-21AURgomEjuiTzeJ4MIx0mkyVi0b0mVdmFsFGNLXRP4"; + version = "1.57.0"; + sha256 = "1jzxjvaljk8p3gzjvs5bn3d128x37pcgn6by7srhs9qclc5j2664"; }; atom-beta = { - version = "1.55.0"; + version = "1.58.0"; beta = 0; - sha256 = "sha256-PICkTt54cPkDJVnXBTtSHUQVbmosOpZfVAiD5A3/n+Q="; + sha256 = "0amhilmpiwn2jfn0nrcrhzminqdp3xm5p3w3ldc3qk761pn3lbpd"; broken = true; }; }; diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 53150e0ad61..253518b276b 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,17 +1,18 @@ -{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig +{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk -, at-spi2-core, libdbusmenu, mesa +, at-spi2-core, libdbusmenu, libdrm, mesa }: let packages = [ stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3 - fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss + fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu + libdrm mesa # required for libgbm ]; diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index 9ccd549693b..5b1fc966dd9 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, makeWrapper -, alsaLib, fontconfig, mesa_glu, libXcursor, libXinerama, libXrandr, xorg +, alsa-lib, fontconfig, mesa_glu, libXcursor, libXinerama, libXrandr, xorg }: stdenv.mkDerivation rec { @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - alsaLib fontconfig mesa_glu + alsa-lib fontconfig mesa_glu libXcursor libXinerama libXrandr xorg.xinput xorg.libXi xorg.libXext ]; postFixup = '' - wrapProgram $out/bin/bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib" + wrapProgram $out/bin/bonzomatic --prefix LD_LIBRARY_PATH : "${alsa-lib}/lib" ''; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index ad044d3968e..1bae0a0c970 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -9,7 +9,7 @@ { stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf +, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz , dontRecurseIntoAttrs ,emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params @@ -105,7 +105,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext jansson harfbuzz.dev ] + [ ncurses gconf libxml2 gnutls alsa-lib acl gpm gettext jansson harfbuzz.dev ] ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg giflib libtiff libXft diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index aa7b7b19448..38fb55ecf7b 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , # Patchelf dependencies: - alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL + alsa-lib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL , openssl, xorg, zlib }: @@ -57,7 +57,7 @@ in $out/kodestudio patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGL}/lib:${libGLU}/lib:${openssl.out}/lib" \ + --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsa-lib}/lib:${libGL}/lib:${libGLU}/lib:${openssl.out}/lib" \ $out/resources/app/extensions/krom/Krom/linux/Krom patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 52acc8ee50b..b19b1ac2b68 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, zlib, glib, alsaLib, makeDesktopItem +{ stdenv, lib, fetchurl, zlib, glib, alsa-lib, makeDesktopItem , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify }: @@ -6,7 +6,7 @@ let libPath = lib.makeLibraryPath [ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss - fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf + fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr gnome2.GConf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr xorg.libXcursor diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 90879b352e1..a48b5eae3de 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib, jack2, fluidsynth, libpulseaudio }: +{ lib, stdenv, fetchurl, swt, jdk, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }: let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; if stdenv.hostPlatform.system == "i686-linux" then @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/tuxguitar \ --set JAVA "${jdk}/bin/java" \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsaLib jack2 fluidsynth libpulseaudio ]}" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsa-lib jack2 fluidsynth libpulseaudio ]}" \ --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 51593353334..657ea55da60 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip -, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome +, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, gnome , xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { dbus nss nspr - alsaLib + alsa-lib cups expat udev diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index e8ef97f949c..05e94bb164c 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, rpmextract, autoPatchelfHook, wrapGAppsHook # Dynamic libraries -, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat +, alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat , gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst , libxcb, libuuid, libxshmfence, nspr, nss, pango, mesa @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib atk at-spi2-atk at-spi2-core diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index acec5293101..3db183b2531 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitLab -, alsaLib +, alsa-lib , bzip2 , fftw , freeglut @@ -23,7 +23,7 @@ }: let libs = [ - alsaLib + alsa-lib bzip2 fftw freeglut @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib + alsa-lib fftw freeglut.dev freetype diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index d8862525030..2ccc6ed401d 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -13,7 +13,7 @@ , libXi , libXext , libGLU -, alsaLib +, alsa-lib , fontconfig , AVFoundation , Carbon @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsaLib fontconfig libGLU ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsa-lib fontconfig libGLU ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL ]; installPhase = '' diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 2ac507dc870..1c4609ac55b 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchzip -, alsaLib +, alsa-lib , glib , gst_all_1 , libGLU, libGL @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib - alsaLib + alsa-lib glib gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index ca51d74a0a1..b30dbab1570 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake , qtbase, qtxmlpatterns, qttools, qtwebkit, libGL, fontconfig, openssl, poppler -, ffmpeg, libva, alsaLib, SDL, x264, libvpx, libvorbis, libtheora, libogg +, ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: let @@ -52,7 +52,7 @@ in mkDerivation rec { poppler ffmpeg libva - alsaLib + alsa-lib SDL x264 libvpx diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index be3b07bf4cc..5c5557d6d60 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, lib, makeWrapper, wrapGAppsHook, # build dependencies - alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, + alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gtk3, libuuid, nspr, nss, pango, xorg, systemd }: let deps = [ - alsaLib + alsa-lib atk at-spi2-atk at-spi2-core diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix index a3ae46cf138..a34f5a22d06 100644 --- a/pkgs/applications/kde/kmix.nix +++ b/pkgs/applications/kde/kmix.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, kglobalaccel, kxmlgui, kcoreaddons, - plasma-framework, libpulseaudio, alsaLib, libcanberra_kde + plasma-framework, libpulseaudio, alsa-lib, libcanberra_kde }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - alsaLib kglobalaccel kxmlgui kcoreaddons + alsa-lib kglobalaccel kxmlgui kcoreaddons libcanberra_kde libpulseaudio plasma-framework ]; cmakeFlags = [ "-DKMIX_KF5_BUILD=1" ]; diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix index 125e79c2c3c..43f41c345fd 100644 --- a/pkgs/applications/kde/kwave.nix +++ b/pkgs/applications/kde/kwave.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig -, kcrash, kiconthemes, kio, audiofile, libsamplerate, alsaLib, libpulseaudio, flac, id3lib +, kcrash, kiconthemes, kio, audiofile, libsamplerate, alsa-lib, libpulseaudio, flac, id3lib , libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { extra-cmake-modules ]; buildInputs = [ - alsaLib + alsa-lib audiofile kcrash kdoctools diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 580f6eda87e..436e4d7831f 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , makeWrapper -, alsaLib +, alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { installPhase = let rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix index 58fcf4cb10d..90373b6b00c 100644 --- a/pkgs/applications/misc/airtame/default.nix +++ b/pkgs/applications/misc/airtame/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper -, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg_3, fontconfig, freetype +, alsa-lib, atk, cairo, cups, curl, dbus, expat, ffmpeg_3, fontconfig, freetype , gdk-pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite , libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender , libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264 }: let libPath = lib.makeLibraryPath [ - alsaLib atk cairo cups curl dbus expat ffmpeg_3 fontconfig freetype gdk-pixbuf + alsa-lib atk cairo cups curl dbus expat ffmpeg_3 fontconfig freetype gdk-pixbuf glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264 libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst libpulseaudio libxcb diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 946150d2b88..9baf2d4d2f2 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, pkg-config, CoreAudio -, enableAlsa ? true, alsaLib ? null +, enableAlsa ? true, alsa-lib ? null , enableLibao ? true, libao ? null , enableLame ? config.sox.enableLame or false, lame ? null , enableLibmad ? true, libmad ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; buildInputs = - optional (enableAlsa && stdenv.isLinux) alsaLib ++ + optional (enableAlsa && stdenv.isLinux) alsa-lib ++ optional enableLibao libao ++ optional enableLame lame ++ optional enableLibmad libmad ++ diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index 65200d85177..dc8786dcce2 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups +{ alsa-lib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups , dbus, electron_9, expat, fetchurl, gdk-pixbuf, glib, gtk3, lib , libappindicator-gtk3, libdbusmenu-gtk3, libuuid, makeWrapper , nspr, nss, pango, squashfsTools, stdenv, systemd, xorg @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { rev = "5"; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index dab8ccb29b7..16344d975fe 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -5,7 +5,7 @@ , copyDesktopItems , pkg-config , gtk3 -, alsaLib +, alsa-lib }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ copyDesktopItems pkg-config ]; - buildInputs = [ gtk3 alsaLib ]; + buildInputs = [ gtk3 alsa-lib ]; postPatch = '' sed -i -e "s|/bin/ls|ls|" gtk/Makefile diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index b1c7949d258..c9be607b366 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }: +{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsa-lib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }: let ld_library_path = builtins.concatStringsSep ":" [ @@ -17,7 +17,7 @@ let xorg.libXcomposite xorg.libXdamage xorg.libXtst - alsaLib + alsa-lib fontconfig libSM libICE diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index c7238fb0155..19cb7f6c552 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -95,7 +95,7 @@ in buildFHSUserEnv { libao libevdev udev libgcrypt libxml2 libusb-compat-0_1 libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib - alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils + alsa-lib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd vulkan-loader xdg-utils sqlite gnutls p11-kit libbsd harfbuzz diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index dd3fb854599..ef802361480 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, perl -, alsaLib, libevdev, libopus, udev, SDL2 +, alsa-lib, libevdev, libopus, udev, SDL2 , ffmpeg, pkg-config, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid, libva }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ - alsaLib libevdev libopus udev SDL2 + alsa-lib libevdev libopus udev SDL2 ffmpeg pkg-config xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi enet libuuid libva ]; diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index ad9baec8f99..b02abc2f229 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -10,7 +10,7 @@ , libva , libvdpau , libxkbcommon -, alsaLib +, alsa-lib , libpulseaudio , openssl , libopus @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libva libvdpau libxkbcommon - alsaLib + alsa-lib libpulseaudio openssl libopus diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 03a83c1179b..8fcd9e1a04f 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -27,7 +27,7 @@ , libXScrnSaver , nss , nspr -, alsaLib +, alsa-lib , cups , fontconfig , expat @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { libXScrnSaver nss nspr - alsaLib + alsa-lib cups fontconfig expat diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 2c431e68dee..099813483a4 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -19,7 +19,7 @@ , xcbutilxrm , makeWrapper , removeReferencesTo -, alsaLib +, alsa-lib , curl , libmpdclient , libpulseaudio @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { xcbutilwm xcbutilxrm ] - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional githubSupport curl ++ lib.optional mpdSupport libmpdclient ++ lib.optional pulseSupport libpulseaudio diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 439af2b8c01..d387468bcdd 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, udev -, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 +, qtmultimedia, qtscript, alsa-lib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: @@ -24,7 +24,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ - udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad + udev qtmultimedia qtscript alsa-lib ola libftdi1 libusb-compat-0_1 libsndfile libmad ]; qmakeFlags = [ "INSTALLROOT=$(out)" ]; diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index b68a3a98e34..2e1b94b6b6c 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, alsaLib }: +{ lib, buildGoModule, fetchFromGitHub, alsa-lib }: buildGoModule rec { pname = "sampler"; @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; meta = with lib; { description = "Tool for shell commands execution, visualization and alerting"; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 6a60e81933b..976aae78171 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook -, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype +, alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb , pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libcxx systemd libpulseaudio - stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype + stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss libxcb pango systemd libXScrnSaver diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index 47d02a0cec9..375b802d5c1 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -5,7 +5,7 @@ , meson , ninja , scdoc -, alsaLib +, alsa-lib , fcft , json_c , libmpdclient @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ - alsaLib + alsa-lib fcft json_c libmpdclient diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index e9e22741c41..2f52a432f4b 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -55,7 +55,7 @@ with lib; let deps = [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index feff2a74b14..7d666f5ba9f 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl , dpkg -, alsaLib +, alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -46,7 +46,7 @@ let rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index dcac873b849..cc443764447 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -62,6 +62,8 @@ mkChromiumDerivation (base: rec { -e '/\[Desktop Entry\]/a\' \ -e 'StartupWMClass=chromium-browser' \ $out/share/applications/chromium-browser.desktop + '' + lib.optionalString (channel == "dev") '' + cp -v "$buildPath/crashpad_handler" "$libExecPath/" ''; passthru = { inherit sandboxExecutableName; }; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 57cac091912..156932aa13f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -9,7 +9,7 @@ , python2, python3, perl, pkg-config , nspr, systemd, libkrb5 -, util-linux, alsaLib +, util-linux, alsa-lib , bison, gperf , glib, gtk3, dbus-glib , glibc @@ -144,7 +144,7 @@ let buildInputs = defaultDependencies ++ [ nspr nss systemd - util-linux alsaLib + util-linux alsa-lib bison gperf libkrb5 glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL @@ -206,7 +206,7 @@ let substituteInPlace services/audio/audio_sandbox_hook_linux.cc \ --replace \ '/usr/share/alsa/' \ - '${alsaLib}/share/alsa/' \ + '${alsa-lib}/share/alsa/' \ --replace \ '/usr/lib/x86_64-linux-gnu/gconv/' \ '${glibc}/lib/gconv/' \ diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index e14e3642643..2768e31bd03 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -27,7 +27,7 @@ for entry in feed.entries: print('\n' + url) if fixes := re.search(r'This update includes .+ security fixes\.', content): fixes = html_tags.sub('', fixes.group(0)) - zero_days = re.search(r'Google is aware of reports that .+ in the wild\.', content) + zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content) if zero_days: fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index fc702993338..725205c5c20 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, config, wrapGAppsHook -, alsaLib +, alsa-lib , atk , cairo , curl @@ -93,7 +93,7 @@ stdenv.mkDerivation { libPath = lib.makeLibraryPath [ stdenv.cc.cc - alsaLib + alsa-lib atk cairo curl diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index a44fb2032f4..2d2073b80b0 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -18,7 +18,7 @@ ## optional libraries -, alsaSupport ? stdenv.isLinux, alsaLib +, alsaSupport ? stdenv.isLinux, alsa-lib , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook @@ -180,7 +180,7 @@ buildStdenv.mkDerivation ({ # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ nspr nss_pkg ] - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport libkrb5 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 13becfc4f62..53c461641dc 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in -, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify +, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify , gnome/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native @@ -68,9 +68,9 @@ let ++ lib.optional gssSupport libkrb5 ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) - (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsa-lib zlib ]) ++ lib.optional (config.pulseaudio or true) libpulseaudio - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk2 ]; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index a7b9ddd07d0..ec03a77d268 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -3,7 +3,7 @@ # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb -, alsaLib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups +, alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , libkrb5, libdrm, mesa , libxkbcommon, wayland # ozone/wayland @@ -59,7 +59,7 @@ let deps = [ glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb - alsaLib libXdamage libXtst libXrandr libxshmfence expat cups + alsa-lib libXdamage libXtst libXrandr libxshmfence expat cups dbus gdk-pixbuf gcc-unwrapped.lib systemd libexif diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 2028c5a7b20..0bad6c58d0a 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , atk , cairo , cups @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 63f1958f4a6..6afdf61886a 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,11 +1,8 @@ -# Compiler in stdenv MUST be a supported one for official branding -# See https://developer.palemoon.org/build/linux/ -# TODO assert if stdenv.cc is supported? { stdenv , lib , fetchFromGitHub , writeScript -, alsaLib +, alsa-lib , autoconf213 , cairo , desktop-file-utils @@ -37,6 +34,15 @@ , gtk3 }: +# Only specific GCC versions are supported with branding +# https://developer.palemoon.org/build/linux/ +assert stdenv.cc.isGNU; +assert with lib.strings; ( + versionAtLeast stdenv.cc.version "4.9" + && !hasPrefix "6" stdenv.cc.version + && versionOlder stdenv.cc.version "11" +); + let libPath = lib.makeLibraryPath [ ffmpeg @@ -46,14 +52,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.2.0"; + version = "29.2.1"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "0pa9j41bbfarwi60a6hxi5vpn52mwgr4p05l98acv4fcs1ccb427"; + sha256 = "0djjl79jrnny16p32db5w7pwwv0a24dc8mg1s1bnavhlvmmk52vq"; fetchSubmodules = true; }; @@ -87,7 +93,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib cairo dbus dbus-glib @@ -142,7 +148,6 @@ stdenv.mkDerivation rec { ac_add_options --enable-jemalloc ac_add_options --enable-strip ac_add_options --enable-devtools - # Missing from build instructions, https://forum.palemoon.org/viewtopic.php?f=5&t=25843#p214767 ac_add_options --enable-av1 ac_add_options --disable-eme @@ -188,7 +193,7 @@ stdenv.mkDerivation rec { ./mach install # Fix missing icon due to wrong WMClass - # TODO report upstream + # https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221 substituteInPlace ./palemoon/branding/official/palemoon.desktop \ --replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon' desktop-file-install --dir=$out/share/applications \ @@ -202,7 +207,7 @@ stdenv.mkDerivation rec { done # Remove unneeded SDK data from installation - # TODO: move to a separate output? + # https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729 rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}} runHook postInstall @@ -231,6 +236,7 @@ stdenv.mkDerivation rec { extensions and themes to make the browser truly your own. ''; homepage = "https://www.palemoon.org/"; + changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${version}_Release"; license = licenses.mpl20; maintainers = with maintainers; [ AndersonTorres OPNA2608 ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 248bf86c0c2..5a2b45725df 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "jelmerro"; repo = pname; rev = version; - sha256 = "sha256-0fbH2tmrgbu/XQg1piK9f56cow+R/Qe6bYMdbeV/mus="; + sha256 = "sha256-0C2gD40nPgEZopGMPsd5ajwcwFRjcu4Xc2DTpEwSK4c="; }; packageJSON = ./package.json; diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index 789c507786a..94effdaa2e5 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -1,7 +1,7 @@ { "name": "vieb", "productName": "Vieb", - "version": "5.0.0", + "version": "5.1.0", "description": "Vim Inspired Electron Browser", "bin": "app.js", "main": "app/index.js", @@ -30,18 +30,18 @@ "license": "GPL-3.0-or-later", "devDependencies": { "archiver": "5.3.0", - "electron": "13.0.1", - "electron-builder": "22.10.5", - "eslint": "7.27.0", - "eslint-plugin-compat": "^3.9.0", + "electron": "13.1.1", + "electron-builder": "22.11.5", + "eslint": "7.28.0", + "eslint-plugin-compat": "3.9.0", "eslint-plugin-sort-keys-fix": "1.1.1", - "jest-environment-jsdom": "^27.0.1", - "jest": "27.0.1" + "jest-environment-jsdom": "27.0.3", + "jest": "27.0.4" }, "dependencies": { "7zip-bin": "5.1.1", - "@cliqz/adblocker-electron": "1.20.6", - "@cliqz/adblocker-electron-preload": "1.20.6", + "@cliqz/adblocker-electron": "1.22.1", + "@cliqz/adblocker-electron-preload": "1.22.1", "is-svg": "4.3.1", "rimraf": "3.0.2" }, diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index 2c484e5bcf6..ff4a7248f61 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -2,16 +2,11 @@ # yarn lockfile v1 -"7zip-bin@5.1.1": +"7zip-bin@5.1.1", "7zip-bin@~5.1.1": version "5.1.1" resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== -"7zip-bin@~5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" - integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== - "@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" @@ -26,10 +21,10 @@ dependencies: "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.13.15": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919" - integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q== +"@babel/compat-data@^7.14.4": + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz#45720fe0cecf3fd42019e1d12cc3d27fadc98d58" + integrity sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ== "@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5": version "7.14.3" @@ -62,13 +57,13 @@ source-map "^0.5.0" "@babel/helper-compilation-targets@^7.13.16": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c" - integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz#33ebd0ffc34248051ee2089350a929ab02f2a516" + integrity sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA== dependencies: - "@babel/compat-data" "^7.13.15" + "@babel/compat-data" "^7.14.4" "@babel/helper-validator-option" "^7.12.17" - browserslist "^4.14.5" + browserslist "^4.16.6" semver "^6.3.0" "@babel/helper-function-name@^7.14.2": @@ -128,14 +123,14 @@ integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== "@babel/helper-replace-supers@^7.13.12": - version "7.14.3" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz#ca17b318b859d107f0e9b722d58cf12d94436600" - integrity sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA== + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz#b2ab16875deecfff3ddfcd539bc315f72998d836" + integrity sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ== dependencies: "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" "@babel/traverse" "^7.14.2" - "@babel/types" "^7.14.2" + "@babel/types" "^7.14.4" "@babel/helper-simple-access@^7.13.12": version "7.13.12" @@ -180,9 +175,9 @@ js-tokens "^4.0.0" "@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.14.3", "@babel/parser@^7.7.2": - version "7.14.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz#9b530eecb071fd0c93519df25c5ff9f14759f298" - integrity sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ== + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz#a5c560d6db6cd8e6ed342368dea8039232cbab18" + integrity sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -298,10 +293,10 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3" - integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw== +"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.14.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz#bfd6980108168593b38b3eb48a24aa026b919bc0" + integrity sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw== dependencies: "@babel/helper-validator-identifier" "^7.14.0" to-fast-properties "^2.0.0" @@ -311,45 +306,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.6.tgz#1bfbdb1e5757fc610f3d5d9921bba9d166d687a7" - integrity sha512-KRo8EjIbiuAHBQHJcgs0oefJlp/lw93KQL1Rv9CeMFdKqVZV8IReGqe/V+ipoaOQFVgLZ8gWPOzEkLAQ4P2ZBQ== +"@cliqz/adblocker-content@^1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.1.tgz#71bc0d0d473ae96d5086badb2f4d624769fa56c4" + integrity sha512-CSOCdK/SJOZVWGVJuurfL0KtPq1AhSp3ng6BAo3SLXAd+WP7obERw2qFWQ0uzrApY/N1a1hvzfw31uonqRakXg== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.20.6" + "@cliqz/adblocker-extended-selectors" "^1.22.1" -"@cliqz/adblocker-electron-preload@1.20.6", "@cliqz/adblocker-electron-preload@^1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.6.tgz#c2804edb8c4dd5ce226a2a5ef95b9e6cd3745767" - integrity sha512-2dF6aaTZftwUXswHRSIlSIop4SQGmtpzp3FHVQvB3lCCE2ssONT38nCY0b4PREooZ35tzZTZNyYcOboaear3UQ== +"@cliqz/adblocker-electron-preload@1.22.1", "@cliqz/adblocker-electron-preload@^1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz#8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af" + integrity sha512-etkb6LNUaCViZ2Bg7Z0fwpKsdsrmHF6Qjqs5u7FcfS4fSZ2TgDv7Ir5PunUWd6MOUW7mapx5CdPIupnlVkiTLA== dependencies: - "@cliqz/adblocker-content" "^1.20.6" + "@cliqz/adblocker-content" "^1.22.1" -"@cliqz/adblocker-electron@1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.6.tgz#870ff1ba7765f545fee70327d3c7e08adadc7764" - integrity sha512-//fdnVxuab6nfx/Eq9u6r8EbgHl/wOGGIUu/ueaYEstR+m3Re22zJDtbj8AwmN75aDynQ7jhUz81GLqH4o4pzg== +"@cliqz/adblocker-electron@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz#13fe6de4be0c3beb2851634b27ea1223d10ca92b" + integrity sha512-RZUog6ogMZnOx9Rz1LWIHE5MOWdDStfzkbfLpelka6PerRSKKltUvV4qwqM455eUMqHqPd27ZMM183+MQ85WpQ== dependencies: - "@cliqz/adblocker" "^1.20.6" - "@cliqz/adblocker-electron-preload" "^1.20.6" + "@cliqz/adblocker" "^1.22.1" + "@cliqz/adblocker-electron-preload" "^1.22.1" tldts-experimental "^5.6.21" -"@cliqz/adblocker-extended-selectors@^1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.6.tgz#964d3b96e419778c6e4c8ecf5c2b94599dfbdcd7" - integrity sha512-EuGLyv00GeRFr2PKZLaWgnRpKSFLdezqXTJFaljtvb0iieR7yNdjfEdoEJmctRmslTrlcMmpOlNhAOpJavY4bw== +"@cliqz/adblocker-extended-selectors@^1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.1.tgz#234ee70a1736e3690b25a7a073818f5a851bf9a8" + integrity sha512-uXB1TybAq6MgqsG09fcY8Qw0P9EOWp4G7KQ4QNXQd4HIP4o3zcJgBd5MKeclJAD/QOyPdhnb+a9JdwVFyqMamQ== -"@cliqz/adblocker@^1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.6.tgz#3428d3c066dbaafa98644fadfd28dd206f8691e2" - integrity sha512-BhYna9gkQnqQfFJy4FOW3cER2oO0IwZzvYQaQEMP5Y/ETUzMq5WBHq5X4dOU+hiJdbkgogIS5L73uPUHDK01Hw== +"@cliqz/adblocker@^1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.1.tgz#dae3dd6c59f16244012d1e736150f618b2d578e6" + integrity sha512-kir/tVTe0VabtJfcRipDX+/UBnZn0aN0lX4GQT7wZIHMOACpW37eix7wGkzVS+icbwu1bEqZ+O8Q98UlORPm4w== dependencies: - "@cliqz/adblocker-content" "^1.20.6" - "@cliqz/adblocker-extended-selectors" "^1.20.6" + "@cliqz/adblocker-content" "^1.22.1" + "@cliqz/adblocker-extended-selectors" "^1.22.1" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.136" + "@types/chrome" "^0.0.144" "@types/firefox-webext-browser" "^82.0.0" tldts-experimental "^5.6.21" @@ -377,10 +372,10 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" -"@electron/universal@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.4.tgz#231ac246c39d45b80e159bd21c3f9027dcaa10f5" - integrity sha512-ajZoumi4XwqwmZe8YVhu4XGkZBCPyWZsVCQONPTIe9TUlleSN+dic3YpXlaWcilx/HOzTdldTKtabNTeI0gDoA== +"@electron/universal@1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz#b812340e4ef21da2b3ee77b2b4d35c9b86defe37" + integrity sha512-zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag== dependencies: "@malept/cross-spawn-promise" "^1.1.0" asar "^3.0.3" @@ -388,15 +383,15 @@ dir-compare "^2.4.0" fs-extra "^9.0.1" -"@eslint/eslintrc@^0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14" - integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ== +"@eslint/eslintrc@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" + integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== dependencies: ajv "^6.12.4" debug "^4.1.1" espree "^7.3.0" - globals "^12.1.0" + globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" @@ -419,94 +414,94 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.0.1.tgz#c6acfec201f9b6823596eb6c4fcd77c89a8b27e9" - integrity sha512-50E6nN2F5cAXn1lDljn0gE9F0WFXHYz/u0EeR7sOt4nbRPNli34ckbl6CUDaDABJbHt62DYnyQAIB3KgdzwKDw== +"@jest/console@^27.0.2": + version "27.0.2" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.0.2.tgz#b8eeff8f21ac51d224c851e1729d2630c18631e6" + integrity sha512-/zYigssuHLImGeMAACkjI4VLAiiJznHgAl3xnFT19iWyct2LhrH3KXOjHRmxBGTkiPLZKKAJAgaPpiU9EZ9K+w== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^27.0.1" - jest-util "^27.0.1" + jest-message-util "^27.0.2" + jest-util "^27.0.2" slash "^3.0.0" -"@jest/core@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.1.tgz#88d0ff55f465fe1fc3a940718e8cf0fea242be4b" - integrity sha512-PiCbKSMf6t8PEfY3MAd0Ldn3aJAt5T+UcaFkAfMZ1VZgas35+fXk5uHIjAQHQLNIHZWX19TLv0wWNT03yvrw6w== - dependencies: - "@jest/console" "^27.0.1" - "@jest/reporters" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/transform" "^27.0.1" - "@jest/types" "^27.0.1" +"@jest/core@^27.0.4": + version "27.0.4" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.4.tgz#679bf9ac07900da2ddbb9667bb1afa8029038f53" + integrity sha512-+dsmV8VUs1h/Szb+rEWk8xBM1fp1I///uFy9nk3wXGvRsF2lBp8EVPmtWc+QFRb3MY2b7u2HbkGF1fzoDzQTLA== + dependencies: + "@jest/console" "^27.0.2" + "@jest/reporters" "^27.0.4" + "@jest/test-result" "^27.0.2" + "@jest/transform" "^27.0.2" + "@jest/types" "^27.0.2" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^27.0.1" - jest-config "^27.0.1" - jest-haste-map "^27.0.1" - jest-message-util "^27.0.1" + jest-changed-files "^27.0.2" + jest-config "^27.0.4" + jest-haste-map "^27.0.2" + jest-message-util "^27.0.2" jest-regex-util "^27.0.1" - jest-resolve "^27.0.1" - jest-resolve-dependencies "^27.0.1" - jest-runner "^27.0.1" - jest-runtime "^27.0.1" - jest-snapshot "^27.0.1" - jest-util "^27.0.1" - jest-validate "^27.0.1" - jest-watcher "^27.0.1" + jest-resolve "^27.0.4" + jest-resolve-dependencies "^27.0.4" + jest-runner "^27.0.4" + jest-runtime "^27.0.4" + jest-snapshot "^27.0.4" + jest-util "^27.0.2" + jest-validate "^27.0.2" + jest-watcher "^27.0.2" micromatch "^4.0.4" p-each-series "^2.1.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.1.tgz#27ed89bf8179c0a030690f063d922d6da7a519ac" - integrity sha512-nG+r3uSs2pOTsdhgt6lUm4ZGJLRcTc6HZIkrFsVpPcdSqEpJehEny9r9y2Bmhkn8fKXWdGCYJKF3i4nKO0HSmA== +"@jest/environment@^27.0.3": + version "27.0.3" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.3.tgz#68769b1dfdd213e3456169d64fbe9bd63a5fda92" + integrity sha512-pN9m7fbKsop5vc3FOfH8NF7CKKdRbEZzcxfIo1n2TT6ucKWLFq0P6gCJH0GpnQp036++yY9utHOxpeT1WnkWTA== dependencies: - "@jest/fake-timers" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/fake-timers" "^27.0.3" + "@jest/types" "^27.0.2" "@types/node" "*" - jest-mock "^27.0.1" + jest-mock "^27.0.3" -"@jest/fake-timers@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.1.tgz#6987a596b0bcf8c07653086076c17058b4c77b5c" - integrity sha512-3CyLJQnHzKI4TCJSCo+I9TzIHjSK4RrNEk93jFM6Q9+9WlSJ3mpMq/p2YuKMe0SiHKbmZOd5G/Ll5ofF9Xkw9g== +"@jest/fake-timers@^27.0.3": + version "27.0.3" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.3.tgz#9899ba6304cc636734c74478df502e18136461dd" + integrity sha512-fQ+UCKRIYKvTCEOyKPnaPnomLATIhMnHC/xPZ7yT1Uldp7yMgMxoYIFidDbpSTgB79+/U+FgfoD30c6wg3IUjA== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" "@sinonjs/fake-timers" "^7.0.2" "@types/node" "*" - jest-message-util "^27.0.1" - jest-mock "^27.0.1" - jest-util "^27.0.1" + jest-message-util "^27.0.2" + jest-mock "^27.0.3" + jest-util "^27.0.2" -"@jest/globals@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.1.tgz#14c776942f7047a04f2aea09b148065e2aa9d7e9" - integrity sha512-80ZCzgopysKdpp5EOglgjApKxiNDR96PG4PwngB4fTwZ4qqqSKo0EwGwQIhl16szQ1M2xCVYmr9J6KelvnABNQ== +"@jest/globals@^27.0.3": + version "27.0.3" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.3.tgz#1cf8933b7791bba0b99305cbf39fd4d2e3fe4060" + integrity sha512-OzsIuf7uf+QalqAGbjClyezzEcLQkdZ+7PejUrZgDs+okdAK8GwRCGcYCirHvhMBBQh60Jr3NlIGbn/KBPQLEQ== dependencies: - "@jest/environment" "^27.0.1" - "@jest/types" "^27.0.1" - expect "^27.0.1" + "@jest/environment" "^27.0.3" + "@jest/types" "^27.0.2" + expect "^27.0.2" -"@jest/reporters@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.1.tgz#5b491f64e37c9b97b13e564f18f36b6697d28045" - integrity sha512-lZbJWuS1h/ytKERfu1D6tEQ4PuQ7+15S4+HrSzHR0i7AGVT1WRo49h4fZqxASOp7AQCupUVtPJNZDkaG9ZXy0g== +"@jest/reporters@^27.0.4": + version "27.0.4" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.4.tgz#95609b1be97afb80d55d8aa3d7c3179c15810e65" + integrity sha512-Xa90Nm3JnV0xCe4M6A10M9WuN9krb+WFKxV1A98Y4ePCw40n++r7uxFUNU7DT1i9Behj7fjrAIju9oU0t1QtCg== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/transform" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/console" "^27.0.2" + "@jest/test-result" "^27.0.2" + "@jest/transform" "^27.0.2" + "@jest/types" "^27.0.2" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -517,10 +512,10 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^27.0.1" - jest-resolve "^27.0.1" - jest-util "^27.0.1" - jest-worker "^27.0.1" + jest-haste-map "^27.0.2" + jest-resolve "^27.0.4" + jest-util "^27.0.2" + jest-worker "^27.0.2" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" @@ -536,52 +531,51 @@ graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.1.tgz#8fb97214268ea21cf8cfb83edc0f17e558b3466d" - integrity sha512-5aa+ibX2dsGSDLKaQMZb453MqjJU/CRVumebXfaJmuzuGE4qf87yQ2QZ6PEpEtBwVUEgrJCzi3jLCRaUbksSuw== +"@jest/test-result@^27.0.2": + version "27.0.2" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.2.tgz#0451049e32ceb609b636004ccc27c8fa22263f10" + integrity sha512-gcdWwL3yP5VaIadzwQtbZyZMgpmes8ryBAJp70tuxghiA8qL4imJyZex+i+USQH2H4jeLVVszhwntgdQ97fccA== dependencies: - "@jest/console" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/console" "^27.0.2" + "@jest/types" "^27.0.2" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.1.tgz#2a3b85130978fc545d8ee6c34d65ff4231dbad86" - integrity sha512-yK2c2iruJ35WgH4KH8whS72uH+FASJUrzwxzNKTzLAEWmNpWKNEPOsSEKsHynvz78bLHafrTg4adN7RrYNbEOA== +"@jest/test-sequencer@^27.0.4": + version "27.0.4" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz#976493b277594d81e589896f0ed21f198308928a" + integrity sha512-6UFEVwdmxYdyNffBxVVZxmXEdBE4riSddXYSnFNH0ELFQFk/bvagizim8WfgJTqF4EKd+j1yFxvhb8BMHfOjSQ== dependencies: - "@jest/test-result" "^27.0.1" + "@jest/test-result" "^27.0.2" graceful-fs "^4.2.4" - jest-haste-map "^27.0.1" - jest-runner "^27.0.1" - jest-runtime "^27.0.1" + jest-haste-map "^27.0.2" + jest-runtime "^27.0.4" -"@jest/transform@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.1.tgz#a9ece291f82273d5e58132550996c16edd5a902a" - integrity sha512-LC95VpT6wMnQ96dRJDlUiAnW/90zyh4+jS30szI/5AsfS0qwSlr/O4TPcGoD2WVaVMfo6KvR+brvOtGyMHaNhA== +"@jest/transform@^27.0.2": + version "27.0.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz#b073b7c589e3f4b842102468875def2bb722d6b5" + integrity sha512-H8sqKlgtDfVog/s9I4GG2XMbi4Ar7RBxjsKQDUhn2XHAi3NG+GoQwWMER+YfantzExbjNqQvqBHzo/G2pfTiPw== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" babel-plugin-istanbul "^6.0.0" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^27.0.1" + jest-haste-map "^27.0.2" jest-regex-util "^27.0.1" - jest-util "^27.0.1" + jest-util "^27.0.2" micromatch "^4.0.4" pirates "^4.0.1" slash "^3.0.0" source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.1.tgz#631738c942e70045ebbf42a3f9b433036d3845e4" - integrity sha512-8A25RRV4twZutsx2D+7WphnDsp7If9Yu6ko0Gxwrwv8BiWESFzka34+Aa2kC8w9xewt7SDuCUSZ6IiAFVj3PRg== +"@jest/types@^27.0.2": + version "27.0.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz#e153d6c46bda0f2589f0702b071f9898c7bbd37e" + integrity sha512-XpjCtJ/99HB4PmyJ2vgmN7vT+JLP7RW1FBT9RgnMFS4Dt7cvIyBee8O3/j98aUZ34ZpenPZFqmaaObWSeL65dg== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" @@ -596,6 +590,16 @@ dependencies: cross-spawn "^7.0.1" +"@malept/flatpak-bundler@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" + integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.0" + lodash "^4.17.15" + tmp-promise "^3.0.2" + "@mdn/browser-compat-data@^2.0.7": version "2.0.7" resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz#72ec37b9c1e00ce0b4e0309d753be18e2da12ee3" @@ -651,9 +655,9 @@ type-detect "4.0.8" "@sinonjs/fake-timers@^7.0.2": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.0.tgz#8f13af27d842cbf51ad4502e05562fe9391d084e" - integrity sha512-hAEzXi6Wbvlb67NnGMGSNOeAflLVnMa4yliPU/ty1qjgW/vAletH15/v/esJwASSIA0YlIyjnloenFbEZc9q9A== + version "7.1.2" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz#2524eae70c4910edccf99b2f4e6efc5894aff7b5" + integrity sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg== dependencies: "@sinonjs/commons" "^1.7.0" @@ -702,10 +706,10 @@ dependencies: "@babel/types" "^7.3.0" -"@types/chrome@^0.0.136": - version "0.0.136" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.136.tgz#7c011b9f997b0156f25a140188a0c5689d3f368f" - integrity sha512-XDEiRhLkMd+SB7Iw3ZUIj/fov3wLd4HyTdLltVszkgl1dBfc3Rb7oPMVZ2Mz2TLqnF7Ow+StbR8E7r9lqpb4DA== +"@types/chrome@^0.0.144": + version "0.0.144" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.144.tgz#7dd9188e355aa17e3ad397f50b5cd3ad12caf788" + integrity sha512-BgoiO7/KP9hRNrCR2Wq+aKWT5Dh9bTofuWaRtcqPcj8YKhZojQgb6sSdIqvds2C+eO63BwaR9KHVMYYgZdGGBg== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -732,7 +736,7 @@ resolved "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-82.0.0.tgz#4d0f5cfebd7321d2cbf0ccfb6032570f0138b958" integrity sha512-zKHePkjMx42KIUUZCPcUiyu1tpfQXH9VR4iDYfns3HvmKVJzt/TAFT+DFVroos8BI9RH78YgF3Hi/wlC6R6cKA== -"@types/fs-extra@^9.0.7": +"@types/fs-extra@^9.0.11": version "9.0.11" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz#8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87" integrity sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA== @@ -755,9 +759,9 @@ "@types/node" "*" "@types/har-format@*": - version "1.2.5" - resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.5.tgz#4f6648814d0fdcb6a510e3364a9db439a753c4b1" - integrity sha512-IG8AE1m2pWtPqQ7wXhFhy6Q59bwwnLwO36v5Rit2FrbXCIp8Sk8E2PfUCreyrdo17STwFSKDAkitVuVYbpEHvQ== + version "1.2.6" + resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.6.tgz#471c83acdf6a2ea429620daee4c6dc1784a0e85f" + integrity sha512-TeZjp4COiAWPOeGx1tuFJETr/SBMx80lxqeqnCC36ZVn463f7ElCdA3X9RzDuo3BHjhN4apw41A5uoIw5FzgWA== "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.3" @@ -772,9 +776,9 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-reports@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" - integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" + integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== dependencies: "@types/istanbul-lib-report" "*" @@ -784,14 +788,14 @@ integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "15.6.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.6.1.tgz#32d43390d5c62c5b6ec486a9bc9c59544de39a08" - integrity sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA== + version "15.12.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz#1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d" + integrity sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww== "@types/node@^14.6.2": - version "14.17.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.1.tgz#5e07e0cb2ff793aa7a1b41deae76221e6166049f" - integrity sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw== + version "14.17.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz#6d327abaa4be34a74e421ed6409a0ae2f47f4c3d" + integrity sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw== "@types/plist@^3.0.1": version "3.0.2" @@ -821,14 +825,7 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== -"@types/yargs@^15.0.13": - version "15.0.13" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" - integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== - dependencies: - "@types/yargs-parser" "*" - -"@types/yargs@^16.0.0": +"@types/yargs@^16.0.0", "@types/yargs@^16.0.1": version "16.0.3" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz#4b6d35bb8e680510a7dc2308518a80ee1ef27e01" integrity sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ== @@ -864,9 +861,9 @@ acorn@^7.1.1, acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.2.4: - version "8.2.4" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0" - integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg== + version "8.3.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.3.0.tgz#1193f9b96c4e8232f00b11a9edff81b2c8b98b88" + integrity sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw== agent-base@6: version "6.0.2" @@ -891,9 +888,9 @@ ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4: uri-js "^4.2.2" ajv@^8.0.1: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz#695528274bcb5afc865446aa275484049a18ae4b" - integrity sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ== + version "8.6.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz#60cc45d9c46a477d80d92c48076d972c342e5720" + integrity sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -961,39 +958,39 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@3.5.12: - version "3.5.12" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz#bbe174972cc1f481f73d6d92ad47a8b4c7eb4530" - integrity sha512-lQARM2AielmFoBeIo6LZigAe+58Wwe07ZWkt+wVeDxzyieNmeWjlvz/V5dKzinydwdHd+CNswN86sww46yijjA== +app-builder-bin@3.5.13: + version "3.5.13" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz#6dd7f4de34a4e408806f99b8c7d6ef1601305b7e" + integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg== -app-builder-lib@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz#24a88581c891e5b187a0d569aa44e7c4a0dc8de2" - integrity sha512-/W8nlGamJCtKlQtsMWwU9vb+cX4pTNY+rJWCuc7oXUykVSMS50W7LhQusIjCelNfymUQ1XCu6cXEY/ylqhX12A== +app-builder-lib@22.11.5: + version "22.11.5" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.5.tgz#d49f49dc2d9fd225249e4ae7e30add2996e7062f" + integrity sha512-lLEDvJuLdc4IVyADJK6t4qEIjRhOUj4p19B1RS/8pN/oAb8X5Qe1t3Einbsi4oFBJBweH2LIygnSAwumjQh9iA== dependencies: - "7zip-bin" "~5.0.3" + "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.0.4" + "@electron/universal" "1.0.5" + "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.10.5" - builder-util-runtime "8.7.3" + builder-util "22.11.5" + builder-util-runtime "8.7.6" chromium-pickle-js "^0.2.0" debug "^4.3.2" ejs "^3.1.6" - electron-publish "22.10.5" - fs-extra "^9.1.0" - hosted-git-info "^3.0.8" - is-ci "^2.0.0" - istextorbinary "^5.12.0" - js-yaml "^4.0.0" - lazy-val "^1.0.4" + electron-publish "22.11.5" + fs-extra "^10.0.0" + hosted-git-info "^4.0.2" + is-ci "^3.0.0" + isbinaryfile "^4.0.8" + js-yaml "^4.1.0" + lazy-val "^1.0.5" minimatch "^3.0.4" - normalize-package-data "^3.0.0" - read-config-file "6.0.0" + read-config-file "6.2.0" sanitize-filename "^1.6.3" - semver "^7.3.4" - temp-file "^3.3.7" + semver "^7.3.5" + temp-file "^3.4.0" archiver-utils@^2.1.0: version "2.1.0" @@ -1088,13 +1085,13 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -babel-jest@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.1.tgz#9f1c4571ac17a39e599d1325dcaf53a274261df4" - integrity sha512-aWFD7OGQjk3Y8MdZKf1XePlQvHnjMVJQjIq9WKrlAjz9by703kJ45Jxhp26JwnovoW71YYz5etuqRl8wMcIv0w== +babel-jest@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz#7dc18adb01322acce62c2af76ea2c7cd186ade37" + integrity sha512-9OThPl3/IQbo4Yul2vMz4FYwILPQak8XelX4YGowygfHaOl5R5gfjm4iVx4d8aUugkW683t8aq0A74E7b5DU1Q== dependencies: - "@jest/transform" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/transform" "^27.0.2" + "@jest/types" "^27.0.2" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.0.0" babel-preset-jest "^27.0.1" @@ -1159,11 +1156,6 @@ base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -binaryextensions@^4.15.0: - version "4.15.0" - resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-4.15.0.tgz#c63a502e0078ff1b0e9b00a9f74d3c2b0f8bd32e" - integrity sha512-MkUl3szxXolQ2scI1PM14WOT951KnaTNJ0eMKg7WzOI4kvSxyNo/Cygx4LOBNhwyINhAuSQpJW1rYD9aBSxGaw== - bl@^4.0.3: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" @@ -1186,9 +1178,9 @@ bluebird@^3.5.5: integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== boolean@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.4.tgz#aa1df8749af41d7211b66b4eee584722ff428c27" - integrity sha512-5pyOr+w2LNN72F2mAq6J0ckHUfJYSgRKma7e/wlcMMhgOLV9OI0ERhERYXxUqo+dPyVxcbXKy9n+wg13+LpNnA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.0.tgz#a245080649ebb80e7c0ea218a480e4e913136336" + integrity sha512-K6r5tvO1ykeYerI7jIyTvSFw2l6D6DzqkljGj2E2uyYAAdDo2SV4qGJIV75cHIQpTFyb6BB0BEHiDdDrFsNI+g== boxen@^5.0.0: version "5.0.1" @@ -1224,7 +1216,7 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browserslist@^4.12.2, browserslist@^4.14.5: +browserslist@^4.12.2, browserslist@^4.16.6: version "4.16.6" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== @@ -1265,33 +1257,33 @@ buffer@^5.1.0, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@8.7.3: - version "8.7.3" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz#0aaafa52d25295c939496f62231ca9ff06c30e40" - integrity sha512-1Q2ReBqFblimF5g/TLg2+0M5Xzv0Ih5LxJ/BMWXvEy/e6pQKeeEpbkPMGsN6OiQgkygaZo5VXCXIjOkOQG5EoQ== +builder-util-runtime@8.7.6: + version "8.7.6" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz#4b43c96db2bd494ced7694bcd7674934655e8324" + integrity sha512-rj9AIY7CzLSuTOXpToiaQkruYh6UEQ+kYnd5UET22ch8MGClEtIZKXHG14qEiXEr2x4EOKDMxkcTa+9TYaE+ug== dependencies: debug "^4.3.2" sax "^1.2.4" -builder-util@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz#8d0b04a3be6acc74938679aa90dcb3181b1ae86b" - integrity sha512-/MkLhmyo1gU3xMwXJxccQaRj/9tm5eTd6ZyebTf8SYouY4r3hRser+LxhOm/f8Z9W6oJvfPe0jc9TFsxYfMcsg== +builder-util@22.11.5: + version "22.11.5" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.5.tgz#08836d00e6bef39bdffd8a66fb07d2d5021b9c3c" + integrity sha512-ur9ksncYOnJg/VuJz3PdsBQHeg9tjdOC2HVj8mQ0WNcn/H3MO4tnwKBOWWikPDiWEjeBSvFUmYBnGFkRiUNkww== dependencies: - "7zip-bin" "~5.0.3" + "7zip-bin" "~5.1.1" "@types/debug" "^4.1.5" - "@types/fs-extra" "^9.0.7" - app-builder-bin "3.5.12" + "@types/fs-extra" "^9.0.11" + app-builder-bin "3.5.13" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.3" - chalk "^4.1.0" + builder-util-runtime "8.7.6" + chalk "^4.1.1" debug "^4.3.2" - fs-extra "^9.1.0" - is-ci "^2.0.0" - js-yaml "^4.0.0" + fs-extra "^10.0.0" + is-ci "^3.0.0" + js-yaml "^4.1.0" source-map-support "^0.5.19" stat-mode "^1.0.0" - temp-file "^3.3.7" + temp-file "^3.4.0" cacheable-request@^6.0.0: version "6.1.0" @@ -1322,9 +1314,9 @@ camelcase@^6.2.0: integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001219: - version "1.0.30001230" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71" - integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ== + version "1.0.30001236" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz#0a80de4cdf62e1770bb46a30d884fc8d633e3958" + integrity sha512-o0PRQSrSCGJKCPZcgMzl5fUaj5xHe8qA2m4QRvnyY4e1lITqoNkr7q/Oh1NcpGSy0Th97UZ35yoKcINPoq7YOQ== chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" @@ -1335,7 +1327,7 @@ chalk@^2.0.0, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== @@ -1359,9 +1351,9 @@ ci-info@^2.0.0: integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== ci-info@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.1.1.tgz#9a32fcefdf7bcdb6f0a7e1c0f8098ec57897b80a" - integrity sha512-kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6" + integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A== cjs-module-lexer@^1.0.0: version "1.2.1" @@ -1461,12 +1453,12 @@ commander@^5.0.0: integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== compress-commons@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz#25ec7a4528852ccd1d441a7d4353cd0ece11371b" - integrity sha512-ofaaLqfraD1YRTkrRKPCrGJ1pFeDG/MVCkVVV2FNGeWquSlqw5wOrwOfPQ1xF2u+blpeWASie5EubHz+vsNIgA== + version "4.1.1" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d" + integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ== dependencies: buffer-crc32 "^0.2.13" - crc32-stream "^4.0.1" + crc32-stream "^4.0.2" normalize-path "^3.0.0" readable-stream "^3.6.0" @@ -1486,9 +1478,9 @@ concat-stream@^1.6.2: typedarray "^0.0.6" config-chain@^1.1.11: - version "1.1.12" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" - integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== + version "1.1.13" + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" + integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== dependencies: ini "^1.3.4" proto-list "~1.2.1" @@ -1513,9 +1505,9 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: safe-buffer "~5.1.1" core-js@^3.6.5: - version "3.13.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.13.0.tgz#58ca436bf01d6903aee3d364089868d0d89fe58d" - integrity sha512-iWDbiyha1M5vFwPFmQnvRv+tJzGbFAm6XimJUT0NgHYW3xZEs1SkCAcasWSVFxpI2Xb/V1DDJckq3v90+bQnog== + version "3.14.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz#62322b98c71cc2018b027971a69419e2425c2a6c" + integrity sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1530,7 +1522,7 @@ crc-32@^1.2.0: exit-on-epipe "~1.0.1" printj "~1.1.0" -crc32-stream@^4.0.1: +crc32-stream@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007" integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w== @@ -1680,21 +1672,21 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz#65a33c106ead5a350c7de8997c546559bd6e0e7c" - integrity sha512-58FEpfH8PEFqjbUNka4bYr52snRT8+LSXrP4gy6EZWOVICbOlmTOYj988pfoLam5C5iXb3odmyUQqwWOxlsEUw== +dmg-builder@22.11.5: + version "22.11.5" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.5.tgz#0df9843def73a217097956982fa21bb4d6a5836e" + integrity sha512-91Shh9+OK9RwBlBURxvhSnQNibEh/JYNAnMOfFguyNbasSfF50Jme4b3dgsQrHTTTfkFijcvzykPPFAZofQs6g== dependencies: - app-builder-lib "22.10.5" - builder-util "22.10.5" - fs-extra "^9.1.0" + app-builder-lib "22.11.5" + builder-util "22.11.5" + builder-util-runtime "8.7.6" + fs-extra "^10.0.0" iconv-lite "^0.6.2" - js-yaml "^4.0.0" - sanitize-filename "^1.6.3" + js-yaml "^4.1.0" optionalDependencies: - dmg-license "^1.0.8" + dmg-license "^1.0.9" -dmg-license@^1.0.8: +dmg-license@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz#a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f" integrity sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q== @@ -1735,24 +1727,16 @@ dotenv-expand@^5.1.0: resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== -dotenv@^8.2.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" - integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== +dotenv@^9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" + integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= -editions@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/editions/-/editions-6.1.0.tgz#ba6c6cf9f4bb571d9e53ea34e771a602e5a66549" - integrity sha512-h6nWEyIocfgho9J3sTSuhU/WoFOu1hTX75rPBebNrbF38Y9QFDjCDizYXdikHTySW7Y3mSxli8bpDz9RAtc7rA== - dependencies: - errlop "^4.0.0" - version-range "^1.0.0" - ejs@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" @@ -1760,49 +1744,46 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz#03b156b93e6012609027c3aaa69201a3ad21e454" - integrity sha512-0q/289UUJUhRou6lZKDz/wzK6WprIQ6VXMTmaI+w9qXvSNugPC9UA5s2zXInOkjZOvO/xKnjeyiavrVSHYF3tA== - dependencies: - "@types/yargs" "^15.0.13" - app-builder-lib "22.10.5" - bluebird-lst "^1.0.9" - builder-util "22.10.5" - builder-util-runtime "8.7.3" - chalk "^4.1.0" - dmg-builder "22.10.5" - fs-extra "^9.1.0" - is-ci "^2.0.0" - lazy-val "^1.0.4" - read-config-file "6.0.0" - sanitize-filename "^1.6.3" +electron-builder@22.11.5: + version "22.11.5" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.5.tgz#914d8183e1bab7cda43ef1d67fc3d17314c7e242" + integrity sha512-QIhzrmSLNteItRvmAjwNpsya08oZeOJIrxFww/Alkjcwnrn5Xgog2qf3Xfa3ocuNUQIwb+mMzZrzqnPu0Mamyg== + dependencies: + "@types/yargs" "^16.0.1" + app-builder-lib "22.11.5" + builder-util "22.11.5" + builder-util-runtime "8.7.6" + chalk "^4.1.1" + dmg-builder "22.11.5" + fs-extra "^10.0.0" + is-ci "^3.0.0" + lazy-val "^1.0.5" + read-config-file "6.2.0" update-notifier "^5.1.0" - yargs "^16.2.0" + yargs "^17.0.1" -electron-publish@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz#9cbe46266b6c79d8c6e99840755682e2262d3543" - integrity sha512-dHyuazv3P3j1Xyv7pdwTwAvxWab2pCb0G0Oa6qWQoCc4b1/mRGY00M7AvYW1cPuUijj9zYAf1HmXfM6MifaMlA== +electron-publish@22.11.5: + version "22.11.5" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.5.tgz#2fcd3280c4267e70e4aa15003c9b7dc34923320e" + integrity sha512-peN4tEP80Kb6reuwKKvSu9p/XUWpx/7x747u5NSg7Kg2axBjzdMtX5ZqBThfPtJWJhSWZ7PEYWmNyUCfdQl2Ag== dependencies: - "@types/fs-extra" "^9.0.7" - bluebird-lst "^1.0.9" - builder-util "22.10.5" - builder-util-runtime "8.7.3" - chalk "^4.1.0" - fs-extra "^9.1.0" - lazy-val "^1.0.4" - mime "^2.5.0" + "@types/fs-extra" "^9.0.11" + builder-util "22.11.5" + builder-util-runtime "8.7.6" + chalk "^4.1.1" + fs-extra "^10.0.0" + lazy-val "^1.0.5" + mime "^2.5.2" electron-to-chromium@^1.3.723: - version "1.3.739" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz#f07756aa92cabd5a6eec6f491525a64fe62f98b9" - integrity sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A== + version "1.3.750" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz#7e5ef6f478316b0bd656af5942fe502610e97eaf" + integrity sha512-Eqy9eHNepZxJXT+Pc5++zvEi5nQ6AGikwFYDCYwXUFBr+ynJ6pDG7MzZmwGYCIuXShLJM0n4bq+aoKDmvSGJ8A== -electron@13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.0.1.tgz#7dd3666f0f966ab83a1f9868d84add2e6205d43a" - integrity sha512-ds1cf0m46nStil0jbM2r9W/p+Kprdq22+2MikIUqEu69eGl1c86IinQVrpmJ9bR4RshDSF4j3uD32a0bsHDMnQ== +electron@13.1.1: + version "13.1.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.1.tgz#de1ea908bcac2197d7a5a373fb68c0c66043e10e" + integrity sha512-kySSb5CbIkWU2Kd9mf2rpGZC9p1nWhVVNl+CJjuOUGeVPXHbojHvTkDU1iC8AvV28eik3gqHisSJss40Caprog== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2" @@ -1847,11 +1828,6 @@ env-paths@^2.2.0: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== -errlop@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/errlop/-/errlop-4.1.0.tgz#8e7b8f4f1bf0a6feafce4d14f0c0cf4bf5ef036b" - integrity sha512-vul6gGBuVt0M2TPi1/WrcL86+Hb3Q2Tpu3TME3sbVhZrYf7J1ZMHCodI25RQKCVurh56qTfvgM0p3w5cT4reSQ== - es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" @@ -1894,7 +1870,7 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-plugin-compat@^3.9.0: +eslint-plugin-compat@3.9.0: version "3.9.0" resolved "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz#a7a224e09b102b58e7f7dff52c936428ff3e0186" integrity sha512-lt3l5PHFHVEYSZ5zijcoYvtQJPsBifRiH5N0Et57KwVu7l/yxmHhSG6VJiLMa/lXrg93Qu8049RNQOMn0+yJBg== @@ -1940,13 +1916,13 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@7.27.0: - version "7.27.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.27.0.tgz#665a1506d8f95655c9274d84bd78f7166b07e9c7" - integrity sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA== +eslint@7.28.0: + version "7.28.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820" + integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.1" + "@eslint/eslintrc" "^0.4.2" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -1963,7 +1939,7 @@ eslint@7.27.0: fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" + glob-parent "^5.1.2" globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" @@ -2029,9 +2005,9 @@ esutils@^2.0.2: integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== execa@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376" - integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== dependencies: cross-spawn "^7.0.3" get-stream "^6.0.0" @@ -2053,16 +2029,16 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= -expect@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.1.tgz#1290c74fef8d62f15f4c5dd1d7233001909abbfb" - integrity sha512-hjKwLeAvKUiq0Plha1dmzOH1FGEwJC9njbT993cq4PK9r58/+3NM+WDqFVGcPuRH7XTjmbIeHQBzp2faDrPhjQ== +expect@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.2.tgz#e66ca3a4c9592f1c019fa1d46459a9d2084f3422" + integrity sha512-YJFNJe2+P2DqH+ZrXy+ydRQYO87oxRUonZImpDodR1G7qo3NYd3pL+NQ9Keqpez3cehczYwZDBC3A7xk3n7M/w== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" ansi-styles "^5.0.0" jest-get-type "^27.0.1" - jest-matcher-utils "^27.0.1" - jest-message-util "^27.0.1" + jest-matcher-utils "^27.0.2" + jest-message-util "^27.0.2" jest-regex-util "^27.0.1" extend@3.0.2: @@ -2193,7 +2169,7 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.1, fs-extra@^9.1.0: +fs-extra@^9.0.0, fs-extra@^9.0.1: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -2257,7 +2233,7 @@ get-stream@^6.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== -glob-parent@^5.0.0: +glob-parent@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -2311,17 +2287,10 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== - dependencies: - type-fest "^0.8.1" - -globals@^13.6.0: - version "13.8.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" - integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== +globals@^13.6.0, globals@^13.9.0: + version "13.9.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" + integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== dependencies: type-fest "^0.20.2" @@ -2381,14 +2350,7 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -hosted-git-info@^3.0.8: - version "3.0.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" - integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== - dependencies: - lru-cache "^6.0.0" - -hosted-git-info@^4.0.1: +hosted-git-info@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== @@ -2623,6 +2585,11 @@ isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isbinaryfile@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" + integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -2669,15 +2636,6 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -istextorbinary@^5.12.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-5.12.0.tgz#2f84777838668fdf524c305a2363d6057aaeec84" - integrity sha512-wLDRWD7qpNTYubk04+q3en1+XZGS4vYWK0+SxNSXJLaITMMEK+J3o/TlOMyULeH1qozVZ9uUkKcyMA8odyxz8w== - dependencies: - binaryextensions "^4.15.0" - editions "^6.1.0" - textextensions "^5.11.0" - jake@^10.6.1: version "10.8.2" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" @@ -2688,93 +2646,94 @@ jake@^10.6.1: filelist "^1.0.1" minimatch "^3.0.4" -jest-changed-files@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.1.tgz#b8356b3708cac9d05ebf6f9e0b32227b514945c8" - integrity sha512-Y/4AnqYNcUX/vVgfkmvSA3t7rcg+t8m3CsSGlU+ra8kjlVW5ZqXcBZY/NUew2Mo8M+dn0ApKl+FmGGT1JV5dVA== +jest-changed-files@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.2.tgz#997253042b4a032950fc5f56abf3c5d1f8560801" + integrity sha512-eMeb1Pn7w7x3wue5/vF73LPCJ7DKQuC9wQUR5ebP9hDPpk5hzcT/3Hmz3Q5BOFpR3tgbmaWhJcMTVgC8Z1NuMw== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" execa "^5.0.0" throat "^6.0.1" -jest-circus@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.1.tgz#3a7ec9e9fd60ef4c827197dffe2288aa19f86678" - integrity sha512-Tz3ytmrsgxWlTwSyPYb8StF9J2IMjLlbBMKAjhL2UU9/0ZpYb2JiEGjXaAhnGauQRbbpyFbSH3yj5HIbdurmwQ== +jest-circus@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.4.tgz#3b261514ee3b3da33def736a6352c98ff56bb6e6" + integrity sha512-QD+eblDiRphta630WRKewuASLs/oY1Zki2G4bccntRvrTHQ63ljwFR5TLduuK4Zg0ZPzW0+8o6AP7KRd1yKOjw== dependencies: - "@jest/environment" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/environment" "^27.0.3" + "@jest/test-result" "^27.0.2" + "@jest/types" "^27.0.2" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^27.0.1" + expect "^27.0.2" is-generator-fn "^2.0.0" - jest-each "^27.0.1" - jest-matcher-utils "^27.0.1" - jest-message-util "^27.0.1" - jest-runner "^27.0.1" - jest-runtime "^27.0.1" - jest-snapshot "^27.0.1" - jest-util "^27.0.1" - pretty-format "^27.0.1" + jest-each "^27.0.2" + jest-matcher-utils "^27.0.2" + jest-message-util "^27.0.2" + jest-runtime "^27.0.4" + jest-snapshot "^27.0.4" + jest-util "^27.0.2" + pretty-format "^27.0.2" + slash "^3.0.0" stack-utils "^2.0.3" throat "^6.0.1" -jest-cli@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.1.tgz#9accc8a505438571ee423438eac526a7ee4654b5" - integrity sha512-plDsQQwpkKK1SZ5L5xqMa7v/sTwB5LTIeSJqb+cV+4EMlThdUQfg8jwMfHX8jHuUc9TPGLcdoZeBuZcGGn3Rlg== +jest-cli@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.4.tgz#491b12c754c0d7c6873b13a66f26b3a80a852910" + integrity sha512-E0T+/i2lxsWAzV7LKYd0SB7HUAvePqaeIh5vX43/G5jXLhv1VzjYzJAGEkTfvxV774ll9cyE2ljcL73PVMEOXQ== dependencies: - "@jest/core" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/core" "^27.0.4" + "@jest/test-result" "^27.0.2" + "@jest/types" "^27.0.2" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" - jest-config "^27.0.1" - jest-util "^27.0.1" - jest-validate "^27.0.1" + jest-config "^27.0.4" + jest-util "^27.0.2" + jest-validate "^27.0.2" prompts "^2.0.1" yargs "^16.0.3" -jest-config@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.1.tgz#db4f202efcbb92011f62d8f25b52c3d1bd5672d4" - integrity sha512-V8O6+CZjGF0OMq4kxVR29ztV/LQqlAAcJLw7a94RndfRXkha4U84n50yZCXiPWtAHHTmb3g1y52US6rGPxA+3w== +jest-config@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.4.tgz#c4f41378acf40ca77860fb4e213b12109d87b8cf" + integrity sha512-VkQFAHWnPQefdvHU9A+G3H/Z3NrrTKqWpvxgQz3nkUdkDTWeKJE6e//BL+R7z79dXOMVksYgM/z6ndtN0hfChg== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^27.0.1" - "@jest/types" "^27.0.1" - babel-jest "^27.0.1" + "@jest/test-sequencer" "^27.0.4" + "@jest/types" "^27.0.2" + babel-jest "^27.0.2" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" is-ci "^3.0.0" - jest-circus "^27.0.1" - jest-environment-jsdom "^27.0.1" - jest-environment-node "^27.0.1" + jest-circus "^27.0.4" + jest-environment-jsdom "^27.0.3" + jest-environment-node "^27.0.3" jest-get-type "^27.0.1" - jest-jasmine2 "^27.0.1" + jest-jasmine2 "^27.0.4" jest-regex-util "^27.0.1" - jest-resolve "^27.0.1" - jest-util "^27.0.1" - jest-validate "^27.0.1" + jest-resolve "^27.0.4" + jest-runner "^27.0.4" + jest-util "^27.0.2" + jest-validate "^27.0.2" micromatch "^4.0.4" - pretty-format "^27.0.1" + pretty-format "^27.0.2" -jest-diff@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.1.tgz#021beb29fe9f07e83c809a4f7a1ce807b229c4ab" - integrity sha512-DQ3OgfJgoGWVTYo4qnYW/Jg5mpYFS2QW9BLxA8bs12ZRN1K8QPZtWeYvUPohQFs3CHX3JLTndGg3jyxdL5THFQ== +jest-diff@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.2.tgz#f315b87cee5dc134cf42c2708ab27375cc3f5a7e" + integrity sha512-BFIdRb0LqfV1hBt8crQmw6gGQHVDhM87SpMIZ45FPYKReZYG5er1+5pIn2zKqvrJp6WNox0ylR8571Iwk2Dmgw== dependencies: chalk "^4.0.0" diff-sequences "^27.0.1" jest-get-type "^27.0.1" - pretty-format "^27.0.1" + pretty-format "^27.0.2" jest-docblock@^27.0.1: version "27.0.1" @@ -2783,53 +2742,53 @@ jest-docblock@^27.0.1: dependencies: detect-newline "^3.0.0" -jest-each@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.1.tgz#37fa20b7d809b29d4349d8eb7d01f17c2feeab10" - integrity sha512-uJTK/aZ05HsdKkfXucAT5+/1DIURnTRv34OSxn1HWHrD+xu9eDX5Xgds09QSvg/mU01VS5upuHTDKG3W+r0rQA== +jest-each@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.2.tgz#865ddb4367476ced752167926b656fa0dcecd8c7" + integrity sha512-OLMBZBZ6JkoXgUenDtseFRWA43wVl2BwmZYIWQws7eS7pqsIvePqj/jJmEnfq91ALk3LNphgwNK/PRFBYi7ITQ== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" chalk "^4.0.0" jest-get-type "^27.0.1" - jest-util "^27.0.1" - pretty-format "^27.0.1" + jest-util "^27.0.2" + pretty-format "^27.0.2" -jest-environment-jsdom@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.1.tgz#12b0ed587fb53e0a581a5101bb209aef09da2310" - integrity sha512-lesU8T9zkjgLaLpUFmFDgchu6/2OCoXm52nN6UumR063Hb+1TJdI7ihgM86+G01Ay86Lyr+K/FAR6yIIOviH3Q== +jest-environment-jsdom@27.0.3, jest-environment-jsdom@^27.0.3: + version "27.0.3" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz#ed73e913ddc03864eb9f934b5cbabf1b63504e2e" + integrity sha512-5KLmgv1bhiimpSA8oGTnZYk6g4fsNyZiA/6gI2tAZUgrufd7heRUSVh4gRokzZVEj8zlwAQYT0Zs6tuJSW/ECA== dependencies: - "@jest/environment" "^27.0.1" - "@jest/fake-timers" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/environment" "^27.0.3" + "@jest/fake-timers" "^27.0.3" + "@jest/types" "^27.0.2" "@types/node" "*" - jest-mock "^27.0.1" - jest-util "^27.0.1" + jest-mock "^27.0.3" + jest-util "^27.0.2" jsdom "^16.6.0" -jest-environment-node@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.1.tgz#7d7df7ae191477a823ffb4fcc0772b4c23ec5c87" - integrity sha512-/p94lo0hx+hbKUw1opnRFUPPsjncRBEUU+2Dh7BuxX8Nr4rRiTivLYgXzo79FhaeMYV0uiV5WAbHBq6xC11JJg== +jest-environment-node@^27.0.3: + version "27.0.3" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.3.tgz#b4acb3679d2552a4215732cab8b0ca7ec4398ee0" + integrity sha512-co2/IVnIFL3cItpFULCvXFg9us4gvWXgs7mutAMPCbFhcqh56QAOdKhNzC2+RycsC/k4mbMj1VF+9F/NzA0ROg== dependencies: - "@jest/environment" "^27.0.1" - "@jest/fake-timers" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/environment" "^27.0.3" + "@jest/fake-timers" "^27.0.3" + "@jest/types" "^27.0.2" "@types/node" "*" - jest-mock "^27.0.1" - jest-util "^27.0.1" + jest-mock "^27.0.3" + jest-util "^27.0.2" jest-get-type@^27.0.1: version "27.0.1" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.1.tgz#34951e2b08c8801eb28559d7eb732b04bbcf7815" integrity sha512-9Tggo9zZbu0sHKebiAijyt1NM77Z0uO4tuWOxUCujAiSeXv30Vb5D4xVF4UR4YWNapcftj+PbByU54lKD7/xMg== -jest-haste-map@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.1.tgz#653c4ba59309a86499ad7bf663176e7f97478191" - integrity sha512-ioCuobr4z90H1Pz8+apz2vfz63387apzAoawm/9IIOndarDfRkjLURdLOe//AI5jUQmjVRg+WiL92339kqlCmA== +jest-haste-map@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz#3f1819400c671237e48b4d4b76a80a0dbed7577f" + integrity sha512-37gYfrYjjhEfk37C4bCMWAC0oPBxDpG0qpl8lYg8BT//wf353YT/fzgA7+Dq0EtM7rPFS3JEcMsxdtDwNMi2cA== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" "@types/graceful-fs" "^4.1.2" "@types/node" "*" anymatch "^3.0.3" @@ -2837,76 +2796,76 @@ jest-haste-map@^27.0.1: graceful-fs "^4.2.4" jest-regex-util "^27.0.1" jest-serializer "^27.0.1" - jest-util "^27.0.1" - jest-worker "^27.0.1" + jest-util "^27.0.2" + jest-worker "^27.0.2" micromatch "^4.0.4" walker "^1.0.7" optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.1.tgz#d975bfe072f3ac3596c0be5fc0a1215fd2e91e77" - integrity sha512-o8Ist0o970QDDm/R2o9UDbvNxq8A0++FTFQ0z9OnieJwS1nDH6H7WBDYAGPTdmnla7kbW41oLFPvhmjJE4mekg== +jest-jasmine2@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz#c669519ccf4904a485338555e1e66cad36bb0670" + integrity sha512-yj3WrjjquZwkJw+eA4c9yucHw4/+EHndHWSqgHbHGQfT94ihaaQsa009j1a0puU8CNxPDk0c1oAPeOpdJUElwA== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^27.0.1" + "@jest/environment" "^27.0.3" "@jest/source-map" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/test-result" "^27.0.2" + "@jest/types" "^27.0.2" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^27.0.1" + expect "^27.0.2" is-generator-fn "^2.0.0" - jest-each "^27.0.1" - jest-matcher-utils "^27.0.1" - jest-message-util "^27.0.1" - jest-runtime "^27.0.1" - jest-snapshot "^27.0.1" - jest-util "^27.0.1" - pretty-format "^27.0.1" + jest-each "^27.0.2" + jest-matcher-utils "^27.0.2" + jest-message-util "^27.0.2" + jest-runtime "^27.0.4" + jest-snapshot "^27.0.4" + jest-util "^27.0.2" + pretty-format "^27.0.2" throat "^6.0.1" -jest-leak-detector@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.1.tgz#eedeaee7c0ab553db4d8908f74967329624342b9" - integrity sha512-SQ/lRhfmnV3UuiaKIjwNXCaW2yh1rTMAL4n4Cl4I4gU0X2LoIc6Ogxe4UKM/J6Ld2uzc4gDGVYc5lSdpf6WjYw== +jest-leak-detector@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.2.tgz#ce19aa9dbcf7a72a9d58907a970427506f624e69" + integrity sha512-TZA3DmCOfe8YZFIMD1GxFqXUkQnIoOGQyy4hFCA2mlHtnAaf+FeOMxi0fZmfB41ZL+QbFG6BVaZF5IeFIVy53Q== dependencies: jest-get-type "^27.0.1" - pretty-format "^27.0.1" + pretty-format "^27.0.2" -jest-matcher-utils@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.1.tgz#7a01330786e370f152b0b0159f827293b6322909" - integrity sha512-NauNU+olKhPzLlsRnTOYFGk/MK5QFYl9ZzkrtfsY4eCq4SB3Bcl03UL44VdnlN5S/uFn4H2jwvRY1y6nSDTX3g== +jest-matcher-utils@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz#f14c060605a95a466cdc759acc546c6f4cbfc4f0" + integrity sha512-Qczi5xnTNjkhcIB0Yy75Txt+Ez51xdhOxsukN7awzq2auZQGPHcQrJ623PZj0ECDEMOk2soxWx05EXdXGd1CbA== dependencies: chalk "^4.0.0" - jest-diff "^27.0.1" + jest-diff "^27.0.2" jest-get-type "^27.0.1" - pretty-format "^27.0.1" + pretty-format "^27.0.2" -jest-message-util@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.1.tgz#382b7c55d8e0b1aba9eeb41d3cfdd34e451210ed" - integrity sha512-w8BfON2GwWORkos8BsxcwwQrLkV2s1ENxSRXK43+6yuquDE2hVxES/jrFqOArpP1ETVqqMmktU6iGkG8ncVzeA== +jest-message-util@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.2.tgz#181c9b67dff504d8f4ad15cba10d8b80f272048c" + integrity sha512-rTqWUX42ec2LdMkoUPOzrEd1Tcm+R1KfLOmFK+OVNo4MnLsEaxO5zPDb2BbdSmthdM/IfXxOZU60P/WbWF8BTw== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.4" micromatch "^4.0.4" - pretty-format "^27.0.1" + pretty-format "^27.0.2" slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.1.tgz#8394e297bc3dfed980961622cb51fd042b4acf5a" - integrity sha512-fXCSZQDT5hUcAUy8OBnB018x7JFOMQnz4XfpSKEbfpWzL6o5qaLRhgf2Qg2NPuVKmC/fgOf33Edj8wjF4I24CQ== +jest-mock@^27.0.3: + version "27.0.3" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.3.tgz#5591844f9192b3335c0dca38e8e45ed297d4d23d" + integrity sha512-O5FZn5XDzEp+Xg28mUz4ovVcdwBBPfAhW9+zJLO0Efn2qNbYcDaJvSlRiQ6BCZUCVOJjALicuJQI9mRFjv1o9Q== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" "@types/node" "*" jest-pnp-resolver@^1.2.2: @@ -2919,69 +2878,71 @@ jest-regex-util@^27.0.1: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz#69d4b1bf5b690faa3490113c47486ed85dd45b68" integrity sha512-6nY6QVcpTgEKQy1L41P4pr3aOddneK17kn3HJw6SdwGiKfgCGTvH02hVXL0GU8GEKtPH83eD2DIDgxHXOxVohQ== -jest-resolve-dependencies@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.1.tgz#3dcaeb277e0253747706467e8f05e1e78a1d534d" - integrity sha512-ly1x5mEf21f3IVWbUNwIz/ePLtv4QdhYuQIVSVDqxx7yzAwhhdu0DJo7UNiEYKQY7Im48wfbNdOUpo7euFUXBQ== +jest-resolve-dependencies@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz#a07a242d70d668afd3fcf7f4270755eebb1fe579" + integrity sha512-F33UPfw1YGWCV2uxJl7wD6TvcQn5IC0LtguwY3r4L7R6H4twpLkp5Q2ZfzRx9A2I3G8feiy0O0sqcn/Qoym71A== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" jest-regex-util "^27.0.1" - jest-snapshot "^27.0.1" + jest-snapshot "^27.0.4" -jest-resolve@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.1.tgz#4e1b76f61c7e2213d2fbd37342800864309de538" - integrity sha512-Q7QQ0OZ7z6D5Dul0MrsexlKalU8ZwexBfHLSu1qYPgphvUm6WO1b/xUnipU3e+uW1riDzMcJeJVYbdQ37hBHeg== +jest-resolve@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.4.tgz#8a27bc3f2f00c8ea28f3bc99bbf6f468300a703d" + integrity sha512-BcfyK2i3cG79PDb/6gB6zFeFQlcqLsQjGBqznFCpA0L/3l1L/oOsltdUjs5eISAWA9HS9qtj8v2PSZr/yWxONQ== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" chalk "^4.0.0" escalade "^3.1.1" graceful-fs "^4.2.4" jest-pnp-resolver "^1.2.2" - jest-util "^27.0.1" + jest-util "^27.0.2" + jest-validate "^27.0.2" resolve "^1.20.0" slash "^3.0.0" -jest-runner@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.1.tgz#52137173fbf318b7b1f034b81200c2846758f681" - integrity sha512-DUNizlD2D7J80G3VOrwfbtb7KYxiftMng82HNcKwTW0W3AwwNuBeq+1exoCnLO7Mxh7NP+k/1XQBlzLpjr/CnA== - dependencies: - "@jest/console" "^27.0.1" - "@jest/environment" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/transform" "^27.0.1" - "@jest/types" "^27.0.1" +jest-runner@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.4.tgz#2787170a9509b792ae129794f6944d27d5d12a4f" + integrity sha512-NfmvSYLCsCJk2AG8Ar2NAh4PhsJJpO+/r+g4bKR5L/5jFzx/indUpnVBdrfDvuqhGLLAvrKJ9FM/Nt8o1dsqxg== + dependencies: + "@jest/console" "^27.0.2" + "@jest/environment" "^27.0.3" + "@jest/test-result" "^27.0.2" + "@jest/transform" "^27.0.2" + "@jest/types" "^27.0.2" "@types/node" "*" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-config "^27.0.1" jest-docblock "^27.0.1" - jest-haste-map "^27.0.1" - jest-leak-detector "^27.0.1" - jest-message-util "^27.0.1" - jest-resolve "^27.0.1" - jest-runtime "^27.0.1" - jest-util "^27.0.1" - jest-worker "^27.0.1" + jest-environment-jsdom "^27.0.3" + jest-environment-node "^27.0.3" + jest-haste-map "^27.0.2" + jest-leak-detector "^27.0.2" + jest-message-util "^27.0.2" + jest-resolve "^27.0.4" + jest-runtime "^27.0.4" + jest-util "^27.0.2" + jest-worker "^27.0.2" source-map-support "^0.5.6" throat "^6.0.1" -jest-runtime@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.1.tgz#b71bb8ea189c50525aebb4aba6c524633ca27659" - integrity sha512-ImcrbQtpCUp8X9Rm4ky3j1GG9cqIKZJvXGZyB5cHEapGPTmg7wvvNooLmKragEe61/p/bhw1qO68Y0/9BSsBBg== +jest-runtime@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.4.tgz#2e4a6aa77cac32ac612dfe12768387a8aa15c2f0" + integrity sha512-voJB4xbAjS/qYPboV+e+gmg3jfvHJJY4CagFWBOM9dQKtlaiTjcpD2tWwla84Z7PtXSQPeIpXY0qksA9Dum29A== dependencies: - "@jest/console" "^27.0.1" - "@jest/environment" "^27.0.1" - "@jest/fake-timers" "^27.0.1" - "@jest/globals" "^27.0.1" + "@jest/console" "^27.0.2" + "@jest/environment" "^27.0.3" + "@jest/fake-timers" "^27.0.3" + "@jest/globals" "^27.0.3" "@jest/source-map" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/transform" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/test-result" "^27.0.2" + "@jest/transform" "^27.0.2" + "@jest/types" "^27.0.2" "@types/yargs" "^16.0.0" chalk "^4.0.0" cjs-module-lexer "^1.0.0" @@ -2989,14 +2950,14 @@ jest-runtime@^27.0.1: exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-haste-map "^27.0.1" - jest-message-util "^27.0.1" - jest-mock "^27.0.1" + jest-haste-map "^27.0.2" + jest-message-util "^27.0.2" + jest-mock "^27.0.3" jest-regex-util "^27.0.1" - jest-resolve "^27.0.1" - jest-snapshot "^27.0.1" - jest-util "^27.0.1" - jest-validate "^27.0.1" + jest-resolve "^27.0.4" + jest-snapshot "^27.0.4" + jest-util "^27.0.2" + jest-validate "^27.0.2" slash "^3.0.0" strip-bom "^4.0.0" yargs "^16.0.3" @@ -3009,10 +2970,10 @@ jest-serializer@^27.0.1: "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.1.tgz#01a82d901f260604908373795c9255b032d2a07a" - integrity sha512-HgKmSebDB3rswugREeh+nKrxJEVZE12K7lZ2MuwfFZT6YmiH0TlofsL2YmiLsCsG5KH5ZcLYYpF5bDrvtVx/Xg== +jest-snapshot@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.4.tgz#2b96e22ca90382b3e93bd0aae2ce4c78bf51fb5b" + integrity sha512-hnjrvpKGdSMvKfbHyaG5Kul7pDJGZvjVy0CKpzhu28MmAssDXS6GpynhXzgst1wBQoKD8c9b2VS2a5yhDLQRCA== dependencies: "@babel/core" "^7.7.2" "@babel/generator" "^7.7.2" @@ -3020,79 +2981,79 @@ jest-snapshot@^27.0.1: "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.0.0" - "@jest/transform" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/transform" "^27.0.2" + "@jest/types" "^27.0.2" "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^27.0.1" + expect "^27.0.2" graceful-fs "^4.2.4" - jest-diff "^27.0.1" + jest-diff "^27.0.2" jest-get-type "^27.0.1" - jest-haste-map "^27.0.1" - jest-matcher-utils "^27.0.1" - jest-message-util "^27.0.1" - jest-resolve "^27.0.1" - jest-util "^27.0.1" + jest-haste-map "^27.0.2" + jest-matcher-utils "^27.0.2" + jest-message-util "^27.0.2" + jest-resolve "^27.0.4" + jest-util "^27.0.2" natural-compare "^1.4.0" - pretty-format "^27.0.1" + pretty-format "^27.0.2" semver "^7.3.2" -jest-util@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.1.tgz#324ed9879d129c1e64f9169a739d6d50d7928769" - integrity sha512-lEw3waSmEOO4ZkwkUlFSvg4es1+8+LIkSGxp/kF60K0+vMR3Dv3O2HMZhcln9NHqSQzpVbsDT6OeMzUPW7DfRg== +jest-util@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz#fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7" + integrity sha512-1d9uH3a00OFGGWSibpNYr+jojZ6AckOMCXV2Z4K3YXDnzpkAaXQyIpY14FOJPiUmil7CD+A6Qs+lnnh6ctRbIA== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" "@types/node" "*" chalk "^4.0.0" graceful-fs "^4.2.4" is-ci "^3.0.0" picomatch "^2.2.3" -jest-validate@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.1.tgz#8e43428674b6097f8ee3abe42c4248a4826cd008" - integrity sha512-zvmPRcfTkqTZuHveIKAI2nbkUc3SDXjWVJULknPLGF5bdxOGSeGZg7f/Uw0MUVOkCOaspcHnsPCgZG0pqmg71g== +jest-validate@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.2.tgz#7fe2c100089449cd5cbb47a5b0b6cb7cda5beee5" + integrity sha512-UgBF6/oVu1ofd1XbaSotXKihi8nZhg0Prm8twQ9uCuAfo59vlxCXMPI/RKmrZEVgi3Nd9dS0I8A0wzWU48pOvg== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" camelcase "^6.2.0" chalk "^4.0.0" jest-get-type "^27.0.1" leven "^3.1.0" - pretty-format "^27.0.1" + pretty-format "^27.0.2" -jest-watcher@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.1.tgz#61b9403d7b498161f6aa6124602363525ac3efc2" - integrity sha512-Chp9c02BN0IgEbtGreyAhGqIsOrn9a0XnzbuXOxdW1+cW0Tjh12hMzHDIdLFHpYP/TqaMTmPHaJ5KWvpCCrNFw== +jest-watcher@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.2.tgz#dab5f9443e2d7f52597186480731a8c6335c5deb" + integrity sha512-8nuf0PGuTxWj/Ytfw5fyvNn/R80iXY8QhIT0ofyImUvdnoaBdT6kob0GmhXR+wO+ALYVnh8bQxN4Tjfez0JgkA== dependencies: - "@jest/test-result" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/test-result" "^27.0.2" + "@jest/types" "^27.0.2" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^27.0.1" + jest-util "^27.0.2" string-length "^4.0.1" -jest-worker@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.1.tgz#b255fcbb40fb467295010c628474b1185cab4f9e" - integrity sha512-NhHqClI3owOjmS8dBhQMKHZ2rrT0sBTpqGitp9nMX5AAjVXd+15o4v96uBEMhoywaLKN+5opcKBlXwAoADZolA== +jest-worker@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz#4ebeb56cef48b3e7514552f80d0d80c0129f0b05" + integrity sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg== dependencies: "@types/node" "*" merge-stream "^2.0.0" supports-color "^8.0.0" -jest@27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.1.tgz#d3822f0904f3bbe884bea393cede2be2aa290d0e" - integrity sha512-lFEoUdXjbGAIxk/gZhcv98xOaH1hjqG5R/PQHs5GBfIK5iL3tnXCjHQf4HQLVZZ2rcXML3oeVg9+XrRZbooBdQ== +jest@27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.4.tgz#91d4d564b36bcf93b98dac1ab19f07089e670f53" + integrity sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA== dependencies: - "@jest/core" "^27.0.1" + "@jest/core" "^27.0.4" import-local "^3.0.2" - jest-cli "^27.0.1" + jest-cli "^27.0.4" js-tokens@^4.0.0: version "4.0.0" @@ -3107,7 +3068,7 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@^4.0.0: +js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== @@ -3177,7 +3138,7 @@ json-stringify-safe@^5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json5@^2.1.2: +json5@^2.1.2, json5@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== @@ -3219,7 +3180,7 @@ latest-version@^5.1.0: dependencies: package-json "^6.3.0" -lazy-val@^1.0.4: +lazy-val@^1.0.4, lazy-val@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== @@ -3304,7 +3265,7 @@ lodash.union@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= -lodash@^4.17.10, lodash@^4.7.0: +lodash@^4.17.10, lodash@^4.17.15, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -3360,19 +3321,19 @@ micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.47.0: - version "1.47.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" - integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== +mime-db@1.48.0: + version "1.48.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" + integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== mime-types@^2.1.12: - version "2.1.30" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" - integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== + version "2.1.31" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" + integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== dependencies: - mime-db "1.47.0" + mime-db "1.48.0" -mime@^2.5.0: +mime@^2.5.2: version "2.5.2" resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== @@ -3437,19 +3398,9 @@ node-modules-regexp@^1.0.0: integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= node-releases@^1.1.71: - version "1.1.72" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe" - integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw== - -normalize-package-data@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699" - integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg== - dependencies: - hosted-git-info "^4.0.1" - resolve "^1.20.0" - semver "^7.3.4" - validate-npm-package-license "^3.0.1" + version "1.1.73" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20" + integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg== normalize-path@^3.0.0: version "3.0.0" @@ -3648,12 +3599,12 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -pretty-format@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.1.tgz#c4094621dfbd3e8ab751964d1cf01edc6f88474d" - integrity sha512-qE+0J6c/gd+R6XTcQgPJMc5hMJNsxzSF5p8iZSbMZ7GQzYGlSLNkh2P80Wa2dbF4gEVUsJEgcrBY+1L2/j265w== +pretty-format@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.2.tgz#9283ff8c4f581b186b2d4da461617143dca478a4" + integrity sha512-mXKbbBPnYTG7Yra9qFBtqj+IXcsvxsvOBco3QHxtxTl+hHKq6QdzMZ+q0CtL4ORHZgwGImRr2XZUX2EWzORxig== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" ansi-regex "^5.0.0" ansi-styles "^5.0.0" react-is "^17.0.1" @@ -3726,15 +3677,15 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -read-config-file@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299" - integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA== +read-config-file@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" + integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== dependencies: - dotenv "^8.2.0" + dotenv "^9.0.2" dotenv-expand "^5.1.0" - js-yaml "^3.13.1" - json5 "^2.1.2" + js-yaml "^4.1.0" + json5 "^2.2.0" lazy-val "^1.0.4" readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.2.2: @@ -3907,7 +3858,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: +semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== @@ -3992,32 +3943,6 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== -spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" - integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== - sprintf-js@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" @@ -4193,7 +4118,7 @@ tar-stream@^2.2.0: inherits "^2.0.3" readable-stream "^3.1.1" -temp-file@^3.3.7: +temp-file@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== @@ -4223,27 +4148,36 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -textextensions@^5.11.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-5.12.0.tgz#b908120b5c1bd4bb9eba41423d75b176011ab68a" - integrity sha512-IYogUDaP65IXboCiPPC0jTLLBzYlhhw2Y4b0a2trPgbHNGGGEfuHE6tds+yDcCf4mpNDaGISFzwSSezcXt+d6w== - throat@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== -tldts-core@^5.7.37: - version "5.7.37" - resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.37.tgz#29f34676d2de7dfaae6b13ee8d5cd3c5a6ce6396" - integrity sha512-6sA9WzrPDCB596urfENoRpzA4RWVyo5u45dBSXtWfBtcxBYsCdkykc0Z9lFFd3B89PAd/f5Sb91nTGFZJqPFsQ== +tldts-core@^5.7.38: + version "5.7.38" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.38.tgz#779092c90941803fb682c3d7094a88f12aad4508" + integrity sha512-mcL16YTXjpVJ+ekoKC/ddvdjGNMg8HkdWQNp3WNz26WJMV7Z2Hjr1IPwYYr9W3LxGdXV7mmg21Zk2vSstiSsFg== tldts-experimental@^5.6.21: - version "5.7.37" - resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.37.tgz#ead49d7dea3b08341ef17c9a03e23717c006407e" - integrity sha512-LRms28QMSWZh+XH1hg9lEzc6JW/zjb1cHZHyJ5webutbLzJNpqgUSdAykwBkOlFlXR+4jCvHkxA7gC2mgPb8Cw== + version "5.7.38" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.38.tgz#a2b03ae0282ee7439b1ed1618a1d7d2e9e66be78" + integrity sha512-3L0yML53LSw3tlRPwHcGOf35l3dhZx/3DgPGWL3ILATnuu76OiAOvJ4Xw1Znl6sIxVKJ4B4BE0zroZMMzsHg/A== + dependencies: + tldts-core "^5.7.38" + +tmp-promise@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.2.tgz#6e933782abff8b00c3119d63589ca1fb9caaa62a" + integrity sha512-OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA== dependencies: - tldts-core "^5.7.37" + tmp "^0.2.0" + +tmp@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== + dependencies: + rimraf "^3.0.0" tmpl@1.0.x: version "1.0.4" @@ -4276,7 +4210,7 @@ tough-cookie@^4.0.0: punycode "^2.1.1" universalify "^0.1.2" -tr46@^2.0.2: +tr46@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== @@ -4329,11 +4263,6 @@ type-fest@^0.21.3: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - typedarray-to-buffer@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" @@ -4421,14 +4350,6 @@ v8-to-istanbul@^7.0.0: convert-source-map "^1.6.0" source-map "^0.7.3" -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - verror@^1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" @@ -4438,18 +4359,6 @@ verror@^1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -version-compare@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/version-compare/-/version-compare-1.1.0.tgz#7b3e67e7e6cec5c72d9c9e586f8854e419ade17c" - integrity sha512-zVKtPOJTC9x23lzS4+4D7J+drq80BXVYAmObnr5zqxxFVH7OffJ1lJlAS7LYsQNV56jx/wtbw0UV7XHLrvd6kQ== - -version-range@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/version-range/-/version-range-1.1.0.tgz#1c233064202ee742afc9d56e21da3b2e15260acf" - integrity sha512-R1Ggfg2EXamrnrV3TkZ6yBNgITDbclB3viwSjbZ3+eK0VVNK4ajkYJTnDz5N0bIMYDtK9MUBvXJUnKO5RWWJ6w== - dependencies: - version-compare "^1.0.0" - w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -4494,12 +4403,12 @@ whatwg-mimetype@^2.3.0: integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== whatwg-url@^8.0.0, whatwg-url@^8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3" - integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg== + version "8.6.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz#27c0205a4902084b872aecb97cf0f2a7a3011f4c" + integrity sha512-os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw== dependencies: lodash "^4.7.0" - tr46 "^2.0.2" + tr46 "^2.1.0" webidl-conversions "^6.1.0" which@^2.0.1: @@ -4595,7 +4504,7 @@ yargs-parser@^20.2.2: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== -yargs@^16.0.3, yargs@^16.2.0: +yargs@^16.0.3: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== @@ -4608,6 +4517,19 @@ yargs@^16.0.3, yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" +yargs@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb" + integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index 3e85c5d1bbf..11cf84050d0 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -10,14 +10,6 @@ }; } { - name = "7zip_bin___7zip_bin_5.0.3.tgz"; - path = fetchurl { - name = "7zip_bin___7zip_bin_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz"; - sha1 = "bc5b5532ecafd923a61f2fb097e3b108c0106a3f"; - }; - } - { name = "_babel_code_frame___code_frame_7.12.11.tgz"; path = fetchurl { name = "_babel_code_frame___code_frame_7.12.11.tgz"; @@ -34,11 +26,11 @@ }; } { - name = "_babel_compat_data___compat_data_7.14.0.tgz"; + name = "_babel_compat_data___compat_data_7.14.4.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz"; - sha1 = "a901128bce2ad02565df95e6ecbf195cf9465919"; + name = "_babel_compat_data___compat_data_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz"; + sha1 = "45720fe0cecf3fd42019e1d12cc3d27fadc98d58"; }; } { @@ -58,11 +50,11 @@ }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; - sha1 = "6e91dccf15e3f43e5556dffe32d860109887563c"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz"; + sha1 = "33ebd0ffc34248051ee2089350a929ab02f2a516"; }; } { @@ -122,11 +114,11 @@ }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz"; - sha1 = "ca17b318b859d107f0e9b722d58cf12d94436600"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz"; + sha1 = "b2ab16875deecfff3ddfcd539bc315f72998d836"; }; } { @@ -178,11 +170,11 @@ }; } { - name = "_babel_parser___parser_7.14.3.tgz"; + name = "_babel_parser___parser_7.14.4.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz"; - sha1 = "9b530eecb071fd0c93519df25c5ff9f14759f298"; + name = "_babel_parser___parser_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz"; + sha1 = "a5c560d6db6cd8e6ed342368dea8039232cbab18"; }; } { @@ -306,11 +298,11 @@ }; } { - name = "_babel_types___types_7.14.2.tgz"; + name = "_babel_types___types_7.14.4.tgz"; path = fetchurl { - name = "_babel_types___types_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz"; - sha1 = "4208ae003107ef8a057ea8333e56eb64d2f6a2c3"; + name = "_babel_types___types_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz"; + sha1 = "bfd6980108168593b38b3eb48a24aa026b919bc0"; }; } { @@ -322,43 +314,43 @@ }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.20.6.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.22.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker_content___adblocker_content_1.20.6.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.6.tgz"; - sha1 = "1bfbdb1e5757fc610f3d5d9921bba9d166d687a7"; + name = "_cliqz_adblocker_content___adblocker_content_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.1.tgz"; + sha1 = "71bc0d0d473ae96d5086badb2f4d624769fa56c4"; }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.6.tgz"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.6.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.6.tgz"; - sha1 = "c2804edb8c4dd5ce226a2a5ef95b9e6cd3745767"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz"; + sha1 = "8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af"; }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.20.6.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.20.6.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.6.tgz"; - sha1 = "870ff1ba7765f545fee70327d3c7e08adadc7764"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz"; + sha1 = "13fe6de4be0c3beb2851634b27ea1223d10ca92b"; }; } { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.6.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.6.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.6.tgz"; - sha1 = "964d3b96e419778c6e4c8ecf5c2b94599dfbdcd7"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.1.tgz"; + sha1 = "234ee70a1736e3690b25a7a073818f5a851bf9a8"; }; } { - name = "_cliqz_adblocker___adblocker_1.20.6.tgz"; + name = "_cliqz_adblocker___adblocker_1.22.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker___adblocker_1.20.6.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.6.tgz"; - sha1 = "3428d3c066dbaafa98644fadfd28dd206f8691e2"; + name = "_cliqz_adblocker___adblocker_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.1.tgz"; + sha1 = "dae3dd6c59f16244012d1e736150f618b2d578e6"; }; } { @@ -378,19 +370,19 @@ }; } { - name = "_electron_universal___universal_1.0.4.tgz"; + name = "_electron_universal___universal_1.0.5.tgz"; path = fetchurl { - name = "_electron_universal___universal_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.4.tgz"; - sha1 = "231ac246c39d45b80e159bd21c3f9027dcaa10f5"; + name = "_electron_universal___universal_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz"; + sha1 = "b812340e4ef21da2b3ee77b2b4d35c9b86defe37"; }; } { - name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; - sha1 = "442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"; + name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz"; + sha1 = "f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"; }; } { @@ -410,51 +402,51 @@ }; } { - name = "_jest_console___console_27.0.1.tgz"; + name = "_jest_console___console_27.0.2.tgz"; path = fetchurl { - name = "_jest_console___console_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/console/-/console-27.0.1.tgz"; - sha1 = "c6acfec201f9b6823596eb6c4fcd77c89a8b27e9"; + name = "_jest_console___console_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-27.0.2.tgz"; + sha1 = "b8eeff8f21ac51d224c851e1729d2630c18631e6"; }; } { - name = "_jest_core___core_27.0.1.tgz"; + name = "_jest_core___core_27.0.4.tgz"; path = fetchurl { - name = "_jest_core___core_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/core/-/core-27.0.1.tgz"; - sha1 = "88d0ff55f465fe1fc3a940718e8cf0fea242be4b"; + name = "_jest_core___core_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-27.0.4.tgz"; + sha1 = "679bf9ac07900da2ddbb9667bb1afa8029038f53"; }; } { - name = "_jest_environment___environment_27.0.1.tgz"; + name = "_jest_environment___environment_27.0.3.tgz"; path = fetchurl { - name = "_jest_environment___environment_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.1.tgz"; - sha1 = "27ed89bf8179c0a030690f063d922d6da7a519ac"; + name = "_jest_environment___environment_27.0.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.3.tgz"; + sha1 = "68769b1dfdd213e3456169d64fbe9bd63a5fda92"; }; } { - name = "_jest_fake_timers___fake_timers_27.0.1.tgz"; + name = "_jest_fake_timers___fake_timers_27.0.3.tgz"; path = fetchurl { - name = "_jest_fake_timers___fake_timers_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.1.tgz"; - sha1 = "6987a596b0bcf8c07653086076c17058b4c77b5c"; + name = "_jest_fake_timers___fake_timers_27.0.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.3.tgz"; + sha1 = "9899ba6304cc636734c74478df502e18136461dd"; }; } { - name = "_jest_globals___globals_27.0.1.tgz"; + name = "_jest_globals___globals_27.0.3.tgz"; path = fetchurl { - name = "_jest_globals___globals_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.1.tgz"; - sha1 = "14c776942f7047a04f2aea09b148065e2aa9d7e9"; + name = "_jest_globals___globals_27.0.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.3.tgz"; + sha1 = "1cf8933b7791bba0b99305cbf39fd4d2e3fe4060"; }; } { - name = "_jest_reporters___reporters_27.0.1.tgz"; + name = "_jest_reporters___reporters_27.0.4.tgz"; path = fetchurl { - name = "_jest_reporters___reporters_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.1.tgz"; - sha1 = "5b491f64e37c9b97b13e564f18f36b6697d28045"; + name = "_jest_reporters___reporters_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.4.tgz"; + sha1 = "95609b1be97afb80d55d8aa3d7c3179c15810e65"; }; } { @@ -466,35 +458,35 @@ }; } { - name = "_jest_test_result___test_result_27.0.1.tgz"; + name = "_jest_test_result___test_result_27.0.2.tgz"; path = fetchurl { - name = "_jest_test_result___test_result_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.1.tgz"; - sha1 = "8fb97214268ea21cf8cfb83edc0f17e558b3466d"; + name = "_jest_test_result___test_result_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.2.tgz"; + sha1 = "0451049e32ceb609b636004ccc27c8fa22263f10"; }; } { - name = "_jest_test_sequencer___test_sequencer_27.0.1.tgz"; + name = "_jest_test_sequencer___test_sequencer_27.0.4.tgz"; path = fetchurl { - name = "_jest_test_sequencer___test_sequencer_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.1.tgz"; - sha1 = "2a3b85130978fc545d8ee6c34d65ff4231dbad86"; + name = "_jest_test_sequencer___test_sequencer_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz"; + sha1 = "976493b277594d81e589896f0ed21f198308928a"; }; } { - name = "_jest_transform___transform_27.0.1.tgz"; + name = "_jest_transform___transform_27.0.2.tgz"; path = fetchurl { - name = "_jest_transform___transform_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.1.tgz"; - sha1 = "a9ece291f82273d5e58132550996c16edd5a902a"; + name = "_jest_transform___transform_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz"; + sha1 = "b073b7c589e3f4b842102468875def2bb722d6b5"; }; } { - name = "_jest_types___types_27.0.1.tgz"; + name = "_jest_types___types_27.0.2.tgz"; path = fetchurl { - name = "_jest_types___types_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.1.tgz"; - sha1 = "631738c942e70045ebbf42a3f9b433036d3845e4"; + name = "_jest_types___types_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz"; + sha1 = "e153d6c46bda0f2589f0702b071f9898c7bbd37e"; }; } { @@ -506,6 +498,14 @@ }; } { + name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; + path = fetchurl { + name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz"; + sha1 = "e8a32c30a95d20c2b1bb635cc580981a06389858"; + }; + } + { name = "_mdn_browser_compat_data___browser_compat_data_2.0.7.tgz"; path = fetchurl { name = "_mdn_browser_compat_data___browser_compat_data_2.0.7.tgz"; @@ -578,11 +578,11 @@ }; } { - name = "_sinonjs_fake_timers___fake_timers_7.1.0.tgz"; + name = "_sinonjs_fake_timers___fake_timers_7.1.2.tgz"; path = fetchurl { - name = "_sinonjs_fake_timers___fake_timers_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.0.tgz"; - sha1 = "8f13af27d842cbf51ad4502e05562fe9391d084e"; + name = "_sinonjs_fake_timers___fake_timers_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz"; + sha1 = "2524eae70c4910edccf99b2f4e6efc5894aff7b5"; }; } { @@ -634,11 +634,11 @@ }; } { - name = "_types_chrome___chrome_0.0.136.tgz"; + name = "_types_chrome___chrome_0.0.144.tgz"; path = fetchurl { - name = "_types_chrome___chrome_0.0.136.tgz"; - url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.136.tgz"; - sha1 = "7c011b9f997b0156f25a140188a0c5689d3f368f"; + name = "_types_chrome___chrome_0.0.144.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.144.tgz"; + sha1 = "7dd9188e355aa17e3ad397f50b5cd3ad12caf788"; }; } { @@ -698,11 +698,11 @@ }; } { - name = "_types_har_format___har_format_1.2.5.tgz"; + name = "_types_har_format___har_format_1.2.6.tgz"; path = fetchurl { - name = "_types_har_format___har_format_1.2.5.tgz"; - url = "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.5.tgz"; - sha1 = "4f6648814d0fdcb6a510e3364a9db439a753c4b1"; + name = "_types_har_format___har_format_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.6.tgz"; + sha1 = "471c83acdf6a2ea429620daee4c6dc1784a0e85f"; }; } { @@ -722,11 +722,11 @@ }; } { - name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; + name = "_types_istanbul_reports___istanbul_reports_3.0.1.tgz"; path = fetchurl { - name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; - sha1 = "508b13aa344fa4976234e75dddcc34925737d821"; + name = "_types_istanbul_reports___istanbul_reports_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz"; + sha1 = "9153fe98bba2bd565a63add9436d6f0d7f8468ff"; }; } { @@ -738,19 +738,19 @@ }; } { - name = "_types_node___node_15.6.1.tgz"; + name = "_types_node___node_15.12.2.tgz"; path = fetchurl { - name = "_types_node___node_15.6.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.6.1.tgz"; - sha1 = "32d43390d5c62c5b6ec486a9bc9c59544de39a08"; + name = "_types_node___node_15.12.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz"; + sha1 = "1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d"; }; } { - name = "_types_node___node_14.17.1.tgz"; + name = "_types_node___node_14.17.3.tgz"; path = fetchurl { - name = "_types_node___node_14.17.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.1.tgz"; - sha1 = "5e07e0cb2ff793aa7a1b41deae76221e6166049f"; + name = "_types_node___node_14.17.3.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz"; + sha1 = "6d327abaa4be34a74e421ed6409a0ae2f47f4c3d"; }; } { @@ -794,14 +794,6 @@ }; } { - name = "_types_yargs___yargs_15.0.13.tgz"; - path = fetchurl { - name = "_types_yargs___yargs_15.0.13.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz"; - sha1 = "34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"; - }; - } - { name = "_types_yargs___yargs_16.0.3.tgz"; path = fetchurl { name = "_types_yargs___yargs_16.0.3.tgz"; @@ -850,11 +842,11 @@ }; } { - name = "acorn___acorn_8.2.4.tgz"; + name = "acorn___acorn_8.3.0.tgz"; path = fetchurl { - name = "acorn___acorn_8.2.4.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz"; - sha1 = "caba24b08185c3b56e3168e97d15ed17f4d31fd0"; + name = "acorn___acorn_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.3.0.tgz"; + sha1 = "1193f9b96c4e8232f00b11a9edff81b2c8b98b88"; }; } { @@ -882,11 +874,11 @@ }; } { - name = "ajv___ajv_8.5.0.tgz"; + name = "ajv___ajv_8.6.0.tgz"; path = fetchurl { - name = "ajv___ajv_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz"; - sha1 = "695528274bcb5afc865446aa275484049a18ae4b"; + name = "ajv___ajv_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz"; + sha1 = "60cc45d9c46a477d80d92c48076d972c342e5720"; }; } { @@ -970,19 +962,19 @@ }; } { - name = "app_builder_bin___app_builder_bin_3.5.12.tgz"; + name = "app_builder_bin___app_builder_bin_3.5.13.tgz"; path = fetchurl { - name = "app_builder_bin___app_builder_bin_3.5.12.tgz"; - url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz"; - sha1 = "bbe174972cc1f481f73d6d92ad47a8b4c7eb4530"; + name = "app_builder_bin___app_builder_bin_3.5.13.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz"; + sha1 = "6dd7f4de34a4e408806f99b8c7d6ef1601305b7e"; }; } { - name = "app_builder_lib___app_builder_lib_22.10.5.tgz"; + name = "app_builder_lib___app_builder_lib_22.11.5.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.10.5.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz"; - sha1 = "24a88581c891e5b187a0d569aa44e7c4a0dc8de2"; + name = "app_builder_lib___app_builder_lib_22.11.5.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.5.tgz"; + sha1 = "d49f49dc2d9fd225249e4ae7e30add2996e7062f"; }; } { @@ -1090,11 +1082,11 @@ }; } { - name = "babel_jest___babel_jest_27.0.1.tgz"; + name = "babel_jest___babel_jest_27.0.2.tgz"; path = fetchurl { - name = "babel_jest___babel_jest_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.1.tgz"; - sha1 = "9f1c4571ac17a39e599d1325dcaf53a274261df4"; + name = "babel_jest___babel_jest_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz"; + sha1 = "7dc18adb01322acce62c2af76ea2c7cd186ade37"; }; } { @@ -1146,14 +1138,6 @@ }; } { - name = "binaryextensions___binaryextensions_4.15.0.tgz"; - path = fetchurl { - name = "binaryextensions___binaryextensions_4.15.0.tgz"; - url = "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-4.15.0.tgz"; - sha1 = "c63a502e0078ff1b0e9b00a9f74d3c2b0f8bd32e"; - }; - } - { name = "bl___bl_4.1.0.tgz"; path = fetchurl { name = "bl___bl_4.1.0.tgz"; @@ -1178,11 +1162,11 @@ }; } { - name = "boolean___boolean_3.0.4.tgz"; + name = "boolean___boolean_3.1.0.tgz"; path = fetchurl { - name = "boolean___boolean_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.0.4.tgz"; - sha1 = "aa1df8749af41d7211b66b4eee584722ff428c27"; + name = "boolean___boolean_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.0.tgz"; + sha1 = "a245080649ebb80e7c0ea218a480e4e913136336"; }; } { @@ -1266,19 +1250,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_8.7.3.tgz"; + name = "builder_util_runtime___builder_util_runtime_8.7.6.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_8.7.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz"; - sha1 = "0aaafa52d25295c939496f62231ca9ff06c30e40"; + name = "builder_util_runtime___builder_util_runtime_8.7.6.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz"; + sha1 = "4b43c96db2bd494ced7694bcd7674934655e8324"; }; } { - name = "builder_util___builder_util_22.10.5.tgz"; + name = "builder_util___builder_util_22.11.5.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.10.5.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz"; - sha1 = "8d0b04a3be6acc74938679aa90dcb3181b1ae86b"; + name = "builder_util___builder_util_22.11.5.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.5.tgz"; + sha1 = "08836d00e6bef39bdffd8a66fb07d2d5021b9c3c"; }; } { @@ -1314,11 +1298,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001230.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001236.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001230.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz"; - sha1 = "8135c57459854b2240b57a4a6786044bdc5a9f71"; + name = "caniuse_lite___caniuse_lite_1.0.30001236.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz"; + sha1 = "0a80de4cdf62e1770bb46a30d884fc8d633e3958"; }; } { @@ -1362,11 +1346,11 @@ }; } { - name = "ci_info___ci_info_3.1.1.tgz"; + name = "ci_info___ci_info_3.2.0.tgz"; path = fetchurl { - name = "ci_info___ci_info_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.1.1.tgz"; - sha1 = "9a32fcefdf7bcdb6f0a7e1c0f8098ec57897b80a"; + name = "ci_info___ci_info_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz"; + sha1 = "2876cb948a498797b5236f0095bc057d0dca38b6"; }; } { @@ -1498,11 +1482,11 @@ }; } { - name = "compress_commons___compress_commons_4.1.0.tgz"; + name = "compress_commons___compress_commons_4.1.1.tgz"; path = fetchurl { - name = "compress_commons___compress_commons_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz"; - sha1 = "25ec7a4528852ccd1d441a7d4353cd0ece11371b"; + name = "compress_commons___compress_commons_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz"; + sha1 = "df2a09a7ed17447642bad10a85cc9a19e5c42a7d"; }; } { @@ -1522,11 +1506,11 @@ }; } { - name = "config_chain___config_chain_1.1.12.tgz"; + name = "config_chain___config_chain_1.1.13.tgz"; path = fetchurl { - name = "config_chain___config_chain_1.1.12.tgz"; - url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz"; - sha1 = "0fde8d091200eb5e808caf25fe618c02f48e4efa"; + name = "config_chain___config_chain_1.1.13.tgz"; + url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; + sha1 = "fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"; }; } { @@ -1546,11 +1530,11 @@ }; } { - name = "core_js___core_js_3.13.0.tgz"; + name = "core_js___core_js_3.14.0.tgz"; path = fetchurl { - name = "core_js___core_js_3.13.0.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.13.0.tgz"; - sha1 = "58ca436bf01d6903aee3d364089868d0d89fe58d"; + name = "core_js___core_js_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz"; + sha1 = "62322b98c71cc2018b027971a69419e2425c2a6c"; }; } { @@ -1762,11 +1746,11 @@ }; } { - name = "dmg_builder___dmg_builder_22.10.5.tgz"; + name = "dmg_builder___dmg_builder_22.11.5.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.10.5.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz"; - sha1 = "65a33c106ead5a350c7de8997c546559bd6e0e7c"; + name = "dmg_builder___dmg_builder_22.11.5.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.5.tgz"; + sha1 = "0df9843def73a217097956982fa21bb4d6a5836e"; }; } { @@ -1810,11 +1794,11 @@ }; } { - name = "dotenv___dotenv_8.6.0.tgz"; + name = "dotenv___dotenv_9.0.2.tgz"; path = fetchurl { - name = "dotenv___dotenv_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz"; - sha1 = "061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"; + name = "dotenv___dotenv_9.0.2.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; + sha1 = "dacc20160935a37dea6364aa1bef819fb9b6ab05"; }; } { @@ -1826,14 +1810,6 @@ }; } { - name = "editions___editions_6.1.0.tgz"; - path = fetchurl { - name = "editions___editions_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/editions/-/editions-6.1.0.tgz"; - sha1 = "ba6c6cf9f4bb571d9e53ea34e771a602e5a66549"; - }; - } - { name = "ejs___ejs_3.1.6.tgz"; path = fetchurl { name = "ejs___ejs_3.1.6.tgz"; @@ -1842,35 +1818,35 @@ }; } { - name = "electron_builder___electron_builder_22.10.5.tgz"; + name = "electron_builder___electron_builder_22.11.5.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.10.5.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz"; - sha1 = "03b156b93e6012609027c3aaa69201a3ad21e454"; + name = "electron_builder___electron_builder_22.11.5.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.5.tgz"; + sha1 = "914d8183e1bab7cda43ef1d67fc3d17314c7e242"; }; } { - name = "electron_publish___electron_publish_22.10.5.tgz"; + name = "electron_publish___electron_publish_22.11.5.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.10.5.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz"; - sha1 = "9cbe46266b6c79d8c6e99840755682e2262d3543"; + name = "electron_publish___electron_publish_22.11.5.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.5.tgz"; + sha1 = "2fcd3280c4267e70e4aa15003c9b7dc34923320e"; }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.739.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.750.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.739.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz"; - sha1 = "f07756aa92cabd5a6eec6f491525a64fe62f98b9"; + name = "electron_to_chromium___electron_to_chromium_1.3.750.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz"; + sha1 = "7e5ef6f478316b0bd656af5942fe502610e97eaf"; }; } { - name = "electron___electron_13.0.1.tgz"; + name = "electron___electron_13.1.1.tgz"; path = fetchurl { - name = "electron___electron_13.0.1.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.0.1.tgz"; - sha1 = "7dd3666f0f966ab83a1f9868d84add2e6205d43a"; + name = "electron___electron_13.1.1.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.1.1.tgz"; + sha1 = "de1ea908bcac2197d7a5a373fb68c0c66043e10e"; }; } { @@ -1930,14 +1906,6 @@ }; } { - name = "errlop___errlop_4.1.0.tgz"; - path = fetchurl { - name = "errlop___errlop_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/errlop/-/errlop-4.1.0.tgz"; - sha1 = "8e7b8f4f1bf0a6feafce4d14f0c0cf4bf5ef036b"; - }; - } - { name = "es6_error___es6_error_4.1.1.tgz"; path = fetchurl { name = "es6_error___es6_error_4.1.1.tgz"; @@ -2042,11 +2010,11 @@ }; } { - name = "eslint___eslint_7.27.0.tgz"; + name = "eslint___eslint_7.28.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.27.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.27.0.tgz"; - sha1 = "665a1506d8f95655c9274d84bd78f7166b07e9c7"; + name = "eslint___eslint_7.28.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz"; + sha1 = "435aa17a0b82c13bb2be9d51408b617e49c1e820"; }; } { @@ -2106,11 +2074,11 @@ }; } { - name = "execa___execa_5.0.0.tgz"; + name = "execa___execa_5.1.1.tgz"; path = fetchurl { - name = "execa___execa_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz"; - sha1 = "4029b0007998a841fbd1032e5f4de86a3c1e3376"; + name = "execa___execa_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz"; + sha1 = "f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"; }; } { @@ -2130,11 +2098,11 @@ }; } { - name = "expect___expect_27.0.1.tgz"; + name = "expect___expect_27.0.2.tgz"; path = fetchurl { - name = "expect___expect_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-27.0.1.tgz"; - sha1 = "1290c74fef8d62f15f4c5dd1d7233001909abbfb"; + name = "expect___expect_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-27.0.2.tgz"; + sha1 = "e66ca3a4c9592f1c019fa1d46459a9d2084f3422"; }; } { @@ -2426,19 +2394,11 @@ }; } { - name = "globals___globals_12.4.0.tgz"; - path = fetchurl { - name = "globals___globals_12.4.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; - sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; - }; - } - { - name = "globals___globals_13.8.0.tgz"; + name = "globals___globals_13.9.0.tgz"; path = fetchurl { - name = "globals___globals_13.8.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz"; - sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3"; + name = "globals___globals_13.9.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz"; + sha1 = "4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb"; }; } { @@ -2506,14 +2466,6 @@ }; } { - name = "hosted_git_info___hosted_git_info_3.0.8.tgz"; - path = fetchurl { - name = "hosted_git_info___hosted_git_info_3.0.8.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz"; - sha1 = "6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d"; - }; - } - { name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; path = fetchurl { name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; @@ -2826,6 +2778,14 @@ }; } { + name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; + sha1 = "5d34b94865bd4946633ecc78a026fc76c5b11fcf"; + }; + } + { name = "isexe___isexe_2.0.0.tgz"; path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; @@ -2874,14 +2834,6 @@ }; } { - name = "istextorbinary___istextorbinary_5.12.0.tgz"; - path = fetchurl { - name = "istextorbinary___istextorbinary_5.12.0.tgz"; - url = "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-5.12.0.tgz"; - sha1 = "2f84777838668fdf524c305a2363d6057aaeec84"; - }; - } - { name = "jake___jake_10.8.2.tgz"; path = fetchurl { name = "jake___jake_10.8.2.tgz"; @@ -2890,43 +2842,43 @@ }; } { - name = "jest_changed_files___jest_changed_files_27.0.1.tgz"; + name = "jest_changed_files___jest_changed_files_27.0.2.tgz"; path = fetchurl { - name = "jest_changed_files___jest_changed_files_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.1.tgz"; - sha1 = "b8356b3708cac9d05ebf6f9e0b32227b514945c8"; + name = "jest_changed_files___jest_changed_files_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.2.tgz"; + sha1 = "997253042b4a032950fc5f56abf3c5d1f8560801"; }; } { - name = "jest_circus___jest_circus_27.0.1.tgz"; + name = "jest_circus___jest_circus_27.0.4.tgz"; path = fetchurl { - name = "jest_circus___jest_circus_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.1.tgz"; - sha1 = "3a7ec9e9fd60ef4c827197dffe2288aa19f86678"; + name = "jest_circus___jest_circus_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.4.tgz"; + sha1 = "3b261514ee3b3da33def736a6352c98ff56bb6e6"; }; } { - name = "jest_cli___jest_cli_27.0.1.tgz"; + name = "jest_cli___jest_cli_27.0.4.tgz"; path = fetchurl { - name = "jest_cli___jest_cli_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.1.tgz"; - sha1 = "9accc8a505438571ee423438eac526a7ee4654b5"; + name = "jest_cli___jest_cli_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.4.tgz"; + sha1 = "491b12c754c0d7c6873b13a66f26b3a80a852910"; }; } { - name = "jest_config___jest_config_27.0.1.tgz"; + name = "jest_config___jest_config_27.0.4.tgz"; path = fetchurl { - name = "jest_config___jest_config_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.1.tgz"; - sha1 = "db4f202efcbb92011f62d8f25b52c3d1bd5672d4"; + name = "jest_config___jest_config_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.4.tgz"; + sha1 = "c4f41378acf40ca77860fb4e213b12109d87b8cf"; }; } { - name = "jest_diff___jest_diff_27.0.1.tgz"; + name = "jest_diff___jest_diff_27.0.2.tgz"; path = fetchurl { - name = "jest_diff___jest_diff_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.1.tgz"; - sha1 = "021beb29fe9f07e83c809a4f7a1ce807b229c4ab"; + name = "jest_diff___jest_diff_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.2.tgz"; + sha1 = "f315b87cee5dc134cf42c2708ab27375cc3f5a7e"; }; } { @@ -2938,27 +2890,27 @@ }; } { - name = "jest_each___jest_each_27.0.1.tgz"; + name = "jest_each___jest_each_27.0.2.tgz"; path = fetchurl { - name = "jest_each___jest_each_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.1.tgz"; - sha1 = "37fa20b7d809b29d4349d8eb7d01f17c2feeab10"; + name = "jest_each___jest_each_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.2.tgz"; + sha1 = "865ddb4367476ced752167926b656fa0dcecd8c7"; }; } { - name = "jest_environment_jsdom___jest_environment_jsdom_27.0.1.tgz"; + name = "jest_environment_jsdom___jest_environment_jsdom_27.0.3.tgz"; path = fetchurl { - name = "jest_environment_jsdom___jest_environment_jsdom_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.1.tgz"; - sha1 = "12b0ed587fb53e0a581a5101bb209aef09da2310"; + name = "jest_environment_jsdom___jest_environment_jsdom_27.0.3.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz"; + sha1 = "ed73e913ddc03864eb9f934b5cbabf1b63504e2e"; }; } { - name = "jest_environment_node___jest_environment_node_27.0.1.tgz"; + name = "jest_environment_node___jest_environment_node_27.0.3.tgz"; path = fetchurl { - name = "jest_environment_node___jest_environment_node_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.1.tgz"; - sha1 = "7d7df7ae191477a823ffb4fcc0772b4c23ec5c87"; + name = "jest_environment_node___jest_environment_node_27.0.3.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.3.tgz"; + sha1 = "b4acb3679d2552a4215732cab8b0ca7ec4398ee0"; }; } { @@ -2970,51 +2922,51 @@ }; } { - name = "jest_haste_map___jest_haste_map_27.0.1.tgz"; + name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; path = fetchurl { - name = "jest_haste_map___jest_haste_map_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.1.tgz"; - sha1 = "653c4ba59309a86499ad7bf663176e7f97478191"; + name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz"; + sha1 = "3f1819400c671237e48b4d4b76a80a0dbed7577f"; }; } { - name = "jest_jasmine2___jest_jasmine2_27.0.1.tgz"; + name = "jest_jasmine2___jest_jasmine2_27.0.4.tgz"; path = fetchurl { - name = "jest_jasmine2___jest_jasmine2_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.1.tgz"; - sha1 = "d975bfe072f3ac3596c0be5fc0a1215fd2e91e77"; + name = "jest_jasmine2___jest_jasmine2_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz"; + sha1 = "c669519ccf4904a485338555e1e66cad36bb0670"; }; } { - name = "jest_leak_detector___jest_leak_detector_27.0.1.tgz"; + name = "jest_leak_detector___jest_leak_detector_27.0.2.tgz"; path = fetchurl { - name = "jest_leak_detector___jest_leak_detector_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.1.tgz"; - sha1 = "eedeaee7c0ab553db4d8908f74967329624342b9"; + name = "jest_leak_detector___jest_leak_detector_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.2.tgz"; + sha1 = "ce19aa9dbcf7a72a9d58907a970427506f624e69"; }; } { - name = "jest_matcher_utils___jest_matcher_utils_27.0.1.tgz"; + name = "jest_matcher_utils___jest_matcher_utils_27.0.2.tgz"; path = fetchurl { - name = "jest_matcher_utils___jest_matcher_utils_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.1.tgz"; - sha1 = "7a01330786e370f152b0b0159f827293b6322909"; + name = "jest_matcher_utils___jest_matcher_utils_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz"; + sha1 = "f14c060605a95a466cdc759acc546c6f4cbfc4f0"; }; } { - name = "jest_message_util___jest_message_util_27.0.1.tgz"; + name = "jest_message_util___jest_message_util_27.0.2.tgz"; path = fetchurl { - name = "jest_message_util___jest_message_util_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.1.tgz"; - sha1 = "382b7c55d8e0b1aba9eeb41d3cfdd34e451210ed"; + name = "jest_message_util___jest_message_util_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.2.tgz"; + sha1 = "181c9b67dff504d8f4ad15cba10d8b80f272048c"; }; } { - name = "jest_mock___jest_mock_27.0.1.tgz"; + name = "jest_mock___jest_mock_27.0.3.tgz"; path = fetchurl { - name = "jest_mock___jest_mock_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.1.tgz"; - sha1 = "8394e297bc3dfed980961622cb51fd042b4acf5a"; + name = "jest_mock___jest_mock_27.0.3.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.3.tgz"; + sha1 = "5591844f9192b3335c0dca38e8e45ed297d4d23d"; }; } { @@ -3034,35 +2986,35 @@ }; } { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.1.tgz"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.4.tgz"; path = fetchurl { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.1.tgz"; - sha1 = "3dcaeb277e0253747706467e8f05e1e78a1d534d"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz"; + sha1 = "a07a242d70d668afd3fcf7f4270755eebb1fe579"; }; } { - name = "jest_resolve___jest_resolve_27.0.1.tgz"; + name = "jest_resolve___jest_resolve_27.0.4.tgz"; path = fetchurl { - name = "jest_resolve___jest_resolve_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.1.tgz"; - sha1 = "4e1b76f61c7e2213d2fbd37342800864309de538"; + name = "jest_resolve___jest_resolve_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.4.tgz"; + sha1 = "8a27bc3f2f00c8ea28f3bc99bbf6f468300a703d"; }; } { - name = "jest_runner___jest_runner_27.0.1.tgz"; + name = "jest_runner___jest_runner_27.0.4.tgz"; path = fetchurl { - name = "jest_runner___jest_runner_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.1.tgz"; - sha1 = "52137173fbf318b7b1f034b81200c2846758f681"; + name = "jest_runner___jest_runner_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.4.tgz"; + sha1 = "2787170a9509b792ae129794f6944d27d5d12a4f"; }; } { - name = "jest_runtime___jest_runtime_27.0.1.tgz"; + name = "jest_runtime___jest_runtime_27.0.4.tgz"; path = fetchurl { - name = "jest_runtime___jest_runtime_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.1.tgz"; - sha1 = "b71bb8ea189c50525aebb4aba6c524633ca27659"; + name = "jest_runtime___jest_runtime_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.4.tgz"; + sha1 = "2e4a6aa77cac32ac612dfe12768387a8aa15c2f0"; }; } { @@ -3074,51 +3026,51 @@ }; } { - name = "jest_snapshot___jest_snapshot_27.0.1.tgz"; + name = "jest_snapshot___jest_snapshot_27.0.4.tgz"; path = fetchurl { - name = "jest_snapshot___jest_snapshot_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.1.tgz"; - sha1 = "01a82d901f260604908373795c9255b032d2a07a"; + name = "jest_snapshot___jest_snapshot_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.4.tgz"; + sha1 = "2b96e22ca90382b3e93bd0aae2ce4c78bf51fb5b"; }; } { - name = "jest_util___jest_util_27.0.1.tgz"; + name = "jest_util___jest_util_27.0.2.tgz"; path = fetchurl { - name = "jest_util___jest_util_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.1.tgz"; - sha1 = "324ed9879d129c1e64f9169a739d6d50d7928769"; + name = "jest_util___jest_util_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz"; + sha1 = "fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7"; }; } { - name = "jest_validate___jest_validate_27.0.1.tgz"; + name = "jest_validate___jest_validate_27.0.2.tgz"; path = fetchurl { - name = "jest_validate___jest_validate_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.1.tgz"; - sha1 = "8e43428674b6097f8ee3abe42c4248a4826cd008"; + name = "jest_validate___jest_validate_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.2.tgz"; + sha1 = "7fe2c100089449cd5cbb47a5b0b6cb7cda5beee5"; }; } { - name = "jest_watcher___jest_watcher_27.0.1.tgz"; + name = "jest_watcher___jest_watcher_27.0.2.tgz"; path = fetchurl { - name = "jest_watcher___jest_watcher_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.1.tgz"; - sha1 = "61b9403d7b498161f6aa6124602363525ac3efc2"; + name = "jest_watcher___jest_watcher_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.2.tgz"; + sha1 = "dab5f9443e2d7f52597186480731a8c6335c5deb"; }; } { - name = "jest_worker___jest_worker_27.0.1.tgz"; + name = "jest_worker___jest_worker_27.0.2.tgz"; path = fetchurl { - name = "jest_worker___jest_worker_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.1.tgz"; - sha1 = "b255fcbb40fb467295010c628474b1185cab4f9e"; + name = "jest_worker___jest_worker_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz"; + sha1 = "4ebeb56cef48b3e7514552f80d0d80c0129f0b05"; }; } { - name = "jest___jest_27.0.1.tgz"; + name = "jest___jest_27.0.4.tgz"; path = fetchurl { - name = "jest___jest_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-27.0.1.tgz"; - sha1 = "d3822f0904f3bbe884bea393cede2be2aa290d0e"; + name = "jest___jest_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-27.0.4.tgz"; + sha1 = "91d4d564b36bcf93b98dac1ab19f07089e670f53"; }; } { @@ -3442,19 +3394,19 @@ }; } { - name = "mime_db___mime_db_1.47.0.tgz"; + name = "mime_db___mime_db_1.48.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.47.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz"; - sha1 = "8cb313e59965d3c05cfbf898915a267af46a335c"; + name = "mime_db___mime_db_1.48.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz"; + sha1 = "e35b31045dd7eada3aaad537ed88a33afbef2d1d"; }; } { - name = "mime_types___mime_types_2.1.30.tgz"; + name = "mime_types___mime_types_2.1.31.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.30.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz"; - sha1 = "6e7be8b4c479825f85ed6326695db73f9305d62d"; + name = "mime_types___mime_types_2.1.31.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz"; + sha1 = "a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"; }; } { @@ -3554,19 +3506,11 @@ }; } { - name = "node_releases___node_releases_1.1.72.tgz"; + name = "node_releases___node_releases_1.1.73.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.72.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz"; - sha1 = "14802ab6b1039a79a0c7d662b610a5bbd76eacbe"; - }; - } - { - name = "normalize_package_data___normalize_package_data_3.0.2.tgz"; - path = fetchurl { - name = "normalize_package_data___normalize_package_data_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz"; - sha1 = "cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"; + name = "node_releases___node_releases_1.1.73.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz"; + sha1 = "dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"; }; } { @@ -3818,11 +3762,11 @@ }; } { - name = "pretty_format___pretty_format_27.0.1.tgz"; + name = "pretty_format___pretty_format_27.0.2.tgz"; path = fetchurl { - name = "pretty_format___pretty_format_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.1.tgz"; - sha1 = "c4094621dfbd3e8ab751964d1cf01edc6f88474d"; + name = "pretty_format___pretty_format_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.2.tgz"; + sha1 = "9283ff8c4f581b186b2d4da461617143dca478a4"; }; } { @@ -3914,11 +3858,11 @@ }; } { - name = "read_config_file___read_config_file_6.0.0.tgz"; + name = "read_config_file___read_config_file_6.2.0.tgz"; path = fetchurl { - name = "read_config_file___read_config_file_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz"; - sha1 = "224b5dca6a5bdc1fb19e63f89f342680efdb9299"; + name = "read_config_file___read_config_file_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz"; + sha1 = "71536072330bcd62ba814f91458b12add9fc7ade"; }; } { @@ -4242,38 +4186,6 @@ }; } { - name = "spdx_correct___spdx_correct_3.1.1.tgz"; - path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; - sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; - }; - } - { - name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; - path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; - }; - } - { - name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; - path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; - sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; - }; - } - { - name = "spdx_license_ids___spdx_license_ids_3.0.9.tgz"; - path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.9.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz"; - sha1 = "8a595135def9592bda69709474f1cbeea7c2467f"; - }; - } - { name = "sprintf_js___sprintf_js_1.1.2.tgz"; path = fetchurl { name = "sprintf_js___sprintf_js_1.1.2.tgz"; @@ -4506,14 +4418,6 @@ }; } { - name = "textextensions___textextensions_5.12.0.tgz"; - path = fetchurl { - name = "textextensions___textextensions_5.12.0.tgz"; - url = "https://registry.yarnpkg.com/textextensions/-/textextensions-5.12.0.tgz"; - sha1 = "b908120b5c1bd4bb9eba41423d75b176011ab68a"; - }; - } - { name = "throat___throat_6.0.1.tgz"; path = fetchurl { name = "throat___throat_6.0.1.tgz"; @@ -4522,19 +4426,35 @@ }; } { - name = "tldts_core___tldts_core_5.7.37.tgz"; + name = "tldts_core___tldts_core_5.7.38.tgz"; + path = fetchurl { + name = "tldts_core___tldts_core_5.7.38.tgz"; + url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.38.tgz"; + sha1 = "779092c90941803fb682c3d7094a88f12aad4508"; + }; + } + { + name = "tldts_experimental___tldts_experimental_5.7.38.tgz"; + path = fetchurl { + name = "tldts_experimental___tldts_experimental_5.7.38.tgz"; + url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.38.tgz"; + sha1 = "a2b03ae0282ee7439b1ed1618a1d7d2e9e66be78"; + }; + } + { + name = "tmp_promise___tmp_promise_3.0.2.tgz"; path = fetchurl { - name = "tldts_core___tldts_core_5.7.37.tgz"; - url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.37.tgz"; - sha1 = "29f34676d2de7dfaae6b13ee8d5cd3c5a6ce6396"; + name = "tmp_promise___tmp_promise_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.2.tgz"; + sha1 = "6e933782abff8b00c3119d63589ca1fb9caaa62a"; }; } { - name = "tldts_experimental___tldts_experimental_5.7.37.tgz"; + name = "tmp___tmp_0.2.1.tgz"; path = fetchurl { - name = "tldts_experimental___tldts_experimental_5.7.37.tgz"; - url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.37.tgz"; - sha1 = "ead49d7dea3b08341ef17c9a03e23717c006407e"; + name = "tmp___tmp_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; + sha1 = "8457fc3037dcf4719c251367a1af6500ee1ccf14"; }; } { @@ -4650,14 +4570,6 @@ }; } { - name = "type_fest___type_fest_0.8.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; - sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; - }; - } - { name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; path = fetchurl { name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; @@ -4754,14 +4666,6 @@ }; } { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - path = fetchurl { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; - }; - } - { name = "verror___verror_1.10.0.tgz"; path = fetchurl { name = "verror___verror_1.10.0.tgz"; @@ -4770,22 +4674,6 @@ }; } { - name = "version_compare___version_compare_1.1.0.tgz"; - path = fetchurl { - name = "version_compare___version_compare_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/version-compare/-/version-compare-1.1.0.tgz"; - sha1 = "7b3e67e7e6cec5c72d9c9e586f8854e419ade17c"; - }; - } - { - name = "version_range___version_range_1.1.0.tgz"; - path = fetchurl { - name = "version_range___version_range_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/version-range/-/version-range-1.1.0.tgz"; - sha1 = "1c233064202ee742afc9d56e21da3b2e15260acf"; - }; - } - { name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; path = fetchurl { name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; @@ -4842,11 +4730,11 @@ }; } { - name = "whatwg_url___whatwg_url_8.5.0.tgz"; + name = "whatwg_url___whatwg_url_8.6.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz"; - sha1 = "7752b8464fc0903fec89aa9846fc9efe07351fd3"; + name = "whatwg_url___whatwg_url_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz"; + sha1 = "27c0205a4902084b872aecb97cf0f2a7a3011f4c"; }; } { @@ -4986,6 +4874,14 @@ }; } { + name = "yargs___yargs_17.0.1.tgz"; + path = fetchurl { + name = "yargs___yargs_17.0.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz"; + sha1 = "6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"; + }; + } + { name = "yauzl___yauzl_2.10.0.tgz"; path = fetchurl { name = "yauzl___yauzl_2.10.0.tgz"; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index dabe0fd373e..4f8d813f055 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsaLib, dbus, cups, libexif, ffmpeg, systemd +, alsa-lib, dbus, cups, libexif, ffmpeg, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat , libuuid , libxml2 @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd + atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr libxml2 pango cairo gnome2.GConf libdrm mesa diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix index 327fc5f31e2..f9be7e9ec9a 100644 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -5,7 +5,7 @@ # Runtime , xorg, zip, freetype, fontconfig, glibc, libffi -, dbus, dbus-glib, gtk2, alsaLib, jack2, ffmpeg +, dbus, dbus-glib, gtk2, alsa-lib, jack2, ffmpeg }: let @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2 + alsa-lib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2 gnome2.GConf xorg.libXt ]; diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/pkgs/applications/networking/hpmyroom/default.nix index 63d0d0b2978..64a237480c6 100644 --- a/pkgs/applications/networking/hpmyroom/default.nix +++ b/pkgs/applications/networking/hpmyroom/default.nix @@ -1,5 +1,5 @@ { mkDerivation, stdenv, lib, fetchurl, rpmextract, autoPatchelfHook , libuuid -, libXtst, libXfixes, glib, gst_all_1, alsaLib, freetype, fontconfig , libXext +, libXtst, libXfixes, glib, gst_all_1, alsa-lib, freetype, fontconfig , libXext , libGL, libpng, libXScrnSaver, libxcb, xorg, libpulseaudio, libdrm }: mkDerivation rec { @@ -16,7 +16,7 @@ mkDerivation rec { ]; buildInputs = [ - libuuid libXtst libXScrnSaver libXfixes alsaLib freetype fontconfig libXext + libuuid libXtst libXScrnSaver libXfixes alsa-lib freetype fontconfig libXext libGL libpng libxcb libpulseaudio libdrm glib # For libgobject stdenv.cc.cc # For libstdc++ diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 0c6b33e04a2..03f0bf63818 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkg-config, gst_all_1 -, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg +, cairo, mpg123, alsa-lib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg , gsm, speex, portaudio, spandsp, libuuid, libvpx }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; buildInputs = [zlib openssl libre librem cairo mpg123 - alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid + alsa-lib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid libvpx ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index b3cd9d8c140..6e57e0e9423 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -32,7 +32,7 @@ , libXft , libXcomposite , libXScrnSaver -, alsaLib +, alsa-lib , pulseaudio , makeWrapper , xdg-utils @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { libXft libXcomposite libXScrnSaver - alsaLib + alsa-lib pulseaudio ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index a155737499e..a8b2b02f0bf 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -1,6 +1,6 @@ { pname, version, src, binaryName, desktopName , autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook -, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig +, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { inherit pname version src; nativeBuildInputs = [ - alsaLib + alsa-lib autoPatchelfHook cups libdrm @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ libcxx systemd libpulseaudio libdrm mesa - stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype + stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss libxcb pango systemd libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 6fac3657c7c..d63318ecfaf 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -17,7 +17,7 @@ , dbus , nss , nspr -, alsaLib +, alsa-lib , cups , expat , udev @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { gnome2.GConf nss nspr - alsaLib + alsa-lib cups expat stdenv.cc.cc diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 6fe0e3b13b2..854cc18a47f 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, alsaLib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl +{ lib, stdenv, alsa-lib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl , fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libdrm, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx @@ -7,7 +7,7 @@ let gitterDirectorySuffix = "opt/gitter"; libPath = lib.makeLibraryPath [ - alsaLib + alsa-lib atk at-spi2-core cairo diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index cbbe74481c2..6a677c9e0d6 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat -, alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd +, alsa-lib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd , libGL, xcbutilkeysyms, xdg-utils, libtool }: let @@ -28,7 +28,7 @@ let nss nspr dbus - alsaLib + alsa-lib zlib libtool libxml2 diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 5fa5c2a2864..e2ace1a5d35 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8 # Optional, Jitsi still runs without, but you may pass null: -, alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg +, alsa-lib, dbus, gtk2, libpulseaudio, openssl, xorg }: let jdk = jdk8; in @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath ([ stdenv.cc.cc # For libstdc++. - alsaLib + alsa-lib dbus gtk2 libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 058a96ea622..5b14fba5b42 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk-pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, -libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev, wrapGAppsHook, +libXScrnSaver, nss, nspr, alsa-lib, cups, expat, udev, wrapGAppsHook, hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk }: let rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 111a3ed091e..c20ec46f266 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/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index bad54f455b0..94e0dc9c8c2 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -7,7 +7,7 @@ , libtool , pjsip , libyamlcpp -, alsaLib +, alsa-lib , libpulseaudio , libsamplerate , libsndfile @@ -95,7 +95,7 @@ stdenv.mkDerivation { buildInputs = [ pjsip' libyamlcpp - alsaLib + alsa-lib libpulseaudio libsamplerate libsndfile diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 6d6e70ff26a..dbcd447d156 100755 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -1,7 +1,7 @@ { lib, mkDerivation, fetchurl, makeFontsConf, appimageTools , qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats , autoPatchelfHook, desktop-file-utils, imagemagick -, twemoji-color-font, xorg, libsodium, libopus, libGL, alsaLib }: +, twemoji-color-font, xorg, libsodium, libopus, libGL, alsa-lib }: mkDerivation rec { pname = "ripcord"; @@ -19,7 +19,7 @@ mkDerivation rec { }; nativeBuildInputs = [ autoPatchelfHook desktop-file-utils imagemagick ]; - buildInputs = [ libsodium libopus libGL alsaLib ] + buildInputs = [ libsodium libopus libGL alsa-lib ] ++ [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] ++ (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]); diff --git a/pkgs/applications/networking/instant-messengers/seren/default.nix b/pkgs/applications/networking/instant-messengers/seren/default.nix index 63cefbd2ffd..ed02def3eb8 100644 --- a/pkgs/applications/networking/instant-messengers/seren/default.nix +++ b/pkgs/applications/networking/instant-messengers/seren/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, alsaLib +, alsa-lib , libopus , libogg , gmp @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "seren"; version = "0.0.21"; - buildInputs = [ alsaLib libopus libogg gmp ncurses ]; + buildInputs = [ alsa-lib libopus libogg gmp ncurses ]; src = fetchurl { url = "http://holdenc.altervista.org/seren/downloads/${pname}-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 67a52113df3..616a0857102 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite -, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib +, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa # Runtime dependencies: , systemd, libnotify, libdbusmenu, libpulseaudio @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 8caafdd5762..4eb53625624 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome +, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg , at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: @@ -10,7 +10,7 @@ let version = "8.69.0.77"; rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib atk at-spi2-atk at-spi2-core diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 4db4580f58a..13778355211 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ , undmg , makeWrapper , nodePackages -, alsaLib +, alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -80,7 +80,7 @@ let passthru.updateScript = ./update.sh; rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 47027da9a91..026dc5b6405 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig +{ lib, stdenv, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gnome2, gtk2, nspr, nss, pango, udev, xorg }: let fullPath = lib.makeLibraryPath [ - alsaLib + alsa-lib atk cairo cups diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index d2648eff57c..048d40082da 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config -, alsaLib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin +, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin }: let @@ -12,7 +12,7 @@ let deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama - xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qtbase qtwebengine qtwebchannel qtsvg + xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index c88c97705fd..02330d11078 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash -, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk # Transitive dependencies: , pcre, xorg, util-linux, libselinux, libsepol, epoxy @@ -37,7 +37,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash - ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk tg_owt # Transitive dependencies: diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 27af9698788..acdf4e660c7 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, fetchpatch, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash -, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, dee, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk, libtgvoip # Transitive dependencies: , pcre, xorg, util-linux, libselinux, libsepol, epoxy @@ -57,7 +57,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash - dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + dee ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk tg_owt libtgvoip # Transitive dependencies: diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 6bd72134e02..614183b72d0 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm -, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf +, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf , xorg, libXtst }: @@ -23,7 +23,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ - libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf + libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf xorg.libX11 libXtst ]; diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 8b306c07506..01c83ba7b1c 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -12,7 +12,7 @@ , qtbase , qttools , qtquickcontrols2 -, alsaLib +, alsa-lib , speex , ilbc , fetchurl @@ -41,7 +41,7 @@ mkDerivation rec { qtbase qttools qtquickcontrols2 - alsaLib + alsa-lib speex ilbc ]; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 7496063c58e..66d33533a73 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,5 +1,5 @@ {fetchurl, lib, stdenv, dpkg, makeWrapper, - alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, + alsa-lib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { dontUnpack = true; libPath = lib.makeLibraryPath [ - alsaLib + alsa-lib cups curl dbus diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 96ae3993b38..51b119aa6de 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, rpmextract, undmg, autoPatchelfHook -, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify +, xorg, gtk3, gnome2, nss, alsa-lib, udev, libnotify , wrapGAppsHook }: let @@ -35,7 +35,7 @@ let nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook ]; buildInputs = (with xorg; [ libXdamage libXtst libXScrnSaver libxkbfile - ]) ++ [ gtk3 nss alsaLib ]; + ]) ++ [ gtk3 nss alsa-lib ]; runtimeDependencies = [ (lib.getLib udev) libnotify ]; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index ba0f867b2aa..371ac91120b 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify +{ alsa-lib, autoPatchelfHook, fetchurl, gtk3, libnotify , makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg-utils , xorg }: @@ -37,7 +37,7 @@ in stdenv.mkDerivation { buildInputs = with xorg; [ libXdmcp libXScrnSaver libXtst ] ++ [ - alsaLib gtk3 nss + alsa-lib gtk3 nss ]; runtimeDependencies = [ (getLib udev) libnotify ]; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 364e6e294ec..191176e539e 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -3,7 +3,7 @@ , fetchurl , makeWrapper # Dynamic libraries -, alsaLib +, alsa-lib , atk , cairo , dbus @@ -39,7 +39,7 @@ let libs = lib.makeLibraryPath ([ # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' - alsaLib + alsa-lib atk cairo dbus diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix index 0c18ec60ab6..ad202871b99 100644 --- a/pkgs/applications/networking/insync/v3.nix +++ b/pkgs/applications/networking/insync/v3.nix @@ -10,7 +10,7 @@ , nss , libthai , wayland -, alsaLib +, alsa-lib , qtvirtualkeyboard , qtwebchannel , qtwebsockets @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib + alsa-lib libGL libthai libxcb diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 29667eb52c6..6c0de05a740 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , autoPatchelfHook -, alsaLib +, alsa-lib , coreutils , db , dpkg @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib db glib gtk3 diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index b81128545d5..f3634b744aa 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, config, makeWrapper -, alsaLib +, alsa-lib , at-spi2-atk , atk , cairo @@ -78,7 +78,7 @@ stdenv.mkDerivation { libPath = lib.makeLibraryPath [ stdenv.cc.cc - alsaLib + alsa-lib at-spi2-atk atk cairo diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 31a15d69487..8e28190fea4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -58,7 +58,7 @@ , debugBuild ? false -, alsaSupport ? stdenv.isLinux, alsaLib +, alsaSupport ? stdenv.isLinux, alsa-lib , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , waylandSupport ? true, libdrm @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { xorg.libXdamage zip zlib - ] ++ lib.optional alsaSupport alsaLib + ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional gtk3Support gtk3 ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 68a9362b87f..33030e0c7ee 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, dpkg -, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype +, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, mesa , xorg, autoPatchelfHook, systemd, libnotify, libappindicator }: let deps = [ - alsaLib + alsa-lib atk cairo cups diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 088391ba48f..e0c5b50be0f 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, qt5 , avahi, boost, libopus, libsndfile, protobuf, speex, libcap -, alsaLib, python3 +, alsa-lib, python3 , rnnoise , jackSupport ? false, libjack2 , speechdSupport ? false, speechd @@ -73,7 +73,7 @@ let nativeBuildInputs = [ qt5.qttools ]; buildInputs = [ libopus libsndfile speex qt5.qtsvg rnnoise ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional speechdSupport speechd ++ lib.optional pulseSupport libpulseaudio; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index bd9371fff13..b3968ed8604 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -21,7 +21,7 @@ # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the # AppImage, so we don't have to duplicate them here. - alsaLib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev + alsa-lib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev }: let @@ -54,7 +54,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - alsaLib + alsa-lib dbus-glib fuse gtk3 diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index dc7b0b0a4c8..84e52128b66 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib, AppKit }: +{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }: stdenv.mkDerivation rec { pname = "pjsip"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl libsamplerate ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional stdenv.isDarwin AppKit; preConfigure = '' diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 8a96cf84755..506f129d359 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more -, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 +, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib atk cairo dconf diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 8e0f4dde816..942090f2bdf 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsaLib, ffmpeg, glib, openssl +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsa-lib, ffmpeg, glib, openssl , pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama , libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland , gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { buildInputs = with lib; [ - alsaLib + alsa-lib cairo cups ffmpeg diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 4eb39f4d1f8..b87e74c256f 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas -, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, cairo, freetype, pango, gdk-pixbuf, glib }: +, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsa-lib, cairo, freetype, pango, gdk-pixbuf, glib }: stdenv.mkDerivation rec { version = "5.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas ] ++ systemLibs; - systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib cairo freetype pango gdk-pixbuf glib ]; + systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsa-lib cairo freetype pango gdk-pixbuf glib ]; systemLibPaths = lib.makeLibraryPath systemLibs; installPhase = '' diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index b38b7e0e585..3b9963d8dbc 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, mkDerivation, dpkg, which , makeWrapper -, alsaLib +, alsa-lib , desktop-file-utils , dbus , libcap @@ -59,7 +59,7 @@ let qtquickcontrols qtwebkit qtwebengine - alsaLib + alsa-lib dbus freetype fontconfig diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index daa71bff061..75e6924db9c 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl # Alphabetic ordering below -, alsaLib +, alsa-lib , at-spi2-atk , atk , autoPatchelfHook @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk atk cairo diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index b18f22b6c1d..ada2804ccba 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -5,7 +5,7 @@ , dpkg , wrapGAppsHook , wrapQtAppsHook -, alsaLib +, alsa-lib , atk , bzip2 , cairo @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { }; buildInputs = with xorg; [ - alsaLib + alsa-lib atk bzip2 cairo diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index 4f8ca550490..7b8f60819c4 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, espeak, glibc, gpsd +{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, espeak, glibc, gpsd , hamlib, perl, python3, udev }: with lib; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ espeak gpsd hamlib perl python3 - ] ++ (optionals stdenv.isLinux [alsaLib udev]); + ] ++ (optionals stdenv.isLinux [alsa-lib udev]); patches = [ ./udev-fix.patch diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index d14e0017f6d..36f020ed272 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, hamlib, fltk14, libjpeg, libpng, portaudio, libsndfile, - libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsaLib }: + libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsa-lib }: stdenv.mkDerivation rec { version = "4.1.18"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio - libsndfile libsamplerate libpulseaudio pkg-config alsaLib ]; + libsndfile libsamplerate libpulseaudio pkg-config alsa-lib ]; meta = { description = "Digital modem program"; diff --git a/pkgs/applications/radio/gnuradio/3.7.nix b/pkgs/applications/radio/gnuradio/3.7.nix index 50993dd6f8e..3e423e025b7 100644 --- a/pkgs/applications/radio/gnuradio/3.7.nix +++ b/pkgs/applications/radio/gnuradio/3.7.nix @@ -17,7 +17,7 @@ , codec2 , gsm , fftwFloat -, alsaLib +, alsa-lib , libjack2 , CoreAudio , uhd @@ -143,7 +143,7 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 9f90d3c0353..f20ffe01bdc 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -16,7 +16,7 @@ , codec2 , gsm , fftwFloat -, alsaLib +, alsa-lib , libjack2 , CoreAudio , uhd @@ -149,7 +149,7 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index d622fef424d..528ea126453 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -16,7 +16,7 @@ , codec2 , gsm , fftwFloat -, alsaLib +, alsa-lib , libjack2 , CoreAudio , uhd @@ -151,7 +151,7 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index cccdff1f3cc..272c381db89 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -7,7 +7,7 @@ , log4cpp , mpir , fftwFloat -, alsaLib +, alsa-lib , libjack2 # drivers (optional): , rtl-sdr @@ -37,7 +37,7 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { log4cpp mpir fftwFloat - alsaLib + alsa-lib libjack2 gnuradio3_8Minimal.unwrapped.boost qt5.qtbase diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix index 48068a342e2..c023e76b273 100644 --- a/pkgs/applications/radio/minimodem/default.nix +++ b/pkgs/applications/radio/minimodem/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, libtool -, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio +, fftw, fftwSinglePrec, alsa-lib, libsndfile, libpulseaudio }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoconf automake libtool ]; - buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; + buildInputs = [ fftw fftwSinglePrec alsa-lib libsndfile libpulseaudio ]; preConfigure = '' aclocal \ diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index 64f5093c4b9..77a7d8cf69f 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -13,7 +13,7 @@ , nlohmann_json , soapysdr-with-plugins , portaudio -, alsaLib +, alsa-lib , muparserx , python3 }: @@ -39,7 +39,7 @@ mkDerivation rec { buildInputs = [ pcre poco qtbase qtsvg libsForQt5.qwt nlohmann_json - soapysdr-with-plugins portaudio alsaLib muparserx python3 + soapysdr-with-plugins portaudio alsa-lib muparserx python3 ]; postInstall = '' diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index e6fa95b5dc7..555264ac485 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, qtbase, qmake, openjpeg, pkg-config, fftw, - libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: + libpulseaudio, alsa-lib, hamlib, libv4l, fftwFloat }: mkDerivation rec { version = "9.4.4"; @@ -17,7 +17,7 @@ mkDerivation rec { pkg-config ]; - buildInputs = [ qtbase openjpeg fftw libpulseaudio alsaLib hamlib libv4l + buildInputs = [ qtbase openjpeg fftw libpulseaudio alsa-lib hamlib libv4l fftwFloat ]; postInstall = '' diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index 19a4e715013..75fb91d5ce6 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -1,5 +1,5 @@ { lib, python38Packages, fetchPypi -, fftw, alsaLib, pulseaudio, wxPython_4_0 }: +, fftw, alsa-lib, pulseaudio, wxPython_4_0 }: python38Packages.buildPythonApplication rec { pname = "quisk"; @@ -10,7 +10,7 @@ python38Packages.buildPythonApplication rec { sha256 = "37dfb02a32341025c086b07d66ddf1608d4ee1ae1c62fb51f87c97662f13e0d8"; }; - buildInputs = [ fftw alsaLib pulseaudio ]; + buildInputs = [ fftw alsa-lib pulseaudio ]; propagatedBuildInputs = [ wxPython_4_0 ]; diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix index e12cced055c..74924de241d 100644 --- a/pkgs/applications/radio/soapyaudio/default.nix +++ b/pkgs/applications/radio/soapyaudio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config -, hamlib, rtaudio, alsaLib, libpulseaudio, libjack2, libusb1, soapysdr +, hamlib, rtaudio, alsa-lib, libpulseaudio, libjack2, libusb1, soapysdr } : stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ hamlib rtaudio alsaLib libpulseaudio libjack2 libusb1 soapysdr ]; + buildInputs = [ hamlib rtaudio alsa-lib libpulseaudio libjack2 libusb1 soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/applications/radio/soundmodem/default.nix index 7f1332a45a6..bedcc8b02c4 100644 --- a/pkgs/applications/radio/soundmodem/default.nix +++ b/pkgs/applications/radio/soundmodem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, alsaLib, audiofile, gtk2, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, alsa-lib, audiofile, gtk2, libxml2 }: stdenv.mkDerivation rec { name = "soundmodem"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib audiofile gtk2 libxml2 ]; + buildInputs = [ alsa-lib audiofile gtk2 libxml2 ]; patches = [ ./matFix.patch ]; diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix index d6a82049a23..255f7761be9 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/applications/radio/svxlink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, pkg-config, fetchFromGitHub, makeDesktopItem, alsaLib, speex +{ lib, stdenv, cmake, pkg-config, fetchFromGitHub, makeDesktopItem, alsa-lib, speex , libopus, curl, gsm, libgcrypt, libsigcxx, popt, qtbase, qttools , wrapQtAppsHook, rtl-sdr, tcl, doxygen, groff }: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config doxygen groff wrapQtAppsHook ]; buildInputs = [ - alsaLib + alsa-lib curl gsm libgcrypt diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index cdb84670c61..8d28215ae25 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libpulseaudio, alsaLib , pkg-config, qt5}: +{lib, stdenv, fetchurl, libpulseaudio, alsa-lib , pkg-config, qt5}: stdenv.mkDerivation rec { pname = "unixcw"; version = "3.5.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-use-of-dlopen.patch ]; - buildInputs = [libpulseaudio alsaLib pkg-config qt5.qtbase]; + buildInputs = [libpulseaudio alsa-lib pkg-config qt5.qtbase]; CFLAGS ="-lasound -lpulse-simple"; dontWrapQtApps = true; diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix index 8e04d72780c..c33bfd408b9 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkg-config, autoreconfHook, glib, libzip, libserialport, check, libusb1, libftdi, -systemd, alsaLib, dsview +systemd, alsa-lib, dsview }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ - glib libzip libserialport libusb1 libftdi systemd check alsaLib + glib libzip libserialport libusb1 libftdi systemd check alsa-lib ]; meta = with lib; { diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 58873b8a770..0628134d9df 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -1,13 +1,13 @@ { lib, stdenv, mkDerivation, fetchurl, makeDesktopItem , libXrender, libXrandr, libXcursor, libX11, libXext, libXi, libxcb - , libGL, glib, nss, nspr, expat, alsaLib + , libGL, glib, nss, nspr, expat, alsa-lib , qtbase, qtdeclarative, qtsvg, qtlocation, qtwebchannel, qtwebengine }: let libPath = lib.makeLibraryPath [ libXrender libXrandr libXcursor libX11 libXext libXi libxcb - libGL glib nss nspr expat alsaLib + libGL glib nss nspr expat alsa-lib qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine ]; in @@ -32,7 +32,7 @@ let buildInputs = [ libXrender libXrandr libXcursor libX11 libXext libXi libxcb - libGL glib nss nspr expat alsaLib + libGL glib nss nspr expat alsa-lib qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine ]; diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 9a8f05bc575..6fed10da18b 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -2,7 +2,7 @@ , coreutils , patchelf , requireFile -, alsaLib +, alsa-lib , fontconfig , freetype , gcc @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils patchelf - alsaLib + alsa-lib coreutils fontconfig freetype diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix index b8270cca908..f6f0046d272 100644 --- a/pkgs/applications/science/math/mathematica/11.nix +++ b/pkgs/applications/science/math/mathematica/11.nix @@ -3,7 +3,7 @@ , patchelf , requireFile , callPackage -, alsaLib +, alsa-lib , dbus , fontconfig , freetype @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils patchelf - alsaLib + alsa-lib coreutils dbus fontconfig diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 43d7853e3d9..88db3c4b2e9 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -2,7 +2,7 @@ , coreutils , patchelf , requireFile -, alsaLib +, alsa-lib , fontconfig , freetype , gcc @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils patchelf - alsaLib + alsa-lib coreutils fontconfig freetype diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 497592f1c06..10301f062e5 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -4,7 +4,7 @@ , requireFile , callPackage , makeWrapper -, alsaLib +, alsa-lib , dbus , fontconfig , freetype @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { coreutils patchelf makeWrapper - alsaLib + alsa-lib coreutils dbus fontconfig diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index e048b881d33..0f5e7e6daa8 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake , qtbase, qtscript, qtwebkit, qtserialport, qtsvg, qtdeclarative, qtquickcontrols2 -, alsaLib, libsndfile, flite, openssl, udev, SDL2 +, alsa-lib, libsndfile, flite, openssl, udev, SDL2 }: mkDerivation rec { @@ -15,7 +15,7 @@ mkDerivation rec { }; buildInputs = [ - alsaLib libsndfile flite openssl udev SDL2 + alsa-lib libsndfile flite openssl udev SDL2 qtbase qtscript qtwebkit qtserialport qtsvg qtdeclarative qtquickcontrols2 ]; diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 7dd495f977a..55798ed6099 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver -, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio, at-spi2-atk }: +, libxcb, nss, nspr, alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk }: let libPath = lib.makeLibraryPath [ stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio + libXrender libX11 libXtst libXScrnSaver nss nspr alsa-lib cups expat udev libpulseaudio at-spi2-atk ]; in diff --git a/pkgs/applications/terminal-emulators/terminus/default.nix b/pkgs/applications/terminal-emulators/terminus/default.nix index 87394241ef7..7631282b3af 100644 --- a/pkgs/applications/terminal-emulators/terminus/default.nix +++ b/pkgs/applications/terminal-emulators/terminus/default.nix @@ -2,13 +2,13 @@ , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libxcb, makeWrapper, nodejs -, nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }: +, nss, nspr, alsa-lib, cups, expat, systemd, libpulseaudio }: let libPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio + libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsa-lib cups expat systemd libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index 864ef51a588..c67fb1532ab 100644 --- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-filter-repo"; - version = "2.29.0"; + version = "2.32.0"; src = fetchurl { url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "00nn7k9jqrybb762486fmigsnbcn9lbvimgpfvvarz4ikdp9y9pb"; + sha256 = "sha256-CztFSyeKM9Bmcf0eSrLHH3vHGepd8WXPvcAACT+vFps="; }; buildInputs = [ pythonPackages.python ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 2f19e0693c4..c0cc9d5e2b1 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib +{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsa-lib , libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nss nspr cups - alsaLib + alsa-lib expat gdk-pixbuf dbus diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 7d041f60f48..133840e066b 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -30,7 +30,7 @@ , openal ? null , alsaSupport ? stdenv.isLinux -, alsaLib ? null +, alsa-lib ? null , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio ? null @@ -42,7 +42,7 @@ assert spellcheckSupport -> (hunspell != null); assert automationSupport -> (lua != null); assert openalSupport -> (openal != null); -assert alsaSupport -> (alsaLib != null); +assert alsaSupport -> (alsa-lib != null); assert pulseaudioSupport -> (libpulseaudio != null); assert portaudioSupport -> (portaudio != null); @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { wxGTK zlib ] - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional automationSupport lua ++ optional openalSupport openal ++ optional portaudioSupport portaudio diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 9b2073bc799..fe767759a82 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -2,7 +2,7 @@ , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi , makeWrapper, libXext, libGLU, qttools, qtbase, wrapQtAppsHook -, alsaLib +, alsa-lib , withX265 ? true, x265 , withX264 ? true, x264 , withXvid ? true, xvidcore @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ++ lib.optional withQT wrapQtAppsHook; buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig - freetype alsaLib libXext libGLU makeWrapper + freetype alsa-lib libXext libGLU makeWrapper ] ++ lib.optional withX264 x264 ++ lib.optional withX265 x265 ++ lib.optional withXvid xvidcore diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index c81811ea937..75d3cdbcc66 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 +, pkg-config, faad2, faac, a52dec, alsa-lib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr , libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng @@ -31,7 +31,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ]; buildInputs = [ faad2 faac - a52dec alsaLib fftw lame libavc1394 libiec61883 + a52dec alsa-lib fftw lame libavc1394 libiec61883 libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype mjpegtools x264 gettext openexr libXext libXxf86vm libXv libXi libX11 libXft xorgproto diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix index e4e72704fb0..09b24663080 100644 --- a/pkgs/applications/video/clickshare-csc1/default.nix +++ b/pkgs/applications/video/clickshare-csc1/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, alsaLib +, alsa-lib , autoPatchelfHook , binutils-unwrapped , gnutar @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { unzip ]; buildInputs = [ - alsaLib + alsa-lib libav_0_8 libnotify libresample diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index dfb110795f4..38d3d6304c6 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, ffmpeg, libjpeg_turbo, gtk3, alsaLib, speex, libusbmuxd, libappindicator-gtk3 +, ffmpeg, libjpeg_turbo, gtk3, alsa-lib, speex, libusbmuxd, libappindicator-gtk3 , pkg-config }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ffmpeg libjpeg_turbo gtk3 - alsaLib + alsa-lib speex libusbmuxd libappindicator-gtk3 diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index ba35c24ecf5..c31eb244c52 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -6,7 +6,7 @@ , openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless , gtest, ncurses, spdlog , libxml2, systemd -, alsaLib, libGLU, libGL, fontconfig, freetype, ftgl +, alsa-lib, libGLU, libGL, fontconfig, freetype, ftgl , libjpeg, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt @@ -114,7 +114,7 @@ in stdenv.mkDerivation { gettext pcre-cpp yajl fribidi libva libdrm openssl gperf tinyxml2 taglib libssh gtest ncurses spdlog - alsaLib libGL libGLU fontconfig freetype ftgl + alsa-lib libGL libGLU fontconfig freetype ftgl libjpeg libpng libtiff libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 81b5be75f3b..352af7754c7 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv , gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU -, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev, libjack2 +, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsa-lib, udev, libjack2 }: let fullPath = lib.makeLibraryPath [ @@ -17,7 +17,7 @@ let zlib openssl libuuid - alsaLib + alsa-lib libjack2 udev ]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index b6bfa9d0dcf..bdcd3fbc8fd 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -5,7 +5,7 @@ , x11Support ? true, libX11 ? null, libXext ? null, libGLU, libGL ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null -, alsaSupport ? stdenv.isLinux, alsaLib ? null +, alsaSupport ? stdenv.isLinux, alsa-lib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? false, libvdpau ? null , cddaSupport ? !stdenv.isDarwin, cdparanoia ? null @@ -36,7 +36,7 @@ assert fribidiSupport -> (fribidi != null); assert x11Support -> (libX11 != null && libXext != null && libGLU != null && libGL != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); -assert alsaSupport -> alsaLib != null; +assert alsaSupport -> alsa-lib != null; assert screenSaverSupport -> libXScrnSaver != null; assert vdpauSupport -> libvdpau != null; assert cddaSupport -> cdparanoia != null; @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi ++ optionals x11Support [ libX11 libXext libGLU libGL ] - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional xvSupport libXv ++ optional theoraSupport libtheora ++ optional cacaSupport libcaca diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 99cb08a02a0..3bde1543057 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -30,7 +30,7 @@ , libdrm ? null , mesa ? null -, alsaSupport ? stdenv.isLinux, alsaLib ? null +, alsaSupport ? stdenv.isLinux, alsa-lib ? null , archiveSupport ? true, libarchive ? null , bluraySupport ? true, libbluray ? null , bs2bSupport ? true, libbs2b ? null @@ -61,7 +61,7 @@ with lib; let available = x: x != null; in -assert alsaSupport -> available alsaLib; +assert alsaSupport -> available alsa-lib; assert archiveSupport -> available libarchive; assert bluraySupport -> available libbluray; assert bs2bSupport -> available libbs2b; @@ -159,7 +159,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg freetype libass libpthreadstubs luaEnv libuchardet mujs - ] ++ optional alsaSupport alsaLib + ] ++ optional alsaSupport alsa-lib ++ optional archiveSupport libarchive ++ optional bluraySupport libbluray ++ optional bs2bSupport libbs2b diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 236aec2ee56..cf307f0da34 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper -, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype +, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsa-lib, freetype , perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders }: @@ -24,7 +24,7 @@ mkDerivation rec { buildInputs = [ freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL - perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC + perl libsamplerate libbluray lzo alsa-lib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 ]; nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ]; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 109744969c2..a50fe16660f 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -30,7 +30,7 @@ , python3 , alsaSupport ? stdenv.isLinux -, alsaLib +, alsa-lib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio , libcef @@ -77,7 +77,7 @@ in mkDerivation rec { mbedtls ] ++ optionals scriptingSupport [ luajit swig python3 ] - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio ++ optional pipewireSupport pipewire; diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 84f5ac56e7d..c3bcc09cd3f 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, doxygen -, alsaLib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor +, alsa-lib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor , zlib, AGL, Cocoa, Foundation }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { [ pkg-config cmake doxygen ]; buildInputs = - optionals stdenv.isLinux [ alsaLib ] + optionals stdenv.isLinux [ alsa-lib ] ++ (if stdenv.isDarwin then [ zlib AGL Cocoa Foundation ] else diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix index ecedd730094..0e0580b9f2a 100644 --- a/pkgs/applications/video/qmplay2/default.nix +++ b/pkgs/applications/video/qmplay2/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , pkg-config , cmake -, alsaLib +, alsa-lib , ffmpeg , libass , libcddb @@ -36,7 +36,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ - alsaLib + alsa-lib ffmpeg libass libcddb diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 14575a88dc1..34842b38743 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, alsaLib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras +{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras , libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja }: @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ - alsaLib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL + alsa-lib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL libpulseaudio libv4l qtbase qttools qtx11extras ]; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 4d90e6327b9..32a35eca920 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -7,7 +7,7 @@ , wrapGAppsHook , at-spi2-core , atk -, alsaLib +, alsa-lib , cairo , cups , dbus @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = with xorg; [ at-spi2-core atk - alsaLib + alsa-lib autoPatchelfHook cairo cups.lib diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 395de891eb9..cb2338c0e18 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchgit, vdr, alsa-lib, fetchFromGitHub , libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3 , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage @@ -54,7 +54,7 @@ in { buildInputs = [ vdr libxcb xcbutilwm ffmpeg_3 - alsaLib + alsa-lib libvdpau # vdpau libva # va-api ] ++ (with xorg; [ libxcb libX11 ]); diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index adb7ba970e2..ed597615130 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, autoreconfHook , libarchive, perl, xorg, libdvdnav, libbluray -, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib +, zlib, a52dec, libmad, faad2, ffmpeg, alsa-lib , pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # which are not included here for no other reason that nobody has mentioned # needing them buildInputs = [ - zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread + zlib a52dec libmad faad2 ffmpeg alsa-lib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec systemd gnutls avahi libcddb SDL SDL_image libmtp taglib libarchive diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index 598a162f399..aeea52a4ff5 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, mkDerivation -, pkg-config, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr +, pkg-config, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsa-lib, libv4l, libXrandr , ffmpeg }: @@ -17,7 +17,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ - alsaLib + alsa-lib libv4l qtbase qtmultimedia diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index aea8266b1d0..63f1e885af3 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, qmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 -, ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2 +, ffmpeg-full, gst_all_1, libpulseaudio, alsa-lib, jack2 , v4l-utils }: mkDerivation rec { pname = "webcamoid"; @@ -18,7 +18,7 @@ mkDerivation rec { qtbase qtdeclarative qtquickcontrols qtquickcontrols2 ffmpeg-full gst_all_1.gstreamer gst_all_1.gst-plugins-base - alsaLib libpulseaudio jack2 + alsa-lib libpulseaudio jack2 v4l-utils ]; diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 7660edcc768..3b486654aeb 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -1,5 +1,5 @@ { - alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype, + alsa-lib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core @@ -7,7 +7,7 @@ let rpath = lib.makeLibraryPath ([ - alsaLib + alsa-lib atk at-spi2-core at-spi2-atk diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index f197abacee0..5a6c6ff524e 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -7,7 +7,7 @@ , perlPackages , xvidcore , mjpegtools -, alsaLib +, alsa-lib , libv4l , cimg }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; buildInputs = with lib; - [ pkg-config intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ]; + [ pkg-config intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsa-lib libv4l cimg ]; NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg"; diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index 0945c5b3f3f..b046fbebaa2 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -4,7 +4,7 @@ , libjpeg , libX11 , libXt -, alsaLib +, alsa-lib , aalib , libXft , xorgproto @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { xorgproto libFS perl - alsaLib + alsa-lib aalib libXaw libXpm diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 0a9de4eb10a..7fd01a8ffa9 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib -, perl, pixman, vde2, alsaLib, texinfo, flex +, perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, gnutls, nettle, curl, ninja, meson , makeWrapper, autoPatchelfHook , attr, libcap, libcap_ng @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ++ optionals smartcardSupport [ libcacard ] ++ optionals spiceSupport [ spice-protocol spice ] ++ optionals usbredirSupport [ usbredir ] - ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] + ++ optionals stdenv.isLinux [ alsa-lib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ] ++ optionals cephSupport [ ceph ] ++ optionals glusterfsSupport [ glusterfs libuuid ] diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 2abb16298d4..2b27e3a7875 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkg-config, alsaLib, spice-protocol, glib, +{lib, stdenv, fetchurl, pkg-config, alsa-lib, spice-protocol, glib, libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm, systemd}: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib spice-protocol glib libdrm + buildInputs = [ alsa-lib spice-protocol glib libdrm libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 4f792b4eb6e..0bc3af364e6 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -2,7 +2,7 @@ , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 -, alsaLib, curl, libvpx, nettools, dbus, substituteAll +, alsa-lib, curl, libvpx, nettools, dbus, substituteAll # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). , open-watcom-bin ? null @@ -53,7 +53,7 @@ in stdenv.mkDerivation { buildInputs = [ iasl' dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL - libcap glib lvm2 alsaLib curl libvpx pam makeself perl + libcap glib lvm2 alsa-lib curl libvpx pam makeself perl libXmu libpng libopus python ] ++ optional javaBindings jdk ++ optional pythonBindings python # Python is needed even when not building bindings @@ -82,7 +82,7 @@ in stdenv.mkDerivation { s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g' grep 'libasound\.so\.2' src include -rI --files-with-match | xargs sed -i -e ' - s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g' + s@"libasound\.so\.2"@"${alsa-lib.out}/lib/libasound.so.2"@g' export USER=nix set +x diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index 765baa0a3b4..cb91d850563 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -10,7 +10,7 @@ # qemu , udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir -, alsaLib, glib, python2 +, alsa-lib, glib, python2 , ... } @ args: assert withInternalSeabios -> !withSeabios; @@ -33,7 +33,7 @@ let qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir - alsaLib glib python2 + alsa-lib glib python2 ]; in diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index ba284b76867..7b22eb39925 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 df774aa417f..4acc2fb669c 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/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 935a6c3c23b..8e9cb2d2b76 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { name = "i3status-2.13"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; - buildInputs = [ libconfuse yajl alsaLib libpulseaudio libnl ]; + buildInputs = [ libconfuse yajl alsa-lib libpulseaudio libnl ]; makeFlags = [ "all" "PREFIX=$(out)" ]; diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index cc99e79fca8..bd9bcb30d10 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git -, alsaLib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config +, alsa-lib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ - alsaLib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config + alsa-lib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config ]; mesonFlags = [ "--sysconfdir" "/etc" ]; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix index 43080f2eae7..e22b02825b7 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsaLib }: +{ lib, stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsa-lib }: stdenv.mkDerivation rec { pname = "AlsaMixer.app"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = dockapps-sources; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXpm libXext alsaLib ]; + buildInputs = [ libX11 libXpm libXext alsa-lib ]; setSourceRoot = '' export sourceRoot=$(echo */${pname}) diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index ec15f7e3627..f9b5d227b0e 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkg-config -, xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl +, xcbutilwm, alsa-lib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib , rev, sha256, version, patches ? [] }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl - alsaLib wirelesstools asciidoc libxslt makeWrapper + alsa-lib wirelesstools asciidoc libxslt makeWrapper ]; postPatch = '' diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 3a820853b1f..6ba5890885d 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -171,7 +171,7 @@ rec { librsvg xorg.libXft libvdpau - alsaLib + alsa-lib harfbuzz e2fsprogs diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index de90eab3ea1..f890d0a77a2 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -91,7 +91,7 @@ rec { nixFromDockerHub = pullImage { imageName = "nixos/nix"; imageDigest = "sha256:85299d86263a3059cf19f419f9d286cc9f06d3c13146a8ebbb21b3437f598357"; - sha256 = "07q9y9r7fsd18sy95ybrvclpkhlal12d30ybnf089hq7v1hgxbi7"; + sha256 = "19fw0n3wmddahzr20mhdqv6jkjn1kanh6n2mrr08ai53dr8ph5n7"; finalImageTag = "2.2.1"; finalImageName = "nix"; }; diff --git a/pkgs/data/misc/common-licenses/default.nix b/pkgs/data/misc/common-licenses/default.nix new file mode 100644 index 00000000000..a0c21b5d900 --- /dev/null +++ b/pkgs/data/misc/common-licenses/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchurl +, lib +}: + +stdenv.mkDerivation rec { + pname = "common-licenses"; + version = "11.1"; + + src = fetchurl { + url = "http://deb.debian.org/debian/pool/main/b/base-files/base-files_${version}.tar.xz"; + sha256 = "1i3hgd9vs14k819k441iibcgmi2zavnpqbnppyn2cz70kd830nbm"; + }; + + installPhase = '' + mkdir -p $out/share + cp -r licenses $out/share/common-licenses + cat debian/base-files.links | grep common-licenses | sed -e "s|usr|$out|g" -e "s|^|ln -s |g" | bash -x + ''; + + meta = with lib; { + description = "common-licenses extracted from debian base-files package"; + homepage = "https://tracker.debian.org/pkg/base-files"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix new file mode 100644 index 00000000000..03b1cca9fd8 --- /dev/null +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, lib +, fetchFromGitHub +, wrapGAppsHook +, python3 +, gsettings-desktop-schemas +, gettext +, gtk3 +, glib +, common-licenses +}: + +stdenv.mkDerivation rec { + pname = "bulky"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = "bulky"; + rev = version; + sha256 = "NBlP10IM/+u8IRds4bdFyGWg3pJLRmlSLsdlndMVQqg="; + }; + + nativeBuildInputs = [ + wrapGAppsHook + gsettings-desktop-schemas + gettext + ]; + + buildInputs = [ + (python3.withPackages(p: with p; [ pygobject3 magic setproctitle ])) + gsettings-desktop-schemas + gtk3 + glib + ]; + + postPatch = '' + substituteInPlace usr/lib/bulky/bulky.py \ + --replace "/usr/share/locale" "$out/share/locale" \ + --replace /usr/share/bulky "$out/share/bulky" \ + --replace /usr/share/common-licenses "${common-licenses}/share/common-licenses" \ + --replace __DEB_VERSION__ "${version}" + ''; + + installPhase = '' + runHook preInstall + chmod +x usr/share/applications/* + cp -ra usr $out + ln -sf $out/lib/bulky/bulky.py $out/bin/bulky + runHook postInstall + ''; + + meta = with lib; { + description = "Bulk rename app"; + homepage = "https://github.com/linuxmint/bulky"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 832a534e5da..6f54515569e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -15,6 +15,7 @@ , cinnamon-session , cinnamon-settings-daemon , cinnamon-common +, bulky }: let @@ -24,6 +25,7 @@ let mint-artwork # on + bulky muffin nemo xapps diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 2a52b83f046..4d148fdcdb0 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -13,6 +13,7 @@ lib.makeScope pkgs.newScope (self: with self; { }); # blueberry -> pkgs/tools/bluetooth/blueberry/default.nix + bulky = callPackage ./bulky {}; cinnamon-common = callPackage ./cinnamon-common { }; cinnamon-control-center = callPackage ./cinnamon-control-center { }; cinnamon-desktop = callPackage ./cinnamon-desktop { }; diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index a68886d414b..7e716ddb5c1 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -4,7 +4,7 @@ , ninja , pkg-config , SDL2 -, alsaLib +, alsa-lib , bullet , check , curl @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ SDL2 - alsaLib + alsa-lib bullet curl dbus diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 3b750bd08b7..84cadd20949 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -4,7 +4,7 @@ , ninja , pkg-config , gettext -, alsaLib +, alsa-lib , acpid , bc , ddcutil @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib acpid # for systems with ACPI for lid events, AC/Battery plug in/out etc bc # for the Everything module calculator mode ddcutil # specifically libddcutil.so.2 for backlight control diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index e091cf2365a..4a1b7f4c20c 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -14,7 +14,7 @@ , libgnomekbd , lcms2 , libpulseaudio -, alsaLib +, alsa-lib , libcanberra-gtk3 , upower , colord @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { gnome-desktop lcms2 libpulseaudio - alsaLib + alsa-lib libcanberra-gtk3 upower colord diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 15a3d918b95..548f8938959 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -20,7 +20,7 @@ , lxmenu-data , wirelesstools , curl -, supportAlsa ? false, alsaLib +, supportAlsa ? false, alsa-lib }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { m4 wirelesstools curl - ] ++ lib.optional supportAlsa alsaLib; + ] ++ lib.optional supportAlsa alsa-lib; postPatch = '' substituteInPlace src/Makefile.in \ diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index c565c5b4c30..34578e6bc5f 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , pkg-config -, alsaLib +, alsa-lib , kguiaddons , kwindowsystem , libXdamage @@ -46,7 +46,7 @@ mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib kguiaddons kwindowsystem libXdamage diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 9d42c23c714..4fe73fadbc4 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, pkg-config, gettext, glib -, alsaSupport ? stdenv.isLinux, alsaLib +, alsaSupport ? stdenv.isLinux, alsa-lib , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , ossSupport ? false , mateUpdateScript @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ glib ] - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio; configureFlags = lib.optional ossSupport "--enable-oss"; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 43fd7a69e8a..568414aab35 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -15,7 +15,7 @@ , libgnomekbd , lcms2 , libpulseaudio -, alsaLib +, alsa-lib , libcanberra-gtk3 , upower , colord @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice - alsaLib + alsa-lib colord gcr geoclue2 diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index e304f67bd75..f61d925036c 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -7,7 +7,7 @@ , makeWrapper , setJavaClassPath # minimum dependencies -, alsaLib +, alsa-lib , fontconfig , freetype , libffi @@ -44,7 +44,7 @@ let result = stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib # libasound.so wanted by lib/libjsound.so + alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype stdenv.cc.cc.lib # libstdc++.so.6 diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 747de25142e..c8a1964814e 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -6,7 +6,7 @@ args@ , developerProgram ? false , runPatches ? [] , addOpenGLRunpath -, alsaLib +, alsa-lib , expat , fetchurl , fontconfig @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ ncurses5 expat python27 zlib glibc xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext - gtk2 glib fontconfig freetype unixODBC alsaLib + gtk2 glib fontconfig freetype unixODBC alsa-lib ]; rpath = "${lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64"; diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 27436d8b614..5cab3b929f7 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -14,7 +14,7 @@ , stdenv , lib , fetchurl -, alsaLib +, alsa-lib , dbus , expat , libpulseaudio @@ -107,7 +107,7 @@ let libGLU # for android emulator - alsaLib + alsa-lib dbus expat libpulseaudio diff --git a/pkgs/development/compilers/graalvm/community-edition.nix b/pkgs/development/compilers/graalvm/community-edition.nix index 3a8fca2c1a0..0d12d5fe2df 100644 --- a/pkgs/development/compilers/graalvm/community-edition.nix +++ b/pkgs/development/compilers/graalvm/community-edition.nix @@ -6,7 +6,7 @@ , makeWrapper # minimum dependencies , Foundation -, alsaLib +, alsa-lib , fontconfig , freetype , glibc @@ -82,7 +82,7 @@ let ]; buildInputs = lib.optionals stdenv.isLinux [ - alsaLib # libasound.so wanted by lib/libjsound.so + alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index eb3045d52ad..f3ca8a4f5bb 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, setJavaClassPath }: +{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsa-lib, setJavaClassPath }: let common = javaVersion: @@ -125,7 +125,7 @@ let }.${javaVersion} }:${ lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender - glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" + glib zlib bzip2 alsa-lib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" for f in $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 15238e63ecb..ef593422ff2 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap , setJavaClassPath @@ -27,7 +27,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 33169be5302..66aeff306e3 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch , setJavaClassPath @@ -24,7 +24,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk11 ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index d3db493c5fe..96a567895d6 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , setJavaClassPath @@ -24,7 +24,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 3804999376e..fae27b8ca75 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk14-bootstrap , setJavaClassPath @@ -24,7 +24,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index 6430c970936..11333b1ef66 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk15-bootstrap , setJavaClassPath @@ -24,7 +24,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip zip file which ]; buildInputs = [ - cpio perl zlib cups freetype alsaLib libjpeg giflib + cpio perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 9a710ed6fa4..99033e8738c 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio -, file, which, unzip, zip, perl, cups, freetype, alsaLib, libjpeg, giflib +, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap , setJavaClassPath @@ -28,7 +28,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk16-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 423c09d923a..7a69038d5e0 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkg-config, lndir, bash, cpio, file, which, unzip, zip -, cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib +, cups, freetype, alsa-lib, cacert, perl, liberation_ttf, fontconfig, zlib , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , openjdk8-bootstrap @@ -85,7 +85,7 @@ let nativeBuildInputs = [ pkg-config lndir unzip ]; buildInputs = [ - cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsaLib + cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsa-lib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 306130a0991..228dbf9b14e 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python, ruby , openjdk11-bootstrap }: let @@ -19,7 +19,7 @@ let sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index e5da2bc3fe0..c36cbaa03f9 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen -, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib +, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib , ffmpeg, python3, ruby }: let @@ -21,7 +21,7 @@ let sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index ca8f4106f3d..713b32a349b 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -26,7 +26,7 @@ , gtk2 , pango , cairo -, alsaLib +, alsa-lib , atk , gdk-pixbuf , setJavaClassPath @@ -168,7 +168,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsa-lib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc]; rpath = lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix index eafe23c8e76..a232b796a06 100644 --- a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix @@ -3,7 +3,7 @@ , xorg , zlib , freetype -, alsaLib +, alsa-lib , setJavaClassPath }: @@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec { ''; postFixup = '' - rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}" + rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}" for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true diff --git a/pkgs/development/compilers/oraclejdk/jdk14-linux.nix b/pkgs/development/compilers/oraclejdk/jdk14-linux.nix index b1655cd8b8f..6604ebbef82 100644 --- a/pkgs/development/compilers/oraclejdk/jdk14-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk14-linux.nix @@ -3,7 +3,7 @@ , xorg , zlib , freetype -, alsaLib +, alsa-lib , setJavaClassPath }: @@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec { ''; postFixup = '' - rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}" + rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}" for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 591f10b3be9..6fcdacf535b 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -7,7 +7,7 @@ , setJavaClassPath , zulu # minimum dependencies -, alsaLib +, alsa-lib , fontconfig , freetype , xorg @@ -49,7 +49,7 @@ in stdenv.mkDerivation { }; buildInputs = lib.optionals stdenv.isLinux [ - alsaLib # libasound.so wanted by lib/libjsound.so + alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype stdenv.cc.cc # libstdc++.so.6 diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index cd118187748..81edb8b469a 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -7,7 +7,7 @@ , setJavaClassPath , zulu # minimum dependencies -, alsaLib +, alsa-lib , fontconfig , freetype , zlib @@ -50,7 +50,7 @@ in stdenv.mkDerivation { }; buildInputs = lib.optionals stdenv.isLinux [ - alsaLib # libasound.so wanted by lib/libjsound.so + alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype stdenv.cc.cc # libstdc++.so.6 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 459821f253f..2d65d3355cc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -15890,7 +15890,7 @@ self: { }) {}; "PortMidi" = callPackage - ({ mkDerivation, alsaLib, base }: + ({ mkDerivation, alsa-lib, base }: mkDerivation { pname = "PortMidi"; version = "0.2.0.0"; @@ -15898,13 +15898,13 @@ self: { revision = "1"; editedCabalFile = "0h3gql271mdz3kh0jgimxv8ada34b0h4n8wnyf5i759fqxpf6w86"; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ alsaLib ]; + librarySystemDepends = [ alsa-lib ]; description = "A binding for PortMedia/PortMidi"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "PortMidi-simple" = callPackage ({ mkDerivation, base, PortMidi }: @@ -17168,7 +17168,7 @@ self: { }) {}; "RtMidi" = callPackage - ({ mkDerivation, alsaLib, base, deepseq, pretty-simple, tasty + ({ mkDerivation, alsa-lib, base, deepseq, pretty-simple, tasty , tasty-hunit, unliftio-core, vector }: mkDerivation { @@ -17178,14 +17178,14 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq unliftio-core vector ]; - librarySystemDepends = [ alsaLib ]; + librarySystemDepends = [ alsa-lib ]; executableHaskellDepends = [ base pretty-simple vector ]; testHaskellDepends = [ base tasty tasty-hunit vector ]; description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "RxHaskell" = callPackage ({ mkDerivation, base, containers, stm, transformers }: @@ -26730,7 +26730,7 @@ self: { }) {}; "alsa" = callPackage - ({ mkDerivation, alsaLib, array, base, extensible-exceptions + ({ mkDerivation, alsa-lib, array, base, extensible-exceptions , sample-frame }: mkDerivation { @@ -26740,27 +26740,27 @@ self: { libraryHaskellDepends = [ array base extensible-exceptions sample-frame ]; - librarySystemDepends = [ alsaLib ]; + librarySystemDepends = [ alsa-lib ]; description = "Binding to the ALSA Library API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "alsa-core" = callPackage - ({ mkDerivation, alsaLib, base, extensible-exceptions }: + ({ mkDerivation, alsa-lib, base, extensible-exceptions }: mkDerivation { pname = "alsa-core"; version = "0.5.0.1"; sha256 = "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b"; libraryHaskellDepends = [ base extensible-exceptions ]; - libraryPkgconfigDepends = [ alsaLib ]; + libraryPkgconfigDepends = [ alsa-lib ]; description = "Binding to the ALSA Library API (Exceptions)"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "alsa-gui" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, midi, midi-alsa, wx @@ -26781,7 +26781,7 @@ self: { }) {}; "alsa-midi" = callPackage - ({ mkDerivation, alsaLib, array, base, event-list, midi + ({ mkDerivation, alsa-lib, array, base, event-list, midi , non-negative }: mkDerivation { @@ -26794,32 +26794,32 @@ self: { libraryHaskellDepends = [ array base event-list midi non-negative ]; - librarySystemDepends = [ alsaLib ]; - executableSystemDepends = [ alsaLib ]; + librarySystemDepends = [ alsa-lib ]; + executableSystemDepends = [ alsa-lib ]; description = "Bindings for the ALSA sequencer API (MIDI stuff)"; license = "GPL"; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "alsa-mixer" = callPackage - ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }: + ({ mkDerivation, alsa-core, alsa-lib, base, c2hs, unix }: mkDerivation { pname = "alsa-mixer"; version = "0.3.0"; sha256 = "00ny2p3276jilidjs44npc8zmbhynz3f2lpmlwwl6swwx5yijsnb"; libraryHaskellDepends = [ alsa-core base unix ]; - librarySystemDepends = [ alsaLib ]; + librarySystemDepends = [ alsa-lib ]; libraryToolDepends = [ c2hs ]; description = "Bindings to the ALSA simple mixer API"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "alsa-pcm" = callPackage - ({ mkDerivation, alsa-core, alsaLib, array, base + ({ mkDerivation, alsa-core, alsa-lib, array, base , extensible-exceptions, sample-frame, semigroups, storable-record }: mkDerivation { @@ -26832,13 +26832,13 @@ self: { alsa-core array base extensible-exceptions sample-frame semigroups storable-record ]; - libraryPkgconfigDepends = [ alsaLib ]; + libraryPkgconfigDepends = [ alsa-lib ]; description = "Binding to the ALSA Library API (PCM audio)"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "alsa-pcm-tests" = callPackage ({ mkDerivation, alsa, base }: @@ -26855,7 +26855,7 @@ self: { }) {}; "alsa-seq" = callPackage - ({ mkDerivation, alsa-core, alsaLib, array, base, bytestring + ({ mkDerivation, alsa-core, alsa-lib, array, base, bytestring , data-accessor, enumset, extensible-exceptions, poll, transformers , utility-ht }: @@ -26869,13 +26869,13 @@ self: { alsa-core array base bytestring data-accessor enumset extensible-exceptions poll transformers utility-ht ]; - libraryPkgconfigDepends = [ alsaLib ]; + libraryPkgconfigDepends = [ alsa-lib ]; description = "Binding to the ALSA Library API (MIDI sequencer)"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "alsa-seq-tests" = callPackage ({ mkDerivation, alsa, base }: diff --git a/pkgs/development/interpreters/python/conda/default.nix b/pkgs/development/interpreters/python/conda/default.nix index 5249ccce0d9..77bda13f266 100644 --- a/pkgs/development/interpreters/python/conda/default.nix +++ b/pkgs/development/interpreters/python/conda/default.nix @@ -4,7 +4,7 @@ # When installing a conda binary package, just extend # the `buildInputs` with `condaAutopatchLibs`. condaPatchelfLibs = builtins.map (p: p.lib or p) ([ - pkgs.alsaLib + pkgs.alsa-lib pkgs.cups pkgs.gcc-unwrapped pkgs.libGL diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index b7efc37ae04..fc8d8f1652d 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, alsaLib +{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, alsa-lib , libjack2, libsndfile, fftw, curl, gcc , libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs @@ -27,7 +27,7 @@ mkDerivation rec { buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] - ++ optional (!stdenv.isDarwin) alsaLib + ++ optional (!stdenv.isDarwin) alsa-lib ++ optional useSCEL emacs; meta = with lib; { diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index b51bc3f7cdd..bf76bc1e857 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL, libGLU -, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid , libXext, libICE, libXrandr , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio @@ -17,7 +17,7 @@ let extraPropagatedBuildInputs = [ ] ++ optionals x11Support [ libXext libICE libXrandr ] ++ optionals openglSupport [ libGL libGLU ] - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; rpath = makeLibraryPath extraPropagatedBuildInputs; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { # Please try revert the change that introduced this comment when updating SDL. ] ++ optional stdenv.isDarwin "--disable-x11-shared" ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"; + ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"; patches = [ ./find-headers.patch diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index f70a46e2f8e..d02dac1f562 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, config, fetchurl, pkg-config , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL -, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib , x11Support ? !stdenv.targetPlatform.isWindows && !stdenv.hostPlatform.isAndroid , libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor , libXinerama, libXext, libXxf86vm, libXrandr @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ++ optionals x11Support [ libX11 xorgproto ]; dlopenBuildInputs = [ ] - ++ optionals alsaSupport [ alsaLib audiofile ] + ++ optionals alsaSupport [ alsa-lib audiofile ] ++ optional dbusSupport dbus ++ optional pulseaudioSupport libpulseaudio ++ optional udevSupport udev @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-oss" ] ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib" + ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" ++ optional stdenv.targetPlatform.isWindows "--disable-video-opengles" ++ optional stdenv.isDarwin "--disable-sdltest"; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 31434741126..5cd6584f18f 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 -, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis +, libXpm, libXt, libXcursor, alsa-lib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL, libjpeg, flac , libXi, libXfixes, freetype, libopus, libtheora @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo libXext xorgproto libX11 libXpm libXt libXcursor - alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc + alsa-lib cmake zlib libpng libvorbis libXxf86dga libXxf86misc libXxf86vm openal libGLU libGL libjpeg flac libXi libXfixes diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 9fefbe01ace..6abf632806a 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11 -, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis +, libXpm, libXt, libXcursor, alsa-lib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo6_5 libXext xorgproto libX11 libXpm libXt libXcursor - alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc + alsa-lib cmake zlib libpng libvorbis libXxf86dga libXxf86misc libXxf86vm openal libGLU libGL ]; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 5693a5968b6..e3bc04a6d22 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q2.2"; + version = "2021.Q2.4"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "4k9ZkBxJGuNUO44F9D+u54eUREl5/8zxjxhaShhzGv0="; + sha256 = "KPWkwbD55BoztF6DPmvau9i1AMhR+5ad5VrrD8I2YyI="; }; buildInputs = [ diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index b1c6c6396c8..e1f2d326879 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate +{ lib, stdenv, fetchurl, alsa-lib, fftw, libjack2, libsamplerate , libsndfile, pkg-config, python3, wafHook }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config python3 wafHook ]; - buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ]; + buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ]; strictDeps = true; diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index 03048abcc32..4f2f78f20cf 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -6,7 +6,7 @@ , cmake , pkg-config , alsaSupport ? stdenv.hostPlatform.isLinux -, alsaLib +, alsa-lib , pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio , jackSupport ? true @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optional alsaSupport alsaLib + buildInputs = lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional jackSupport jack ++ lib.optional coreaudioSupport CoreAudio; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index ccfafd36a8a..6c75b9866e8 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -5,7 +5,7 @@ , cmake , pkg-config , alsaSupport ? stdenv.hostPlatform.isLinux -, alsaLib +, alsa-lib , jackSupport ? true , jack , coremidiSupport ? stdenv.hostPlatform.isDarwin @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optional alsaSupport alsaLib + buildInputs = lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport jack ++ lib.optionals coremidiSupport [ CoreMIDI CoreAudio CoreServices ]; diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index 45f5fcfe3a4..afecd561b72 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl , alsaLib, }: +{ lib, stdenv, fetchurl , alsa-lib, }: stdenv.mkDerivation rec { pname = "zita-alsa-pcmi"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s"; }; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; buildPhase = '' cd source diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 88b1840955d..54df6d7b255 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, alsaLib, AudioUnit, CoreServices }: +{ stdenv, lib, fetchurl, fetchpatch, alsa-lib, AudioUnit, CoreServices }: let @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isLinux [ - alsaLib + alsa-lib ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit ]; diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/development/libraries/clanlib/default.nix index 15fd9cd7286..0a0f976e0dc 100644 --- a/pkgs/development/libraries/clanlib/default.nix +++ b/pkgs/development/libraries/clanlib/default.nix @@ -10,7 +10,7 @@ , freetype , fontconfig , xlibsWrapper -, alsaLib +, alsa-lib , libXrender }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { freetype fontconfig xlibsWrapper - alsaLib + alsa-lib libXrender ]; diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index fb0d6afc710..ba3768227f3 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook -, alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio +, alsa-lib, fluidsynth, qtbase, qtsvg, libpulseaudio }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib fluidsynth libpulseaudio qtbase qtsvg + alsa-lib fluidsynth libpulseaudio qtbase qtsvg ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 9ce487b1b03..ca7ea10afff 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM +{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsa-lib, qt4, libX11, libsndfile, libSM , libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ ladspaH libjack2 liblo alsaLib qt4 libX11 libsndfile libSM + [ ladspaH libjack2 liblo alsa-lib qt4 libX11 libsndfile libSM libsamplerate libtool autoconf automake xorgproto libICE pkg-config ]; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index dcd1388143d..98d8ef434e0 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -47,7 +47,7 @@ /* * External libraries options */ -, alsaLib ? null # Alsa in/output support +, alsa-lib ? null # Alsa in/output support #, avisynth ? null # Support for reading AviSynth scripts , bzip2 ? null , celt ? null # CELT decoder @@ -433,7 +433,7 @@ stdenv.mkDerivation rec { ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf - ++ optionals isLinux [ alsaLib libraw1394 libv4l vulkan-loader glslang ] + ++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ] ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx ++ optional nvenc nv-codec-headers ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7e4a6a08098..d52abd4ab09 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm -, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg +, alsa-lib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d , openglSupport ? false, libGLU ? null, libGL ? null @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional ((isLinux || isFreeBSD) && !isAarch32) libdrm - ++ optional isLinux alsaLib + ++ optional isLinux alsa-lib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL) diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index a80c317b06e..cd8eb538462 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, alsa-lib, fetchpatch }: stdenv.mkDerivation rec { pname = "flite"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf"; }; - buildInputs = lib.optionals stdenv.isLinux [ alsaLib ]; + buildInputs = lib.optionals stdenv.isLinux [ alsa-lib ]; # https://github.com/festvox/flite/pull/60. # Replaces `ar` with `$(AR)` in config/common_make_rules. diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 7e9095ef0ed..699f70a0788 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -26,7 +26,7 @@ , wayland , wayland-protocols , enableAlsa ? stdenv.isLinux -, alsaLib +, alsa-lib # Enabling Cocoa seems to currently not work, giving compile # errors. Suspected is that a newer version than clang # is needed than 5.0 but it is not clear. @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { pango OpenGL ] ++ lib.optionals enableAlsa [ - alsaLib + alsa-lib ] ++ lib.optionals enableX11 [ libXext libXv diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 99d38f0cfc4..4a07ba9da7d 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, libpulseaudio, alsaLib, libcap +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, libpulseaudio, alsa-lib, libcap , CoreAudio, CoreServices, AudioUnit , usePulseAudio }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ lib.optional usePulseAudio libpulseaudio ++ - lib.optionals stdenv.isLinux [ alsaLib libcap ] ++ + lib.optionals stdenv.isLinux [ alsa-lib libcap ] ++ lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 0127c1ebe8a..5d4bca0f1b9 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -2,7 +2,7 @@ , gtk ? null , libpulseaudio, gst_all_1, libvorbis, libcap , CoreServices -, withAlsa ? stdenv.isLinux, alsaLib }: +, withAlsa ? stdenv.isLinux, alsa-lib }: stdenv.mkDerivation rec { name = "libcanberra-0.30"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional stdenv.isDarwin CoreServices ++ lib.optional stdenv.isLinux libcap - ++ lib.optional withAlsa alsaLib; + ++ lib.optional withAlsa alsa-lib; configureFlags = [ "--disable-oss" ]; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index ec1a5ee3828..8f01958a9bc 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig +{ lib, stdenv, fetchurl, cmake, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig , GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver , libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core @@ -7,7 +7,7 @@ let libPath = lib.makeLibraryPath [ - alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2 + alsa-lib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2 libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio systemd at-spi2-core at-spi2-atk diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index a734a4b8009..02ccf0c66fb 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }: +{ lib, stdenv, fetchurl, texinfo, alsa-lib, libpulseaudio, CoreAudio }: let inherit (lib) optional optionalString; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ texinfo ] - ++ optional stdenv.isLinux alsaLib + ++ optional stdenv.isLinux alsa-lib ++ optional stdenv.isDarwin CoreAudio; propagatedBuildInputs = optional stdenv.isLinux libpulseaudio; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index fc577d7e508..e9a54dc478c 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -2,7 +2,7 @@ , qtbase, qtmultimedia, qtquick1, qttools , libGL, libX11 , libass, openal, ffmpeg, libuchardet -, alsaLib, libpulseaudio, libva +, alsa-lib, libpulseaudio, libva }: with lib; @@ -16,7 +16,7 @@ mkDerivation rec { qtbase qtmultimedia qtquick1 libGL libX11 libass openal ffmpeg libuchardet - alsaLib libpulseaudio libva + alsa-lib libpulseaudio libva ]; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index ac9f3b25654..2ef629e5467 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }: +{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, libjack2, libpulseaudio, AudioUnit }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libjack2 libpulseaudio ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional stdenv.isDarwin AudioUnit; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 004460abe31..d9be4a2964f 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libspotify, alsaLib, readline, pkg-config, apiKey ? null, unzip, gnused }: +{ lib, stdenv, fetchurl, libspotify, alsa-lib, readline, pkg-config, apiKey ? null, unzip, gnused }: let version = "12.1.51"; @@ -67,7 +67,7 @@ else stdenv.mkDerivation { src = libspotify.src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libspotify readline ] - ++ lib.optional (!stdenv.isDarwin) alsaLib; + ++ lib.optional (!stdenv.isDarwin) alsa-lib; postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples"; patchPhase = "cp ${apiKey} appkey.c"; installPhase = '' diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/pkgs/development/libraries/libtgvoip/default.nix index 920315bb1bc..dcf8990a879 100644 --- a/pkgs/development/libraries/libtgvoip/default.nix +++ b/pkgs/development/libraries/libtgvoip/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkg-config, autoreconfHook -, openssl, libopus, alsaLib, libpulseaudio +, openssl, libopus, alsa-lib, libpulseaudio }: with lib; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ openssl libopus alsaLib libpulseaudio ]; + buildInputs = [ openssl libopus alsa-lib libpulseaudio ]; enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index f8dfa80a959..9261d1b81ba 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "unstable-2020-01-20"; + version = "unstable-2021-03-09"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "43a103ff17ee5872669f8712606578c90c14591d"; - sha256 = "0cihgckghamcfxrvqjjn69giib80xhsqaj98ldn0gd96zqh96sd4"; + rev = "551d75b5662cccd0466b990d58136bdf799a804d"; + sha256 = "05cnjjqjv9nvrs1d8pg4xxxf27jryiv6xk8plmdpmm7r2wkvwn3r"; }; cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ]; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 6b7f0c102ee..b93cc96bde0 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3, - alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: + alsa-lib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: stdenv.mkDerivation rec { name = "lirc-0.10.1"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config help2man (python3.withPackages (p: with p; [ pyyaml setuptools ])) ]; - buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ]; + buildInputs = [ alsa-lib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ]; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 452031dc924..5d9cc98b1a9 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , bctoolbox , bzrtp , cmake @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - alsaLib + alsa-lib bctoolbox bzrtp ffmpeg diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 43c781cf52c..2d469a406de 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake -, alsaSupport ? !stdenv.isDarwin, alsaLib ? null +, alsaSupport ? !stdenv.isDarwin, alsa-lib ? null , pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null , CoreServices, AudioUnit, AudioToolbox }: with lib; -assert alsaSupport -> alsaLib != null; +assert alsaSupport -> alsa-lib != null; assert pulseSupport -> libpulseaudio != null; stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [] - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional pulseSupport libpulseaudio ++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index ebdacdfc9bd..2c7dd440da8 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchFromGitHub , autoconf, automake, which, libtool, pkg-config -, portaudio, alsaLib +, portaudio, alsa-lib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake which libtool pkg-config ]; buildInputs = [ portaudio ] - ++ lib.optionals stdenv.isLinux [ alsaLib ] + ++ lib.optionals stdenv.isLinux [ alsa-lib ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index 1e686b98004..276ad6b8c49 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg +, glib, dbus, gst_all_1, alsa-lib, ffmpeg_4, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer - alsaLib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2 + alsa-lib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index b3e740f39c4..40f4e328c31 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -11,7 +11,7 @@ , valgrind , glib , dbus -, alsaLib +, alsa-lib , libjack2 , udev , libva @@ -85,7 +85,7 @@ let ]; buildInputs = [ - alsaLib + alsa-lib dbus glib libjack2 diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index c7de116e879..efa68146e8d 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, pkg-config, libjack2 +{ lib, stdenv, fetchurl, alsa-lib, pkg-config, libjack2 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ] - ++ lib.optional (!stdenv.isDarwin) alsaLib; + ++ lib.optional (!stdenv.isDarwin) alsa-lib; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation { make install '' + lib.optionalString (!stdenv.isDarwin) '' # fixup .pc file to find alsa library - sed -i "s|-lasound|-L${alsaLib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc + sed -i "s|-lasound|-L${alsa-lib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc '' + lib.optionalString stdenv.isDarwin '' cp include/pa_mac_core.h $out/include/pa_mac_core.h ''; diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index e9a868240bb..0151d461c13 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }: +{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsa-lib }: stdenv.mkDerivation rec { pname = "portmidi"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ unzip cmake ]; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 532a72c820c..ed93d86a197 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -3,7 +3,7 @@ , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng , libmng, which, libGLU, openssl, dbus, cups, pkg-config , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi -, alsaLib +, alsa-lib , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2, gdk-pixbuf , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 0af773947f0..0d2d565fe7a 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -1,5 +1,5 @@ { qtModule, lib, stdenv, qtbase, qtdeclarative, pkg-config -, alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland +, alsa-lib, gstreamer, gst-plugins-base, libpulseaudio, wayland }: with lib; @@ -9,7 +9,7 @@ qtModule { qtInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base libpulseaudio ] - ++ optional (stdenv.isLinux) alsaLib + ++ optional (stdenv.isLinux) alsa-lib ++ optional (versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; outputs = [ "bin" "dev" "out" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 13ab7e35c5a..729c5f388f9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -8,7 +8,7 @@ , fontconfig, freetype, harfbuzz, icu, dbus, libdrm , zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus , jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent -, alsaLib +, alsa-lib , libcap , pciutils , systemd @@ -156,7 +156,7 @@ qtModule { dbus zlib minizip snappy nss protobuf jsoncpp # Audio formats - alsaLib + alsa-lib # Text rendering fontconfig freetype diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 16f6c324a7a..836bafd4280 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, cmake, mesa, libGLU, glfw, libX11, libXi, libXcursor, libXrandr, libXinerama, - alsaSupport ? stdenv.hostPlatform.isLinux, alsaLib, + alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio, sharedLib ? true, includeEverything ? true @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ mesa libGLU glfw libX11 libXi libXcursor libXrandr libXinerama - ] ++ lib.optional alsaSupport alsaLib + ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio; # https://github.com/raysan5/raylib/wiki/CMake-Build-Options @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # fix libasound.so/libpulse.so not being found preFixup = '' - ${lib.optionalString alsaSupport "patchelf --add-needed ${alsaLib}/lib/libasound.so $out/lib/libraylib.so.${version}"} + ${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${version}"} ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"} ''; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 4948e481ff5..41d776c6869 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -1,4 +1,4 @@ -# alsaLib vorbis-tools python can be made optional +# alsa-lib vorbis-tools python can be made optional { lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index c54b4a3721f..8706b878922 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, ncurses }: +{ lib, stdenv, fetchurl, alsa-lib, ncurses }: stdenv.mkDerivation rec { name = "speech_tools-${version}.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4"; }; - buildInputs = [ alsaLib ncurses ]; + buildInputs = [ alsa-lib ncurses ]; preConfigure = '' sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 0f16a519169..80034a5a9cf 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -15,7 +15,7 @@ , libsndfile , withLibao ? true, libao , withPulse ? false, libpulseaudio -, withAlsa ? false, alsaLib +, withAlsa ? false, alsa-lib , withOss ? false , withFlite ? true, flite # , withFestival ? false, festival-freebsoft-utils @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { libsndfile libao libpulseaudio - alsaLib + alsa-lib python ] ++ optionals withEspeak [ espeak diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 584b1e15a8e..ff1f5eb8041 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -4,7 +4,7 @@ , ninja , pkg-config , pixman -, alsaLib +, alsa-lib , openssl , libXrandr , libXfixes @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib cyrus_sasl glib gst_all_1.gst-plugins-base diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix index db947d373a2..4bbec39291a 100644 --- a/pkgs/development/libraries/ubus/default.nix +++ b/pkgs/development/libraries/ubus/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation { pname = "ubus"; - version = "unstable-2020-01-05"; + version = "unstable-2021-02-15"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; - rev = "d35df8adda873dc75d876f72b78e84db8cfa72ee"; - sha256 = "1ksrih5vfyixaafzsrs6ab88qw34d0197wvw201jl5p1fc7drgn4"; + rev = "2537be01858710e714c329153760c64fe3f8a73e"; + sha256 = "03ljxsn4w87bfrilccxhrkzqmd30hy6ihkvsinw0i3l7rpp5m4a7"; }; - cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; + cmakeFlags = [ "-DBUILD_LUA=OFF" ]; buildInputs = [ libubox libjson ]; nativeBuildInputs = [ cmake ]; meta = with lib; { description = "OpenWrt system message/RPC bus"; homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.all; maintainers = with maintainers; [ petabyteboy ]; }; diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix index 0a5af8b907b..49aba6cd183 100644 --- a/pkgs/development/libraries/uci/default.nix +++ b/pkgs/development/libraries/uci/default.nix @@ -2,23 +2,23 @@ stdenv.mkDerivation { pname = "uci"; - version = "unstable-2020-04-27"; + version = "unstable-2021-04-14"; src = fetchgit { url = "https://git.openwrt.org/project/uci.git"; - rev = "ec8d3233948603485e1b97384113fac9f1bab5d6"; - sha256 = "0p765l8znvwhzhgkq7dp36w62k5rmzav59vgdqmqq1bjmlz1yyi6"; + rev = "4b3db1179747b6a6779029407984bacef851325c"; + sha256 = "1zflxazazzkrycpflzfg420kzp7kgy4dlz85cms279vk07dc1d52"; }; hardeningDisable = [ "all" ]; - cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; + cmakeFlags = [ "-DBUILD_LUA=OFF" ]; buildInputs = [ libubox ]; nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { description = "OpenWrt Unified Configuration Interface"; homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.all; maintainers = with maintainers; [ petabyteboy ]; }; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 880823a8473..81c1b51e658 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, alsaLib, freepats }: +{ lib, stdenv, fetchurl, cmake, alsa-lib, freepats }: stdenv.mkDerivation rec { name = "wildmidi-0.4.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ alsaLib stdenv.cc.libc/*couldn't find libm*/ ]; + buildInputs = [ alsa-lib stdenv.cc.libc/*couldn't find libm*/ ]; preConfigure = '' substituteInPlace CMakeLists.txt \ diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 8915299a734..70fdf24dd9f 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , aalib -, alsaLib +, alsa-lib , ffmpeg , flac , libGL @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ aalib - alsaLib + alsa-lib ffmpeg flac libGL diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index c8fce166aa7..2746a60247b 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -26,7 +26,7 @@ deployAndroidPackage { pkgs.freetype pkgs.nss pkgs.nspr - pkgs.alsaLib + pkgs.alsa-lib ]; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib diff --git a/pkgs/development/octave-modules/audio/default.nix b/pkgs/development/octave-modules/audio/default.nix index 4fafefd6f75..0cb03746085 100644 --- a/pkgs/development/octave-modules/audio/default.nix +++ b/pkgs/development/octave-modules/audio/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , jack2 -, alsaLib +, alsa-lib , rtmidi , pkg-config }: @@ -22,7 +22,7 @@ buildOctavePackage rec { propagatedBuildInputs = [ jack2 - alsaLib + alsa-lib rtmidi ]; @@ -31,6 +31,6 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Audio and MIDI Toolbox for GNU Octave"; - platforms = platforms.linux; # Because of run-time dependency on jack2 and alsaLib + platforms = platforms.linux; # Because of run-time dependency on jack2 and alsa-lib }; } diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index c00c92a6c33..88ef9f9efde 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -10,7 +10,7 @@ , libGL , freetype , xorg -, alsaLib +, alsa-lib , cairo , libuuid , libnsl @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; buildInputs = [ bash glibc openssl libGLU libGL freetype - xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libnsl ]; + xorg.libX11 xorg.libICE xorg.libSM alsa-lib cairo pharo-share libnsl ]; LD_LIBRARY_PATH = lib.makeLibraryPath - [ cairo libGLU libGL freetype openssl libuuid alsaLib + [ cairo libGLU libGL freetype openssl libuuid alsa-lib xorg.libICE xorg.libSM ]; preConfigure = '' diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index c1f703f7251..498e5c41472 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -8,7 +8,7 @@ , libGLU, libGL , freetype , xorg -, alsaLib +, alsa-lib , cairo , libuuid , autoreconfHook @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libICE xorg.libSM - alsaLib + alsa-lib cairo pharo-share libuuid @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { freetype openssl libuuid - alsaLib + alsa-lib xorg.libICE xorg.libSM ]; diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index a8e3236a3a0..a51366820a9 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -11,7 +11,7 @@ , libGLU, libGL , freetype , xorg -, alsaLib +, alsa-lib , cairo , libuuid , autoreconfHook diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index b86980031fb..aaa698e6d0c 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.1.2"; + version = "2.1.3"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0gd4hxkxdds3nxpbcd38chrkijha31p6nygdq3f73mbb984h3v1d"; + sha256 = "04ad2zsnf8qi6hzs9sak6y8xxyx8l0f7crmcimnp7nn8vsc2x9zq"; }; dontUnpack = true; diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix index 2779feffee8..174ab6dc6c4 100644 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.21"; + version = "2.9.22"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "1pfiwq2wfw11vmxdq2yhk86hm5jljlrnphlzfjr01kwzfikkdp5m"; + sha256 = "0gkv59cfxzs0ahgkxmmx9sqnfb2xqr10q4yh2662nbzajmvqmfgm"; }; prePatch = '' diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index c3965b10a2a..e83a7919238 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7DpPbXEaee0jrqlUFjjTNT3D8IPyk6ExgLFLSC4+Ge8="; + sha256 = "sha256-lyJKGTJezuSaO/TfPuBTHTr5zyiLZ9CJp+9Eo8TqODk="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index afeefbdf55b..73cb44d0811 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.52"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.88"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-7WQMF8l68om+RpN0DBy/laRW6cSV45c6Htb1GjloRtI="; + sha256 = "sha256-pxXKbERX1W6j4+/em9yL5BwpsvKpBPvRK+/bnLXiieQ="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index f34cc34334d..a3c77e1fab7 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.52"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.88"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-3V9YCOxIqZm5Y0s4etarehojuh+XEqh1Bm0jSAj4qmI="; + sha256 = "sha256-vJie2rUtR4iq3Y0a/5JfXGp8vGiQC/2443mWWurBcxc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 1d919de6ee8..58920b40646 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -5,6 +5,7 @@ , asgi-csrf , click , click-default-group +, itsdangerous , janus , jinja2 , hupper @@ -17,56 +18,62 @@ , httpx # Check Inputs , pytestCheckHook -, pytestrunner +, pytest-runner , pytest-asyncio +, pytest-timeout , aiohttp , beautifulsoup4 , asgiref , setuptools +, trustme +, pythonOlder }: buildPythonPackage rec { pname = "datasette"; - version = "0.54.1"; + version = "0.57.1"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "simonw"; - repo = "datasette"; + repo = pname; rev = version; - sha256 = "sha256-Ixh56X9dI/FIJPXHXXGnFiYj3qeBmvW5L1FF7/0ofUQ="; + sha256 = "sha256-BHsf3GOganPhsDiZlRxvAsRZH/Sq+Jr+CZcc2ubce+8="; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ aiofiles asgi-csrf + asgiref click click-default-group + httpx + hupper + itsdangerous janus jinja2 - hupper mergedeep pint pluggy python-baseconv pyyaml - uvicorn setuptools - httpx - asgiref + uvicorn ]; checkInputs = [ - pytestCheckHook - pytest-asyncio aiohttp beautifulsoup4 + pytest-asyncio + pytest-timeout + pytestCheckHook + trustme ]; postConfigure = '' substituteInPlace setup.py \ - --replace "click~=7.1.1" "click" \ --replace "click-default-group~=1.2.2" "click-default-group" \ --replace "hupper~=1.9" "hupper" \ --replace "pint~=0.9" "pint" \ @@ -75,12 +82,13 @@ buildPythonPackage rec { --replace "PyYAML~=5.3" "PyYAML" ''; - # takes 30-180 mins to run entire test suite, not worth the cpu resources, slows down reviews - # with pytest-xdist, it still takes around 10mins with 32 cores + # takes 30-180 mins to run entire test suite, not worth the CPU resources, slows down reviews + # with pytest-xdist, it still takes around 10 mins with 32 cores # just run the csv tests, as this should give some indictation of correctness pytestFlagsArray = [ "tests/test_csv.py" ]; + disabledTests = [ "facet" "_invalid_database" # checks error message when connecting to invalid database @@ -97,10 +105,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "An instant JSON API for your SQLite databases"; - homepage = "https://github.com/simonw/datasette"; + description = "Multi-tool for exploring and publishing data"; + homepage = "https://datasette.io/"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; - } diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix index 107585f0416..e6098208033 100644 --- a/pkgs/development/python-modules/itemloaders/default.nix +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , w3lib , parsel , jmespath @@ -12,8 +12,7 @@ buildPythonPackage rec { pname = "itemloaders"; version = "1.0.4"; - - disabled = isPy27; + disabled = pythonOlder "3.6"; # Tests not included in PyPI tarball src = fetchFromGitHub { @@ -27,6 +26,14 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # Test are failing (AssertionError: Lists differ: ...) + "test_nested_css" + "test_nested_xpath" + ]; + + pythonImportsCheck = [ "itemloaders" ]; + meta = with lib; { description = "Base library for scrapy's ItemLoader"; homepage = "https://github.com/scrapy/itemloaders"; diff --git a/pkgs/development/python-modules/jsonstreams/default.nix b/pkgs/development/python-modules/jsonstreams/default.nix index 9042498664a..82152a8d112 100644 --- a/pkgs/development/python-modules/jsonstreams/default.nix +++ b/pkgs/development/python-modules/jsonstreams/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "jsonstreams"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dcbaker"; repo = pname; rev = version; - sha256 = "0c85fdqkj5k4b0v0ngx2d9qbmzdsvglh4j9k9h7508bvn7l8fa4b"; + sha256 = "0qw74wz9ngz9wiv89vmilbifsbvgs457yn1bxnzhrh7g4vs2wcav"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 860646af9c6..0c871c90a3a 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "4.12.0"; + version = "4.14.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - sha256 = "09kbmrpnph5kbxlqqavpxg3l85dmk3vzmwawa4s09y9gknxxkcv9"; + sha256 = "sha256-y55bPi70ldd528Olr2atXHm5JHiLNBZ396D9qwbBmkc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index af97c5e103f..bbbcc5a1492 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.17.71"; + version = "1.17.88"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0zgx3f41j80xy203jwms7j72svxy10ry5v9w3ql817ai4lcrspnn"; + sha256 = "sha256-ba7ohsScaag3tDnUbs1eWYO/YSWcgJlo9VpkdU40x5o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index ea9f0485bef..ba4725c9aaa 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/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index 319f83f7275..423f4eb0293 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -1,14 +1,13 @@ { lib , buildPythonPackage +, cssselect , fetchPypi -, pytest -, pytestrunner , functools32 +, isPy27 +, lxml +, pytestCheckHook , six , w3lib -, lxml -, cssselect -, isPy27 }: buildPythonPackage rec { @@ -20,17 +19,47 @@ buildPythonPackage rec { sha256 = "0yawf9r3r863lwxj0n89i7h3n8xjbsl5b7n6xg76r68scl5yzvvh"; }; - checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ six w3lib lxml cssselect ] ++ lib.optionals isPy27 [ functools32 ]; + propagatedBuildInputs = [ + cssselect + lxml + six + w3lib + ] ++ lib.optionals isPy27 [ + functools32 + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" ''; + disabledTests = [ + # Test are out-dated and are failing (AssertionError: Lists differ: ...) + # https://github.com/scrapy/parsel/pull/174 + "test_differences_parsing_xml_vs_html" + "test_nested_selectors" + "test_re" + "test_replacement_null_char_from_body" + "test_select_on_text_nodes" + "test_selector_get_alias" + "test_selector_getall_alias" + "test_selector_over_text" + "test_selectorlist_get_alias" + "test_selectorlist_getall_alias" + "test_slicing" + "test_text_pseudo_element" + ]; + + pythonImportsCheck = [ "parsel" ]; + meta = with lib; { homepage = "https://github.com/scrapy/parsel"; - description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors"; + description = "Python library to extract data from HTML and XML using XPath and CSS selectors"; license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index a249b0aede1..e9cff7eb824 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, GitPython , libpcap, meson, ninja, pillow, pkg-config, pygobject3, SDL2 -, alsaLib, soundtouch, openal +, alsa-lib, soundtouch, openal }: let @@ -26,7 +26,7 @@ buildPythonPackage rec { cp -R --no-preserve=mode ${desmume} __build_desmume ''; - buildInputs = [ GitPython libpcap SDL2 alsaLib soundtouch openal ]; + buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ]; nativeBuildInputs = [ meson ninja pkg-config ]; propagatedBuildInputs = [ pillow pygobject3 ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 9967394d28e..b41b7ddf320 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/development/python-modules/pynobo/default.nix b/pkgs/development/python-modules/pynobo/default.nix new file mode 100644 index 00000000000..52cada82781 --- /dev/null +++ b/pkgs/development/python-modules/pynobo/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pynobo"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "echoromeo"; + repo = pname; + rev = "v${version}"; + sha256 = "0f98qm9vp7f0hqaxhihv7y5swciyp60222la44f4936g0rvs005x"; + }; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pynobo" ]; + + meta = with lib; { + description = "Python 3 TCP/IP interface for Nobo Hub/Nobo Energy Control devices"; + homepage = "https://github.com/echoromeo/pynobo"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index aadf75d59f7..781231749fd 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 -, pkg-config, alsaLib, libjack2, tox, flake8, alabaster +, pkg-config, alsa-lib, libjack2, tox, flake8, alabaster }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib libjack2 ]; + buildInputs = [ alsa-lib libjack2 ]; checkInputs = [ tox flake8 diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix index 4e6da0b8d42..e1565fa6c30 100644 --- a/pkgs/development/python-modules/rtmidi-python/default.nix +++ b/pkgs/development/python-modules/rtmidi-python/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, cython, alsaLib }: +{ lib, buildPythonPackage, fetchPypi, cython, alsa-lib }: buildPythonPackage rec { pname = "rtmidi-python"; @@ -14,7 +14,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ cython ]; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; setupPyBuildFlags = [ "--from-cython" ]; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 0ef7378fbf6..e41e4165b9c 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.3.6"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "c5dadf598762899d8cfaecf68eba649cd25b0ce93b6c954b156aaa3eed160547"; + sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 08a3a596732..4ca07310658 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -1,64 +1,89 @@ { lib , stdenv +, botocore , buildPythonPackage -, isPy27 -, fetchPypi +, cryptography +, cssselect +, fetchFromGitHub +, fetchpatch , glibcLocales +, installShellFiles +, itemadapter +, itemloaders +, jmespath +, lxml +, parsel +, pillow +, protego +, pydispatcher +, pyopenssl +, pytest-twisted , pytestCheckHook +, pythonOlder +, queuelib +, service-identity +, sybil , testfixtures -, pillow , twisted -, cryptography , w3lib -, lxml -, queuelib -, pyopenssl -, service-identity -, parsel -, pydispatcher -, cssselect , zope_interface -, protego -, jmespath -, sybil -, pytest-twisted -, botocore -, itemadapter -, itemloaders }: buildPythonPackage rec { - version = "2.4.1"; - pname = "Scrapy"; + pname = "scrapy"; + version = "2.5.0"; + disabled = pythonOlder "3.6"; - disabled = isPy27; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "09lxnjz1cw37i9bgk8sci2xxknj20gi2lq8l7i0b3xw7q8bxzp7h"; + }; - checkInputs = [ - glibcLocales - jmespath - pytestCheckHook - sybil - testfixtures - pillow - pytest-twisted - botocore + nativeBuildInputs = [ + installShellFiles ]; propagatedBuildInputs = [ - twisted cryptography cssselect + itemadapter + itemloaders lxml parsel + protego pydispatcher pyopenssl queuelib service-identity + twisted w3lib zope_interface - protego - itemadapter - itemloaders + ]; + + checkInputs = [ + botocore + glibcLocales + jmespath + pytestCheckHook + sybil + testfixtures + ]; + + patches = [ + # Require setuptools, https://github.com/scrapy/scrapy/pull/5122 + (fetchpatch { + name = "add-setuptools.patch"; + url = "https://github.com/scrapy/scrapy/commit/4f500342c8ad4674b191e1fab0d1b2ac944d7d3e.patch"; + sha256 = "14030sfv1cf7dy4yww02b49mg39cfcg4bv7ys1iwycfqag3xcjda"; + }) + # Make Twisted[http2] installation optional, https://github.com/scrapy/scrapy/pull/5113 + (fetchpatch { + name = "remove-h2.patch"; + url = "https://github.com/scrapy/scrapy/commit/c5b1ee810167266fcd259f263dbfc0fe0204761a.patch"; + sha256 = "1gw28wg8qcb0al59rz214hm17smspi6j5kg62nr1r850pykyrsqk"; + }) ]; LC_ALL = "en_US.UTF-8"; @@ -68,39 +93,48 @@ buildPythonPackage rec { substituteInPlace pytest.ini --replace "--doctest-modules" "" ''; - pytestFlagsArray = [ - "--ignore=tests/test_proxy_connect.py" - "--ignore=tests/test_utils_display.py" - "--ignore=tests/test_command_check.py" + disabledTestPaths = [ + "tests/test_proxy_connect.py" + "tests/test_utils_display.py" + "tests/test_command_check.py" + # Don't test the documentation + "docs" ]; disabledTests = [ + # It's unclear if the failures are related to libxml2, https://github.com/NixOS/nixpkgs/pull/123890 + "test_nested_css" + "test_nested_xpath" + "test_flavor_detection" + # Requires network access "FTPFeedStorageTest" - "test_noconnect" - "test_retry_dns_error" + "FeedExportTest" "test_custom_asyncio_loop_enabled_true" "test_custom_loop_asyncio" + "test_custom_loop_asyncio_deferred_signal" "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157 ] ++ lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" "test_download" ]; - src = fetchPypi { - inherit pname version; - sha256 = "68c48f01a58636bdf0f6fcd5035a19ecf277b58af24bd70c36dc6e556df3e005"; - }; - postInstall = '' - install -m 644 -D extras/scrapy.1 $out/share/man/man1/scrapy.1 + installManPage extras/scrapy.1 install -m 644 -D extras/scrapy_bash_completion $out/share/bash-completion/completions/scrapy install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy ''; + pythonImportsCheck = [ "scrapy" ]; + __darwinAllowLocalNetworking = true; meta = with lib; { - description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; + description = "High-level web crawling and web scraping framework"; + longDescription = '' + Scrapy is a fast high-level web crawling and web scraping framework, used to crawl + websites and extract structured data from their pages. It can be used for a wide + range of purposes, from data mining to monitoring and automated testing. + ''; homepage = "https://scrapy.org/"; license = licenses.bsd3; maintainers = with maintainers; [ drewkett marsam ]; diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix index 948716a9b7c..4ab18efe332 100644 --- a/pkgs/development/python-modules/simpleaudio/default.nix +++ b/pkgs/development/python-modules/simpleaudio/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, buildPythonPackage, fetchFromGitHub, isPy27, lib }: +{ alsa-lib, buildPythonPackage, fetchFromGitHub, isPy27, lib }: buildPythonPackage rec { pname = "simpleaudio"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "12nypzb1m14yip4zrbzin5jc5awyp1d5md5y40g5anj4phb4hx1i"; }; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; meta = with lib; { homepage = "https://github.com/hamiltron/py-simple-audio"; diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index 568ce67d143..838ffd47184 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ]; + buildInputs = with pkgs; [ alsa-lib ffmpeg_3 libv4l sqlite libvpx ]; propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; meta = with lib; { diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index d256b6e767a..25d61d2393e 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -3,7 +3,7 @@ , zlib , xorg , freetype -, alsaLib +, alsa-lib , jdk11 , curl , lttng-ust @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.libXrender freetype - alsaLib + alsa-lib jdk11 stdenv.cc.cc.lib curl diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 3a210ab174f..5e457227c8d 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, scons, pkg-config, udev, libX11 , libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio , libXi, libXext, libXfixes, freetype, openssl -, alsaLib, libGLU, zlib, yasm +, alsa-lib, libGLU, zlib, yasm , withUdev ? true }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ scons udev libX11 libXcursor libXinerama libXrandr libXrender - libXi libXext libXfixes freetype openssl alsaLib libpulseaudio + libXi libXext libXfixes freetype openssl alsa-lib libpulseaudio libGLU zlib yasm ]; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 475c08eb169..f5276510e61 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig +, xorg, alsa-lib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify}: let @@ -10,7 +10,7 @@ let name = "nwjs-env"; paths = [ xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk-pixbuf - freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap libnotify diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 9cfb3c448e8..7d0175ac912 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig +, xorg, alsa-lib, dbus, glib, gtk3, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify , ffmpeg, libxcb, cups @@ -16,7 +16,7 @@ let name = "nwjs-env"; paths = [ xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk-pixbuf - freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr xorg.libXScrnSaver cups diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index ca8359a32a8..1db72dc1c8f 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome, atk, at-spi2-atk, at-spi2-core -, gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem +, gtk3, glib, freetype, dbus, nss, nspr, alsa-lib, cups, expat, udev, makeDesktopItem }: let @@ -16,7 +16,7 @@ let dbus nss nspr - alsaLib + alsa-lib cups expat udev diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix new file mode 100644 index 00000000000..eb12f9e1dcd --- /dev/null +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -0,0 +1,29 @@ +{ stdenvNoCC, fetchurl, lib }: + +stdenvNoCC.mkDerivation rec { + pname = "symfony-cli"; + version = "4.25.2"; + + src = fetchurl { + url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; + sha256 = "8bfa53c1479883e9b48d2e4e5d3f6f7a511df73d65fe5c7b07a4890ee2c75c7e"; + }; + + dontBuild = true; + + unpackPhase = '' + gunzip <$src >symfony + ''; + + installPhase = '' + install -D -t $out/bin symfony + ''; + + meta = with lib; { + description = "Symfony CLI"; + homepage = "https://symfony.com/download"; + license = licenses.unfree; + maintainers = with maintainers; [ drupol ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index fcb1edf153a..cc46f3f5d34 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk +{ lib, stdenv, fetchurl, buildEnv, makeWrapper, glib, alsa-lib , dbus, gtk2, atk , pango, freetype, fontconfig, gdk-pixbuf , cairo, cups, expat, nspr, gconf, nss , xorg, libcap, unzip }: @@ -8,7 +8,7 @@ let name = "env-thrust"; paths = [ stdenv.cc.cc glib dbus gtk2 atk pango freetype fontconfig gdk-pixbuf - cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11 + cairo cups expat alsa-lib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap ]; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 5c41a1dac93..9333864c69b 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, file, getopt , gtk2, gtk3, gdk-pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb -, alsaLib, GConf, cups, libcap, fontconfig, freetype, pango +, alsa-lib, GConf, cups, libcap, fontconfig, freetype, pango , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi , libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium @@ -10,7 +10,7 @@ let libPath64 = lib.makeLibraryPath [ gcc.cc gtk2 gdk-pixbuf glib libGL libGLU nss nspr - alsaLib GConf cups libcap fontconfig freetype pango + alsa-lib GConf cups libcap fontconfig freetype pango cairo dbus expat zlib libpng12 udev tbb libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index dc2f8022117..19cd15e7be4 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -6,7 +6,7 @@ in appimageTools.wrapType2 rec { name = "unityhub"; extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr - alsaLib cups gnome2.GConf libcap fontconfig freetype pango + alsa-lib cups gnome2.GConf libcap fontconfig freetype pango cairo dbus dbus-glib libdbusmenu libdbusmenu-gtk2 expat zlib libpng12 udev tbb libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5 diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 287709bbbad..9563563bc42 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook, mesa }: +{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsa-lib, udev, unzip, wrapGAppsHook, mesa }: stdenv.mkDerivation rec { pname = "cypress"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = with xorg; [ libXScrnSaver libXdamage libXtst libxshmfence ] ++ [ - nss gtk2 alsaLib gnome2.GConf gtk3 + nss gtk2 alsa-lib gnome2.GConf gtk3 mesa # for libgbm ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 1c854368df7..3ba900f3f69 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat +{ lib, stdenv, makeWrapper, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat , fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, mesa, nspr, nss, gtk3, gtk2 , at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { [ autoPatchelfHook dpkg makeWrapper gobject-introspection wrapGAppsHook ]; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk atk cairo diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index b8763c94323..6eb7eb1b58c 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook -, atk, at-spi2-atk, at-spi2-core, alsaLib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 +, atk, at-spi2-atk, at-spi2-core, alsa-lib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 , freetype, fontconfig, nss, nspr, pango, udev, libuuid, libX11, libxcb, libXi , libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes , libXrender, libXtst, libXScrnSaver, libdrm, mesa @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { atk at-spi2-atk at-spi2-core - alsaLib + alsa-lib cairo cups dbus diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index dc4f1f47f7b..b40a608412e 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU, libGL, alsaLib, libpulseaudio +{ lib, stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU, libGL, alsa-lib, libpulseaudio , xorg }: let @@ -6,7 +6,7 @@ let inherit (xorg) libXext libX11; lpath = "${stdenv.cc.cc.lib}/lib64:" + lib.makeLibraryPath [ - zlib libmad libpng12 libcaca libXext libX11 libGLU libGL alsaLib libpulseaudio]; + zlib libmad libpng12 libcaca libXext libX11 libGLU libGL alsa-lib libpulseaudio]; in stdenv.mkDerivation rec { diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index d648ac85c60..61f5a5bf824 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }: +{ lib, stdenv, fetchurl, amoeba-data, alsa-lib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }: stdenv.mkDerivation rec { name = "amoeba-${version}-${debver}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU xorg.libXxf86vm ]; + buildInputs = [ alsa-lib expat freetype gtk2 libvorbis libGLU xorg.libXxf86vm ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1/ diff --git a/pkgs/games/clonehero/default.nix b/pkgs/games/clonehero/default.nix index 377e1d79bda..cf1fad8d945 100644 --- a/pkgs/games/clonehero/default.nix +++ b/pkgs/games/clonehero/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , autoPatchelfHook -, alsaLib +, alsa-lib , gtk2 , libXrandr , libXScrnSaver @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { zlib # Run-time libraries (loaded with dlopen) - alsaLib # ALSA sound + alsa-lib # ALSA sound libXrandr # X11 resolution detection libXScrnSaver # X11 screensaver prevention udev # udev input drivers diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index a5796f697ef..3fb8236947f 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, nasm, makeDesktopItem -, alsaLib, flac, gtk2, libvorbis, libvpx, libGLU, libGL +, alsa-lib, flac, gtk2, libvorbis, libvpx, libGLU, libGL , SDL2, SDL2_mixer }: let @@ -27,7 +27,7 @@ in stdenv.mkDerivation { sha256 = "972630059be61ef9564a241b84ef2ee4f69fc85c19ee36ce46052ff2f1ce3bf9"; }; - buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; + buildInputs = [ alsa-lib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; nativeBuildInputs = [ makeWrapper pkg-config ] ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 879bbfa2311..9798d659322 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem -, alsaLib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL +, alsa-lib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL , libSM, libICE, libXext, factorio-utils , releaseType , mods ? [] @@ -182,7 +182,7 @@ let buildInputs = [ libpulseaudio ]; libPath = lib.makeLibraryPath [ - alsaLib + alsa-lib libpulseaudio libX11 libXcursor diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix index 4d6795070ca..07aad4a5b60 100644 --- a/pkgs/games/gambatte/default.nix +++ b/pkgs/games/gambatte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, scons, qt4, alsaLib }: +{ lib, stdenv, fetchFromGitHub, scons, qt4, alsa-lib }: stdenv.mkDerivation { pname = "gambatte"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0cc6zcvxpvi5hgcssb1zy0fkj9nk7n0d2xm88a4v05kpm5zw7sh2"; }; - buildInputs = [ scons qt4 alsaLib ]; + buildInputs = [ scons qt4 alsa-lib ]; patches = [ ./fix-scons-paths.patch ]; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 3ec196b7373..f16aa752632 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_mixer, alsaLib, libpng +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_mixer, alsa-lib, libpng , pcre, makeDesktopItem }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ SDL2 SDL2_mixer alsaLib libpng pcre ]; + buildInputs = [ SDL2 SDL2_mixer alsa-lib libpng pcre ]; hardeningDisable = ["all"]; diff --git a/pkgs/games/methane/default.nix b/pkgs/games/methane/default.nix index 17c9dc42567..071e1a64b54 100644 --- a/pkgs/games/methane/default.nix +++ b/pkgs/games/methane/default.nix @@ -16,7 +16,7 @@ , clanlib , libXrender , libmikmod -, alsaLib +, alsa-lib }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { clanlib libXrender libmikmod - alsaLib + alsa-lib ]; installPhase = '' diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 7e1a0cba176..73207923839 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -12,7 +12,7 @@ , pkg-config , stb , ant -, alsaLib +, alsa-lib , glew # Make the build version easily overridable. @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals enableClient [ SDL2 glew - alsaLib + alsa-lib ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 3d0b53035ed..254c01fdf1b 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -15,7 +15,7 @@ , pango , cairo , expat -, alsaLib +, alsa-lib , cups , dbus , atk @@ -45,13 +45,13 @@ let curl libpulseaudio systemd - alsaLib # needed for narrator + alsa-lib # needed for narrator flite # needed for narrator libXxf86vm # needed only for versions <1.13 ]; libPath = lib.makeLibraryPath ([ - alsaLib + alsa-lib atk cairo cups diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 84d8a620001..4082e853aa3 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -3,7 +3,7 @@ unzip, zlib, curl, libjpeg, libpng, libvorbis, libtheora , libogg, libmodplug , # glx - libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib + libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, libXxf86dga, alsa-lib , # sdl SDL }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; buildInputs = [ # glx - libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsaLib + libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsa-lib # sdl SDL ]; diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/games/oh-my-git/default.nix index 89dc1bdd50e..542effa6596 100644 --- a/pkgs/games/oh-my-git/default.nix +++ b/pkgs/games/oh-my-git/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , makeDesktopItem , stdenv -, alsaLib +, alsa-lib , gcc-unwrapped , git , godot-export-templates @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib gcc-unwrapped.lib git libGLU diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index 0c9c71e38d2..32e1ef4fca9 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkg-config -, alsaLib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }: +, alsa-lib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }: # - set the opendune configuration at ~/.config/opendune/opendune.ini: # [opendune] @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { }; configureFlags = [ - "--with-alsa=${lib.getLib alsaLib}/lib/libasound.so" + "--with-alsa=${lib.getLib alsa-lib}/lib/libasound.so" "--with-pulse=${lib.getLib libpulseaudio}/lib/libpulse.so" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib libpulseaudio SDL2 SDL2_image SDL2_mixer ]; + buildInputs = [ alsa-lib libpulseaudio SDL2 SDL2_image SDL2_mixer ]; enableParallelBuilding = true; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 4cde6b032ee..8a7573dd584 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs , dotnetCorePackages, dotnetPackages, cacert -, ffmpeg_4, alsaLib, SDL2, lttng-ust, numactl, alsaPlugins +, ffmpeg_4, alsa-lib, SDL2, lttng-ust, numactl, alsa-plugins }: let runtimeDeps = [ - ffmpeg_4 alsaLib SDL2 lttng-ust numactl + ffmpeg_4 alsa-lib SDL2 lttng-ust numactl ]; dotnet-sdk = dotnetCorePackages.sdk_5_0; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 7dbca783b67..c29af6d810f 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk +{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk , nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out @@ -34,7 +34,7 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 691406160d1..25c6b4ddec0 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, curl, libGL, libX11, libXxf86dga, alsaLib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }: +{ lib, stdenv, curl, libGL, libX11, libXxf86dga, alsa-lib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "Quake3e"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1jvk8qd0mi0x8lslknhkfd8h6ridwca34c6qahsbmmpcgsvdv16s"; }; - buildInputs = [ curl libGL libX11 libXxf86dga alsaLib libXrandr libXxf86vm libXext ]; + buildInputs = [ curl libGL libX11 libXxf86dga alsa-lib libXrandr libXxf86vm libXext ]; enableParallelBuilding = true; postPatch = '' sed -i -e 's#OpenGLLib = dlopen( dllname#OpenGLLib = dlopen( "${libGL}/lib/libGL.so"#' code/unix/linux_qgl.c - sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsaLib}/lib/libasound.so.2" )#' code/unix/linux_snd.c + sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsa-lib}/lib/libasound.so.2" )#' code/unix/linux_snd.c sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libXrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index 51dd4f90860..9a836c59508 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib +{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsa-lib , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGLU, libGL ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "99c419b13885a49bdfc10a50a3a6000fd1ba9504f6aae04c74b840ec6f57a963"; }; - buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ] + buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsa-lib ] ++ lib.optionals openglSupport [ libGL libGLU ]; configureFlags = [ "--enable-all-engines" ]; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 68ccb894d99..b22d292f207 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, nasm -, alsaLib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib +, alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib , Cocoa, AudioToolbox, Carbon, CoreMIDI, AudioUnit, cctools }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; buildInputs = lib.optionals stdenv.isLinux [ - alsaLib + alsa-lib ] ++ lib.optionals stdenv.isDarwin [ Cocoa AudioToolbox Carbon CoreMIDI AudioUnit ] ++ [ diff --git a/pkgs/games/shticker-book-unwritten/default.nix b/pkgs/games/shticker-book-unwritten/default.nix index 0179c7c86e8..7dbd5c257e8 100644 --- a/pkgs/games/shticker-book-unwritten/default.nix +++ b/pkgs/games/shticker-book-unwritten/default.nix @@ -6,7 +6,7 @@ let in buildFHSUserEnv { name = "shticker_book_unwritten"; targetPkgs = pkgs: with pkgs; [ - alsaLib + alsa-lib xorg.libX11 xorg.libXcursor xorg.libXext diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index fe3dde7167b..a0557eed9b1 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -136,7 +136,7 @@ in buildFHSUserEnv rec { libGLU libuuid libbsd - alsaLib + alsa-lib # Loop Hero libidn2 diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 8e4f5b866bb..765ecbed28f 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -6,7 +6,7 @@ let overridePkgs = lib.optionals (!runtimeOnly) (with pkgs; [ libgpgerror libpulseaudio - alsaLib + alsa-lib openalSoft libva1 libvdpau diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 1512359d495..70e1acb1f34 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, nasm -, gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis +, gtk2, glib, ffmpeg, alsa-lib, libmad, libogg, libvorbis , glew, libpulseaudio, udev }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ]; buildInputs = [ - gtk2 glib ffmpeg alsaLib libmad libogg libvorbis + gtk2 glib ffmpeg alsa-lib libmad libogg libvorbis glew libpulseaudio udev ]; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 19f562d54af..b0a49cc77d1 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsaLib +{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsa-lib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils , nixosTests }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config icoutils ]; buildInputs = [ - python3 alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack + python3 alsa-lib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack ]; postInstall = '' diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index a60ec15744c..4a25d26f8cc 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, SDL, libpulseaudio, alsaLib, runtimeShell }: +{ lib, stdenv, requireFile, SDL, libpulseaudio, alsa-lib, runtimeShell }: stdenv.mkDerivation rec { name = "vessel-12082012"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ld_preload = ./isatty.c; libPath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; + + ":" + lib.makeLibraryPath [ SDL libpulseaudio alsa-lib ] ; installPhase = '' mkdir -p $out/libexec/strangeloop/vessel/ diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index fb6cb93f7f2..38a0450168e 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -3,7 +3,7 @@ , # required for both unzip, libjpeg, zlib, libvorbis, curl , # glx - libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsaLib + libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib , # sdl SDL2 @@ -64,7 +64,7 @@ let nativeBuildInputs = [ unzip ]; buildInputs = [ libjpeg zlib libvorbis curl ] - ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsaLib.dev ] + ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ] ++ lib.optional withSDL [ SDL2.dev ]; sourceRoot = "Xonotic/source/darkplaces"; diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix index 4b09cb170c0..59075d69c75 100644 --- a/pkgs/games/zandronum/fmod.nix +++ b/pkgs/games/zandronum/fmod.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, alsaLib, libpulseaudio, undmg }: +{ stdenv, lib, fetchurl, alsa-lib, libpulseaudio, undmg }: let bits = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; - libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libpulseaudio ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsa-lib libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 085ad7902f5..95beb8bcdf3 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib, cmake, pkg-config, glib +{ lib, stdenv, fetchFromGitHub, alsa-lib, cmake, pkg-config, glib , tracingSupport ? true, logToStderr ? true }: let oz = x: if x then "1" else "0"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ alsaLib glib ]; + buildInputs = [ alsa-lib glib ]; cmakeFlags = [ "-DWITH_TRACE=${oz tracingSupport}" diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index 2019820510e..5e35dcaebd0 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: +{ lib, stdenv, fetchurl, libSM, libX11, libICE, SDL, alsa-lib, gcc-unwrapped, libXext }: stdenv.mkDerivation rec { pname = "atari++"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "04fm2ic2qi4a52mi72wcaxyrpll4k8vvchx3qrik8rhg3jrxgm47"; }; - buildInputs = [ libSM libX11 SDL libICE alsaLib gcc-unwrapped libXext ]; + buildInputs = [ libSM libX11 SDL libICE alsa-lib gcc-unwrapped libXext ]; postFixup = '' patchelf --set-rpath ${lib.makeLibraryPath buildInputs} "$out/bin/atari++" diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index ff17833f690..03e97743905 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -3,7 +3,7 @@ , libXmu , lua , tinyxml -, agg, alsaLib, soundtouch, openal +, agg, alsa-lib, soundtouch, openal , desktop-file-utils , gtk2, gtkglext, libglade , libGLU, libpcap, SDL, zziplib }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { CXXFLAGS = "-fpermissive"; buildInputs = - [ pkg-config libtool intltool libXmu lua agg alsaLib soundtouch + [ pkg-config libtool intltool libXmu lua agg alsa-lib soundtouch openal desktop-file-utils gtk2 gtkglext libglade libGLU libpcap SDL zziplib tinyxml ]; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 11627914560..8e08be28eda 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkg-config, cmake , wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama -, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib +, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib , miniupnpc, enet, mbedtls, soundtouch, sfml , vulkan-loader ? null, libpulseaudio ? null @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase ] ++ lib.optionals stdenv.isLinux [ - bluez udev libevdev alsaLib vulkan-loader + bluez udev libevdev alsa-lib vulkan-loader ] ++ lib.optionals stdenv.isDarwin [ CoreBluetooth OpenGL ForceFeedback IOKit ]; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 458b27d3304..4cb5ca9ec2e 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen -, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive +, freeimage, freetype, libGLU, libGL, SDL2, alsa-lib, libarchive , fetchpatch }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; + buildInputs = [ alsa-lib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; installPhase = '' install -D ../emulationstation $out/bin/emulationstation diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index 7cdd88d0b94..f70e90e9872 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL, +{ lib, stdenv, fetchurl, alsa-lib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL, libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }: with lib; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; buildInputs = [ - alsaLib + alsa-lib curl gdk-pixbuf glib diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index c7bc7e9f976..8e10b7bb315 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -4,7 +4,7 @@ , udev , libGLU, libGL, SDL2 , libao, openal, libpulseaudio -, alsaLib +, alsa-lib , gtk2, gtksourceview , runtimeShell # Darwin dependencies @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isDarwin [ libicns ]; buildInputs = [ SDL2 libao ] - ++ optionals stdenv.isLinux [ alsaLib udev libpulseaudio openal + ++ optionals stdenv.isLinux [ alsa-lib udev libpulseaudio openal gtk2 gtksourceview libX11 libXv libGLU libGL ] ++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ]; diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index 1b00a55fe05..e8feb1ea7ed 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }: +{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsa-lib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }: let - libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsa-lib libSM libX11 gdk-pixbuf pango libXinerama ]; in stdenv.mkDerivation { pname = "kega-fusion"; diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index e803a130683..26abda81b30 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper -, python, pkg-config, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama +, python, pkg-config, SDL2, SDL2_ttf, alsa-lib, which, qtbase, libXinerama , libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: @@ -41,7 +41,7 @@ in mkDerivation { buildInputs = [ SDL2 SDL2_ttf qtbase libXinerama ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ] ; nativeBuildInputs = [ python pkg-config which makeWrapper installShellFiles ]; diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index aaf736f3e5e..f76ddb78bd5 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, freeglut, libGLU, libGL, libcdio, libjack2 -, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsaLib }: +, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsa-lib }: stdenv.mkDerivation rec { pname = "mednafen"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libGLU libGL libcdio libjack2 - alsaLib + alsa-lib libsamplerate libsndfile libX11 diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 502e5c64723..e19b97a477e 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3 +{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsa-lib, gtk3 , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils , epoxy, gdk-pixbuf, gnome, wrapGAppsHook }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 - alsaLib + alsa-lib epoxy gtk3 gdk-pixbuf diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index d34a921e177..61d416e17ac 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config , python -, alsaLib, glew, libGL, libpng +, alsa-lib, glew, libGL, libpng , libogg, libtheora, libvorbis , SDL2, SDL2_image, SDL2_ttf , freetype, tcl, zlib @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python ]; - buildInputs = [ alsaLib glew libGL libpng + buildInputs = [ alsa-lib glew libGL libpng libogg libtheora libvorbis freetype SDL2 SDL2_image SDL2_ttf tcl zlib ]; diff --git a/pkgs/misc/emulators/pcem/default.nix b/pkgs/misc/emulators/pcem/default.nix index 6e7e3bc6379..2e6aa683e4d 100644 --- a/pkgs/misc/emulators/pcem/default.nix +++ b/pkgs/misc/emulators/pcem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsaLib, pkg-config +{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsa-lib, pkg-config , autoreconfHook, withNetworking ? true, withALSA ? true }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ wxGTK31 coreutils SDL2 openal ] - ++ lib.optional withALSA alsaLib; + ++ lib.optional withALSA alsa-lib; configureFlags = [ "--enable-release-build" ] ++ lib.optional withNetworking "--enable-networking" diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 476ea7122cb..13d2ea74f34 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , cmake , fetchFromGitHub , fmt @@ -71,7 +71,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake makeWrapper perl pkg-config wrapGAppsHook ]; buildInputs = [ - alsaLib + alsa-lib fmt gettext glib diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/misc/emulators/punes/default.nix index 68f48bc7b40..0d2a5b11798 100644 --- a/pkgs/misc/emulators/punes/default.nix +++ b/pkgs/misc/emulators/punes/default.nix @@ -11,7 +11,7 @@ , pkg-config , ffmpeg , libGLU -, alsaLib +, alsa-lib , sndio }: @@ -34,7 +34,7 @@ mkDerivation rec { nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ]; buildInputs = [ ffmpeg qtbase qtsvg libGLU ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsaLib ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] ++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ]; dontUseCmakeConfigure = true; diff --git a/pkgs/misc/emulators/reicast/default.nix b/pkgs/misc/emulators/reicast/default.nix index 8c0bc30d438..f9e8e4d6937 100644 --- a/pkgs/misc/emulators/reicast/default.nix +++ b/pkgs/misc/emulators/reicast/default.nix @@ -3,7 +3,7 @@ , cmake , pkg-config , curl -, alsaLib +, alsa-lib , libGLU , libX11 , libevdev @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl - alsaLib + alsa-lib libGLU libX11 libevdev diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 7153c378f8a..bddabede0a0 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch -, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL +, alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL , ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl , buildPackages }: @@ -548,7 +548,7 @@ in with lib.licenses; description = "Port of MAME to libretro"; license = gpl2Plus; - extraBuildInputs = [ alsaLib libGLU libGL portaudio python27 xorg.libX11 ]; + extraBuildInputs = [ alsa-lib libGLU libGL portaudio python27 xorg.libX11 ]; postPatch = '' # Prevent the failure during the parallel building of: # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o @@ -617,7 +617,7 @@ in with lib.licenses; description = "Port of MAME ~2015 to libretro"; license = gpl2Plus; extraNativeBuildInputs = [ python27 ]; - extraBuildInputs = [ alsaLib ]; + extraBuildInputs = [ alsa-lib ]; makefile = "Makefile"; }; @@ -638,7 +638,7 @@ in with lib.licenses; description = "Port of MAME ~2016 to libretro"; license = gpl2Plus; extraNativeBuildInputs = [ python27 ]; - extraBuildInputs = [ alsaLib ]; + extraBuildInputs = [ alsa-lib ]; postPatch = '' # Prevent the failure during the parallel building of: # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index e6f1b4f1a78..86ca803d965 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, which, pkg-config, makeWrapper , ffmpeg, libGLU, libGL, freetype, libxml2, python3 , libobjc, AppKit, Foundation -, alsaLib ? null +, alsa-lib ? null , libdrm ? null , libpulseaudio ? null , libv4l ? null @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] - ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 + ++ optionals stdenv.isLinux [ alsa-lib libdrm libpulseaudio libv4l libX11 libXdmcp libXext libXxf86vm mesa udev wayland libxkbcommon ]; diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 8eab2f05720..bf1dc1c9573 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -4,7 +4,7 @@ , sdl2Support ? true, SDL2 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland -, alsaSupport ? true, alsaLib +, alsaSupport ? true, alsa-lib }: let @@ -50,7 +50,7 @@ mkDerivation { libevdev zlib libusb1 curl python3 ] ++ lib.optional sdl2Support SDL2 ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional waylandSupport wayland; meta = with lib; { diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix index 11be67b6d9e..84837322e97 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , fetchFromGitHub , makeWrapper , openssl @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - alsaLib + alsa-lib openssl wayland xorg.libX11 diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 75b86eaeebd..803efe5149c 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkg-config, gtk2, alsaLib, SDL}: +{lib, stdenv, fetchurl, pkg-config, gtk2, alsa-lib, SDL}: stdenv.mkDerivation rec { name = "uae-0.8.29"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 alsaLib SDL ]; + buildInputs = [ gtk2 alsa-lib SDL ]; hardeningDisable = [ "format" ]; LDFLAGS = [ "-lm" ]; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 7d63927e33f..f8b9e5906f3 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw +{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsa-lib, readline, libGLU, libGL, libXaw , pkg-config, gtk2, SDL, autoreconfHook, makeDesktopItem }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; - buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU libGL + buildInputs = [ bison flex perl libpng giflib libjpeg alsa-lib readline libGLU libGL pkg-config gtk2 SDL autoreconfHook libXaw ]; dontDisableStatic = true; configureFlags = [ "--enable-fullscreen --enable-gnomeui" ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 8553ab83645..0023d9878b3 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional gphoto2Support pkgs.libgphoto2 ++ lib.optional ldapSupport pkgs.openldap ++ lib.optional fontconfigSupport pkgs.fontconfig - ++ lib.optional alsaSupport pkgs.alsaLib + ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev diff --git a/pkgs/misc/emulators/yuzu/base.nix b/pkgs/misc/emulators/yuzu/base.nix index c2b8061485b..1160a5fc1e7 100644 --- a/pkgs/misc/emulators/yuzu/base.nix +++ b/pkgs/misc/emulators/yuzu/base.nix @@ -1,7 +1,7 @@ { pname, version, src, branchName , stdenv, lib, fetchFromGitHub, fetchpatch, wrapQtAppsHook , cmake, pkg-config -, libpulseaudio, libjack2, alsaLib, sndio +, libpulseaudio, libjack2, alsa-lib, sndio , vulkan-loader, vulkan-headers , qtbase, qtwebengine, qttools , nlohmann_json, rapidjson @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ - libpulseaudio libjack2 alsaLib sndio + libpulseaudio libjack2 alsa-lib sndio vulkan-loader vulkan-headers qtbase qtwebengine qttools nlohmann_json rapidjson diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 865ab6ee1f3..7474a304f03 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -5,7 +5,7 @@ , aften, AudioUnit, CoreAudio, libobjc, Accelerate # Optional Dependencies -, dbus ? null, libffado ? null, alsaLib ? null +, dbus ? null, libffado ? null, alsa-lib ? null , libopus ? null # Extra options @@ -22,7 +22,7 @@ let optDbus = if stdenv.isDarwin then null else shouldUsePkg dbus; optPythonDBus = if libOnly then null else shouldUsePkg dbus-python; optLibffado = if libOnly then null else shouldUsePkg libffado; - optAlsaLib = if libOnly then null else shouldUsePkg alsaLib; + optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib; optLibopus = shouldUsePkg libopus; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index c1ccc668487..aebe32497c1 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config # Optional Dependencies -, alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null +, alsa-lib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null }: let shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; - optAlsaLib = shouldUsePkg alsaLib; + optAlsaLib = shouldUsePkg alsa-lib; optDb = shouldUsePkg db; optLibuuid = shouldUsePkg libuuid; optLibffado = shouldUsePkg libffado; diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 3b4c34702d3..9e4035801f1 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, alsa-lib, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "sndio"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib; + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib; enableParallelBuilding = true; diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index af2ce3f53cf..fc7062d904c 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/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index f1a06264688..a7fdb5fd919 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-06-06"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "00fe69a21e128d0378d1e00eb5334cde9cd7a227"; - sha256 = "0nrcxsf00x2ygh16965d6fp5lhjq7hg9wzqgail2l0pwjdxnizm4"; + rev = "eaee30fe7afdbce73f92d0c766f4b411c8de5525"; + sha256 = "0b73k55zfhd4ygqiwwps17fp9nksbs8km57vfl0y85vb3ajzg0l6"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -557,12 +557,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-06-04"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "06d950e547e8fa1a775399ae5eeb70603084b109"; - sha256 = "1fj8v8zm0w04fyxf12ck4lc3gwq6bxh5shmwc24j0sar3ki0i4rz"; + rev = "898335d52ed925e8dd5dd3da3c25470d352b2e11"; + sha256 = "19ks20v1mjm5yrhlrkxqpmsc8jz2nfz5w38ixfkpbhdj3qwdf5gg"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -617,12 +617,12 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2021-03-14"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "a7ce436b211a7ac1f47cfd440370653e33c2a1d5"; - sha256 = "1yfcbh9q35w1ckdv8isbwjwlgnjnjmqm8yc7bcbfirkx9pjlsw2z"; + rev = "6a00a2cabfb5ee3f49ff556ceea56892825c0397"; + sha256 = "0z2zr2mfc5m4xn8b0j0br7q96hs42md5wd53viv0zmw67i2pnbcs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -774,12 +774,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-05-31"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "31820e386ce7a32488ad6b19033c17a8f05c36bf"; - sha256 = "1p35blgnd99kggwyiag6drx3v6zqx50ypxnfvvij102ws50144fk"; + rev = "643ae9bf5f08e752a22027628b69a31ce271f1b5"; + sha256 = "0jbd1y0riq6xdyh0x5msw8475b7v0viapgkmawyda3ax8bczb3jv"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -810,12 +810,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-06-01"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "5f92ee08b9c0018df244de47dc6e2ed4ba232a64"; - sha256 = "16xfkblsn149v9rgqjcimaw380xv6l8gimfaj368gh9h2icaz9qc"; + rev = "2f1c81a86342e333a916a1bc7db5218cf115a191"; + sha256 = "0ysnsixa7zy4plxr2qm2phyvl63qnmszjh3d8cbr4852klmv0shw"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1304,12 +1304,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview-nvim"; - version = "2021-06-03"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "e174aa0a1e8a65fd9699f190c67fd197c2afa09f"; - sha256 = "0skzir27vzg5h8w0c7hj2p2i0540m768i1vbgqwpgz7y7wkgpbcm"; + rev = "93c3aba19c54a7e68fab6c9864eff499a744b4cc"; + sha256 = "01s43bg2y0yb5h7gkr75j23i5jy5acaz0m65nbx5c6x1lbm7fy20"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1364,12 +1364,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-05-22"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "af858776b6faf81b9eb50f8bbb87c639ee483c93"; - sha256 = "07smppxp2wr4282vsz0zdx3kkhvrx9f5140dwx4h4p8chs1c1zc5"; + rev = "d1fa03e861b514aa485b6b1369ebb4cc34d4a817"; + sha256 = "1v28cl52bfxl9c12bk0hnr14nn8mp5wg6qqp5ycmsw44rbg18vh4"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1799,12 +1799,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-06-06"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "0d8db4531a508f875d98b55f5e78bc1c560d6342"; - sha256 = "1avp9df2lbiczycgfiigbyny8s6srjw6h88a88161m29g2mznr2s"; + rev = "b5a6c6c0cbac430d61965be1fac5b984d3c9c469"; + sha256 = "19k96irs8saibjxah457ir418l3aih1rp3arj6b1m14p3yf2dxy3"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1821,6 +1821,18 @@ final: prev: meta.homepage = "https://github.com/gregsexton/gitv/"; }; + gleam-vim = buildVimPluginFrom2Nix { + pname = "gleam-vim"; + version = "2020-06-24"; + src = fetchFromGitHub { + owner = "gleam-lang"; + repo = "gleam.vim"; + rev = "847a5ef57c2faef2774242c87f711d1131b89fe6"; + sha256 = "17kjby64zdnmhyia1cx9jnk4mss0gca1jz1m4hff9rl63i56bql1"; + }; + meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; + }; + glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; version = "2021-05-29"; @@ -1895,24 +1907,24 @@ final: prev: gruvbox-flat-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-flat-nvim"; - version = "2021-05-28"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "eddyekofo94"; repo = "gruvbox-flat.nvim"; - rev = "521d9234d1c8c3a0e9dc782a8f2e5776483856b0"; - sha256 = "1k92z847ix3c7kwiyiw4x41z2sid2wyyjgv08myh93k0ivb5y4qh"; + rev = "0b27de51438f62870f1558ef9c27cb20caec69cf"; + sha256 = "0k9hqjw857ri0vbgjncbbfgh0yh1bpqr25vj0drp9wiakn5pywqf"; }; meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; - version = "2021-06-05"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "npxbr"; repo = "gruvbox.nvim"; - rev = "ad076d46c76b884d7b555067d3434b3666c3b80b"; - sha256 = "0m4ks6gxh3clg4vg1rxyvhjjkmmwipb9s38zwbaidfqwifldjriy"; + rev = "2dc25bb14fbd69f888dd0615c5576dd730de869a"; + sha256 = "1i87f7vfgk1szy18cg7nng2yqvcny4v1wnh4dbw74lcqmmazgi7y"; }; meta.homepage = "https://github.com/npxbr/gruvbox.nvim/"; }; @@ -2123,12 +2135,12 @@ final: prev: indent-blankline-nvim-lua = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim-lua"; - version = "2021-04-28"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "ec5816267caa5fdde7a5e5a8359b9b19bc8ecf49"; - sha256 = "008q3rg6fz36k334ci30f1vci9hws4y04z8gr4wnq9q8qx57y7nh"; + rev = "4e1004b4efcb8f4bbb29d69dd4898ed14120a973"; + sha256 = "1y1skj9q29sk7dfza1s21gfwyjfk49v5b298br39xiankin1b8jx"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2292,12 +2304,12 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-05-20"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "2f35033a2141eea7a5a89ef8be438985781a9fcf"; - sha256 = "1d7xl7i5xl4mnpx7bl9cnf23x48lc6ambhgb98phzdsb0kzjhv3n"; + rev = "69673e40a3c9c6532c1500ba92fed93ccd55af90"; + sha256 = "07nh2pdl09z6k6bzfsbxyna1rccji7s1sz6z4lmhi6fdi7wjby7j"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2388,11 +2400,11 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-06-03"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "3849b6440299215e5168d569713d2a5540dfbf2b"; + rev = "183fa5f3203983fed87174e6f193f271133fe974"; sha256 = "17if75p3x4lkqncl296f3jdq0rcc69b0mgj0dbz6cl851bmqvy40"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; @@ -2400,12 +2412,12 @@ final: prev: lean-vim = buildVimPluginFrom2Nix { pname = "lean-vim"; - version = "2021-06-04"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean.vim"; - rev = "fdf448398335434f4b5c45aff5f4ee64a3d090fa"; - sha256 = "0wi7837yy4x89w6gw72qkaxbb0vdm3hlxnkjplg2g4ibpayxx3s4"; + rev = "48ac5798b74b8ef8212adc70048ff0ed6f4e1976"; + sha256 = "08n8zfglml4v983nnm8gg25vggg5cfjsqrm96k8s3j5wmzi95mhx"; }; meta.homepage = "https://github.com/leanprover/lean.vim/"; }; @@ -2592,12 +2604,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-06-03"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "5aca93b10b571a8dfafd2c9e850239dfa2094a6f"; - sha256 = "1k8k7zq03jnvh4328i0s0d87g9s5y2yc94wnpg059clmp1cizcq4"; + rev = "88272b6d89e8140a35099ea563978172f2776dc9"; + sha256 = "013ffydnhjwzj0y106m0x65zx31kabsxrs86ndq2vik3pc6vyslq"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3048,12 +3060,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-06-03"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "f0a22c4609e6f090afdcb147242a2e96ac763f4a"; - sha256 = "09y03krzg2wl0mlgvc3shvdbvjr8ga69amknbfzvnmplmqyji0g5"; + rev = "55dcb4206324e3f90dd9dd41bed22fc6d4887098"; + sha256 = "0iiblvqmn7xg3mpyppzng081wgpdfrdn9jpa3ijr2ly6w5jg0yqa"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3264,12 +3276,12 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn-vim"; - version = "2021-05-30"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "fb80ed60c642b1f3666125c3051bd2da34453eeb"; - sha256 = "1p87dc296icb2kpyzlflpzbaq5z2yg106mpsxxzmwzn949smsk7l"; + rev = "abf700104c0450bac10be3ece613ff88997f47e4"; + sha256 = "0s3z5kd2h8cx6lplvg3yqp2pacx8c7kcavpvwnl71vmi0s2ld85s"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3288,12 +3300,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-06-02"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "6965333869ca172a18606c93d6f6c1275fb9aabb"; - sha256 = "0nljk4ncxz5syf0wr29j3bdxdw5bjpjn879ls1r910hicn4lg468"; + rev = "f6464fa295005049c07650f41b06c0216c3c112d"; + sha256 = "124qxhi9ckjqhxwj8wlxd6srlalmhpr58pidpvvdpvzcpp205yr2"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3336,48 +3348,48 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-06-06"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "64c937940c2d890bd192a56e1a831e378fe0168b"; - sha256 = "05pa2zz7dwzfjsgz8chv0wkx202f8x3plbxyczlkp390sfhqk0nn"; + rev = "34a02b4f37a99b80eff03dff90c675b7374af54b"; + sha256 = "0vz610ifrzzish5qysz8pz7w0zcfhm0q0xvya3r48fgs12ipahmq"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-05-27"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "4388bb114a9c153cbe8c5745f6c3cb92edc9bf4b"; - sha256 = "0ivgdl0biiz91g5s0riva77ybzp33driwm7p7fwl94czqgyjjqc4"; + rev = "b53dbb4d33a77e1b9b16672565749d6990e84cf0"; + sha256 = "1fwb797jcp5xkrfcqqljlhpnggkj3wfrc6zb0h662i35yhbhnin8"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-06-06"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "85b05cdc0ce371b055504be5d16cdfb1ea110f22"; - sha256 = "0sr3rcy5mw0gx06x12dqc4bsb2ypc2xvcr6cqzw4w8w520ys7aid"; + rev = "2063533b0f496ac7047fa9c58937d2a35b995dbe"; + sha256 = "1k95dyrqcy88b0s8jsijgx7mpnfmw2ay2fzj3bhbdqagdghsgpp4"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-06-01"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "883cd1b0d8029c97bb6c3358b8e55c040b0c7bcb"; - sha256 = "06mcl11jx56wym2jfinpbklpfn55d6j35yy80dv9dy8072mb5f9f"; + rev = "7b510d5241fb29f5a5e985e02c4cfa046ec4ee3e"; + sha256 = "1ahy4v7z08l0z6c7v19dik8icw943kc243vlzhs1bfa4aj13nncs"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3408,12 +3420,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-06-02"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "310488302c6532646adfe8228e40187a80b36ac5"; - sha256 = "1anfrybaliyaxgi8iv55hncnac8xgizqw9b9047lw2grkybmrdn4"; + rev = "c459c3f3a18c7ff7a312593c481af2b90fa01655"; + sha256 = "148k41db7ncri3mgdhc13mi4xk7chdchbgf42zldhcrf05y3xd58"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3432,24 +3444,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-06-03"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "826a1931fdf1b3b67a0b456aa3abc1b72185a7a7"; - sha256 = "0g8x9vk9qv16zlbvx3h8w2vhnqyycssn5v4y8sdhsnhyjljsjygz"; + rev = "dfacc1fb7aeb0789c4fd27004e312cf363becba5"; + sha256 = "058kjgngg7l37q9zbfz0xfqajx526m4cp85i3chcsfrvp99c7mzv"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-06-05"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "3c221fe2cc2d675ebf8c83bb62e0b44516ae34ae"; - sha256 = "0hcfs9c5m610sh5105kd4qbgj8ikfds7zfh2hcf1ly5ikkbz1ma4"; + rev = "9190b4a625a449927ffc3777b45db6cb392dc8f6"; + sha256 = "1gai54z6w4dw17irwnwfd35k8zy2aiws2ia9vqamzicaf0n8axr8"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3468,12 +3480,12 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-05-30"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "60994408e6684fb776bcfb80c456cbdf8bc6eb93"; - sha256 = "044bgiyhi4db5avajry9v168gz55xn6yzr83j610k95hh2aam08a"; + rev = "53bfce7a254651469ce9577349811bc76d9af46c"; + sha256 = "1xcwrjfvikb1qqyaic2m0fi12l0hmxj0y5mwx1h95karpydbb0rz"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -3540,12 +3552,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-06-03"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "62c04242031ed65a8d29ebefaaf645e8e3375748"; - sha256 = "1g1s85dzz7lr3ky90m27m8f3s06xm4c87z96vwzaaajb28927774"; + rev = "f95be0c947237edb88df148dd61790988ab3a23e"; + sha256 = "1cddnkil9xid7xq3k0iszk12ma9pi396khqx6dzh2z9p7nkhk2rg"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3624,24 +3636,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-06-05"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "82f1598bd4388c8089cf08007b17a3555c0328f0"; - sha256 = "1mpszdypmhw3zizm699rq1m3zfrzmn1ilqaha01zb3q64l7mddzc"; + rev = "906a35cd0e7520eaff369688cb0a090240d7c2b9"; + sha256 = "18nw0xm4dp45v9s9kn0cmjwxdwydgr5f1v2kgm6h6kc1wvvd5scj"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-06-04"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b5d603a876fe8c89e96a9cac2dac2dd375479dac"; - sha256 = "1x2cn0v7yyqlwz8g4vqxh0vai372946a1akbg50pldq24jxm8j0q"; + rev = "37ed50f28f8350de8dc70b56d8ac198aac9b1178"; + sha256 = "16mmjpk0pqqshlw1qj3zxx197iv4g7mscgfya17c7r03rybz0q19"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3840,12 +3852,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-06-03"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "3715ce44c0aae69471511bd93789ccf578c9684c"; - sha256 = "1xcfmv7dn975hqa1izn4h80vpn3yksm8ali6nbxv62sij6m9na48"; + rev = "d21e0e2c157af0fad6c6752ca07a274632202710"; + sha256 = "0zww9975x8wkmcdxzg4b51v94iy9644lb1miaz9ra2nwzz4ljqzj"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4429,12 +4441,13 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-06-06"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "15acde01892efd6e8d2a5c452babe862ce05f74d"; - sha256 = "0bb06g2knzqj7himsvpfydq8yig2szz9q5pqds9yv83m3vh4kppl"; + rev = "bf19ffb2ea583516908ceb861e7c52a0c3260221"; + sha256 = "1mrqli7gpn3bzfjn3095ms9m8vkpf7zlia6m75c0ppxgmyry8ngs"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -4501,12 +4514,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-06-01"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "9dd432b1bce0bd448faf22375fcf6311ff0d4226"; - sha256 = "0asqmnyizcyg5drfhbm52l654q3s5ibvbnd8n45kbcn3cnaqb148"; + rev = "5c1fc0452387cae323692e3345238a780a942056"; + sha256 = "0j2bba7img06m6b7lzgw1q5r8g38cs70pynwisqdb34l5jbj0fqx"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4609,12 +4622,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2021-04-24"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "f4773c0d2f7453fea23f5f69f433547f3d62ea0a"; - sha256 = "06fsfsvrq6sqyqpmj693vn810c6zvzn16781mw6bb2912cmyrs5z"; + rev = "a8c4af3d69839cd2c03d458044fb3d3b128e450d"; + sha256 = "0s87vzdb3j3hna5yda4jay1k4zw419mqd8yn3h4q22qhhsr36q0k"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -5116,12 +5129,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2021-05-18"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "b3fd9022bdc3472dac114a8b2aa85b845189514b"; - sha256 = "0yss85xy3i6gfgpwy3h42db5q5gpmv9m3s64ygfix5f24lflsi98"; + rev = "b6c9a814a4fdfcad3ea53d8888746803a7218a9e"; + sha256 = "0iqirp8pmsrgrk3i0hkk1a66igc5ydi96scp62yl97nazhz45xxr"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -5464,12 +5477,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-06-04"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "82b1b2e87677b468a3b6140372839654d8c346e7"; - sha256 = "0vvaj84q72z5b473f4823laxdvqb1qqj83n05ixavzpjq2qnlmhq"; + rev = "49cdcb7b3ea76ee19c737885c0ab19e64e564169"; + sha256 = "17p0j9i6ylns66cx6qw4266yd6al1gvmran3k4v2mhjlynf5c4s3"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -5560,12 +5573,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-06-05"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "31e47bb9ee7a8b7aa2d324723dac75ea02896044"; - sha256 = "1pw5iipr6yln1nspy2sn13cx7p1cn5485l8rkkkyqfwqgqsj3jfq"; + rev = "43ec20e20f21f4f4a5eccadef01186ee7bf1df98"; + sha256 = "0qa9a6l9snkvnf41924mvv5yhm8ywcz6mzdirsr43inp5hgv6r8n"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -5740,12 +5753,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-06-06"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "351ec86836986fb36e48ba414d65b62a7793374a"; - sha256 = "1gksn9s40fjzwp6v0cmss2mxhpprj8ycysy5rbfp8h3vdghkkya7"; + rev = "c7e013cb273597e37eb65b481cbeb7d1b92b01b7"; + sha256 = "1i33y3jqjqbrg2mgnz4sxvsckl1ggdg3aymxxz4l3qivnbn1fni5"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6580,12 +6593,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-06-03"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "68a8cb300c75eb1cd2173b2aac70515e99904ef3"; - sha256 = "0s4c1vb2z3manl2i768f48i2pww2d4dj41plx4mvvi7sczlma30n"; + rev = "0f98634b92da9a35580b618c11a6d2adc42d9f90"; + sha256 = "0l1f98zfmxq8xi2ii31ih0mbq5yilpc0l61qbprs1g5h5p4azjy8"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -7326,12 +7339,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-06-02"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "ddd5abb5b6491117c4b7ef4149e47945926eecd8"; - sha256 = "0xv687xzwqhwpmxr65sm3ln74y8mxww1q3fqj57va06ilxzac56c"; + rev = "516fd7ce956bdfa2fa6ee8ac6d77ad8a57616811"; + sha256 = "0anfwxq93ddmymdna692xz74h3kimwmw1ii6pq8ci08i3pkqjrf7"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -8095,12 +8108,12 @@ final: prev: vim-qf = buildVimPluginFrom2Nix { pname = "vim-qf"; - version = "2021-03-29"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-qf"; - rev = "127257057c4befb8c1026a7ba7e07713af1fb5c8"; - sha256 = "1ai915kfxq4m8ba304qpcc2qb5rcj2vsrfcdh3blb1slw3a90hiq"; + rev = "4fe7e33a514874692d6897edd1acaaa46d9fb646"; + sha256 = "054p9f3a3yljng3r51asgyq2ifmmrr35ws5f8dv8ssmby2f7an1l"; }; meta.homepage = "https://github.com/romainl/vim-qf/"; }; @@ -8203,12 +8216,12 @@ final: prev: vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2021-04-12"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "662c00676abab9d7ce16bf9f202420bf86cc6554"; - sha256 = "1birkzysn8midk627zyp3pla51wmz4sp613gs5xxlms5imq4diaq"; + rev = "9a5ce8edc67cca36cc530ee27a805112ce7a7e9b"; + sha256 = "0zx1mzaiqwqyg7imahwy0mzp52b2dzp4qdnrsgcnkvkxf8v67bak"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -8467,12 +8480,12 @@ final: prev: vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; - version = "2021-02-16"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "bohlender"; repo = "vim-smt2"; - rev = "196d05f7152fb95c4613476368ebae9dd842d470"; - sha256 = "0lk9clnvrkjbxgszg52zdl28d313vk2fiyh86aa6xx5pr0nr9iw3"; + rev = "2cc8c80c0a88e0d47de85bef1d50df86e197c302"; + sha256 = "0djk8s8q4b72blw73r4m7z9gc15gys167xgnvd1avmfyfw8fb22a"; }; meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; @@ -8972,12 +8985,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-06-04"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "17e372f83238d5d85f6574c59d5d210a898e8623"; - sha256 = "084mn6zxc2x8gp938fpi5ylwqy2pgvn046xbsmyq8md36vqb6m7g"; + rev = "d864a6b2b0f394b9371246cad226adac7507e13d"; + sha256 = "0bvdhbla38mvq9x595h5mcvib13sb84mz3z9f7sqf4m3c9v9376m"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -9200,12 +9213,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-05-29"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "ad80aa67958a31a254d8994c7a517c1123256721"; - sha256 = "07pd7wzyvch400i6kv0ld3bx2x90ycdjaapwc7aaqkwikk2slq3h"; + rev = "5e67677a4815bbf474b52f8aefcfa2090fe43768"; + sha256 = "17pb39zhzsmmibxmsbrsd3znky88sar2sl0h7b1418qqkaakx4p9"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -9392,12 +9405,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-05-25"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "a51b8b23c9b7e12c2899e423037458d46dbe196e"; - sha256 = "0w49lgmg880pzblwwkkrp24pyvd8dkjbqvsx9m6n3x5n4zmz1c1f"; + rev = "1cbb400d426760a63d5383e2574e9d8905bebe51"; + sha256 = "172kryvxphsvbh2f60ka21rjsrq4abgdh1ijyxp57p1qbbv9fhcc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -9405,12 +9418,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-06-01"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "b0d430b80504e847584664d83e879399647cd38f"; - sha256 = "0k44iv5fig0601bc1vglgbphiw0h6gq8379zsk1ca3fgzyi2ic0p"; + rev = "fef77c8edf655d947e4d9c78d7bd2740ccda70cd"; + sha256 = "06hdz4rwwnmm1hhhjhvcd50r04qnvmksriaw4csv3gfnkfkm5v9r"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1a2457d36d3..015504c5b45 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -159,6 +159,7 @@ GEverding/vim-hocon gfanto/fzf-lsp.nvim@main gibiansky/vim-textobj-haskell gioele/vim-autoswap +gleam-lang/gleam.vim glepnir/dashboard-nvim glepnir/galaxyline.nvim@main glepnir/lspsaga.nvim@main diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 1ca566bf7f2..7951636c60c 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -12,6 +12,19 @@ let # baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) { + _4ops.terraform = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "4ops"; + name = "terraform"; + version = "0.2.1"; + sha256 = "196026a89pizj8p0hqdgkyllj2spx2qwpynsaqjq17s8v15vk5dg"; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; + a5huynh.vscode-ron = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-ron"; @@ -495,6 +508,19 @@ let }; }; + jkillian.custom-local-formatters = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "jkillian"; + name = "custom-local-formatters"; + version = "0.0.4"; + sha256 = "1pmqnc759fq86g2z3scx5xqpni9khcqi5z2kpl1kb7yygsv314gm"; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; + github = { github-vscode-theme = buildVscodeMarketplaceExtension { mktplcRef = { @@ -615,7 +641,7 @@ let }; }; - JakeBecker.elixir-ls = buildVscodeMarketplaceExtension { + jakebecker.elixir-ls = buildVscodeMarketplaceExtension { mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; @@ -708,11 +734,24 @@ let mktplcRef = { name = "magit"; publisher = "kahole"; - version = "0.6.13"; - sha256 = "sha256-/SeGQV0UEqBk69cAmUXFc/OfPxNssvzZqa7NmAMQD1k="; + version = "0.6.15"; + sha256 = "sha256-fRXm70FXnHduoywI4YC9ya6/J7wyd6EBzbnrcijBIbA="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + mads-hartmann.bash-ide-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "mads-hartmann"; + name = "bash-ide-vscode"; + version = "1.11.0"; + sha256 = "1hq41fy2v1grjrw77mbs9k6ps6gncwlydm03ipawjnsinxc9rdkp"; }; meta = { license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; }; }; @@ -982,6 +1021,18 @@ let }; }; + shardulm94.trailing-spaces = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "shardulm94"; + name = "trailing-spaces"; + version = "0.3.1"; + sha256 = "0h30zmg5rq7cv7kjdr5yzqkkc1bs20d72yz9rjqag32gwf46s8b8"; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; shyykoserhiy.vscode-spotify = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1173,7 +1224,7 @@ let }; }; - VSpaceCode.vspacecode = buildVscodeMarketplaceExtension { + vspacecode.vspacecode = buildVscodeMarketplaceExtension { mktplcRef = { name = "vspacecode"; publisher = "VSpaceCode"; @@ -1185,7 +1236,7 @@ let }; }; - VSpaceCode.whichkey = buildVscodeMarketplaceExtension { + vspacecode.whichkey = buildVscodeMarketplaceExtension { mktplcRef = { name = "whichkey"; publisher = "VSpaceCode"; diff --git a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix b/pkgs/os-specific/linux/alsa-plugins/wrapper.nix deleted file mode 100644 index 8271088a501..00000000000 --- a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ writeShellScriptBin, stdenv, alsaPlugins }: -writeShellScriptBin "ap${if stdenv.hostPlatform.system == "i686-linux" then "32" else "64"}" '' - ALSA_PLUGIN_DIRS=${alsaPlugins}/lib/alsa-lib "$@" -'' diff --git a/pkgs/os-specific/linux/alsa-firmware/cross.patch b/pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch index 989ccea2b98..989ccea2b98 100644 --- a/pkgs/os-specific/linux/alsa-firmware/cross.patch +++ b/pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix index a627a7762a8..a627a7762a8 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix diff --git a/pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch b/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch index b17df9a492e..b17df9a492e 100644 --- a/pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index 7d2615824a6..7d2615824a6 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix index 9c87dbe8e8c..f600b52c5f3 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: +{lib, stdenv, fetchurl, alsa-lib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { pname = "alsa-oss"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4"; }; - buildInputs = [ alsaLib ncurses libsamplerate ]; + buildInputs = [ alsa-lib ncurses libsamplerate ]; nativeBuildInputs = [ gettext ]; configureFlags = [ "--disable-xmlto" ]; diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix index 5fd940c9635..747979b1037 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, pkg-config, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: +{ stdenv, fetchurl, lib, pkg-config, alsa-lib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { pname = "alsa-plugins"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # ToDo: a52, etc.? buildInputs = - [ alsaLib libogg ] + [ alsa-lib libogg ] ++ lib.optional (libpulseaudio != null) libpulseaudio ++ lib.optional (libjack2 != null) libjack2; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix b/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix new file mode 100644 index 00000000000..992f4886e26 --- /dev/null +++ b/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix @@ -0,0 +1,10 @@ +{ stdenv +, alsa-plugins +, writeShellScriptBin +}: +let + arch = if stdenv.hostPlatform.system == "i686-linux" then "32" else "64"; +in +writeShellScriptBin "ap${arch}" '' + ALSA_PLUGIN_DIRS=${alsa-plugins}/lib/alsa-lib "$@" +'' diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix index 897d8dd6c02..8b9abb74036 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, pkg-config, gtk2, gtk3, fltk13 }: +{ lib, stdenv, fetchurl, alsa-lib, pkg-config, gtk2, gtk3, fltk13 }: # Comes from upstream as as bundle of several tools, # some use gtk2, some gtk3 (and some even fltk13). @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib gtk2 gtk3 fltk13 ]; + buildInputs = [ alsa-lib gtk2 gtk3 fltk13 ]; patchPhase = '' export tools="as10k1 hda-verb hdspmixer echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control" diff --git a/pkgs/os-specific/linux/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix index 97960f833e1..97960f833e1 100644 --- a/pkgs/os-specific/linux/alsa-topology-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix diff --git a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix index d87f3eebb84..d87f3eebb84 100644 --- a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix index 298d9d19635..47da04de5ae 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, alsaLib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: +{lib, stdenv, fetchurl, alsa-lib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: stdenv.mkDerivation rec { pname = "alsa-utils"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ gettext makeWrapper ]; - buildInputs = [ alsaLib ncurses libsamplerate fftw ]; + buildInputs = [ alsa-lib ncurses libsamplerate fftw ]; configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; diff --git a/pkgs/os-specific/linux/aseq2json/default.nix b/pkgs/os-specific/linux/aseq2json/default.nix index 015419ee07a..646e9f7b7b9 100644 --- a/pkgs/os-specific/linux/aseq2json/default.nix +++ b/pkgs/os-specific/linux/aseq2json/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, alsaLib, glib, json-glib }: +{ stdenv, lib, fetchFromGitHub, pkg-config, alsa-lib, glib, json-glib }: stdenv.mkDerivation { pname = "aseq2json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sourceRoot = "source/aseq2json"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib glib json-glib ]; + buildInputs = [ alsa-lib glib json-glib ]; installPhase = '' install -D --target-directory "$out/bin" aseq2json diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 2e342fbc039..f995c8c5c1e 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, alsaLib +, alsa-lib , dbus , glib , json_c @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib + alsa-lib dbus glib json_c diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index b7ee8772f46..b060b908284 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.10.3"; - sha256Hash = "054g3jqy8lhlj8kkwd16wxaxzynmh8h5iv20cryd0psg0hgmhd7v"; + version = "3.10.4"; + sha256Hash = "1ml4bs4wx5dbz5xpnd5g8b9avmn7g7jvf16fbdlk0da8il0qd2rx"; }; } diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index c241ac02a64..04eccaf0243 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -9,7 +9,7 @@ , udev , libusb1 , libv4l -, alsaLib +, alsa-lib , gsl , libpng , sfml @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 - alsaLib + alsa-lib ffmpeg libusb1 libv4l diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index e97dcad43db..ca5b82b8785 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kernel, alsaLib }: +{ lib, stdenv, fetchurl, kernel, alsa-lib }: with lib; @@ -7,7 +7,7 @@ let if stdenv.is64bit then "64" else "32"; - libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsaLib ]; + libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsa-lib ]; in stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix index 9e9cf149fef..0797656f653 100644 --- a/pkgs/os-specific/linux/pommed-light/default.nix +++ b/pkgs/os-specific/linux/pommed-light/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , pciutils , libconfuse -, alsaLib +, alsa-lib , audiofile , pkg-config , zlib @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ pciutils libconfuse - alsaLib + alsa-lib audiofile zlib eject diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 81a5f74c42f..90a052fdef9 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, pkg-config, perl , libjpeg, udev , withUtils ? true -, withGUI ? true, alsaLib, libX11, qtbase, libGLU, wrapQtAppsHook +, withGUI ? true, alsa-lib, libX11, qtbase, libGLU, wrapQtAppsHook }: # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config perl ] ++ lib.optional withQt wrapQtAppsHook; - buildInputs = [ udev ] ++ lib.optionals withQt [ alsaLib libX11 qtbase libGLU ]; + buildInputs = [ udev ] ++ lib.optionals withQt [ alsa-lib libX11 qtbase libGLU ]; propagatedBuildInputs = [ libjpeg ]; diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index 4be2bdfb5b8..1ff50079ebd 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -1,5 +1,5 @@ { lib, buildGoModule, fetchFromGitHub -, pkg-config, taglib, alsaLib +, pkg-config, taglib, alsa-lib , zlib # Disable on-the-fly transcoding, @@ -21,7 +21,7 @@ buildGoModule rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ taglib alsaLib zlib ]; + buildInputs = [ taglib alsa-lib zlib ]; vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; # TODO(Profpatsch): write a test for transcoding support, diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 56bf0ed5d2f..86c150991f7 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -11,7 +11,7 @@ # Filters , libsamplerate # Outputs -, alsaLib, libjack2, libpulseaudio, libshout +, alsa-lib, libjack2, libpulseaudio, libshout # Misc , icu, sqlite, avahi, dbus, pcre, libgcrypt, expat # Services @@ -63,7 +63,7 @@ let # Filter plugins libsamplerate = [ libsamplerate ]; # Output plugins - alsa = [ alsaLib ]; + alsa = [ alsa-lib ]; jack = [ libjack2 ]; pulse = [ libpulseaudio ]; shout = [ libshout ]; diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix index b4d1fda4090..c6fd2332c90 100644 --- a/pkgs/servers/mumsi/default.nix +++ b/pkgs/servers/mumsi/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, boost -, log4cpp, pjsip, openssl, alsaLib, mumlib }: +, log4cpp, pjsip, openssl, alsa-lib, mumlib }: with lib; stdenv.mkDerivation { pname = "mumsi"; version = "unstable-2018-12-12"; @@ -11,7 +11,7 @@ with lib; stdenv.mkDerivation { sha256 = "0vrivl1fiiwjsz4v26nrn8ra3k9v0mcz7zjm2z319fw8hv6n1nrk"; }; - buildInputs = [ boost log4cpp pkg-config pjsip mumlib openssl alsaLib ]; + buildInputs = [ boost log4cpp pkg-config pjsip mumlib openssl alsa-lib ]; nativeBuildInputs = [ cmake pkg-config ]; installPhase = '' install -Dm555 mumsi $out/bin/mumsi diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index bebe4801c65..10b18dd1ae1 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, autoreconfHook , libsndfile, libtool, makeWrapper, perlPackages -, xorg, libcap, alsaLib, glib, dconf +, xorg, libcap, alsa-lib, glib, dconf , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat , soxr, speexdsp, systemd, webrtc-audio-processing @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optional jackaudioSupport libjack2 ++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ] ++ lib.optional useSystemd systemd - ++ lib.optionals stdenv.isLinux [ alsaLib udev ] + ++ lib.optionals stdenv.isLinux [ alsa-lib udev ] ++ lib.optional airtunesSupport openssl ++ lib.optionals bluetoothSupport [ bluez5 sbc ] ++ lib.optional remoteControlSupport lirc diff --git a/pkgs/servers/pulseaudio/pali.nix b/pkgs/servers/pulseaudio/pali.nix index cc11f98a829..b07c2fd4ac7 100644 --- a/pkgs/servers/pulseaudio/pali.nix +++ b/pkgs/servers/pulseaudio/pali.nix @@ -11,7 +11,7 @@ , perlPackages , xorg , libcap -, alsaLib +, alsa-lib , glib , dconf , avahi @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.xlibsWrapper ] ++ lib.optionals stdenv.isLinux [ - alsaLib + alsa-lib systemd udev ] ++ lib.optional airtunesSupport openssl diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 3fcb8af65e2..c26ae1e6416 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -1,5 +1,5 @@ -{ alsaLib -, alsaUtils +{ alsa-lib +, alsa-utils , autoPatchelfHook , cifs-utils , fetchurl @@ -23,8 +23,8 @@ }; buildInputs = [ - alsaLib - alsaUtils + alsa-lib + 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/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index bae2f3aad79..7fdb4bbc869 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsaLib +{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsa-lib , libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl avahi - alsaLib + alsa-lib libdaemon popt libconfig diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index be3b4209eb9..cc80acd4226 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "1h3ry4y62wwcv4z3yjqal4ch4xy40k9s3rq20lqs3r58kblnaxs2"; + sha256 = "0mw0sizy30slgyd06syd9sqx22dxd08ncqx7srcinj1g7hxylm5z"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index c5b426e463b..885aaaa1214 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.52"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.88"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-keKyuNeDC/90pn89KjoDTO8AGsmI8nqfDNSeGyM6iHQ="; + sha256 = "sha256-LfWSE3dDTJ0BHcaaY49Nd9RAZgj5b++NFeYhkIfwQX0="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 11c2da247d7..fde3e829cc1 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -19,13 +19,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.14"; + version = "4.15"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "1x9gv70j333w254jgg1n0kvxpwv6vww0v0i862pglq48xhdaa7hy"; + sha256 = "sha256-UXipGNWclBKgr0r0wav85Gnhp2SXkTvDFr9gKJWismU="; }; postPatch = '' diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix index 12d590c4c76..c6c25fd3996 100644 --- a/pkgs/tools/audio/alsaequal/default.nix +++ b/pkgs/tools/audio/alsaequal/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, alsaLib, caps +, alsa-lib, caps }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1w3g9q5z3nrn3mwdhaq6zsg0jila8d102dgwgrhj9vfx58apsvli"; }; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index f7d74dc615c..1ff66e83e5a 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, libjack2, alsaLib, libpulseaudio +, libjack2, alsa-lib, libpulseaudio , faac, lame, libogg, libopus, libvorbis, libsamplerate }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libopus libvorbis libogg libpulseaudio alsaLib libsamplerate libjack2 lame + libopus libvorbis libogg libpulseaudio alsa-lib libsamplerate libjack2 lame ]; NIX_CFLAGS_COMPILE = "-fpermissive"; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 03ea3302d26..9ef8eb43772 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: +{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { name = "gvolicon-2014-04-28"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - makeWrapper alsaLib gtk3 gdk-pixbuf gnome.adwaita-icon-theme + makeWrapper alsa-lib gtk3 gdk-pixbuf gnome.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 3d05461121f..1c52e6796b7 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -1,6 +1,6 @@ { lib, stdenv, makeWrapper, fetchurl, which, pkg-config , ocamlPackages -, libao, portaudio, alsaLib, libpulseaudio, libjack2 +, libao, portaudio, alsa-lib, libpulseaudio, libjack2 , libsamplerate, libmad, taglib, lame, libogg , libvorbis, speex, libtheora, libopus, zlib , faad2, flac, ladspaH, ffmpeg, frei0r, dssi @@ -52,7 +52,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ which ocamlPackages.ocaml ocamlPackages.findlib - libao portaudio alsaLib libpulseaudio libjack2 + libao portaudio alsa-lib libpulseaudio libjack2 libsamplerate libmad taglib lame libogg libvorbis speex libtheora libopus zlib faad2 flac ladspaH ffmpeg frei0r dssi diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix index 186f67f3504..f220fed208f 100644 --- a/pkgs/tools/audio/mididings/default.nix +++ b/pkgs/tools/audio/mididings/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: +{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsa-lib, libjack2 }: pythonPackages.buildPythonApplication { version = "2015-11-17"; @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib alsaLib libjack2 pythonPackages.boost ]; + buildInputs = [ glib alsa-lib libjack2 pythonPackages.boost ]; propagatedBuildInputs = with pythonPackages; [ decorator ] # for livedings ++ [ tkinter pyliblo ] diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index 0c82d09f99b..13f8dde680d 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, alsa-lib }: mkDerivation rec { version = "1.5.1"; @@ -13,7 +13,7 @@ mkDerivation rec { }; buildInputs = [ - alsaLib qttools + alsa-lib qttools ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index 3aca8e8f619..da4654a3e5f 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, alsa-lib, gtk3, glib, libnotify, libX11, pcre }: stdenv.mkDerivation rec { pname = "pnmixer"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config gettext ]; - buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ]; + buildInputs = [ alsa-lib gtk3 glib libnotify libX11 pcre ]; meta = with lib; { homepage = "https://github.com/nicklan/pnmixer"; diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index 55dbba007f8..f8b705a8fa1 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, cmake, alsaLib, udev, qtbase, qtsvg, qttools }: +{ mkDerivation, lib, fetchFromGitLab, cmake, alsa-lib, udev, qtbase, qtsvg, qttools }: mkDerivation rec { pname = "qastools"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ alsaLib udev qtbase qtsvg qttools ]; + buildInputs = [ alsa-lib udev qtbase qtsvg qttools ]; meta = with lib; { description = "Collection of desktop applications for ALSA configuration"; diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix index c7445f03fd3..b3ffee6419b 100644 --- a/pkgs/tools/audio/trx/default.nix +++ b/pkgs/tools/audio/trx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libopus, ortp, bctoolbox }: +{ lib, stdenv, fetchurl, alsa-lib, libopus, ortp, bctoolbox }: stdenv.mkDerivation rec { pname = "trx"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./add_bctoolbox_ldlib.patch ]; - buildInputs = [ alsaLib libopus ortp bctoolbox ]; + buildInputs = [ alsa-lib libopus ortp bctoolbox ]; makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index 79dc5a356be..4d726cbd2a9 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchurl, lib, stdenv, gtk3, pkg-config, intltool, alsaLib }: +{ pkgs, fetchurl, lib, stdenv, gtk3, pkg-config, intltool, alsa-lib }: stdenv.mkDerivation { pname = "volumeicon"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk3 intltool alsaLib ]; + buildInputs = [ gtk3 intltool alsa-lib ]; meta = with lib; { description = "A lightweight volume control that sits in your systray"; diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index 6867d7c8ce9..175fa92bad2 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, alsaLib, bluez, glib, sbc, dbus +, alsa-lib, bluez, glib, sbc, dbus # optional, but useful utils , readline, libbsd, ncurses @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ - alsaLib bluez glib sbc dbus + alsa-lib bluez glib sbc dbus readline libbsd ncurses ] ++ optional aacSupport fdk_aac; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index c3bdbca7a59..fef13a89372 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, python3, bluez , tcl, acl, kmod, coreutils, shadow, util-linux, udev -, alsaSupport ? stdenv.isLinux, alsaLib +, alsaSupport ? stdenv.isLinux, alsa-lib , systemdSupport ? stdenv.isLinux, systemd }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3.pkgs.cython tcl ]; buildInputs = [ bluez ] - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional systemdSupport systemd; meta = { diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 8ede0510487..8baeb1556b1 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, dpkg -, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib +, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: let version = "1.25.0"; rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index db3a065fdf4..847e8bb8428 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, makeWrapper , dpkg, patchelf -, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd +, gtk2, glib, gdk-pixbuf, alsa-lib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd , libXdamage, expat }: let LD_LIBRARY_PATH = lib.makeLibraryPath - [ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; + [ glib gtk2 gdk-pixbuf alsa-lib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; in stdenv.mkDerivation rec { version = "2.8.1"; diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index 78172c5ef75..f611b7adc07 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib }: +{ lib, stdenv, fetchFromGitHub, alsa-lib }: stdenv.mkDerivation rec { version = "0.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index 12168bd07f0..1ead06ed6e8 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchurl, - alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, + alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, gtk2-x11, nspr, nss, libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver, libXtst, @@ -32,7 +32,7 @@ preFixup = let libPath = lib.makeLibraryPath [ - alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype + alsa-lib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype gdk-pixbuf glib gnome2.GConf pango gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXScrnSaver libXtst diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 63c4fd36ff6..760284140b1 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, ncurses, pkg-config }: +{ lib, stdenv, fetchurl, alsa-lib, libjack2, ncurses, pkg-config }: stdenv.mkDerivation { name = "timidity-2.15.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ ./timidity-iA-Oj.patch ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib libjack2 ncurses ]; + buildInputs = [ alsa-lib libjack2 ncurses ]; configureFlags = [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "--enable-ncurses" ]; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 42624df8a06..7677a756737 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.9.1"; + version = "7.0.1"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FaN1/S/VzHnaQp+UOmvNGaWDEFijVEI7GWkAmnln3jE="; + sha256 = "sha256-86lBEtwybHrcm7G0ZIbfOHSZPBzNERHGqrTR4YbpDnE="; }; - cargoSha256 = "sha256-Vq2gorQJbLfxKWKbYYOVaHPN0uITbGs1CgkwBtPwSrk="; + cargoSha256 = "sha256-yZIh01A1yC1ZeDDyXeh1C3abPfbW2JuJ7TIsVO1weZk="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix index efa05591f52..dc343e563a7 100644 --- a/pkgs/tools/networking/netifd/default.nix +++ b/pkgs/tools/networking/netifd/default.nix @@ -1,27 +1,22 @@ -{ runCommand, lib, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c }: +{ lib, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c, pkg-config }: stdenv.mkDerivation { pname = "netifd"; - version = "unstable-2020-07-11"; + version = "unstable-2021-04-03"; src = fetchgit { url = "https://git.openwrt.org/project/netifd.git"; - rev = "3d9bd73e8c2d8a1f78effbe92dd2495bbd2552c4"; - sha256 = "085sx1gsigbi1jr19l387rc5p6ja1np6q2gb84khjd4pyiqwk840"; + rev = "327da9895327bc56b23413ee91a6e6b6e0e4329d"; + sha256 = "0jvk2hx8kbkc6d72gh9rwap8ds6qgnmny6306vvzxy68v03xikwv"; }; buildInputs = [ libnl libubox uci ubus json_c ]; - nativeBuildInputs = [ cmake ]; - - preBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ - -I$(echo "${lib.getDev libnl}"/include/libnl*/)" - ''; + nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { description = "OpenWrt Network interface configuration daemon"; homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.linux; maintainers = with maintainers; [ petabyteboy ]; }; diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index e1a5de7754e..92d783dd5fd 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype , pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes -, libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr +, libXrender, libXcomposite , alsa-lib, libXdamage, libXtst, libXrandr , expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify }: @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { rpath = lib.makeLibraryPath [ glib nss nspr gconf fontconfig freetype pango cairo libX11 libXi - libXcursor libXext libXfixes libXrender libXcomposite alsaLib + libXcursor libXext libXfixes libXrender libXcomposite alsa-lib libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk-pixbuf libnotify stdenv.cc.cc ]; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 8894a77a86a..3032c18427a 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev, libdrm, mesa +{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, udev, libdrm, mesa , dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook , runtimeShell, gsettings-desktop-schemas }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib atk cairo cups diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 08d8ed9494f..3eb72cefa12 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -40,8 +40,14 @@ mapAliases ({ adobe_flex_sdk = apache-flex-sdk; # added 2018-06-01 ag = silver-searcher; # added 2018-04-25 aircrackng = aircrack-ng; # added 2016-01-14 - alienfx = throw "alienfx has been removed."; # added 2019-12-08 aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30 + alienfx = throw "alienfx has been removed."; # added 2019-12-08 + alsaLib = alsa-lib; # added 2021-06-09 + alsaOss = alsa-oss; # added 2021-06-10 + 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 c445e428761..2c6ca049d78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2228,6 +2228,8 @@ in commitizen = callPackage ../applications/version-management/commitizen {}; + common-licenses = callPackage ../data/misc/common-licenses {}; + compactor = callPackage ../applications/networking/compactor { }; consul = callPackage ../servers/consul { }; @@ -14036,6 +14038,8 @@ in swiftformat = callPackage ../development/tools/swiftformat { }; + symfony-cli = callPackage ../development/tools/symfony-cli { }; + swiftshader = callPackage ../development/libraries/swiftshader { }; systemfd = callPackage ../development/tools/systemfd { }; @@ -20109,23 +20113,17 @@ in alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; - alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { }; - - alsaLib = callPackage ../os-specific/linux/alsa-lib { }; - - alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { }; - - alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; - - alsaUtils = callPackage ../os-specific/linux/alsa-utils { + alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { }; + alsa-lib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; + alsa-oss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; + 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 { }; + alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { }; + alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; + alsa-utils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; - alsaOss = callPackage ../os-specific/linux/alsa-oss { }; - alsaTools = callPackage ../os-specific/linux/alsa-tools { }; - - alsa-ucm-conf = callPackage ../os-specific/linux/alsa-ucm-conf { }; - - alsa-topology-conf = callPackage ../os-specific/linux/alsa-topology-conf { }; inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware @@ -23357,7 +23355,7 @@ in libXaw = xorg.libXaw; Xaw3d = null; gconf = null; - alsaLib = null; + alsa-lib = null; acl = null; gpm = null; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e284963bef..d417b2a85e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5162,6 +5162,8 @@ in { pynndescent = callPackage ../development/python-modules/pynndescent { }; + pynobo = callPackage ../development/python-modules/pynobo { }; + pynuki = callPackage ../development/python-modules/pynuki { }; pynws = callPackage ../development/python-modules/pynws { }; |