Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-03-29 12:01:18 +00:00 committed by GitHub
commit 29d12c9448
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 276 additions and 94 deletions

View file

@ -111,7 +111,7 @@ let
}
''
echo 'Section "Files"' >> $out
echo $fontpath >> $out
echo "$fontpath" >> $out
for i in ${toString fontsForXServer}; do
if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
@ -121,11 +121,9 @@ let
fi
done
for i in $(find ${toString cfg.modules} -type d | sort); do
if test $(echo $i/*.so* | wc -w) -ne 0; then
echo " ModulePath \"$i\"" >> $out
fi
done
${concatMapStrings (m: ''
echo " ModulePath \"${m}/lib/xorg/modules\"" >> "$out"
'') cfg.modules}
echo '${cfg.filesSection}' >> $out
echo 'EndSection' >> $out

View file

@ -20,6 +20,7 @@
, millet
, craftos-pc
, shfmt
, tinymist
, typst-lsp
, typst-preview
, autoPatchelfHook
@ -2345,6 +2346,22 @@ let
};
};
jbockle.jbockle-format-files = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "jbockle-format-files";
publisher = "jbockle";
version = "3.4.0";
sha256 = "sha256-BHw+T2EPdQq/wOD5kzvSln5SBFTYUXip8QDjnAGBfFY=";
};
meta = {
description = "A VSCode extension to formats all files in the current workspace";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=jbockle.jbockle-format-files";
homepage = "https://github.com/jbockle/format-files";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.wackbyte ];
};
};
jdinhlife.gruvbox = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "gruvbox";
@ -3169,6 +3186,37 @@ let
};
};
myriad-dreamin.tinymist = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "tinymist";
publisher = "myriad-dreamin";
# Please update the corresponding binary (tinymist) when updating
# this extension.
version = "0.11.1";
sha256 = "sha256-jyZBnT8UW94TVnZKZna1cJa/UIj+DwYwlAbU4pnaf04=";
};
nativeBuildInputs = [ jq moreutils ];
buildInputs = [
tinymist
];
postInstall = ''
cd "$out/$installPrefix"
jq '.contributes.configuration.properties."tinymist.serverPath".default = "${lib.getExe tinymist}"' package.json | sponge package.json
'';
meta = {
changelog = "https://marketplace.visualstudio.com/items/myriad-dreamin.tinymist/changelog";
description = "A VSCode extension for providing an integration solution for Typst";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist";
homepage = "https://github.com/myriad-dreamin/tinymist";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.drupol ];
};
};
naumovs.color-highlight = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "color-highlight";

View file

@ -19,6 +19,7 @@ let
"java.xml"
"java.desktop"
"java.management"
"java.naming"
];
jdk = jdk_headless;
};

View file

@ -0,0 +1,53 @@
{ lib
, python3Packages
, fetchPypi
, curl
}:
python3Packages.buildPythonPackage rec {
pname = "httpy-cli";
version = "1.1.0";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "httpy-cli";
hash = "sha256-uhF/jF4buHMDiXOuuqjskynioz4qVBevQhdcUbH+91Q=";
};
propagatedBuildInputs = with python3Packages; [
colorama
pygments
requests
urllib3
];
build-system = with python3Packages; [
setuptools
];
pythonImportsCheck = [
"httpy"
];
nativeCheckInputs = [
python3Packages.pytest
curl
];
checkPhase = ''
runHook preCheck
echo "line1\nline2\nline3" > tests/test_file.txt
# ignore the test_args according to pytest.ini in the repo
pytest tests/ --ignore=tests/test_args.py
runHook postCheck
'';
meta = with lib; {
description = "Modern, user-friendly, programmable command-line HTTP client for the API";
homepage = "https://github.com/knid/httpy";
license = licenses.mit;
mainProgram = "httpy";
maintainers = with maintainers; [ eymeric ];
};
}

View file

@ -0,0 +1,43 @@
{ lib
, fetchurl
, appimageTools
}:
appimageTools.wrapType2 rec {
pname = "kmeet";
version = "2.0.1";
src = fetchurl {
url = "https://download.storage5.infomaniak.com/meet/kmeet-desktop-${version}-linux-x86_64.AppImage";
name = "kmeet-${version}.AppImage";
hash = "sha256-0lygBbIwaEydvFEfvADiL2k5GWzVpM1jX4orweriBYw=";
};
extraInstallCommands =
let
contents = appimageTools.extractType2 { inherit pname version src; };
in
''
mkdir -p "$out/share/applications"
mkdir -p "$out/share/lib/kmeet"
cp -r ${contents}/{locales,resources} "$out/share/lib/kmeet"
cp -r ${contents}/usr/* "$out"
cp "${contents}/kMeet.desktop" "$out/share/applications/"
mv "$out/bin/kmeet-${version}" "$out/bin/${meta.mainProgram}"
substituteInPlace $out/share/applications/kMeet.desktop --replace 'Exec=AppRun' 'Exec=${meta.mainProgram}'
'';
meta = with lib; {
description = "Organise secure online meetings via your web browser, your mobile, your tablet or your computer.";
homepage = "https://www.infomaniak.com/en/apps/download-kmeet";
license = licenses.unfree;
maintainers = [ maintainers.vinetos ];
mainProgram = "kmeet";
platforms = [ "x86_64-linux" ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
longDescription = ''
kMeet allows you to organise secure online meetings via your web browser, your mobile, your tablet or your
computer.
'';
};
}

View file

@ -71,13 +71,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "2481";
version = "2568";
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "refs/tags/b${finalAttrs.version}";
hash = "sha256-40GSZZEnjM9L9KVVKdSKtBoSRy996l98ORM4NeltsSM=";
hash = "sha256-yBlLChtzfAi2TAGUO1zdnpHCvi5YDCzjdflQgTWh98Y=";
};
postPatch = ''
@ -107,7 +107,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
(cmakeBool "BUILD_SHARED_LIBS" true)
(cmakeBool "LLAMA_BLAS" blasSupport)
(cmakeBool "LLAMA_CLBLAST" openclSupport)
(cmakeBool "LLAMA_CUBLAS" cudaSupport)
(cmakeBool "LLAMA_CUDA" cudaSupport)
(cmakeBool "LLAMA_HIPBLAS" rocmSupport)
(cmakeBool "LLAMA_METAL" metalSupport)
(cmakeBool "LLAMA_MPI" mpiSupport)
@ -131,7 +131,10 @@ effectiveStdenv.mkDerivation (finalAttrs: {
# Should likely use `rocmPackages.clr.gpuTargets`.
"-DAMDGPU_TARGETS=gfx803;gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx940;gfx941;gfx942;gfx1010;gfx1012;gfx1030;gfx1100;gfx1101;gfx1102"
]
++ optionals metalSupport [ (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") ];
++ optionals metalSupport [
(cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1")
(cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true)
];
# upstream plans on adding targets at the cmakelevel, remove those
# additional steps after that

View file

@ -11,6 +11,8 @@
rustPlatform.buildRustPackage rec {
pname = "tinymist";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.11.1";
src = fetchFromGitHub {

View file

@ -6,23 +6,23 @@
python3.pkgs.buildPythonApplication rec {
pname = "zircolite";
version = "2.10.0";
version = "2.20.0";
format = "other";
src = fetchFromGitHub {
owner = "wagga40";
repo = "Zircolite";
rev = "refs/tags/${version}";
hash = "sha256-r5MIoP+6CnAGsOtK4YLshLBVSZN2NVrwnkuHHDdLZrQ=";
hash = "sha256-a7xwF0amsh2SycOjtZpk3dylcBGG9uYd7vmbnz/f9Ug=";
};
__darwinAllowLocalNetworking = true;
nativeBuildInputs = [
build-system = [
makeWrapper
];
propagatedBuildInputs = with python3.pkgs; [
dependencies = with python3.pkgs; [
aiohttp
colorama
elastic-transport

View file

@ -2,16 +2,16 @@
php.buildComposerProject (finalAttrs: {
pname = "phpstan";
version = "1.10.65";
version = "1.10.66";
src = fetchFromGitHub {
owner = "phpstan";
repo = "phpstan-src";
rev = finalAttrs.version;
hash = "sha256-mKNix5TEnr0aUHxn9cYvFafU7yLhTe8AVkHZcu0/a1M=";
hash = "sha256-ZEQ6oP6zyi0cL69J9ck8gAht5taPkzH+iW5ALC4saAQ=";
};
vendorHash = "sha256-NezEoraSomeeMbY7qz2pH2EwLr/VXO1tmWJ5/2fS/qU=";
vendorHash = "sha256-Qp/eMhcKK32N1EMgeIspBDs28Oofwn6n2bEFKqvSx9E=";
composerStrictValidation = false;
meta = {

View file

@ -8,23 +8,23 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.84";
version = "9.2.96";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
repo = "ailment";
rev = "refs/tags/v${version}";
hash = "sha256-I4lZrp4coJOBB8gREmeQsCiNhMC0MqhYxd5BmYXq9BA=";
hash = "sha256-xc9/J360ftynKT5HYNcjR/0WX04DUDmszaAHb8h3Iao=";
};
nativeBuildInputs = [
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
pyvex
];

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioraven";
version = "0.5.2";
version = "0.5.3";
pyproject = true;
disabled = pythonOlder "3.9";
@ -21,14 +21,14 @@ buildPythonPackage rec {
owner = "cottsay";
repo = "aioraven";
rev = "refs/tags/${version}";
hash = "sha256-ysmIxWy+gufX5oUfQ7Zw5xv0t/yxihFB+eAdYAWAmXs=";
hash = "sha256-kGCFwpMaLWxLUp8k5H5AnL21KrwohbUYLswLcLqmc3M=";
};
nativeBuildInputs = [
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
iso4217
pyserial
pyserial-asyncio

View file

@ -20,19 +20,23 @@
, protobuf
, psutil
, pycparser
, pyformlang
, pythonOlder
, pythonRelaxDepsHook
, pyvex
, rich
, rpyc
, setuptools
, sortedcontainers
, sqlalchemy
, sympy
, unicorn
, unique-log-filter
}:
buildPythonPackage rec {
pname = "angr";
version = "9.2.84";
version = "9.2.96";
pyproject = true;
disabled = pythonOlder "3.11";
@ -41,10 +45,19 @@ buildPythonPackage rec {
owner = "angr";
repo = "angr";
rev = "refs/tags/v${version}";
hash = "sha256-qav9SUvQtcEad9lvgyrMhOcFhPAhzU/9s7ekTfohqRc=";
hash = "sha256-eyXjmU/K8zv5nxrt+oKkyxS00tHOYrkbTc2X9esTSSA=";
};
propagatedBuildInputs = [
pythonRelaxDeps = [
"capstone"
];
build-system = [
pythonRelaxDepsHook
setuptools
];
dependencies = [
ailment
archinfo
cachetools
@ -63,6 +76,7 @@ buildPythonPackage rec {
protobuf
psutil
pycparser
pyformlang
pyvex
rich
rpyc
@ -70,6 +84,7 @@ buildPythonPackage rec {
sqlalchemy
sympy
unicorn
unique-log-filter
];
setupPyBuildFlags = lib.optionals stdenv.isLinux [

View file

@ -1,5 +1,4 @@
{ stdenv
, lib
{ lib
, angr
, buildPythonPackage
, cmd2
@ -8,28 +7,34 @@
, pygments
, pytestCheckHook
, pythonOlder
, setuptools
, stdenv
}:
buildPythonPackage rec {
pname = "angrcli";
version = "1.2.0";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "fmagin";
repo = "angr-cli";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s=";
};
postPatch = ''
substituteInPlace tests/test_derefs.py \
--replace "/bin/ls" "${coreutils}/bin/ls"
--replace-fail "/bin/ls" "${coreutils}/bin/ls"
'';
propagatedBuildInputs = [
build-system = [
setuptools
];
dependencies = [
angr
cmd2
pygments

View file

@ -11,22 +11,22 @@
buildPythonPackage rec {
pname = "angrop";
version = "9.2.8";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
repo = "angrop";
rev = "refs/tags/v${version}";
hash = "sha256-zmWdGbFzwLDP7MUqEprZcIgA7lAdCrafWYohAehJyh0=";
};
nativeBuildInputs = [
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
angr
progressbar
tqdm

View file

@ -9,23 +9,23 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.84";
version = "9.2.96";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
repo = "archinfo";
rev = "refs/tags/v${version}";
hash = "sha256-drZuQRQ2XukCimH/SG6CRCL4avyMEcKxuj+Rinp7lJQ=";
hash = "sha256-g/fxj/6dMVLoW4hFtVDEjHjdJiB3KE2XB3c0ihclqeM=";
};
nativeBuildInputs = [
build-system = [
setuptools
];
propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [
dependencies = lib.optionals (pythonOlder "3.11") [
backports-strenum
];

View file

@ -1,19 +1,19 @@
{ lib
, buildPythonPackage
, setuptools
, cachetools
, decorator
, fetchFromGitHub
, future
, pysmt
, pythonOlder
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
, setuptools
, z3-solver
}:
buildPythonPackage rec {
pname = "claripy";
version = "9.2.84";
version = "9.2.96";
pyproject = true;
disabled = pythonOlder "3.11";
@ -22,20 +22,25 @@ buildPythonPackage rec {
owner = "angr";
repo = "claripy";
rev = "refs/tags/v${version}";
hash = "sha256-wgCWMngda0gB+AEDFpRxQ2ots5YXE4bkBSxMtYJqLEo=";
hash = "sha256-rXJzJCyhsScFW1L/mVARciGDlOOBCFT69VBivjV6oig=";
};
nativeBuildInputs = [
# z3 does not provide a dist-info, so python-runtime-deps-check will fail
pythonRemoveDeps = [
"z3-solver"
];
build-system = [
pythonRelaxDepsHook
setuptools
];
propagatedBuildInputs = [
dependencies = [
cachetools
decorator
future
pysmt
z3-solver
];
] ++ z3-solver.requiredPythonModules;
nativeCheckInputs = [
pytestCheckHook

View file

@ -1,4 +1,5 @@
{ lib
, archinfo
, buildPythonPackage
, cffi
, fetchFromGitHub
@ -16,14 +17,14 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.84";
version = "9.2.96";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
owner = "angr";
repo = "binaries";
rev = "refs/tags/v${version}";
hash = "sha256-sU9Rv2kTLYMpaalrkcOv6HlHt1u4oG482M+d7OSjJ3Y=";
hash = "sha256-eC9qQCrms4pSXYTrKJlfdejhl/kzUmmyfYhjlEPpgzA=";
};
in
@ -38,14 +39,15 @@ buildPythonPackage rec {
owner = "angr";
repo = "cle";
rev = "refs/tags/v${version}";
hash = "sha256-N0z5wgaeWkoPuhIUj7bj1kDKgZ7pWChm1uEU4MjXjqI=";
hash = "sha256-osClaoAzjf3mOng38disxxSFncbc/V7Uuc1HCTdX4SQ=";
};
nativeBuildInputs = [
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
archinfo
cffi
minidump
pefile

View file

@ -2,41 +2,49 @@
, buildPythonPackage
, fetchFromGitHub
, future
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "nampa";
version = "1.0";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "thebabush";
repo = pname;
rev = version;
sha256 = "14b6xjm497wrfw4kv24zhsvz2l6zknvx36w8i754hfwz3s3fsl6a";
repo = "nampa";
rev = "refs/tags/${version}";
hash = "sha256-ylDthh6fO0jKiYib0bed31Dxt4afiD0Jd5mfRKrsZpE=";
};
propagatedBuildInputs = [
future
];
nativeCheckInputs = [
pytestCheckHook
];
postPatch = ''
# https://github.com/thebabush/nampa/pull/13
substituteInPlace setup.py \
--replace "0.1.1" "${version}"
'';
pythonImportsCheck = [ "nampa" ];
build-system = [
setuptools
];
dependencies = [
future
];
# Not used for binaryninja as plugin
doCheck = false;
pythonImportsCheck = [
"nampa"
];
meta = with lib; {
description = "Python implementation of the FLIRT technology";
mainProgram = "dumpsig.py";
homepage = "https://github.com/thebabush/nampa";
changelog = "https://github.com/thebabush/nampa/releases/tag/${version}";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ fab ];
};

View file

@ -1,12 +1,13 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, wheel
, networkx
, numpy
, pydot
, pytestCheckHook
, pythonOlder
, setuptools
, wheel
}:
buildPythonPackage rec {
@ -14,17 +15,19 @@ buildPythonPackage rec {
version = "1.0.9";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-oCwYM4yQ1KYZpC7vVpeHSIDH2Q930JAuTDq9mds9zoc=";
};
nativeBuildInputs = [
build-system = [
setuptools
wheel
];
propagatedBuildInputs = [
dependencies = [
networkx
numpy
pydot
@ -39,7 +42,7 @@ buildPythonPackage rec {
];
meta = with lib; {
description = "A python framework for formal grammars";
description = "Framework for formal grammars";
homepage = "https://github.com/Aunsiels/pyformlang";
license = licenses.mit;
maintainers = with maintainers; [ natsukium ];

View file

@ -1,11 +1,9 @@
{ lib
, stdenv
, archinfo
, bitstring
, buildPythonPackage
, cffi
, fetchPypi
, future
, pycparser
, pythonOlder
, setuptools
@ -13,31 +11,29 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.93";
version = "9.2.96";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchPypi {
inherit pname version;
hash = "sha256-44F1EE8TRsmYRnMNQakxIaFdAuZKpHIDsq+M1cK/pQk=";
hash = "sha256-60aOAm7eUlYHTCqIILz4l0oF1jvttDZUs4jSrF5+IJI=";
};
nativeBuildInputs = [
build-system = [
setuptools
];
propagatedBuildInputs = [
archinfo
dependencies = [
bitstring
cffi
future
pycparser
];
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace vex/Makefile-gcc \
--replace '/usr/bin/ar' 'ar'
--replace-fail '/usr/bin/ar' 'ar'
'';
setupPyBuildFlags = lib.optionals stdenv.isLinux [

View file

@ -20,7 +20,7 @@ buildPythonPackage rec {
hash = "sha256-av1pVPDsO2dto5fhBK74jKfVsVY2ChyUE5NNja2B1Qw=";
};
nativeBuildInputs = [
build-system = [
flit-core
];

View file

@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o
buildGoModule rec {
pname = "open-policy-agent";
version = "0.62.1";
version = "0.63.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
hash = "sha256-iR3/6tqB6jwjy87D6xkKu/N61oenWzU3tEPTYTeEv7c=";
hash = "sha256-yXYyRl0ZDgS6eB2pB0Iqi3DiBGcIO3Vdet9RLSOczkU=";
};
vendorHash = null;

View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "panoply";
version = "5.3.3";
version = "5.3.4";
src = fetchurl {
url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
sha256 = "sha256-h2MJqbouPSciOdChLNIskYm3YLpJYK9gjTDB8StmBqg=";
sha256 = "sha256-v7ieTtm2W8Sc/zhQ7QPh8rkMUgaqgfGYYXc6Ly+9iMg=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -15,11 +15,11 @@ let
in
tcl.mkTclDerivation rec {
pname = "remind";
version = "04.03.03";
version = "04.03.04";
src = fetchurl {
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
sha256 = "sha256-+/vX6Nu0F84mZcEnd9jFlaVKbJIQQOJiPsxspKF+klQ=";
sha256 = "sha256-XkF/silBwDlQt9T2wmUMPh7MiE9yB+vXrSQmEnBEpC8=";
};
propagatedBuildInputs = tclLibraries;