Merge master into staging-next
This commit is contained in:
commit
b2c1e06ad0
|
@ -87,9 +87,9 @@ rec {
|
|||
Nix has a [has attribute operator `?`](https://nixos.org/manual/nix/stable/language/operators#has-attribute), which is sufficient for such queries, as long as the number of attributes is static. For example:
|
||||
|
||||
```nix
|
||||
(x?a.b) == hasAttryByPath ["a" "b"] x
|
||||
(x?a.b) == hasAttrByPath ["a" "b"] x
|
||||
# and
|
||||
(x?${f p}."example.com") == hasAttryByPath [ (f p) "example.com" ] x
|
||||
(x?${f p}."example.com") == hasAttrByPath [ (f p) "example.com" ] x
|
||||
```
|
||||
|
||||
**Laws**:
|
||||
|
|
|
@ -13379,6 +13379,12 @@
|
|||
githubId = 830082;
|
||||
name = "Nathan Moos";
|
||||
};
|
||||
moraxyc = {
|
||||
name = "Moraxyc Xu";
|
||||
email = "nix@qaq.li";
|
||||
github = "Moraxyc";
|
||||
githubId = 69713071;
|
||||
};
|
||||
moredread = {
|
||||
email = "code@apb.name";
|
||||
github = "Moredread";
|
||||
|
|
|
@ -285,6 +285,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
|
||||
- The `cudaPackages` package scope has been updated to `cudaPackages_12`.
|
||||
|
||||
- The `halloy` package was updated past 2024.5 which introduced a breaking change by switching the config format from YAML to TOML. See https://github.com/squidowl/halloy/releases/tag/2024.5 for details.
|
||||
|
||||
- Ada packages (libraries and tools) have been moved into the `gnatPackages` scope. `gnatPackages` uses the default GNAT compiler, `gnat12Packages` and `gnat13Packages` use the respective matching compiler version.
|
||||
|
||||
- `spark2014` has been renamed to `gnatprove`. A version of `gnatprove` matching different GNAT versions is available from the different `gnatPackages` sets.
|
||||
|
|
|
@ -842,6 +842,7 @@
|
|||
./services/monitoring/munin.nix
|
||||
./services/monitoring/nagios.nix
|
||||
./services/monitoring/netdata.nix
|
||||
./services/monitoring/nezha-agent.nix
|
||||
./services/monitoring/ocsinventory-agent.nix
|
||||
./services/monitoring/opentelemetry-collector.nix
|
||||
./services/monitoring/osquery.nix
|
||||
|
|
|
@ -0,0 +1,103 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.nezha-agent;
|
||||
in
|
||||
{
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ moraxyc ];
|
||||
};
|
||||
options = {
|
||||
services.nezha-agent = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "Agent of Nezha Monitoring");
|
||||
|
||||
package = lib.mkPackageOption pkgs "nezha-agent" { };
|
||||
debug = lib.mkEnableOption (lib.mdDoc "verbose log");
|
||||
tls = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Enable SSL/TLS encryption.
|
||||
'';
|
||||
};
|
||||
disableCommandExecute = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Disable executing the command from dashboard.
|
||||
'';
|
||||
};
|
||||
skipConnection = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Do not monitor the number of connections.
|
||||
'';
|
||||
};
|
||||
skipProcess = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Do not monitor the number of processes.
|
||||
'';
|
||||
};
|
||||
reportDelay = lib.mkOption {
|
||||
type = lib.types.enum [ 1 2 3 4 ];
|
||||
default = 1;
|
||||
description = lib.mdDoc ''
|
||||
The interval between system status reportings.
|
||||
The value must be an integer from 1 to 4
|
||||
'';
|
||||
};
|
||||
passwordFile = lib.mkOption {
|
||||
type = with lib.types; nullOr str;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
Path to the file contained the password from dashboard.
|
||||
'';
|
||||
};
|
||||
server = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = lib.mdDoc ''
|
||||
Address to the dashboard
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
systemd.services.nezha-agent = {
|
||||
serviceConfig = {
|
||||
ProtectSystem = "full";
|
||||
PrivateDevices = "yes";
|
||||
PrivateTmp = "yes";
|
||||
NoNewPrivileges = true;
|
||||
};
|
||||
path = [ cfg.package ];
|
||||
startLimitIntervalSec = 10;
|
||||
startLimitBurst = 3;
|
||||
script = lib.concatStringsSep " " (
|
||||
[
|
||||
"${cfg.package}/bin/agent"
|
||||
"--disable-auto-update"
|
||||
"--disable-force-update"
|
||||
"--password $(cat ${cfg.passwordFile})"
|
||||
]
|
||||
++ lib.optional cfg.debug "--debug"
|
||||
++ lib.optional cfg.disableCommandExecute "--disable-command-execute"
|
||||
++ lib.optional (cfg.reportDelay != null) "--report-delay ${toString cfg.reportDelay}"
|
||||
++ lib.optional (cfg.server != null) "--server ${cfg.server}"
|
||||
++ lib.optional cfg.skipConnection "--skip-conn"
|
||||
++ lib.optional cfg.skipProcess "--skip-procs"
|
||||
++ lib.optional cfg.tls "--tls"
|
||||
);
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
};
|
||||
}
|
|
@ -45,13 +45,13 @@ stdenv.mkDerivation {
|
|||
pname = binName;
|
||||
# versions are specified in `squeezelite.h`
|
||||
# see https://github.com/ralph-irving/squeezelite/issues/29
|
||||
version = "2.0.0.1476";
|
||||
version = "2.0.0.1481";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ralph-irving";
|
||||
repo = "squeezelite";
|
||||
rev = "7bba683e26f84b7dccc6ef5f40762a67b4f63606";
|
||||
hash = "sha256-iRrZRnSIp8NbZ/Pi8WoQjyeBgxoU0mchNEf00W1Gsvo=";
|
||||
rev = "c751ef146265c243cdbd7c0353dd0b70ab51730c";
|
||||
hash = "sha256-wvHIKOTi/a5tdn7E4SnUrDz3htvyZQMJeQFa+24OKwI=";
|
||||
};
|
||||
|
||||
buildInputs = [ flac libmad libvorbis mpg123 ]
|
||||
|
|
|
@ -56,9 +56,15 @@ stdenv.mkDerivation rec {
|
|||
(lib.cmakeBool "ZBAR" withZbar)
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
postInstall = ''
|
||||
# Binary is looking for .qm files in share/merkaartor
|
||||
mv $out/share/merkaartor/{translations/*.qm,}
|
||||
rm -r $out/share/merkaartor/translations
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv $out/merkaartor.app $out/Applications
|
||||
# Prevent wrapping, otherwise plugins will not be loaded
|
||||
chmod -x $out/Applications/merkaartor.app/Contents/plugins/background/*.dylib
|
||||
makeWrapper $out/{Applications/merkaartor.app/Contents/MacOS,bin}/merkaartor
|
||||
'';
|
||||
|
||||
|
|
|
@ -20,18 +20,18 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "teams-for-linux";
|
||||
version = "1.4.14";
|
||||
version = "1.4.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-qdox6C6ztWECwSqHZoZHMbqPFrokPK0u44NUG+SHmPk=";
|
||||
hash = "sha256-fpz3JzJ6RaSajCwc44Uavln572mT5ixLnIK8FFoKWMg=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-++ZPsBH0qHCykexpY2aZukAc+Ak1wEzAUker8ZLxA9Q=";
|
||||
hash = "sha256-/8Jxly02EZxp5JZ3mVlv01aWX53V9eSy0pvVMfpb9I0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ];
|
||||
|
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "foliate";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnfactotum";
|
||||
repo = pname;
|
||||
repo = "foliate";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6cymAqQxHHoTgzEyUKXC7zV/lUEJfIG+54+tLsc9iHo=";
|
||||
hash = "sha256-uKxybt8ZZuk2tWSJLKC7Tgw78EfMMgI99VExfgOdHwA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -51,9 +51,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A simple and modern GTK eBook reader";
|
||||
mainProgram = "foliate";
|
||||
homepage = "https://johnfactotum.github.io/foliate";
|
||||
changelog = "https://github.com/johnfactotum/foliate/releases/tag/${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
mainProgram = "foliate";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.26.0";
|
||||
version = "2.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hOBWtvls4rRYPMTvkTRkEAftzQB6SG1bv9vasK54d/4=";
|
||||
hash = "sha256-R/AFjJM4rcu2JbdfTNhxIIVhaP7LzFrDAU93hbuXSXs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||
rm -rf e2e/
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-uyGGzfsfjk0mUoJ/0Sm89Mus2fQS3HZGBAQ48xMecwU=";
|
||||
vendorHash = "sha256-SzySXS0s0p1EXcO5RQyATBG9gtoJ4wPxZKGU62fAOHw=";
|
||||
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
|
|
|
@ -15,15 +15,26 @@ in python3Packages.buildPythonApplication {
|
|||
hash = "sha256-pve2f+XMfFokMCtW3KdeOJ9Ey330Gwv/dk1+WBtrBEQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems qt5.wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
qt5.qtbase
|
||||
qt5.qtwayland
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
editdistance
|
||||
pyqt5
|
||||
translitcodec
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems qt5.wrapQtAppsHook ];
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -15,20 +15,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "halloy";
|
||||
version = "2024.5";
|
||||
version = "2024.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "squidowl";
|
||||
repo = "halloy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-F/yQYLYrq3MZFV6igQe4sQi84ChIKCCPdS5151nD6hs=";
|
||||
hash = "sha256-UfeGRLZ0k2hHiA6o5kTysszU1WS4JUF5AXhKmE86bDM=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"iced-0.13.0-dev" = "sha256-8L0AoHPwRUeCiJK/N0NTs1Nl4BX0wbM7SLgundhvra0=";
|
||||
"winit-0.29.10" = "sha256-YoXJEvEhMvk3pK5EbXceVFeJEJLL6KTjiw0kBJxgHIE=";
|
||||
"iced-0.13.0-dev" = "sha256-acGN7yxf33fDoh8J8uKvwiID+Xz1oVJ7KiiWgNWDXfo=";
|
||||
"glyphon-0.5.0" = "sha256-e1jTuaWh9eFdk2pDE4Ov/l3b/Q7GA3hqx6dPoOde1hM=";
|
||||
"winit-0.29.15" = "sha256-9i2i4KcEv7vIImJtcw2NALQ3uDb4EAZXjShG6tfmhkc=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -0,0 +1,45 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nezha-agent,
|
||||
testers,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nezha-agent";
|
||||
version = "0.16.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xXv2FVPsl8BR51VMrFreaS3UQLEJwfObY4OeMMb8pms=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZlheRFgl3vsUXVx8PKZQ59kme2NC31OQAL6EaNhbf70=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
# The test failed due to a geoip request in the sandbox. Remove it to avoid network requirement
|
||||
preCheck = ''
|
||||
rm ./pkg/monitor/myip_test.go
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = nezha-agent;
|
||||
command = "${nezha-agent}/bin/agent -v";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Agent of Nezha Monitoring";
|
||||
homepage = "https://github.com/nezhahq/agent";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [moraxyc];
|
||||
};
|
||||
}
|
|
@ -1,45 +1,44 @@
|
|||
{ lib
|
||||
, adslib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
{
|
||||
lib,
|
||||
adslib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyads";
|
||||
version = "3.3.9";
|
||||
format = "setuptools";
|
||||
version = "3.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stlehmann";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-eNouFJQDgp56fgkA7wZKfosKWOKU6OvXRjFwjCMvZqI=";
|
||||
repo = "pyads";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HJ/dlRuwFSY5j/mAp6rLMlTV59GFwrTV27n73TWlCUo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
adslib
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
buildInputs = [ adslib ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace pyads/pyads_ex.py \
|
||||
--replace "ctypes.CDLL(adslib)" "ctypes.CDLL(\"${adslib}/lib/adslib.so\")"
|
||||
--replace-fail "ctypes.CDLL(adslib)" "ctypes.CDLL(\"${adslib}/lib/adslib.so\")"
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyads"
|
||||
];
|
||||
pythonImportsCheck = [ "pyads" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper for TwinCAT ADS library";
|
||||
homepage = "https://github.com/MrLeeh/pyads";
|
||||
changelog = "https://github.com/stlehmann/pyads/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jamiemagee ];
|
||||
};
|
||||
|
|
|
@ -8,30 +8,37 @@
|
|||
, pytest-benchmark
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pykakasi";
|
||||
version = "2.2.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miurahr";
|
||||
repo = pname;
|
||||
repo = "pykakasi";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM==";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail ', "klepto"' ""
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
jaconv
|
||||
deprecated
|
||||
setuptools
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
|
|
@ -1,42 +1,44 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, libftdi1
|
||||
, libusb1
|
||||
, pythonOlder
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
libftdi1,
|
||||
libusb1,
|
||||
pythonOlder,
|
||||
poetry-core,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylibftdi";
|
||||
version = "0.21.0";
|
||||
format = "setuptools";
|
||||
version = "0.22.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-634vUFKFJUf0xsRgIqFmX510U0OWORcereVv3ICliDI=";
|
||||
hash = "sha256-haaqtDj3ZTQoQ6otWbso+7DTCEemIfuYAJhRhZkPAa8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
libftdi1
|
||||
libusb1
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/pylibftdi/driver.py \
|
||||
--replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb-1.0.so')" \
|
||||
--replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')"
|
||||
--replace-fail 'self._load_library("libusb")' 'cdll.LoadLibrary("${libusb1.out}/lib/libusb-1.0.so")' \
|
||||
--replace-fail 'self._load_library("libftdi")' 'cdll.LoadLibrary("${libftdi1.out}/lib/libftdi1.so")'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pylibftdi"
|
||||
];
|
||||
pythonImportsCheck = [ "pylibftdi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wrapper to Intra2net's libftdi driver for FTDI's USB devices";
|
||||
homepage = "https://pylibftdi.readthedocs.io/";
|
||||
changelog = "https://github.com/codedstructure/pylibftdi/blob/${version}0/CHANGES.txt";
|
||||
changelog = "https://github.com/codedstructure/pylibftdi/blob/${version}/CHANGES.txt";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthuszagh ];
|
||||
};
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynobo";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -16,19 +17,15 @@ buildPythonPackage rec {
|
|||
owner = "echoromeo";
|
||||
repo = "pynobo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Hfyf7XGleDWTKKWNlItcBFuiS3UEwsYed7v5FPRdC0w=";
|
||||
hash = "sha256-OSgpT9CLkfnv1BLAJApZUs3vMc1WE2eG7ZrinCLy/0U=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pynobo"
|
||||
];
|
||||
pythonImportsCheck = [ "pynobo" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python TCP/IP interface for Nobo Hub/Nobo Energy Control devices";
|
||||
|
|
|
@ -0,0 +1,36 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-motionmount";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vogelsproducts";
|
||||
repo = "python-MotionMount";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GXgshCARH4VPYHIIeWXwOCRmKgCyel4ydj/oKUWuyUM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "motionmount" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to control the TVM7675 Pro (Signature) series of MotionMount";
|
||||
homepage = "https://github.com/vogelsproducts/python-MotionMount";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -104,6 +104,9 @@ buildPythonPackage rec {
|
|||
|
||||
pytestFlagsArray = [
|
||||
"-m 'not network'"
|
||||
|
||||
# pytest.PytestRemovedIn8Warning: Passing None has been deprecated.
|
||||
"-W ignore::pytest.PytestRemovedIn8Warning"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -2,7 +2,6 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, wheel
|
||||
, botocore-stubs
|
||||
, typing-extensions
|
||||
, types-aiobotocore-accessanalyzer
|
||||
|
@ -364,20 +363,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-aiobotocore";
|
||||
version = "2.12.1";
|
||||
version = "2.12.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pdPYBcAaqGnDwvgttfEUZv3GfUxebpqwTtVwk9p120c=";
|
||||
hash = "sha256-cpw68B9rX30QE+pbfSRV00wg05XZuKmSYNdJ53uo7+M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
botocore-stubs
|
||||
typing-extensions
|
||||
];
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update
|
||||
#!nix-shell -i bash -p nix-update nixpkgs-fmt
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
source_file=pkgs/development/python-modules/types-aiobotocore-packages/default.nix
|
||||
|
||||
version="2.12.1"
|
||||
version="2.12.2"
|
||||
|
||||
nix-update python311Packages.types-aiobotocore --commit --build
|
||||
|
||||
|
|
|
@ -1,29 +1,26 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-docutils";
|
||||
version = "0.20.0.20240331";
|
||||
version = "0.20.0.20240406";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rJnN80BAyYIIH1QjfWAX+PXa/gvruBilmL+Xpl9bFxU=";
|
||||
hash = "sha256-6OxKWhJdBthjK7qsihH76hih7fqU35xRKdxFmAkVuEs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# Module doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"docutils-stubs"
|
||||
];
|
||||
pythonImportsCheck = [ "docutils-stubs" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for docutils";
|
||||
|
|
|
@ -17,16 +17,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wagtail-localize";
|
||||
version = "1.8.2";
|
||||
version = "1.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "wagtail-localize";
|
||||
owner = "wagtail";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DBqGFD6piMn9d7Ls/GBeBfeQty/MDvlQY0GP66BA2QE=";
|
||||
hash = "sha256-ENdUXfvQOfd9cgHr6fd5Hf+8AJXFix3YbsYJQfpu4ZE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
, fetchPypi
|
||||
, html5lib
|
||||
, l18n
|
||||
, laces
|
||||
, openpyxl
|
||||
, permissionedforms
|
||||
, pillow
|
||||
|
@ -24,22 +25,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wagtail";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Q89luoQwtB5TMWfudbJ2YKeobrBt2L156NZPtK8Feos=";
|
||||
hash = "sha256-58/DwPU/swLxeY8OAqesYHirAusOhwPA9xzL0/GOOG8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8" \
|
||||
--replace "draftjs_exporter>=2.1.5,<3.0" "draftjs_exporter>=2.1.5,<6.0" \
|
||||
--replace "django-taggit>=2.0,<5.0" "django-taggit>=2.0,<6.0" \
|
||||
--replace "Willow[heif]>=1.6.2,<1.7" "Willow[heif]>=1.6.2,<2"
|
||||
--replace "django-filter>=23.3,<24" "django-filter>=23.3,<24.3"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -54,6 +52,7 @@ buildPythonPackage rec {
|
|||
draftjs-exporter
|
||||
html5lib
|
||||
l18n
|
||||
laces
|
||||
openpyxl
|
||||
permissionedforms
|
||||
pillow
|
||||
|
|
|
@ -47,13 +47,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "radare2";
|
||||
version = "5.8.8";
|
||||
version = "5.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-JGNV5xSyrjcO2ZgOjzDqzfZyALPSCyA3DZx/D8ffmKA=";
|
||||
hash = "sha256-h2IYOGr+yCgCJR1gB4jibcUt1A+8IuNVoTUcJ83lKHw=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, lib, fetchurl, undmg, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "3.4.1";
|
||||
version = "3.4.2";
|
||||
pname = "grandperspective";
|
||||
|
||||
src = fetchurl {
|
||||
inherit (finalAttrs) version;
|
||||
url = "mirror://sourceforge/grandperspectiv/GrandPerspective-${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}.dmg";
|
||||
hash = "sha256-iTtvP6iONcfDWJ3qMh+TUJMN+3spwCQ/5S+A307BJCM=";
|
||||
hash = "sha256-ZgyBeQCoixLGCFS8+UFoMilvtswplEC8MzK3BE4ocDg=";
|
||||
};
|
||||
|
||||
sourceRoot = "GrandPerspective.app";
|
||||
|
|
|
@ -3212,7 +3212,8 @@
|
|||
motioneye-client
|
||||
];
|
||||
"motionmount" = ps: with ps; [
|
||||
]; # missing inputs: python-MotionMount
|
||||
python-motionmount
|
||||
];
|
||||
"mpd" = ps: with ps; [
|
||||
mpd2
|
||||
];
|
||||
|
@ -6282,6 +6283,7 @@
|
|||
"mopeka"
|
||||
"motion_blinds"
|
||||
"motioneye"
|
||||
"motionmount"
|
||||
"mqtt"
|
||||
"mqtt_eventstream"
|
||||
"mqtt_json"
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pgbouncer-exporter";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prometheus-community";
|
||||
repo = "pgbouncer_exporter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2N8FaGk6AU39j4q22B2Om5E7BeR7iw9drl3PTOBO2kg=";
|
||||
hash = "sha256-QnA9H4qedCPZKqJQ1I2OJO42mCWcWqYxLmeF3+JXzTw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2aaUlOokqYkjMpcM12mU+O+N09/mDPlIrJ4Z1iXJAyk=";
|
||||
vendorHash = "sha256-NYiVW+CNrxFrEUl1nsTeNNgy7SmTYgqs1d50rCvyBcw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Prometheus exporter for PgBouncer";
|
||||
|
|
|
@ -137,7 +137,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
changelog = "https://github.com/debanjum/khoj/releases/tag/${version}";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
# src/tcmalloc.cc:333] Attempt to free invalid pointer
|
||||
broken = stdenv.isDarwin;
|
||||
broken = true; # last successful build 2024-01-10
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,24 +9,24 @@ let
|
|||
python = python3;
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "spotdl";
|
||||
version = "4.2.4";
|
||||
version = "4.2.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spotDL";
|
||||
repo = "spotify-downloader";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-U0UA94t7WdCeU9Y86rcnT8BzXVx8ryhD3MTJxmNBYcc=";
|
||||
hash = "sha256-vxMhFs2mLbVQndlC2UpeDP+M4pwU9Y4cZHbZ8y3vWbI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
build-system = with python.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
dependencies = with python.pkgs; [
|
||||
spotipy
|
||||
ytmusicapi
|
||||
pytube
|
||||
|
@ -43,10 +43,8 @@ in python.pkgs.buildPythonApplication rec {
|
|||
platformdirs
|
||||
pykakasi
|
||||
syncedlyrics
|
||||
typing-extensions
|
||||
soundcloud-v2
|
||||
bandcamp-api
|
||||
setuptools # for pkg_resources
|
||||
] ++ python-slugify.optional-dependencies.unidecode;
|
||||
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
let
|
||||
pname = "iaito";
|
||||
version = "5.8.8";
|
||||
version = "5.9.0";
|
||||
|
||||
main_src = fetchFromGitHub rec {
|
||||
owner = "radareorg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-/sXdp6QpDxltesg5i2CD0K2r18CrbGZmmI7HqULvFfA=";
|
||||
hash = "sha256-Ep3Cbi0qjY4PKG0urr12y0DgX/l/Tsq8w1qlyH0lu3s=";
|
||||
name = repo;
|
||||
};
|
||||
|
||||
|
|
|
@ -9965,6 +9965,8 @@ self: super: with self; {
|
|||
inherit (pkgs) memcached;
|
||||
};
|
||||
|
||||
python-motionmount = callPackage ../development/python-modules/python-motionmount { };
|
||||
|
||||
python-otbr-api = callPackage ../development/python-modules/python-otbr-api { };
|
||||
|
||||
python-openems = callPackage ../development/python-modules/python-openems { };
|
||||
|
|
Loading…
Reference in New Issue