gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2022-08-07 00:02:30 +00:00
committed by GitHub
parent beef677ae7 a5c16df361
commit 5e07b70dde
44 changed files with 238 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/josm/default.nix
+4 -4
View File
@@ -3,20 +3,20 @@
}:
let
pname = "josm";
version = "18513";
version = "18531";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "sha256-rKBDKPq6hn4VGlzW4ad/gBU4eCVRF9JgRLrDaTKjCbI=";
sha256 = "sha256-/esGbLbidQ60+auMC1W2GwH7V5qdTVzblDNsskuhcjs=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
sha256 = "sha256-M8ZV3FXZJHqaegPKQnjQkMYMWt2BUiKzM8Tit4NqtU4=";
sha256 = "sha256-ldcTuacUUxsssJqJ8cRjbP+TWlxQdcNtVbj8clDNEGw=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version;
sha256 = "sha256-cguvKl9yvthNWcLD6YDLKiialJmutJTa9egMdfKHRpU=";
sha256 = "sha256-Cga17ymUROJb5scpyOlo6JIgQ77yHavI0ciUpZN+jLk=";
};
};
in
pkgs/applications/video/gpac/default.nix
+9
View File
@@ -41,5 +41,14 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21;
maintainers = with maintainers; [ bluescreen303 mgdelacroix ];
platforms = platforms.linux;
knownVulnerabilities = [
"CVE-2022-1035"
"CVE-2022-1172"
"CVE-2022-1222"
"CVE-2022-1795"
"CVE-2022-2453"
"CVE-2022-2454"
"CVE-2022-2549"
];
};
}
pkgs/applications/virtualization/virt-manager/default.nix
+5 -2
View File
@@ -64,6 +64,10 @@ python3.pkgs.buildPythonApplication rec {
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ cpio e2fsprogs file findutils gzip ]}")
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
# Fixes testCLI0051virt_install_initrd_inject on Darwin: "cpio: root:root: invalid group"
substituteInPlace virtinst/install/installerinject.py \
--replace "'--owner=root:root'" "'--owner=0:0'"
'';
checkInputs = with python3.pkgs; [
@@ -95,8 +99,7 @@ python3.pkgs.buildPythonApplication rec {
manages Xen and LXC (linux containers).
'';
license = licenses.gpl2;
# exclude Darwin since libvirt-glib currently doesn't build there
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ qknight offline fpletz globin ];
};
}
pkgs/development/libraries/libvirt/default.nix
+4 -1
View File
@@ -136,9 +136,12 @@ stdenv.mkDerivation rec {
'' + optionalString isDarwin ''
sed -i '/qemucapabilitiestest/d' tests/meson.build
sed -i '/vircryptotest/d' tests/meson.build
'' + optionalString (isDarwin && isx86_64) ''
sed -i '/qemucaps2xmltest/d' tests/meson.build
sed -i '/qemuhotplugtest/d' tests/meson.build
sed -i '/virnetdaemontest/d' tests/meson.build
'';
nativeBuildInputs = [
meson
pkgs/development/python-modules/aiolifx/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aiolifx";
version = "0.8.1";
version = "0.8.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-w6d2qpU8jPrE2Dtuq4825qOCU1SoIpkEjOEX+BYxhuU=";
hash = "sha256-k47cXi2CDtFIV3gzfdYU4i17ry0ABXcWK5CcWhwTdT0=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/asyncwhois/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "asyncwhois";
version = "1.0.0";
version = "1.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pogzyb";
repo = pname;
rev = "v${version}";
hash = "sha256-9tSGfF/Ezuya4pEyr1XolWXvSO/F/UrobRVlyHITNTU=";
hash = "sha256-TpUiUW9ntrpuT/rUhucedl+DM5X88Mislrd+3D5/TUE=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/bleak-retry-connector/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "bleak-retry-connector";
version = "1.3.0";
version = "1.4.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-WjjpehrYy9187C3wUDR3sfQG+2p6YbQfp4EwC5FbzGU=";
hash = "sha256-vp+tZIDFuO41r34z8+aUf3dhYhaUeLZ3l9JNvjsqKc4=";
};
nativeBuildInputs = [
pkgs/development/python-modules/blinkpy/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "blinkpy";
version = "0.19.1";
version = "0.19.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fronzbot";
repo = "blinkpy";
rev = "refs/tags/v${version}";
hash = "sha256-29wfdRbJ4U3ou/4jkpWBE2FrUuo09k4hTYLnIP1S3uU=";
hash = "sha256-depaXtbXo5F1JC3M24i6ynWhpm9x9O7UCjkoSzFaSZI=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/container-inspector/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "container-inspector";
version = "31.1.0";
version = "32.0.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "nexB";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-44sTZelCT6sGPyMteJZBcPRReTHuO1ZUxeQ0Vp7Zmqo=";
hash = "sha256-J9glnfs6l36/IQoIvE8a+Cw4B8x/6r5UeAU8+T/OiQg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "cyclonedx-python-lib";
version = "2.7.0";
version = "2.7.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "CycloneDX";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Imn9wl5I7dzkUnVBzK2vhWOrf89FycVW4GvEYFeSujU=";
hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk=";
};
nativeBuildInputs = [
pkgs/development/python-modules/django-storages/default.nix
+26 -4
View File
@@ -1,20 +1,42 @@
{ lib, buildPythonPackage, fetchPypi
, django
, azure-storage-blob
, boto3
, dropbox
, google-cloud-storage
, libcloud
, paramiko
}:
buildPythonPackage rec {
pname = "django-storages";
version = "1.12.3";
version = "1.13";
src = fetchPypi {
inherit pname version;
sha256 = "a475edb2f0f04c4f7e548919a751ecd50117270833956ed5bd585c0575d2a5e7";
sha256 = "sha256-1P7Zi7+1NHCW3frCpmZdUTPHiLnsMsFW7F9/sCrlczU=";
};
propagatedBuildInputs = [ django ];
# django.core.exceptions.ImproperlyConfigured: Requested setting DEFAULT_INDEX_TABLESPACE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
doCheck = false;
preCheck = ''
export DJANGO_SETTINGS_MODULE=tests.settings
# timezone issues https://github.com/jschneier/django-storages/issues/1171
substituteInPlace tests/test_sftp.py \
--replace 'test_accessed_time' 'dont_test_accessed_time' \
--replace 'test_modified_time' 'dont_test_modified_time'
'';
checkInputs = [
azure-storage-blob
boto3
dropbox
google-cloud-storage
libcloud
paramiko
];
pythonImportsCheck = [ "storages" ];
meta = with lib; {
description = "Collection of custom storage backends for Django";
pkgs/development/python-modules/dvc-data/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "dvc-data";
version = "0.1.5";
version = "0.1.13";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-SQ4w2Yqho5kbM4fRQkji69wOV8rYAIyFFve7pTEjgMM=";
hash = "sha256-dKqn7dMwPxKnLLBPJGgmD/2MFzdzrw7W9+w9Zi/9hsA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/dvc-objects/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "dvc-objects";
version = "0.1.5";
version = "0.1.7";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-vRQhlxaNy0bJTkNVlGZ+c9ocnzG/jeZYCxCabMuI5Ag=";
hash = "sha256-Edp2MRhe/eTUosL4XQfVbtwFWBg3D5RDWRb6r1C4MgE=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/dvclive/default.nix
+5 -3
View File
@@ -4,24 +4,26 @@
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, tabulate
}:
buildPythonPackage rec {
pname = "dvclive";
version = "0.9.0";
version = "0.10.0";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-3kbP8eL/cO/aSAIVrbfGS+vwCTsWoCbNS2orExYt4aw=";
hash = "sha256-4sixsWZNnI3UJRlFyB21eAdUCgF8iIZ56ECgIeFV/u8=";
};
propagatedBuildInputs = [
dvc-render
tabulate # will be available as dvc-render.optional-dependencies.table
];
# Circular dependency with dvc
pkgs/development/python-modules/elastic-apm/default.nix
+2 -2
View File
@@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "elastic-apm";
version = "6.10.1";
version = "6.10.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "elastic";
repo = "apm-agent-python";
rev = "v${version}";
hash = "sha256-ql6qBnZXa0JL1qEXj2OzzP3onjYrMx6+Be6K3SDuWf4=";
hash = "sha256-Ru/yGND7xkpO3QH/cTMu4rxWUXSMsFx5u/V/rHY8k1E=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/extractcode/default.nix
+12 -10
View File
@@ -1,14 +1,14 @@
{ lib
, fetchPypi
, buildPythonPackage
, extractcode-7z
, extractcode-libarchive
, fetchPypi
, patch
, pytest-xdist
, pytestCheckHook
, pythonOlder
, setuptools-scm
, typecode
, patch
, extractcode-libarchive
, extractcode-7z
, pytestCheckHook
, pytest-xdist
, pythonOlder
}:
buildPythonPackage rec {
@@ -41,21 +41,23 @@ buildPythonPackage rec {
pytest-xdist
];
# CLI test tests the cli which we can't do until after install
disabledTestPaths = [
# CLI test tests the CLI which we can't do until after install
"tests/test_extractcode_cli.py"
];
# test_uncompress_* wants to use a binary to extract instead of the provided library
disabledTests = [
# test_uncompress_* wants to use a binary to extract instead of the provided library
"test_uncompress_lz4_basic"
"test_extract_tarlz4_basic"
"test_extract_rar_with_trailing_data"
# tries to parse /boot/vmlinuz-*, which is not available in the nix sandbox
# Tries to parse /boot/vmlinuz-*, which is not available in the nix sandbox
"test_can_extract_qcow2_vm_image_as_tarball"
"test_can_extract_qcow2_vm_image_not_as_tarball"
"test_can_listfs_from_qcow2_image"
"test_get_extractor_qcow2"
# WARNING patch:patch.py:450 inconsistent line ends in patch hunks
"test_patch_info_patch_patches_windows_plugin_explorer_patch"
];
pythonImportsCheck = [
pkgs/development/python-modules/h5netcdf/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "h5netcdf";
version = "1.0.1";
version = "1.0.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-d2cE+s2LgiRtbUBoxQXDibO3C5v5kgzPusfzXNxjTaw=";
hash = "sha256-iAih4JXwEitPtAjMmMYK3zmb1X/vSNHKfN9M2h0Ka0o=";
};
nativeBuildInputs = [
pkgs/development/python-modules/json-stream/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "json-stream";
version = "1.3.0";
version = "1.4.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-J5DBa8zeandkDIXpEaRN6cneZIIG2aRHS5zjmM/H0Uw=";
hash = "sha256-ebB8l8H6yPLoCXmVOy60IijdBI61SEzJInC30aMe9Bk=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/mailchecker/default.nix
+2 -2
View File
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "mailchecker";
version = "4.1.18";
version = "4.1.19";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-zBikruHBTXKK4Yk7euTp0lTcdCG5AQ/kMZrECAvQ7Zw=";
hash = "sha256-oNIh9mRdPXai6SDfyvfoOrgsbVWyRYhJva+bsqgGOoo=";
};
# Module has no tests
pkgs/development/python-modules/netutils/default.nix
+3 -13
View File
@@ -2,7 +2,6 @@
, lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, jinja2
, poetry-core
, pytestCheckHook
@@ -13,7 +12,7 @@
buildPythonPackage rec {
pname = "netutils";
version = "1.1.0";
version = "1.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +21,7 @@ buildPythonPackage rec {
owner = "networktocode";
repo = pname;
rev = "v${version}";
hash = "sha256-rTSesG7XmIzu2DcJMVgZMlh0kRQ8jEB3t++rgf63Flw=";
hash = "sha256-6FoadV5QMZCJnF/eD3FXRsyP4MymO5nayJ/54PJXOB4=";
};
nativeBuildInputs = [
@@ -36,15 +35,6 @@ buildPythonPackage rec {
toml
];
patches = [
# Switch to poetry-core, https://github.com/networktocode/netutils/pull/115
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/networktocode/netutils/commit/edc8b06686db4e5b4c8c4deb6d0effbc22177b31.patch";
sha256 = "sha256-K5oSbtOJYeKbxzbaZQBXcl6LsHQAK8CxBLfkak15V6M=";
})
];
pythonImportsCheck = [
"netutils"
];
@@ -59,10 +49,10 @@ buildPythonPackage rec {
];
meta = with lib; {
broken = stdenv.isDarwin;
description = "Library that is a collection of objects for common network automation tasks";
homepage = "https://github.com/networktocode/netutils";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
broken = stdenv.isDarwin;
};
}
pkgs/development/python-modules/nextdns/default.nix
+49
View File
@@ -0,0 +1,49 @@
{ lib
, aiohttp
, aioresponses
, buildPythonPackage
, fetchFromGitHub
, orjson
, pytest-asyncio
, pytest-error-for-skips
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "nextdns";
version = "1.0.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-joPg5XZ5qEDnON96XCy5j4/OC+EkFw09Db4TH+ThsTY=";
};
propagatedBuildInputs = [
aiohttp
orjson
];
checkInputs = [
aioresponses
pytest-asyncio
pytest-error-for-skips
pytestCheckHook
];
pythonImportsCheck = [
"nextdns"
];
meta = with lib; {
description = "Module for the NextDNS API";
homepage = "https://github.com/bieniu/nextdns";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/plugwise/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.21.0";
version = "0.21.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
sha256 = "sha256-pw1apxqjKKv05Qw2VFN0cKit/3fas7PUb1wS/XsJruY=";
sha256 = "sha256-9tnLUzr7FWZlpN6mLLv1Q5EZ4wgquCC5nxGNyT63dzY=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pubnub/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pubnub";
version = "6.5.0";
version = "6.5.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python";
rev = "refs/tags/v${version}";
hash = "sha256-zY40VLjjb9VBbw2579UPD/csk9o0AWIZMWRKxo78NrE=";
hash = "sha256-+x58aEvemav0Pz2jeICLFG36FTtZCu5dk/arb+j5nmo=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pycep-parser/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pycep-parser";
version = "0.3.7";
version = "0.3.8";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "gruebel";
repo = "pycep";
rev = "refs/tags/${version}";
hash = "sha256-5XivzmwcJi+DrrskM0u3XBXtC5j0pjXbWHI+8mciMXM=";
hash = "sha256-y6npvFh6/QykOAKK8ihTHDcv5dFd4lLU64UXPIhBELA=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pydeconz/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pydeconz";
version = "101";
version = "103";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = "deconz";
rev = "refs/tags/v${version}";
hash = "sha256-U9jdKKT6RtvdJlWTwuUby0q7Qxa3mWUds8HQvsME9R4=";
hash = "sha256-nxM9airO1/CF4g9CeyV2WMxh22fBtu0fjz1R3X1zm+o=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pylibmc/default.nix
+28 -6
View File
@@ -1,23 +1,45 @@
{ buildPythonPackage, fetchPypi, lib, libmemcached, zlib, cyrus_sasl }:
{ lib
, buildPythonPackage
, cyrus_sasl
, fetchPypi
, libmemcached
, pythonOlder
, zlib
}:
buildPythonPackage rec {
version = "1.6.1";
pname = "pylibmc";
version = "1.6.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "1sg7d9j0v6g3xg3finf4l1hb72c13vcyyi6rqrc9shbx903d93ca";
hash = "sha256-QatJ05VAdnN0iRvvC+tSkcqXvrcEi3r3dSEGSVPATcA=";
};
buildInputs = [ libmemcached zlib cyrus_sasl ];
setupPyBuildFlags = [ "--with-sasl2" ];
buildInputs = [
cyrus_sasl
libmemcached
zlib
];
# requires an external memcached server running
setupPyBuildFlags = [
"--with-sasl2"
];
# Requires an external memcached server running
doCheck = false;
pythonImportsCheck = [
"pylibmc"
];
meta = with lib; {
description = "Quick and small memcached client for Python";
homepage = "http://sendapatch.se/projects/pylibmc/";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
}
pkgs/development/python-modules/pyoverkiz/default.nix
+5
View File
@@ -45,6 +45,11 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'backoff = "^1.10.0"' 'backoff = "*"'
'';
pythonImportsCheck = [
"pyoverkiz"
];
pkgs/development/python-modules/pyswitchbot/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.17.3";
version = "0.18.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
hash = "sha256-vyfIt9Tkl6jpO//xizraqBwwwGmuJjkFGU3TzN3dqhQ=";
hash = "sha256-lj2ud+Bp4z154XfPPJ6ocA9mlmRtlHOZRaOeDLQfYyo=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pytibber/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pytibber";
version = "0.23.0";
version = "0.24.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pyTibber";
rev = version;
hash = "sha256-DMYSv66PVBuOHuIio06OLrtGP0q7PeuDGKK+OznaLec=";
hash = "sha256-Ib9Rb6RkhUe4WDDHVLgaOYOleSFj7LFys6pW3WgxMQo=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pyunifiprotect/default.nix
+2
View File
@@ -71,6 +71,8 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov=pyunifiprotect --cov-append" ""
substituteInPlace setup.cfg \
--replace "pydantic!=1.9.1" "pydantic"
'';
pythonImportsCheck = [
pkgs/development/python-modules/pyupgrade/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyupgrade";
version = "2.37.1";
version = "2.37.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "asottile";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nWiaKfs2eVnwyA+UACcB/OImWSb5Nn6n/8gcGPNevM4=";
sha256 = "sha256-woHYMzk1xLDfJ14UycPlbaMG8mHeBixqDvs9vO0TKQI=";
};
checkInputs = [
pkgs/development/python-modules/rdkit/default.nix
+2 -2
View File
@@ -40,7 +40,7 @@ let
in
buildPythonPackage rec {
pname = "rdkit";
version = "2022.03.3";
version = "2022.03.4";
src =
let
@@ -50,7 +50,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "Release_${versionTag}";
sha256 = "sha256-YZq1JKDlCQVvjv7+XpEhD/wfFcQ5m3i5VO4rNQ3ONRQ=";
sha256 = "13aga2fy1hgldb229n16niv30n3lwlypd7xv16smpbgw0cp1xpp2";
};
unpackPhase = ''
pkgs/development/python-modules/tesla-wall-connector/default.nix
+6 -2
View File
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "einarhauks";
repo = pname;
rev = version;
sha256 = "sha256-JBtlGd9aHY8ikhpJ5v7ZcNu3BfLdBmOBZCMa6C0s6gE=";
hash = "sha256-JBtlGd9aHY8ikhpJ5v7ZcNu3BfLdBmOBZCMa6C0s6gE=";
};
nativeBuildInputs = [
@@ -40,13 +40,17 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'backoff = "^1.11.1"' 'backoff = "*"'
'';
pythonImportsCheck = [
"tesla_wall_connector"
];
meta = with lib; {
description = "Python library for communicating with a Tesla Wall Connector";
description = "Library for communicating with a Tesla Wall Connector";
homepage = "https://github.com/einarhauks/tesla-wall-connector";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
pkgs/development/python-modules/whodap/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "whodap";
version = "0.1.5";
version = "0.1.6";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pogzyb";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Jm3+WMGuYc910TNDVzHjYcbNcts668D3xYORXxozWqA=";
hash = "sha256-gLA6tT6ZUMjb2ZF5t6DdI5nqiX2Uxatj3ThmQ+VZu9A=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/yalexs/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "yalexs";
version = "1.1.25";
version = "1.2.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "v${version}";
sha256 = "sha256-O7M9Shh8jp2fTaVQPM8mgh1pkv75wn22PFpxJVenbAo=";
sha256 = "sha256-7+4Icg3E6xrWmxObNzNuDc+MXJ9rnbgBHMK4uPBJeuY=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/zeroconf/default.nix
+7 -5
View File
@@ -1,5 +1,6 @@
{ stdenv
, lib
{ lib
, stdenv
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, ifaddr
@@ -10,7 +11,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.38.7";
version = "0.39.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,10 +20,11 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = version;
hash = "sha256-Q/rrN7xzbehwMa3yFVP5F9ztUcJCDsfBIGf0b/GPzLM=";
hash = "sha256-R6q5fq8P91q+qhy+lOCuoKUMFBvkKFsKLVCoqIy7Qpk=";
};
propagatedBuildInputs = [
async-timeout
ifaddr
];
@@ -39,7 +41,7 @@ buildPythonPackage rec {
"test_launch_and_close_v4_v6"
"test_launch_and_close_v6_only"
"test_integration_with_listener_ipv6"
# Starting with 0.38.7: AssertionError: assert [('add', '_ht..._tcp.local.')]
# Starting with 0.39.0: AssertionError: assert [('add', '_ht..._tcp.local.')]
"test_service_browser_expire_callbacks"
] ++ lib.optionals stdenv.isDarwin [
"test_lots_of_names"
pkgs/development/tools/ocaml/opam/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper, getconf,
ocaml, unzip, ncurses, curl, aspcud, bubblewrap
ocaml, unzip, ncurses, curl, bubblewrap
}:
assert lib.versionAtLeast ocaml.version "4.02.3";
@@ -119,7 +119,7 @@ in stdenv.mkDerivation {
mv $out/bin/opam $out/bin/.opam-wrapped
makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
--argv0 "opam" \
--suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
--suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
--set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
$out/bin/opam-installer --prefix=$installer opam-installer.install
'';
pkgs/development/tools/ocaml/opam/opam.nix.pl
+3 -3
View File
@@ -21,12 +21,12 @@ chomp $OPAM_RELEASE_SHA256;
my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG";
my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`;
my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" {>= "(.*)"}$/m
my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" \{>= "(.*)"}$/m
or die "could not parse ocaml version bound\n";
print <<"EOF";
{ stdenv, lib, fetchurl, makeWrapper, getconf,
ocaml, unzip, ncurses, curl, aspcud, bubblewrap
ocaml, unzip, ncurses, curl, bubblewrap
}:
assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION";
@@ -114,7 +114,7 @@ print <<'EOF';
mv $out/bin/opam $out/bin/.opam-wrapped
makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
--argv0 "opam" \
--suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
--suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
--set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
$out/bin/opam-installer --prefix=$installer opam-installer.install
'';
pkgs/servers/home-assistant/component-packages.nix
+3 -1
View File
@@ -1818,7 +1818,8 @@
nextcloudmonitor
];
"nextdns" = ps: with ps; [
]; # missing inputs: nextdns
nextdns
];
"nfandroidtv" = ps: with ps; [
]; # missing inputs: notifications-android-tv
"nightscout" = ps: with ps; [
@@ -3617,6 +3618,7 @@
"network"
"nexia"
"nextbus"
"nextdns"
"nightscout"
"nina"
"no_ip"
pkgs/servers/sql/postgresql/ext/repmgr.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "repmgr";
version = "5.3.1";
version = "5.3.2";
src = fetchFromGitHub {
owner = "2ndQuadrant";
repo = "repmgr";
rev = "v${version}";
sha256 = "sha256-fHoXbFOF3xj/eNHgQIghF15vbDObnuwl2DAH+zRVGZQ=";
sha256 = "sha256-M8FMin9y6nAiPYeT5pUUy0KyZ1dkuH708GshZ6GoXXw=";
};
nativeBuildInputs = [ flex ];
pkgs/tools/admin/gtk-vnc/default.nix
+8 -2
View File
@@ -9,6 +9,7 @@
, glib
, pkg-config
, cyrus_sasl
, pulseaudioSupport ? stdenv.isLinux
, libpulseaudio
, libgcrypt
, gtk3
@@ -51,8 +52,13 @@ stdenv.mkDerivation rec {
glib
libgcrypt
cyrus_sasl
libpulseaudio
gtk3
] ++ lib.optionals pulseaudioSupport [
libpulseaudio
];
mesonFlags = lib.optionals (!pulseaudioSupport) [
"-Dpulseaudio=disabled"
];
passthru = {
@@ -67,6 +73,6 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Projects/gtk-vnc";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ raskin offline ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}
pkgs/tools/misc/watchexec/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "watchexec";
version = "1.20.4";
version = "1.20.5";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "cli-v${version}";
sha256 = "sha256-se3iqz+qjwf71wvHQhCWYryEdUc+kY0Q0ZTg4i1ayNI=";
sha256 = "sha256-x1weerTOpD4g1Fbm5erbS4S87ZjygF2X3MyyXl+9DXw=";
};
cargoSha256 = "sha256-YM+Zm3wFp3Lsx5LmyjGwZywV/SZjriL6JMDO1l0tNf4=";
cargoSha256 = "sha256-hyPIdMVUXc03B8opcqq7y0wS1rqCfOQ1W5M8jDUqr0k=";
nativeBuildInputs = [ installShellFiles ];
pkgs/top-level/perl-packages.nix
+6 -6
View File
@@ -11007,10 +11007,10 @@ let
Imager = buildPerlPackage {
pname = "Imager";
version = "1.012";
version = "1.019";
src = fetchurl {
url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.012.tar.gz";
sha256 = "a321c728e3277fd15de842351e69bbef0e2a5a608a31d089e5029b8381e23f21";
url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.019.tar.gz";
sha256 = "sha256-dNRNcBwfFPxLmE+toelVcmtQTC2LBtJl56hh+llDy0g=";
};
buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ];
makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib";
@@ -11223,10 +11223,10 @@ let
IOAsyncSSL = buildPerlModule {
pname = "IO-Async-SSL";
version = "0.22";
version = "0.23";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.22.tar.gz";
sha256 = "0c7363a7f1a08805bd1b2cf2b1a42a950ca71914c2aedbdd985970e011331a21";
url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.23.tar.gz";
sha256 = "sha256-0vyuFuJ+F6yjkDpK1aK/L7wmjQZRzn8ARabQVG9YTy4=";
};
buildInputs = [ TestIdentity ];
propagatedBuildInputs = [ Future IOAsync IOSocketSSL ];
pkgs/top-level/python-packages.nix
+2
View File
@@ -5882,6 +5882,8 @@ in {
nextcord = callPackage ../development/python-modules/nextcord { };
nextdns = callPackage ../development/python-modules/nextdns { };
nftables = toPythonModule (pkgs.nftables.override {
python3 = python;
withPython = true;