Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
238f504755
27 changed files with 255 additions and 69 deletions
|
|
@ -8588,6 +8588,12 @@
|
|||
githubId = 7845120;
|
||||
name = "Alex Martens";
|
||||
};
|
||||
nialov = {
|
||||
email = "nikolasovaskainen@gmail.com";
|
||||
github = "nialov";
|
||||
githubId = 47318483;
|
||||
name = "Nikolas Ovaskainen";
|
||||
};
|
||||
nikitavoloboev = {
|
||||
email = "nikita.voloboev@gmail.com";
|
||||
github = "nikitavoloboev";
|
||||
|
|
|
|||
|
|
@ -278,6 +278,11 @@ in {
|
|||
"bluetooth_tracker"
|
||||
"bluetooth_le_tracker"
|
||||
];
|
||||
componentsUsingPing = [
|
||||
# Components that require the capset syscall for the ping wrapper
|
||||
"ping"
|
||||
"wake_on_lan"
|
||||
];
|
||||
componentsUsingSerialDevices = [
|
||||
# Components that require access to serial devices (/dev/tty*)
|
||||
# List generated from home-assistant documentation:
|
||||
|
|
@ -382,6 +387,8 @@ in {
|
|||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
] ++ optionals (any useComponent componentsUsingPing) [
|
||||
"capset"
|
||||
];
|
||||
UMask = "0077";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -119,6 +119,30 @@ ${cfg.extraConfig}
|
|||
|
||||
hasLocalPostgresDB = let args = cfg.database_args; in
|
||||
usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ]));
|
||||
|
||||
registerNewMatrixUser =
|
||||
let
|
||||
isIpv6 = x: lib.length (lib.splitString ":" x) > 1;
|
||||
listener =
|
||||
lib.findFirst (
|
||||
listener: lib.any (
|
||||
resource: lib.any (
|
||||
name: name == "client"
|
||||
) resource.names
|
||||
) listener.resources
|
||||
) (lib.last cfg.listeners) cfg.listeners;
|
||||
in
|
||||
pkgs.writeShellScriptBin "matrix-synapse-register_new_matrix_user" ''
|
||||
exec ${cfg.package}/bin/register_new_matrix_user \
|
||||
$@ \
|
||||
${lib.concatMapStringsSep " " (x: "-c ${x}") ([ configFile ] ++ cfg.extraConfigFiles)} \
|
||||
"${listener.type}://${
|
||||
if (isIpv6 listener.bind_address) then
|
||||
"[${listener.bind_address}]"
|
||||
else
|
||||
"${listener.bind_address}"
|
||||
}:${builtins.toString listener.port}/"
|
||||
'';
|
||||
in {
|
||||
options = {
|
||||
services.matrix-synapse = {
|
||||
|
|
@ -294,7 +318,7 @@ in {
|
|||
description = ''
|
||||
List of resources to host on this listener.
|
||||
'';
|
||||
example = ["client" "webclient" "federation"];
|
||||
example = ["client" "federation"];
|
||||
};
|
||||
compress = mkOption {
|
||||
type = types.bool;
|
||||
|
|
@ -319,7 +343,7 @@ in {
|
|||
tls = true;
|
||||
x_forwarded = false;
|
||||
resources = [
|
||||
{ names = ["client" "webclient"]; compress = true; }
|
||||
{ names = ["client"]; compress = true; }
|
||||
{ names = ["federation"]; compress = false; }
|
||||
];
|
||||
}];
|
||||
|
|
@ -792,6 +816,8 @@ in {
|
|||
UMask = "0077";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ registerNewMatrixUser ];
|
||||
};
|
||||
|
||||
imports = [
|
||||
|
|
|
|||
|
|
@ -49,6 +49,12 @@ in {
|
|||
payload_on = "let_there_be_light";
|
||||
payload_off = "off";
|
||||
}];
|
||||
wake_on_lan = {};
|
||||
switch = [{
|
||||
platform = "wake_on_lan";
|
||||
mac = "00:11:22:33:44:55";
|
||||
host = "127.0.0.1";
|
||||
}];
|
||||
# tests component-based capability assignment (CAP_NET_BIND_SERVICE)
|
||||
emulated_hue = {
|
||||
host_ip = "127.0.0.1";
|
||||
|
|
@ -99,6 +105,10 @@ in {
|
|||
print("\n### home-assistant.log ###\n")
|
||||
print(output_log + "\n")
|
||||
|
||||
# wait for home-assistant to fully boot
|
||||
hass.sleep(30)
|
||||
hass.wait_for_unit("home-assistant.service")
|
||||
|
||||
with subtest("Check that no errors were logged"):
|
||||
assert "ERROR" not in output_log
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,12 @@ buildGoPackage rec {
|
|||
|
||||
subPackages = [ "." ];
|
||||
|
||||
preBuild = ''
|
||||
pushd go/src/github.com/git-lfs/git-lfs
|
||||
go generate ./commands
|
||||
popd
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
make -C go/src/${goPackagePath} man
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,27 +1,42 @@
|
|||
{ fetchFromGitHub, python, lib }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
with python.pkgs;
|
||||
buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gitless";
|
||||
version = "0.8.8";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitless-vcs";
|
||||
repo = "gitless";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xo5EWtP2aN8YzP8ro3bnxZwUGUp0PHD0g8hk+Y+gExE=";
|
||||
hash = "sha256-xo5EWtP2aN8YzP8ro3bnxZwUGUp0PHD0g8hk+Y+gExE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ sh pygit2 clint ];
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
sh
|
||||
pygit2
|
||||
clint
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pygit2==0.28.2" "pygit2>=0.28.2"
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"gitless"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Version control system built on top of Git";
|
||||
homepage = "https://gitless.com/";
|
||||
description = "A version control system built on top of Git";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cransom ];
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.cransom ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }:
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc, pystray, tkinter }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "plex-mpv-shim";
|
||||
|
|
@ -11,7 +11,7 @@ buildPythonApplication rec {
|
|||
sha256 = "0hgv9g17dkrh3zbsx27n80yvkgix9j2x0rgg6d3qsf7hp5j3xw4r";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ];
|
||||
propagatedBuildInputs = [ mpv requests python-mpv-jsonipc pystray tkinter ];
|
||||
|
||||
# does not contain tests
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
let
|
||||
unwrapped = python3Packages.buildPythonPackage rec {
|
||||
pname = "qtile";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qtile";
|
||||
repo = "qtile";
|
||||
rev = "v${version}";
|
||||
sha256 = "BLHGVPMQd8O4h5TVx/F/klzSra+FZYogp22V6Yq04T0=";
|
||||
sha256 = "TRmul3t//izJRdViTvxFz29JZeGYsWc7WsJjagQ35nw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.71.0";
|
||||
version = "1.72.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = version;
|
||||
hash = "sha256-zpjg7R6/fmDfvFTsooak3B+gwbCadwxiQfbKREqEXY8=";
|
||||
hash = "sha256-/StX22pSQtfOYbBTFL7vh0Y0V038Ohyq+qoDECITD80=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-BHjb2mtB7b2KhQtdlLwDPg7plkS3uYku7AfxRExQhfs=";
|
||||
hash = "sha256-Jwf95oTyGsOikVMKAg+EaDNY78VW+kECD+lhNePSKWE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest-asyncio
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, siosocks
|
||||
|
|
@ -29,7 +28,6 @@ buildPythonPackage rec {
|
|||
checkInputs = [
|
||||
async-timeout
|
||||
pytest-asyncio
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
trustme
|
||||
];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, pydevccu
|
||||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, python-slugify
|
||||
, pythonOlder
|
||||
, voluptuous
|
||||
, websocket-client
|
||||
|
|
@ -13,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "0.21.2";
|
||||
version = "0.27.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -22,11 +23,12 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-oD4HXdzlQJZ/+ceF9zfmGs6S8DEVoxzLv5h/IURJnOY=";
|
||||
sha256 = "sha256-RPUj0We1nsKgAl1DTpa3pCD7gMm590N00+xwOVFIOaw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
python-slugify
|
||||
voluptuous
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydevccu";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-bLXACJPiHZlJzoDm7N9RWskN+qQddSkGFX9d4YcTaLo=";
|
||||
sha256 = "sha256-awTy1yQdiKvqcUb8ecgOMhgpzpF7HvFZw/W8urA92LU=";
|
||||
};
|
||||
|
||||
# Module has no tests
|
||||
|
|
|
|||
48
pkgs/development/python-modules/pygeos/default.nix
Normal file
48
pkgs/development/python-modules/pygeos/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python
|
||||
, geos
|
||||
, pytestCheckHook
|
||||
, cython
|
||||
, numpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygeos";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PEFULvZ8ZgFfRDrj5uaDUDqKIh+cJPsjgPauQq7RYAo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
geos # for geos-config
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
# The cythonized extensions are required to exist in the pygeos/ directory
|
||||
# for the package to function. Therefore override of buildPhase was
|
||||
# necessary.
|
||||
buildPhase = ''
|
||||
${python.interpreter} setup.py build_ext --inplace
|
||||
${python.interpreter} setup.py bdist_wheel
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pygeos" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wraps GEOS geometry functions in numpy ufuncs.";
|
||||
homepage = "https://github.com/pygeos/pygeos";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ nialov ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -12,21 +12,27 @@
|
|||
, wayland
|
||||
, pywayland
|
||||
, xkbcommon
|
||||
, xorg
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywlroots";
|
||||
version = "0.14.12";
|
||||
version = "0.15.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "80v1kuiYL3OdtDVJj0EvgrO9x1eN8xxUyRuI4Wb4giI=";
|
||||
sha256 = "sCHeiD6KugHZLtxcVcLggdHC1gqCxStuHy1065TbGiY=";
|
||||
};
|
||||
|
||||
# The XWayland detection uses some hard-coded FHS paths. Since we
|
||||
# know wlroots was built with xwayland support, replace its
|
||||
# detection with `return True`.
|
||||
patches = [ ./xwayland.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
propagatedNativeBuildInputs = [ cffi ];
|
||||
buildInputs = [ libinput libxkbcommon pixman udev wayland wlroots ];
|
||||
buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots ];
|
||||
propagatedBuildInputs = [ cffi pywayland xkbcommon ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
|
|
@ -40,6 +46,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/flacjacket/pywlroots";
|
||||
description = "Python bindings to wlroots using cffi";
|
||||
license = licenses.ncsa;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ chvp ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
25
pkgs/development/python-modules/pywlroots/xwayland.patch
Normal file
25
pkgs/development/python-modules/pywlroots/xwayland.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
diff --git a/wlroots/ffi_build.py b/wlroots/ffi_build.py
|
||||
index bb07ff8..f19efe3 100644
|
||||
--- a/wlroots/ffi_build.py
|
||||
+++ b/wlroots/ffi_build.py
|
||||
@@ -55,19 +55,7 @@ def has_xwayland() -> bool:
|
||||
Check for XWayland headers. If present, wlroots was built with XWayland support, so
|
||||
pywlroots can be too.
|
||||
"""
|
||||
- try:
|
||||
- FFI().verify(
|
||||
- "#include <wlr/xwayland.h>",
|
||||
- define_macros=[("WLR_USE_UNSTABLE", 1)],
|
||||
- include_dirs=["/usr/include/pixman-1", include_dir.as_posix()],
|
||||
- )
|
||||
- return True
|
||||
- except VerificationError:
|
||||
- print("If XWayland support is not required, ignore the above error message.")
|
||||
- print(
|
||||
- "If support is required, ensure wlroots was built with -Dxwayland=enabled."
|
||||
- )
|
||||
- return False
|
||||
+ return True
|
||||
|
||||
|
||||
# backend.h
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcs-api-client";
|
||||
version = "0.20.9";
|
||||
version = "0.20.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "rigetti";
|
||||
repo = "qcs-api-client-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bQ+5TZzjxGnNRsENEW/sN7sF6SOcgWl4MFtLekD0D+8=";
|
||||
hash = "sha256-pBC8pFrk6iNYPS3/LKaVo+ds2okN56bxzvffEfs6SrU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -30,6 +30,13 @@ buildPythonPackage rec {
|
|||
pytest-trio
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Timeout on Hydra
|
||||
"tests/test_trio.py"
|
||||
"tests/test_sansio.py"
|
||||
"tests/test_socketserver.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"siosocks"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
|
|
@ -32,6 +32,8 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "sunpy";
|
||||
version = "3.1.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
|
|
@ -40,36 +42,36 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
astropy-extension-helpers
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
matplotlib
|
||||
pandas
|
||||
asdf
|
||||
astropy
|
||||
astropy-helpers
|
||||
h5netcdf
|
||||
parfive
|
||||
sqlalchemy
|
||||
scikitimage
|
||||
towncrier
|
||||
glymur
|
||||
beautifulsoup4
|
||||
drms
|
||||
glymur
|
||||
h5netcdf
|
||||
matplotlib
|
||||
numpy
|
||||
pandas
|
||||
parfive
|
||||
python-dateutil
|
||||
zeep
|
||||
scikitimage
|
||||
scipy
|
||||
sqlalchemy
|
||||
towncrier
|
||||
tqdm
|
||||
asdf
|
||||
zeep
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
pytest-astropy
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# darwin has write permission issues
|
||||
|
|
@ -81,11 +83,20 @@ buildPythonPackage rec {
|
|||
|
||||
disabledTests = [
|
||||
"rst"
|
||||
"test_sunpy_warnings_logging"
|
||||
"test_main_nonexisting_module"
|
||||
"test_main_stdlib_module"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/helioprojective-1.0.0.yaml"
|
||||
"sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentric-1.0.0.yaml"
|
||||
"sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliographic_carrington-*.yaml"
|
||||
"sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/geocentricearthequatorial-1.0.0.yaml"
|
||||
"sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/geocentricsolarecliptic-1.0.0.yaml"
|
||||
"sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentricearthecliptic-1.0.0.yaml"
|
||||
"sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentricinertial-1.0.0.yaml"
|
||||
"sunpy/io/special/asdf/schemas/sunpy.org/sunpy/map/generic_map-1.0.0.yaml"
|
||||
# requires mpl-animators package
|
||||
"sunpy/map/tests/test_compositemap.py"
|
||||
"sunpy/map/tests/test_mapbase.py"
|
||||
|
|
@ -100,17 +111,24 @@ buildPythonPackage rec {
|
|||
"sunpy/visualization/colormaps/tests/test_cm.py"
|
||||
# requires cdflib package
|
||||
"sunpy/timeseries/tests/test_timeseries_factory.py"
|
||||
# distutils is deprecated
|
||||
"sunpy/io/setup_package.py"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--deselect=sunpy/tests/tests/test_self_test.py::test_main_nonexisting_module"
|
||||
"--deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module"
|
||||
"-W"
|
||||
"ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
# Wants a configuration file
|
||||
# pythonImportsCheck = [
|
||||
# "sunpy"
|
||||
# ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "SunPy: Python for Solar Physics";
|
||||
description = "Python for Solar Physics";
|
||||
homepage = "https://sunpy.org";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.753";
|
||||
version = "2.0.762";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-6CBe4BuztW3EoLWqGmuRmWfVfb1gP5cPEzYnyBtPEsE=";
|
||||
hash = "sha256-7YINKTvEAAOGoGkc4t2YwuMBF4rvOxRD2XhJxJBWvis=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
@ -81,7 +81,8 @@ buildPythonApplication rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0"
|
||||
--replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0" \
|
||||
--replace "prettytable>=3.0.0" "prettytable"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocamlbuild-${version}";
|
||||
pname = "ocaml${ocaml.version}-ocamlbuild";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ in
|
|||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.50.2";
|
||||
version = "1.51.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-dy5VCrrmZjWAAkcyfCzUaPLDGSyA0zlP6n8vhS0V8N0=";
|
||||
sha256 = "sha256-qhwFRveFCwflQmVCwzThC8sP+YCqckgCaXAc3IRms0g=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# Outputs
|
||||
, alsa-lib, libjack2, libpulseaudio, libshout, pipewire
|
||||
# Misc
|
||||
, icu, sqlite, avahi, dbus, pcre, libgcrypt, expat
|
||||
, icu, sqlite, avahi, dbus, pcre2, libgcrypt, expat
|
||||
# Services
|
||||
, yajl
|
||||
# Client support
|
||||
|
|
@ -79,7 +79,7 @@ let
|
|||
dbus = [ dbus ];
|
||||
expat = [ expat ];
|
||||
icu = [ icu ];
|
||||
pcre = [ pcre ];
|
||||
pcre = [ pcre2 ];
|
||||
sqlite = [ sqlite ];
|
||||
syslog = [ ];
|
||||
systemd = [ systemd ];
|
||||
|
|
@ -116,13 +116,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "mpd";
|
||||
version = "0.23.4";
|
||||
version = "0.23.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MusicPlayerDaemon";
|
||||
repo = "MPD";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-siMFLV1fKdRt8To6AhLXmAAsgqZCA/bbvmlhbb6hLic=";
|
||||
sha256 = "sha256-zsxh/rUJtcuke0zYBrh225Qd6RKo1SiFDbMmROdkyjI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wiki-js";
|
||||
version = "2.5.268";
|
||||
version = "2.5.272";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz";
|
||||
sha256 = "sha256-Ec4trrVETbgKs41aIc4Ne02c969Qc44QtoBf8tyk4+I=";
|
||||
sha256 = "sha256-30thDjmjc24tChgih0FZyIUU6/aKKl4MAD5yqn0yYa4=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
, fetchurl
|
||||
, fetchpatch
|
||||
, libedit
|
||||
, runCommand
|
||||
, dash
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -52,5 +54,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
shellPath = "/bin/dash";
|
||||
tests = {
|
||||
"execute-simple-command" = runCommand "${pname}-execute-simple-command" { } ''
|
||||
mkdir $out
|
||||
${dash}/bin/dash -c 'echo "Hello World!" > $out/success'
|
||||
[ -s $out/success ]
|
||||
grep -q "Hello World" $out/success
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-release";
|
||||
version = "0.19.0";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = "cargo-release";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u1XXkenMIflbXACxOeeq7Mg5ubel4oFXpL/uy6McQf0=";
|
||||
sha256 = "sha256-/lY6NQN1oYH+gNyYLXVoqHhikJxd1R0KbpZvuSemnwI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-7QOaSEaX2JXtTQQo3RXbMpZg6V2wzfoQbId9QOD9sCA=";
|
||||
cargoSha256 = "sha256-iw4RPW4VwfsvDgaxphBIlSPM5IhCyVv07mrCpIPKaPI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1791,7 +1791,7 @@ with pkgs;
|
|||
|
||||
github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite;
|
||||
|
||||
gitless = callPackage ../applications/version-management/gitless { python = python3; };
|
||||
gitless = callPackage ../applications/version-management/gitless { };
|
||||
|
||||
gistyc = with python3Packages; toPythonApplication gistyc;
|
||||
|
||||
|
|
|
|||
|
|
@ -6829,6 +6829,8 @@ in {
|
|||
|
||||
pygeoip = callPackage ../development/python-modules/pygeoip { };
|
||||
|
||||
pygeos = callPackage ../development/python-modules/pygeos { };
|
||||
|
||||
pygetwindow = callPackage ../development/python-modules/pygetwindow { };
|
||||
|
||||
pygit2 = callPackage ../development/python-modules/pygit2 { };
|
||||
|
|
@ -8278,9 +8280,7 @@ in {
|
|||
|
||||
pywizlight = callPackage ../development/python-modules/pywizlight { };
|
||||
|
||||
pywlroots = callPackage ../development/python-modules/pywlroots {
|
||||
wlroots = pkgs.wlroots_0_14;
|
||||
};
|
||||
pywlroots = callPackage ../development/python-modules/pywlroots { };
|
||||
|
||||
pyxattr = callPackage ../development/python-modules/pyxattr { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue