Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -14329,9 +14329,11 @@
|
||||
name = "Scott Hamilton";
|
||||
};
|
||||
ShamrockLee = {
|
||||
name = "Shamrock Lee";
|
||||
email = "shamrocklee@posteo.net";
|
||||
github = "ShamrockLee";
|
||||
githubId = 44064051;
|
||||
matrix = "@shamrocklee:matrix.org";
|
||||
name = "Yueh-Shun Li";
|
||||
};
|
||||
shanesveller = {
|
||||
email = "shane@sveller.dev";
|
||||
|
||||
@@ -10,7 +10,8 @@ let
|
||||
|
||||
defaultPinentryFlavor =
|
||||
if xserverCfg.desktopManager.lxqt.enable
|
||||
|| xserverCfg.desktopManager.plasma5.enable then
|
||||
|| xserverCfg.desktopManager.plasma5.enable
|
||||
|| xserverCfg.desktopManager.deepin.enable then
|
||||
"qt"
|
||||
else if xserverCfg.desktopManager.xfce.enable then
|
||||
"gtk2"
|
||||
|
||||
@@ -64,7 +64,6 @@ in {
|
||||
# include some popular integrations, that absolutely shouldn't break
|
||||
esphome = {};
|
||||
knx = {};
|
||||
matter = {};
|
||||
shelly = {};
|
||||
zha = {};
|
||||
|
||||
|
||||
@@ -1,19 +1,14 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, trivialBuild, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
trivialBuild {
|
||||
pname = "prolog-mode";
|
||||
version = "1.28";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://bruda.ca/_media/emacs/prolog.el";
|
||||
url = "https://bruda.ca/_media/emacs/prolog.el";
|
||||
sha256 = "ZzIDFQWPq1vI9z3btgsHgn0axN6uRQn9Tt8TnqGybOk=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/share/emacs/site-lisp/
|
||||
cp $src $out/share/emacs/site-lisp/prolog.el
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://bruda.ca/emacs/prolog_mode_for_emacs/";
|
||||
description = "Prolog mode for Emacs";
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.19.0";
|
||||
version = "1.20.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4XhcmK9Dgk82ExzugY4SGRfWYC+IgCAxWS+cBURgT2o=";
|
||||
hash = "sha256-gBnpps++dwcXCLSVjtK3nMJMcJ43vKeNzgCWEt1kn7g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -128,11 +128,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-nNA2jBRMN5JV2i92dZaK5ZFzs44t9zZpusPw+Qnhby0=",
|
||||
"hash": "sha256-4gNXamhda8EyEyOQXnxYNy+S5SyGqtYaxRk/fAG7vvA=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.56.0",
|
||||
"rev": "v3.57.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtx11extras
|
||||
, qtdeclarative
|
||||
, dtkwidget
|
||||
, dde-qt-dbus-factory
|
||||
, xorg
|
||||
, xscreensaver
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-screensaver";
|
||||
version = "5.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-d/BllaXZxRdJe8nH+hhQIEutpBvAWFnBHWbIjznUfQU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs {src,customscreensaver/deepin-custom-screensaver}/{generate_translations.sh,update_translations.sh}
|
||||
|
||||
substituteInPlace src/{dbusscreensaver.cpp,com.deepin.ScreenSaver.service,src.pro} \
|
||||
customscreensaver/deepin-custom-screensaver/deepin-custom-screensaver.pro \
|
||||
--replace "/usr" "$out" \
|
||||
--replace "/etc" "$out/etc"
|
||||
|
||||
substituteInPlace tools/preview/main.cpp \
|
||||
--replace "/usr/lib/xscreensaver" "${xscreensaver}/libexec/xscreensaver"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtx11extras
|
||||
qtdeclarative
|
||||
dtkwidget
|
||||
dde-qt-dbus-factory
|
||||
xorg.libXScrnSaver
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
"XSCREENSAVER_DATA_PATH=${xscreensaver}/libexec/xscreensaver"
|
||||
"COMPILE_ON_V23=false"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A screensaver service developed by deepin";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-screensaver";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -57,6 +57,7 @@ let
|
||||
deepin-terminal = callPackage ./apps/deepin-terminal { };
|
||||
deepin-reader = callPackage ./apps/deepin-reader { };
|
||||
deepin-voice-note = callPackage ./apps/deepin-voice-note { };
|
||||
deepin-screensaver = callPackage ./apps/deepin-screensaver { };
|
||||
|
||||
#### Go Packages
|
||||
go-lib = callPackage ./go-package/go-lib { };
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hvm";
|
||||
version = "1.0.8";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-dPO3GWDojuz7nilOr09xC6tPhBZ95wjAk0ErItzAbxw=";
|
||||
hash = "sha256-dO0GzbMopX84AKOtJYYW6vojcs4kYcZ8LQ4tXEgUN7I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XsKVXlceg3HHGalHcXfmJPKhAQm4DqdsJ2c+NF+AOI4=";
|
||||
cargoHash = "sha256-RQnyVRHWrqnKcI3Jy593jDTydG1nGyrScsqSNyJTDJk=";
|
||||
|
||||
patches = [
|
||||
# see https://github.com/higherorderco/hvm/pull/220
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "example-robot-data";
|
||||
version = "4.0.6";
|
||||
version = "4.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gepetto";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-X1BQGM7MMe753RMb/rVYv7kNnjk/q30u/VJARAXiTAI=";
|
||||
hash = "sha256-dN23ukKPkTohqD1J/0EneLyG6Cg0zriMr1l6WLFemd8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtpbfimageplugin";
|
||||
version = "2.3";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "QtPBFImagePlugin";
|
||||
rev = version;
|
||||
sha256 = "063agzcrcihasqqk2yqxqxg9xknjs99y6vx3n1v7md7dqnfv4iva";
|
||||
sha256 = "sha256-Ju22lCpwbNxiFeQoaUh3LmtI6RlTO3hOw2Z4/O8PQ6E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chat-downloader";
|
||||
version = "0.2.5";
|
||||
version = "0.2.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
hash = "sha256-nxk1VcZr5teuev4cFrtUSIeZNQ8ynpk0n0obGTxqepA=";
|
||||
hash = "sha256-r5322xFQ2gY3Aaj/567pYen9Iw6By++xvBcmLLtFpnI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# dependencies
|
||||
, numpy
|
||||
, pillow
|
||||
, requests
|
||||
, scipy
|
||||
, torch
|
||||
, torchvision
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clean-fid";
|
||||
version = "0.1.35";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GaParmar";
|
||||
repo = "clean-fid";
|
||||
rev = "c8ffa420a3923e8fd87c1e75170de2cf59d2644b";
|
||||
hash = "sha256-fqBU/TmCXDTPU3KTP0+VYQoP+HsT2UMcZeLzQHKD9hw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pillow
|
||||
requests
|
||||
scipy
|
||||
torch
|
||||
torchvision
|
||||
tqdm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cleanfid"
|
||||
];
|
||||
|
||||
# no tests1
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "PyTorch - FID calculation with proper image resizing and quantization steps [CVPR 2022]";
|
||||
homepage = "https://github.com/GaParmar/clean-fid";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# dependencies
|
||||
, ftfy
|
||||
, regex
|
||||
, tqdm
|
||||
, torch
|
||||
, torchvision
|
||||
|
||||
# tests
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clip-anytorch";
|
||||
version = "2.5.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rom1504";
|
||||
repo = "CLIP";
|
||||
rev = version;
|
||||
hash = "sha256-EqVkpMQHawoCFHNupf49NrvLdGCq35wnYBpdP81Ztd4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ftfy
|
||||
regex
|
||||
tqdm
|
||||
torch
|
||||
torchvision
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"clip"
|
||||
];
|
||||
|
||||
# all tests require network access
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Contrastive Language-Image Pretraining";
|
||||
homepage = "https://github.com/rom1504/CLIP";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudflare";
|
||||
version = "2.11.1";
|
||||
version = "2.11.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-VAEgrM9F9M/HjL726RzofJT/Sc8R6WIF/D/gZH5ncBs=";
|
||||
hash = "sha256-igOsDHqfjD1cxcHYsTNbjkhsxKR7LNJf5Zw1kkr4a2E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -41,6 +41,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python wrapper for the Cloudflare v4 API";
|
||||
homepage = "https://github.com/cloudflare/python-cloudflare";
|
||||
changelog = "https://github.com/cloudflare/python-cloudflare/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, python,
|
||||
django_hijack, django_nose }:
|
||||
django-hijack, django_nose }:
|
||||
buildPythonPackage rec {
|
||||
pname = "django-hijack-admin";
|
||||
version = "2.1.10";
|
||||
@@ -13,7 +13,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ django_nose ];
|
||||
propagatedBuildInputs = [ django_hijack ];
|
||||
propagatedBuildInputs = [ django-hijack ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
@@ -1,28 +1,57 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, fetchNpmDeps
|
||||
, buildPythonPackage
|
||||
|
||||
# build-system
|
||||
, gettext
|
||||
, nodejs
|
||||
, npmHooks
|
||||
, setuptools-scm
|
||||
|
||||
# dependencies
|
||||
, django
|
||||
, django_compat
|
||||
|
||||
# tests
|
||||
, pytest-django
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-hijack";
|
||||
version = "3.2.6";
|
||||
version = "3.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
# the wheel comes with pre-built assets, allowing us to avoid fighting
|
||||
# with npm/webpack/gettext to build them ourselves.
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version format;
|
||||
pname = "django_hijack";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-xFPZ03II1814+bZ5gx7GD/AxYMiLuH6awfSeXEraOHQ=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "django-hijack";
|
||||
repo = "django-hijack";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ytQ4xxkBAC3amQbenD8RO5asrbfNAjOspWUY3c2hkig=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'cmd = ["npm", "ci"]' 'cmd = ["true"]' \
|
||||
--replace 'f"{self.build_lib}/{name}.mo"' 'f"{name}.mo"'
|
||||
|
||||
sed -i "/addopts/d" setup.cfg
|
||||
'';
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-FLfMCn2jsLlTTsC+LRMX0dmVCCbNAr2pQUsSQRKgo6E=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
django_compat
|
||||
@@ -33,13 +62,11 @@ buildPythonPackage rec {
|
||||
pytest-django
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export DJANGO_SETTINGS_MODULE='hijack.tests.test_app.settings'
|
||||
'';
|
||||
env.DJANGO_SETTINGS_MODULE = "hijack.tests.test_app.settings";
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--pyargs"
|
||||
"hijack"
|
||||
"--pyargs" "hijack"
|
||||
"-W" "ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# dependencies
|
||||
, accelerate
|
||||
, clean-fid
|
||||
, clip-anytorch
|
||||
, einops
|
||||
, jsonmerge
|
||||
, kornia
|
||||
, pillow
|
||||
, resize-right
|
||||
, scikit-image
|
||||
, scipy
|
||||
, torch
|
||||
, torchdiffeq
|
||||
, torchsde
|
||||
, torchvision
|
||||
, tqdm
|
||||
, wandb
|
||||
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "k-diffusion";
|
||||
version = "0.0.14";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crowsonkb";
|
||||
repo = "k-diffusion";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KKVgk+1hidDBVaRnXjoqwuSRydI10OPHK3YModAizZU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
accelerate
|
||||
clean-fid
|
||||
clip-anytorch
|
||||
einops
|
||||
jsonmerge
|
||||
kornia
|
||||
pillow
|
||||
resize-right
|
||||
scikit-image
|
||||
scipy
|
||||
torch
|
||||
torchdiffeq
|
||||
torchsde
|
||||
torchvision
|
||||
tqdm
|
||||
wandb
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"k_diffusion"
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Karras et al. (2022) diffusion models for PyTorch";
|
||||
homepage = "https://github.com/crowsonkb/k-diffusion";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "0.31.3";
|
||||
version = "0.31.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = "python-plugwise";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/J61J9r6nhY10aerhZ1+RK9hohV0NYiAve+06ubI8p8=";
|
||||
hash = "sha256-8DcURUJgngmBE6oPquSAHCsL1J2HAqvbtBcrqfrauHk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.7.8";
|
||||
version = "1.7.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DZ9MpwlZvq6LHbvnesk7XtGsHOhZvc1tXb/xVDQuR48=";
|
||||
hash = "sha256-mCL1sMNQgC48XR2YlOlIY0OYHQkdQwFQXfZ7bn9K7Tw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
|
||||
# dependencies
|
||||
, numpy
|
||||
, torch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "resize-right";
|
||||
version = "0.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fcNbcs5AErd/fMkEmDUWN5OrmKWKuIk2EPsRn+Wa9SA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
torch
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"resize_right"
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "The correct way to resize images or tensors. For Numpy or Pytorch (differentiable";
|
||||
homepage = "https://github.com/assafshocher/ResizeRight";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rns";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "markqvist";
|
||||
repo = "Reticulum";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yyBUz+Bg05TtPTtREkylqaj2oz8kfxC5fSYpgPCF0Vs=";
|
||||
hash = "sha256-SZx0GBpYDC7p7yLVY5WZmBgpbpcl9GbsfdqH0YBrUgQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
|
||||
# dependencies
|
||||
, torch
|
||||
, scipy
|
||||
|
||||
# tests
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchdiffeq";
|
||||
version = "0.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/nX0NLkJCsDCdwLgK+0hRysPhwNb5lgfUe3F1AE+oxo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
torch
|
||||
scipy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "torchdiffeq" ];
|
||||
|
||||
# no tests in sdist, no tags on git
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Differentiable ODE solvers with full GPU support and O(1)-memory backpropagation";
|
||||
homepage = "https://github.com/rtqichen/torchdiffeq";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# build-system
|
||||
, setuptools
|
||||
|
||||
# dependencies
|
||||
, boltons
|
||||
, numpy
|
||||
, scipy
|
||||
, torch
|
||||
, trampoline
|
||||
|
||||
# tests
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchsde";
|
||||
version = "0.2.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-research";
|
||||
repo = "torchsde";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qQ7oswm0qTdq1xpQElt5cd3K0zskH+H/lgyEnxbCqsI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "numpy==1.19.*" "numpy" \
|
||||
--replace "scipy==1.5.*" "scipy"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
boltons
|
||||
numpy
|
||||
scipy
|
||||
torch
|
||||
trampoline
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "torchsde" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# RuntimeError: a view of a leaf Variable that requires grad is being used in an in-place operation.
|
||||
"test_adjoint"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/google-research/torchsde/releases/tag/v${version}";
|
||||
description = "Differentiable SDE solvers with GPU support and efficient sensitivity analysis";
|
||||
homepage = "https://github.com/google-research/torchsde";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitLab
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "trampoline";
|
||||
version = "0.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
# only wheel on pypi, no tags on git
|
||||
src = fetchFromGitLab {
|
||||
owner = "ferreum";
|
||||
repo = "trampoline";
|
||||
rev = "1d98f39c3015594e2ac8ed48dccc2f393b4dd82b";
|
||||
hash = "sha256-A/tuR+QW9sKh76Qjwn1uQxlVJgWrSFzXeBRDdnSi2o4=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"trampoline"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple and tiny yield-based trampoline implementation for python";
|
||||
homepage = "https://gitlab.com/ferreum/trampoline";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
||||
@@ -9,17 +9,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "orogene";
|
||||
version = "0.3.25";
|
||||
version = "0.3.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orogene";
|
||||
repo = "orogene";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QQhlkTg14nPYQvKYoZf07PjknTZZRUTzBzNFJeovny8=";
|
||||
hash = "sha256-9Rq2/o2W0l2/JR/D95+2AjpVzdZuDVDyQFFNb5Us/hg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uxW196f/PEVxGHmZ7hUyvaIz1OD1XmyVEuwk8Hdvsvs=";
|
||||
cargoHash = "sha256-X7DWJ/3Zqtjgw2s/H+dG8tu8f7/aZVIliloJe2Uz9RE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,42 +1,56 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, pkg-config, flex, bison
|
||||
, llvmPackages, elfutils
|
||||
, libbfd, libbpf, libopcodes, bcc
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, llvmPackages, elfutils, bcc
|
||||
, libbpf, libbfd, libopcodes
|
||||
, cereal, asciidoctor
|
||||
, nixosTests
|
||||
, cmake, pkg-config, flex, bison
|
||||
, util-linux
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpftrace";
|
||||
version = "0.17.1";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iovisor";
|
||||
repo = "bpftrace";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dEchHXZPWc+/Dui6P65EqxB8O/M7F47PZVsKSp80oXE=";
|
||||
owner = "iovisor";
|
||||
repo = "bpftrace";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+SBLcMyOf1gZN8dG5xkNLsqIcK1eVlswjY1GRXepFVg=";
|
||||
};
|
||||
|
||||
buildInputs = with llvmPackages;
|
||||
[ llvm libclang
|
||||
elfutils bcc
|
||||
libbpf libbfd libopcodes
|
||||
cereal asciidoctor
|
||||
];
|
||||
patches = [
|
||||
# fails to build - https://github.com/iovisor/bpftrace/issues/2598
|
||||
(fetchpatch {
|
||||
name = "link-binaries-against-zlib";
|
||||
url = "https://github.com/iovisor/bpftrace/commit/a60b171eb288250c3f1d6f065b05d8a87aff3cdd.patch";
|
||||
hash = "sha256-b/0pKDjolo2RQ/UGjEfmWdG0tnIiFX8PJHhRCXvzyxA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config flex bison llvmPackages.llvm.dev util-linux ];
|
||||
buildInputs = with llvmPackages; [
|
||||
llvm libclang
|
||||
elfutils bcc
|
||||
libbpf libbfd libopcodes
|
||||
cereal asciidoctor
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake pkg-config flex bison
|
||||
llvmPackages.llvm.dev
|
||||
util-linux
|
||||
];
|
||||
|
||||
# tests aren't built, due to gtest shenanigans. see:
|
||||
#
|
||||
# https://github.com/iovisor/bpftrace/issues/161#issuecomment-453606728
|
||||
# https://github.com/iovisor/bpftrace/pull/363
|
||||
#
|
||||
cmakeFlags =
|
||||
[ "-DBUILD_TESTING=FALSE"
|
||||
"-DLIBBCC_INCLUDE_DIRS=${bcc}/include"
|
||||
"-DINSTALL_TOOL_DOCS=off"
|
||||
];
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TESTING=FALSE"
|
||||
"-DLIBBCC_INCLUDE_DIRS=${bcc}/include"
|
||||
"-DINSTALL_TOOL_DOCS=OFF"
|
||||
"-DUSE_SYSTEM_BPF_BCC=ON"
|
||||
];
|
||||
|
||||
# Pull BPF scripts into $PATH (next to their bcc program equivalents), but do
|
||||
# not move them to keep `${pkgs.bpftrace}/share/bpftrace/tools/...` working.
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eudev";
|
||||
version = "3.2.11";
|
||||
version = "3.2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eudev-project";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W5nL4hicQ4fxz5rqoP+hhkE1tVn8lJZjMq4UaiXH6jc=";
|
||||
hash = "sha256-x9l+W8zuFYwG0m9JOIDbEf1x6yeBW36HnJws/buc7HI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, openssl_1_1
|
||||
, openssl
|
||||
, avahi
|
||||
, alsa-lib
|
||||
, libplist
|
||||
@@ -34,6 +34,10 @@
|
||||
, enableLibdaemon ? false
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) optional optionals;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.1.1";
|
||||
pname = "shairport-sync";
|
||||
@@ -47,8 +51,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
buildInputs = with lib; [
|
||||
openssl_1_1
|
||||
buildInputs = [
|
||||
openssl
|
||||
avahi
|
||||
popt
|
||||
libconfig
|
||||
@@ -76,7 +80,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = with lib; [
|
||||
configureFlags = [
|
||||
"--without-configfiles"
|
||||
"--sysconfdir=/etc"
|
||||
"--with-ssl=openssl"
|
||||
|
||||
@@ -8,19 +8,21 @@
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
torch = super.torch-bin;
|
||||
torchvision = super.torchvision-bin;
|
||||
};
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "tts";
|
||||
version = "0.13.3";
|
||||
version = "0.14.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coqui-ai";
|
||||
repo = "TTS";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cu714/XtVqqlHN2CmUObcNFG6Vdi9VqC4at/HB8euDs=";
|
||||
hash = "sha256-AVU4ULz++t9850pYeNrG5HKNvUZcMld4O1/zu697rzk=";
|
||||
};
|
||||
|
||||
postPatch = let
|
||||
@@ -57,6 +59,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
bnnumerizer
|
||||
bnunicodenormalizer
|
||||
coqpit
|
||||
einops
|
||||
flask
|
||||
fsspec
|
||||
g2pkk
|
||||
@@ -65,6 +68,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
inflect
|
||||
jamo
|
||||
jieba
|
||||
k-diffusion
|
||||
librosa
|
||||
matplotlib
|
||||
mecab-python3
|
||||
@@ -81,6 +85,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
torchaudio-bin
|
||||
tqdm
|
||||
trainer
|
||||
transformers
|
||||
unidic-lite
|
||||
webrtcvad
|
||||
];
|
||||
|
||||
@@ -86,6 +86,8 @@ mapAliases ({
|
||||
django_environ = django-environ; # added 2021-12-25
|
||||
django_extensions = django-extensions; # added 2022-01-09
|
||||
django_guardian = django-guardian; # added 2022-05-19
|
||||
django_hijack = django-hijack; # added 2023-05-16
|
||||
django_hijack_admin = django-hijack-admin; # added 2023-05-16
|
||||
django_modelcluster = django-modelcluster; # added 2022-04-02
|
||||
django_reversion = django-reversion; # added 2022-06-18
|
||||
django_polymorphic = django-polymorphic; # added 2022-05-24
|
||||
|
||||
@@ -1831,6 +1831,8 @@ self: super: with self; {
|
||||
|
||||
cle = callPackage ../development/python-modules/cle { };
|
||||
|
||||
clean-fid = callPackage ../development/python-modules/clean-fid { };
|
||||
|
||||
cleo = callPackage ../development/python-modules/cleo { };
|
||||
|
||||
clevercsv = callPackage ../development/python-modules/clevercsv { };
|
||||
@@ -1839,6 +1841,8 @@ self: super: with self; {
|
||||
|
||||
clip = callPackage ../development/python-modules/clip { };
|
||||
|
||||
clip-anytorch = callPackage ../development/python-modules/clip-anytorch { };
|
||||
|
||||
cock = callPackage ../development/python-modules/cock { };
|
||||
|
||||
click = callPackage ../development/python-modules/click { };
|
||||
@@ -2689,10 +2693,9 @@ self: super: with self; {
|
||||
|
||||
django-hierarkey = callPackage ../development/python-modules/django-hierarkey { };
|
||||
|
||||
django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { };
|
||||
django-hijack-admin = callPackage ../development/python-modules/django-hijack-admin { };
|
||||
|
||||
django_hijack = callPackage ../development/python-modules/django-hijack { };
|
||||
# This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set.
|
||||
django-hijack = callPackage ../development/python-modules/django-hijack { };
|
||||
|
||||
django-i18nfield = callPackage ../development/python-modules/django-i18nfield { };
|
||||
|
||||
@@ -5320,6 +5323,8 @@ self: super: with self; {
|
||||
|
||||
jxmlease = callPackage ../development/python-modules/jxmlease { };
|
||||
|
||||
k-diffusion = callPackage ../development/python-modules/k-diffusion { };
|
||||
|
||||
k5test = callPackage ../development/python-modules/k5test {
|
||||
inherit (pkgs) krb5 findutils;
|
||||
};
|
||||
@@ -10463,6 +10468,8 @@ self: super: with self; {
|
||||
|
||||
resampy = callPackage ../development/python-modules/resampy { };
|
||||
|
||||
resize-right = callPackage ../development/python-modules/resize-right { };
|
||||
|
||||
resolvelib = callPackage ../development/python-modules/resolvelib { };
|
||||
|
||||
responses = callPackage ../development/python-modules/responses { };
|
||||
@@ -12147,6 +12154,8 @@ self: super: with self; {
|
||||
|
||||
torchaudio-bin = callPackage ../development/python-modules/torchaudio/bin.nix { };
|
||||
|
||||
torchdiffeq = callPackage ../development/python-modules/torchdiffeq { };
|
||||
|
||||
torchgpipe = callPackage ../development/python-modules/torchgpipe { };
|
||||
|
||||
torchmetrics = callPackage ../development/python-modules/torchmetrics { };
|
||||
@@ -12157,6 +12166,8 @@ self: super: with self; {
|
||||
|
||||
torchlibrosa = callPackage ../development/python-modules/torchlibrosa { };
|
||||
|
||||
torchsde = callPackage ../development/python-modules/torchsde { };
|
||||
|
||||
torchvision = callPackage ../development/python-modules/torchvision { };
|
||||
|
||||
torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { };
|
||||
@@ -12203,6 +12214,8 @@ self: super: with self; {
|
||||
|
||||
traittypes = callPackage ../development/python-modules/traittypes { };
|
||||
|
||||
trampoline = callPackage ../development/python-modules/trampoline { };
|
||||
|
||||
transaction = callPackage ../development/python-modules/transaction { };
|
||||
|
||||
transformers = callPackage ../development/python-modules/transformers { };
|
||||
|
||||
Reference in New Issue
Block a user