Merge staging-next into staging
This commit is contained in:
commit
43a9895405
49 changed files with 250 additions and 198 deletions
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ton";
|
||||
version = "2024.01";
|
||||
version = "2024.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ton-blockchain";
|
||||
repo = "ton";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nZ7yel+lTNO5zFzN711tLwAvqpf5qaYOxERwApnMVOs=";
|
||||
hash = "sha256-ZYW1/7jebgPu0IvBkopUjaXZZLymJ4yYp8Di0vI2WUg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -18,13 +18,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpxsee";
|
||||
version = "13.16";
|
||||
version = "13.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-rw+I7Re1hqZ1k1flIAr7kW8Wst7pVdmFcqtQTg6L/9Y=";
|
||||
hash = "sha256-pk6PMQDPvyfUS5PMRu6pz/QrRrOfbq9oGsMk0ZDawDM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -7,18 +7,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wttrbar";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjesus";
|
||||
repo = "wttrbar";
|
||||
rev = version;
|
||||
hash = "sha256-XgBPZl5msKICIrUJZz2gj/hZjVAv0HpVKa69/KiLwnI=";
|
||||
hash = "sha256-8ahXRKpVbGFX+SrR8bjUw5POzpCqmlunM5CiRzDE/IM=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]);
|
||||
|
||||
cargoHash = "sha256-JGJJ94rzHTQNR6rzFPWnFHH3t0fL1tvMeEN5NMzRtHM=";
|
||||
cargoHash = "sha256-SsZRD6FmeB5Hz6Hs+I+5SBGazm8/mntK3Eb2FNw27Bg=";
|
||||
|
||||
meta = {
|
||||
description = "A simple but detailed weather indicator for Waybar using wttr.in";
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.11.21";
|
||||
version = "3.11.22";
|
||||
pyproject = true;
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
|
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KSOuNH+y7+mCK8XfGxiyn+C1H6g9a/ej96k8KG/EE9k=";
|
||||
hash = "sha256-csy3v1A8tejdChw6umslOPMCJHk5MBLuJdxbpzJBphQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
}:
|
||||
let
|
||||
pname = "beeper";
|
||||
version = "3.98.16";
|
||||
version = "3.99.22";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.98.16-build-240228llcputn9l-x86_64.AppImage";
|
||||
hash = "sha256-CjtlE/owx7emzGDdOAw6pSlAuNbUspm1YP+kxm6Jrt8=";
|
||||
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.99.22-build-240307lufv3wsra-x86_64.AppImage";
|
||||
hash = "sha256-T3MABc11rWRjCU+4fvbpYDVq4XjSVfEeBrS03ITw8x8=";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
|
|
|
@ -5,18 +5,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "storj-uplink";
|
||||
version = "1.99.1";
|
||||
version = "1.99.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storj";
|
||||
repo = "storj";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UzuKy3pwl+chwYUWtcUEJIrU8wpSg3o2mVryc3qA9EM=";
|
||||
hash = "sha256-SzldiGwcpR+UEQ3imJfu3FlYqGq4evsYtjVLybdjGqc=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/uplink" ];
|
||||
|
||||
vendorHash = "sha256-RaZ+yEkzsu/V3734joWtVA2m2vCOW+CnjF5s0mwDI/0=";
|
||||
vendorHash = "sha256-mPJVb2/iGbRWDDcfIey3uW/5g2TIIemHR8d/3osMeGA=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "convco";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "convco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x01fkicoAH8NaJJqIF5jjbZ53TitnXBCdKEbr8xVCyE=";
|
||||
hash = "sha256-b05RO6x5hnxG6gepRTK4CDlnLqMdp8hl4KL+InzBH70=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-j2xuaAkycWp5sCAmVJLYfqH1ZGxIGU/a/97WpGyQcvU=";
|
||||
cargoHash = "sha256-pdnH/9Tda6PXf70W76mg5vVE2rzOI+M61UR+HMtgXC0=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "git-releaser";
|
||||
version = "0.1.3";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-releaser";
|
||||
repo = "git-releaser";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-27xUsqFuAu02jYLi3LiTnVjifqZIr39lPwMfJea7a4A=";
|
||||
hash = "sha256-nKmHTqnpWoWMyXxsD/+pk+uSeqZSG18h2T6sJ/wEr/w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uKS7MwCak/CjnMjzFKqYypBVZFl+3hD1xVaOPvQV9E0=";
|
||||
vendorHash = "sha256-RROA+nvdZnGfkUuB+ksUWGG16E8tqdyMQss2z/XWGd8=";
|
||||
|
||||
ldflags = [ "-X main.version=${version}" ];
|
||||
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "littlefs-fuse";
|
||||
version = "2.7.5";
|
||||
version = "2.7.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "littlefs-project";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sSnk1iQV5aHcOPqVKbigWqojrZKlJK5CcrVlwilT2mE=";
|
||||
hash = "sha256-iN6Ny1H7CyBzBRJyYKbXuzkap7+u+6tVkXo7Vnp1WV8=";
|
||||
};
|
||||
buildInputs = [ fuse ];
|
||||
installPhase = ''
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "yamlscript";
|
||||
version = "0.1.39";
|
||||
version = "0.1.40";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
|
||||
hash = "sha256-P64Ekkn8yIuct+dl4dVYDRhMmKFieIa75r0rJbTvfhg=";
|
||||
hash = "sha256-tPnEfYI3l8PKDeWnb9i0ov/XydjlJXMN7h7DJO7acKA=";
|
||||
};
|
||||
|
||||
executable = "ys";
|
||||
|
|
|
@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b";
|
||||
};
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
# Suppress error "call to undeclared library function 'strcasecmp'" during compilation.
|
||||
# The function is found by the linker correctly, so this doesn't introduce any issues.
|
||||
NIX_CFLAGS_COMPILE = " -Wno-implicit-function-declaration";
|
||||
};
|
||||
|
||||
makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
|
||||
|
||||
meta = with lib; {
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svdtools";
|
||||
version = "0.3.10";
|
||||
version = "0.3.11";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
hash = "sha256-VEGLUc8ThhD/R+K2IFGvE800euz8oF0kuekGO627rvU=";
|
||||
hash = "sha256-LmpYsG/2oEdbAK2ePI+LYbGrVN+wC9gQS6GXNcF8XFg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-T0yTGCDgRQUySUHNkoB4kqoKS/0kJWDi04ysPGO79HY=";
|
||||
cargoHash = "sha256-qsCa+YWE9dghG8T53TSDikWh+JhQt9v7A1Gn+/t5YZs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools to handle vendor-supplied, often buggy SVD files";
|
||||
|
|
|
@ -22,13 +22,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zeroc-ice";
|
||||
version = "3.7.7";
|
||||
version = "3.7.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeroc-ice";
|
||||
repo = "ice";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h455isEmnRyoasXhh1UaA5PICcEEM8/C3IJf5yHRl5g=";
|
||||
hash = "sha256-l3cKsR8HSdtFGw1S12xueQOu/U9ABlOxQQtbHBj2izs=";
|
||||
};
|
||||
|
||||
buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl libxcrypt ];
|
||||
|
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "anywidget";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-S6nB3Df17sD1Zrsp+1Di66FNeaVmE1rqt8hogjI/3I4=";
|
||||
hash = "sha256-Coae8oretZHhb1c9i5x0Sm1nVruN89kRZSEMyeLibbg=";
|
||||
};
|
||||
|
||||
# We do not need the jupyterlab build dependency, because we do not need to
|
||||
|
|
|
@ -7,23 +7,34 @@
|
|||
, orjson
|
||||
, packaging
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, xmltodict
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "axis";
|
||||
version = "50";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kane610";
|
||||
repo = pname;
|
||||
repo = "axis";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Zu8hT6t7ZxlgXQKb2o20FpB15n9y/+n1qMctzcRP8F8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools==68.0.0" "setuptools" \
|
||||
--replace-fail "wheel==0.40.0" "wheel"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
attrs
|
||||
|
|
|
@ -5,24 +5,34 @@
|
|||
, dbus-next
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bless";
|
||||
version = "0.2.5";
|
||||
format = "setuptools";
|
||||
version = "0.2.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevincar";
|
||||
repo = pname;
|
||||
repo = "bless";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+rnMLqNfhIJASCKkIfOKpVil3S/d8BcMxnLHmdOcRIY=";
|
||||
hash = "sha256-dAdA+d75iE6v6t4mfgvwhRsIARLW+IqCGmaMABaDlZg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/pysetupdi/d" setup.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bleak
|
||||
dbus-next
|
||||
|
@ -31,6 +41,7 @@ buildPythonPackage rec {
|
|||
nativeCheckInputs = [
|
||||
aioconsole
|
||||
numpy
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
|
@ -150,6 +150,8 @@ buildPythonPackage rec {
|
|||
"chromadb/test/stress/"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "The AI-native open-source embedding database";
|
||||
homepage = "https://github.com/chroma-core/chroma";
|
||||
|
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.41.0";
|
||||
version = "2.43.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5DUFaQqzIvN/8Vo7MJNBrsMaB4HANO7Eb2nuzx3nDJc=";
|
||||
hash = "sha256-RfGhQv1wr5fMMHleMamwSKQ2opv3nppGSvUe4UdFiT0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,22 +8,24 @@
|
|||
, wheel
|
||||
, aiohttp
|
||||
, diskcache
|
||||
, fastapi
|
||||
, gptcache
|
||||
, msal
|
||||
, nest-asyncio
|
||||
, numpy
|
||||
, openai
|
||||
, ordered-set
|
||||
, platformdirs
|
||||
, protobuf
|
||||
, pyformlang
|
||||
, requests
|
||||
, tiktoken
|
||||
, torch
|
||||
, uvicorn
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "guidance";
|
||||
version = "0.1.6";
|
||||
version = "0.1.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -32,28 +34,33 @@ buildPythonPackage rec {
|
|||
owner = "guidance-ai";
|
||||
repo = "guidance";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Z3EuHAQPPXf/i0HnbDhGv5KBUBP0aZDHTwpff7g2E3g=";
|
||||
hash = "sha256-dvIJeSur3DdNBhrEPNPghxqmDEEig59Iz83LWksim6U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pybind11
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
diskcache
|
||||
fastapi
|
||||
gptcache
|
||||
msal
|
||||
nest-asyncio
|
||||
numpy
|
||||
openai
|
||||
ordered-set
|
||||
platformdirs
|
||||
protobuf
|
||||
pyformlang
|
||||
requests
|
||||
tiktoken
|
||||
uvicorn
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
@ -86,6 +93,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "guidance" ];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A guidance language for controlling large language models";
|
||||
homepage = "https://github.com/guidance-ai/guidance";
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "minio";
|
||||
version = "7.2.4";
|
||||
version = "7.2.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "minio";
|
||||
repo = "minio-py";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-26naoSccz/LEf56iQIePrNKllq6XkEQD9Peld7VeGqY=";
|
||||
hash = "sha256-Xb6XaGI/bwkhp6YKgoqi5Tbs74pSXc6aJpWVUgG5uR4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -14,30 +14,32 @@
|
|||
let
|
||||
self = buildPythonPackage rec {
|
||||
pname = "opentelemetry-api";
|
||||
version = "1.22.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "1.23.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
# to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6BmBmooVaH1FOpgXpFlYth0r9XaNtmb9UezeP8hWEok=";
|
||||
hash = "sha256-Ge/DjVG7ajoS0nJLZxtfn4Mmx0SffAE/91dViA5qWAA=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/opentelemetry-api";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
deprecated
|
||||
importlib-metadata
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
@ -2,10 +2,8 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, hatchling
|
||||
, backoff
|
||||
, opentelemetry-api
|
||||
, opentelemetry-proto
|
||||
, opentelemetry-sdk
|
||||
, opentelemetry-test-utils
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
@ -13,19 +11,17 @@
|
|||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-exporter-otlp-proto-common";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-common";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
backoff
|
||||
opentelemetry-sdk
|
||||
dependencies = [
|
||||
opentelemetry-proto
|
||||
];
|
||||
|
||||
|
|
|
@ -1,35 +1,37 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, backoff
|
||||
, deprecated
|
||||
, googleapis-common-protos
|
||||
, grpcio
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-test-utils
|
||||
, opentelemetry-exporter-otlp-proto-common
|
||||
, pytest-grpc
|
||||
, opentelemetry-proto
|
||||
, opentelemetry-test-utils
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-exporter-otlp-proto-grpc";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-grpc";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
backoff
|
||||
dependencies = [
|
||||
deprecated
|
||||
googleapis-common-protos
|
||||
grpcio
|
||||
opentelemetry-api
|
||||
opentelemetry-exporter-otlp-proto-common
|
||||
opentelemetry-proto
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
@ -43,6 +45,8 @@ buildPythonPackage {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = opentelemetry-api.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-grpc";
|
||||
description = "OpenTelemetry Collector Protobuf over gRPC Exporter";
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, backoff
|
||||
, deprecated
|
||||
, googleapis-common-protos
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-exporter-otlp-proto-common
|
||||
, opentelemetry-proto
|
||||
, opentelemetry-sdk
|
||||
, opentelemetry-test-utils
|
||||
, requests
|
||||
, responses
|
||||
|
@ -15,20 +17,23 @@
|
|||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-exporter-otlp-proto-http";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-http";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
backoff
|
||||
dependencies = [
|
||||
deprecated
|
||||
googleapis-common-protos
|
||||
opentelemetry-api
|
||||
opentelemetry-exporter-otlp-proto-common
|
||||
opentelemetry-proto
|
||||
opentelemetry-sdk
|
||||
requests
|
||||
];
|
||||
|
||||
|
|
|
@ -1,33 +1,34 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, backoff
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-exporter-otlp-proto-grpc
|
||||
, opentelemetry-exporter-otlp-proto-http
|
||||
, opentelemetry-test-utils
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-exporter-otlp";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
opentelemetry-exporter-otlp-proto-grpc
|
||||
opentelemetry-exporter-otlp-proto-http
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
opentelemetry-test-utils
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
|
@ -10,19 +10,20 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
inherit (opentelemetry-api) src;
|
||||
pname = "opentelemetry-exporter-prometheus";
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "0.44b0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-prometheus";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
opentelemetry-api
|
||||
opentelemetry-sdk
|
||||
prometheus-client
|
||||
|
|
|
@ -15,23 +15,23 @@
|
|||
buildPythonPackage {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-aiohttp-client";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-aiohttp-client";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
opentelemetry-api
|
||||
opentelemetry-instrumentation
|
||||
opentelemetry-semantic-conventions
|
||||
opentelemetry-util-http
|
||||
wrapt
|
||||
aiohttp
|
||||
];
|
||||
|
||||
# missing https://github.com/ezequielramos/http-server-mock
|
||||
|
|
|
@ -14,17 +14,17 @@
|
|||
buildPythonPackage {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-asgi";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-asgi";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
asgiref
|
||||
opentelemetry-instrumentation
|
||||
opentelemetry-api
|
||||
|
|
|
@ -13,33 +13,36 @@
|
|||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-django";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-django";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
django
|
||||
opentelemetry-api
|
||||
opentelemetry-instrumentation
|
||||
opentelemetry-instrumentation-asgi
|
||||
opentelemetry-instrumentation-wsgi
|
||||
opentelemetry-semantic-conventions
|
||||
opentelemetry-util-http
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
asgi = [ opentelemetry-instrumentation-asgi ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
opentelemetry-test-utils
|
||||
pytestCheckHook
|
||||
];
|
||||
] ++ passthru.optional-dependencies.asgi;
|
||||
|
||||
pythonImportsCheck = [ "opentelemetry.instrumentation.django" ];
|
||||
|
||||
|
|
|
@ -19,15 +19,15 @@ buildPythonPackage {
|
|||
pname = "opentelemetry-instrumentation-fastapi";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-fastapi";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
fastapi
|
||||
opentelemetry-api
|
||||
opentelemetry-instrumentation
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
, opentelemetry-semantic-conventions
|
||||
, opentelemetry-test-utils
|
||||
, opentelemetry-util-http
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
@ -14,21 +15,22 @@
|
|||
buildPythonPackage {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-flask";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-flask";
|
||||
|
||||
format = "pyproject";
|
||||
build-system = [ hatchling ];
|
||||
|
||||
nativeBuildInputs = [ hatchling ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
flask
|
||||
opentelemetry-api
|
||||
opentelemetry-instrumentation
|
||||
opentelemetry-instrumentation-wsgi
|
||||
opentelemetry-semantic-conventions
|
||||
opentelemetry-util-http
|
||||
packaging
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, hatchling
|
||||
|
@ -15,17 +16,17 @@
|
|||
buildPythonPackage {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-grpc";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-grpc";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
opentelemetry-api
|
||||
opentelemetry-instrumentation
|
||||
opentelemetry-sdk
|
||||
|
@ -43,8 +44,15 @@ buildPythonPackage {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
# RuntimeError: Failed to bind to address
|
||||
"TestOpenTelemetryServerInterceptorUnix"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "opentelemetry.instrumentation.grpc" ];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = opentelemetry-instrumentation.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc";
|
||||
description = "OpenTelemetry Instrumentation for grpc";
|
||||
|
|
|
@ -13,17 +13,17 @@
|
|||
buildPythonPackage {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-wsgi";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-wsgi";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
opentelemetry-instrumentation
|
||||
opentelemetry-api
|
||||
opentelemetry-semantic-conventions
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-sdk
|
||||
, opentelemetry-test-utils
|
||||
, setuptools
|
||||
, wrapt
|
||||
|
@ -13,28 +12,27 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "opentelemetry-instrumentation";
|
||||
version = "0.43b0";
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "0.44b0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
# to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python-contrib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fUyA3cPXAxO506usEWxOUX9xiapc8Ocnbx73LP6ghRE=";
|
||||
hash = "sha256-r+k/YdK7YqYme8nKoy3ig3krvZjxYRKgLBkcdEtFy3k=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/opentelemetry-instrumentation";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
opentelemetry-api
|
||||
opentelemetry-sdk
|
||||
setuptools
|
||||
wrapt
|
||||
];
|
||||
|
|
|
@ -10,17 +10,17 @@
|
|||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-proto";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-proto";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
protobuf
|
||||
];
|
||||
|
||||
|
|
|
@ -15,20 +15,19 @@ let
|
|||
self = buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-sdk";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-sdk";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
opentelemetry-api
|
||||
opentelemetry-semantic-conventions
|
||||
setuptools
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
|
|
|
@ -7,15 +7,16 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
inherit (opentelemetry-api) src;
|
||||
pname = "opentelemetry-semantic-conventions";
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "0.44b0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-semantic-conventions";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, callPackage
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, asgiref
|
||||
|
@ -9,19 +8,20 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
inherit (opentelemetry-api) src;
|
||||
pname = "opentelemetry-test-utils";
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "0.44b0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-api.src.name}/tests/opentelemetry-test-utils";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
asgiref
|
||||
opentelemetry-api
|
||||
opentelemetry-sdk
|
||||
|
|
|
@ -3,8 +3,6 @@
|
|||
, pythonOlder
|
||||
, hatchling
|
||||
, opentelemetry-instrumentation
|
||||
, opentelemetry-sdk
|
||||
, opentelemetry-semantic-conventions
|
||||
, opentelemetry-test-utils
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
@ -12,23 +10,18 @@
|
|||
buildPythonPackage {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-util-http";
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-instrumentation.src.name}/util/opentelemetry-util-http";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
opentelemetry-instrumentation
|
||||
opentelemetry-sdk
|
||||
opentelemetry-semantic-conventions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
opentelemetry-instrumentation
|
||||
opentelemetry-test-utils
|
||||
pytestCheckHook
|
||||
];
|
||||
|
@ -41,6 +34,8 @@ buildPythonPackage {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.util.http" ];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = opentelemetry-instrumentation.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/util/opentelemetry-util-http";
|
||||
description = "Web util for OpenTelemetry";
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-task";
|
||||
version = "3.35.0";
|
||||
version = "3.35.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "task";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jjhWo/rQeGcZvvpYisCujFuExJrFiJqIiDytRo8lH1k=";
|
||||
hash = "sha256-HFjoLzGF62noA9NQk1Delq6vOcuTZzsyq6kH6QtR7zI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HhnherRx5YQn4ArcavVZutze9usYP+PRI07lEXyw8a0=";
|
||||
|
|
|
@ -8,8 +8,8 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "21.7.0";
|
||||
sha256 = "sha256-5B7v4eWWJO5/MSw4+PffwRWVZBrLIpPSEXbwPSdj6dQ=";
|
||||
version = "21.7.1";
|
||||
sha256 = "sha256-EnK24SnVZNveF1J7hEIQuXHCCnCucpJoGGt8udmQpks=";
|
||||
patches = [
|
||||
./disable-darwin-v8-system-instrumentation-node19.patch
|
||||
./bypass-darwin-xcrun-node16.patch
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "agkozak-zsh-prompt";
|
||||
version = "3.11.2";
|
||||
version = "3.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "agkozak";
|
||||
repo = "agkozak-zsh-prompt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QDUI9EYflITttkX9Khij62ybBMYJwPfayqj+wr495mM=";
|
||||
sha256 = "sha256-YBqFA/DK2K1effniwjPSe5VMx9tZGbmxyJp92TiingU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "chamber";
|
||||
version = "2.14.0";
|
||||
version = "2.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "segmentio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vyVdEMs+vtZkN0UuXGmCPNB4hsfjiiG6LeWYFW3gLiw=";
|
||||
sha256 = "sha256-Vbz8rpNy6+iIr/WyegALSo4gRoDL2P1x/6lHg6Kvm/w=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
vendorHash = "sha256-pxWsx/DURVOXGC2izKS91BhbHc220+/6t15eT4Jl128=";
|
||||
vendorHash = "sha256-ZRKs/5JtsTjWL62RuQRwroA6TvTpJqkf6pOecvO3134=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];
|
||||
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grpc_cli";
|
||||
version = "1.62.0";
|
||||
version = "1.62.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iqoxgo/oocO9gBq0o5bmZvre/EwRguMrWnmwvyLGLr8=";
|
||||
hash = "sha256-L0bn6Bg36UKIRxznH9o4T7WXUqMwFjr8ybeQfbUi8xM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [ automake cmake autoconf ];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.58"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.59"
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 08ebefe2368f73ceeac2c5f9c20a49a82d6a969e
|
||||
ref: refs/tags/6.3.58
|
||||
revision: b6a03cb5f17b5c714fad8741c1812be542dd2087
|
||||
ref: refs/tags/6.3.59
|
||||
specs:
|
||||
metasploit-framework (6.3.58)
|
||||
metasploit-framework (6.3.59)
|
||||
actionpack (~> 7.0.0)
|
||||
activerecord (~> 7.0.0)
|
||||
activesupport (~> 7.0.0)
|
||||
|
@ -469,4 +469,4 @@ DEPENDENCIES
|
|||
metasploit-framework!
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.13
|
||||
2.5.6
|
||||
|
|
|
@ -15,13 +15,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.3.58";
|
||||
version = "6.3.59";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NUm+6vWmSpGpy4KGXQ/pQDqeU3ORhQrQwwicFCMyjhg=";
|
||||
hash = "sha256-pGYEx5Ac4vEW5rsKI4iAMGXB2zHMS2AD6jIVEWHQn6g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -674,12 +674,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "08ebefe2368f73ceeac2c5f9c20a49a82d6a969e";
|
||||
sha256 = "064f68ii9708qg80m1cifd9rwfj0x47mv1l2rflr2jm6ypmbwj9m";
|
||||
rev = "b6a03cb5f17b5c714fad8741c1812be542dd2087";
|
||||
sha256 = "1a4zs1hi259jx81n0jyc67dw2r9hh24262mvwqbg3qhwj33h8rm4";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.3.58";
|
||||
version = "6.3.59";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
|
@ -15222,8 +15222,6 @@ with pkgs;
|
|||
|
||||
zsv = callPackage ../development/tools/zsv { };
|
||||
|
||||
zsync = callPackage ../tools/compression/zsync { };
|
||||
|
||||
zxing = callPackage ../tools/graphics/zxing { };
|
||||
|
||||
zkar = callPackage ../tools/security/zkar { };
|
||||
|
@ -36525,7 +36523,7 @@ with pkgs;
|
|||
|
||||
zerobin = callPackage ../applications/networking/zerobin { };
|
||||
|
||||
zeroc-ice = disable-warnings-if-gcc13 (callPackage ../development/libraries/zeroc-ice { });
|
||||
zeroc-ice = callPackage ../development/libraries/zeroc-ice { };
|
||||
|
||||
zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; };
|
||||
|
||||
|
|
Loading…
Reference in a new issue