diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-06-10 16:13:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 16:13:48 +0200 |
| commit | a5f5d020c69c22ddc6be48123ef4d30fd262c403 (patch) | |
| tree | bfb79b323b549e1f10a94d0153fdd3761ae893a6 /pkgs/servers | |
| parent | ed43d951af1030d01e22fe0aaaed568af4e7e8e9 (diff) | |
| parent | bbe71613b6e656e707acdf9c279736c900bf4e87 (diff) | |
| download | nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.gz nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.bz2 nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.lz nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.xz nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.zst nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.zip | |
Merge branch 'staging-next'
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/connector-c/3_1.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index b9fb104d5f6c..e15efd4b47d1 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -3,7 +3,7 @@ , xorg, libcap, alsaLib, glib, dconf , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat -, speexdsp, systemd, webrtc-audio-processing +, soxr, speexdsp, systemd, webrtc-audio-processing , x11Support ? false @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ libcap ]; buildInputs = - [ libtool libsndfile speexdsp fftwFloat ] + [ libtool libsndfile soxr speexdsp fftwFloat ] ++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] ++ lib.optionals (!libOnly) ( diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix index e3fc66045301..fb6835775fbf 100644 --- a/pkgs/servers/sql/mariadb/connector-c/3_1.nix +++ b/pkgs/servers/sql/mariadb/connector-c/3_1.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./. (args // { - version = "3.1.7"; - sha256 = "16pmdms454jbralaw6rpx0rjlf2297p6h3q8wfk0n87kbn7vrxv4"; + version = "3.1.8"; + sha256 = "0yrzhsxmjiwkhchagx8dymzhvxl3k5h40wn9wpicqjvgjb9k8523"; }) |