Merge staging-next into staging
This commit is contained in:
@@ -9109,6 +9109,12 @@
|
||||
githubId = 7047019;
|
||||
name = "Florent Becker";
|
||||
};
|
||||
galabovaa = {
|
||||
name = "Ivet Galabova";
|
||||
email = "galabovaa@gmail.com";
|
||||
github = "galabovaa";
|
||||
githubId = 4016566;
|
||||
};
|
||||
galagora = {
|
||||
email = "lightningstrikeiv@gmail.com";
|
||||
github = "Galagora";
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.84.132";
|
||||
version = "1.84.135";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-/3LF5T/Y7eyjrDZMJ6UtBmjqxSZTsBcJJ6LtDG3Xnvc=";
|
||||
hash = "sha256-DekkbvOpVn+NDSzltiafsS7cE2QbVn47mIaVvXUQUUM=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-UPV4krI4jnXNNL6RjvhO/ftxS53eWernG1YVVI2AXbg=";
|
||||
hash = "sha256-mPZqszSPkMC77eUY+CpTzYbbDKMKt7LoM6lncgBqSFo=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-FzWiCVwscggFgjKLd4thp1j3A5xMn4AjCSE3PvaBYR0=";
|
||||
hash = "sha256-yC1XS1NdJ6kTd16kK/MlVV5KYoMVgRAr8/JLOdr+r74=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-CBjBfqy9n5/WH2NBc1GUz13n8KyqhryTx849gMUq+j8=";
|
||||
hash = "sha256-Au42zUX21ZFvfNyrNRb3sWH+c+DGqqGUulbK02Xjrsg=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -2,18 +2,19 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "changedetection-io";
|
||||
version = "0.49.4";
|
||||
version = "0.50.14";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgtlmoon";
|
||||
repo = "changedetection.io";
|
||||
tag = version;
|
||||
hash = "sha256-EmtJ8XXPb75W4VPj4Si9fdzVLDKVfm+8P6UZZlMpMdI=";
|
||||
hash = "sha256-zxCb2mmCicjDxilj/l8HabJm2FsFQB0yLNaRiIDltwI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
@@ -22,14 +23,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||
with python3.pkgs;
|
||||
[
|
||||
apprise
|
||||
beautifulsoup4
|
||||
brotli
|
||||
babel
|
||||
beautifulsoup4
|
||||
blinker
|
||||
brotli
|
||||
chardet
|
||||
cryptography
|
||||
dnspython
|
||||
elementpath
|
||||
eventlet
|
||||
extruct
|
||||
feedgen
|
||||
flask
|
||||
@@ -39,45 +39,62 @@ python3.pkgs.buildPythonApplication rec {
|
||||
flask-login
|
||||
flask-paginate
|
||||
flask-restful
|
||||
flask-socketio
|
||||
flask-wtf
|
||||
gevent
|
||||
greenlet
|
||||
inscriptis
|
||||
janus
|
||||
jinja2
|
||||
jinja2-time
|
||||
jsonpath-ng
|
||||
jq
|
||||
jsonpath-ng
|
||||
jsonschema
|
||||
levenshtein
|
||||
loguru
|
||||
lxml
|
||||
openapi-core
|
||||
openpyxl
|
||||
paho-mqtt
|
||||
playwright
|
||||
pyee
|
||||
pyppeteer
|
||||
panzi-json-logic
|
||||
pluggy
|
||||
price-parser
|
||||
psutil
|
||||
pyppeteer-ng
|
||||
# pyppeteerstealth
|
||||
python-engineio
|
||||
python-magic
|
||||
python-socketio
|
||||
pytz
|
||||
referencing
|
||||
requests
|
||||
requests-file
|
||||
selenium
|
||||
setuptools
|
||||
timeago
|
||||
urllib3
|
||||
tzdata
|
||||
validators
|
||||
werkzeug
|
||||
wtforms
|
||||
]
|
||||
++ requests.optional-dependencies.socks;
|
||||
++ requests.optional-dependencies.socks
|
||||
++ openapi-core.optional-dependencies.flask;
|
||||
|
||||
# tests can currently not be run in one pytest invocation and without docker
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytest-flask
|
||||
pytestCheckHook
|
||||
];
|
||||
pythonImportsCheck = [ "changedetectionio" ];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Self-hosted free open source website change detection tracking, monitoring and notification service";
|
||||
homepage = "https://github.com/dgtlmoon/changedetection.io";
|
||||
changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${src.tag}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mikaelfangel ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
mikaelfangel
|
||||
thanegill
|
||||
];
|
||||
mainProgram = "changedetection.io";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,20 +16,20 @@ let
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/linux/x64/Cursor-1.7.52-x86_64.AppImage";
|
||||
hash = "sha256-nhDDdXE5/m9uASiQUJ4GHfApkzkf9ju5b8s0h6BhpjQ=";
|
||||
url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/x64/Cursor-2.0.64-x86_64.AppImage";
|
||||
hash = "sha256-zT9GhdwGDWZJQl+WpV2txbmp3/tJRtL6ds1UZQoKNzA=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/linux/arm64/Cursor-1.7.52-aarch64.AppImage";
|
||||
hash = "sha256-96zL0pmcrEyDEy8oW2qWk6RM8XGE4Gd2Aa3Hhq0qvk0=";
|
||||
url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/arm64/Cursor-2.0.64-aarch64.AppImage";
|
||||
hash = "sha256-1pN9LfnplKyVUxlICQ2KsxcAn++dZY9hGR4XubHxLUY=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/darwin/x64/Cursor-darwin-x64.dmg";
|
||||
hash = "sha256-0//Sv57iEgRm/exnUnKVpdyk6fwxAnx0PDg2mVaB9J8=";
|
||||
url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/x64/Cursor-darwin-x64.dmg";
|
||||
hash = "sha256-lY5BJeauw5VtWuaAu8C9C2inmKFvv/OnCxOicE2Zs48=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/darwin/arm64/Cursor-darwin-arm64.dmg";
|
||||
hash = "sha256-g8Fk9+MDwzLTNitxJMApypfiLWEjze0PR2OIPC774j8=";
|
||||
url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/arm64/Cursor-darwin-arm64.dmg";
|
||||
hash = "sha256-IIJbuRdxTG7kSspspWk8GH9KZsKPyLJahz0iqSvP1B0=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -39,7 +39,7 @@ in
|
||||
inherit useVSCodeRipgrep;
|
||||
commandLineArgs = finalCommandLineArgs;
|
||||
|
||||
version = "1.7.52";
|
||||
version = "2.0.64";
|
||||
pname = "cursor";
|
||||
|
||||
# You can find the current VSCode version in the About dialog:
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geographiclib";
|
||||
version = "2.6";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geographiclib";
|
||||
repo = "geographiclib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-G0D44iP3ApYlxNxF+hrB20v3X+4gp2p94gQLygqgB3E=";
|
||||
hash = "sha256-xqrt7KeYyYB90kuvn2qmK8VI3RVQuIhNN8qCzV//yko=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -170,11 +170,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "142.0.7444.59";
|
||||
version = "142.0.7444.134";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-j7WXeRIyuqwvwWGtds4g20kKM+wWkj0R7O/nw6kdsPo=";
|
||||
hash = "sha256-exTjuvwv/W2nemvBHyliD74At7i6ZcKypT9xaVPzcAE=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -272,11 +272,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "142.0.7444.60";
|
||||
version = "142.0.7444.135";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/pgkesp3xybyklm4wlxch42zlny_142.0.7444.60/GoogleChrome-142.0.7444.60.dmg";
|
||||
hash = "sha256-OhtURSA1rH6j7Bxp0Mg3kGREd44lwVbqH2gEnG8wrFg=";
|
||||
url = "http://dl.google.com/release2/chrome/e7ds3jjlib5cryamafm2t5wjce_142.0.7444.135/GoogleChrome-142.0.7444.135.dmg";
|
||||
hash = "sha256-kU6DBUW/O/RzbQUNQiKfuu3+h4ys22mg5nF0oKBPNy8=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gscreenshot";
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thenaterhood";
|
||||
repo = "gscreenshot";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-y5G2eJ5G6FpH01n1/YTcjPh6u58N0nJO6gcC9yEr+84=";
|
||||
sha256 = "sha256-ZdywZhH59L5fk1EB+o6fSj9zCOljS7T/HWpUd2tTl0o=";
|
||||
};
|
||||
|
||||
# needed for wrapGAppsHook3 to function
|
||||
|
||||
@@ -8,23 +8,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "highs";
|
||||
version = "1.10.0";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ERGO-Code";
|
||||
repo = "HiGHS";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CzHE2d0CtScexdIw95zHKY1Ao8xFodtfSNNkM6dNCac=";
|
||||
hash = "sha256-FRiYtbl1kWEkHHEIIOpefC9UdusmJKl6UmP3dKRkAXA=";
|
||||
};
|
||||
|
||||
# CMake Error in CMakeLists.txt:
|
||||
# Imported target "highs::highs" includes non-existent path
|
||||
# "/include"
|
||||
# in its INTERFACE_INCLUDE_DIRECTORIES.
|
||||
postPatch = ''
|
||||
sed -i "/CMAKE_CUDA_PATH/d" src/CMakeLists.txt
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
outputs = [ "out" ];
|
||||
@@ -48,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
mainProgram = "highs";
|
||||
maintainers = with maintainers; [ silky ];
|
||||
maintainers = with maintainers; [
|
||||
galabovaa
|
||||
silky
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "2.24.0";
|
||||
version = "2.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chatmail";
|
||||
repo = "core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OCC1qHeDSJJcbTmsyVKiwzXiIQAmofu/EhF56cRJ3kE=";
|
||||
hash = "sha256-pW1+9aljtnYJmlJOj+m0aQekYO5IsL0fduR7kIAPdN8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "chatmail-core";
|
||||
inherit version src;
|
||||
hash = "sha256-/PRIVdW2pnioqaYoIX/87cBbPezRaSbX5RWN6yuwpe8=";
|
||||
hash = "sha256-iIC9wE7P2SKeCMtc/hFTRaOGXD2F7kh1TptOoes/Qi0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,14 +2,13 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitea,
|
||||
fetchpatch,
|
||||
jdupes,
|
||||
fixDarwinDylibNames,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libjodycode";
|
||||
version = "4.1";
|
||||
version = "4.1.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -22,22 +21,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "jbruchon";
|
||||
repo = "libjodycode";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IBOCl5iFxKwanA28JG4wEzy9tNb6TznKK8RJET8CtSY=";
|
||||
hash = "sha256-vuFANaQLJjyRTw+0ggye4TpFiqVa50GaRVKboagsJ7Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix linux build failure, drop after 4.1 release.
|
||||
(fetchpatch {
|
||||
name = "linux-build-fix.patch";
|
||||
url = "https://codeberg.org/jbruchon/libjodycode/commit/07294bbfd6c3c4be42c40c9ed81eebb5cd3d83a0.patch";
|
||||
hash = "sha256-qgP8MgGenGebM7n5zpPJ1WTsYUTCZwcWUloUKToc1eo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
|
||||
env.PREFIX = placeholder "out";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit jdupes;
|
||||
};
|
||||
|
||||
@@ -43,11 +43,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "saga";
|
||||
version = "9.10.0";
|
||||
version = "9.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-xsXOB4WCzkZhH/mIYEUQNiQ9NnX+0CF2IcWkmwEJBUA=";
|
||||
hash = "sha256-6V7KSdaU3TkdsGr6ll7Q8oSH7/rItgSrgN7Fjn+f9dM=";
|
||||
};
|
||||
|
||||
sourceRoot = "saga-${finalAttrs.version}/saga-gis";
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
python3,
|
||||
yosys,
|
||||
yices,
|
||||
boolector,
|
||||
z3,
|
||||
aiger,
|
||||
btor2tools,
|
||||
@@ -19,13 +18,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sby";
|
||||
version = "0.57";
|
||||
version = "0.58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "sby";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vhgLP2twPPGsey5lzmt/zUFme4GjIdWgRyWoCHxLxRU=";
|
||||
hash = "sha256-msQ+aqdp8i5KMLUABYU6vA5VBkI6G3zF06RrQzfJucY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -44,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Fix various executable references
|
||||
substituteInPlace sbysrc/sby_core.py \
|
||||
--replace-fail '"/usr/bin/env", "bash"' '"${lib.getExe bash}"' \
|
||||
--replace-fail ', "btormc"' ', "${lib.getExe' boolector "btormc"}"' \
|
||||
--replace-fail ', "aigbmc"' ', "${lib.getExe' aiger "aigbmc"}"'
|
||||
|
||||
substituteInPlace sbysrc/sby_core.py \
|
||||
@@ -73,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3
|
||||
python3.pkgs.xmlschema
|
||||
yosys
|
||||
boolector
|
||||
yices
|
||||
z3
|
||||
aiger
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swayidle";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "swayidle";
|
||||
rev = version;
|
||||
hash = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fxDwRfAXb9D6epLlyWnXpy9g8V3ovJRpQ/f3M4jxY/s=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "teams-for-linux";
|
||||
version = "2.6.7";
|
||||
version = "2.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8jIQbeUhGBqVSz6tO48wTbwcJig+xnL8sIsROtEBsv4=";
|
||||
hash = "sha256-jx58Bg/jMGqf9M/Ss4cYIHtuUmtkej67ScrcttSxNhg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-DKHQwJb9y75jX+h2XNudyn6mYnT9GywwBhZZtkknKKE=";
|
||||
npmDepsHash = "sha256-tgLO4EsD3j5mg3c9M+I8jkeytw2ZrgQsKs10aryaFhw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -23,6 +25,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"--skip=test_cli_interface"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \
|
||||
--bash <($out/bin/${finalAttrs.meta.mainProgram} completion bash) \
|
||||
--zsh <($out/bin/${finalAttrs.meta.mainProgram} completion zsh) \
|
||||
--fish <($out/bin/${finalAttrs.meta.mainProgram} completion fish)
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
@@ -30,6 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
meta = {
|
||||
description = "OpenTelemetry tool for dealing with semantic conventions and application telemetry schemas";
|
||||
homepage = "https://github.com/open-telemetry/weaver";
|
||||
changelog = "https://github.com/open-telemetry/weaver/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ aaronjheng ];
|
||||
mainProgram = "weaver";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "werf";
|
||||
version = "2.51.1";
|
||||
version = "2.51.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8tmBzwvuYv3FvSNFpu51fYZP1nqQHtfKioY6eycf7W8=";
|
||||
hash = "sha256-xka8poabuG1Bwmo+Q+VeWLZIkKSY9+k5JHYTO2ecz2I=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "avro";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ytnFOyPO7Wmceva93O1C4sVy/WtAjCV6fU/E6M8uLWs=";
|
||||
hash = "sha256-xbjdLdTBCBbw3BJ8wpz9Q7XkBc9+aEDolGCgJL89CY0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -14,11 +14,12 @@
|
||||
redis,
|
||||
redisTestHook,
|
||||
sortedcontainers,
|
||||
valkey,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fakeredis";
|
||||
version = "2.30.3";
|
||||
version = "2.32.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -27,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "dsoftwareinc";
|
||||
repo = "fakeredis-py";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SQVLuO5cA+XO7hEBph7XGlnomTcysB3ye9jZ8sy9GAI=";
|
||||
hash = "sha256-esouWM32qe4iO5AcRC0HuUF+lwEDHnyXoknwqsZhr+o=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -35,6 +36,7 @@ buildPythonPackage rec {
|
||||
dependencies = [
|
||||
redis
|
||||
sortedcontainers
|
||||
valkey
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
@@ -60,6 +62,14 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
"test_init_args" # AttributeError: module 'fakeredis' has no attribute 'FakeValkey'
|
||||
"test_async_init_kwargs" # AttributeError: module 'fakeredis' has no attribute 'FakeAsyncValkey'"
|
||||
|
||||
# KeyError: 'tot-mem'
|
||||
"test_acl_log_auth_exist"
|
||||
"test_acl_log_invalid_channel"
|
||||
"test_acl_log_invalid_key"
|
||||
"test_client_id"
|
||||
"test_client_info"
|
||||
"test_client_list"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@@ -1,28 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
configargparse,
|
||||
fetchFromGitHub,
|
||||
gevent,
|
||||
hatch-vcs,
|
||||
hatchling,
|
||||
lib,
|
||||
platformdirs,
|
||||
python-engineio,
|
||||
python-socketio,
|
||||
requests,
|
||||
gevent-websocket,
|
||||
tomli,
|
||||
flask,
|
||||
requests-mock,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "locust-cloud";
|
||||
version = "1.27.0";
|
||||
version = "1.27.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "locustcloud";
|
||||
repo = "locust-cloud";
|
||||
tag = version;
|
||||
hash = "sha256-K69VIyQggwWQQoMld0JpzmtJRQc6HYrKAGA6E9O69MQ=";
|
||||
hash = "sha256-7k1IZNBVkz+E5WW/wZWpB+yl/W7ONuHlUM8wOKvu0ow=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -40,9 +44,37 @@ buildPythonPackage rec {
|
||||
tomli
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
flask
|
||||
gevent-websocket
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "locust_cloud" ];
|
||||
|
||||
preCheck = ''
|
||||
export LOCUSTCLOUD_USERNAME=dummy
|
||||
export LOCUSTCLOUD_PASSWORD=dummy
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError
|
||||
"test_recursive_imports"
|
||||
"test_from_import_file"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests require network access
|
||||
"tests/web_login_test.py"
|
||||
"tests/cloud_test.py"
|
||||
"tests/websocket_test.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Hosted version of Locust to run distributed load tests";
|
||||
homepage = "https://www.locust.cloud/";
|
||||
homepage = "https://github.com/locustcloud/locust-cloud";
|
||||
changelog = "https://github.com/locustcloud/locust-cloud/releases/tag/${src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ magicquark ];
|
||||
};
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
locust-cloud,
|
||||
psutil,
|
||||
pyquery,
|
||||
pytest,
|
||||
pyzmq,
|
||||
requests,
|
||||
retry,
|
||||
@@ -27,14 +28,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "locust";
|
||||
version = "2.37.14";
|
||||
version = "2.42.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "locustio";
|
||||
repo = "locust";
|
||||
tag = version;
|
||||
hash = "sha256-16pMl72OIZlAi6jNx0qv0TO9RTm6O9CgiE84sndsEhc=";
|
||||
hash = "sha256-yyG4HVti0BAcGWQHID799YfkCEIBmpTkUUm8QzXMivc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -65,6 +66,7 @@ buildPythonPackage rec {
|
||||
"flask-login"
|
||||
# version 6.0.1 is listed as 0.0.1 in the dependency check and 0.0.1 is not >= 3.0.10
|
||||
"flask-cors"
|
||||
"requests"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
@@ -81,6 +83,7 @@ buildPythonPackage rec {
|
||||
requests
|
||||
tomli
|
||||
werkzeug
|
||||
pytest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "locust" ];
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
missingHashes = ./missing-hashes.json;
|
||||
yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes;
|
||||
hash = "sha256-FbKaU3wezuvcn98FOcUZbmoot/iHtmeStp4n0dNwFYA=";
|
||||
hash = "sha256-dxt7rRA6kh0msjy3DAUvtj7LoE7vEaf4pmP2B95HoeY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
unittestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "panzi-json-logic";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "panzi";
|
||||
repo = "panzi-json-logic";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-P34+7SckMtiCTZbdKsjztNam+/HWtcVQEnGPMoPBw3g=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ unittestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "json_logic" ];
|
||||
|
||||
meta = {
|
||||
description = "Pure Python 3 JsonLogic and CertLogic implementation.";
|
||||
homepage = "https://github.com/panzi/panzi-json-logic";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ thanegill ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
pytest-cov,
|
||||
attrs,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "price-parser";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scrapinghub";
|
||||
repo = "price-parser";
|
||||
tag = version;
|
||||
hash = "sha256-9f/+Yw94SVvg9fl9zYR9YEMwAgKHwySG5cysPMomnA0=";
|
||||
};
|
||||
|
||||
dependencies = [ attrs ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "price_parser" ];
|
||||
|
||||
meta = {
|
||||
description = "Extract price amount and currency symbol from a raw text string";
|
||||
homepage = "https://github.com/scrapinghub/price-parser";
|
||||
changelog = "https://github.com/scrapinghub/price-parser/blob/${version}/CHANGES.rst";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ thanegill ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,160 @@
|
||||
{
|
||||
lib,
|
||||
aenum,
|
||||
aiohttp,
|
||||
appdirs,
|
||||
buildPythonPackage,
|
||||
certifi,
|
||||
diff-match-patch,
|
||||
fetchFromGitHub,
|
||||
flake8,
|
||||
importlib-metadata,
|
||||
livereload,
|
||||
mypy,
|
||||
networkx,
|
||||
ordered-set,
|
||||
pillow,
|
||||
pixelmatch,
|
||||
poetry-core,
|
||||
pre-commit,
|
||||
pydocstyle,
|
||||
pyee,
|
||||
pylint,
|
||||
pytest,
|
||||
pytest-cov,
|
||||
pytest-timeout,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
readme-renderer,
|
||||
sphinx,
|
||||
sphinxcontrib-asyncio,
|
||||
syncer,
|
||||
tox,
|
||||
tqdm,
|
||||
typing-extensions,
|
||||
typing-inspect,
|
||||
urllib3,
|
||||
websockets,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyppeteer-ng";
|
||||
version = "2.0.0rc10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgtlmoon";
|
||||
repo = "pyppeteer-ng";
|
||||
tag = version;
|
||||
hash = "sha256-NpxjKsh12pr/MCZ4gfoaa+3jTYyvQzHgSno1+rw2Wk0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'aenum = "^2.2.3"' 'aenum = "*"' \
|
||||
--replace-fail 'typing_inspect = { version ="^0.5.0"' 'typing_inspect = { version ="*"' \
|
||||
--replace-fail 'urllib3 = "^1.25.8"' 'urllib3 = "*"' \
|
||||
--replace-fail 'websockets = "^10.1"' 'websockets = "*"' \
|
||||
--replace-fail 'requires = ["poetry>=0.12"]' 'requires = ["poetry-core"]' \
|
||||
--replace-fail 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"'
|
||||
|
||||
substituteInPlace tests/conftest.py \
|
||||
--replace-fail '_port = get_free_port()' ""
|
||||
|
||||
substituteInPlace tests/utils/server.py \
|
||||
--replace-fail '_Middleware' '_Middlewares' \
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aenum
|
||||
appdirs
|
||||
certifi
|
||||
ordered-set
|
||||
pillow
|
||||
pyee
|
||||
tqdm
|
||||
typing-inspect
|
||||
typing-extensions
|
||||
urllib3
|
||||
websockets
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiohttp
|
||||
diff-match-patch
|
||||
flake8
|
||||
livereload
|
||||
mypy
|
||||
networkx
|
||||
pixelmatch
|
||||
pre-commit
|
||||
pydocstyle
|
||||
pylint
|
||||
pytest
|
||||
pytest-cov
|
||||
pytest-timeout
|
||||
pytest-xdist
|
||||
readme-renderer
|
||||
sphinx
|
||||
sphinxcontrib-asyncio
|
||||
syncer
|
||||
tox
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requires network access
|
||||
"tests/test_abnormal_crash.py"
|
||||
"tests/test_accessibility.py"
|
||||
"tests/test_browser.py"
|
||||
"tests/test_browser_context.py"
|
||||
"tests/test_browser_fetcher.py"
|
||||
"tests/test_click.py"
|
||||
"tests/test_connection.py"
|
||||
"tests/test_coverage.py"
|
||||
"tests/test_dialog.py"
|
||||
"tests/test_element_handle.py"
|
||||
"tests/test_emulation.py"
|
||||
"tests/test_execution_context.py"
|
||||
"tests/test_frame.py"
|
||||
"tests/test_input.py"
|
||||
"tests/test_jshandle.py"
|
||||
"tests/test_keyboard.py"
|
||||
"tests/test_launcher.py"
|
||||
"tests/test_mouse.py"
|
||||
"tests/test_navigation.py"
|
||||
"tests/test_page.py"
|
||||
"tests/test_pyppeteer.py"
|
||||
"tests/test_queryselector.py"
|
||||
"tests/test_requestinterception.py"
|
||||
"tests/test_screenshot.py"
|
||||
"tests/test_target.py"
|
||||
"tests/test_touchscreen.py"
|
||||
"tests/test_tracing.py"
|
||||
"tests/test_worker.py"
|
||||
|
||||
# Failing
|
||||
"pyee12-compat/connection_stability_test.py"
|
||||
"pyee12-compat/pyee_compatibility_test.py"
|
||||
"pyee12-compat/real_websocket_test.py"
|
||||
"pyee12-compat/simple_connection_test.py"
|
||||
"pyee12-compat/simplified_test.py"
|
||||
"tests/test_misc.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyppeteer" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Headless chrome/chromium automation library (unofficial port of puppeteer)";
|
||||
mainProgram = "pyppeteer-install";
|
||||
homepage = "https://github.com/dgtlmoon/pyppeteer-ng";
|
||||
changelog = "https://github.com/dgtlmoon/pyppeteer-ng/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ thanegill ];
|
||||
};
|
||||
}
|
||||
@@ -18,22 +18,25 @@
|
||||
|
||||
# tests
|
||||
msgpack,
|
||||
pytest7CheckHook,
|
||||
pytestCheckHook,
|
||||
simple-websocket,
|
||||
uvicorn,
|
||||
redis,
|
||||
valkey,
|
||||
pytest-asyncio,
|
||||
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-socketio";
|
||||
version = "5.13.0";
|
||||
version = "5.14.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelgrinberg";
|
||||
repo = "python-socketio";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-iOipxGALYOXLvUwn6OSjLCMZoUl7u4S5eCktUgcs/X0=";
|
||||
hash = "sha256-2zts0gkwAoUCC8S1UDg0PlBaFH23jTv04hgGblHSX7c=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -53,9 +56,12 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
msgpack
|
||||
pytest7CheckHook
|
||||
pytestCheckHook
|
||||
uvicorn
|
||||
simple-websocket
|
||||
redis
|
||||
valkey
|
||||
pytest-asyncio
|
||||
]
|
||||
++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "streamlit";
|
||||
version = "1.50.0";
|
||||
version = "1.51.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hyIdVoqsWFJ0oF7xijeLA98zK5PggQP//PPNhNhSr0Y=";
|
||||
hash = "sha256-HnQqnAtpj0Zsb1v1jTM77aWh++jeZgdDl2eRtcFEbvY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -11530,6 +11530,8 @@ self: super: with self; {
|
||||
|
||||
panphon = callPackage ../development/python-modules/panphon { };
|
||||
|
||||
panzi-json-logic = callPackage ../development/python-modules/panzi-json-logic { };
|
||||
|
||||
paperbush = callPackage ../development/python-modules/paperbush { };
|
||||
|
||||
papermill = callPackage ../development/python-modules/papermill { };
|
||||
@@ -12275,6 +12277,8 @@ self: super: with self; {
|
||||
|
||||
prettytable = callPackage ../development/python-modules/prettytable { };
|
||||
|
||||
price-parser = callPackage ../development/python-modules/price-parser { };
|
||||
|
||||
primecountpy = callPackage ../development/python-modules/primecountpy { };
|
||||
|
||||
primepy = callPackage ../development/python-modules/primepy { };
|
||||
@@ -13961,6 +13965,8 @@ self: super: with self; {
|
||||
|
||||
pyppeteer = callPackage ../development/python-modules/pyppeteer { };
|
||||
|
||||
pyppeteer-ng = callPackage ../development/python-modules/pyppeteer-ng { };
|
||||
|
||||
pyppmd = callPackage ../development/python-modules/pyppmd { };
|
||||
|
||||
pyprecice = callPackage ../development/python-modules/pyprecice {
|
||||
|
||||
Reference in New Issue
Block a user