Merge master into staging-next
This commit is contained in:
commit
96a0e614c8
|
@ -56,8 +56,6 @@ in {
|
|||
systemd = {
|
||||
packages = [ config.boot.kernelPackages.hyperv-daemons.lib ];
|
||||
|
||||
services.hv-vss.unitConfig.ConditionPathExists = [ "/dev/vmbus/hv_vss" ];
|
||||
|
||||
targets.hyperv-daemons = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import ./make-test-python.nix {
|
||||
name = "ntfy-sh";
|
||||
|
||||
nodes.machine = { ... }: {
|
||||
services.ntfy-sh.enable = true;
|
||||
|
|
|
@ -94,5 +94,8 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ figsoda ];
|
||||
meta = with lib; (super.nvim-treesitter.meta or { }) // {
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -305,7 +305,7 @@ rec {
|
|||
if checkPhase == null then ''
|
||||
runHook preCheck
|
||||
${stdenv.shellDryRun} "$target"
|
||||
${shellcheck}/bin/shellcheck "$target"
|
||||
${shellcheck.unwrapped}/bin/shellcheck "$target"
|
||||
runHook postCheck
|
||||
''
|
||||
else checkPhase;
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.28";
|
||||
version = "9.2.29";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6+3lZygQEezEbGIMbB6NINjVDkgt5sYO2FV5wpienuY=";
|
||||
hash = "sha256-Yso47p4d8buJTdXOrm7luvtxpFu+oTFhqTBueQaXqII=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, prometheus-client
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohttp-openmetrics";
|
||||
version = "0.0.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-GIVUkjyn+iQSMZZ6dNmmimvbt+t+uxOYv2QEDk/dA+g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
prometheus-client
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aiohttp_openmetrics" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenMetrics provider for aiohttp";
|
||||
homepage = "https://github.com/jelmer/aiohttp-openmetrics/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.28";
|
||||
version = "9.2.29";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-16/hocVfd2RI8qQ9Qt7EM/gGfyGpWabyZhtfwOscqQY=";
|
||||
hash = "sha256-cAruoJhQpxK/+sRcyoLoBlG35b11UV2Tjwt2+QUx46E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.28";
|
||||
version = "9.2.29";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LUrLO9BFbpB2p6PtTZPdpLsGHPh088aPHIyoxgv4dGg=";
|
||||
hash = "sha256-kS7NTlZnWwcvuRV/Eq3K0MJ/bGYcR5BWIbdPONuTqII=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.28";
|
||||
version = "9.2.29";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CGYX8IzVBqhF0IenTFKtx79J81X6UGkvm/XvFovnHYE=";
|
||||
hash = "sha256-X2c1TVbf/KTUOfjQ8Izt+vyxhQrAki3hCBBwKxgkxbw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.28";
|
||||
version = "9.2.29";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
|
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t3TO1rHf5iA+9WW3Adi37fL7XjRUZFPowUWchX9eEVI=";
|
||||
hash = "sha256-fK0j6+UqQVadQPU34oLp50gB+/0YnNnNg/rGuIt5I54=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "geopandas";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "geopandas";
|
||||
repo = "geopandas";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aLERNVojPgZ3Y7+CnirGvC4RfuQf+K3Oj2/0BqdorwI=";
|
||||
hash = "sha256-ntOZ2WCoMz5ZpqPeupqPC3cN8mbQmEAvJGaFblu0ibY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -62,6 +62,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python geospatial data analysis framework";
|
||||
homepage = "https://geopandas.org";
|
||||
changelog = "https://github.com/geopandas/geopandas/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ knedlsepp ];
|
||||
};
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, attrs
|
||||
, django
|
||||
, pytestCheckHook
|
||||
, parso
|
||||
|
@ -10,20 +11,23 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jedi";
|
||||
version = "0.18.1";
|
||||
version = "0.18.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davidhalter";
|
||||
repo = "jedi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wWNPNi16WtefvB7GcQBnWMbHVlVzxSFs4TKRqEasuR0=";
|
||||
hash = "sha256-hNRmUFpRzVKJQAtfsSNV4jeTR8vVj1+mGBIPO6tUGto=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ parso ];
|
||||
|
||||
checkInputs = [
|
||||
attrs
|
||||
django
|
||||
pytestCheckHook
|
||||
];
|
||||
|
@ -44,8 +48,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/davidhalter/jedi";
|
||||
description = "An autocompletion tool for Python that can be used for text editors";
|
||||
homepage = "https://github.com/davidhalter/jedi";
|
||||
changelog = "https://github.com/davidhalter/jedi/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "line-profiler";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6" || isPyPy;
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "line_profiler";
|
||||
inherit version;
|
||||
hash = "sha256-eXlt/5BUxtIZDnRz3umqXqkYqDcgYX5+goSzwBmneek=";
|
||||
hash = "sha256-JejJ1CSNxIkFgBhR/4p1ucdIJ6CHHRGNEQTY5D1/sPw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.18.8";
|
||||
version = "0.18.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-DRJhqHpeGbDzqhym6z9wCmzTz3VpnwJMdDKFT5vMVUE=";
|
||||
hash = "sha256-Ihaz/izB9L6osu3CPwBWOwLZ2JOLKhsDuqOUf/B02qI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wzDi4C/XUykoTxgoDneQzWplTlo0bGUODM38Eza4fUY=";
|
||||
hash = "sha256-PN09TaJZR/REQPIgrm9XR+mXvR1evMAWGQziAzpg+fE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -3,30 +3,46 @@
|
|||
, fetchPypi
|
||||
, hatchling
|
||||
, ipykernel
|
||||
, jedi
|
||||
, jupyter_core
|
||||
, pexpect
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "metakernel";
|
||||
version = "0.29.2";
|
||||
version = "0.29.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-A++uLR4hhOQYmA6o9wBTejFju3CpbK0hwIs7XFscddQ=";
|
||||
hash = "sha256-kxrF/Msxjht7zGs0aEcL/Sf0qwcLiSoDPDUlE7Lrcmg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ ipykernel ];
|
||||
propagatedBuildInputs = [
|
||||
ipykernel
|
||||
jedi
|
||||
jupyter_core
|
||||
pexpect
|
||||
];
|
||||
|
||||
# Tests hang, so disable
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"metakernel"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Jupyter/IPython Kernel Tools";
|
||||
homepage = "https://github.com/Calysto/metakernel";
|
||||
changelog = "https://github.com/Calysto/metakernel/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ thomasjm ];
|
||||
};
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "moderngl";
|
||||
version = "5.7.3";
|
||||
version = "5.7.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fi7pauMSUSGkSI2ifPg/q1MiApyUg1j2OERcuq20ncQ=";
|
||||
hash = "sha256-IPghv2aygRvIZI189/ZEAq//dhn+onH0Km7oX+A+QEE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "omegaconf";
|
||||
version = "2.2.3";
|
||||
version = "2.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "omry";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sJUYi0M/6SBSeKVSJoNY7IbVmzRZVTlek8AyL2cOPAM=";
|
||||
hash = "sha256-Qxa4uIiX5TAyQ5rFkizdev60S4iVAJ08ES6FpNqf8zI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -46,6 +46,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Framework for configuring complex applications";
|
||||
homepage = "https://github.com/omry/omegaconf";
|
||||
changelog = "https://github.com/omry/omegaconf/blob/v${version}/NEWS.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
|
|
|
@ -1,24 +1,41 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, flake8, mock, nose, pytest
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, flake8
|
||||
, mock
|
||||
, nose
|
||||
, pytest
|
||||
, cryptography
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-vapid";
|
||||
version = "1.8.2";
|
||||
version = "1.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "874f21910f2103c56228cded941d6e733dd8f1eb12876137919533bfacb65a48";
|
||||
hash = "sha256-BmSreJl0LvKyhzl6TUYe9pHtDML1hyBRKNjPYX/9uRk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cryptography ];
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
];
|
||||
|
||||
checkInputs = [ flake8 mock nose pytest ];
|
||||
checkInputs = [
|
||||
flake8
|
||||
mock
|
||||
nose
|
||||
pytest
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "VAPID is a voluntary standard for WebPush subscription providers";
|
||||
description = "Library for VAPID header generation";
|
||||
homepage = "https://github.com/mozilla-services/vapid";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-remotedata";
|
||||
version = "0.3.3";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "66920bf1c62928b079d0e611379111a0d49f10a9509ced54c8269514ccce6ee3";
|
||||
hash = "sha256-viHFWONNfBGw9q61CVbAlSC//NArf86cb46FMaQBocg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -48,6 +48,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Pytest plugin for controlling remote data access";
|
||||
homepage = "https://github.com/astropy/pytest-remotedata";
|
||||
changelog = "https://github.com/astropy/pytest-remotedata/blob/v${version}/CHANGES.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.28";
|
||||
version = "9.2.29";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fDsJqilxIt/LApXVrTm3JyOrZ6BR0+IbnFux/huF2ZU=";
|
||||
hash = "sha256-buqtEiifBKbR7FP08ne5v0nWqkO+d2cVHxNCCZJDrdU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "open-policy-agent";
|
||||
version = "0.47.2";
|
||||
version = "0.47.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "opa";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OAL7sYR4SFFQbRhVTx3NAQiDTr5l/4ejtFTVnT1idCU=";
|
||||
sha256 = "sha256-c82v/4+HdBLNsJM1kO6A6rfywU4J7a3h5LW/T731vxw=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
@ -37,6 +37,11 @@ let
|
|||
install -Dm644 shellcheck.1 $man/share/man/man1/shellcheck.1
|
||||
mkdir $out
|
||||
'';
|
||||
|
||||
passthru = ShellCheck.passthru or {} // {
|
||||
# pandoc takes long to build and documentation isn't needed for in nixpkgs usage
|
||||
unwrapped = ShellCheck;
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
|
|
|
@ -113,6 +113,9 @@ let
|
|||
mkdir -pv $out/share/minetest/games/minetest_game/
|
||||
cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/
|
||||
patchShebangs $out
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv $out/minetest.app $out/Applications
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -73,9 +73,9 @@ in stdenv.mkDerivation {
|
|||
buildCommand = ''
|
||||
system=$lib/lib/systemd/system
|
||||
|
||||
install -Dm444 ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service
|
||||
install -Dm444 ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service
|
||||
install -Dm444 ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service
|
||||
install -Dm444 ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service
|
||||
install -Dm444 ${service "kvp" "key-value pair (KVP)" "hv_kvp" } $system/hv-kvp.service
|
||||
install -Dm444 ${service "vss" "volume shadow copy (VSS)" "hv_vss" } $system/hv-vss.service
|
||||
|
||||
cat > $system/hyperv-daemons.target <<EOF
|
||||
[Unit]
|
||||
|
|
|
@ -6,19 +6,27 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "prometheus-xmpp-alerts";
|
||||
version = "0.5.3";
|
||||
version = "0.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jelmer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gb7lFRqqw4w/B+Sw0iteDkuGsPfw/ZZ+sRMTu5vxIUo=";
|
||||
sha256 = "sha256-PwShGS1rbfZCK5OS6Cnn+mduOpWAD4fC69mcGB5GB1c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "bs4" "beautifulsoup4"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
prometheus-alertmanager
|
||||
] ++ (with python3Packages; [
|
||||
aiohttp
|
||||
aiohttp-openmetrics
|
||||
beautifulsoup4
|
||||
jinja2
|
||||
slixmpp
|
||||
prometheus-client
|
||||
pyyaml
|
||||
|
@ -29,6 +37,8 @@ python3Packages.buildPythonApplication rec {
|
|||
pytz
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "prometheus_xmpp" ];
|
||||
|
||||
meta = {
|
||||
description = "XMPP Web hook for Prometheus";
|
||||
homepage = "https://github.com/jelmer/prometheus-xmpp-alerts";
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
{ lib, pkgs, nodejs, stdenv, buildGoModule, fetchFromGitHub, debianutils, mkdocs, python3, python3Packages }:
|
||||
{ lib, pkgs, stdenv, buildGoModule, fetchFromGitHub, nixosTests
|
||||
, nodejs, debianutils, mkdocs, python3, python3Packages }:
|
||||
|
||||
|
||||
let
|
||||
nodeDependencies = (import ./node-composition.nix {
|
||||
|
@ -8,16 +10,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "ntfy-sh";
|
||||
version = "1.28.0";
|
||||
version = "1.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "binwiederhier";
|
||||
repo = "ntfy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pDKeG0Q4cG+UoxpBawHOtO8xVXXxo0Z7nyY2nZSSFvc=";
|
||||
sha256 = "sha256-ikXhST+fvXu7FBeoYMzPq2LhpAw3gfaES1WlhnRO8BY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-oMZCjrCsq6aRxcdF6jQK51sZqOjbrdlbofSQvGO/POg=";
|
||||
vendorSha256 = "sha256-VVqaQFluqV77/+Asu9xSBpCvoYr276UE3Yg+iNkxP0o=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -41,10 +43,15 @@ buildGoModule rec {
|
|||
DISABLE_ESLINT_PLUGIN=true npm_config_offline=true make web-build docs-build
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests.ntfy-sh = nixosTests.ntfy-sh;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Send push notifications to your phone or desktop via PUT/POST";
|
||||
homepage = "https://ntfy.sh";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ arjan-s ];
|
||||
maintainers = with maintainers; [ arjan-s fpletz ];
|
||||
};
|
||||
}
|
||||
|
|
1637
pkgs/tools/misc/ntfy-sh/node-packages.nix
generated
1637
pkgs/tools/misc/ntfy-sh/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -23,8 +23,8 @@
|
|||
}:
|
||||
let
|
||||
pname = "qFlipper";
|
||||
version = "1.2.1";
|
||||
sha256 = "sha256-6pfkZfT/8DNZGIdc8YvHN2TPyhDqHU6e3mqtAZOpHLo=";
|
||||
version = "1.2.2";
|
||||
sha256 = "sha256-zlw1WUKmx93EwgR2FSEovo9570MsDRWtI6IAuAOvBJ0=";
|
||||
timestamp = "99999999999";
|
||||
commit = "nix-${version}";
|
||||
|
||||
|
|
|
@ -17985,7 +17985,7 @@ with pkgs;
|
|||
shards;
|
||||
|
||||
shellcheck = callPackage ../development/tools/shellcheck {
|
||||
inherit (haskellPackages) ShellCheck;
|
||||
inherit (__splicedPackages.haskellPackages) ShellCheck;
|
||||
};
|
||||
|
||||
shellharden = callPackage ../development/tools/shellharden {};
|
||||
|
|
|
@ -198,6 +198,8 @@ self: super: with self; {
|
|||
|
||||
aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
|
||||
|
||||
aiohttp-openmetrics = callPackage ../development/python-modules/aiohttp-openmetrics { };
|
||||
|
||||
aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { };
|
||||
|
||||
aiohttp-retry = callPackage ../development/python-modules/aiohttp-retry { };
|
||||
|
|
Loading…
Reference in a new issue