Merge master into staging-next
This commit is contained in:
github-actions[bot]
+5
-3
@@ -58,9 +58,11 @@
|
||||
/maintainers/scripts/db-to-md.sh @jtojnar @ryantm
|
||||
/maintainers/scripts/doc @jtojnar @ryantm
|
||||
|
||||
/doc/build-aux/pandoc-filters @jtojnar
|
||||
/doc/contributing/ @fricklerhandwerk
|
||||
/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @fricklerhandwerk
|
||||
# Contributor documentation
|
||||
/CONTRIBUTING.md @infinisil
|
||||
/.github/PULL_REQUEST_TEMPLATE.md @infinisil
|
||||
/doc/contributing/ @fricklerhandwerk @infinisil
|
||||
/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @fricklerhandwerk @infinisil
|
||||
|
||||
# NixOS Internals
|
||||
/nixos/default.nix @infinisil
|
||||
|
||||
@@ -3265,6 +3265,12 @@
|
||||
fingerprint = "6E3A FA6D 915C C2A4 D26F C53E 7BB4 BA9C 783D 2BBC";
|
||||
}];
|
||||
};
|
||||
codec = {
|
||||
email = "codec@fnord.cx";
|
||||
github = "codec";
|
||||
githubId = 118829;
|
||||
name = "codec";
|
||||
};
|
||||
CodeLongAndProsper90 = {
|
||||
github = "CodeLongAndProsper90";
|
||||
githubId = 50145141;
|
||||
@@ -5866,6 +5872,11 @@
|
||||
githubId = 17859309;
|
||||
name = "Fuzen";
|
||||
};
|
||||
fuzzdk = {
|
||||
github = "fuzzdk";
|
||||
githubId = 12715461;
|
||||
name = "Anders Bo Rasmussen";
|
||||
};
|
||||
fwc = {
|
||||
github = "fwc";
|
||||
githubId = 29337229;
|
||||
|
||||
@@ -36,6 +36,7 @@ let
|
||||
"fastly"
|
||||
"fritzbox"
|
||||
"graphite"
|
||||
"idrac"
|
||||
"influxdb"
|
||||
"ipmi"
|
||||
"json"
|
||||
@@ -318,6 +319,14 @@ in
|
||||
message = ''
|
||||
Scaphandre needs 'intel_rapl_common' kernel module to be enabled. Please add it in 'boot.kernelModules'.
|
||||
'';
|
||||
} {
|
||||
assertion = cfg.idrac.enable -> (
|
||||
(cfg.idrac.configurationPath == null) != (cfg.idrac.configuration == null)
|
||||
);
|
||||
message = ''
|
||||
Please ensure you have either `services.prometheus.exporters.idrac.configuration'
|
||||
or `services.prometheus.exporters.idrac.configurationPath' set!
|
||||
'';
|
||||
} ] ++ (flip map (attrNames exporterOpts) (exporter: {
|
||||
assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall;
|
||||
message = ''
|
||||
@@ -325,7 +334,12 @@ in
|
||||
`openFirewall' is set to `true'!
|
||||
'';
|
||||
})) ++ config.services.prometheus.exporters.assertions;
|
||||
warnings = config.services.prometheus.exporters.warnings;
|
||||
warnings = [(mkIf (config.services.prometheus.exporters.idrac.enable && config.services.prometheus.exporters.idrac.configurationPath != null) ''
|
||||
Configuration file in `services.prometheus.exporters.idrac.configurationPath` may override
|
||||
`services.prometheus.exporters.idrac.listenAddress` and/or `services.prometheus.exporters.idrac.port`.
|
||||
Consider using `services.prometheus.exporters.idrac.configuration` instead.
|
||||
''
|
||||
)] ++ config.services.prometheus.exporters.warnings;
|
||||
}] ++ [(mkIf config.services.minio.enable {
|
||||
services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000";
|
||||
services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey;
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
{ config, lib, pkgs, options }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.idrac;
|
||||
|
||||
configFile = if cfg.configurationPath != null
|
||||
then cfg.configurationPath
|
||||
else pkgs.writeText "idrac.yml" (builtins.toJSON cfg.configuration);
|
||||
in
|
||||
{
|
||||
port = 9348;
|
||||
extraOpts = {
|
||||
configurationPath = mkOption {
|
||||
type = with types; nullOr path;
|
||||
default = null;
|
||||
example = "/etc/prometheus-idrac-exporter/idrac.yml";
|
||||
description = lib.mdDoc ''
|
||||
Path to the service's config file. This path can either be a computed path in /nix/store or a path in the local filesystem.
|
||||
|
||||
The config file should NOT be stored in /nix/store as it will contain passwords and/or keys in plain text.
|
||||
|
||||
Mutually exclusive with `configuration` option.
|
||||
|
||||
Configuration reference: https://github.com/mrlhansen/idrac_exporter/#configuration
|
||||
'';
|
||||
};
|
||||
configuration = mkOption {
|
||||
type = types.nullOr types.attrs;
|
||||
description = lib.mdDoc ''
|
||||
Configuration for iDRAC exporter, as a nix attribute set.
|
||||
|
||||
Configuration reference: https://github.com/mrlhansen/idrac_exporter/#configuration
|
||||
|
||||
Mutually exclusive with `configurationPath` option.
|
||||
'';
|
||||
default = null;
|
||||
example = {
|
||||
timeout = 10;
|
||||
retries = 1;
|
||||
hosts = {
|
||||
default = {
|
||||
username = "username";
|
||||
password = "password";
|
||||
};
|
||||
};
|
||||
metrics = {
|
||||
system = true;
|
||||
sensors = true;
|
||||
power = true;
|
||||
sel = true;
|
||||
storage = true;
|
||||
memory = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
LoadCredential = "configFile:${configFile}";
|
||||
ExecStart = "${pkgs.prometheus-idrac-exporter}/bin/idrac_exporter -config %d/configFile";
|
||||
Environment = [
|
||||
"IDRAC_EXPORTER_LISTEN_ADDRESS=${cfg.listenAddress}"
|
||||
"IDRAC_EXPORTER_LISTEN_PORT=${toString cfg.port}"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -307,6 +307,23 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
idrac = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
port = 9348;
|
||||
configuration = {
|
||||
hosts = {
|
||||
default = { username = "username"; password = "password"; };
|
||||
};
|
||||
};
|
||||
};
|
||||
exporterTest = ''
|
||||
wait_for_unit("prometheus-idrac-exporter.service")
|
||||
wait_for_open_port(9348)
|
||||
wait_until_succeeds("curl localhost:9348")
|
||||
'';
|
||||
};
|
||||
|
||||
influxdb = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
|
||||
@@ -22,8 +22,23 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-5m4aeuCqSJNgerQKyP9M6Qf7P4ijCtCY4Efew6E09Bc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ wayland-scanner wayland pango glib harfbuzz cairo libxkbcommon ];
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "pkg-config" "$PKG_CONFIG"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
buildInputs = [
|
||||
cairo
|
||||
glib
|
||||
harfbuzz
|
||||
libxkbcommon
|
||||
pango
|
||||
wayland
|
||||
];
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -30,11 +30,11 @@
|
||||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "117.0b3";
|
||||
version = "117.0b5";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "d051aa1f7bce063eae2f9885c3d4a54ba4234075a46ab903b0c74a343e7c6e8834a629e21b48f6d9440515bbc4780690e46e79ed8e379e3dbba953ffabc12aac";
|
||||
sha512 = "8cb7a96a996b5d3b4e119b4b6317eb7015f9e3d96a3c6a301effe4e5cdaf1c8295a68e57cd919b42a1bef8717ae6764edcbedd4399ca89e14e5f212b144125c1";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -58,12 +58,12 @@
|
||||
|
||||
firefox-devedition = (buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "117.0b3";
|
||||
version = "117.0b5";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "33b7f66304d5db77c1f83e1608bd755009b8f1d4fd034dc011fb2104b56ecd311d7db665decaa85120766c0db6e3c0675271979ebc568c0ccf90741baac04afd";
|
||||
sha512 = "16f2fc0ac5d3cd76659b33b319a39367d5e37d7c2f5246f2f76a57b1455ab16af83872ec4fb74a30e127b744a06d8dc5c99a531d3bf2ff4c6465d1d5e2fcd126";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zarf";
|
||||
version = "0.28.2";
|
||||
version = "0.28.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "defenseunicorns";
|
||||
repo = "zarf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4217HkmTridDkq0c0lqkcbwqxqAceNIVFl/TEDcuxCA=";
|
||||
hash = "sha256-UloVE3CRiXYzIAm0Yyt0WyYEY7ykCyIiPH5JNa/acAo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sTI/fpT/5/2ulhCuhsKpY5epJup2TxF2jpRqBI0eOWA=";
|
||||
vendorHash = "sha256-+i4pHHCo7sSESerHEVQ1r8MoEzhKdfhRGRjvyiyPG5E=";
|
||||
proxyVendor = true;
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubo";
|
||||
version = "0.21.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
version = "0.22.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
rev = "v${version}";
|
||||
|
||||
passthru.repoVersion = "14"; # Also update kubo-migrator when changing the repo version
|
||||
@@ -10,7 +10,7 @@ buildGoModule rec {
|
||||
# Kubo makes changes to it's source tarball that don't match the git source.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
||||
hash = "sha256-tS7hiv7KnALR+hCn/TPUwqp/xIOLnQ3ReSb1bNBnwUY=";
|
||||
hash = "sha256-TX5ZM8Kyj3LZ12Ro7MsHRd+P5XLk/mU7DUxZaopSEV0=";
|
||||
};
|
||||
|
||||
# tarball contains multiple files/directories
|
||||
|
||||
@@ -67,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--set-default SSL_CERT_DIR "/etc/ssl/certs/"
|
||||
--prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
|
||||
${lib.optionalString stdenv.isDarwin ''
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
|
||||
|
||||
@@ -397,5 +397,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ primeos wmertens globin ];
|
||||
mainProgram = "git";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -20,6 +20,7 @@ lib.recurseIntoAttrs
|
||||
thumbfast = callPackage ./thumbfast.nix { };
|
||||
thumbnail = callPackage ./thumbnail.nix { };
|
||||
uosc = callPackage ./uosc.nix { };
|
||||
visualizer = callPackage ./visualizer.nix { };
|
||||
vr-reversal = callPackage ./vr-reversal.nix { };
|
||||
webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { };
|
||||
cutter = callPackage ./cutter.nix { };
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "visualizer";
|
||||
version = "unstable-2021-07-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfcc64";
|
||||
repo = "mpv-scripts";
|
||||
rev = "a0cd87eeb974a4602c5d8086b4051b5ab72f42e1";
|
||||
sha256 = "1xgd1nd117lpj3ppynhgaa5sbkfm7l8n6c9a2fy8p07is2dkndrq";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp visualizer.lua $out/share/mpv/scripts
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "visualizer.lua";
|
||||
|
||||
meta = with lib; {
|
||||
description = "various audio visualization";
|
||||
homepage = "https://github.com/mfcc64/mpv-scripts";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [kmein];
|
||||
};
|
||||
}
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "advanced-scene-switcher";
|
||||
version = "1.23.0";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WarmUpTill";
|
||||
repo = "SceneSwitcher";
|
||||
rev = version;
|
||||
hash = "sha256-X1qeMNTC2Hsl3Yh3E7PYVWAMGjGylF/EBkgW4WrtH40=";
|
||||
hash = "sha256-rpZ/vR9QbWgr8n6LDv6iTRsKXSIDGy0IpPu1Uatb0zw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,14 +1,33 @@
|
||||
{ pcre, pcre2, libXinerama, picom, lib, fetchFromGitHub }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, libXinerama
|
||||
, pcre
|
||||
, pcre2
|
||||
, picom
|
||||
, xcbutil
|
||||
}:
|
||||
|
||||
picom.overrideAttrs (oldAttrs: rec {
|
||||
picom.overrideAttrs (oldAttrs: {
|
||||
pname = "picom-next";
|
||||
version = "unstable-2023-01-29";
|
||||
buildInputs = [ pcre2 ] ++ lib.remove libXinerama (lib.remove pcre oldAttrs.buildInputs);
|
||||
version = "unstable-2023-08-03";
|
||||
|
||||
buildInputs = [
|
||||
pcre2
|
||||
xcbutil
|
||||
]
|
||||
# remove dependencies that are not used anymore
|
||||
++ (lib.subtractLists [
|
||||
libXinerama
|
||||
pcre
|
||||
]
|
||||
oldAttrs.buildInputs);
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yshui";
|
||||
repo = "picom";
|
||||
rev = "cee12875625465292bc11bf09dc8ab117cae75f4";
|
||||
sha256 = "sha256-lVwBwOvzn4ro1jInRuNvn1vQuwUHUp4MYrDaFRmW9pc=";
|
||||
rev = "5d6957d3da1bf99311a676eab94c69ef4276bedf";
|
||||
hash = "sha256-Mzf0533roLSODjMCPKyGSMbP7lIbT+PoLTZfoIBAI6g=";
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ];
|
||||
})
|
||||
|
||||
@@ -1,14 +1,24 @@
|
||||
# Run autoOpenGLRunpath on all files
|
||||
# shellcheck shell=bash
|
||||
# Run addOpenGLRunpath on all dynamically linked, ELF files
|
||||
echo "Sourcing auto-add-opengl-runpath-hook"
|
||||
|
||||
autoAddOpenGLRunpathPhase () {
|
||||
# TODO: support multiple outputs
|
||||
for file in $(find ${out,lib,bin} -type f); do
|
||||
addOpenGLRunpath $file
|
||||
done
|
||||
}
|
||||
autoAddOpenGLRunpathPhase() (
|
||||
local outputPaths
|
||||
mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done)
|
||||
find "${outputPaths[@]}" -type f -executable -print0 | while IFS= read -rd "" f; do
|
||||
if isELF "$f"; then
|
||||
# patchelf returns an error on statically linked ELF files
|
||||
if patchelf --print-interpreter "$f" >/dev/null 2>&1; then
|
||||
echo "autoAddOpenGLRunpathHook: patching $f"
|
||||
addOpenGLRunpath "$f"
|
||||
elif [ -n "${DEBUG-}" ]; then
|
||||
echo "autoAddOpenGLRunpathHook: skipping ELF file $f"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
)
|
||||
|
||||
if [ -z "${dontUseAutoAddOpenGLRunpath-}" ]; then
|
||||
echo "Using autoAddOpenGLRunpathPhase"
|
||||
postFixupHooks+=(autoAddOpenGLRunpathPhase)
|
||||
echo "Using autoAddOpenGLRunpathPhase"
|
||||
postFixupHooks+=(autoAddOpenGLRunpathPhase)
|
||||
fi
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luau";
|
||||
version = "0.588";
|
||||
version = "0.589";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Roblox";
|
||||
repo = "luau";
|
||||
rev = version;
|
||||
hash = "sha256-iRYVmRnEpLBtBJ5EjN88EmWM88FNU4CyFvgnBaqDSz4=";
|
||||
hash = "sha256-q36mWkZgzms+dYZ++S9MwnRYxUXBtRxiECOxX886eVw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aeppl";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "aesara-devs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-y2JQxHztLEORoqVikOD/pSF5+WJRo/f8XyZKVDx2Ybs=";
|
||||
hash = "sha256-mqBbXwWJwQA2wSHuEdBeXQMfTIcgwYEjpq8AVmOjmHM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -23,16 +23,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aesara";
|
||||
version = "2.8.12";
|
||||
version = "2.9.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aesara-devs";
|
||||
repo = "aesara";
|
||||
rev = "refs/tags/rel-${version}";
|
||||
hash = "sha256-lRc0IGpxkSnVeziFOYX7f99P7WNvz1KHy73qMPrU24I=";
|
||||
hash = "sha256-eanFkEiuPzm4InLd9dFmoLs/IOofObn9NIzaqzINdMQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aliyun-python-sdk-config";
|
||||
version = "2.2.9";
|
||||
version = "2.2.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5uRiOJAxq1zcJX+CyDnTG5BG1eFcJ43HdfpWUoZ5FSM=";
|
||||
hash = "sha256-Yv0RIraWi1HMlzIQkH8JXvVi3FvyCmDvH9XjAamEDQo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "energyzero";
|
||||
version = "0.4.2";
|
||||
version = "0.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "klaasnicolaas";
|
||||
repo = "python-energyzero";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sqkpbvsMd/8y6QSrMZHJeHl9GTes8TUoZ7RKePJsREs=";
|
||||
hash = "sha256-UFmchPFAO5azvLKgbKLbPooGhQ4SZHzrCe6jBo0X3bw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,7 +10,9 @@
|
||||
, optax
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, pythonRelaxDepsHook
|
||||
, tensorflow
|
||||
, tensorstore
|
||||
, fetchpatch
|
||||
, rich
|
||||
}:
|
||||
@@ -26,7 +28,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-Vv68BK83gTIKj0r9x+twdhqmRYziD0vxQCdHkYSeTak=";
|
||||
};
|
||||
|
||||
buildInputs = [ jaxlib ];
|
||||
nativeBuildInputs = [ jaxlib pythonRelaxDepsHook ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jax
|
||||
@@ -35,8 +37,12 @@ buildPythonPackage rec {
|
||||
numpy
|
||||
optax
|
||||
rich
|
||||
tensorstore
|
||||
];
|
||||
|
||||
# See https://github.com/google/flax/pull/2882.
|
||||
pythonRemoveDeps = [ "orbax" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"flax"
|
||||
];
|
||||
@@ -64,6 +70,12 @@ buildPythonPackage rec {
|
||||
# `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them
|
||||
# would be limited anyway.
|
||||
"examples/*"
|
||||
|
||||
# See https://github.com/google/flax/issues/3232.
|
||||
"tests/jax_utils_test.py"
|
||||
|
||||
# Requires orbax which is not packaged as of 2023-07-27.
|
||||
"tests/checkpoints_test.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
@@ -88,7 +100,5 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/google/flax/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ndl ];
|
||||
# Requires orbax which is not available
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "globus-sdk";
|
||||
version = "3.25.0";
|
||||
version = "3.26.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "globus";
|
||||
repo = "globus-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-k+gmkngZEO2vr/QP6LeJkzYG98X8Ck1EGc99F2rPeps=";
|
||||
hash = "sha256-L3YwBFpeGDPIixjvU7OLf8kpeYkqcSmLqMzGcSjtMtE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hdf5plugin";
|
||||
version = "4.1.2";
|
||||
version = "4.1.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "silx-kit";
|
||||
repo = "hdf5plugin";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ooRZTZaHutr6tdMm8mbpukjmH9yfgWCf5lrFc6AJVpw=";
|
||||
hash = "sha256-0emCZ+r5dCRBT2xaNsgYskcGcLF/9Jf6K7FFi/PA+60=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
homepage = "http://www.silx.org/doc/hdf5plugin/latest/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bhipple ];
|
||||
maintainers = with maintainers; [ pbsds ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "knack";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-xXKBKCl+bSaXkQhc+Wwv/fzvWM+DxjSly5LrA7KSmDg=";
|
||||
hash = "sha256-62VoAB6RELGzIJQUMcUQM9EEzJjNoiVKXCsJulaf1JQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, crcmod
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ndspy";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -17,13 +16,9 @@ buildPythonPackage rec {
|
||||
owner = "RoadrunnerWMC";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0x3sp10had1mq192m7kgjivvs8kpjagxjgj9d4z95dfjhzzbjh70";
|
||||
hash = "sha256-V7phRZCA0WbUpYLgS/4nJbje/JM61RksDUZQ2pnbQyU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
crcmod
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymazda";
|
||||
version = "0.3.10";
|
||||
version = "0.3.11";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-b7YRg5g9ltYJhjMVcq9uZaSqzizJZM4pE4WYW2u9AwY=";
|
||||
hash = "sha256-DiXLY4mfgRbE0Y1tOJnkMSQQj1vcySLVDBthOWe7/dM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvesync";
|
||||
version = "2.1.8";
|
||||
version = "2.1.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RrFCza6y5IdeDokSAGOYs20OMIm4UGCRy/0YO/uYtNo=";
|
||||
hash = "sha256-88aCnPzC4RfmEsL05pgFoOCfz42R1eqaJGTmXoWu0gA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{ autoPatchelfHook
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, lib
|
||||
, numpy
|
||||
, python
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
pythonVersionNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||
systemToPlatform = {
|
||||
"x86_64-linux" = "manylinux_2_17_x86_64.manylinux2014_x86_64";
|
||||
"aarch64-darwin" = "macosx_11_0_arm64";
|
||||
};
|
||||
hashes = {
|
||||
"310-x86_64-linux" = "sha256-Zuy2zBLV950CMbdtpLNpIWqnXHw2jkjrZG48eGtm42w=";
|
||||
"311-x86_64-linux" = "sha256-Bg5j8QB5z8Ju4bEQsZDojJHTJ4UoQF1pkd4ma83Sc/s=";
|
||||
"310-aarch64-darwin" = "sha256-6Tta4ru1TnobFa4FXWz8fm9rAxF0G09Y2Pj/KaQPVnE=";
|
||||
"311-aarch64-darwin" = "sha256-Sb0tv9ZPQJ4n9b0ybpjJWpreQPZvSC5Sd7CXuUwHCn0=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorstore";
|
||||
version = "0.1.40";
|
||||
format = "wheel";
|
||||
|
||||
# The source build involves some wonky Bazel stuff.
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
format = "wheel";
|
||||
python = "cp${pythonVersionNoDot}";
|
||||
abi = "cp${pythonVersionNoDot}";
|
||||
dist = "cp${pythonVersionNoDot}";
|
||||
platform = systemToPlatform.${stdenv.system} or (throw "unsupported system");
|
||||
hash = hashes."${pythonVersionNoDot}-${stdenv.system}" or (throw "unsupported system/python version combination");
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
pythonImportsCheck = [ "tensorstore" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for reading and writing large multi-dimensional arrays";
|
||||
homepage = "https://google.github.io/tensorstore";
|
||||
changelog = "https://github.com/google/tensorstore/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
sourceProvenance = [ sourceTypes.binaryNativeCode ];
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.213.0";
|
||||
version = "0.214.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6w09lo1+gBiFU481a6wYGQmJ61yVwQhMOll7QUeXy0U=";
|
||||
sha256 = "sha256-N3eunmUl08RPu54k1QQWqgKa9RS0uzVVI2f0kCbmb2w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fly";
|
||||
version = "7.9.1";
|
||||
version = "7.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "concourse";
|
||||
repo = "concourse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ySyarky92+VSo/KzQFrWeh35KDMTQDV34F5iFrARHJs=";
|
||||
hash = "sha256-KmKIr7Y3CQmv1rXdju6xwUHABqj/dkXpgWc/yNrAza8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Oy1wP82ZhdpGHs/gpfdveOK/jI9yuo0D3JtxjLg+W/w=";
|
||||
vendorHash = "sha256-lc0okniezfTNLsnCBIABQxSgakRUidsprrEnkH8il2g=";
|
||||
|
||||
subPackages = [ "fly" ];
|
||||
|
||||
|
||||
Generated
+67
-49
@@ -83,9 +83,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-compression"
|
||||
version = "0.4.0"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11"
|
||||
checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6"
|
||||
dependencies = [
|
||||
"brotli",
|
||||
"flate2",
|
||||
@@ -103,7 +103,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.28",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -254,9 +254,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.3.10"
|
||||
version = "4.3.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a"
|
||||
checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
@@ -265,9 +265,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.3.10"
|
||||
version = "4.3.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d"
|
||||
checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@@ -277,14 +277,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.3.2"
|
||||
version = "4.3.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
|
||||
checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.28",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -463,12 +463,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "dashmap"
|
||||
version = "5.4.0"
|
||||
version = "5.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
|
||||
checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"hashbrown 0.12.3",
|
||||
"hashbrown 0.14.0",
|
||||
"lock_api",
|
||||
"once_cell",
|
||||
"parking_lot_core",
|
||||
@@ -568,7 +568,7 @@ checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"redox_syscall 0.2.13",
|
||||
"windows-sys 0.36.1",
|
||||
]
|
||||
|
||||
@@ -690,7 +690,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.28",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -862,7 +862,7 @@ dependencies = [
|
||||
"httpdate",
|
||||
"itoa",
|
||||
"pin-project-lite",
|
||||
"socket2",
|
||||
"socket2 0.4.9",
|
||||
"tokio",
|
||||
"tower-service",
|
||||
"tracing",
|
||||
@@ -938,9 +938,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "indicatif"
|
||||
version = "0.17.5"
|
||||
version = "0.17.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057"
|
||||
checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730"
|
||||
dependencies = [
|
||||
"console",
|
||||
"instant",
|
||||
@@ -994,7 +994,7 @@ version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98"
|
||||
dependencies = [
|
||||
"socket2",
|
||||
"socket2 0.4.9",
|
||||
"widestring",
|
||||
"winapi",
|
||||
"winreg 0.7.0",
|
||||
@@ -1098,9 +1098,9 @@ checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.8"
|
||||
version = "0.4.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
|
||||
checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"scopeguard",
|
||||
@@ -1367,15 +1367,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
version = "0.9.3"
|
||||
version = "0.9.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
|
||||
checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"redox_syscall 0.3.5",
|
||||
"smallvec",
|
||||
"windows-sys 0.36.1",
|
||||
"windows-targets 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1406,9 +1406,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.9"
|
||||
version = "0.2.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
|
||||
checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c"
|
||||
|
||||
[[package]]
|
||||
name = "pin-utils"
|
||||
@@ -1491,6 +1491,15 @@ dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.6.0"
|
||||
@@ -1679,29 +1688,29 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.166"
|
||||
version = "1.0.183"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
|
||||
checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.166"
|
||||
version = "1.0.183"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
|
||||
checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.28",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.99"
|
||||
version = "1.0.104"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3"
|
||||
checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
|
||||
dependencies = [
|
||||
"indexmap 2.0.0",
|
||||
"itoa",
|
||||
@@ -1711,9 +1720,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_path_to_error"
|
||||
version = "0.1.12"
|
||||
version = "0.1.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0b1b6471d7496b051e03f1958802a73f88b947866f5146f329e47e36554f4e55"
|
||||
checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"serde",
|
||||
@@ -1783,6 +1792,16 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "socket2"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "spin"
|
||||
version = "0.5.2"
|
||||
@@ -1823,9 +1842,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.23"
|
||||
version = "2.0.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
|
||||
checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -1894,11 +1913,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.29.1"
|
||||
version = "1.30.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
|
||||
checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"backtrace",
|
||||
"bytes",
|
||||
"libc",
|
||||
@@ -1907,7 +1925,7 @@ dependencies = [
|
||||
"parking_lot",
|
||||
"pin-project-lite",
|
||||
"signal-hook-registry",
|
||||
"socket2",
|
||||
"socket2 0.5.3",
|
||||
"tokio-macros",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
@@ -1920,7 +1938,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.28",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1952,7 +1970,7 @@ dependencies = [
|
||||
"filetime",
|
||||
"futures-core",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"redox_syscall 0.2.13",
|
||||
"tokio",
|
||||
"tokio-stream",
|
||||
"xattr",
|
||||
@@ -1975,9 +1993,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.7.5"
|
||||
version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240"
|
||||
checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
@@ -1996,9 +2014,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "toml_edit"
|
||||
version = "0.19.11"
|
||||
version = "0.19.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"
|
||||
checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"
|
||||
dependencies = [
|
||||
"indexmap 2.0.0",
|
||||
"serde",
|
||||
@@ -2032,7 +2050,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.28",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cotton";
|
||||
version = "unstable-2023-07-04";
|
||||
version = "unstable-2023-08-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielhuang";
|
||||
repo = pname;
|
||||
rev = "940564f64fb6cc6a4bf1e59bc2498ca19a62e1c3";
|
||||
sha256 = "sha256-SwbF+CRjcjCDMt4tCq8dWbTsnIP5tZZw4e2cThQJIdY=";
|
||||
rev = "04e2dfd123f7af6e78e3ce86b2fc04ca4c754cdc";
|
||||
sha256 = "sha256-+HOuQyGkyS7oG0I0DkFGl+6YIDpV4GCCgC+a5Jwo4fw=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
let
|
||||
pname = "gptcommit";
|
||||
version = "0.5.10";
|
||||
version = "0.5.11";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "zurawiki";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-W4AUP4OQCHWJ3BbuD7N9CowF4tPi9f1fmYZnAbG9Rq8=";
|
||||
sha256 = "sha256-UUiqIwvZHV+WhzRc05sW/R3V+6ovL8+WoDOzz4chCq0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-KUM3ZV9pfR/kUktO2mk9uYpTscBwzAi2APHXBb0GH+U=";
|
||||
cargoSha256 = "sha256-YoNC1kaYItpnn9tzRh61Hn58XbA/LPWokqdbPDD3sq4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -80,5 +80,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "A handy way to save and run project-specific commands";
|
||||
license = licenses.cc0;
|
||||
maintainers = with maintainers; [ xrelkd jk adamcstephens ];
|
||||
mainProgram = "just";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub, nix, nix-update-script }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, nixVersions, nix-update-script }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nil";
|
||||
version = "2023-05-09";
|
||||
version = "2023-08-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxalica";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Xg3Cux5wQDatXRvQWsVD0YPfmxfijjG8+gxYqgoT6JE=";
|
||||
hash = "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-N7flQRIc0CXTuKjy9tVZapu+CXUT4rg66VLLT/vMUoc=";
|
||||
|
||||
CFG_RELEASE = version;
|
||||
cargoHash = "sha256-lyKPmzuZB9rCBI9JxhxlyDtNHLia8FXGnSgV+D/dwgo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
(lib.getBin nix)
|
||||
(lib.getBin nixVersions.unstable)
|
||||
];
|
||||
|
||||
env.CFG_RELEASE = version;
|
||||
|
||||
# might be related to https://github.com/NixOS/nix/issues/5884
|
||||
preBuild = ''
|
||||
export NIX_STATE_DIR=$(mktemp -d)
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "complgen";
|
||||
version = "unstable-2023-07-20";
|
||||
version = "unstable-2023-08-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adaszko";
|
||||
repo = "complgen";
|
||||
rev = "18ad7e5def8e9b9701a79511a23a2091baad8a9e";
|
||||
hash = "sha256-1nNxcYi7HrA2vcggiLC5UPTX3dmM5xgjubnX7WtCq/A=";
|
||||
rev = "7c81398e66e5728e0247b61e2210aad0b7a1d002";
|
||||
hash = "sha256-ToyvyXuesBKxi8qLo1YLUvIlhjEmkoiOu8+inPCgyU8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rR9wj34QUmIn5HE0k2nOa7HHO5DI+w6BbCgJ4Aelt44=";
|
||||
cargoHash = "sha256-fH+yeuup2USkW8L2/CEmSx++u0wHrCsMuugCmJ+L6jw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar";
|
||||
|
||||
Generated
+3
-3
@@ -800,7 +800,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
|
||||
|
||||
[[package]]
|
||||
name = "flake8-to-ruff"
|
||||
version = "0.0.283"
|
||||
version = "0.0.284"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
@@ -2042,7 +2042,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff"
|
||||
version = "0.0.283"
|
||||
version = "0.0.284"
|
||||
dependencies = [
|
||||
"annotate-snippets 0.9.1",
|
||||
"anyhow",
|
||||
@@ -2141,7 +2141,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff_cli"
|
||||
version = "0.0.283"
|
||||
version = "0.0.284"
|
||||
dependencies = [
|
||||
"annotate-snippets 0.9.1",
|
||||
"anyhow",
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.283";
|
||||
version = "0.0.284";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WqvTn/NGyZq9cJ417KPOVEEshDITxs6XdhwZbCXPk2o=";
|
||||
hash = "sha256-MAlIepodGQL2tHRIPXsHLg4rDYgjfq1opaXIkjNNW1I=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@@ -3728,6 +3728,39 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wit"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"assert_cmd",
|
||||
"bytes",
|
||||
"cargo-component-core",
|
||||
"clap",
|
||||
"futures",
|
||||
"indexmap 2.0.0",
|
||||
"log",
|
||||
"p256",
|
||||
"predicates",
|
||||
"pretty_env_logger",
|
||||
"rand_core",
|
||||
"rpassword",
|
||||
"semver",
|
||||
"serde",
|
||||
"tokio",
|
||||
"tokio-util",
|
||||
"toml_edit",
|
||||
"url",
|
||||
"warg-client",
|
||||
"warg-crypto",
|
||||
"warg-protocol",
|
||||
"warg-server",
|
||||
"wasm-metadata 0.10.1",
|
||||
"wasmparser 0.110.0",
|
||||
"wit-component 0.13.1",
|
||||
"wit-parser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wit-bindgen"
|
||||
version = "0.9.0"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "cargo-component";
|
||||
version = "unstable-2023-07-28";
|
||||
version = "unstable-2023-08-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "cargo-component";
|
||||
rev = "b58f10c867f666c1c799b766fb8cd1941ede8ed7";
|
||||
hash = "sha256-BwrbenOg+Q6BAy/Mn8AHB0VvvIZ0cYvq4r791QEFTdo=";
|
||||
rev = "d14cef65719d0d186218d1dfe5f04bbbf295dc80";
|
||||
hash = "sha256-dFaboXF5NXPE2xcJWanyP5WYpqJBq+xKpi6snNfIWJg=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "leptosfmt";
|
||||
version = "0.1.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bram209";
|
||||
repo = "leptosfmt";
|
||||
rev = version;
|
||||
hash = "sha256-RR4gwmYna/mvUw5akQutWKaUCWzCjK512gynR9Pddd0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6du44SfH0dT1gWVFluB3+AA3GUzwN7Sjh03rKhSRKCM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A formatter for the leptos view! macro";
|
||||
homepage = "https://github.com/bram209/leptosfmt";
|
||||
changelog = "https://github.com/bram209/leptosfmt/blob/${src.rev}/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.16.2";
|
||||
version = "1.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1s9wN72QnlvtcB8W26Mw4uC8c6/txUfv6QBpqcWzYZQ=";
|
||||
hash = "sha256-64cVDW5sScQCpBsP/dyHbWppYuGRQwXloRsMHFKT4yw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0bzW34QuD0OJLXDzrVRPzVTyCZHWiQZh6MUP5Wix+Tg=";
|
||||
cargoHash = "sha256-Sad28iwsCpZPo/V6DlLA+pjq0T3yv8fRHXDCnRfFzPg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
||||
@@ -61,7 +61,7 @@ in {
|
||||
dontStrip = true;
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ fusion809 msteen rardiol ];
|
||||
maintainers = with maintainers; [ fusion809 msteen ];
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@@ -104,36 +104,30 @@ in gcc11Stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
# autoAddOpenGLRunpathHook does not actually depend on or incur any dependency
|
||||
# of cudaPackages. It merely adds an impure, non-Nix PATH to the RPATHs of
|
||||
# executables that need to use cuda at runtime.
|
||||
cudaPackages_12.autoAddOpenGLRunpathHook
|
||||
|
||||
cmake
|
||||
git
|
||||
python3
|
||||
|
||||
jsoncpp-static
|
||||
jsoncpp-static.dev
|
||||
libevent-nossl-static
|
||||
libevent-nossl-static.dev
|
||||
plog.dev # header-only
|
||||
tclap_1_4 # header-only
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
plog.dev # header-only
|
||||
tclap_1_4 # header-only
|
||||
|
||||
catch2
|
||||
fmt_9
|
||||
jsoncpp-static
|
||||
libevent-nossl-static
|
||||
yaml-cpp
|
||||
];
|
||||
|
||||
# libcuda.so must be found at runtime because it is supplied by the NVIDIA
|
||||
# driver. autoAddOpenGLRunpathHook breaks on the statically linked exes.
|
||||
postFixup = ''
|
||||
find "$out/bin" "$out/lib" -type f -executable -print0 | while IFS= read -r -d "" f; do
|
||||
if isELF "$f" && [[ $(patchelf --print-needed "$f" || true) == *libcuda.so* ]]; then
|
||||
addOpenGLRunpath "$f"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = lib.concatMap (x: x.pkgSet) cudaPackageSetByVersion;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
"sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
|
||||
},
|
||||
"invidious": {
|
||||
"rev": "507bed6313b49564e53b69a5c9b4d072d1e05e4b",
|
||||
"rev": "545a5937d87d31622e87bb2ba8151f8aecd66c81",
|
||||
"sha256": "sha256-1Ra3nLO2DsnTvyovteF0cOIl07GHbJyPbTYBRIyKuAs=",
|
||||
"version": "unstable-2023-07-05"
|
||||
"version": "unstable-2023-06-06"
|
||||
},
|
||||
"lsquic": {
|
||||
"sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "idrac_exporter";
|
||||
version = "unstable-2023-06-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrlhansen";
|
||||
repo = "idrac_exporter";
|
||||
rev = "3b311e0e6d602fb0938267287f425f341fbf11da";
|
||||
sha256 = "sha256-N8wSjQE25TCXg/+JTsvQk3fjTBgfXTiSGHwZWFDmFKc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iNV4VrdQONq7LXwAc6AaUROHy8TmmloUAL8EmuPtF/o=";
|
||||
|
||||
patches = [ ./idrac-exporter/config-from-environment.patch ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = { inherit (nixosTests.prometheus-exporters) idrac; };
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Simple iDRAC exporter for Prometheus";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ codec ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
diff --git a/internal/config/config.go b/internal/config/config.go
|
||||
index ba8f066..1c801cd 100644
|
||||
--- a/internal/config/config.go
|
||||
+++ b/internal/config/config.go
|
||||
@@ -2,8 +2,11 @@ package config
|
||||
|
||||
import (
|
||||
"encoding/base64"
|
||||
+ "fmt"
|
||||
"os"
|
||||
+ "strconv"
|
||||
"sync"
|
||||
+
|
||||
"github.com/mrlhansen/idrac_exporter/internal/logging"
|
||||
"gopkg.in/yaml.v2"
|
||||
)
|
||||
@@ -17,9 +20,9 @@ type HostConfig struct {
|
||||
|
||||
type RootConfig struct {
|
||||
mutex sync.Mutex
|
||||
- Address string `yaml:"address"`
|
||||
- Port uint `yaml:"port"`
|
||||
- MetricsPrefix string `yaml:"metrics_prefix"`
|
||||
+ Address string `yaml:"address"`
|
||||
+ Port uint `yaml:"port"`
|
||||
+ MetricsPrefix string `yaml:"metrics_prefix"`
|
||||
Collect struct {
|
||||
System bool `yaml:"system"`
|
||||
Sensors bool `yaml:"sensors"`
|
||||
@@ -28,9 +31,29 @@ type RootConfig struct {
|
||||
Storage bool `yaml:"storage"`
|
||||
Memory bool `yaml:"memory"`
|
||||
} `yaml:"metrics"`
|
||||
- Timeout uint `yaml:"timeout"`
|
||||
- Retries uint `yaml:"retries"`
|
||||
- Hosts map[string]*HostConfig `yaml:"hosts"`
|
||||
+ Timeout uint `yaml:"timeout"`
|
||||
+ Retries uint `yaml:"retries"`
|
||||
+ Hosts map[string]*HostConfig `yaml:"hosts"`
|
||||
+}
|
||||
+
|
||||
+func getEnv(envvar string, defvalue string) string {
|
||||
+ value := os.Getenv(envvar)
|
||||
+ if len(value) == 0 {
|
||||
+ return defvalue
|
||||
+ }
|
||||
+ return value
|
||||
+}
|
||||
+
|
||||
+func getEnvUint(envvar string, defvalue uint) uint {
|
||||
+ value, err := strconv.Atoi(getEnv(envvar, fmt.Sprint(defvalue)))
|
||||
+ if err != nil {
|
||||
+ logging.Fatalf("Failed parse integer value: %s", err)
|
||||
+ }
|
||||
+ if value == 0 {
|
||||
+ return defvalue
|
||||
+ }
|
||||
+
|
||||
+ return uint(value)
|
||||
}
|
||||
|
||||
func (config *RootConfig) GetHostCfg(target string) *HostConfig {
|
||||
@@ -70,29 +93,29 @@ func ReadConfigFile(fileName string) {
|
||||
}
|
||||
|
||||
if Config.Address == "" {
|
||||
- Config.Address = "0.0.0.0"
|
||||
+ Config.Address = getEnv("IDRAC_EXPORTER_LISTEN_ADDRESS", "0.0.0.0")
|
||||
}
|
||||
|
||||
if Config.Port == 0 {
|
||||
- Config.Port = 9348
|
||||
+ Config.Port = getEnvUint("IDRAC_EXPORTER_LISTEN_PORT", 9348)
|
||||
}
|
||||
|
||||
if Config.Timeout == 0 {
|
||||
- Config.Timeout = 10
|
||||
+ Config.Timeout = getEnvUint("IDRAC_EXPORTER_TIMEOUT", 10)
|
||||
}
|
||||
|
||||
if Config.Retries == 0 {
|
||||
- Config.Retries = 1
|
||||
+ Config.Retries = getEnvUint("IDRAC_EXPORTER_RETRIES", 1)
|
||||
+ }
|
||||
+
|
||||
+ if Config.MetricsPrefix == "" {
|
||||
+ Config.MetricsPrefix = getEnv("IDRAC_EXPORTER_PREFIX", "idrac")
|
||||
}
|
||||
|
||||
if len(Config.Hosts) == 0 {
|
||||
parseError("missing section", "hosts")
|
||||
}
|
||||
|
||||
- if Config.MetricsPrefix == "" {
|
||||
- Config.MetricsPrefix = "idrac"
|
||||
- }
|
||||
-
|
||||
for k, v := range Config.Hosts {
|
||||
if v.Username == "" {
|
||||
parseError("missing username for host", k)
|
||||
@@ -11,17 +11,19 @@
|
||||
, mariadb-connector-c
|
||||
, re2
|
||||
, nlohmann_json
|
||||
, testers
|
||||
, manticoresearch
|
||||
}:
|
||||
|
||||
let
|
||||
columnar = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "columnar";
|
||||
version = "c18-s6"; # see NEED_COLUMNAR_API/NEED_SECONDARY_API in Manticore's GetColumnar.cmake
|
||||
version = "c21-s10"; # see NEED_COLUMNAR_API/NEED_SECONDARY_API in Manticore's cmake/GetColumnar.cmake
|
||||
src = fetchFromGitHub {
|
||||
owner = "manticoresoftware";
|
||||
repo = "columnar";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-/HGh1Wktb65oXKCjGxMl+8kNwEEfPzGT4UxGoGS4+8c=";
|
||||
hash = "sha256-TGFGFfoyHnPSr2U/9dpqFLUN3Dt2jDQrTF/xxDY4pdE=";
|
||||
};
|
||||
nativeBuildInputs = [ cmake ];
|
||||
cmakeFlags = [ "-DAPI_ONLY=ON" ];
|
||||
@@ -32,16 +34,33 @@ let
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
});
|
||||
uni-algo = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uni-algo";
|
||||
version = "0.7.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "manticoresoftware";
|
||||
repo = "uni-algo";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-+V9w4UJ+3KsyZUYht6OEzms60mBHd8FewVc7f21Z9ww=";
|
||||
};
|
||||
nativeBuildInputs = [ cmake ];
|
||||
meta = {
|
||||
description = "Unicode Algorithms Implementation for C/C++";
|
||||
homepage = "https://github.com/manticoresoftware/uni-algo";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "manticoresearch";
|
||||
version = "6.0.4";
|
||||
version = "6.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manticoresoftware";
|
||||
repo = "manticoresearch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-enSK3hlGUtrPVA/qF/AFiDJN8CbaTHCzYadBorZLE+c=";
|
||||
hash = "sha256-KmBIQa5C71Y/1oa3XiPfmb941QDU2rWo7Bl5QlAo+yA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -58,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libstemmer
|
||||
mariadb-connector-c
|
||||
nlohmann_json
|
||||
uni-algo
|
||||
re2
|
||||
];
|
||||
|
||||
@@ -66,7 +86,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# supply our own packages rather than letting manticore download dependencies during build
|
||||
sed -i 's/^with_get/with_menu/' CMakeLists.txt
|
||||
sed -i 's/include(GetNLJSON)/find_package(nlohmann_json)/' CMakeLists.txt
|
||||
sed -i 's/get_dep \( nlohmann_json .* \)/find_package(nlohmann_json)/' CMakeLists.txt
|
||||
sed -i 's/get_dep \( uni-algo .* \)/find_package(uni-algo)/' CMakeLists.txt
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
@@ -76,9 +97,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a"
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
inherit (finalAttrs) version;
|
||||
package = manticoresearch;
|
||||
command = "searchd --version";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Easy to use open source fast database for search";
|
||||
homepage = "https://manticoresearch.com";
|
||||
changelog = "https://github.com/manticoresoftware/manticoresearch/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.gpl2;
|
||||
mainProgram = "searchd";
|
||||
maintainers = [ lib.maintainers.jdelStrother ];
|
||||
|
||||
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchzip {
|
||||
url =
|
||||
"https://github.com/engelsystem/engelsystem/releases/download/v3.3.0/engelsystem-v3.3.0.zip";
|
||||
url = "https://github.com/engelsystem/engelsystem/releases/download/v${version}/engelsystem-v${version}.zip";
|
||||
hash = "sha256-DS0klm26udXsiiFToeOJooA1WUR8gk0qf/UJL8E77ps=";
|
||||
};
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clair";
|
||||
version = "4.6.1";
|
||||
version = "4.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quay";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Nd73GQJUYkFMyvMLAUgu/LQuDEW74s9+YKwqnftPoPM=";
|
||||
hash = "sha256-jnEnzIxI6S5AoUpfurOcf5N2Fo03QFNjxUzkn+i4h0Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-V9Y+dZv3RKiyzGJB1o4+M4QQeRpBkCtJOr2zyjTCKTY=";
|
||||
vendorHash = "sha256-6UdTqnbtX4X4qACXW8uybyiOVOGXVw5HBNUvC/l1xfo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tgpt";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aandrew-me";
|
||||
repo = "tgpt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g9gwLM7H7sPzR9Gpyun0Nc+Afe5phSFYrGBUOmyLG/I=";
|
||||
hash = "sha256-WJYSipaq3lL5NscfQQCxuX5maprn9Z3LSQ0Dkn9edKo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2I5JJWxM6aZx0eZu7taUTL11Y/5HIrXYC5aezrTbbsM=";
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, fltk }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xdiskusage";
|
||||
version = "1.60";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://xdiskusage.sourceforge.net/xdiskusage-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-e1NtxvG9xtm+x8KblDXCPZ0yv/ig6+4muZZrJz3J9n4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ fltk ];
|
||||
|
||||
meta = {
|
||||
description = "Program to show you what is using up all your disk space";
|
||||
homepage = "https://xdiskusage.sourceforge.net/";
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
maintainers = with lib.maintainers; [ fuzzdk ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
})
|
||||
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.djcbsoftware.nl/code/mu/";
|
||||
changelog = "https://github.com/djcb/mu/releases/tag/v${version}";
|
||||
maintainers = with maintainers; [ antono chvp peterhoeg ];
|
||||
mainProgram = "mu";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "picosnitch";
|
||||
version = "0.12.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b87654b4b92e28cf5418388ba1d3165b9fa9b17ba91af2a1a942f059128f68bc";
|
||||
sha256 = "b58255a78a0bf652224ee22ca83137d75ea77b7eb1ad2d11159b56b6788f6201";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
@@ -22,9 +22,12 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pandas
|
||||
plotly
|
||||
dash
|
||||
geoip2
|
||||
];
|
||||
|
||||
patches = [ ./picosnitch.patch ];
|
||||
postInstall = ''
|
||||
substituteInPlace $out/${python3.sitePackages}/picosnitch.py --replace '/run/picosnitch.pid' '/run/picosnitch/picosnitch.pid'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "picosnitch" ];
|
||||
|
||||
|
||||
@@ -1,111 +0,0 @@
|
||||
diff --git a/picosnitch.py b/picosnitch.py
|
||||
index a3dbb07..2b74f3e 100755
|
||||
--- a/picosnitch.py
|
||||
+++ b/picosnitch.py
|
||||
@@ -1356,7 +1356,7 @@ def ui_loop(stdscr: curses.window, splash: str, con: sqlite3.Connection) -> int:
|
||||
update_query = False
|
||||
if execute_query:
|
||||
try:
|
||||
- with open("/run/picosnitch.pid", "r") as f:
|
||||
+ with open("/run/picosnitch/picosnitch.pid", "r") as f:
|
||||
run_status = "pid: " + f.read().strip()
|
||||
except Exception:
|
||||
run_status = "not running"
|
||||
@@ -1603,7 +1603,7 @@ def ui_dash():
|
||||
return cmdline
|
||||
def serve_layout():
|
||||
try:
|
||||
- with open("/run/picosnitch.pid", "r") as f:
|
||||
+ with open("/run/picosnitch/picosnitch.pid", "r") as f:
|
||||
run_status = "pid: " + f.read().strip()
|
||||
except Exception:
|
||||
run_status = "not running"
|
||||
@@ -1771,7 +1771,7 @@ def main():
|
||||
# master copy of the snitch dictionary, all subprocesses only receive a static copy of it from this point in time
|
||||
snitch = read_snitch()
|
||||
# start picosnitch process monitor
|
||||
- with open("/run/picosnitch.pid", "r") as f:
|
||||
+ with open("/run/picosnitch/picosnitch.pid", "r") as f:
|
||||
assert int(f.read().strip()) == os.getpid()
|
||||
if __name__ == "__main__" or sys.argv[1] == "start-no-daemon":
|
||||
sys.exit(main_process(snitch))
|
||||
@@ -1818,7 +1818,7 @@ def start_picosnitch():
|
||||
RestartSec=5
|
||||
Environment="SUDO_UID={os.getenv("SUDO_UID")}" "SUDO_USER={os.getenv("SUDO_USER")}" "DBUS_SESSION_BUS_ADDRESS={os.getenv("DBUS_SESSION_BUS_ADDRESS")}" "PYTHON_USER_SITE={site.USER_SITE}"
|
||||
ExecStart={sys.executable} "{os.path.abspath(__file__)}" start-no-daemon
|
||||
- PIDFile=/run/picosnitch.pid
|
||||
+ PIDFile=/run/picosnitch/picosnitch.pid
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -1832,12 +1832,12 @@ def start_picosnitch():
|
||||
subprocess.Popen(["bash", "-c", f'let i=0; rm {BASE_PATH}/dash; while [[ ! -f {BASE_PATH}/dash || "$i" -gt 30 ]]; do let i++; sleep 1; done; rm {BASE_PATH}/dash && /usr/bin/env python3 -m webbrowser -t http://{os.getenv("HOST", "localhost")}:{os.getenv("PORT", "5100")}'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||||
if os.getuid() != 0:
|
||||
args = ["sudo", "-E", sys.executable, os.path.abspath(__file__), sys.argv[1]]
|
||||
- os.execvp("sudo", args)
|
||||
+ assert sys.argv[1] not in ["start", "stop", "restart", "start-no-daemon"], "picosnitch requires root privileges to run"
|
||||
with open("/proc/self/status", "r") as f:
|
||||
proc_status = f.read()
|
||||
capeff = int(proc_status[proc_status.find("CapEff:")+8:].splitlines()[0].strip(), base=16)
|
||||
cap_sys_admin = 2**21
|
||||
- assert capeff & cap_sys_admin, "Missing capability CAP_SYS_ADMIN"
|
||||
+ assert sys.argv[1] not in ["start", "stop", "restart", "start-no-daemon"] or (capeff & cap_sys_admin), "Missing capability CAP_SYS_ADMIN"
|
||||
assert importlib.util.find_spec("bcc"), "Requires BCC https://github.com/iovisor/bcc/blob/master/INSTALL.md"
|
||||
tmp_snitch = read_snitch()
|
||||
con = sqlite3.connect(os.path.join(BASE_PATH, "snitch.db"))
|
||||
@@ -1883,8 +1883,8 @@ def start_picosnitch():
|
||||
except Exception as e:
|
||||
print("Warning: %s%s on line %s" % (type(e).__name__, str(e.args), sys.exc_info()[2].tb_lineno), file=sys.stderr)
|
||||
if sys.argv[1] in ["start", "stop", "restart"]:
|
||||
- if os.path.exists("/usr/lib/systemd/system/picosnitch.service"):
|
||||
- print("Found /usr/lib/systemd/system/picosnitch.service but you are not using systemctl")
|
||||
+ if os.path.exists("/usr/lib/systemd/system/picosnitch.service") or os.path.exists("/etc/systemd/system/picosnitch.service"):
|
||||
+ print("Found picosnitch.service but you are not using systemctl")
|
||||
if sys.stdin.isatty():
|
||||
confirm = input(f"Did you intend to run `systemctl {sys.argv[1]} picosnitch` (y/N)? ")
|
||||
if confirm.lower().startswith("y"):
|
||||
@@ -1893,15 +1893,15 @@ def start_picosnitch():
|
||||
class PicoDaemon(Daemon):
|
||||
def run(self):
|
||||
main()
|
||||
- daemon = PicoDaemon("/run/picosnitch.pid")
|
||||
+ daemon = PicoDaemon("/run/picosnitch/picosnitch.pid")
|
||||
if sys.argv[1] == "start":
|
||||
- print("starting picosnitch daemon")
|
||||
+ print("starting picosnitch daemon, WARNING: built in daemon mode is not supported on Nix, use picosnitch start-no-daemon or systemctl instead")
|
||||
daemon.start()
|
||||
elif sys.argv[1] == "stop":
|
||||
- print("stopping picosnitch daemon")
|
||||
+ print("stopping picosnitch daemon, WARNING: built in daemon mode is not supported on Nix, use picosnitch start-no-daemon or systemctl instead")
|
||||
daemon.stop()
|
||||
elif sys.argv[1] == "restart":
|
||||
- print("restarting picosnitch daemon")
|
||||
+ print("restarting picosnitch daemon, WARNING: built in daemon mode is not supported on Nix, use picosnitch start-no-daemon or systemctl instead")
|
||||
daemon.restart()
|
||||
elif sys.argv[1] == "status":
|
||||
daemon.status()
|
||||
@@ -1912,11 +1912,12 @@ def start_picosnitch():
|
||||
print("Wrote /usr/lib/systemd/system/picosnitch.service\nYou can now run picosnitch using systemctl")
|
||||
return 0
|
||||
elif sys.argv[1] == "start-no-daemon":
|
||||
- assert not os.path.exists("/run/picosnitch.pid")
|
||||
+ assert not os.path.exists("/run/picosnitch/picosnitch.pid")
|
||||
def delpid():
|
||||
- os.remove("/run/picosnitch.pid")
|
||||
+ os.remove("/run/picosnitch/picosnitch.pid")
|
||||
atexit.register(delpid)
|
||||
- with open("/run/picosnitch.pid", "w") as f:
|
||||
+ os.makedirs("/run/picosnitch", exist_ok=True)
|
||||
+ with open("/run/picosnitch/picosnitch.pid", "w") as f:
|
||||
f.write(str(os.getpid()) + "\n")
|
||||
print("starting picosnitch in simple mode")
|
||||
print(f"using config and log files from: {BASE_PATH}")
|
||||
@@ -1927,7 +1928,7 @@ def start_picosnitch():
|
||||
assert dash.__version__ and pandas.__version__ and plotly.__version__
|
||||
print(f"serving web gui on http://{os.getenv('HOST', 'localhost')}:{os.getenv('PORT', '5100')}")
|
||||
args = ["bash", "-c", f"sudo -i -u {os.getenv('SUDO_USER')} touch {BASE_PATH}/dash; nohup {sys.executable} \"{os.path.abspath(__file__)}\" start-dash > /dev/null 2>&1 &"]
|
||||
- os.execvp("bash", args)
|
||||
+ return ui_dash()
|
||||
elif sys.argv[1] == "start-dash":
|
||||
return ui_dash()
|
||||
elif sys.argv[1] == "view":
|
||||
@@ -1,10 +1,10 @@
|
||||
{ pkgs, lib, fetchurl, fetchpatch, perl, perlPackages, rsync, which, installShellFiles, ... }:
|
||||
{ pkgs, lib, fetchurl, fetchpatch, perlPackages, rsync, which, installShellFiles, ... }:
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "Rex";
|
||||
version = "1.14.0";
|
||||
version = "1.14.3";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/F/FE/FERKI/Rex-${version}.tar.gz";
|
||||
hash = "sha256-RHxJbkaEjKF9lkl6JYFp2pvcKQurRGUU7FfM/m5lSz8=";
|
||||
hash = "sha256-An0wQu+UC2dZDlmJ6W8irh5nunRIlcXdPbVpwFE3Alw=";
|
||||
};
|
||||
|
||||
buildInputs = with perlPackages; [
|
||||
|
||||
@@ -17139,6 +17139,8 @@ with pkgs;
|
||||
|
||||
devspace = callPackage ../development/tools/misc/devspace { };
|
||||
|
||||
leptosfmt = callPackage ../development/tools/rust/leptosfmt { };
|
||||
|
||||
maturin = callPackage ../development/tools/rust/maturin {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
@@ -25445,6 +25447,8 @@ with pkgs;
|
||||
|
||||
xdo = callPackage ../tools/misc/xdo { };
|
||||
|
||||
xdiskusage = callPackage ../tools/misc/xdiskusage { };
|
||||
|
||||
xed = callPackage ../development/libraries/xed { };
|
||||
|
||||
xedit = callPackage ../applications/editors/xedit { };
|
||||
@@ -26931,6 +26935,7 @@ with pkgs;
|
||||
prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { };
|
||||
prometheus-graphite-exporter = callPackage ../servers/monitoring/prometheus/graphite-exporter.nix { };
|
||||
prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
|
||||
prometheus-idrac-exporter = callPackage ../servers/monitoring/prometheus/idrac-exporter.nix { };
|
||||
prometheus-influxdb-exporter = callPackage ../servers/monitoring/prometheus/influxdb-exporter.nix { };
|
||||
prometheus-ipmi-exporter = callPackage ../servers/monitoring/prometheus/ipmi-exporter.nix { };
|
||||
prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { };
|
||||
|
||||
@@ -12468,6 +12468,8 @@ self: super: with self; {
|
||||
|
||||
tensorrt = callPackage ../development/python-modules/tensorrt { };
|
||||
|
||||
tensorstore = callPackage ../development/python-modules/tensorstore { };
|
||||
|
||||
tellduslive = callPackage ../development/python-modules/tellduslive { };
|
||||
|
||||
termcolor = callPackage ../development/python-modules/termcolor { };
|
||||
|
||||
Reference in New Issue
Block a user