Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
cc89582356
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
xmrig.overrideAttrs (oldAttrs: rec {
|
||||
pname = "xmrig-mo";
|
||||
version = "6.16.2-mo2";
|
||||
version = "6.16.4-mo1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MoneroOcean";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o2TtkoKa4DQ6tM1GdKVEmkWoJvnvxQc514wwgsfTDnE=";
|
||||
sha256 = "sha256-OnKz/Sl/b0wpZ1tqeEXhNxNNmQJXBhv5YNnKu9aOVZA=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ buildGoModule rec {
|
|||
sha256 = "1vcwzksixc9n016gf8zavkdk7ba33zkmymclvjwb32pwsanvzdz7";
|
||||
};
|
||||
|
||||
vendorSha256 = "1yl9lmqvw70a6z0c85vkzvdzyzqjizfa1rahfw8gb175fax1f0sz";
|
||||
vendorSha256 = "0v4xk1ia6zhh4h2rgpinfl0hs300lk84vabm35mjahch7kmvfhvb";
|
||||
|
||||
nativeBuildInputs = [ go-bindata installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,18 +9,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "shellhub-agent";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shellhub-io";
|
||||
repo = "shellhub";
|
||||
rev = "v${version}";
|
||||
sha256 = "saaohHHjX9ws74SXlpP+V9cks0ddLkz04ceY14uoVhA=";
|
||||
sha256 = "A1634b3uxlILMpx/9jpCIApqAqofvD4ZPasVKL29Gtc=";
|
||||
};
|
||||
|
||||
modRoot = "./agent";
|
||||
|
||||
vendorSha256 = "sha256-Xfzk6Ts6+LzGaMTcbopGG6WT541nkAnZxq/3AlX81ks=";
|
||||
vendorSha256 = "sha256-LxJtLQr8djoRGznT5hL2agTgtZY6pFS8Zo0BwHDmugc=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -143,5 +143,6 @@ mkDerivation rec {
|
|||
maintainers = with maintainers; [ jb55 MP2E V ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
|
||||
mainProgram = "obs";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
106
pkgs/development/compilers/openjdk/openjfx/17.nix
Normal file
106
pkgs/development/compilers/openjdk/openjfx/17.nix
Normal file
|
|
@ -0,0 +1,106 @@
|
|||
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7
|
||||
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
|
||||
, ffmpeg, python3, ruby, icu68 }:
|
||||
|
||||
let
|
||||
major = "17";
|
||||
update = ".0.0.1";
|
||||
build = "+1";
|
||||
repover = "${major}${update}${build}";
|
||||
gradle_ = (gradle_7.override {
|
||||
java = openjdk17_headless;
|
||||
});
|
||||
|
||||
makePackage = args: stdenv.mkDerivation ({
|
||||
version = "${major}${update}${build}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openjdk";
|
||||
repo = "jfx";
|
||||
rev = repover;
|
||||
sha256 = "sha256-PSiE9KbF/4u9VyBl9PAMLGzKyGFB86/XByeh7vhL6Kw=";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg icu68 ];
|
||||
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
config = writeText "gradle.properties" (''
|
||||
CONF = Release
|
||||
JDK_HOME = ${openjdk17_headless.home}
|
||||
'' + args.gradleProperties or "");
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
ln -s $config gradle.properties
|
||||
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
|
||||
gradle --no-daemon $gradleFlags sdk
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
} // args);
|
||||
|
||||
# Fake build to pre-download deps into fixed-output derivation.
|
||||
# We run nearly full build because I see no other way to download everything that's needed.
|
||||
# Anyone who knows a better way?
|
||||
deps = makePackage {
|
||||
pname = "openjfx-deps";
|
||||
|
||||
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
|
||||
installPhase = ''
|
||||
find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \
|
||||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
|
||||
| sh
|
||||
rm -rf $out/tmp
|
||||
'';
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo=";
|
||||
};
|
||||
|
||||
in makePackage {
|
||||
pname = "openjfx-modular-sdk";
|
||||
|
||||
gradleProperties = ''
|
||||
COMPILE_MEDIA = true
|
||||
COMPILE_WEBKIT = false
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)"
|
||||
substituteInPlace build.gradle \
|
||||
--replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \
|
||||
--replace 'name: SWT_FILE_NAME' "files('$swtJar')"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
cp -r build/modular-sdk $out
|
||||
'';
|
||||
|
||||
stripDebugList = [ "." ];
|
||||
|
||||
postFixup = ''
|
||||
# Remove references to bootstrap.
|
||||
export openjdkOutPath='${openjdk17_headless.outPath}'
|
||||
find "$out" -name \*.so | while read lib; do
|
||||
new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
|
||||
patchelf --set-rpath "$new_refs" "$lib"
|
||||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk17_headless ];
|
||||
|
||||
passthru.deps = deps;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://openjdk.java.net/projects/openjfx/";
|
||||
license = licenses.gpl2;
|
||||
description = "The next-generation Java client toolkit";
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -19,11 +20,14 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "bc-python-hcl2";
|
||||
version = "0.3.24";
|
||||
version = "0.3.30";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-YsiMkTPRSKR4511csJOv9/Jf1b3TVUM7N2lInejdNrQ=";
|
||||
hash = "sha256-wfcTIPKbMPa7xpXzkFtxnxG2ZRFzTw35EP7f4zwHxcs=";
|
||||
};
|
||||
|
||||
# Nose is required during build process, so can not use `checkInputs`.
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boost-histogram";
|
||||
version = "1.2.1";
|
||||
version = "1.3.1";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "boost_histogram";
|
||||
inherit version;
|
||||
sha256 = "a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579";
|
||||
sha256 = "sha256-Mc05Zlbzo3g04H0wTNuE2ZBrwhcmJqPZL+V30IvPQQ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,27 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, six }:
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dict2xml";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0bfn8n8sb3slwx7ra8m8fbfy65k20h2qxcqfq99hwqrrkgcffihl";
|
||||
hash = "sha256-ZgCqMx8X7uODNhH3GJmkOnZhLKdVoVdpzyBJLEsaoBY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
pythonImportsCheck = [
|
||||
"dict2xml"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Super simple library to convert a Python dictionary into an xml string";
|
||||
description = "Library to convert a Python dictionary into an XML string";
|
||||
homepage = "https://github.com/delfick/python-dict2xml";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ johnazoidberg ];
|
||||
|
|
|
|||
|
|
@ -11,14 +11,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "georss-client";
|
||||
version = "0.14";
|
||||
version = "0.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-georss-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rviXXNmDLEVNYOCkqvLT9EXSuVpI5wMlCXnlpUUl1P0=";
|
||||
sha256 = "sha256-D1ggfEDU+vlFmi1USwdHj1due0PrCQCpKF4zaarHCFs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -32,7 +34,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "georss_client" ];
|
||||
pythonImportsCheck = [
|
||||
"georss_client"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for accessing GeoRSS feeds";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "georss-ingv-centro-nazionale-terremoti-client";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-georss-ingv-centro-nazionale-terremoti-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "1pd0qsr0n8f1169p2nz8s0zrbrxh0rdzaxdb3jmdymzp4xz28wb0";
|
||||
sha256 = "sha256-zqjo70NzpUt5zNEar0P1sl/gMb+ZcS+7GX7QGuFjMYY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -26,7 +28,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "georss_ingv_centro_nazionale_terremoti_client" ];
|
||||
pythonImportsCheck = [
|
||||
"georss_ingv_centro_nazionale_terremoti_client"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for accessing the INGV Centro Nazionale Terremoti GeoRSS feed";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ buildPythonApplication
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, click
|
||||
, fetchPypi
|
||||
, git
|
||||
, httpretty
|
||||
, lib
|
||||
, qrcode
|
||||
, pygments
|
||||
, pyopenssl
|
||||
|
|
@ -11,43 +11,54 @@
|
|||
, requests
|
||||
, rollbar
|
||||
, stripe
|
||||
, pythonOlder
|
||||
, sure
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gigalixir";
|
||||
version = "1.2.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw=";
|
||||
hash = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
pygments
|
||||
pyopenssl
|
||||
qrcode
|
||||
requests
|
||||
rollbar
|
||||
stripe
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
git
|
||||
httpretty
|
||||
pytestCheckHook
|
||||
sure
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'," "" \
|
||||
--replace "cryptography==" "cryptography>="
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
requests
|
||||
stripe
|
||||
rollbar
|
||||
pygments
|
||||
qrcode
|
||||
pyopenssl
|
||||
disabledTests = [
|
||||
# Test requires network access
|
||||
"test_rollback_without_version"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
httpretty
|
||||
sure
|
||||
pytestCheckHook
|
||||
git
|
||||
pythonImportsCheck = [
|
||||
"gigalixir"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "gigalixir" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gigalixir Command-Line Interface";
|
||||
homepage = "https://github.com/gigalixir/gigalixir-cli";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "0.34.0";
|
||||
version = "0.34.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-XgVZwCXdUae1BA3WUm+mJ+zmnqLpp13ht+FRJ3udmQk=";
|
||||
sha256 = "sha256-S2zbm0S6LhQSRW6wFdbvqZdXHqIqLRSkqxVTQdIRGT4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "holoviews";
|
||||
version = "1.14.7";
|
||||
version = "1.14.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8d8d171227e9c9eaadd4b037b3ddaa01055a33bacbdbeb57a5efbd273986665f";
|
||||
sha256 = "sha256-bDZVmaLLFnk7tifJtcVDCYK7WRyd6IhQAv+RtTm2ETM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,14 +16,16 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "iso4217";
|
||||
version = "1.7";
|
||||
version = "1.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dahlia";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Ih2l6bGM7i5TUkzJPkgx8EOOL4a3/qE28SUZS6M4sQc=";
|
||||
hash = "sha256-L0vx6Aan6D1lusgBh/pcT373ZTxbtWpQnFKB2V0dxlA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "1.2.83";
|
||||
version = "1.2.84";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-QOTRmr7x4vB8shyxSNt6HX9+JnQ9vODGSR9aVQu+WSM=";
|
||||
sha256 = "sha256-0ItNYdbGnIzgIh23Qtg9zQ5lm7zhY3qz+5s4MCfXN0E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
39
pkgs/development/python-modules/onvif-zeep-async/default.nix
Normal file
39
pkgs/development/python-modules/onvif-zeep-async/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, httpx
|
||||
, pythonOlder
|
||||
, zeep
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "onvif-zeep-async";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-O4H6oL9cFvgX6whoESA7eRI6+VoT1ncRk/tehQT1WcM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
zeep
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"onvif"
|
||||
];
|
||||
|
||||
# Tests are not shipped
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "ONVIF Client Implementation in Python";
|
||||
homepage = "https://github.com/hunterjm/python-onvif-zeep-async";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "0.16.4";
|
||||
version = "0.16.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "python-plugwise";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G1PpVqq66uBAigrFxJVvcIKdyL3zTKxcosgkZTjy3Is=";
|
||||
sha256 = "sha256-qvzocaqWIkhSdVm4x/pUIVtNBC0D5FRFEkonH7F6Oaw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -3,15 +3,19 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyeconet";
|
||||
version = "0.1.14";
|
||||
version = "0.1.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-x0mkC2k65VrDhv7UavgDUuRWIQoAJMDtA7jNXNUJuVg=";
|
||||
sha256 = "sha256-zxD2sjKWB/bmxwpVFgkKTngMhr4bVuW+qkSt+pbxqPY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -21,7 +25,10 @@ buildPythonPackage rec {
|
|||
|
||||
# Tests require credentials
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pyeconet" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyeconet"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface to the EcoNet API";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
|
@ -28,11 +29,14 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/nficano/humps/pull/240
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'version = "3.0.2"' 'version = "${version}"'
|
||||
'';
|
||||
patches = [
|
||||
# Fix naming, https://github.com/nficano/humps/pull/246
|
||||
(fetchpatch {
|
||||
name = "fix-naming.patch";
|
||||
url = "https://github.com/nficano/humps/commit/118f6bce785d170b10dd3afee467d26dcc8b425d.patch";
|
||||
sha256 = "sha256-oQxkLsihnHZlHiZEupwG9Dr1Ss1w+KjDsBtbEVDced4=";
|
||||
})
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"humps"
|
||||
|
|
|
|||
58
pkgs/development/python-modules/pyoverkiz/default.nix
Normal file
58
pkgs/development/python-modules/pyoverkiz/default.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, attrs
|
||||
, backoff
|
||||
, boto3
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pyhumps
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, warrant-lite
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.3.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KxZYluXa15RojAyNe5hA8Yf/Q9/mVl+b0TrDGRE6iuM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
aiohttp
|
||||
backoff
|
||||
pyhumps
|
||||
boto3
|
||||
warrant-lite
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyoverkiz"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to interact with the Somfy TaHoma API or other OverKiz APIs";
|
||||
homepage = "https://github.com/iMicknl/python-overkiz-api";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +1,32 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, requests }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, requests
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "2.65.0";
|
||||
version = "2.66.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2e55d4d7262085de9cef2228f14581925c35350ba58a332352b1ec9e19a7b7a6";
|
||||
hash = "sha256-d8YDIjD3cUsaG0WQdPCMYNYMIpucO+rDcnGQY+PRQJw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
# Tests require network connectivity and there's no easy way to disable them
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "stripe" ];
|
||||
pythonImportsCheck = [
|
||||
"stripe"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Stripe Python bindings";
|
||||
|
|
|
|||
45
pkgs/development/python-modules/wsdiscovery/default.nix
Normal file
45
pkgs/development/python-modules/wsdiscovery/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, netifaces
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wsdiscovery";
|
||||
version = "2.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andreikop";
|
||||
repo = "python-ws-discovery";
|
||||
rev = version;
|
||||
hash = "sha256-6LGZogNRCnmCrRXvHq9jmHwqW13KQPpaGaao/52JPtk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
netifaces
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"wsdiscovery"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "WS-Discovery implementation for Python";
|
||||
homepage = "https://github.com/andreikop/python-ws-discovery";
|
||||
license = with licenses; [ lgpl3Plus ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -32,13 +32,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.853";
|
||||
version = "2.0.859";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-qD6P3ppxckqiCB6wiypdVQtY+b3PN3dhuAQP5REDq3U=";
|
||||
hash = "sha256-uvuAMD/upr8mvK/YCvvlPGIZBMZ0SHxXMdv18NIsOYM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
rec {
|
||||
gen =
|
||||
|
||||
{ version, nativeVersion, sha256, defaultJava ? jdk8 }:
|
||||
{ version, nativeVersion, sha256, defaultJava ? jdk8, supportedPlatforms ? null }:
|
||||
|
||||
{ lib, stdenv, fetchurl, makeWrapper, unzip, java ? defaultJava
|
||||
, javaToolchains ? [ ], ncurses5, ncurses6 }:
|
||||
|
|
@ -87,7 +87,7 @@ rec {
|
|||
changelog = "https://docs.gradle.org/${version}/release-notes.html";
|
||||
downloadPage = "https://gradle.org/next-steps/?version=${version}";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
platforms = if (supportedPlatforms != null) then supportedPlatforms else platforms.unix;
|
||||
maintainers = with maintainers; [ lorenzleutgeb liff ];
|
||||
};
|
||||
};
|
||||
|
|
@ -100,6 +100,9 @@ rec {
|
|||
nativeVersion = "0.22-milestone-23";
|
||||
sha256 = "0d56bgd2m64pzmycjk29hwdlhbpn1kkm7fjik1sibn6vslw71hlc";
|
||||
defaultJava = jdk17;
|
||||
# Gradle 7 ships some binaries that are only available for some platforms
|
||||
# See https://github.com/gradle/native-platform#supported-platforms
|
||||
supportedPlatforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows" ];
|
||||
};
|
||||
|
||||
gradle_6 = gen {
|
||||
|
|
@ -107,6 +110,9 @@ rec {
|
|||
nativeVersion = "0.22-milestone-20";
|
||||
sha256 = "13qyk3f6namw27ynh6nxljxpk9r3l12vxl3f0qpglprdf3c6ydcb";
|
||||
defaultJava = jdk11;
|
||||
# Gradle 6 ships some binaries that are only available for some platforms
|
||||
# See https://github.com/gradle/native-platform#supported-platforms
|
||||
supportedPlatforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows" ];
|
||||
};
|
||||
|
||||
# NOTE: No GitHub Release for the following versions. `update.sh` will not work.
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-kWGj0THunXXv3fz9oRLPx314bBU8mdHElmz0v7ALNpE=";
|
||||
hash = "sha256-ZgLg+pIdTBxMNXgFFL8jCbQa444pkgtnSx+QjMqQhag=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vendir";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-vendir";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6f9UF0UgwKG3Mdgy85pW2KVjC8nbnMTwQJqIWxA3Jp4=";
|
||||
sha256 = "sha256-3l0ezObZK/QEmpBlqSm3R3e4pFM7KUnsxDrzvEYExnk=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -195,6 +195,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/";
|
||||
};
|
||||
|
||||
asyncrun-vim = buildVimPluginFrom2Nix {
|
||||
pname = "asyncrun.vim";
|
||||
version = "2022-02-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "skywind3000";
|
||||
repo = "asyncrun.vim";
|
||||
rev = "fc6d524b9d81850c15b9b374a1b4a1374e243ec3";
|
||||
sha256 = "/144rx2txz+VnPI8y4w1z9DY5nBEmp64arApRGiHQXU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/skywind3000/asyncrun.vim";
|
||||
};
|
||||
|
||||
ats-vim = buildVimPluginFrom2Nix {
|
||||
pname = "ats-vim";
|
||||
version = "2020-09-04";
|
||||
|
|
|
|||
|
|
@ -761,6 +761,7 @@ SirVer/ultisnips
|
|||
sjl/gundo.vim
|
||||
sjl/splice.vim
|
||||
sk1418/last256
|
||||
skywind3000/asyncrun.vim
|
||||
slashmili/alchemist.vim
|
||||
smiteshp/nvim-gps
|
||||
sodapopcan/vim-twiggy
|
||||
|
|
|
|||
|
|
@ -613,7 +613,7 @@
|
|||
"ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ];
|
||||
"onewire" = ps: with ps; [ pi1wire pyownet ];
|
||||
"onkyo" = ps: with ps; [ onkyo-eiscp ];
|
||||
"onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async
|
||||
"onvif" = ps: with ps; [ wsdiscovery ha-ffmpeg onvif-zeep-async ];
|
||||
"open_meteo" = ps: with ps; [ open-meteo ];
|
||||
"openalpr_cloud" = ps: with ps; [ ];
|
||||
"openalpr_local" = ps: with ps; [ ];
|
||||
|
|
@ -636,7 +636,7 @@
|
|||
"orvibo" = ps: with ps; [ orvibo ];
|
||||
"osramlightify" = ps: with ps; [ ]; # missing inputs: lightify
|
||||
"otp" = ps: with ps; [ pyotp ];
|
||||
"overkiz" = ps: with ps; [ ]; # missing inputs: pyoverkiz
|
||||
"overkiz" = ps: with ps; [ pyoverkiz ];
|
||||
"ovo_energy" = ps: with ps; [ ovoenergy ];
|
||||
"owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ];
|
||||
"ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ];
|
||||
|
|
@ -1388,6 +1388,7 @@
|
|||
"oncue"
|
||||
"ondilo_ico"
|
||||
"onewire"
|
||||
"onvif"
|
||||
"open_meteo"
|
||||
"openalpr_cloud"
|
||||
"openalpr_local"
|
||||
|
|
@ -1398,6 +1399,7 @@
|
|||
"openuv"
|
||||
"openweathermap"
|
||||
"opnsense"
|
||||
"overkiz"
|
||||
"ovo_energy"
|
||||
"owntracks"
|
||||
"ozw"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs }:
|
||||
{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs, bash }:
|
||||
|
||||
let
|
||||
zshCompletion = fetchurl {
|
||||
|
|
@ -8,11 +8,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tarsnap";
|
||||
version = "1.0.39";
|
||||
version = "1.0.40";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz";
|
||||
sha256 = "10i0whbmb345l2ggnf4vs66qjcyf6hmlr8f4nqqcfq0h5a5j24sn";
|
||||
sha256 = "1mbzq81l4my5wdhyxyma04sblr43m8p7ryycbpi6n78w1hwfbjmw";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
|
|||
patchPhase = ''
|
||||
substituteInPlace Makefile.in \
|
||||
--replace "command -p mv" "mv"
|
||||
substituteInPlace configure \
|
||||
--replace "command -p getconf PATH" "echo $PATH"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,20 +1,22 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, testVersion
|
||||
, alejandra
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alejandra";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kamadorueda";
|
||||
repo = "alejandra";
|
||||
rev = version;
|
||||
hash = "sha256-jj66PRqXASDNzdidkdfF2ezWM45Pw9Z+G4YNe8HRPhU=";
|
||||
sha256 = "sha256-bM+z3s7oG0+8P7TVmyw7NW3eavN109zgsw9exUSQCaQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-701lWa/2u10vCSRplL1ebYz29DxjpHY0SqjSWme1X1U=";
|
||||
cargoSha256 = "sha256-GxQxyUyrDKTf+7cye0Ob/le06GnAI+FMGCUB5dts+k0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Uncompromising Nix Code Formatter";
|
||||
|
|
@ -22,4 +24,8 @@ rustPlatform.buildRustPackage rec {
|
|||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ _0x4A6F kamadorueda ];
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
version = testVersion { package = alejandra; };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12542,8 +12542,8 @@ with pkgs;
|
|||
|
||||
hugs = callPackage ../development/interpreters/hugs { };
|
||||
|
||||
inherit (javaPackages) openjfx11 openjfx15;
|
||||
openjfx = openjfx15;
|
||||
inherit (javaPackages) openjfx11 openjfx15 openjfx17;
|
||||
openjfx = openjfx17;
|
||||
|
||||
openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
|
||||
openjdk8 = javaPackages.compiler.openjdk8;
|
||||
|
|
|
|||
|
|
@ -8,9 +8,10 @@ let
|
|||
|
||||
openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { };
|
||||
openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { };
|
||||
openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { };
|
||||
|
||||
in {
|
||||
inherit mavenbuild fetchMaven openjfx11 openjfx15;
|
||||
inherit mavenbuild fetchMaven openjfx11 openjfx15 openjfx17;
|
||||
|
||||
compiler = let
|
||||
|
||||
|
|
@ -170,7 +171,7 @@ in {
|
|||
../development/compilers/openjdk/darwin/17.nix
|
||||
{
|
||||
inherit openjdk17-bootstrap;
|
||||
openjfx = openjfx15;
|
||||
openjfx = openjfx17;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5635,6 +5635,8 @@ in {
|
|||
|
||||
onnx = callPackage ../development/python-modules/onnx { };
|
||||
|
||||
onvif-zeep-async = callPackage ../development/python-modules/onvif-zeep-async { };
|
||||
|
||||
oocsi = callPackage ../development/python-modules/oocsi { };
|
||||
|
||||
open-garage = callPackage ../development/python-modules/open-garage { };
|
||||
|
|
@ -6139,6 +6141,8 @@ in {
|
|||
|
||||
pynx584 = callPackage ../development/python-modules/pynx584 { };
|
||||
|
||||
pyoverkiz = callPackage ../development/python-modules/pyoverkiz { };
|
||||
|
||||
pyownet = callPackage ../development/python-modules/pyownet { };
|
||||
|
||||
pypoint = callPackage ../development/python-modules/pypoint { };
|
||||
|
|
@ -10541,6 +10545,8 @@ in {
|
|||
|
||||
ws4py = callPackage ../development/python-modules/ws4py { };
|
||||
|
||||
wsdiscovery = callPackage ../development/python-modules/wsdiscovery { };
|
||||
|
||||
wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { };
|
||||
|
||||
wsgiprox = callPackage ../development/python-modules/wsgiprox { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue