b12f/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-11-05 18:01:11 +00:00 committed by GitHub
parent 7a2cb8737c 1f3ebb2bd1
commit a8cf6897e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
86 changed files with 988 additions and 802 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/services/hardware/sane.nix
View file

@ -70,10 +70,12 @@ in
Packages providing extra SANE backends to enable.
::: {.note}
The example contains the package for HP scanners.
The example contains the package for HP scanners, and the package for
Apple AirScan and Microsoft WSD support (supports many
vendors/devices).
:::
'';
example = literalExpression "[ pkgs.hplipWithPlugin ]";
example = literalExpression "[ pkgs.hplipWithPlugin pkgs.sane-airscan ]";
};
hardware.sane.disabledDefaultBackends = mkOption {

6
nixos/modules/services/home-automation/home-assistant.nix
View file

@ -433,6 +433,8 @@ in {
componentsUsingBluetooth = [
# Components that require the AF_BLUETOOTH address family
"august"
"august_ble"
"airthings_ble"
"bluemaestro"
"bluetooth"
"bluetooth_le_tracker"
@ -445,15 +447,19 @@ in {
"govee_ble"
"homekit_controller"
"inkbird"
"keymitt_ble"
"led_ble"
"melnor"
"moat"
"oralb"
"qingping"
"sensorpro"
"sensorpush"
"snooz"
"switchbot"
"thermobeacon"
"thermopro"
"tilt_ble"
"xiaomi_ble"
"yalexs_ble"
];

2
nixos/modules/services/web-apps/nextcloud.nix
View file

@ -613,7 +613,7 @@ in {
config = mkIf cfg.enable (mkMerge [
{ warnings = let
latest = 24;
latest = 25;
upgradeWarning = major: nixos:
''
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.

91
pkgs/applications/editors/lite-xl/0001-replace-unpack-with-table-unpack.patch
View file

@ -1,91 +0,0 @@
diff --git a/data/core/commands/findreplace.lua b/data/core/commands/findreplace.lua
index 5d27aa6..db6a2dd 100644
--- a/data/core/commands/findreplace.lua
+++ b/data/core/commands/findreplace.lua
@@ -37,7 +37,7 @@ local function update_preview(sel, search_fn, text)
last_view:scroll_to_line(line2, true)
found_expression = true
else
- last_view.doc:set_selection(unpack(sel))
+ last_view.doc:set_selection(table.unpack(sel))
found_expression = false
end
end
@@ -55,7 +55,7 @@ end
local function find(label, search_fn)
last_view, last_sel = core.active_view,
{ core.active_view.doc:get_selection() }
- local text = last_view.doc:get_text(unpack(last_sel))
+ local text = last_view.doc:get_text(table.unpack(last_sel))
found_expression = false
core.command_view:set_text(text, true)
@@ -69,8 +69,8 @@ local function find(label, search_fn)
last_fn, last_text = search_fn, text
else
core.error("Couldn't find %q", text)
- last_view.doc:set_selection(unpack(last_sel))
- last_view:scroll_to_make_visible(unpack(last_sel))
+ last_view.doc:set_selection(table.unpack(last_sel))
+ last_view:scroll_to_make_visible(table.unpack(last_sel))
end
end, function(text)
update_preview(last_sel, search_fn, text)
@@ -79,8 +79,8 @@ local function find(label, search_fn)
end, function(explicit)
core.status_view:remove_tooltip()
if explicit then
- last_view.doc:set_selection(unpack(last_sel))
- last_view:scroll_to_make_visible(unpack(last_sel))
+ last_view.doc:set_selection(table.unpack(last_sel))
+ last_view:scroll_to_make_visible(table.unpack(last_sel))
end
end)
end
diff --git a/data/core/doc/init.lua b/data/core/doc/init.lua
index 2e72907..0e61ffb 100644
--- a/data/core/doc/init.lua
+++ b/data/core/doc/init.lua
@@ -198,9 +198,9 @@ local function selection_iterator(invariant, idx)
local target = invariant[3] and (idx*4 - 7) or (idx*4 + 1)
if target > #invariant[1] or target <= 0 or (type(invariant[3]) == "number" and invariant[3] ~= idx - 1) then return end
if invariant[2] then
- return idx+(invariant[3] and -1 or 1), sort_positions(unpack(invariant[1], target, target+4))
+ return idx+(invariant[3] and -1 or 1), sort_positions(table.unpack(invariant[1], target, target+4))
else
- return idx+(invariant[3] and -1 or 1), unpack(invariant[1], target, target+4)
+ return idx+(invariant[3] and -1 or 1), table.unpack(invariant[1], target, target+4)
end
end
@@ -345,7 +345,7 @@ function Doc:raw_insert(line, col, text, undo_stack, time)
-- push undo
local line2, col2 = self:position_offset(line, col, #text)
- push_undo(undo_stack, time, "selection", unpack(self.selections))
+ push_undo(undo_stack, time, "selection", table.unpack(self.selections))
push_undo(undo_stack, time, "remove", line, col, line2, col2)
-- update highlighter and assure selection is in bounds
@@ -357,7 +357,7 @@ end
function Doc:raw_remove(line1, col1, line2, col2, undo_stack, time)
-- push undo
local text = self:get_text(line1, col1, line2, col2)
- push_undo(undo_stack, time, "selection", unpack(self.selections))
+ push_undo(undo_stack, time, "selection", table.unpack(self.selections))
push_undo(undo_stack, time, "insert", line1, col1, text)
-- get line content before/after removed text
diff --git a/data/core/tokenizer.lua b/data/core/tokenizer.lua
index d95baeb..f77fed4 100644
--- a/data/core/tokenizer.lua
+++ b/data/core/tokenizer.lua
@@ -161,7 +161,7 @@ function tokenizer.tokenize(incoming_syntax, text, state)
if count % 2 == 0 then break end
end
until not res[1] or not close or not target[3]
- return unpack(res)
+ return table.unpack(res)
end
while i <= #text do

13
pkgs/applications/editors/lite-xl/default.nix
View file

@ -3,7 +3,7 @@
, Foundation
, freetype
, lib
, lua5_2
, lua5_4
, meson
, ninja
, pcre2
@ -15,26 +15,21 @@
stdenv.mkDerivation rec {
pname = "lite-xl";
version = "2.0.5";
version = "2.1.0";
src = fetchFromGitHub {
owner = "lite-xl";
repo = "lite-xl";
rev = "v${version}";
sha256 = "sha256-7ppO5ITijhJ37OL6xlQgu1SaQ/snXDH5xJOwuXZNUVA=";
sha256 = "sha256-9nQFdii6SY14Cul7Ki0DUEsu75HWTCeEZtXaU6KGRiM=";
};
patches = [
# Fixes compatibility with Lua5.2, remove patch when a new release covers this
./0001-replace-unpack-with-table-unpack.patch
];
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [
agg
freetype
lua5_2
lua5_4
pcre2
reproc
SDL2

12
pkgs/applications/misc/clight/clightd.nix
View file

@ -5,7 +5,8 @@
, enableDdc ? true, ddcutil
, enableDpms ? true, libXext
, enableGamma ? true, libdrm, libXrandr, wayland
, enableScreen ? true }:
, enableScreen ? true
, enableYoctolight ? true }:
stdenv.mkDerivation rec {
pname = "clightd";
@ -33,10 +34,11 @@ stdenv.mkDerivation rec {
"-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d"
# systemd.pc has prefix=${systemd.out}
"-DMODULE_LOAD_DIR=${placeholder "out"}/lib/modules-load.d"
] ++ optional enableDdc "-DENABLE_DDC=1"
++ optional enableDpms "-DENABLE_DPMS=1"
++ optional enableGamma "-DENABLE_GAMMA=1"
++ optional enableScreen "-DENABLE_SCREEN=1";
] ++ optional enableDdc "-DENABLE_DDC=1"
++ optional enableDpms "-DENABLE_DPMS=1"
++ optional enableGamma "-DENABLE_GAMMA=1"
++ optional enableScreen "-DENABLE_SCREEN=1"
++ optional enableYoctolight "-DENABLE_YOCTOLIGHT=1";
nativeBuildInputs = [
dbus

3
pkgs/applications/misc/gnome-extension-manager/default.nix
View file

@ -54,9 +54,6 @@ stdenv.mkDerivation rec {
text-engine
];
# See https://github.com/NixOS/nixpkgs/issues/36468.
mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ];
meta = with lib; {
description = "Desktop app for managing GNOME shell extensions";
homepage = "https://github.com/mjakeman/extension-manager";

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

File diff suppressed because it is too large Load diff

11
pkgs/applications/networking/cluster/tektoncd-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.24.1";
version = "0.27.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-8dCmORfTMFHSyc9FOpL01ywxGcH3uolzD2aOtyy191Q=";
sha256 = "sha256-zLPZueKdUNauIzqXOV773SZ/RWg7UuMNeJHr7z6ZJ+E=";
};
vendorSha256 = null;
@ -17,14 +17,15 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
# third_party/VENDOR-LICENSE breaks build/check as go files are still included
# docs is a tool for generating docs
excludedPackages = [ "third_party" "cmd/docs" ];
subPackages = [ "cmd/tkn" ];
preCheck = ''
# some tests try to write to the home dir
export HOME="$TMPDIR"
# run all tests
unset subPackages
# the tests expect the clientVersion ldflag not to be set
unset ldflags

6
pkgs/applications/virtualization/nixpacks/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "0.11.6";
version = "0.12.2";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9b1j3hY4ChlLIXmNsIjt6SjqHOYSqdY98amV36WPU74=";
sha256 = "sha256-l6QIP/GIm7QMWLjYQJ3yuT7mWriowcND32EUuiNfvNA=";
};
cargoSha256 = "sha256-s34mYMaHElBTD7I6QZtGsVTZUbVkcSmavvLs2k4mJDw=";
cargoSha256 = "sha256-t2kxpiSSYzg4MfjCyxkKNfPLTwGB8KgzQonFkLPCpvM=";
# skip test due FHS dependency
doCheck = false;

4
pkgs/applications/window-managers/i3/gaps.nix
View file

@ -2,13 +2,13 @@
i3.overrideAttrs (oldAttrs : rec {
pname = "i3-gaps";
version = "4.21";
version = "4.21.1";
src = fetchFromGitHub {
owner = "Airblader";
repo = "i3";
rev = version;
sha256 = "sha256-douSRvnyDbi2gDJfu9VZmmTyYfy+FrFWHgyAyPyBWdM=";
sha256 = "sha256-+JxJjvzEuAA4CH+gufzAzIqd5BSvHtPvLm2zTfXc/xk=";
};
meta = with lib; {

4
pkgs/development/libraries/globalarrays/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "globalarrays";
version = "5.8.1";
version = "5.8.2";
src = fetchFromGitHub {
owner = "GlobalArrays";
repo = "ga";
rev = "v${version}";
sha256 = "sha256-IyHdeIUHu/T4lb/etGGnNB2guIspual8/v9eS807Qco=";
sha256 = "sha256-2ffQIg9topqKX7ygnWaa/UunL9d0Lj9qr9xucsjLuoY=";
};
nativeBuildInputs = [ autoreconfHook gfortran ];

4
pkgs/development/libraries/libplctag/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libplctag";
version = "2.5.2";
version = "2.5.3";
src = fetchFromGitHub {
owner = "libplctag";
repo = "libplctag";
rev = "v${version}";
sha256 = "sha256-HBhVPHkr21iT78lE0FRydZAY7kkH1s/EWP7lsWFC0xA=";
sha256 = "sha256-v6Gp9C5r5WMFR+LAZPlUKQ4EiBDmbscPEKKDv7gaTEo=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/webkitgtk/default.nix
View file

@ -68,7 +68,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk";
version = "2.38.1";
version = "2.38.2";
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
outputs = [ "out" "dev" "devdoc" ];
@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
sha256 = "AuGVs/ueBXdDszZO5/HuwT9xYUImhJVEwHwypzuPGEg=";
hash = "sha256-8+uCiZZR9YO02Zys0Wr3hKGncQ/OnntoB71szekJ/j4=";
};
patches = lib.optionals stdenv.isLinux [

14
pkgs/development/ocaml-modules/lablgtk/default.nix
View file

@ -1,16 +1,19 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, gtksourceview }:
{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, gtksourceview
, camlp-streams
}:
let param =
let check = lib.versionAtLeast ocaml.version; in
if check "4.06" then rec {
version = "2.18.12";
version = "2.18.13";
src = fetchFromGitHub {
owner = "garrigue";
repo = "lablgtk";
rev = version;
sha256 = "sha256:0asib87c42apwf1ln8541x6i3mvyajqbarifvz11in0mqn5k7g7h";
sha256 = "sha256-69Svno0qLaUifMscnVuPUJlCo9d8Lee+1qiYx34G3Po=";
};
NIX_CFLAGS_COMPILE = null;
buildInputs = [ camlp-streams ];
} else if check "3.12" then {
version = "2.18.5";
src = fetchurl {
@ -26,11 +29,12 @@ let param =
in
stdenv.mkDerivation {
pname = "lablgtk";
pname = "ocaml${ocaml.version}-lablgtk";
inherit (param) version src NIX_CFLAGS_COMPILE;
nativeBuildInputs = [ pkg-config ocaml findlib ];
buildInputs = [ gtk2 libgnomecanvas gtksourceview ];
buildInputs = [ gtk2 libgnomecanvas gtksourceview ]
++ param.buildInputs or [];
configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
buildFlags = [ "world" ];

6
pkgs/development/python-modules/aiohomekit/default.nix
View file

@ -3,6 +3,7 @@
, aiocoap
, bleak
, bleak-retry-connector
, chacha20poly1305
, chacha20poly1305-reuseable
, commentjson
, cryptography
@ -17,7 +18,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "2.0.2";
version = "2.2.14";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -26,7 +27,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-pZEZHhsU/1tEX1VOFQ8b+ERJ8tU1pzRJMRYD28nfTb0=";
hash = "sha256-0O8fax25vabItFnUD9N7C4gyMSKPHqHSgzJXJjp5dGw=";
};
nativeBuildInputs = [
@ -37,6 +38,7 @@ buildPythonPackage rec {
aiocoap
bleak
bleak-retry-connector
chacha20poly1305
chacha20poly1305-reuseable
commentjson
cryptography

58
pkgs/development/python-modules/aiolifx-themes/default.nix Normal file
View file

@ -0,0 +1,58 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, pythonOlder
, aiolifx
, poetry-core
, pytest-asyncio
, pytestCheckHook
, async-timeout
, typer
}:
buildPythonPackage rec {
pname = "aiolifx-themes";
version = "0.2.0";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Djelibeybi";
repo = "aiolifx-themes";
rev = "v${version}";
hash = "sha256:17498vdg8i20hk4i8hzc67qaj206ik3s1zn1k70plsjr9zlgs6vz";
};
prePatch = ''
# Don't run coverage, or depend on typer for no reason.
substituteInPlace pyproject.toml \
--replace " --cov=aiolifx_themes --cov-report=term-missing:skip-covered" "" \
--replace "typer = " "# unused: typer = "
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiolifx
];
checkInputs = [
async-timeout
pytestCheckHook
pytest-asyncio
];
pythonImportsCheck = [
"aiolifx_themes"
];
meta = with lib; {
description = "Color themes for LIFX lights running on aiolifx";
homepage = "https://github.com/Djelibeybi/aiolifx-themes";
license = licenses.mit;
maintainers = with maintainers; [ lukegb ];
};
}

8
pkgs/development/python-modules/aiopyarr/default.nix
View file

@ -2,7 +2,9 @@
, aiohttp
, aresponses
, buildPythonPackage
, ciso8601
, fetchFromGitHub
, orjson
, pytest-asyncio
, pytestCheckHook
, pythonOlder
@ -10,7 +12,7 @@
buildPythonPackage rec {
pname = "aiopyarr";
version = "22.9.0";
version = "22.10.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -19,11 +21,13 @@ buildPythonPackage rec {
owner = "tkdrob";
repo = pname;
rev = version;
hash = "sha256-nJjqpk4GcgXJhFZd4E3vSmyNP+RkOASEd4Ipemx6cAc=";
hash = "sha256-FpBKhxFFMG5WgQ3TCAcg1P+cGVGU7LiJ+Zr4kL2Nl88=";
};
propagatedBuildInputs = [
aiohttp
ciso8601
orjson
];
checkInputs = [

4
pkgs/development/python-modules/aioshelly/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioshelly";
version = "3.0.0";
version = "4.1.2";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-Id4qg7uSvpjXpEx0/EvSMvFxgkR78/NOoOmmwngj7Qw=";
hash = "sha256-0BxbcWA2Kdk1xTSKN/dH9LJc3yI60kmyMCrK77tqyNE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/aiounifi/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiounifi";
version = "40";
version = "41";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-PJ3AIoqu0cUs8IZqY9O2e+GuPd4vjLn9VruKyPxVe4A=";
hash = "sha256-rBluo4080m9jFnquXaQY/Cntp7wHToY16aNFhzrQJs8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/asyncclick/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "asyncclick";
version = "8.0.1.3";
version = "8.1.3.2";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "python-trio";
repo = pname;
rev = version;
sha256 = "03b8zz8i3aqzxr3ffzb4sxnrcm3gsk9r4hmr0fkml1ahi754bx2r";
sha256 = "sha256-by1clF+WAfN/gjOg/F60O1tCZ3qAhWqiiJJY04iMzQ8=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/av/default.nix
View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "av";
version = "9.2.0";
version = "10.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "mikeboers";
repo = "PyAV";
rev = "v${version}";
hash = "sha256-I7j+EzpvgKCNY8TbcaHsaWtetyvmno6YYhQTer2+Ds0=";
hash = "sha256-XcHP8RwC2iwD64Jc7SS+t9OxjFTsz3FbrnjMgJnN7Ak=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/bleak-retry-connector/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "bleak-retry-connector";
version = "2.1.3";
version = "2.8.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-fEdyo6QBmHWgl5o/ZIu/HM8GWp5t88awhb+7SPWngf0=";
hash = "sha256-u/7gEY1HsOc2JqGmq/kS46wcA0p8B7D08vrOHWIuFyY=";
};
postPatch = ''

8
pkgs/development/python-modules/bleak/default.nix
View file

@ -5,6 +5,7 @@
, dbus-fast
, fetchFromGitHub
, poetry-core
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, typing-extensions
@ -12,16 +13,16 @@
buildPythonPackage rec {
pname = "bleak";
version = "0.18.1";
version = "0.19.1";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "hbldh";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-2/jJ2C2TudwCAshDBLUQjNMbYa2j4XfW8bXmeWrAyrA=";
hash = "sha256-WNFAN8xE0ULo4fQnPFJJsc/HtrVo1ClxsvxrrhJjvI0=";
};
nativeBuildInputs = [
@ -35,6 +36,7 @@ buildPythonPackage rec {
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];

4
pkgs/development/python-modules/bluetooth-data-tools/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "bluetooth-data-tools";
version = "0.1.2";
version = "0.2.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-AobkHODtWun2TPxb6yR/ieYyeIndTG0KmxTY81fQHCA=";
hash = "sha256-5FOFN2B35dTYuZhO09HZ/sNkY5X16bICP+qWzmrua5o=";
};
nativeBuildInputs = [

69
pkgs/development/python-modules/bsblan/default.nix
View file

@ -1,69 +0,0 @@
{ lib
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, mypy
, packaging
, poetry-core
, pydantic
, pytest-asyncio
, pytest-mock
, pytestCheckHook
, pythonOlder
, setuptools
, yarl
}:
buildPythonPackage rec {
pname = "bsblan";
version = "0.5.6";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "liudger";
repo = "python-bsblan";
rev = "refs/tags/v${version}";
hash = "sha256-eTKexiuomlTryy2bD2w9Pzhb4R9C3OIbLNX+7h/5l+c=";
};
nativeBuildInputs = [
poetry-core
setuptools
];
propagatedBuildInputs = [
aiohttp
packaging
pydantic
yarl
];
checkInputs = [
aresponses
mypy
pytest-asyncio
pytest-mock
pytestCheckHook
];
postPatch = ''
# Upstream doesn't set a version for the pyproject.toml
substituteInPlace pyproject.toml \
--replace 'version = "0.0.0"' 'version = "${version}"' \
--replace "--cov" ""
'';
pythonImportsCheck = [
"bsblan"
];
meta = with lib; {
description = "Python client for BSB-Lan";
homepage = "https://github.com/liudger/python-bsblan";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/bthome-ble/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "bthome-ble";
version = "1.2.2";
version = "2.1.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-2/2ODlHqQOl4LHUb2fyQpmsBYnoz0Rvc9lLEfZTKijA=";
hash = "sha256-4vk9uaG/9n3lNEWAergW9kFN2/Ta/KSax0rK9tVxAfw=";
};
nativeBuildInputs = [

12
pkgs/development/python-modules/dbus-fast/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dbus-fast";
version = "1.29.1";
version = "1.64.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-GqL6PZlqFi5Es8VYeqeTsXX6j5fol2JzcosFtVCQn60=";
hash = "sha256-y/H4TYCicn6Gvv+F4ogqhNWK2mZxEVNGCY4pJAfjq9s=";
};
nativeBuildInputs = [
@ -78,6 +78,14 @@ buildPythonPackage rec {
"test_standard_interfaces"
"test_tcp_connection_with_forwarding"
"test_unexpected_disconnect"
# NameError: name '_cast_uint32_native' is not defined
"test_unmarshall_bluez_interfaces_added_message"
"test_unmarshall_bluez_interfaces_removed_message"
"test_unmarshall_bluez_message"
"test_unmarshall_bluez_properties_changed_with_service_data"
"test_unmarshall_can_resume"
"test_unmarshalling_with_table"
"test_ay_buffer"
];
meta = with lib; {

4
pkgs/development/python-modules/fjaraskupan/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "fjaraskupan";
version = "2.1.0";
version = "2.2.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "elupus";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-Vt2THMB4m0YCLdfEnAokwS0oJfcgp3fmZMUDhTrekZY=";
hash = "sha256-0tNLwYckWF9GjhniEkiO+A+xDsUriUsMFZxG/FmUfps=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/freebox-api/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "freebox-api";
version = "1.0.0";
version = "1.0.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "hacf-fr";
repo = pname;
rev = "v${version}";
hash = "sha256-y78PzSivB+IJ9hrN3ZRhDBo7kI7M6uleTPkF6slO6So=";
rev = "refs/tags/v${version}";
hash = "sha256-60hIv35nNxXPFZy/JvG1O/ZkSMk65XDojUYP1QyfwXY=";
};
nativeBuildInputs = [

28
pkgs/development/python-modules/gcal-sync/default.nix
View file

@ -1,18 +1,20 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, aiohttp
, pydantic
, buildPythonPackage
, fetchFromGitHub
, freezegun
, ical
, pydantic
, pytest-aiohttp
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "gcal-sync";
version = "2.1.0";
version = "3.0.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -20,11 +22,12 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "gcal_sync";
rev = "refs/tags/${version}";
hash = "sha256-FKrZPiN4rSk5iFhGAXVuKhEeekOnPxdFslP4SMUrQIE=";
hash = "sha256-xRmNV06gMdPPHcvgJTvxPZBUi1BbFTnwZpzXLBluBYo=";
};
propagatedBuildInputs = [
aiohttp
ical
pydantic
];
@ -35,12 +38,15 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "gcal_sync" ];
pythonImportsCheck = [
"gcal_sync"
];
meta = {
description = "Python library for syncing Google Calendar to local storage";
meta = with lib; {
description = "Library for syncing Google Calendar to local storage";
homepage = "https://github.com/allenporter/gcal_sync";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ dotlambda ];
changelog = "https://github.com/allenporter/gcal_sync/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
};
}

4
pkgs/development/python-modules/home-assistant-bluetooth/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "home-assistant-bluetooth";
version = "1.5.1";
version = "1.6.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-//e+Kb85TBAC9/mHz/T/Dm/pNjbj0488/L/NeS1RMqY=";
hash = "sha256-6w940Yn0WgVC0Rn9OX40+6hO4maPSC7VrT3ARD8CIjQ=";
};
postPatch = ''

18
pkgs/development/python-modules/ibeacon-ble/default.nix
View file

@ -1,7 +1,9 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, home-assistant-bluetooth
, mac-vendor-lookup
, poetry-core
, pytestCheckHook
, pythonOlder
@ -9,7 +11,7 @@
buildPythonPackage rec {
pname = "ibeacon-ble";
version = "0.7.4";
version = "1.0.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -18,26 +20,28 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-B+ftS/oNCECjCqB396K5iCl0aeJSBGVXshlvZ1kvEuo=";
hash = "sha256-iYgGflM0IpSIMNgPpJAFAl9FYoMfRinM3sP6VRcBSMc=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" ""
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
home-assistant-bluetooth
mac-vendor-lookup
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" ""
'';
pythonImportsCheck = [
"ibeacon_ble"
];

4
pkgs/development/python-modules/led-ble/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "led-ble";
version = "0.10.1";
version = "1.0.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-GyVj9g4tqPaR5Gd8N76TtkldaAATnEBsSs/F+2iQqGM=";
hash = "sha256-XAb/tJPUe/sNvcU7t63inMPBIz+AREioWXBuQa/c9T0=";
};
postPatch = ''

41
pkgs/development/python-modules/mac-vendor-lookup/default.nix Normal file
View file

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiofiles
, aiohttp
}:
buildPythonPackage rec {
pname = "mac-vendor-lookup";
version = "0.1.12";
format = "setuptools";
src = fetchFromGitHub {
owner = "bauerj";
repo = "mac_vendor_lookup";
rev = "5b57faac0c5a701a7e18085e331853397b68c07c";
hash = "sha256-F/aiMs+J4bAesr6mKy+tYVjAjZ3l9vyHxV7zaaB6KbA=";
};
postPatch = ''
sed -i '/mac-vendors.txt/d' setup.py
'';
propagatedBuildInputs = [
aiofiles
aiohttp
];
doCheck = false; # no tests
pythonImportsCheck = [
"mac_vendor_lookup"
];
meta = with lib; {
description = "Find the vendor for a given MAC address";
homepage = "https://github.com/bauerj/mac_vendor_lookup";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
};
}

12
pkgs/development/python-modules/mpi4py/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "mpi4py";
version = "3.1.3";
version = "3.1.4";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-8en64QefQ+r92fgXzbP9MNcJ7cCTtdXa2lekYbLbMAg=";
sha256 = "sha256-F4WPLrxiMiDQEg0fqNQo0DPd50nEvDWzPYGmatf5NIA=";
};
passthru = {
@ -41,11 +41,13 @@ buildPythonPackage rec {
setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];
nativeBuildInputs = [ mpi openssh ];
nativeBuildInputs = [ mpi ];
checkInputs = [ openssh ];
meta = with lib; {
description = "Python bindings for the Message Passing Interface standard";
homepage = "https://bitbucket.org/mpi4py/mpi4py/";
license = licenses.bsd3;
homepage = "https://github.com/mpi4py/mpi4py";
license = licenses.bsd2;
};
}

55
pkgs/development/python-modules/oralb-ble/default.nix Normal file
View file

@ -0,0 +1,55 @@
{ lib
, bluetooth-data-tools
, bluetooth-sensor-state-data
, buildPythonPackage
, fetchFromGitHub
, home-assistant-bluetooth
, poetry-core
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "oralb-ble";
version = "0.10.1";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Iuu44H8fCbJysoSJLBtlJ1XE5Ad2caWihj3UZytWK3o=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
bluetooth-data-tools
bluetooth-sensor-state-data
home-assistant-bluetooth
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=oralb_ble --cov-report=term-missing:skip-covered" ""
'';
pythonImportsCheck = [
"oralb_ble"
];
meta = with lib; {
description = "Library for Oral B BLE devices";
homepage = "https://github.com/Bluetooth-Devices/oralb-ble";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/plugwise/default.nix
View file

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.25.4";
version = "0.25.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
sha256 = "sha256-avriroWSgBn80PzGEuvp/5yad9Q4onSxWLaLlpXDReo=";
sha256 = "sha256-n7+cEJC/RIbA4e5b19HncFOhzWhUZ8etxYsiER7zd8E=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/prometheus-client/default.nix
View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "prometheus-client";
version = "0.14.1";
version = "0.15.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -15,8 +15,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "prometheus";
repo = "client_python";
rev = "v${version}";
sha256 = "sha256-hvBdWOMDuzF91Hv4u//tF+z6la0JfiTQHlpS4TnWpmk=";
rev = "refs/tags/v${version}";
hash = "sha256-LabvQMNiRH4jclMnN0P4M3w25NQasNQEu1HWvRDQQ2o=";
};
checkInputs = [

7
pkgs/development/python-modules/pyGithub/default.nix
View file

@ -11,14 +11,15 @@
buildPythonPackage rec {
pname = "PyGithub";
version = "1.56";
version = "1.57";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "PyGithub";
repo = "PyGithub";
rev = "refs/tags/v${version}";
sha256 = "sha256-L6xrv3dAT/sWt/7ZeDy3P095g7Lpht52LkfCVYNLkbA=";
sha256 = "sha256-7CNvSOwDXXcJ082/Fmgr6OtTQeA30yDjt/Oq2nx4vEk=";
};
propagatedBuildInputs = [
@ -36,7 +37,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library to access the GitHub API v3";
homepage = "https://github.com/PyGithub/PyGithub";
platforms = platforms.all;
changelog = "https://github.com/PyGithub/PyGithub/raw/v${version}/doc/changes.rst";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ jhhuh ];
};

4
pkgs/development/python-modules/pyatmo/default.nix
View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyatmo";
version = "7.2.0";
version = "7.3.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "jabesq";
repo = "pyatmo";
rev = "refs/tags/v${version}";
sha256 = "sha256-5RlYTgxWm6BM/V2+1IF/rje5dNirN7PJs0eSiYeOpOQ=";
sha256 = "sha256-3NgAsXMdt4FsE30oxeTfunpP2e+iqLFZkhMJbc5jVGw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/pydaikin/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pydaikin";
version = "2.7.2";
version = "2.8.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mustang51";
repo = pname;
rev = "v${version}";
hash = "sha256-IONmzrCW/5nAEa7GlWMZsnweQWTSUwV4HwhXww6/9ig=";
hash = "sha256-AZDwoq4lCThzwHI0WCzrV9Il2MHp0LKxWg/dscGw0q0=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pydeconz/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pydeconz";
version = "104";
version = "105";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = "deconz";
rev = "refs/tags/v${version}";
hash = "sha256-bG2dhWa+KnSsigmOHE4wShaS56M9z6vqrFNek3PLbic=";
hash = "sha256-8GQJ4PCl8te3sovC5FwWoaQnXIRR27b7gPwfmyPRVBE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pylutron-caseta/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pylutron-caseta";
version = "0.17.0";
version = "0.17.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "gurumitts";
repo = pname;
rev = "v${version}";
hash = "sha256-8keKhwbvqIMxbfmd9GGF7uacOyvqb8G/ifq+pr4Z700=";
hash = "sha256-W3OfYNVendYOrwN/WGeAkNAnZctvlssZ3Bvp5caPZao=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pyrmvtransport/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pyrmvtransport";
version = "0.3.2";
version = "0.3.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "cgtobi";
repo = pname;
rev = "v${version}";
sha256 = "0m74m3dhxmbv10hsvs7cpshzs3pg66va5lyq94i5j1nxrl9i7spb";
sha256 = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pysma/default.nix
View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pysma";
version = "0.6.12";
version = "0.7.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-uxMxqx5qbahMvTm3akiOTODhKLNVhHzBAUsOcZo/35I=";
sha256 = "sha256-hIrdT0b9XKw1UoPZtQQ7IaW+HV8wuA9Rwoo8XYdGyw8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyswitchbot/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.19.15";
version = "0.20.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
hash = "sha256-iWd67JEnlI60mvd5hhMPRooZ3VECTt+M9UFvXWdJVPg=";
hash = "sha256-GNjyDkqhOP9sq2qoAZCdSrUNte3FynVxhy9RSUn9j/c=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyxiaomigateway/default.nix
View file

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pyxiaomigateway";
version = "0.14.1";
version = "0.14.3";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "PyXiaomiGateway";
rev = version;
sha256 = "sha256-e/FqqUl90VFDJD6ZFbFqXKH3s2sBaDjSFEvaKJhDlGg=";
sha256 = "sha256-TAbZvs1RrUy9+l2KpfbBopc3poTy+M+Q3ERQLFYbQis=";
};
propagatedBuildInputs = [ cryptography ];

9
pkgs/development/python-modules/scipy/default.nix
View file

@ -2,6 +2,7 @@
, stdenv
, fetchPypi
, python
, pythonOlder
, buildPythonPackage
, cython
, gfortran
@ -14,6 +15,7 @@
, pytest-xdist
, numpy
, pybind11
, libxcrypt
}:
buildPythonPackage rec {
@ -28,7 +30,12 @@ buildPythonPackage rec {
nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ];
buildInputs = [ numpy.blas pybind11 ];
buildInputs = [
numpy.blas
pybind11
] ++ lib.optionals (pythonOlder "3.9") [
libxcrypt
];
propagatedBuildInputs = [ numpy ];

4
pkgs/development/python-modules/scrapy/default.nix
View file

@ -31,7 +31,7 @@
buildPythonPackage rec {
pname = "scrapy";
version = "2.7.0";
version = "2.7.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -39,7 +39,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "Scrapy";
hash = "sha256-Ssvg8fX7XqkTU1EriVjtMEvCX2373ig5oNh6SUNRWLk=";
hash = "sha256-MPpAg1PSSx35ed8upK+9GbSuAvsiB/IY0kYzLx4c8U4=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/sensor-state-data/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "sensor-state-data";
version = "2.9.1";
version = "2.10.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-bBLBDdwVUCh8VA/6w/5DmJNvayaWHNIe1kRhnOQ2Llc=";
hash = "sha256-pCo9CMX+CQBFuK5rbMHsxQEdBHvp1EZA7A9Ykm68NCw=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/subarulink/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "subarulink";
version = "0.5.0";
version = "0.6.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "G-Two";
repo = pname;
rev = "v${version}";
hash = "sha256-q+a+OFFMAGl8KQi+KZ8h21+Pj0XEqP9ZIJii2PCgD6E=";
hash = "sha256-esZ+nIHIXKfilb8dBFbAbQQFI6fFRUcoFVCPdnqGXYw=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/xknx/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "xknx";
version = "1.1.0";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "XKNX";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-Nam6TnjTAt5oV+IQ+6cS8L0/j/lp+x9adRHUTs69GA0=";
hash = "sha256-IHZvmVloBSLcK3GZV9urFeqRxOG76O9O/3ZDNTz4wjQ=";
};
propagatedBuildInputs = [
@ -41,6 +41,8 @@ buildPythonPackage rec {
disabledTests = [
# Test requires network access
"test_scan_timeout"
"test_start_secure_routing_knx_keys"
"test_start_secure_routing_manual"
];
meta = with lib; {

4
pkgs/development/python-modules/yalexs-ble/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "yalexs-ble";
version = "1.9.2";
version = "1.9.5";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "v${version}";
hash = "sha256-ypZ0VDGgQcwlMS1POW+lvTlmd02P7bPR2Qo0lDyBYUw=";
hash = "sha256-cU4aeJlRBwxQm6a/rqpO2HVZfz/vfEo4P5x+BjKqqeo=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/zha-quirks/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zha-quirks";
version = "0.0.83";
version = "0.0.84";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zha-device-handlers";
rev = "refs/tags/${version}";
hash = "sha256-N+DSaPohwkMJ+YjbnUi7k8GQ+YFd6Ng8n0yesEnOnRA=";
hash = "sha256-x8DOUQjjOlLaIhsLLbGNEE+MYBcMD+VsmcCDU0XxxcE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/zigpy-zigate/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "zigpy-zigate";
version = "0.10.2";
version = "0.10.3";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy-zigate";
rev = "refs/tags/v${version}";
hash = "sha256-Vb87G+R4SvAhCF3h/U5Q4/avxPgfIjklWdWGaiIWGhk=";
hash = "sha256-zO20ySRO9XFcDB8TkUJW2MxkhDIBpHp9Z24gupssOaY=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/zigpy/default.nix
View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "zigpy";
version = "0.51.3";
version = "0.51.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy";
rev = "refs/tags/${version}";
hash = "sha256-IfYWuJfmQtJnVANyiBE3AurhucqZ8qzYXBV3jprS5qw=";
hash = "sha256-6OSP23lEdl15IjSqGYLCW5+F6rki+rzmXm82QRzabwU=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/analysis/flow/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.191.0";
version = "0.192.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "sha256-WS2Mm8hK03fXfjLLSL9V0itgmv8/tDQhN6G/C6SucOs=";
sha256 = "sha256-Eqn90vA48PKea2Qrj7sN1hWoU31KzAr7xbfF8Fwi9uw=";
};
makeFlags = [ "FLOW_RELEASE=1" ];

4
pkgs/development/tools/bazelisk/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "bazelisk";
version = "1.14.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-y3DVU2xHYZGUqf+kXhBDpTHACloqOXiMFY9bWU/QfOg=";
sha256 = "sha256-+JAAei783S9umDSMSQq50ovYm1MCID33W6dolTxBEvU=";
};
vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg=";

4
pkgs/development/tools/bundletool/default.nix
View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "bundletool";
version = "1.12.1";
version = "1.13.0";
src = fetchurl {
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
sha256 = "sha256-yn8Nz2f0UffzTrI+g1MoDpOYj7frq6/US86auYkcs3I=";
sha256 = "sha256-9Fks0DrUgk6N218pPvgAHrU0P9kjCOJhQx8ILzloC+I=";
};
dontUnpack = true;

4
pkgs/development/tools/ctlptl/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ctlptl";
version = "0.8.11";
version = "0.8.12";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-69xFfDNitLu8KUQP9ij0ndV6JCzp9wrLsHKwEjuhYdY=";
sha256 = "sha256-h0JR641+VBiTJY8INXhxwvsyZGLH4YRdkddwo2IUDQk=";
};
vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s=";

1
pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
View file

@ -17,6 +17,7 @@
tree-sitter-devicetree = lib.importJSON ./tree-sitter-devicetree.json;
tree-sitter-dockerfile = lib.importJSON ./tree-sitter-dockerfile.json;
tree-sitter-dot = lib.importJSON ./tree-sitter-dot.json;
tree-sitter-eex = lib.importJSON ./tree-sitter-eex.json;
tree-sitter-elisp = lib.importJSON ./tree-sitter-elisp.json;
tree-sitter-elixir = lib.importJSON ./tree-sitter-elixir.json;
tree-sitter-elm = lib.importJSON ./tree-sitter-elm.json;

11
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json Normal file
View file

@ -0,0 +1,11 @@
{
"url": "https://github.com/connorlay/tree-sitter-eex",
"rev": "f742f2fe327463335e8671a87c0b9b396905d1d1",
"date": "2022-01-12T10:01:23-08:00",
"path": "/nix/store/an5vj0gnziy44ckklm9hxp9wbydisk4l-tree-sitter-eex",
"sha256": "19n07ywavwkh4p189d18wxhch45qgn094b7mkdymh60zr7cbmyjh",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

4
pkgs/development/tools/parsing/tree-sitter/update.nix
View file

@ -224,6 +224,10 @@ let
orga = "connorlay";
repo = "tree-sitter-surface";
};
"tree-sitter-eex" = {
orga = "connorlay";
repo = "tree-sitter-eex";
};
"tree-sitter-heex" = {
orga = "connorlay";
repo = "tree-sitter-heex";

6
pkgs/development/tools/rust/cargo-release/default.nix
View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-release";
version = "0.22.2";
version = "0.23.0";
src = fetchFromGitHub {
owner = "crate-ci";
repo = "cargo-release";
rev = "v${version}";
sha256 = "sha256-G235QKwwOFnHsfU26hc7d0mD/nwGyJRPs6BCctEqxJ8=";
sha256 = "sha256-11u6y4w7Ah4SNgfNeVpanIZ5bWz1K0TkMGCxDtomKMM=";
};
cargoSha256 = "sha256-A3tzgLW+/GO4/kHRJH7Y7vtFUzI2Ow0nyfMfIuI5Sl4=";
cargoSha256 = "sha256-oXTuLWH8nSH1XZ+Zwu2jEi3yY+0SeR+N/b0s5gKVORQ=";
nativeBuildInputs = [ pkg-config ];

6
pkgs/development/tools/rust/cargo-udeps/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-udeps";
version = "0.1.33";
version = "0.1.35";
src = fetchFromGitHub {
owner = "est31";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Fl/4RsWHjWYJ76mD59m9Gcs2hz7bwnd0YWpZnVgMKjg=";
sha256 = "sha256-FVOrF90kgcxWmeyxBnmGyOwb1aycAQelqskOYYpAXhI=";
};
cargoSha256 = "sha256-kQwg1R+rvg2Tw27pTkrOi5QpPF3Q1woPsjac9RDYCyg=";
cargoSha256 = "sha256-JTRel8bOJbBdeDyJjO/xc+ZUQ1EunMPlyWeFrWrsVEI=";
nativeBuildInputs = [ pkg-config ];

6
pkgs/development/web/flyctl/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.427";
version = "0.0.429";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "sha256-rY/RrgkT3SjkAw1rQaTNHYecMzLy+go/BSd6/Hbz1qM=";
sha256 = "sha256-rx+5wHd6RyvsoL6176zBCgAZLCAXfdOIgZ41Vq48rdI=";
};
vendorSha256 = "sha256-wMVvDB/6ZDY3EwTWRJ1weCIlRZM+Ye24UnRl1YZzAcA=";
vendorSha256 = "sha256-pc9+m6oZGYBqDwE642HB4Ku549L3bMA52jWSmzV3tHc=";
subPackages = [ "." ];

8
pkgs/os-specific/linux/kernel/zen-kernels.nix
View file

@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
version = "6.0.6"; #zen
version = "6.0.7"; #zen
suffix = "zen1"; #zen
sha256 = "11y942camfhwd32zkfyn232acgznp3n18g65kyp8k46hrkbhbxds"; #zen
sha256 = "011wlc0h99vx830qmgy569srhb3rzhyy5j235pf7m541392vh41g"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
version = "6.0.6"; #lqx
version = "6.0.7"; #lqx
suffix = "lqx1"; #lqx
sha256 = "0f0bz2pmwwmbqdss1diblzn4lis1pw31pb4gkay4a5p61f4rw1mz"; #lqx
sha256 = "09h99fdzicbc4kkl51dqwgqqa9416hd7bvrghr4pdjqrw4z15557"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

152
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,8 +2,10 @@
# Do not edit!
{
version = "2022.10.5";
version = "2022.11.1";
components = {
"3_day_blinds" = ps: with ps; [
];
"abode" = ps: with ps; [
abodepy
];
@ -51,6 +53,21 @@
"airthings" = ps: with ps; [
airthings-cloud
];
"airthings_ble" = ps: with ps; [
aiohttp-cors
airthings-ble
bleak-retry-connector
bleak
bluetooth-adapters
bluetooth-auto-recovery
dbus-fast
fnvhash
home-assistant-frontend
pillow
pyserial
pyudev
sqlalchemy
];
"airtouch4" = ps: with ps; [
airtouch4pyapi
];
@ -98,6 +115,8 @@
amcrest
ha-ffmpeg
];
"amp_motorization" = ps: with ps; [
];
"ampio" = ps: with ps; [
asmog
];
@ -203,6 +222,8 @@
yalexs-ble
yalexs
];
"august_ble" = ps: with ps; [
];
"aurora" = ps: with ps; [
auroranoaa
];
@ -281,6 +302,10 @@
"blinksticklight" = ps: with ps; [
BlinkStick
];
"bliss_automation" = ps: with ps; [
];
"bloc_blinds" = ps: with ps; [
];
"blockchain" = ps: with ps; [
]; # missing inputs: python-blockchain-api
"bloomsky" = ps: with ps; [
@ -352,6 +377,8 @@
"braviatv" = ps: with ps; [
pybravia
];
"brel_home" = ps: with ps; [
];
"broadlink" = ps: with ps; [
broadlink
];
@ -367,7 +394,9 @@
brunt
];
"bsblan" = ps: with ps; [
bsblan
python-bsblan
];
"bswitch" = ps: with ps; [
];
"bt_home_hub_5" = ps: with ps; [
]; # missing inputs: bthomehub5-devicelist
@ -388,6 +417,10 @@
pyudev
sqlalchemy
];
"bticino" = ps: with ps; [
];
"bubendorff" = ps: with ps; [
];
"buienradar" = ps: with ps; [
buienradar
];
@ -499,6 +532,8 @@
];
"cover" = ps: with ps; [
];
"cozytouch" = ps: with ps; [
];
"cppm_tracker" = ps: with ps; [
]; # missing inputs: clearpasspy
"cpuspeed" = ps: with ps; [
@ -517,6 +552,8 @@
];
"currencylayer" = ps: with ps; [
];
"dacia" = ps: with ps; [
];
"daikin" = ps: with ps; [
pydaikin
];
@ -616,6 +653,10 @@
"dialogflow" = ps: with ps; [
aiohttp-cors
];
"diaz" = ps: with ps; [
];
"digital_loggers" = ps: with ps; [
];
"digital_ocean" = ps: with ps; [
digital-ocean
];
@ -668,6 +709,8 @@
aiohttp-cors
doorbirdpy
];
"dooya" = ps: with ps; [
];
"dovado" = ps: with ps; [
]; # missing inputs: dovado
"downloader" = ps: with ps; [
@ -944,6 +987,8 @@
"flexit" = ps: with ps; [
pymodbus
];
"flexom" = ps: with ps; [
];
"flic" = ps: with ps; [
pyflic
];
@ -1038,12 +1083,15 @@
"garages_amsterdam" = ps: with ps; [
garages-amsterdam
];
"gaviota" = ps: with ps; [
];
"gc100" = ps: with ps; [
]; # missing inputs: python-gc100
"gdacs" = ps: with ps; [
aio-georss-gdacs
];
"generic" = ps: with ps; [
aiohttp-cors
av
pillow
];
@ -1210,6 +1258,8 @@
pillow
sqlalchemy
];
"havana_shade" = ps: with ps; [
];
"haveibeenpwned" = ps: with ps; [
];
"hddtemp" = ps: with ps; [
@ -1219,12 +1269,16 @@
];
"heatmiser" = ps: with ps; [
]; # missing inputs: heatmiserV3
"heiwa" = ps: with ps; [
];
"heos" = ps: with ps; [
pyheos
];
"here_travel_time" = ps: with ps; [
herepy
];
"hi_kumo" = ps: with ps; [
];
"hikvision" = ps: with ps; [
]; # missing inputs: pyhik
"hikvisioncam" = ps: with ps; [
@ -1340,12 +1394,15 @@
aiohue
];
"huisbaasje" = ps: with ps; [
]; # missing inputs: energyflip-client
energyflip-client
];
"humidifier" = ps: with ps; [
];
"hunterdouglas_powerview" = ps: with ps; [
aiopvapi
];
"hurrican_shutters_wholesale" = ps: with ps; [
];
"hvv_departures" = ps: with ps; [
pygti
];
@ -1442,6 +1499,8 @@
];
"input_text" = ps: with ps; [
];
"inspired_shades" = ps: with ps; [
];
"insteon" = ps: with ps; [
aiohttp-cors
fnvhash
@ -1491,6 +1550,8 @@
"islamic_prayer_times" = ps: with ps; [
prayer-times-calculator
];
"ismartwindow" = ps: with ps; [
];
"iss" = ps: with ps; [
]; # missing inputs: pyiss
"isy994" = ps: with ps; [
@ -1640,6 +1701,8 @@
pyudev
sqlalchemy
];
"legrand" = ps: with ps; [
];
"lg_netcast" = ps: with ps; [
pylgnetcast
];
@ -1656,6 +1719,7 @@
aiohttp-cors
aiolifx
aiolifx-effects
aiolifx-themes
ifaddr
];
"lifx_cloud" = ps: with ps; [
@ -1736,6 +1800,8 @@
"lutron_caseta" = ps: with ps; [
pylutron-caseta
];
"luxaflex" = ps: with ps; [
];
"lw12wifi" = ps: with ps; [
]; # missing inputs: lw12
"lyric" = ps: with ps; [
@ -1764,6 +1830,10 @@
pillow
sqlalchemy
];
"marantz" = ps: with ps; [
];
"martec" = ps: with ps; [
];
"marytts" = ps: with ps; [
]; # missing inputs: speak2mary
"mastodon" = ps: with ps; [
@ -2043,6 +2113,8 @@
"nexia" = ps: with ps; [
nexia
];
"nexity" = ps: with ps; [
];
"nextbus" = ps: with ps; [
py-nextbusnext
];
@ -2076,8 +2148,9 @@
aiohttp-cors
getmac
ifaddr
mac-vendor-lookup
netmap
]; # missing inputs: mac-vendor-lookup
];
"nmbs" = ps: with ps; [
]; # missing inputs: pyrail
"no_ip" = ps: with ps; [
@ -2115,6 +2188,8 @@
"nut" = ps: with ps; [
pynut2
];
"nutrichef" = ps: with ps; [
];
"nws" = ps: with ps; [
pynws
];
@ -2216,6 +2291,21 @@
"opple" = ps: with ps; [
pyoppleio
];
"oralb" = ps: with ps; [
aiohttp-cors
bleak-retry-connector
bleak
bluetooth-adapters
bluetooth-auto-recovery
dbus-fast
fnvhash
home-assistant-frontend
oralb-ble
pillow
pyserial
pyudev
sqlalchemy
];
"oru" = ps: with ps; [
]; # missing inputs: oru
"orvibo" = ps: with ps; [
@ -2265,6 +2355,8 @@
pillow
sqlalchemy
];
"pcs_lighting" = ps: with ps; [
];
"peco" = ps: with ps; [
peco
];
@ -2468,6 +2560,8 @@
];
"raspyrfm" = ps: with ps; [
]; # missing inputs: raspyrfm-client
"raven_rock_mfg" = ps: with ps; [
];
"rdw" = ps: with ps; [
vehicle
];
@ -2508,6 +2602,8 @@
];
"rest_command" = ps: with ps; [
];
"rexel" = ps: with ps; [
];
"rflink" = ps: with ps; [
rflink
];
@ -2535,6 +2631,8 @@
"rmvtransport" = ps: with ps; [
pyrmvtransport
];
"roborock" = ps: with ps; [
];
"rocketchat" = ps: with ps; [
]; # missing inputs: rocketchat-API
"roku" = ps: with ps; [
@ -2616,6 +2714,8 @@
lxml
xmltodict
];
"screenaway" = ps: with ps; [
];
"screenlogic" = ps: with ps; [
screenlogicpy
];
@ -2647,6 +2747,8 @@
fnvhash
sqlalchemy
];
"sensorblue" = ps: with ps; [
];
"sensorpro" = ps: with ps; [
aiohttp-cors
bleak-retry-connector
@ -2704,6 +2806,7 @@
"shell_command" = ps: with ps; [
];
"shelly" = ps: with ps; [
aiohttp-cors
aioshelly
];
"shiftr" = ps: with ps; [
@ -2732,6 +2835,8 @@
"simplisafe" = ps: with ps; [
simplisafe-python
];
"simply_automated" = ps: with ps; [
];
"simulated" = ps: with ps; [
];
"sinch" = ps: with ps; [
@ -2770,9 +2875,15 @@
aiohttp-cors
pysmappee
];
"smart_blinds" = ps: with ps; [
];
"smart_home" = ps: with ps; [
];
"smart_meter_texas" = ps: with ps; [
smart-meter-texas
];
"smarther" = ps: with ps; [
];
"smartthings" = ps: with ps; [
pyturbojpeg
aiohttp-cors
@ -2803,6 +2914,21 @@
"snmp" = ps: with ps; [
pysnmplib
];
"snooz" = ps: with ps; [
aiohttp-cors
bleak-retry-connector
bleak
bluetooth-adapters
bluetooth-auto-recovery
dbus-fast
fnvhash
home-assistant-frontend
pillow
pyserial
pysnooz
pyudev
sqlalchemy
];
"solaredge" = ps: with ps; [
solaredge
stringcase
@ -2818,6 +2944,8 @@
"soma" = ps: with ps; [
pysoma
];
"somfy" = ps: with ps; [
];
"somfy_mylink" = ps: with ps; [
somfy-mylink-synergy
];
@ -2967,6 +3095,8 @@
];
"switchmate" = ps: with ps; [
]; # missing inputs: pySwitchmate
"symfonisk" = ps: with ps; [
];
"syncthing" = ps: with ps; [
aiosyncthing
];
@ -3073,6 +3203,8 @@
sqlalchemy
thermobeacon-ble
];
"thermoplus" = ps: with ps; [
];
"thermopro" = ps: with ps; [
aiohttp-cors
bleak-retry-connector
@ -3243,6 +3375,8 @@
"ukraine_alarm" = ps: with ps; [
uasiren
];
"ultraloq" = ps: with ps; [
];
"unifi" = ps: with ps; [
aiounifi
];
@ -3277,6 +3411,8 @@
ifaddr
zeroconf
];
"uprise_smart_shades" = ps: with ps; [
];
"uptime" = ps: with ps; [
];
"uptimerobot" = ps: with ps; [
@ -3557,6 +3693,7 @@
py-zabbix
];
"zamg" = ps: with ps; [
zamg
];
"zengge" = ps: with ps; [
bluepy
@ -3630,6 +3767,7 @@
"airly"
"airnow"
"airthings"
"airthings_ble"
"airtouch4"
"airvisual"
"airzone"
@ -3695,6 +3833,7 @@
"canary"
"cast"
"cert_expiry"
"clicksend_tts"
"climate"
"cloud"
"cloudflare"
@ -3871,6 +4010,7 @@
"http"
"huawei_lte"
"hue"
"huisbaasje"
"humidifier"
"hunterdouglas_powerview"
"hvv_departures"
@ -4005,6 +4145,7 @@
"nextdns"
"nightscout"
"nina"
"nmap_tracker"
"no_ip"
"nobo_hub"
"notify"
@ -4033,6 +4174,7 @@
"openuv"
"openweathermap"
"opnsense"
"oralb"
"overkiz"
"ovo_energy"
"owntracks"
@ -4145,6 +4287,7 @@
"smtp"
"snips"
"snmp"
"snooz"
"solaredge"
"solarlog"
"solax"
@ -4297,6 +4440,7 @@
"yeelight"
"yolink"
"youless"
"zamg"
"zeroconf"
"zerproc"
"zha"

48
pkgs/servers/home-assistant/default.nix
View file

@ -41,26 +41,15 @@ let
};
});
bsblan = super.bsblan.overridePythonAttrs (oldAttrs: rec {
version = "0.5.0";
postPatch = null;
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.cattrs ];
gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: rec {
version = "2.2.3";
src = fetchFromGitHub {
owner = "liudger";
repo = "python-bsblan";
rev = "v.${version}";
hash = "sha256-yzlHcIb5QlG+jAgEtKlAcY7rESiUY7nD1YwqK63wgcg=";
};
});
blebox-uniapi = super.blebox-uniapi.overridePythonAttrs (oldAttrs: rec {
version = "2.0.2";
src = fetchFromGitHub {
owner = "blebox";
repo = "blebox_uniapi";
rev = "refs/tags/v${version}";
hash = "sha256-0Yiooy7YSUFjqqcyH2fPQ6AWuR0EJxfRRZTw/6JGcMA=";
owner = "allenporter";
repo = "gcal_sync";
rev = "refs/tags/${version}";
hash = "sha256-5PoKdJBrNhPfcDxmprc/1jX7weIs7HSxFzzvjKOjGbY=";
};
doCheck = false; # requires aiohttp>=1.0.0
});
gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec {
@ -84,16 +73,6 @@ let
};
});
iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec {
version = "0.4.1";
src = fetchFromGitHub {
owner = "flz";
repo = "iaqualink-py";
rev = "v${version}";
hash = "sha256-GDJwPBEU7cteAdYj7eo5tAo0G8AVcQR7KSxLNLhU/XU=";
};
});
# pytest-aiohttp>0.3.0 breaks home-assistant tests
pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec {
version = "0.3.0";
@ -115,9 +94,6 @@ let
aioopenexchangerates = super.aioopenexchangerates.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires aiohttp>=1.0.0
});
gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires aiohttp>=1.0.0
});
hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires aiohttp>=1.0.0
});
@ -161,6 +137,12 @@ let
};
});
pydaikin = super.pydaikin.overridePythonAttrs (oldAttrs: rec {
disabledTests = [
"test_power_sensors"
];
});
pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec {
doCheck = false; # requires pytest-aiohttp>=1.0.0
});
@ -254,7 +236,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.10.5";
hassVersion = "2022.11.1";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -272,7 +254,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-y2X6tiR3TLbQ1tYUUuu8D0i5j+P0FnDWJ1mSlGPwIuY=";
hash = "sha256-2zpNrkRYsmJEq+4L0J6wJodmda5r8NWgYVtYwAHKSps=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

4
pkgs/servers/home-assistant/frontend.nix
View file

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20221010.0";
version = "20221102.1";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
sha256 = "sha256-TyaEnXHnaFk+V06BjeblYv6VnXsmYCc/7mYicJsBEY8=";
sha256 = "sha256-HAFJxrBI6wB1XMe+71tF/bijuQAoyAw8LBQbfv+Vqco=";
};
# there is nothing to strip in this package

18
pkgs/servers/home-assistant/parse-requirements.py
View file

@ -168,8 +168,8 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional
return None
def get_pkg_version(package: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]:
pkg = packages.get(f"{PKG_SET}.{package}", None)
def get_pkg_version(attr_path: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]:
pkg = packages.get(attr_path, None)
if not pkg:
return None
return pkg["version"]
@ -198,12 +198,14 @@ def main() -> None:
extras = name[name.find("[")+1:name.find("]")].split(",")
name = name[:name.find("[")]
attr_path = name_to_attr_path(name, packages)
if our_version := get_pkg_version(name, packages):
if Version.parse(our_version) < Version.parse(required_version):
outdated[name] = {
'wanted': required_version,
'current': our_version
}
if attr_path:
if our_version := get_pkg_version(attr_path, packages):
attr_name = attr_path.split(".")[-1]
if Version.parse(our_version) < Version.parse(required_version):
outdated[attr_name] = {
'wanted': required_version,
'current': our_version
}
if attr_path is not None:
# Add attribute path without "python3Packages." prefix
pname = attr_path[len(PKG_SET + "."):]

10
pkgs/servers/home-assistant/tests.nix
View file

@ -47,6 +47,10 @@ let
# bytearrray mismatch
"test_rfy_cover"
];
zha = [
# 'manual_pick_radio_type' == 'choose_serial_port'
"test_options_flow_migration_reset_old_adapter"
];
};
extraPytestFlagsArray = {
@ -62,6 +66,10 @@ let
# Flaky: AssertionError: assert '0.0' == '12.0'
"--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed"
];
modem_callerid = [
# aioserial mock produces wrong state
"--deselect tests/components/modem_callerid/test_init.py::test_setup_entry"
];
skybell = [
# Sandbox network limitations: Cannot connect to host cloud.myskybell.com:443
"--deselect tests/components/skybell/test_config_flow.py::test_flow_user_unknown_error"
@ -106,8 +114,6 @@ in lib.listToAttrs (map (component: lib.nameValuePair component (
meta = old.meta // {
broken = lib.elem component [
"modem_callerid"
"subaru"
];
# upstream only tests on Linux, so do we.
platforms = lib.platforms.linux;

8
pkgs/servers/nextcloud/default.nix
View file

@ -48,13 +48,13 @@ in {
'';
nextcloud24 = generic {
version = "24.0.6";
sha256 = "b26dff9980a47e7e722805fdbbf87e07f59a3817b03ecc32698e028e9baf0301";
version = "24.0.7";
sha256 = "a1c7344a4eb27260a9f6f6e6f586bdc4fb35e1e9330e1a6e8d46c05634db6384";
};
nextcloud25 = generic {
version = "25.0.0";
sha256 = "2c05ac9d7b72b44ef8b3d2ae03ff0fd6121e254b8054556f5163bd8760dd8f49";
version = "25.0.1";
sha256 = "72d4076924caf19139c40178597af6211799e20440ce196fb43b9c4e47d77515";
};
# tip: get the sha with:

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View file

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
stdenv.mkDerivation rec {
version = "2022-11-03";
version = "2022-11-04";
pname = "oh-my-zsh";
rev = "b3b336b0f95644ceda7758871191cdf040b897b2";
rev = "80fdbc9b91a9acca42fb90065b5e64a9722978a7";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "azQ2ceqRnvugNI/1ORZXb+5zrv0PXvwYd2Zc85VXSo4=";
sha256 = "dapyDDtQ8JUE3PpmHo9DLtt0gEBOrHqoC8wMZeQFUts=";
};
strictDeps = true;

6
pkgs/tools/admin/clair/default.nix
View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "clair";
version = "4.4.4";
version = "4.5.0";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
hash = "sha256-QfNFms1OxKPk6vimagMFGWJSl9L7JEM1rIK5kNpZlfg=";
hash = "sha256-/Czgdl6OxfXSQGvoanA8eoGdzK/wCgGH3wy5aLf0DSM=";
};
vendorSha256 = "sha256-Y3eymnLVbDmisV3RDAYkV+I6kTe/CoG0yLvZBOrTfig=";
vendorSha256 = "sha256-XWsnEjVA/fqiLevn6sxjzlDfuy937idIcXdTY56FrdA=";
nativeBuildInputs = [
makeWrapper

6
pkgs/tools/admin/eksctl/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.115.0";
version = "0.117.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "sha256-IIxg0xaRfd7jKS4AkSFHcObQmKSRCnQ+K68by8aZlAc=";
sha256 = "sha256-3OYhwl+oJNSAYI5RLJgdZgq8teqkjCHy5r/XOqJdz7I=";
};
vendorSha256 = "sha256-glMu2GwMWsuIjLjCwskH90wn690tosLTCThd4LUZobo=";
vendorSha256 = "sha256-a5E6a+DFrbAA2/sznrKbE4IP68f49+Nbiujx94snryQ=";
doCheck = false;

4
pkgs/tools/filesystems/btrfs-progs/default.nix
View file

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
version = "6.0";
version = "6.0.1";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
sha256 = "sha256-Rp4bLshCpuZISK5j3jAiRG+ACel19765GRkfE3y91TQ=";
sha256 = "sha256-tTFv/x2BHirToGeXMQnrkSuw2SgFc1Yl/YuC5wAgHEg=";
};
nativeBuildInputs = [

8
pkgs/tools/misc/tio/default.nix
View file

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkg-config, inih, bash-completion }:
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, inih, bash-completion }:
stdenv.mkDerivation rec {
pname = "tio";
version = "2.1";
version = "2.3";
src = fetchFromGitHub {
owner = "tio";
repo = "tio";
rev = "v${version}";
hash = "sha256-1GKwJylC57es2zM0ON3y4DLgJ7Q6bDYZW/L49U8GBLo=";
hash = "sha256-BjA9Zl6JcgDxTj4KPiWItSq9XuX9FJkpZnhdMBGZQpQ=";
};
nativeBuildInputs = [ meson ninja cmake pkg-config inih bash-completion ];
nativeBuildInputs = [ meson ninja pkg-config inih bash-completion ];
meta = with lib; {
description = "Serial console TTY";

4
pkgs/tools/networking/ghostunnel/default.nix
View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "ghostunnel";
version = "1.6.1";
version = "1.7.0";
src = fetchFromGitHub {
owner = "ghostunnel";
repo = "ghostunnel";
rev = "v${version}";
sha256 = "sha256-VameENcHZ6AttV0D8ekPGGFoMHTiTXAY2FxK/Nxwjmk=";
sha256 = "sha256-vODSjTpo2oTY42fONhUU8Xn119cTYUGQ6RJaLnS9q3k=";
};
vendorSha256 = null;

13
pkgs/tools/security/sudo/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, buildPackages
, coreutils
, pam
@ -15,21 +14,13 @@
stdenv.mkDerivation rec {
pname = "sudo";
version = "1.9.12";
version = "1.9.12p1";
src = fetchurl {
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
hash = "sha256-3hVzOIgXDFaDTar9NL+YPbEPshA5dC/Pw5a9MhaNY2I=";
hash = "sha256-R1oYqOs9qLKRfOqwY6a69R6gkSjDxH4+DjOrdJe6t9g=";
};
patches = [
(fetchpatch {
name = "CVE-2022-43995.patch";
url = "https://github.com/sudo-project/sudo/commit/bd209b9f16fcd1270c13db27ae3329c677d48050.patch";
sha256 = "sha256-JUdoStoSyv6KBPsyzxuMIxqwZMZsjUPj8zUqOSvmZ1A=";
})
];
prePatch = ''
# do not set sticky bit in nix store
substituteInPlace src/Makefile.in --replace 04755 0755

7
pkgs/tools/security/witness/default.nix
View file

@ -2,15 +2,16 @@
buildGoModule rec {
pname = "witness";
version = "0.1.11";
version = "0.1.12";
src = fetchFromGitHub {
owner = "testifysec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/v6dltF4oCIOtN6Fcpf+VvT+c3vTB1q/IgGUqZzbcVk=";
sha256 = "sha256-MH4ByPoHZHIq2b/QGA/fFa3P1a28BbkaX/p48pwnl1Q=";
};
vendorSha256 = "sha256-UP68YNLX+fuCvd+e3rER1icha9bS3MemJLwJOMMOVfg=";
proxyVendor = true;
vendorSha256 = "sha256-CUiex+ljzpbkqbXCmOjO62YTcgqOIE9Cg3JB6CWUbsk=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/tools/system/natscli/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "natscli";
version = "0.0.34";
version = "0.0.35";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tDs0OrMeWLhBUnngJRBmAauwMA/zdMC4ED7xcCED4Zs=";
sha256 = "sha256-Sro0EwHP1pszuOYP6abZO5XjJvbXrDDeSAbzPA2p00M=";
};
vendorSha256 = "sha256-Wv0V1/BbO8cP9Qj1TBCDpPTpbv3xzT8eCLPBhCPxRKo=";
vendorSha256 = "sha256-HSKBUw9ZO150hLXyGX66U9XpLX2yowxYVdcdDVdqrAc=";
meta = with lib; {
description = "NATS Command Line Interface";

4
pkgs/tools/typesetting/biblatex-check/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "biblatex-check";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "Pezmc";
repo = "BibLatex-Check";
rev = "v${version}";
sha256 = "sha256-Pe6Ume7vH8WJG2EqOw31g3VYilfFsDBmNHtHcUXxqf0=";
sha256 = "sha256-8oHX56+kRWWl8t22DqLAFinjPngRMo3vXxXuVXBwutM=";
};
buildInputs = [ python3 ];

1
pkgs/top-level/python-aliases.nix
View file

@ -41,6 +41,7 @@ mapAliases ({
Babel = babel; # added 2022-05-06
bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15
blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29
bsblan = python-bsblan; # added 2022-11-04
bt_proximity = bt-proximity; # added 2021-07-02
carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18
class-registry = phx-class-registry; # added 2021-10-05

8
pkgs/top-level/python-packages.nix
View file

@ -238,6 +238,8 @@ self: super: with self; {
aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { };
aiolifx-themes = callPackage ../development/python-modules/aiolifx-themes { };
aiolimiter = callPackage ../development/python-modules/aiolimiter { };
aiolip = callPackage ../development/python-modules/aiolip { };
@ -1394,8 +1396,6 @@ self: super: with self; {
bsdiff4 = callPackage ../development/python-modules/bsdiff4 { };
bsblan = callPackage ../development/python-modules/bsblan { };
bson = callPackage ../development/python-modules/bson { };
bsuite = callPackage ../development/python-modules/bsuite { };
@ -5433,6 +5433,8 @@ self: super: with self; {
mac_alias = callPackage ../development/python-modules/mac_alias { };
mac-vendor-lookup = callPackage ../development/python-modules/mac-vendor-lookup { };
macfsevents = callPackage ../development/python-modules/macfsevents {
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices;
};
@ -6488,6 +6490,8 @@ self: super: with self; {
opuslib = callPackage ../development/python-modules/opuslib { };
oralb-ble = callPackage ../development/python-modules/oralb-ble { };
orderedmultidict = callPackage ../development/python-modules/orderedmultidict { };
ordered-set = callPackage ../development/python-modules/ordered-set { };