Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-12-26 12:01:11 +00:00 committed by GitHub
commit d4086e3e8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 517 additions and 429 deletions

View file

@ -4180,6 +4180,15 @@
githubId = 118536343;
name = "David Hamelin";
};
david-r-cox = {
email = "david@integrated-reasoning.com";
github = "david-r-cox";
githubId = 4259949;
name = "David Cox";
keys = [{
fingerprint = "0056 A3F6 9918 1E0D 8FF0 BCDE 65BB 07FA A4D9 4634";
}];
};
davidrusu = {
email = "davidrusu.me@gmail.com";
github = "davidrusu";

View file

@ -3,7 +3,6 @@
with lib;
let
pkg = pkgs.pgadmin4;
cfg = config.services.pgadmin;
_base = with types; [ int bool str ];
@ -36,6 +35,8 @@ in
default = 5050;
};
package = mkPackageOptionMD pkgs "pgadmin4" { };
initialEmail = mkOption {
description = lib.mdDoc "Initial email for the pgAdmin account";
type = types.str;
@ -150,7 +151,7 @@ in
echo "$PW"
# Retype password:
echo "$PW"
) | ${pkg}/bin/pgadmin4-setup
) | ${cfg.package}/bin/pgadmin4-setup
'';
restartTriggers = [
@ -162,7 +163,7 @@ in
DynamicUser = true;
LogsDirectory = "pgadmin";
StateDirectory = "pgadmin";
ExecStart = "${pkg}/bin/pgadmin4";
ExecStart = "${cfg.package}/bin/pgadmin4";
};
};

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "timewarrior";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "GothenburgBitFactory";
repo = "timewarrior";
rev = "v${version}";
sha256 = "sha256-0obIMnPBvMO30o+qXqwtINNRobBR6cFO65B/xjVt+2w=";
sha256 = "sha256-6s/fifjGCkk8JiADPbeiqsKMgY0fkIJBqRPco+rmP1A=";
fetchSubmodules = true;
};

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs:{
pname = "wxmaxima";
version = "23.11.0";
version = "23.12.0";
src = fetchFromGitHub {
owner = "wxMaxima-developers";
repo = "wxmaxima";
rev = "Version-${finalAttrs.version}";
sha256 = "sha256-QOXRtWFY76aIvRPSN+i8jkvMZvuPO3Yr3yqFOh0PSXY=";
sha256 = "sha256-5MOj4loZsD1Fhy+D7V6ZL4QFyVkWyIaxTcHe7R2xypo=";
};
buildInputs = [

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "qjournalctl";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "pentix";
repo = pname;
rev = "v${version}";
sha256 = "0j27cmfq29mwrbjfrrwi6m1grcamhbfhk47xzlfsx5wr2q9m6qkz";
sha256 = "sha256-anNNzqjbIaQI+MAwwMwzy6v4SKqi4u9F5IbFBErm4q8=";
};
postPatch = ''

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "git-quick-stats";
version = "2.5.2";
version = "2.5.3";
src = fetchFromGitHub {
repo = "git-quick-stats";
owner = "arzzen";
rev = version;
sha256 = "sha256-ff8n8SkeppZzJO58OrPQJ0MInZCIz8nTb7lmiCC0ATg=";
sha256 = "sha256-Fh8FSaclxOkTr49HixjwoM/367RjtdQ4dRyw87KylPs=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -0,0 +1,31 @@
{ lib, rustfmt, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "cargo-typify";
version = "0.0.14";
src = fetchFromGitHub {
owner = "oxidecomputer";
repo = "typify";
rev = "v${version}";
hash = "sha256-Clwm5hRjPPPRB6xpO8YOGpqnyNFtsSMkPbWBY3etPCI=";
};
cargoHash = "sha256-balx5xOtrWwMOFeGQkYQ2f+lcGMCJvdPqE8rH9adkfU=";
cargoBuildFlags = [ "-p" "cargo-typify" ];
nativeCheckInputs = [ rustfmt ];
preCheck = ''
# cargo-typify depends on rustfmt-wrapper, which requires RUSTFMT:
export RUSTFMT="${lib.getExe rustfmt}"
'';
meta = with lib; {
description = "JSON Schema to Rust type converter";
homepage = "https://github.com/oxidecomputer/typify";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ david-r-cox ];
};
}

View file

@ -25,13 +25,13 @@ let
pieBuild = stdenv.hostPlatform.isMusl;
in buildGoModule rec {
pname = "frankenphp";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "dunglas";
repo = "frankenphp";
rev = "v${version}";
hash = "sha256-FDOD/YA1f16mykrjbgNKw3H091xTCWteZEkEknmF6uM=";
hash = "sha256-iR47S52L2cMORE2MOzddFRDwlqaHAtB8dJs/UrufB0w=";
};
sourceRoot = "source/caddy";
@ -39,7 +39,7 @@ in buildGoModule rec {
# frankenphp requires C code that would be removed with `go mod tidy`
# https://github.com/golang/go/issues/26366
proxyVendor = true;
vendorHash = "sha256-cocLeZZ037LgvfYwFD1hIOlU0XARD9G1rh8B3/hK/ZQ=";
vendorHash = "sha256-ZkbhpY8+BSTSdzQGsvXUfTBdTPUvQ8tHjbnr0lYho5I=";
buildInputs = [ phpUnwrapped ] ++ phpUnwrapped.buildInputs;
nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config darwin.cctools darwin.autoSignDarwinBinariesHook ];

View file

@ -1,30 +1,30 @@
{ lib
, mkXfceDerivation
, cairo
, glib
, gtk3
, libX11
, libxfce4ui
, libxfce4util
, xfce4-panel
, xfconf
, libwnck
, exo
}:
mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-docklike-plugin";
version = "0.4.1";
sha256 = "sha256-BKxd2TFEbRHeFy/dC2Wx5ppErsi7d2m7JicFCcZbjTo=";
version = "0.4.2";
sha256 = "sha256-M/V8cnEU/nSEDjQ3k8fWiklF5OuNg3uzzJMHBSZBiLU=";
buildInputs = [
cairo
glib
gtk3
libX11
libxfce4ui
libxfce4util
xfce4-panel
xfconf
libwnck
exo
];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

View file

@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "podofo";
version = "0.10.2";
version = "0.10.3";
src = fetchFromGitHub {
owner = "podofo";
repo = "podofo";
rev = finalAttrs.version;
hash = "sha256-BHTfidLn738f9kVIgzRTR4vY6fx5JPPtYNKvD7klyGw=";
hash = "sha256-B+YNTo2rZAL4PqDo+lFOQiWM9bl/TIn8xrJyefrIAYE=";
};
outputs = [ "out" "dev" "lib" ];

View file

@ -0,0 +1,43 @@
{ buildDunePackage
, dune-configurator
, fetchurl
, kqueue
, lib
, ppx_expect
, ppx_optcomp
}:
buildDunePackage rec {
pname = "poll";
version = "0.3.1";
minimalOCamlVersion = "4.13";
src = fetchurl {
url = "https://github.com/anuragsoni/poll/releases/download/${version}/poll-${version}.tbz";
hash = "sha256-IX6SivK/IMQaGgMgWiIsNgUSMHP6z1E/TSB0miaQ8pw=";
};
buildInputs = [
dune-configurator
ppx_optcomp
];
propagatedBuildInputs = [
kqueue
];
checkInputs = [
ppx_expect
];
doCheck = true;
meta = {
description = "Portable OCaml interface to macOS/Linux/Windows native IO event notification mechanisms";
homepage = "https://github.com/anuragsoni/poll";
changelog = "https://github.com/anuragsoni/poll/blob/${version}/CHANGES.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ sixstring982 ];
};
}

File diff suppressed because it is too large Load diff

View file

@ -5,7 +5,7 @@ set -eu -o pipefail
source_file=pkgs/development/python-modules/mypy-boto3/default.nix
version="1.33.0"
version="1.34.0"
nix-update python311Packages.botocore-stubs --commit --build
@ -142,7 +142,7 @@ packages=(
mypy-boto3-frauddetector
mypy-boto3-fsx
mypy-boto3-gamelift
mypy-boto3-gamesparks
# mypy-boto3-gamesparks
mypy-boto3-glacier
mypy-boto3-globalaccelerator
mypy-boto3-glue
@ -212,7 +212,7 @@ packages=(
mypy-boto3-lookoutvision
mypy-boto3-m2
mypy-boto3-machinelearning
mypy-boto3-macie
#mypy-boto3-macie
mypy-boto3-macie2
mypy-boto3-managedblockchain
mypy-boto3-managedblockchain-query
@ -376,9 +376,11 @@ for package in "${packages[@]}"; do
awk -i inplace -v package="$package" -v new_version="$version" -v new_sha256="$sri_hash" '
$1 == package {
$5 = "\"" new_version "\"";
$6 = "\"" new_sha256 "\"";
$6 = "\"" new_sha256 "\";";
}
{print}
' $source_file
done
nixpkgs-fmt $source_file

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "python-google-nest";
version = "5.2.0";
version = "5.2.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-k7cOOyUqgh7Y/MIBgBTVgCZexXLVkvAaHz6irXGLdgA=";
hash = "sha256-qL4Qk2NW41Sb9raF0vnEb04w3uyaWPauDnNY+DvnNgQ=";
};
propagatedBuildInputs = [

View file

@ -3,16 +3,16 @@
"deps": {
"src/electron": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-c3crd1hOiRYQAIEApVmE2gGsfW30rbQrr61Hmdryftk=",
"hash": "sha256-ms8zX3Ov/du5J6M0qzmQFlbGaR9S9tQHMwQs+AutF0w=",
"owner": "electron",
"repo": "electron",
"rev": "v28.0.0"
"rev": "v28.1.0"
},
"src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-umUgGlclsdK6EDucwQXqL5/ExXuzAE6SYZcdlV0WHg0=",
"hash": "sha256-Nt5OpfWc2PoZMQVIaiKfv5uqGSua81zZmV3zOE2Y1Ek=",
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "120.0.6099.56",
"rev": "120.0.6099.109",
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; "
},
"src/third_party/clang-format/script": {
@ -77,9 +77,9 @@
},
"src/third_party/angle": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-AMwWqLnRSb4FdOsiMB9Q2znX+FPCrS94FXYAc6dCdLg=",
"hash": "sha256-/SnBY/jmj7MSbzBnuq6VVccRNaLsjo6hWhnKiIdAq+w=",
"url": "https://chromium.googlesource.com/angle/angle.git",
"rev": "76ead87021b954ab670d0c1e682f4828cb6adf25"
"rev": "4ae5f681dfe60bed7b083296ac97827b751f9226"
},
"src/third_party/angle/third_party/glmark2/src": {
"fetcher": "fetchFromGitiles",
@ -257,9 +257,9 @@
},
"src/third_party/devtools-frontend/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-jLsdRAQF7UxetAIU0bb+KK4cbXRlaQpg2B8T6+ba7uE=",
"hash": "sha256-B/2Qk5LSElBPNImlZHVF3A4g0GFE9OHG/+4QADpK+8w=",
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
"rev": "099860eb0f995fef1d97ecdbe3c354f0558bec3b"
"rev": "a6c7f00333881a7ecf7044b725052ab0c8776d6f"
},
"src/third_party/dom_distiller_js/dist": {
"fetcher": "fetchFromGitiles",
@ -419,9 +419,9 @@
},
"src/third_party/libavif/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-mSIrPqJebYSyLyTJmuLuwNoeJ6YJk3gSgFRLap7kSpA=",
"hash": "sha256-Jd/KwJJ1oeQMLg8CShTTDQhCVHEDpXcQHiA4+NXYOIA=",
"url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git",
"rev": "466d5e5f8889053115d445637ab8f6e0b3c70ed3"
"rev": "1a78d970b8315e7cc6a8601861ec75189c50c214"
},
"src/third_party/libavifinfo/src": {
"fetcher": "fetchFromGitiles",
@ -833,9 +833,9 @@
},
"src/v8": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-HoatrWRElaZ47jtenPz0PzMh0ixBAwbMzL3vj0sw+HE=",
"hash": "sha256-IeZ9oCM+toyqqSf8Ip6FqjymbvUiqTmMM2ir+Edzmjc=",
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "5eefc590c868d8dfb411e53053c963fe42dcda74"
"rev": "999a2ca2d915d01ff1d889a57f1e26907d6ea842"
},
"src/third_party/nan": {
"fetcher": "fetchFromGitHub",
@ -873,12 +873,12 @@
"rev": "78d3966b3c331292ea29ec38661b25df0a245948"
}
},
"version": "28.0.0",
"version": "28.1.0",
"modules": "119",
"chrome": "120.0.6099.56",
"chrome": "120.0.6099.109",
"node": "18.18.2",
"chromium": {
"version": "120.0.6099.56",
"version": "120.0.6099.109",
"deps": {
"gn": {
"version": "2023-10-23",
@ -895,10 +895,10 @@
"deps": {
"src/electron": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-L43N0jGO8fREAAgSlLuwphq+pyI3Ozpan0phqTMCb58=",
"hash": "sha256-bafuK4n9UXZqG1NHBzM5eLQ0PPkQx7CBHQLmShmQHWQ=",
"owner": "electron",
"repo": "electron",
"rev": "v27.1.3"
"rev": "v27.2.0"
},
"src": {
"fetcher": "fetchFromGitiles",
@ -1765,7 +1765,7 @@
"rev": "78d3966b3c331292ea29ec38661b25df0a245948"
}
},
"version": "27.1.3",
"version": "27.2.0",
"modules": "118",
"chrome": "118.0.5993.159",
"node": "18.17.1",
@ -1787,10 +1787,10 @@
"deps": {
"src/electron": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-jvNttIRouxQAfH4n+0xxj57Bc3LCo36B66SGwEfz0jM=",
"hash": "sha256-K14NaU0INgNQP4mD6lXeYRd3COoMvMjRUOtsUZB9KiQ=",
"owner": "electron",
"repo": "electron",
"rev": "v26.6.2"
"rev": "v26.6.3"
},
"src": {
"fetcher": "fetchFromGitiles",
@ -2609,7 +2609,7 @@
"rev": "78d3966b3c331292ea29ec38661b25df0a245948"
}
},
"version": "26.6.2",
"version": "26.6.3",
"modules": "116",
"chrome": "116.0.5845.228",
"node": "18.16.1",
@ -2624,7 +2624,7 @@
}
}
},
"chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=",
"electron_yarn_hash": "05wkb1m0yjbai4153y49kwr1v2lj14fg75aqlvmmrhf3bxp9lg5g"
"electron_yarn_hash": "05wkb1m0yjbai4153y49kwr1v2lj14fg75aqlvmmrhf3bxp9lg5g",
"chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ="
}
}

View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-binstall";
version = "1.4.6";
version = "1.4.8";
src = fetchFromGitHub {
owner = "cargo-bins";
repo = "cargo-binstall";
rev = "v${version}";
hash = "sha256-zCivxYHhaVqzPe3qBUKXgMgEE6niGqkHJM77rfEUoFo=";
hash = "sha256-TU/jUPfh7c22L19zOccXvE9jq4dXEzXdzzZ1fJxjf2E=";
};
cargoHash = "sha256-O8X+oLKhKeQGeUrsRVeakZjaMKPiXdIns48rV8Q9JA8=";
cargoHash = "sha256-zHP64xx5CGl17+IZpsbVfbhau4ZYhxD0t5HeThMVBVQ=";
nativeBuildInputs = [
pkg-config

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-clone";
version = "1.1.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "janlikar";
repo = pname;
rev = "v${version}";
sha256 = "1lfg47kw07k4r795n0iixl5cnrb13g74hqlbp8jzbypr255bc16q";
sha256 = "sha256-al+C3p9jzPbykflt3WN+SibHm/AN4BdTxuTGmFiGGrE=";
};
cargoSha256 = "sha256-rJcTl5fe3vkNNyLRvm7q5KmzyJXchh1/JuzK0GFhHLk=";
cargoHash = "sha256-sQVjK6i+wXwOfQMvnatl6PQ1S+91I58YEtRjzjSNNo8=";
nativeBuildInputs = [ pkg-config ];

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.37.4";
version = "0.37.5";
src = fetchFromGitHub {
owner = "sagiegurari";
repo = "cargo-make";
rev = version;
hash = "sha256-ZcigUYHNhzLFXA726FqalSt0hIzBVBvmep8jqzaCioc=";
hash = "sha256-2kJdj1Ye6o/GQSWRIi/SvSEz0Yvdx9xDzsYdJm4I0GQ=";
};
cargoHash = "sha256-hmEo5UQlVtgdmb6b/vhK5GHHUCgbEKdnAu2S+xrDpuk=";
cargoHash = "sha256-3Xo1JqqaEIEA18bsrLFOD4HMd/evdSEHL0DdqNNjJL8=";
nativeBuildInputs = [ pkg-config ];

View file

@ -10,14 +10,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-public-api";
version = "0.32.0";
version = "0.33.1";
src = fetchCrate {
inherit pname version;
hash = "sha256-etEwMmfwyOTHRb/UfkcHvmnLVVqeSagWJ5HjuJ6gZVo=";
hash = "sha256-poS8s4rfktNKQ0co8G4RLXUJAeUAGcS8YIvb4W0IFNo=";
};
cargoHash = "sha256-7GyPjEit3FEjnegLnZt9TMLBI3BtzcDssrJPj60gpTo=";
cargoHash = "sha256-+tmLUxDxI/W2g7cdQD/Ph5wBpW3QbZzH2M/oRXLzsgU=";
nativeBuildInputs = [ pkg-config ];

View file

@ -57,7 +57,7 @@ buildGoModule rec {
downloadPage = "https://github.com/superfly/flyctl";
homepage = "https://fly.io/";
license = licenses.asl20;
maintainers = with maintainers; [ adtya jsierles techknowlogick viraptor ];
maintainers = with maintainers; [ adtya jsierles techknowlogick ];
mainProgram = "flyctl";
};
}

View file

@ -18,16 +18,16 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "1.30.1";
version = "1.30.2";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
hash = "sha256-AGdP60eOrkFsey5BrIG0mkbNE3Ba+/2Q8HlKmEqrHug=";
hash = "sha256-sWy5Ekq4Jx0JTJgp2xYtfRjPokDsqP5n+pHSyCBzo30=";
};
cargoHash = "sha256-Pnobq/m/K0+YL5FDFbSAWSoSPdmFvcL3zPVbI2IPgvs=";
cargoHash = "sha256-jc3tg+Xs3z7neGx1iyMENXy5s4eAC/9KtsQcal45RoI=";
nativeBuildInputs = [
installShellFiles

View file

@ -15,7 +15,7 @@ let
python pytest nose3 cryptography pyyaml requests mock requests-mock
python-dateutil setuptools;
version = "4.28.1";
version = "4.69";
in
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
hash = "sha256-z9DFtKTvnivY5D2EUHfrmndlUBTfico8o9G3J017f90=";
hash = "sha256-F8VyeIj9I7oDpHTyGw1T8ZvC6kxYf15soY9ni0Zg7u4=";
};
pythonPaths = [ cryptography pyyaml requests ];

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "speedtest-go";
version = "1.6.9";
version = "1.6.10";
src = fetchFromGitHub {
owner = "showwin";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-VaaUFUkPXAMzT+wyLOrOw85sgJzWCYx5k6oTfRcIHuU=";
hash = "sha256-Uk7ZKGxyK4b7P87qN7rGgj4oXJgYhH4NzZa+4fOkh14=";
};
vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E=";

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "fingerprintx";
version = "1.1.12";
version = "1.1.13";
src = fetchFromGitHub {
owner = "praetorian-inc";
repo = "fingerprintx";
rev = "refs/tags/v${version}";
hash = "sha256-jCWWCLLh2mSVvURFw+6eE+wss6/zlGiLBQ4VW2ar+iw=";
hash = "sha256-kWMwadE3ZJTqwEgtrXvXlyc/2+cf1NGhubwZuYpDMBQ=";
};
vendorHash = "sha256-TMy6FwAFlo+ARvm+RiRqly0xIk4lBCXuZrtdnNSMSxw=";

View file

@ -29,13 +29,13 @@ let
in
stdenv.mkDerivation rec {
pname = "wofi-pass";
version = "23.1.2";
version = "23.1.4";
src = fetchFromGitHub {
owner = "schmidtandreas";
repo = "wofi-pass";
rev = "v${version}";
sha256 = "sha256-Z1a+nfnL6NXhufpCU7VIkwuifoS88Pf9qI8GCuP/Zqc=";
sha256 = "sha256-Ycu1NFHoglJdOzGuJ7yfmDo1+f+FMPkpQXJuz6nvtig=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -1443,6 +1443,8 @@ let
inherit (pkgs) coreutils imagemagick;
};
poll = callPackage ../development/ocaml-modules/poll { };
polynomial = callPackage ../development/ocaml-modules/polynomial { };
portaudio = callPackage ../development/ocaml-modules/portaudio {