Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt
2025-01-05 15:06:50 +01:00
18 changed files with 271 additions and 100 deletions
+5
View File
@@ -68,6 +68,11 @@ for user in "${!users[@]}"; do
fi
done
if [[ "${#users[@]}" -gt 10 ]]; then
log "Too many reviewers (${!users[@]}), skipping review requests"
exit 1
fi
for user in "${!users[@]}"; do
log "Requesting review from: $user"
@@ -6373,6 +6373,18 @@ final: prev:
meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/";
};
lua-async-await = buildVimPlugin {
pname = "lua-async-await";
version = "2024-03-31";
src = fetchFromGitHub {
owner = "nvim-java";
repo = "lua-async";
rev = "652d94df34e97abe2d4a689edbc4270e7ead1a98";
sha256 = "0jpw9008xghqmzjnikwq417p497lj7v9hkjbrach5p652yca07s8";
};
meta.homepage = "https://github.com/nvim-java/lua-async/";
};
lualine-lsp-progress = buildVimPlugin {
pname = "lualine-lsp-progress";
version = "2021-10-23";
@@ -9114,6 +9126,66 @@ final: prev:
meta.homepage = "https://github.com/idanarye/nvim-impairative/";
};
nvim-java = buildVimPlugin {
pname = "nvim-java";
version = "2024-12-24";
src = fetchFromGitHub {
owner = "nvim-java";
repo = "nvim-java";
rev = "e8e84413ca03e7d0541921e795b2e6bf8801f186";
sha256 = "0hhjhigmwydsa4wq5f6gkkv09bajvdyajg21k5xfqmh1mblxf5sr";
};
meta.homepage = "https://github.com/nvim-java/nvim-java/";
};
nvim-java-core = buildVimPlugin {
pname = "nvim-java-core";
version = "2024-12-25";
src = fetchFromGitHub {
owner = "nvim-java";
repo = "nvim-java-core";
rev = "22eca6b90b7e209299d99cbf60421f0ffdae5629";
sha256 = "1m9p3m97nmkvs4v34lv7sly9896l47ff73aa40r2x60y6z2b98pq";
};
meta.homepage = "https://github.com/nvim-java/nvim-java-core/";
};
nvim-java-dap = buildVimPlugin {
pname = "nvim-java-dap";
version = "2024-07-25";
src = fetchFromGitHub {
owner = "nvim-java";
repo = "nvim-java-dap";
rev = "55f239532f7a3789d21ea68d1e795abc77484974";
sha256 = "01fscbw226djimzscpa7n20gfzyhw952ar4dymyw18svp5vg5g2y";
};
meta.homepage = "https://github.com/nvim-java/nvim-java-dap/";
};
nvim-java-refactor = buildVimPlugin {
pname = "nvim-java-refactor";
version = "2024-07-25";
src = fetchFromGitHub {
owner = "nvim-java";
repo = "nvim-java-refactor";
rev = "ea1420fed5463c9cc976c2b4175f434b3646f0f7";
sha256 = "0jspnlfq0c69ki0nva3jv6zi3fxd0x4p33d8szj1nh4yg8a0qbhl";
};
meta.homepage = "https://github.com/nvim-java/nvim-java-refactor/";
};
nvim-java-test = buildVimPlugin {
pname = "nvim-java-test";
version = "2024-07-19";
src = fetchFromGitHub {
owner = "nvim-java";
repo = "nvim-java-test";
rev = "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468";
sha256 = "18jvkiy568i18r0cq0pyxjsispsvbbv40niyj98dlc04dzx618ba";
};
meta.homepage = "https://github.com/nvim-java/nvim-java-test/";
};
nvim-jdtls = buildVimPlugin {
pname = "nvim-jdtls";
version = "2024-11-26";
@@ -2129,6 +2129,41 @@ in
dependencies = [ self.nvim-treesitter ];
};
nvim-java = super.nvim-java.overrideAttrs {
dependencies = with self; [
lua-async-await
mason-nvim
nui-nvim
nvim-dap
nvim-java-core
nvim-java-dap
nvim-java-refactor
nvim-java-test
nvim-lspconfig
];
};
nvim-java-core = super.nvim-java-core.overrideAttrs {
dependencies = with self; [
mason-nvim
nvim-lspconfig
];
};
nvim-java-dap = super.nvim-java-dap.overrideAttrs {
dependencies = [ self.nvim-java-core ];
};
nvim-java-refactor = super.nvim-java-refactor.overrideAttrs {
dependencies = [ self.nvim-java-core ];
nvimSkipModule = [
# Requires the `java.utils.ui` module which seems to be provided by `nvim-java` (cyclic dependency)
# -> Skip to avoid infinite recursion
"java-refactor.action"
"java-refactor.refactor"
];
};
nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs {
dependencies = [ self.plenary-nvim ];
nvimRequireCheck = "lsp-file-operations";
@@ -528,6 +528,7 @@ https://github.com/deathbeam/lspecho.nvim/,HEAD,
https://github.com/onsails/lspkind.nvim/,,
https://github.com/nvimdev/lspsaga.nvim/,,
https://github.com/barreiroleo/ltex_extra.nvim/,HEAD,
https://github.com/nvim-java/lua-async-await/,HEAD,
https://github.com/arkav/lualine-lsp-progress/,,
https://github.com/nvim-lualine/lualine.nvim/,,
https://github.com/l3mon4d3/luasnip/,,
@@ -756,6 +757,9 @@ https://github.com/Iron-E/nvim-highlite/,,
https://github.com/kevinhwang91/nvim-hlslens/,,
https://github.com/neovimhaskell/nvim-hs.vim/,,
https://github.com/idanarye/nvim-impairative/,HEAD,
https://github.com/nvim-java/nvim-java/,HEAD,
https://github.com/nvim-java/nvim-java-core/,HEAD,
https://github.com/nvim-java/nvim-java-dap/,HEAD,
https://github.com/mfussenegger/nvim-jdtls/,,
https://github.com/gennaro-tedesco/nvim-jqx/,,
https://gitlab.com/usmcamp0811/nvim-julia-autotest,HEAD,
@@ -19,17 +19,17 @@
let
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
version = "1.152.0";
version = "1.152.1";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
tag = "v${version}";
hash = "sha256-ncgJGeQXOI/Sc5ZfjEGBOY0qiLQrg4/N6QIStWUuJ7s=";
hash = "sha256-ty2pZWMZ5ZFwwpLm22ChxVAf2cqmIimk8BWvMBqzmks=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust";
inherit version src;
hash = "sha256-kV42OSvYXzY5lim2MUxDADOIGiCUop7QKV6nl6IsPzs=";
hash = "sha256-wbk4/yhhIRPD3x8ghAwJ0lQy0k8GQopTBBT1a021FRo=";
};
};
electron = electron_32;
@@ -37,18 +37,18 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "deltachat-desktop";
version = "1.50.0";
version = "1.50.1";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
tag = "v${finalAttrs.version}";
hash = "sha256-0yVO9uIq70Oogt254+iHJv7p8mUeRpxVlJOcISJrKgo=";
hash = "sha256-G/qBGyx+vxkJvwmBYG5kpx01OO0C9dPji0Cafna9pyw=";
};
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-07jvAKY5GBrZ6EKY9yHwWESezjQXSjjRzImaG+yUlGc=";
hash = "sha256-UwfblmCkJOuy2Et5Rjm8ONWLbDmLppazqIk2+rV2RJU=";
};
nativeBuildInputs = [
+4 -6
View File
@@ -12,15 +12,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "deltatouch";
version = "1.8.0";
version = "1.10.2";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "lk108";
repo = "deltatouch";
rev = "v${finalAttrs.version}";
hash = "sha256-HVq6eiy2ufFg96oXwnSpv7fMDL1haWyIelBzFd7pfk0=";
fetchSubmodules = true;
hash = "sha256-QcrBo7lrMYkOZGSyS5fLAwNxZwKFrylU5P5my2Jl93k=";
};
nativeBuildInputs = [
@@ -36,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
lomiri.lomiri-ui-toolkit
lomiri.lomiri-ui-extras
lomiri.lomiri-api
lomiri.lomiri-indicator-network # Lomiri.Connectivity module
lomiri.qqc2-suru-style
];
@@ -48,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail 'assets/logo.svg DESTINATION assets' 'assets/logo.svg DESTINATION ''${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME deltatouch.svg' \
--replace-fail "\''${DESKTOP_FILE_NAME} DESTINATION \''${DATA_DIR}" "\''${DESKTOP_FILE_NAME} DESTINATION \''${CMAKE_INSTALL_DATAROOTDIR}/applications"
substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile}/CMakeLists.txt \
substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile,XdcPickerEngineProfile}/CMakeLists.txt \
--replace-fail 'set(QT_IMPORTS_DIR "/lib/''${ARCH_TRIPLET}")' 'set(QT_IMPORTS_DIR "${placeholder "out"}/${qt5.qtbase.qtQmlPrefix}")'
# Fix import of library dependencies
substituteInPlace plugins/{DeltaHandler,WebxdcEngineProfile}/CMakeLists.txt \
substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile,XdcPickerEngineProfile}/CMakeLists.txt \
--replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libdeltachat.so"' 'IMPORTED_LOCATION "${lib.getLib libdeltachat}/lib/libdeltachat.so"'
substituteInPlace plugins/DeltaHandler/CMakeLists.txt \
--replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libquirc.so.1.2"' 'IMPORTED_LOCATION "${lib.getLib quirc}/lib/libquirc.so"'
+9 -9
View File
@@ -7,15 +7,15 @@
openssl,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "flashmq";
version = "1.18.2";
version = "1.19.0";
src = fetchFromGitHub {
owner = "halfgaar";
repo = "FlashMQ";
rev = "v${version}";
hash = "sha256-sr3gKCovw5bhX9WsuiHQxwq/SaoLHOPCoNjtSop8ka8=";
tag = "v${finalAttrs.version}";
hash = "sha256-sMpXDriH/uko0zvrliK+knAcw2unBbDHQfYHG7brhTk=";
};
nativeBuildInputs = [
@@ -34,12 +34,12 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
meta = with lib; {
meta = {
description = "Fast light-weight MQTT broker/server";
mainProgram = "flashmq";
homepage = "https://www.flashmq.org/";
license = licenses.agpl3Only;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.linux;
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ sikmir ];
platforms = lib.platforms.linux;
};
}
})
+6 -1
View File
@@ -1,4 +1,8 @@
{ lib, fetchPypi, python3Packages }:
{
lib,
fetchPypi,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "frida-tools";
@@ -14,6 +18,7 @@ python3Packages.buildPythonApplication rec {
prompt-toolkit
colorama
frida-python
websockets
];
meta = {
+3 -3
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.152.0";
version = "1.152.2";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
tag = "v${version}";
hash = "sha256-ncgJGeQXOI/Sc5ZfjEGBOY0qiLQrg4/N6QIStWUuJ7s=";
hash = "sha256-NPdUHBge6k2BqWf6SxA35Tqo0xGjFIIU2t5dbdnbMGg=";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust";
inherit version src;
hash = "sha256-kV42OSvYXzY5lim2MUxDADOIGiCUop7QKV6nl6IsPzs=";
hash = "sha256-AbFtGL63wl2fo4rbxq8Hx8VvEw64sawtLHS8jQ496Vw=";
};
nativeBuildInputs = [
+3
View File
@@ -29,6 +29,9 @@ stdenv.mkDerivation rec {
"shared"
"CC=${stdenv.cc.targetPrefix}cc"
];
NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
enableParallelBuilding = true;
installFlags = [
+59
View File
@@ -0,0 +1,59 @@
{
lib,
buildGoModule,
fetchFromGitHub,
ast-grep,
versionCheckHook,
nix-update-script,
lipo-go,
}:
buildGoModule rec {
pname = "lipo-go";
version = "0.9.3";
src = fetchFromGitHub {
owner = "konoui";
repo = "lipo";
tag = "v${version}";
hash = "sha256-FW2mOsshpXCTTjijo0RFdsYX883P2cudyclRtvkCxa0=";
};
vendorHash = "sha256-7M6CRxJd4fgYQLJDkNa3ds3f7jOp3dyloOZtwMtCBQk=";
nativeBuildInputs = [ ast-grep ];
postPatch =
# Remove the test case that is not compatible with nix-build
''
ast-grep run \
--pattern 'func TestLipo_ArchsToLocalFiles($$$) { $$$ }' \
--rewrite "" \
pkg/lipo/archs_test.go
'';
buildPhase = ''
runHook preBuild
make build VERSION=${version} REVISION="" BINARY=$out/bin/lipo
runHook postBuild
'';
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/lipo";
versionCheckProgramArg = [ "-version" ];
doInstallCheck = true;
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Designed to be compatible with macOS lipo, written in golang";
homepage = "https://github.com/konoui/lipo";
changelog = "https://github.com/konoui/lipo/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ xiaoxiangmoe ];
mainProgram = "lipo";
};
}
+6 -1
View File
@@ -2,6 +2,7 @@
lib,
fetchFromGitHub,
php,
versionCheckHook,
}:
php.buildComposerProject2 (finalAttrs: {
@@ -11,12 +12,16 @@ php.buildComposerProject2 (finalAttrs: {
src = fetchFromGitHub {
owner = "netz98";
repo = "n98-magerun2";
rev = finalAttrs.version;
tag = finalAttrs.version;
hash = "sha256-1wHRzh/Fdxdgx70fIPNOIpqBX9IvYPJnV7CZ5hLQ0qE=";
};
vendorHash = "sha256-KULTijHG5717dDOfvB4yR+ztrB+mbYaosgmg8aV/GAs=";
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
meta = {
changelog = "https://magerun.net/category/magerun/";
description = "Swiss army knife for Magento2 developers";
+3 -3
View File
@@ -7,19 +7,19 @@
}:
let
pname = "open-webui";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
tag = "v${version}";
hash = "sha256-6jMlEA3GufTXikyg5txyTtpPzIfk6hA9zkg+015UnqY=";
hash = "sha256-vlaJv4CbhjbJbiNZHKsedS2vBXp44oE/7ZALgkPASHI=";
};
frontend = buildNpmPackage {
inherit pname version src;
npmDepsHash = "sha256-2Zu9YlkL3PY2MgN6NAjCVQL2f2CWXP0AsQcOGEs7B1g=";
npmDepsHash = "sha256-g47tK6BC6CE0hqdZbToQMB5QeNdufhO12xPrAjbfMTk=";
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
# Until this is solved, running python packages from the browser will not work.
+37 -20
View File
@@ -1,49 +1,66 @@
{
stdenv,
lib,
python3Packages,
fetchPypi,
fetchFromGitHub,
versionCheckHook,
gitUpdater,
}:
python3Packages.buildPythonApplication rec {
pname = "piston-cli";
version = "1.4.3";
format = "pyproject";
version = "1.5.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "qvDGVJcaMXUajdUQWl4W1dost8k0PsS9XX/o8uQrtfY=";
src = fetchFromGitHub {
owner = "Shivansh-007";
repo = "piston-cli";
tag = "v${version}";
hash = "sha256-5S+1YGoPMprWnlsTGGPHtlQT974TsFgct3jVPngTT1k=";
};
propagatedBuildInputs = with python3Packages; [
rich
build-system = [
python3Packages.poetry-core
];
dependencies = with python3Packages; [
appdirs
click
coloredlogs
more-itertools
prompt-toolkit
requests
rich
requests-cache
pygments
pyyaml
more-itertools
];
checkPhase = ''
$out/bin/piston --help > /dev/null
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'piston = "piston:main"' 'piston = "piston.cli:cli_app"'
'';
nativeBuildInputs = with python3Packages; [
poetry-core
];
pythonRelaxDeps = [
"rich"
"more-itertools"
"PyYAML"
"requests-cache"
];
meta = with lib; {
broken = stdenv.hostPlatform.isDarwin;
nativeCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
versionCheckProgram = "${placeholder "out"}/bin/piston";
pythonImportsCheck = [ "piston" ];
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = {
description = "Piston api tool";
homepage = "https://github.com/Shivansh-007/piston-cli";
license = licenses.mit;
maintainers = with maintainers; [ ethancedwards8 ];
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ ethancedwards8 ];
mainProgram = "piston";
};
}
+2 -2
View File
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "xmedcon";
version = "0.24.1";
version = "0.25.0";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "sha256-VIZRRSIesH0KzgzoPgonRRX8qilcb5cR8HcMNd1UbFg=";
sha256 = "sha256-UKM68H2AGfe4+keW/0ZxQwPsF2tTAZQCEZT9var+MHs=";
};
buildInputs = [
@@ -18,10 +18,10 @@
mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-whiskermenu-plugin";
version = "2.8.3";
version = "2.8.4";
rev-prefix = "v";
odd-unstable = false;
sha256 = "sha256-xRLvjRu/I+wsTWXUhrJUcrQz+JkZCYqoJSqYAYOztgg=";
sha256 = "sha256-ykb/1+BYT0JfDpp9ZKTSy88TmQdXOjsK/eW58ZGKdJQ=";
nativeBuildInputs = [
cmake
@@ -1,67 +1,36 @@
{
lib,
stdenv,
fetchurl,
fetchPypi,
buildPythonPackage,
typing-extensions,
darwin,
}:
let
version = "16.0.19";
format = "setuptools";
devkit = {
aarch64-darwin = fetchurl {
url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-macos-arm64.tar.xz";
hash = "sha256-5VAZnpHQ5wjl7IM96GhIKOfFYHFDKKOoSjN1STna2UA=";
};
x86_64-linux = fetchurl {
url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-linux-x86_64.tar.xz";
hash = "sha256-yNXNqv8eCbpdQKFShpAh6rUCEuItrOSNNLOjESimPdk=";
};
}.${stdenv.hostPlatform.system}
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
in
buildPythonPackage rec {
pname = "frida-python";
inherit version;
version = "16.5.7";
format = "wheel";
src = fetchPypi {
pname = "frida";
inherit version;
hash = "sha256-rikIjjn9wA8VL/St/2JJTcueimn+q/URbt9lw/+nalY=";
inherit version format;
hash = "sha256-+2P+Be7xDWBHesqcGupt6gGdUmda0zIp8HkyJqzGgio=";
platform = "manylinux1_x86_64";
abi = "abi3";
python = "cp37";
dist = "cp37";
};
postPatch = ''
mkdir assets
pushd assets
tar xvf ${devkit}
export FRIDA_CORE_DEVKIT=$PWD
popd
'';
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit";
propagatedBuildInputs = [ typing-extensions ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit
pythonImportsCheck = [
"frida"
"frida._frida"
];
pythonImportsCheck = [ "frida" ];
passthru = {
inherit devkit;
};
meta = {
description = "Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers (Python bindings)";
homepage = "https://www.frida.re";
license = lib.licenses.wxWindows;
maintainers = with lib.maintainers; [ s1341 ];
platforms = [ "aarch64-darwin" "x86_64-linux" ];
platforms = [
"x86_64-linux"
];
};
}
@@ -22,8 +22,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "pymatting";
repo = "pymatting";
# https://github.com/pymatting/pymatting/issues/92
rev = "afd2dec073cb08b8119300feec18c179a9d436f3";
tag = "v${version}";
hash = "sha256-AzdhRZgcT+gfLPZYKJLQUW7uLyXoRy6SP2raHWd9XUY=";
};