JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-06-07 00:15:20 +00:00 committed by GitHub
commit 4db56e21dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 282 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/systems/parse.nix
View File

@ -121,6 +121,14 @@ rec {
js = { bits = 32; significantByte = littleEndian; family = "js"; };
};
# GNU build systems assume that older NetBSD architectures are using a.out.
gnuNetBSDDefaultExecFormat = cpu:
if (cpu.family == "x86" && cpu.bits == 32) ||
(cpu.family == "arm" && cpu.bits == 32) ||
(cpu.family == "sparc" && cpu.bits == 32)
then execFormats.aout
else execFormats.elf;
# Determine when two CPUs are compatible with each other. That is,
# can code built for system B run on system A? For that to happen,
# the programs that system B accepts must be a subset of the
@ -276,7 +284,7 @@ rec {
kernels = with execFormats; with kernelFamilies; setTypes types.openKernel {
# TODO(@Ericson2314): Don't want to mass-rebuild yet to keeping 'darwin' as
# the nnormalized name for macOS.
# the normalized name for macOS.
macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; };
ios = { execFormat = macho; families = { inherit darwin; }; };
freebsd = { execFormat = elf; families = { inherit bsd; }; };
@ -463,8 +471,12 @@ rec {
else "${cpu.name}-${kernel.name}";
tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let
optExecFormat =
lib.optionalString (kernel.name == "netbsd" &&
gnuNetBSDDefaultExecFormat cpu != kernel.execFormat)
kernel.execFormat.name;
optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}";
in "${cpu.name}-${vendor.name}-${kernel.name}${optAbi}";
in "${cpu.name}-${vendor.name}-${kernel.name}${optExecFormat}${optAbi}";
################################################################################

1
nixos/lib/test-driver/test-driver.py
View File

@ -907,7 +907,6 @@ class Machine:
def create_machine(args: Dict[str, Any]) -> Machine:
global log
args["log"] = log
args["redirectSerial"] = os.environ.get("USE_SERIAL", "0") == "1"
return Machine(args)

3
nixos/lib/testing-python.nix
View File

@ -196,8 +196,7 @@ rec {
--add-flags "''${vms[*]}" \
${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
--set tests 'start_all(); join_all();' \
--set VLANS '${toString vlans}' \
${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
--set VLANS '${toString vlans}'
''); # "
passMeta = drv: drv // lib.optionalAttrs (t ? meta) {

21
nixos/modules/virtualisation/ec2-amis.nix
View File

@ -348,5 +348,24 @@ let self = {
"20.09".ap-east-1.hvm-ebs = "ami-0c42f97e5b1fda92f";
"20.09".sa-east-1.hvm-ebs = "ami-021637976b094959d";
latest = self."20.09";
# 21.05.740.aa576357673
"21.05".eu-west-1.hvm-ebs = "ami-048dbc738074a3083";
"21.05".eu-west-2.hvm-ebs = "ami-0234cf81fec68315d";
"21.05".eu-west-3.hvm-ebs = "ami-020e459baf709107d";
"21.05".eu-central-1.hvm-ebs = "ami-0857d5d1309ab8b77";
"21.05".eu-north-1.hvm-ebs = "ami-05403e3ae53d3716f";
"21.05".us-east-1.hvm-ebs = "ami-0d3002ba40b5b9897";
"21.05".us-east-2.hvm-ebs = "ami-069a0ca1bde6dea52";
"21.05".us-west-1.hvm-ebs = "ami-0b415460a84bcf9bc";
"21.05".us-west-2.hvm-ebs = "ami-093cba49754abd7f8";
"21.05".ca-central-1.hvm-ebs = "ami-065c13e1d52d60b33";
"21.05".ap-southeast-1.hvm-ebs = "ami-04f570c70ff9b665e";
"21.05".ap-southeast-2.hvm-ebs = "ami-02a3d1df595df5ef6";
"21.05".ap-northeast-1.hvm-ebs = "ami-027836fddb5c56012";
"21.05".ap-northeast-2.hvm-ebs = "ami-0edacd41dc7700c39";
"21.05".ap-south-1.hvm-ebs = "ami-0b279b5bb55288059";
"21.05".ap-east-1.hvm-ebs = "ami-06dc98082bc55c1fc";
"21.05".sa-east-1.hvm-ebs = "ami-04737dd49b98936c6";
latest = self."21.05";
}; in self

11
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -12,15 +12,17 @@ assert trackerSearch -> (python3 != null);
with lib;
mkDerivation rec {
pname = "qbittorrent";
version = "4.3.3";
version = "4.3.5";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qbittorrent";
repo = "qBittorrent";
rev = "release-${version}";
sha256 = "0y8vrvfv8n6zg6pgg5a9hmvxi2z9rrfd9k8zv04nv5js91b99ncq";
sha256 = "1vdk42f8rxffyfydjk5cgzg5gl88ng2pynlyxw5ajh08wvkkjzgy";
};
enableParallelBuilding = true;
# NOTE: 2018-05-31: CMake is working but it is not officially supported
nativeBuildInputs = [ makeWrapper pkg-config ];
@ -47,7 +49,8 @@ mkDerivation rec {
meta = {
description = "Featureful free software BitTorrent client";
homepage = "https://www.qbittorrent.org/";
license = licenses.gpl2;
changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ Anton-Latukha ];
};

4
pkgs/desktops/gnome/core/eog/default.nix
View File

@ -28,11 +28,11 @@
stdenv.mkDerivation rec {
pname = "eog";
version = "40.1";
version = "40.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-e+CGA3/tm2v4S6yXqD48kYMBt+nJavEwsnJS0KURFok=";
sha256 = "sha256-kITimZMftX3ih+V9vS7i0pf7Z0DA1TW52o1fGWqP0ZU=";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome/extensions/unite/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-unite";
version = "53";
version = "54";
src = fetchFromGitHub {
owner = "hardpixel";
repo = "unite-shell";
rev = "v${version}";
sha256 = "0fw9wqf362h2yd67fhgbhqx0b2fwcl25wxmb92dqwigxjcj0dnw6";
sha256 = "sha256-Ys2kWPj/FugW/LkvLAZdbj7Ufg/KShC+EX6QrjKNVH8=";
};
uuid = "unite@hardpixel.eu";

9
pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
View File

@ -23,7 +23,7 @@ index b9a2fb5..4b8629f 100644
+ value: '',
+ description: 'Installation directory for binary files in tests')
diff --git a/tests/meson.build b/tests/meson.build
index 77281f5..c4c7fac 100644
index 77281f5..7522456 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -21,8 +21,17 @@ unit_tests = [
@ -71,7 +71,12 @@ index 77281f5..c4c7fac 100644
),
env: ['MUTEST_OUTPUT=tap'],
protocol: 'tap',
@@ -70,13 +79,13 @@ if build_gir and host_system == 'linux' and not meson.is_cross_build()
@@ -66,17 +75,18 @@ endif
if build_gir and host_system == 'linux' and not meson.is_cross_build()
foreach unit: ['introspection.py']
wrapper = '@0@.test'.format(unit)
+ install_data(unit, install_dir: test_bindir)
custom_target(wrapper,
output: wrapper,
command: [
gen_installed_test,

8
pkgs/development/libraries/graphene/default.nix
View File

@ -12,6 +12,7 @@
, docbook_xsl
, docbook_xml_dtd_43
, gobject-introspection
, makeWrapper
}:
stdenv.mkDerivation rec {
@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
pkg-config
gobject-introspection
python3
makeWrapper
];
buildInputs = [
@ -62,6 +64,12 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs tests/gen-installed-test.py
PATH=${python3.withPackages (pp: [ pp.pygobject3 pp.tappy ])}/bin:$PATH patchShebangs tests/introspection.py
'';
postFixup = ''
wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/graphene-1.0/introspection.py" \
--prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0"
'';
passthru = {

21
pkgs/development/ocaml-modules/bisect_ppx/default.nix
View File

@ -1,27 +1,28 @@
{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ocaml-migrate-parsetree, ppx_tools_versioned }:
{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ppxlib }:
buildDunePackage rec {
pname = "bisect_ppx";
version = "2.5.0";
useDune2 = true;
version = "2.6.1";
src = fetchFromGitHub {
owner = "aantron";
repo = "bisect_ppx";
rev = version;
sha256 = "0w2qd1myvh333jvkf8hgrqzl8ns4xgfggk4frf1ij3jyc7qc0868";
sha256 = "sha256-YeLDlH3mUbVEY4OmzlrvSwVUav3uMtSsTFlOsQKnz84=";
};
minimumOCamlVersion = "4.08";
useDune2 = true;
buildInputs = [
cmdliner
ocaml-migrate-parsetree
ppx_tools_versioned
ppxlib
];
meta = {
description = "Code coverage for OCaml";
license = lib.licenses.mit;
meta = with lib; {
description = "Bisect_ppx is a code coverage tool for OCaml and Reason. It helps you test thoroughly by showing what's not tested.";
license = licenses.mit;
homepage = "https://github.com/aantron/bisect_ppx";
maintainers = with maintainers; [ ];
};
}

29
pkgs/development/ocaml-modules/fix/default.nix
View File

@ -1,25 +1,24 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
{ lib, fetchFromGitLab, buildDunePackage }:
assert lib.versionAtLeast (lib.getVersion ocaml) "3.12";
buildDunePackage rec {
pname = "fix";
version = "20201120";
stdenv.mkDerivation {
name = "ocaml-fix-20130611";
src = fetchurl {
url = "http://gallium.inria.fr/~fpottier/fix/fix-20130611.tar.gz";
sha256 = "1phlqcs1nb93x9cf0w0hnq2ck4dmn71zm4mxf60w96vb9yb9qzp0";
src = fetchFromGitLab {
domain = "gitlab.inria.fr";
owner = "fpottier";
repo = "fix";
rev = "${version}";
sha256 = "sha256-RO+JCG6R2i5uZfwTYEnQBCVq963fjv5lA2wA/8KrgMg=";
};
buildInputs = [ ocaml findlib ocamlbuild ];
createFindlibDestdir = true;
minimumOCamlVersion = "4.03";
useDune2 = true;
meta = with lib; {
homepage = "http://gallium.inria.fr/~fpottier/fix/";
homepage = "https://gitlab.inria.fr/fpottier/fix/";
description = "A simple OCaml module for computing the least solution of a system of monotone equations";
license = licenses.cecill-c;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [ vbgl ];
};
}

19
pkgs/development/ocaml-modules/ocaml-version/default.nix
View File

@ -1,24 +1,21 @@
{ lib, fetchurl, buildDunePackage }:
buildDunePackage rec {
pname = "ocaml-version";
version = "3.0.0";
minimumOCamlVersion = "4.07";
useDune2 = true;
version = "3.1.0";
src = fetchurl {
url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-v${version}.tbz";
sha256 = "15vk8sh50p3f2mbv8z7mqnx76cffri36f2krp25zkkwix8jg7ci4";
sha256 = "sha256-rHuhagnY9yISdC85NpgPv667aYx7v2JRgq99ayw83l8=";
};
meta = {
minimumOCamlVersion = "4.07";
useDune2 = true;
meta = with lib; {
description = "Manipulate, parse and generate OCaml compiler version strings";
homepage = "https://github.com/ocurrent/ocaml-version";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
license = licenses.isc;
maintainers = with maintainers; [ vbgl ];
};
}

27
pkgs/development/python-modules/adblock/default.nix
View File

@ -3,7 +3,6 @@
, fetchFromGitHub
, buildPythonPackage
, rustPlatform
, pythonImportsCheckHook
, pkg-config
, openssl
, publicsuffix-list
@ -11,11 +10,14 @@
, libiconv
, CoreFoundation
, Security
, pytestCheckHook
, toml
, python
}:
buildPythonPackage rec {
pname = "adblock";
version = "0.4.0";
version = "0.4.4";
disabled = isPy27;
# Pypi only has binary releases
@ -23,18 +25,18 @@ buildPythonPackage rec {
owner = "ArniDagur";
repo = "python-adblock";
rev = version;
sha256 = "10d6ks2fyzbizq3kb69q478idj0h86k6ygjb6wl3zq3mf65ma4zg";
sha256 = "sha256-zNQ8zEpTLzyU5AnFBNpOGDJ02Ogu2+xl85LA+ia7Si4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-gEFmj3/KvhvvsOK2nX2L1RUD4Wfp3nYzEzVnQZIsIDY=";
hash = "sha256-ajVZ0xPxC31hM1gQr3DC1HWdpIYBCSmqm0z2cflcClg=";
};
format = "pyproject";
nativeBuildInputs = [ pkg-config pythonImportsCheckHook ]
nativeBuildInputs = [ pkg-config ]
++ (with rustPlatform; [ cargoSetupHook maturinBuildHook ]);
buildInputs = [ openssl ]
@ -42,10 +44,19 @@ buildPythonPackage rec {
PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat";
# There are no rust tests
doCheck = false;
checkInputs = [ pytestCheckHook toml ];
pythonImportsCheck = [ "adblock" ];
preCheck = ''
# import from $out instead
rm -r adblock
'';
disabledTestPaths = [
# relies on directory removed above
"tests/test_typestubs.py"
];
pythonImportsCheck = [ "adblock" "adblock.adblock" ];
meta = with lib; {
description = "Python wrapper for Brave's adblocking library, which is written in Rust";

4
pkgs/development/python-modules/datadog/default.nix
View File

@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "datadog";
version = "0.40.1";
version = "0.41.0";
src = fetchPypi {
inherit pname version;
sha256 = "438c1dde5462e68c5c792b7b4a1d87a0ddd970af3db31b3cf15980eed0c44311";
sha256 = "sha256-PeGkO4qNX2sZ0WLsG0gtxasmNsWc9l5gWJcCMEUQpok=";
};
postPatch = ''

4
pkgs/development/python-modules/google-api-python-client/default.nix
View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "google-api-python-client";
version = "2.6.0";
version = "2.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "1s1q1nw05925ryvnycq4bmqrxc14cicdl1j4l9xvyis26cjg71va";
sha256 = "sha256-mHm40dGCEq6Ss1urYejqntXqY++cjKhHk4U42hDdGTs=";
};
# No tests included in archive

4
pkgs/development/python-modules/pyupgrade/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pyupgrade";
version = "2.18.0";
version = "2.19.1";
disabled = isPy27;
src = fetchFromGitHub {
owner = "asottile";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nkMKy1NAFBG/PuPdj3LAqr0c4UqEM2R2kHKuORql2dw=";
sha256 = "sha256-zDT8VskHEX4uldMvxnb9A+FKMuvZbtEcmdVl5mghTs4=";
};
checkInputs = [ pytestCheckHook ];

44
pkgs/development/python-modules/textacy/default.nix
View File

@ -1,34 +1,39 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
{ lib
, buildPythonPackage
, cachetools
, cytoolz
, fetchPypi
, jellyfish
, joblib
, matplotlib
, networkx
, numpy
, pyemd
, pyphen
, pytest
, pytestCheckHook
, pythonOlder
, requests
, scikit-learn
, scipy
, spacy
, srsly
, tqdm
}:
buildPythonPackage rec {
pname = "textacy";
version = "0.10.1";
disabled = isPy27;
version = "0.11.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "ff72adc6dbb85db6981324e226fff77830da57d7fe7e4adb2cafd9dc2a8bfa7d";
sha256 = "sha256-d/tyTCewoERA15iBv4H2LORFzgco15fnnN1sneeGuF4=";
};
propagatedBuildInputs = [
cachetools
cytoolz
jellyfish
joblib
matplotlib
networkx
numpy
@ -38,22 +43,25 @@ buildPythonPackage rec {
scikit-learn
scipy
spacy
srsly
tqdm
];
checkInputs = [ pytest ];
# almost all tests have to deal with downloading a dataset, only test pure tests
checkPhase = ''
pytest tests/test_text_utils.py \
tests/test_utils.py \
tests/preprocessing \
tests/datasets/test_base_dataset.py
'';
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [
# Almost all tests have to deal with downloading a dataset, only test pure tests
"tests/test_constants.py"
"tests/preprocessing/test_normalize.py"
"tests/similarity/test_edits.py"
"tests/preprocessing/test_resources.py"
"tests/preprocessing/test_replace.py"
];
pythonImportsCheck = [ "textacy" ];
meta = with lib; {
# scikit-learn in pythonPackages is too new for textacy
# remove as soon as textacy support scikit-learn >= 0.24
broken = true;
description = "Higher-level text processing, built on spaCy";
homepage = "https://textacy.readthedocs.io/";
license = licenses.asl20;

32
pkgs/development/tools/electron/default.nix
View File

@ -105,23 +105,23 @@ rec {
headers = "1dqkx861vfq6xbzdlbgza6h4j7bib8p3xahllrnfc0s65y8gf0ry";
};
electron_12 = mkElectron "12.0.9" {
x86_64-linux = "3ab0a873f720d3bf56cce6ca1bf9d8b956843920798f659ca0829e4cc3126f6d";
x86_64-darwin = "b3f1e378f58e7c36b54451c5a3485adc370277827974e1eb0790b6965737c872";
i686-linux = "37405b3b27779ad417c3ae432d7f0d969c126c958a0ad8f2585c34fc8ee6c6e6";
armv7l-linux = "2d41ef3ed6a215efe2c7d03d8055fcfda0079f09e9580e5bf70e8ac4a22b0898";
aarch64-linux = "22a85817ea2edbba2e17b35f6e3a8104b2165e070ea21a1f2fa3b40e8d7aecc9";
aarch64-darwin = "cb8aa8153005ea0d801182eb714d56af0217345b1152d867317291670731daeb";
headers = "1vwcjzkjag2wxrwnsbi8bgbv8bi6vn5iq9b04krwlk7mlhm4ax66";
electron_12 = mkElectron "12.0.10" {
x86_64-linux = "b5383b5818062de42536a7966df875ae781433a7ee991da34643bc6fda4ad038";
x86_64-darwin = "3d4111280bf50dbfb141b46551974b0e4e39eb0d1f8ef789d71f7d3295a8e24f";
i686-linux = "6fd10db8d896ef82ac8f2a1d796942dc56f5b41e504c86121d83eababa0cccb8";
armv7l-linux = "5820ac7e70488507417122aaa0381439f929da1819c2c710ba74569a609cc972";
aarch64-linux = "022ff009969d9f270704e918fe2dda6cd395c3e9d9e9515e99eca628d996a503";
aarch64-darwin = "d2af4870a79866621469043e44a2a0e995abc5530d4aaf1add567b00eb286b01";
headers = "1vl3cnhf2j5g4xhk17rag0vzbxwba5fq54mhvv0hp3hqbiqhdds6";
};
electron_13 = mkElectron "13.0.1" {
x86_64-linux = "05c6cfc2804d426d6c2af15cc16e0265782917e76fb2c4e87b7469d0f3ab0f81";
x86_64-darwin = "a65a44bfafcdfcdee0bb2b3515dab57e884e0700830ccd142e15f01e6c3a4976";
i686-linux = "3f3b358879523b10e6341a5c74842f8c09a1073f6064410f3495143733663f8d";
armv7l-linux = "b6657862bf4b1f61f5c1e0c836401f82822fc5ebd69ecb2efd0777255fefc813";
aarch64-linux = "ccc581dc5ddf9d2adefb60d8bc495b5a04363a80614d617094c142b8c5aa95de";
aarch64-darwin = "e58e3ea3fffc8c3b280b0b6c22c685f9ecd82ef0340a5207d8b9c6f20e7c0197";
headers = "0idlap698vqz7i2by3g9k4yqhm87fqc34pgzxcidzan9qvyd0njx";
electron_13 = mkElectron "13.1.0" {
x86_64-linux = "6681078971d2e99e9f8b3c598de65869d3596356af901bbbabcc4860c0496bb4";
x86_64-darwin = "d62a561e80fcbcb0f249e74c487313192451046f288478add65be997793831de";
i686-linux = "e4d8cc19689b1f9c00894bb776083f8543abeba9203d3297268c1644f1300355";
armv7l-linux = "ac5a19e31fd83db5775a2af57f742c7b3e5fc4528958329ec3c81f82e7bd611a";
aarch64-linux = "0ed0cc3afae5cc7e1e6c6204866a1cecdf97e0ab658789e8951842bd0d28e1bb";
aarch64-darwin = "6da46d2861011263af2953a3e0186735e54708c01c50967ff5f8ed71b73f7fea";
headers = "1h4saavsy97kmbfaw6xcya5l0iybr37vyw7bv539c7a064kam07b";
};
}

166
pkgs/misc/vim-plugins/generated.nix
View File

@ -185,12 +185,12 @@ final: prev:
aurora = buildVimPluginFrom2Nix {
pname = "aurora";
version = "2021-06-03";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "ray-x";
repo = "aurora";
rev = "8d5601629f123e9553688a6705a1490ee8be9a1c";
sha256 = "0i2nyk46yvr59hxwc99iaa0zdy0xcnaa1z1q93xf85i2pdyjg99b";
rev = "6a77e8ecf38b0e7a547df58f499cecc1c50cd444";
sha256 = "1yh88v6p1ingwydzr40jcva9gw58ihmgjndaf7h3sp0ldvl75ci2";
};
meta.homepage = "https://github.com/ray-x/aurora/";
};
@ -413,12 +413,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-06-05";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "a33387ffed163f922d93f142a908adfda521a224";
sha256 = "1gs06vs1bgjr76hg1pdkxsd81c12fnaqg8r1lfvwcvph1nzqj7d9";
rev = "00fe69a21e128d0378d1e00eb5334cde9cd7a227";
sha256 = "0nrcxsf00x2ygh16965d6fp5lhjq7hg9wzqgail2l0pwjdxnizm4";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -970,8 +970,8 @@ final: prev:
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
rev = "27890150286f62d9c2fcb624f6f3bd1fd45c7f3c";
sha256 = "0fvwdjqiqwhaxwkrnzfai0ay4sksr4ma4akhzqnfqd0blbhc4x2i";
rev = "b42f1b974a50d4c0ebe563a210b5a3bf138c0166";
sha256 = "0z0xd5qnrm85ibwy826n7wbk0w8nzwmrs5xii9xkxgych4q9xanp";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@ -1014,12 +1014,12 @@ final: prev:
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2021-06-05";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "70ca378f399be626020e2994f9604eae35c232a6";
sha256 = "0njjwa2ixqm792chvkq91fb7dadaf05kws727w1q9r5sp8k000sr";
rev = "a20d2376b57ca500782719f1c4f83796d160c296";
sha256 = "15hrlr6f98y1cmdyrlady6h4b501b7mvyzfbvsqcxjj8vj18pxas";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
@ -1030,8 +1030,8 @@ final: prev:
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
rev = "5d4ca0cab361962a58db6f4a3ad06b00348b743d";
sha256 = "04ja8ps0vmvg5aggr6lr4qb4pv46hi86x8zw8mwrzav04z8fhxcw";
rev = "6f3574b091d48e37599dcb356349a31472556716";
sha256 = "0im9jnrbf1qbglh9wzqalfvp98wx9ccg5gk89k40nz3gggpwsbfh";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@ -1256,12 +1256,12 @@ final: prev:
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2021-06-05";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "e9bd32d18430ee2c95b154d90533affc3ca6f62b";
sha256 = "0g5ssg6363552fx7y74hl5wbmpmdz6z7y98jwa5y3dkq3xqh6ykn";
rev = "218229c593de9ca3b526605c50da7cb7e6ffb47c";
sha256 = "13xhzhpdwq680imvm7208wyhb2l5hppnflhbzyl1w3i7bzpczaxc";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@ -1280,12 +1280,12 @@ final: prev:
dhall-vim = buildVimPluginFrom2Nix {
pname = "dhall-vim";
version = "2020-08-19";
version = "2021-06-05";
src = fetchFromGitHub {
owner = "vmchale";
repo = "dhall-vim";
rev = "77d1c165bcbe6bb7f9eedbeafe390c2107d3c52e";
sha256 = "03x55x0gvf7n4i8hh6s5453mf5h43pf7kdy817q6w1149bd90vxy";
rev = "68500ef46ff3706f46c99db3be7a0c8abcf6a3ae";
sha256 = "0lwna4kcq7davfvh3535n8wl9jxkjm7cg6jgpisd17kvagihh8qw";
};
meta.homepage = "https://github.com/vmchale/dhall-vim/";
};
@ -1739,12 +1739,12 @@ final: prev:
gina-vim = buildVimPluginFrom2Nix {
pname = "gina-vim";
version = "2021-04-28";
version = "2021-06-05";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "gina.vim";
rev = "699d1e9d4104c994a37cb18b730f38ff7f32f2d1";
sha256 = "1akcpf5iyrbj4apjvp02613x328igp9gk4gaqgkx4qvwha4khbi5";
rev = "7069668147157d872821ebed1eee07742ece48fd";
sha256 = "0fbr154jgvr71liq0cwdl1qwg8j40yg9i2gb6ykz4p2y5cvs3wz6";
};
meta.homepage = "https://github.com/lambdalisue/gina.vim/";
};
@ -1763,12 +1763,12 @@ final: prev:
git-messenger-vim = buildVimPluginFrom2Nix {
pname = "git-messenger-vim";
version = "2021-05-14";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "rhysd";
repo = "git-messenger.vim";
rev = "2a26734c6322449a56d02c25a2947e9b7519ca49";
sha256 = "0ib0yl7zqklj9i1sgv854d3xl5sqbdf2khh9cpraik1rv23nlf2h";
rev = "f17e40e9995bbb21e0e9b7fd29278637a69fcc02";
sha256 = "09izgdlba3413llb698r8iagpfnhvp57yaz7qlcypbyvqr9l41mm";
};
meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
};
@ -1799,12 +1799,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-06-02";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "4e3e2626af9573758a4e8c0d463ff3b733d40644";
sha256 = "01cr2a6xqzazyapkdlqjbxswsm9y7hnwl3bs7wcp23dwlpdvxc89";
rev = "0d8db4531a508f875d98b55f5e78bc1c560d6342";
sha256 = "1avp9df2lbiczycgfiigbyny8s6srjw6h88a88161m29g2mznr2s";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -2506,6 +2506,18 @@ final: prev:
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
};
lightline-gruvbox-vim = buildVimPluginFrom2Nix {
pname = "lightline-gruvbox-vim";
version = "2018-03-23";
src = fetchFromGitHub {
owner = "shinchu";
repo = "lightline-gruvbox.vim";
rev = "21659af1fc980ebe7de0f475e57c3fda9a82c2d3";
sha256 = "0h9br1r5vbrx5cplnk34xlg1kagasj3zn18f8d4ifi0pibyq6pm1";
};
meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/";
};
lightline-vim = buildVimPluginFrom2Nix {
pname = "lightline-vim";
version = "2021-05-30";
@ -3100,8 +3112,8 @@ final: prev:
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet.vim";
rev = "5d65a8fde5c3f4dfc0dc1a13639515948d8a28a5";
sha256 = "1iaapjpx91kcz9h2gp7vzgj7lnjs86g0iqkg3vgr04kj9lsvj3j7";
rev = "d2e1e6b4c4e17cab2debd0353fed77b417b53237";
sha256 = "0bwlcija1sbml5ni7mz4q97hhnl7hiqamzzvqw8qyp8aw2b0kj1q";
};
meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
};
@ -3324,12 +3336,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2021-06-05";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "b09ab7495e55f09293500aacf460d176f942504d";
sha256 = "05w7bjn1iy1qa3ni12vm9p28y4bsz4kkfgmcs44152qmcqj13wp1";
rev = "64c937940c2d890bd192a56e1a831e378fe0168b";
sha256 = "05pa2zz7dwzfjsgz8chv0wkx202f8x3plbxyczlkp390sfhqk0nn";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@ -3348,12 +3360,12 @@ final: prev:
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
version = "2021-06-02";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
rev = "554ae68f404492c8d37381545b9a785fda30c26e";
sha256 = "0z6xb6wsq5kjcnyiqbp2ik97yl2kb9hxy0rfccfswh5pgmfv2z1i";
rev = "85b05cdc0ce371b055504be5d16cdfb1ea110f22";
sha256 = "0sr3rcy5mw0gx06x12dqc4bsb2ypc2xvcr6cqzw4w8w520ys7aid";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
@ -3432,12 +3444,12 @@ final: prev:
nvim-dap-ui = buildVimPluginFrom2Nix {
pname = "nvim-dap-ui";
version = "2021-05-31";
version = "2021-06-05";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-dap-ui";
rev = "055b143fdd23fee1d86247a8ec7c43c84a2a896b";
sha256 = "0v9mxpr5m01w948ddh598k1vzaiyq2zl6fkykbpzkijhk8qvjnv9";
rev = "3c221fe2cc2d675ebf8c83bb62e0b44516ae34ae";
sha256 = "0hcfs9c5m610sh5105kd4qbgj8ikfds7zfh2hcf1ly5ikkbz1ma4";
};
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
};
@ -3480,12 +3492,12 @@ final: prev:
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
version = "2021-06-04";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
rev = "d5ba4abab33808dbf653cc8270d82561f96b220b";
sha256 = "0qyb6fjjcgjifkgvcy475gxplbvdvzd51z7xv2m7gshy6m4vlzk6";
rev = "081fac590588ce0f6bcf54699658ba960a514172";
sha256 = "05sw210pfsb4nfcix978x1mrnmjz5yv1rmv1501mqla8xq18cskv";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@ -3504,24 +3516,24 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2021-06-03";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "8bd4eac08c637961b10ac01c124fb5091484c265";
sha256 = "0jjsq718m0c1f45k9b68z0inlhy5nas48ff5yd0v29qlcv01w3wf";
rev = "89fdc14457f2b18eebebeb226df9f6d5e464e318";
sha256 = "09rd1hq8rzp84aiplvp0w4j1wykycrb55z1qwk83d9fv006sqvcl";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
nvim-lightbulb = buildVimPluginFrom2Nix {
pname = "nvim-lightbulb";
version = "2021-03-13";
version = "2021-06-05";
src = fetchFromGitHub {
owner = "kosayoda";
repo = "nvim-lightbulb";
rev = "9c3b264ae2da1d984f0482d5a0dfa43f567fa064";
sha256 = "0yjxmnn3a7fw0fjwfqk284zshlw8v7wp8pn16d5m40rvbkk2ipzr";
rev = "388cc8caaf3e10836810aabbb9283a27dd8584cd";
sha256 = "0a7izbvpwn0sx9gvpczvl57fy9rm7jaibc4m44asjz501m04lbra";
};
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
};
@ -3600,12 +3612,12 @@ final: prev:
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
pname = "nvim-toggleterm-lua";
version = "2021-06-01";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-toggleterm.lua";
rev = "53134b08a5a5e66f343c4e431966a0a19ce2d162";
sha256 = "00gxkl87f8gawil9bdxa5s15yswc1ac4y9c5vx3kmhv6g5ipcrrn";
rev = "7e13134c7e252746586ccb35a535c42a1c3b07c4";
sha256 = "17md8wvfvy9z2an89fxcg64d6lmqndmzj9qn294s311fn7zpaz0p";
};
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
};
@ -3616,8 +3628,8 @@ final: prev:
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
rev = "f56ac7884c9b12343d66a2bacf90097af3c58cf6";
sha256 = "0v2aznndmc5bsipqbj4q40qqmv384z6k5xh17yfcp7a6iak5zzjq";
rev = "82f1598bd4388c8089cf08007b17a3555c0328f0";
sha256 = "1mpszdypmhw3zizm699rq1m3zfrzmn1ilqaha01zb3q64l7mddzc";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
@ -3636,12 +3648,12 @@ final: prev:
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
version = "2021-05-25";
version = "2021-06-05";
src = fetchFromGitHub {
owner = "romgrk";
repo = "nvim-treesitter-context";
rev = "af10a3251f3e826c3fb2062ddeb4c74f23a2f52d";
sha256 = "1pl1v28wscdcns4cs2cv44rh0vrk8fwmr2banjgp5lcjynivzrwr";
rev = "bdc598b519cfbfdf61baf9a27953da2fc1642b23";
sha256 = "1slyjfjcrna06b23kbw4vf81qbncgimzhw1qsqwsqldnvdc35lcr";
};
meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";
};
@ -4405,12 +4417,12 @@ final: prev:
sideways-vim = buildVimPluginFrom2Nix {
pname = "sideways-vim";
version = "2021-05-24";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "sideways.vim";
rev = "9ce855ab448467dc1468ef8b46bb86d38aa3d0fa";
sha256 = "0ldz09hjck5pq0lhbk93gm1zvc0aifsfk75w5pzrwqmwidimzyid";
rev = "15acde01892efd6e8d2a5c452babe862ce05f74d";
sha256 = "0bb06g2knzqj7himsvpfydq8yig2szz9q5pqds9yv83m3vh4kppl";
};
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
};
@ -4887,12 +4899,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-06-03";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "2697bcfaf0fac861e08c3a55d9334ec6d823029f";
sha256 = "0q9kq64y3yrazcks476yplkrhx59z82ij5wj1w8qakidy2i008z1";
rev = "feaed4b6e23bd56906089154f293f2b1ecb68c7e";
sha256 = "0kx9xmlv6smpqgf2mdz0n6r4cwrsldw9d92xk5m1pdsmpi1b61sa";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -5536,12 +5548,12 @@ final: prev:
vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat";
version = "2021-05-24";
version = "2021-06-05";
src = fetchFromGitHub {
owner = "vim-autoformat";
repo = "vim-autoformat";
rev = "728d42f93054e15d260e25da0255378f171df7d2";
sha256 = "1r86100i30jqyxz1hc4z6ykx5s44iaapffs1xbv3pg8grz8fmf6x";
rev = "31e47bb9ee7a8b7aa2d324723dac75ea02896044";
sha256 = "1pw5iipr6yln1nspy2sn13cx7p1cn5485l8rkkkyqfwqgqsj3jfq";
};
meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";
};
@ -5716,12 +5728,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-06-04";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "c743b1171194f85469a64556a1f54882cb73cc17";
sha256 = "0ws8rvvmszcspwvzns7i82l458sa2mhi0013li8c61g1g2wbpphn";
rev = "351ec86836986fb36e48ba414d65b62a7793374a";
sha256 = "1gksn9s40fjzwp6v0cmss2mxhpprj8ycysy5rbfp8h3vdghkkya7";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -6484,12 +6496,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2021-06-03";
version = "2021-06-06";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "f7f1413ed9b69eb80c8af07d38ebcc889ed64d96";
sha256 = "16az604z245bw64dhkgmszifg1ajnf0i9binllixwaifnh6vfnhh";
rev = "41960996e0c532069533072b3fd820fafe9ce0b3";
sha256 = "0lzjwjbdq90b39561yp7qs1l69iw4jlxcjrsi5yvh1rbhv7gpy1i";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@ -8357,6 +8369,18 @@ final: prev:
meta.homepage = "https://github.com/mhinz/vim-signify/";
};
vim-simpledb = buildVimPluginFrom2Nix {
pname = "vim-simpledb";
version = "2020-10-02";
src = fetchFromGitHub {
owner = "ivalkeen";
repo = "vim-simpledb";
rev = "1e9e72160dd01c837b5afb4f75cbb587a15b31b5";
sha256 = "1y0i876p2pxx7gbr04acnv94cjrincsbg03bqxr89xbqlbggxf0w";
};
meta.homepage = "https://github.com/ivalkeen/vim-simpledb/";
};
vim-slash = buildVimPluginFrom2Nix {
pname = "vim-slash";
version = "2019-08-28";

2
pkgs/misc/vim-plugins/overrides.nix
View File

@ -621,7 +621,7 @@ self: super: {
libiconv
];
cargoSha256 = "16fhiv6qmf7dv968jyybkgs1wkphy383s78g8w5wnz4i0czld8dq";
cargoSha256 = "sha256-/ALOjJayCmLpMV8zC9ryEofUxYdvqj4Cn+sY1qRuqcs=";
};
in
''

2
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -214,6 +214,7 @@ itchyny/thumbnail.vim
itchyny/vim-cursorword
itchyny/vim-gitbranch
itspriddle/vim-shellcheck
ivalkeen/vim-simpledb
ivanov/vim-ipython
jackguo380/vim-lsp-cxx-highlight
jacoborus/tender.vim
@ -577,6 +578,7 @@ SevereOverfl0w/deoplete-github
shaunsingh/moonlight.nvim@pure-lua
shaunsingh/nord.nvim
sheerun/vim-polyglot
shinchu/lightline-gruvbox.vim
Shougo/context_filetype.vim
Shougo/defx.nvim
Shougo/denite.nvim

2
pkgs/os-specific/bsd/netbsd/default.nix
View File

@ -96,6 +96,8 @@ in lib.makeScopeWithSplicing
HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc);
} // lib.optionalAttrs (stdenv'.cc.isGNU or false) {
HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc);
} // lib.optionalAttrs (stdenv'.isx86_32) {
USE_SSP = "no";
} // lib.optionalAttrs (attrs.headersOnly or false) {
installPhase = "includesPhase";
dontBuild = true;

3
pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix
View File

@ -151,6 +151,9 @@ in rec {
# This framework doesn't exist in newer SDKs (somewhere around 10.13), but
# there are references to it in nixpkgs.
QuickTime = throw "QuickTime framework not available";
# Seems to be appropriate given https://developer.apple.com/forums/thread/666686
JavaVM = super.JavaNativeFoundation;
};
bareFrameworks = (

10
pkgs/servers/mpd/default.nix
View File

@ -1,4 +1,6 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, darwin
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost
# Darwin inputs
, AudioToolbox, AudioUnit
# Inputs
, curl, libmms, libnfs, liburing, samba
# Archive support
@ -114,13 +116,13 @@ let
in stdenv.mkDerivation rec {
pname = "mpd";
version = "0.22.6";
version = "0.22.8";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${version}";
sha256 = "sha256-Xu+MxMxR5u++R3lZHe6UQ+mEmRnWbN6173ZX39KS1A8=";
sha256 = "sha256-nlUgFmiIrheN/FsSlQ/16iqwBXDw6xuwJG/foPZD07M=";
};
buildInputs = [
@ -133,7 +135,7 @@ let
gtest
]
++ concatAttrVals features_ featureDependencies
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.AudioUnit ];
++ lib.optionals stdenv.isDarwin [ AudioToolbox AudioUnit ];
nativeBuildInputs = [
meson

16
pkgs/servers/pr-tracker/default.nix
View File

@ -1,6 +1,6 @@
{ rustPlatform
, lib
, fetchgit
, fetchurl
, openssl
, pkg-config
, systemd
@ -8,20 +8,20 @@
rustPlatform.buildRustPackage rec {
pname = "pr-tracker";
version = "1.0.0";
version = "1.1.0";
src = fetchgit {
url = "https://git.qyliss.net/pr-tracker";
rev = version;
sha256 = "sha256-NHtY05Llrvfvcb3uyagLd6kaVW630TIP3IreFrY3wl0=";
src = fetchurl {
url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz";
sha256 = "0881ckb4y762isisf9d6xk6fh9207xi1i04kays298zx2dq6gh6h";
};
cargoSha256 = "sha256-SgSASfIanADV31pVy+VIwozTLxq7P3oMDIiAAQ8s+k0=";
cargoSha256 = "0r8pxg65s5jv95a0g8pzr693za7jfb4rv0wc739lkbpf0dssw8sr";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl systemd ];
meta = with lib; {
changelog = "https://git.qyliss.net/pr-tracker/plain/NEWS?h=${version}";
description = "Nixpkgs pull request channel tracker";
longDescription = ''
A web server that displays the path a Nixpkgs pull request will take
@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec {
platforms = platforms.linux;
homepage = "https://git.qyliss.net/pr-tracker";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ sumnerevans ];
maintainers = with maintainers; [ qyliss sumnerevans ];
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -19314,8 +19314,10 @@ in
mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12;
mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp;
inherit (callPackages ../servers/mpd { stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; })
mpd mpd-small mpdWithFeatures;
inherit (callPackages ../servers/mpd {
stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv;
inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit;
}) mpd mpd-small mpdWithFeatures;
libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { };