Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-07-09 12:01:54 +00:00 committed by GitHub
commit 449ceff4fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 298 additions and 143 deletions

View File

@ -85,6 +85,12 @@
githubId = 56617252;
matrix = "@oxc45:matrix.org";
};
_0xd61 = {
email = "dgl@degit.co";
name = "Daniel Glinka";
github = "0xd61";
githubId = 8351869;
};
_1000101 = {
email = "b1000101@pm.me";
github = "1000101";

View File

@ -55,14 +55,18 @@ with lib;
type = types.listOf types.str;
default = builtins.map (l: l + "/UTF-8")
(unique (
[ config.i18n.defaultLocale ] ++
(attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings))
[
"C.UTF-8"
config.i18n.defaultLocale
] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings))
));
defaultText = literalExpression ''
builtins.map (l: l + "/UTF-8")
(unique (
[ config.i18n.defaultLocale ] ++
(attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings))
[
"C.UTF-8"
config.i18n.defaultLocale
] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings))
))
'';
example = ["en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" "nl_NL/ISO-8859-1"];

View File

@ -9,16 +9,16 @@ let
in buildGoModule rec {
pname = "go-ethereum";
version = "1.10.18";
version = "1.10.20";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "1jfyhzklznjrdki6m8wjgqzp63b6n6vy7ws3l0al58zkaybnpikw";
sha256 = "sha256-PIQP08QxGJmla7LKEtnEXmwJxDYh02q4fmRHZsYtthU=";
};
vendorSha256 = "10xpxz8ybgwqizqy9d3phza8mlxxpsbk4qsf271r7ls4qr5q1wxz";
vendorSha256 = "sha256-AlXfKytDrQrp0gvnC5/gTlJAVJBAQNHm4MoBu9O9jM4=";
doCheck = false;

View File

@ -32,15 +32,15 @@
}
},
"dev": {
"version": "104.0.5112.20",
"sha256": "0adzdk3m2l4pjlk82sqavwgxf6a5darbiwchmlrsxc58p9xxag4s",
"sha256bin64": "13p2w4wwd8ji5ydgz4x7w2q4rmn74w3z2fl999q7zaq1cra21pzd",
"version": "105.0.5148.2",
"sha256": "0qnkpda0chsxgfby5g38xmpkilyz2v12mrwlayfsp2iqhc7d07vz",
"sha256bin64": "045czwsra17iclgyzsnbbjr55lrmhzf97c2k0wwjrmd59cx4b1sa",
"deps": {
"gn": {
"version": "2022-06-08",
"version": "2022-06-22",
"url": "https://gn.googlesource.com/gn",
"rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3",
"sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra"
"rev": "29accf5ac2eadfc53e687081583b7bc1592a8839",
"sha256": "0z9gaw8p88yhb7fi844pvylsbgjy3ni7bnca1yx37928fjw3ppln"
}
}
},

View File

@ -44,14 +44,14 @@ let
pname = "slack";
x86_64-darwin-version = "4.26.1";
x86_64-darwin-sha256 = "0883nnnwjaii89x6idqcl68acw1fbijyhhrwy7inwgrdw233qqcd";
x86_64-darwin-version = "4.27.154";
x86_64-darwin-sha256 = "0a3cc9kkiq18vr4hk532vc59cza1hq8qh9x9hlhli4n72n3h7y3n";
x86_64-linux-version = "4.26.1";
x86_64-linux-sha256 = "0nw3cfypinzp8csli1myh3b9hvv2pg1d8p9izg7znfpnlwps8gy1";
x86_64-linux-version = "4.27.156";
x86_64-linux-sha256 = "sha256-/xtD+/+KGtPr4vQJm8ZczvpyPxfMBw0OE7hzTzFhSs0=";
aarch64-darwin-version = "4.26.1";
aarch64-darwin-sha256 = "1p5qn5zyibpyiv5is70g1la9y6wc038j3sxjyxflgqsdvania7vq";
aarch64-darwin-version = "4.27.154";
aarch64-darwin-sha256 = "1n3vgcsbi1w49w4xqc5hyadb9qwvsqdiirfw9v4s65wsnark1iz6";
version = {
x86_64-darwin = x86_64-darwin-version;

View File

@ -3,12 +3,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20220624025859";
version = "20220708161253";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
sha256 = "sha256-/4wfTtRsBzOCbx3I3H28tB935xDZPPwHOFFmjiV7kEI=";
sha256 = "sha256-RLfb4DmigoQAKp00RHjGKGjQhCHqxSOLNnphiv1ub8s=";
};
vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo=";
meta = with lib; {

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202206230045";
version = "202207070057";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "2e2aba7f3dfb4139e8a882f85350045f2ef522d1";
sha256 = "sha256-WFvS51RmkAWivYj0HFAT6S3euJk+GSYLDTN3cmkcCNs=";
rev = "cbabee03cf7b7b60b1167a8a14ba1eba9d9dbb77";
sha256 = "sha256-bWhsV7+aj75nd8NDeb5D5UjvCChhtXq9lpkaZN41wDk=";
};
installPhase = ''

View File

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.0.20";
sha256 = "y3Zmv2ftn2yYfUg2yvA9SzZFN+anXlbNXJhnYOzC/dg=";
version = "8.0.21";
hash = "sha256-HLd2LR/+zOruuvufbiQTLKI/sUQ8tWMND8z1PwTPoSY=";
});
in

View File

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.1.7";
sha256 = "uBZ1PrAFUR5pXZCUXCcJPDI2zHPbEmJlbZ+t1z6tfp0=";
version = "8.1.8";
hash = "sha256-uIFaWgJDFFPUJh41mL0fKFFuTANU8yjBKJDyV4cOTAE=";
});
in

View File

@ -29,7 +29,7 @@ let
, xcbuild
, version
, sha256
, hash
, extraPatches ? [ ]
, packageOverrides ? (final: prev: { })
, phpAttrsOverrides ? (attrs: { })
@ -290,7 +290,7 @@ let
src = fetchurl {
url = "https://www.php.net/distributions/php-${version}.tar.bz2";
inherit sha256;
inherit hash;
};
patches = [ ./fix-paths-php7.patch ] ++ extraPatches;

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aiopyarr";
version = "22.6.0";
version = "22.7.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tkdrob";
repo = pname;
rev = version;
hash = "sha256-LfZEM1vPccQBrvNz9CGVlihg6YAB7FAvUZogu/ngZ4Y=";
hash = "sha256-ALFaWy/wY8PTuMixHEWaXXmKNSLf9Cm2pgffVHnAWLg=";
};
propagatedBuildInputs = [

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "asf-search";
version = "4.0.1";
version = "4.0.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "asfadmin";
repo = "Discovery-asf_search";
rev = "refs/tags/v${version}";
hash = "sha256-58roOxLFTu7WddgifuvaMoFlEh+iHrrL0rSJjAw35d0=";
hash = "sha256-Af6Nyrl1mrYTG24/nIv+x5Znk20HOubjjPAUvbdnj+Y=";
};
propagatedBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "azure-servicebus";
version = "7.7.0";
version = "7.8.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-D9CdVfPU7FwiAQd2Pw/CMJsHj8psYtVq3wYJlVHVA1s=";
hash = "sha256-KTvJXOJ3o2KUL9iPcus6m0qS3hAAB3Wz0uPgCttFqlk=";
};
propagatedBuildInputs = [

View File

@ -6,23 +6,24 @@
, pytestCheckHook
, netcdf4
, pythonOlder
, setuptools-scm
}:
buildPythonPackage rec {
pname = "h5netcdf";
version = "0.8.1";
version = "1.0.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "09bbnpsvwksb07wijn7flyyza56h5b2g2cw0hb3slmwxz6cgcjmr";
hash = "sha256-d2cE+s2LgiRtbUBoxQXDibO3C5v5kgzPusfzXNxjTaw=";
};
patches = [
(fetchpatch{
url = "https://patch-diff.githubusercontent.com/raw/h5netcdf/h5netcdf/pull/82.patch";
sha256 = "0x9bq9jl4kvw152adkpcyqslhpi7miv80hrnpl2w2y798mmbs0s4";
})
];
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
h5py
@ -33,14 +34,16 @@ buildPythonPackage rec {
netcdf4
];
disabled = pythonOlder "3.6";
dontUseSetuptoolsCheck = true;
meta = {
pythonImportsCheck = [
"h5netcdf"
];
meta = with lib; {
description = "netCDF4 via h5py";
homepage = "https://github.com/shoyer/h5netcdf";
license = lib.licenses.bsd3;
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
}

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "1.9.4";
version = "2022.7.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-swi9m2vM573h+im3p97DT73LtalipoCnGMbcnBFyCfw=";
sha256 = "sha256-V+g4TlwnTuirmxoMmq/A0dGKqubEH8ObPuroXKbSH8U=";
};
propagatedBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "moku";
version = "2.3";
version = "2.4";
/*
@ -22,7 +22,7 @@ buildPythonPackage rec {
*/
src = fetchPypi {
inherit pname version;
hash = "sha256-EzVcECjJyrr2NLQkG0Yp/jYBMnsEP1/FnS5O3UplszI=";
hash = "sha256-yFA2NkiRt6wjXJk6i7oxrjD597acAligWId3MDYwTd0=";
};
/*

View File

@ -1,19 +1,23 @@
{ lib
, buildPythonPackage
, fetchPypi
, packaging
, pbr
, sentinels
, six
, pytestCheckHook
, pythonOlder
, sentinels
}:
buildPythonPackage rec {
pname = "mongomock";
version = "4.0.0";
version = "4.1.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-sYMsN0jUdETBiGc3PlzqdUwub2RKDPv9Zn8Xj2i97Pw=";
hash = "sha256-8GzWKvuK4+9jujE0mr0iCmV+8N1PAkOilYfFIT+TG30=";
};
nativeBuildInputs = [
@ -21,15 +25,17 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
packaging
sentinels
six
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "mongomock" ];
pythonImportsCheck = [
"mongomock"
];
meta = with lib; {
homepage = "https://github.com/mongomock/mongomock";

View File

@ -3,17 +3,21 @@
, fetchFromGitHub
, libcec
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pycec";
version = "0.5.1";
version = "0.5.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "konikvranik";
repo = pname;
rev = "v${version}";
sha256 = "1ivnmihajhfkwwghgl0f8n9ragpirbmbj1mhj9bmjjc29zzdc3m6";
sha256 = "sha256-H18petSiUdftZN8Q3fPmfSJA3OZks+gI+FAq9LwkRsk=";
};
propagatedBuildInputs = [
@ -24,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "pycec" ];
pythonImportsCheck = [
"pycec"
];
meta = with lib; {
description = "Python modules to access HDMI CEC devices";

View File

@ -0,0 +1,63 @@
{ lib
, buildPythonPackage
, docutils
, fetchFromGitHub
, importlib-metadata
, mock
, poetry-core
, pydantic
, pytest-mock
, pytestCheckHook
, pythonOlder
, types-docutils
, typing-extensions
}:
buildPythonPackage rec {
pname = "rstcheck-core";
version = "1.0.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "rstcheck";
repo = pname;
rev = "v${version}";
hash = "sha256-XNr+prK9VDP66ZaFvh3Qrx+eJs6mnVO8lvoMC/qrCLs=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
docutils
importlib-metadata
pydantic
types-docutils
typing-extensions
];
checkInputs = [
mock
pytest-mock
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"'
'';
pythonImportsCheck = [
"rstcheck_core"
];
meta = with lib; {
description = "Library for checking syntax of reStructuredText";
homepage = "https://github.com/rstcheck/rstcheck-core";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -1,26 +1,32 @@
{ lib
, buildPythonPackage
, colorama
, docutils
, fetchFromGitHub
, importlib-metadata
, poetry-core
, pydantic
, pytestCheckHook
, pythonOlder
, rstcheck-core
, shellingham
, typer
, types-docutils
, typing-extensions
}:
buildPythonPackage rec {
pname = "rstcheck";
version = "5.0.0";
version = "6.0.0.post1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "myint";
owner = "rstcheck";
repo = pname;
rev = "v${version}";
hash = "sha256-vTUa/eP6/flxRLBuzdHoNoPoGAg6XWwu922az8tLgJM=";
hash = "sha256-Ljg1cciT9qKL9xtBxQ8OLygDpV/1yR5XiJOzHrLr6xw=";
};
nativeBuildInputs = [
@ -28,15 +34,28 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
colorama
docutils
rstcheck-core
shellingham
types-docutils
typing-extensions
pydantic
typer
] ++ lib.optionals (pythonOlder "3.8") [
typing-extensions
importlib-metadata
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"'
'';
pythonImportsCheck = [
"rstcheck"
];

View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "tldextract";
version = "3.3.0";
version = "3.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-rc0kq/Ic40UEF81aAPI7fldVTOiugnM03RK/y7YnTPE=";
hash = "sha256-/hWsMgXlolthaJNp+Yy0XHd4qPKvET18EVWezlGV8tY=";
};
nativeBuildInputs = [

View File

@ -49,6 +49,7 @@ buildPythonPackage rec {
"TestFileTypesDataDriven"
# AssertionError: assert 'application/x-bytecode.python'...
"test_compiled_python_1"
"test_package_json"
];
pythonImportsCheck = [

View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-docutils";
version = "0.18.3";
version = "0.19.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-oO+DHcIGNfNQ+pz/WRIxwx0n51dx5Z/WyXm2wMfgMpI=";
hash = "sha256-lJNrGWGqzaYexrsKzxFpzXgwtSMLZFhVwdR4m68ZaF4=";
};
# Module doesn't have tests

View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
version = "57.4.18";
version = "62.6.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-juA9gj/n/aC9Nfrq4z01y1wltJcmPmpYs0xM/QX0C88=";
sha256 = "sha256-x3oytRZ7ng2Zwfezm39aPsABxxCZMd1jxRZS+eRmPQc=";
};
# Module doesn't have tests

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "vertica-python";
version = "1.1.0";
version = "1.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-XccIN5lmrRTNAmK52XeMBZzuNOxSvXFK7COLh5lacDY=";
hash = "sha256-3t9W12tnZztNV6E/f5br3FeznqZQuT6/DAXrbR0sDAU=";
};
propagatedBuildInputs = [

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fundoc";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "csssr";
repo = pname;
rev = "v${version}";
sha256 = "0nd03c2lz07ghaab67kgl5pw8z8mv6kwx3xzr4pqr7v5b983py6v";
sha256 = "sha256-qmsr4bhErpMzS71NhLep0EWimZb/S3aEhMbeBNa5y8E=";
};
cargoSha256 = "sha256-6riBlCyqNN2nzgwfVfbRy1avT9b0PdetOrbmbaltsjE=";
cargoSha256 = "sha256-G2KRjkccS/rfrb7BtotbG6L4WaVnfwY1UEXLnVBLSzM=";
meta = with lib; {
description = "Language agnostic documentation generator";

View File

@ -0,0 +1,13 @@
diff --git a/build.sh b/build.sh
index e471563..32bdfab 100755
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,7 @@ gdb --version > /dev/null 2>&1 || printf "\033[0;31mWarning\033[0m: GDB not dete
echo q | gdb | grep "(gdb)" > /dev/null 2>&1 || printf "\033[0;31mWarning\033[0m: Your copy of GDB appears to be non-standard or has been heavily reconfigured with .gdbinit.\nIf you are using GDB plugins like 'GDB Dashboard' you must remove them,\nas otherwise gf will be unable to communicate with GDB.\n"
# Check if FreeType is available.
-if [ -d /usr/include/freetype2 ]; then extra_flags="$extra_flags -lfreetype -D UI_FREETYPE -I /usr/include/freetype2";
+if pkg-config --cflags freetype2 > /dev/null; then extra_flags="$extra_flags -D UI_FREETYPE $(pkg-config --cflags --libs freetype2)";
else printf "\033[0;31mWarning\033[0m: FreeType could not be found. The fallback font will be used.\n"; fi
# Check if SSE2 is available.

View File

@ -0,0 +1,64 @@
{ lib
, stdenv
, makeWrapper
, fetchFromGitHub
, libX11
, pkg-config
, gdb
, freetype
, freetypeSupport ? true
, extensions ? [ ]
}:
stdenv.mkDerivation rec {
pname = "gf";
version = "unstable-2022-06-22";
src = fetchFromGitHub {
repo = "gf";
owner = "nakst";
rev = "e0d6d2f59344f853a4a204d5313db6b6a5e5de7d";
sha256 = "01fln4wnn1caqr4wa1nhcp0rqdx5m5nqyn2amvclp5hhi3h3qaiq";
};
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [ libX11 gdb ]
++ lib.optional freetypeSupport freetype;
patches = [
./build-use-optional-freetype-with-pkg-config.patch
];
postPatch = lib.forEach extensions (ext: ''
cp ${ext} ./${ext.name or (builtins.baseNameOf ext)}
'');
preConfigure = ''
patchShebangs build.sh
'';
buildPhase = ''
runHook preBuild
extra_flags=-DUI_FREETYPE_SUBPIXEL ./build.sh
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p "$out/bin"
cp gf2 "$out/bin/"
runHook postInstall
'';
postFixup = ''
wrapProgram $out/bin/gf2 --prefix PATH : ${lib.makeBinPath[ gdb ]}
'';
meta = with lib; {
description = "A GDB Frontend";
homepage = "https://github.com/nakst/gf";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ _0xd61 ];
};
}

View File

@ -25,14 +25,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "pip-audit";
version = "2.4.0";
version = "2.4.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "trailofbits";
repo = pname;
rev = "v${version}";
hash = "sha256-l1oefdveAmmkRKnEOvdVp4efYd/nFkyDyVP5dxAG1CI=";
hash = "sha256-Uko8ZtVMu9a/WrgSREFY3c8O+psE6cWpyHKVrOTJOJE=";
};
nativeBuildInputs = [

View File

@ -1,39 +0,0 @@
diff -ur source/src/btf.cpp new/src/btf.cpp
--- source/src/btf.cpp 1970-01-01 09:00:01.000000000 +0900
+++ new/src/btf.cpp 2021-12-04 21:46:59.337023489 +0900
@@ -225,7 +225,7 @@
char err_buf[256];
int err;
- dump = btf_dump__new(btf, nullptr, &opts, dump_printf);
+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf);
err = libbpf_get_error(dump);
if (err)
{
@@ -496,7 +496,7 @@
char err_buf[256];
int err;
- dump = btf_dump__new(btf, nullptr, &opts, dump_printf);
+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf);
err = libbpf_get_error(dump);
if (err)
{
@@ -554,7 +554,7 @@
char err_buf[256];
int err;
- dump = btf_dump__new(btf, nullptr, &opts, dump_printf);
+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf);
err = libbpf_get_error(dump);
if (err)
{
@@ -648,7 +648,7 @@
char err_buf[256];
int err;
- dump = btf_dump__new(btf, nullptr, &opts, dump_printf);
+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf);
err = libbpf_get_error(dump);
if (err)
{

View File

@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "bpftrace";
version = "0.14.1";
version = "0.15.0";
# Cherry-picked from merged PR, remove this hook on next update
# https://github.com/iovisor/bpftrace/pull/2242
@ -33,14 +33,9 @@ stdenv.mkDerivation rec {
owner = "iovisor";
repo = "bpftrace";
rev = "v${version}";
sha256 = "sha256-QDqHAEVM/XHCFMS0jMLdKJfDUOpkUqONOf8+Fbd5dCY=";
sha256 = "sha256-9adZAKSn00W2yNwVDbVB1/O5Y+10c4EkVJGCHyd4Tgg=";
};
# libbpf 0.6.0 relies on typeof in bpf/btf.h to pick the right version of
# btf_dump__new() but that's not valid c++.
# see https://github.com/iovisor/bpftrace/issues/2068
patches = [ ./btf-dump-new-0.6.0.patch ];
buildInputs = with llvmPackages;
[ llvm libclang
elfutils libelf bcc

View File

@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
version = "5.18.9"; #zen
version = "5.18.10"; #zen
suffix = "zen1"; #zen
sha256 = "0smmy7axz874x22s8yram3k64n3w9npfh4irgan1if8k87pgx474"; #zen
sha256 = "0kqzs3g9w1sfin61sapc403pc65acsy18qk8ldkhzhjzv90fw4im"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
version = "5.18.9"; #lqx
version = "5.18.10"; #lqx
suffix = "lqx1"; #lqx
sha256 = "1dvdav0d3fw9frp1l2k525yai071gvign2z81fna3j63ddy2bxp1"; #lqx
sha256 = "0b666lwqhiydkikca2x55ljgpw9sba8r7jvcvp6nghm4yf3a11mp"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

View File

@ -1,6 +1,5 @@
{ fetchFromGitHub
, fetchpatch
, libelf
, elfutils
, pkg-config
, stdenv
, zlib
@ -10,17 +9,17 @@
stdenv.mkDerivation rec {
pname = "libbpf";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "libbpf";
repo = "libbpf";
rev = "v${version}";
sha256 = "sha256-NFVJ8JquWVzu+QoaaOMzhnu6/IqdP1FPhtJFidXA4L4=";
sha256 = "sha256-D2ASqSZFNShCdRCH8LDocLP/O4sME9nT73rk1KsJeJE=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libelf zlib ];
buildInputs = [ elfutils zlib ];
enableParallelBuilding = true;
makeFlags = [ "PREFIX=$(out)" "-C src" ];

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "librespeed-cli";
version = "1.0.9";
version = "1.0.10";
src = fetchFromGitHub {
owner = "librespeed";
repo = "speedtest-cli";
rev = "v${version}";
sha256 = "sha256-rtZZgx5QNwYd6vXSts/ICSiXv7sMZA8ihHgxTjZ/6KQ=";
sha256 = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8=";
};
vendorSha256 = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ=";

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, openssl
}:
@ -15,6 +16,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-1sT1/iwtc2ievmLuNuooy9b14pTs1ZC5noDwzFelk7w=";
};
patches = [
# Pull fix pending upstream inclusion for -fno-common toolchains:
# https://github.com/PeterPawn/decoder/pull/29
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/PeterPawn/decoder/commit/843ac477c31108023d8008581bf91c5a3acc1859.patch";
sha256 = "sha256-rRylz8cxgNyPSqL/THdgEBpzcVx1K+xbjUn4PwP9Jn4=";
})
];
buildInputs = [
openssl
];

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "kubeaudit";
version = "0.18.0";
version = "0.19.0";
src = fetchFromGitHub {
owner = "Shopify";
repo = pname;
rev = "v${version}";
hash = "sha256-aMnhEY16SybE5Oavc6stw7xoyNblCwFJpzYHsDBENX4=";
hash = "sha256-exJGjFeqk3hM52Zgfs+2JEVdzVZf79ZRQH2krusiw8c=";
};
vendorSha256 = "sha256-plsnzeRIaJNNzrkzQYtxOqWejTDntPRemIhcfpxXgBg=";
vendorSha256 = "sha256-hi83C05eEXqQ6kMGv6n/fjsYAXveyVRqKZds5iv8Oio=";
postInstall = ''
mv $out/bin/cmd $out/bin/$pname

View File

@ -6,15 +6,15 @@
buildGoModule rec {
pname = "kubescape";
version = "2.0.160";
version = "2.0.161";
src = fetchFromGitHub {
owner = "armosec";
repo = pname;
rev = "v${version}";
hash = "sha256-IQ80AnI+mHdZxqgVuZvDLO6LuhLdgRGu6Hyz1kJ2v38=";
hash = "sha256-rsO6ZTQg5fmpp+5Zx36tQnDW1vf2k+FCI3cFbGZifVM=";
};
vendorSha256 = "sha256-x+Sxe4fBhOvE5An0dIqL5q3eEKzNJwugToGZ8NZ5GGA=";
vendorSha256 = "sha256-EinrVdGdYroh0X/ACAVD2gw4k0jrPHQ3Ucb3TUYKd8Q=";
nativeBuildInputs = [
installShellFiles

View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "crowdin-cli";
version = "3.7.8";
version = "3.7.9";
src = fetchurl {
url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
sha256 = "sha256-z9c12KKrh4hV7A92qinNCQGTxZI6IsmJ3Z+3ZcZZljk=";
sha256 = "sha256-goRqj/3BM7DPWlfJH9kgW9JQP1lGWQod6DO8fmcRPqc=";
};
nativeBuildInputs = [ installShellFiles makeWrapper unzip ];

View File

@ -16742,6 +16742,8 @@ with pkgs;
readline = readline81;
};
gf = callPackage ../development/tools/misc/gf { };
java-language-server = callPackage ../development/tools/java/java-language-server { };
jprofiler = callPackage ../development/tools/java/jprofiler {

View File

@ -9419,6 +9419,8 @@ in {
rstcheck = callPackage ../development/python-modules/rstcheck { };
rstcheck-core = callPackage ../development/python-modules/rstcheck-core { };
rtmidi-python = callPackage ../development/python-modules/rtmidi-python {
inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices;
};