Merge master into staging-next
This commit is contained in:
commit
a8cf6897e5
|
@ -70,10 +70,12 @@ in
|
||||||
Packages providing extra SANE backends to enable.
|
Packages providing extra SANE backends to enable.
|
||||||
|
|
||||||
::: {.note}
|
::: {.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 {
|
hardware.sane.disabledDefaultBackends = mkOption {
|
||||||
|
|
|
@ -433,6 +433,8 @@ in {
|
||||||
componentsUsingBluetooth = [
|
componentsUsingBluetooth = [
|
||||||
# Components that require the AF_BLUETOOTH address family
|
# Components that require the AF_BLUETOOTH address family
|
||||||
"august"
|
"august"
|
||||||
|
"august_ble"
|
||||||
|
"airthings_ble"
|
||||||
"bluemaestro"
|
"bluemaestro"
|
||||||
"bluetooth"
|
"bluetooth"
|
||||||
"bluetooth_le_tracker"
|
"bluetooth_le_tracker"
|
||||||
|
@ -445,15 +447,19 @@ in {
|
||||||
"govee_ble"
|
"govee_ble"
|
||||||
"homekit_controller"
|
"homekit_controller"
|
||||||
"inkbird"
|
"inkbird"
|
||||||
|
"keymitt_ble"
|
||||||
"led_ble"
|
"led_ble"
|
||||||
"melnor"
|
"melnor"
|
||||||
"moat"
|
"moat"
|
||||||
|
"oralb"
|
||||||
"qingping"
|
"qingping"
|
||||||
"sensorpro"
|
"sensorpro"
|
||||||
"sensorpush"
|
"sensorpush"
|
||||||
|
"snooz"
|
||||||
"switchbot"
|
"switchbot"
|
||||||
"thermobeacon"
|
"thermobeacon"
|
||||||
"thermopro"
|
"thermopro"
|
||||||
|
"tilt_ble"
|
||||||
"xiaomi_ble"
|
"xiaomi_ble"
|
||||||
"yalexs_ble"
|
"yalexs_ble"
|
||||||
];
|
];
|
||||||
|
|
|
@ -613,7 +613,7 @@ in {
|
||||||
|
|
||||||
config = mkIf cfg.enable (mkMerge [
|
config = mkIf cfg.enable (mkMerge [
|
||||||
{ warnings = let
|
{ warnings = let
|
||||||
latest = 24;
|
latest = 25;
|
||||||
upgradeWarning = major: nixos:
|
upgradeWarning = major: nixos:
|
||||||
''
|
''
|
||||||
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
|
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
|
||||||
|
|
|
@ -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
|
|
|
@ -3,7 +3,7 @@
|
||||||
, Foundation
|
, Foundation
|
||||||
, freetype
|
, freetype
|
||||||
, lib
|
, lib
|
||||||
, lua5_2
|
, lua5_4
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pcre2
|
, pcre2
|
||||||
|
@ -15,26 +15,21 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "lite-xl";
|
pname = "lite-xl";
|
||||||
version = "2.0.5";
|
version = "2.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lite-xl";
|
owner = "lite-xl";
|
||||||
repo = "lite-xl";
|
repo = "lite-xl";
|
||||||
rev = "v${version}";
|
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 ];
|
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
agg
|
agg
|
||||||
freetype
|
freetype
|
||||||
lua5_2
|
lua5_4
|
||||||
pcre2
|
pcre2
|
||||||
reproc
|
reproc
|
||||||
SDL2
|
SDL2
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
, enableDdc ? true, ddcutil
|
, enableDdc ? true, ddcutil
|
||||||
, enableDpms ? true, libXext
|
, enableDpms ? true, libXext
|
||||||
, enableGamma ? true, libdrm, libXrandr, wayland
|
, enableGamma ? true, libdrm, libXrandr, wayland
|
||||||
, enableScreen ? true }:
|
, enableScreen ? true
|
||||||
|
, enableYoctolight ? true }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "clightd";
|
pname = "clightd";
|
||||||
|
@ -36,7 +37,8 @@ stdenv.mkDerivation rec {
|
||||||
] ++ optional enableDdc "-DENABLE_DDC=1"
|
] ++ optional enableDdc "-DENABLE_DDC=1"
|
||||||
++ optional enableDpms "-DENABLE_DPMS=1"
|
++ optional enableDpms "-DENABLE_DPMS=1"
|
||||||
++ optional enableGamma "-DENABLE_GAMMA=1"
|
++ optional enableGamma "-DENABLE_GAMMA=1"
|
||||||
++ optional enableScreen "-DENABLE_SCREEN=1";
|
++ optional enableScreen "-DENABLE_SCREEN=1"
|
||||||
|
++ optional enableYoctolight "-DENABLE_YOCTOLIGHT=1";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
dbus
|
dbus
|
||||||
|
|
|
@ -54,9 +54,6 @@ stdenv.mkDerivation rec {
|
||||||
text-engine
|
text-engine
|
||||||
];
|
];
|
||||||
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/36468.
|
|
||||||
mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Desktop app for managing GNOME shell extensions";
|
description = "Desktop app for managing GNOME shell extensions";
|
||||||
homepage = "https://github.com/mjakeman/extension-manager";
|
homepage = "https://github.com/mjakeman/extension-manager";
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "tektoncd-cli";
|
pname = "tektoncd-cli";
|
||||||
version = "0.24.1";
|
version = "0.27.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tektoncd";
|
owner = "tektoncd";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-8dCmORfTMFHSyc9FOpL01ywxGcH3uolzD2aOtyy191Q=";
|
sha256 = "sha256-zLPZueKdUNauIzqXOV773SZ/RWg7UuMNeJHr7z6ZJ+E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
@ -17,14 +17,15 @@ buildGoModule rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
# third_party/VENDOR-LICENSE breaks build/check as go files are still included
|
subPackages = [ "cmd/tkn" ];
|
||||||
# docs is a tool for generating docs
|
|
||||||
excludedPackages = [ "third_party" "cmd/docs" ];
|
|
||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
# some tests try to write to the home dir
|
# some tests try to write to the home dir
|
||||||
export HOME="$TMPDIR"
|
export HOME="$TMPDIR"
|
||||||
|
|
||||||
|
# run all tests
|
||||||
|
unset subPackages
|
||||||
|
|
||||||
# the tests expect the clientVersion ldflag not to be set
|
# the tests expect the clientVersion ldflag not to be set
|
||||||
unset ldflags
|
unset ldflags
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "nixpacks";
|
pname = "nixpacks";
|
||||||
version = "0.11.6";
|
version = "0.12.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "railwayapp";
|
owner = "railwayapp";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-9b1j3hY4ChlLIXmNsIjt6SjqHOYSqdY98amV36WPU74=";
|
sha256 = "sha256-l6QIP/GIm7QMWLjYQJ3yuT7mWriowcND32EUuiNfvNA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-s34mYMaHElBTD7I6QZtGsVTZUbVkcSmavvLs2k4mJDw=";
|
cargoSha256 = "sha256-t2kxpiSSYzg4MfjCyxkKNfPLTwGB8KgzQonFkLPCpvM=";
|
||||||
|
|
||||||
# skip test due FHS dependency
|
# skip test due FHS dependency
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
i3.overrideAttrs (oldAttrs : rec {
|
i3.overrideAttrs (oldAttrs : rec {
|
||||||
pname = "i3-gaps";
|
pname = "i3-gaps";
|
||||||
version = "4.21";
|
version = "4.21.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Airblader";
|
owner = "Airblader";
|
||||||
repo = "i3";
|
repo = "i3";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-douSRvnyDbi2gDJfu9VZmmTyYfy+FrFWHgyAyPyBWdM=";
|
sha256 = "sha256-+JxJjvzEuAA4CH+gufzAzIqd5BSvHtPvLm2zTfXc/xk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -4,13 +4,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "globalarrays";
|
pname = "globalarrays";
|
||||||
version = "5.8.1";
|
version = "5.8.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "GlobalArrays";
|
owner = "GlobalArrays";
|
||||||
repo = "ga";
|
repo = "ga";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-IyHdeIUHu/T4lb/etGGnNB2guIspual8/v9eS807Qco=";
|
sha256 = "sha256-2ffQIg9topqKX7ygnWaa/UunL9d0Lj9qr9xucsjLuoY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook gfortran ];
|
nativeBuildInputs = [ autoreconfHook gfortran ];
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libplctag";
|
pname = "libplctag";
|
||||||
version = "2.5.2";
|
version = "2.5.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "libplctag";
|
owner = "libplctag";
|
||||||
repo = "libplctag";
|
repo = "libplctag";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-HBhVPHkr21iT78lE0FRydZAY7kkH1s/EWP7lsWFC0xA=";
|
sha256 = "sha256-v6Gp9C5r5WMFR+LAZPlUKQ4EiBDmbscPEKKDv7gaTEo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -68,7 +68,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "webkitgtk";
|
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"}"}";
|
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" ];
|
outputs = [ "out" "dev" "devdoc" ];
|
||||||
|
@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
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 [
|
patches = lib.optionals stdenv.isLinux [
|
||||||
|
|
|
@ -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 param =
|
||||||
let check = lib.versionAtLeast ocaml.version; in
|
let check = lib.versionAtLeast ocaml.version; in
|
||||||
if check "4.06" then rec {
|
if check "4.06" then rec {
|
||||||
version = "2.18.12";
|
version = "2.18.13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "garrigue";
|
owner = "garrigue";
|
||||||
repo = "lablgtk";
|
repo = "lablgtk";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256:0asib87c42apwf1ln8541x6i3mvyajqbarifvz11in0mqn5k7g7h";
|
sha256 = "sha256-69Svno0qLaUifMscnVuPUJlCo9d8Lee+1qiYx34G3Po=";
|
||||||
};
|
};
|
||||||
NIX_CFLAGS_COMPILE = null;
|
NIX_CFLAGS_COMPILE = null;
|
||||||
|
buildInputs = [ camlp-streams ];
|
||||||
} else if check "3.12" then {
|
} else if check "3.12" then {
|
||||||
version = "2.18.5";
|
version = "2.18.5";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
|
@ -26,11 +29,12 @@ let param =
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "lablgtk";
|
pname = "ocaml${ocaml.version}-lablgtk";
|
||||||
inherit (param) version src NIX_CFLAGS_COMPILE;
|
inherit (param) version src NIX_CFLAGS_COMPILE;
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ocaml findlib ];
|
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" ];
|
configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
|
||||||
buildFlags = [ "world" ];
|
buildFlags = [ "world" ];
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
, aiocoap
|
, aiocoap
|
||||||
, bleak
|
, bleak
|
||||||
, bleak-retry-connector
|
, bleak-retry-connector
|
||||||
|
, chacha20poly1305
|
||||||
, chacha20poly1305-reuseable
|
, chacha20poly1305-reuseable
|
||||||
, commentjson
|
, commentjson
|
||||||
, cryptography
|
, cryptography
|
||||||
|
@ -17,7 +18,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aiohomekit";
|
pname = "aiohomekit";
|
||||||
version = "2.0.2";
|
version = "2.2.14";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -26,7 +27,7 @@ buildPythonPackage rec {
|
||||||
owner = "Jc2k";
|
owner = "Jc2k";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-pZEZHhsU/1tEX1VOFQ8b+ERJ8tU1pzRJMRYD28nfTb0=";
|
hash = "sha256-0O8fax25vabItFnUD9N7C4gyMSKPHqHSgzJXJjp5dGw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -37,6 +38,7 @@ buildPythonPackage rec {
|
||||||
aiocoap
|
aiocoap
|
||||||
bleak
|
bleak
|
||||||
bleak-retry-connector
|
bleak-retry-connector
|
||||||
|
chacha20poly1305
|
||||||
chacha20poly1305-reuseable
|
chacha20poly1305-reuseable
|
||||||
commentjson
|
commentjson
|
||||||
cryptography
|
cryptography
|
||||||
|
|
58
pkgs/development/python-modules/aiolifx-themes/default.nix
Normal file
58
pkgs/development/python-modules/aiolifx-themes/default.nix
Normal 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 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,7 +2,9 @@
|
||||||
, aiohttp
|
, aiohttp
|
||||||
, aresponses
|
, aresponses
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
|
, ciso8601
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, orjson
|
||||||
, pytest-asyncio
|
, pytest-asyncio
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
|
@ -10,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aiopyarr";
|
pname = "aiopyarr";
|
||||||
version = "22.9.0";
|
version = "22.10.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -19,11 +21,13 @@ buildPythonPackage rec {
|
||||||
owner = "tkdrob";
|
owner = "tkdrob";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-nJjqpk4GcgXJhFZd4E3vSmyNP+RkOASEd4Ipemx6cAc=";
|
hash = "sha256-FpBKhxFFMG5WgQ3TCAcg1P+cGVGU7LiJ+Zr4kL2Nl88=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
aiohttp
|
aiohttp
|
||||||
|
ciso8601
|
||||||
|
orjson
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aioshelly";
|
pname = "aioshelly";
|
||||||
version = "3.0.0";
|
version = "4.1.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||||
owner = "home-assistant-libs";
|
owner = "home-assistant-libs";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-Id4qg7uSvpjXpEx0/EvSMvFxgkR78/NOoOmmwngj7Qw=";
|
hash = "sha256-0BxbcWA2Kdk1xTSKN/dH9LJc3yI60kmyMCrK77tqyNE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aiounifi";
|
pname = "aiounifi";
|
||||||
version = "40";
|
version = "41";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||||
owner = "Kane610";
|
owner = "Kane610";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-PJ3AIoqu0cUs8IZqY9O2e+GuPd4vjLn9VruKyPxVe4A=";
|
hash = "sha256-rBluo4080m9jFnquXaQY/Cntp7wHToY16aNFhzrQJs8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "asyncclick";
|
pname = "asyncclick";
|
||||||
version = "8.0.1.3";
|
version = "8.1.3.2";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||||
owner = "python-trio";
|
owner = "python-trio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "03b8zz8i3aqzxr3ffzb4sxnrcm3gsk9r4hmr0fkml1ahi754bx2r";
|
sha256 = "sha256-by1clF+WAfN/gjOg/F60O1tCZ3qAhWqiiJJY04iMzQ8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "av";
|
pname = "av";
|
||||||
version = "9.2.0";
|
version = "10.0.0";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||||
owner = "mikeboers";
|
owner = "mikeboers";
|
||||||
repo = "PyAV";
|
repo = "PyAV";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-I7j+EzpvgKCNY8TbcaHsaWtetyvmno6YYhQTer2+Ds0=";
|
hash = "sha256-XcHP8RwC2iwD64Jc7SS+t9OxjFTsz3FbrnjMgJnN7Ak=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bleak-retry-connector";
|
pname = "bleak-retry-connector";
|
||||||
version = "2.1.3";
|
version = "2.8.2";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "Bluetooth-Devices";
|
owner = "Bluetooth-Devices";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-fEdyo6QBmHWgl5o/ZIu/HM8GWp5t88awhb+7SPWngf0=";
|
hash = "sha256-u/7gEY1HsOc2JqGmq/kS46wcA0p8B7D08vrOHWIuFyY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
, dbus-fast
|
, dbus-fast
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, poetry-core
|
, poetry-core
|
||||||
|
, pytest-asyncio
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, typing-extensions
|
, typing-extensions
|
||||||
|
@ -12,16 +13,16 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bleak";
|
pname = "bleak";
|
||||||
version = "0.18.1";
|
version = "0.19.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hbldh";
|
owner = "hbldh";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-2/jJ2C2TudwCAshDBLUQjNMbYa2j4XfW8bXmeWrAyrA=";
|
hash = "sha256-WNFAN8xE0ULo4fQnPFJJsc/HtrVo1ClxsvxrrhJjvI0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -35,6 +36,7 @@ buildPythonPackage rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
pytest-asyncio
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bluetooth-data-tools";
|
pname = "bluetooth-data-tools";
|
||||||
version = "0.1.2";
|
version = "0.2.0";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||||
owner = "Bluetooth-Devices";
|
owner = "Bluetooth-Devices";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-AobkHODtWun2TPxb6yR/ieYyeIndTG0KmxTY81fQHCA=";
|
hash = "sha256-5FOFN2B35dTYuZhO09HZ/sNkY5X16bICP+qWzmrua5o=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -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 ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bthome-ble";
|
pname = "bthome-ble";
|
||||||
version = "1.2.2";
|
version = "2.1.0";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "Bluetooth-Devices";
|
owner = "Bluetooth-Devices";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-2/2ODlHqQOl4LHUb2fyQpmsBYnoz0Rvc9lLEfZTKijA=";
|
hash = "sha256-4vk9uaG/9n3lNEWAergW9kFN2/Ta/KSax0rK9tVxAfw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "dbus-fast";
|
pname = "dbus-fast";
|
||||||
version = "1.29.1";
|
version = "1.64.0";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||||
owner = "Bluetooth-Devices";
|
owner = "Bluetooth-Devices";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-GqL6PZlqFi5Es8VYeqeTsXX6j5fol2JzcosFtVCQn60=";
|
hash = "sha256-y/H4TYCicn6Gvv+F4ogqhNWK2mZxEVNGCY4pJAfjq9s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -78,6 +78,14 @@ buildPythonPackage rec {
|
||||||
"test_standard_interfaces"
|
"test_standard_interfaces"
|
||||||
"test_tcp_connection_with_forwarding"
|
"test_tcp_connection_with_forwarding"
|
||||||
"test_unexpected_disconnect"
|
"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; {
|
meta = with lib; {
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "fjaraskupan";
|
pname = "fjaraskupan";
|
||||||
version = "2.1.0";
|
version = "2.2.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||||
owner = "elupus";
|
owner = "elupus";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-Vt2THMB4m0YCLdfEnAokwS0oJfcgp3fmZMUDhTrekZY=";
|
hash = "sha256-0tNLwYckWF9GjhniEkiO+A+xDsUriUsMFZxG/FmUfps=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "freebox-api";
|
pname = "freebox-api";
|
||||||
version = "1.0.0";
|
version = "1.0.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hacf-fr";
|
owner = "hacf-fr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-y78PzSivB+IJ9hrN3ZRhDBo7kI7M6uleTPkF6slO6So=";
|
hash = "sha256-60hIv35nNxXPFZy/JvG1O/ZkSMk65XDojUYP1QyfwXY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,18 +1,20 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
|
||||||
, pythonOlder
|
|
||||||
, fetchFromGitHub
|
|
||||||
, aiohttp
|
, aiohttp
|
||||||
, pydantic
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
, freezegun
|
, freezegun
|
||||||
|
, ical
|
||||||
|
, pydantic
|
||||||
, pytest-aiohttp
|
, pytest-aiohttp
|
||||||
, pytest-asyncio
|
, pytest-asyncio
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "gcal-sync";
|
pname = "gcal-sync";
|
||||||
version = "2.1.0";
|
version = "3.0.0";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
|
||||||
|
@ -20,11 +22,12 @@ buildPythonPackage rec {
|
||||||
owner = "allenporter";
|
owner = "allenporter";
|
||||||
repo = "gcal_sync";
|
repo = "gcal_sync";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-FKrZPiN4rSk5iFhGAXVuKhEeekOnPxdFslP4SMUrQIE=";
|
hash = "sha256-xRmNV06gMdPPHcvgJTvxPZBUi1BbFTnwZpzXLBluBYo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
aiohttp
|
aiohttp
|
||||||
|
ical
|
||||||
pydantic
|
pydantic
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -35,12 +38,15 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "gcal_sync" ];
|
pythonImportsCheck = [
|
||||||
|
"gcal_sync"
|
||||||
|
];
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
description = "Python library for syncing Google Calendar to local storage";
|
description = "Library for syncing Google Calendar to local storage";
|
||||||
homepage = "https://github.com/allenporter/gcal_sync";
|
homepage = "https://github.com/allenporter/gcal_sync";
|
||||||
license = lib.licenses.asl20;
|
changelog = "https://github.com/allenporter/gcal_sync/releases/tag/${version}";
|
||||||
maintainers = with lib.maintainers; [ dotlambda ];
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ dotlambda ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "home-assistant-bluetooth";
|
pname = "home-assistant-bluetooth";
|
||||||
version = "1.5.1";
|
version = "1.6.0";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||||
owner = "home-assistant-libs";
|
owner = "home-assistant-libs";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-//e+Kb85TBAC9/mHz/T/Dm/pNjbj0488/L/NeS1RMqY=";
|
hash = "sha256-6w940Yn0WgVC0Rn9OX40+6hO4maPSC7VrT3ARD8CIjQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
{ lib
|
{ lib
|
||||||
|
, aiohttp
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, home-assistant-bluetooth
|
, home-assistant-bluetooth
|
||||||
|
, mac-vendor-lookup
|
||||||
, poetry-core
|
, poetry-core
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
|
@ -9,7 +11,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ibeacon-ble";
|
pname = "ibeacon-ble";
|
||||||
version = "0.7.4";
|
version = "1.0.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -18,26 +20,28 @@ buildPythonPackage rec {
|
||||||
owner = "Bluetooth-Devices";
|
owner = "Bluetooth-Devices";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
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 = [
|
nativeBuildInputs = [
|
||||||
poetry-core
|
poetry-core
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
aiohttp
|
||||||
home-assistant-bluetooth
|
home-assistant-bluetooth
|
||||||
|
mac-vendor-lookup
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace pyproject.toml \
|
|
||||||
--replace " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" ""
|
|
||||||
'';
|
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
"ibeacon_ble"
|
"ibeacon_ble"
|
||||||
];
|
];
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "led-ble";
|
pname = "led-ble";
|
||||||
version = "0.10.1";
|
version = "1.0.0";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "Bluetooth-Devices";
|
owner = "Bluetooth-Devices";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-GyVj9g4tqPaR5Gd8N76TtkldaAATnEBsSs/F+2iQqGM=";
|
hash = "sha256-XAb/tJPUe/sNvcU7t63inMPBIz+AREioWXBuQa/c9T0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -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 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "mpi4py";
|
pname = "mpi4py";
|
||||||
version = "3.1.3";
|
version = "3.1.4";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-8en64QefQ+r92fgXzbP9MNcJ7cCTtdXa2lekYbLbMAg=";
|
sha256 = "sha256-F4WPLrxiMiDQEg0fqNQo0DPd50nEvDWzPYGmatf5NIA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
|
@ -41,11 +41,13 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];
|
setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];
|
||||||
|
|
||||||
nativeBuildInputs = [ mpi openssh ];
|
nativeBuildInputs = [ mpi ];
|
||||||
|
|
||||||
|
checkInputs = [ openssh ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python bindings for the Message Passing Interface standard";
|
description = "Python bindings for the Message Passing Interface standard";
|
||||||
homepage = "https://bitbucket.org/mpi4py/mpi4py/";
|
homepage = "https://github.com/mpi4py/mpi4py";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd2;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
55
pkgs/development/python-modules/oralb-ble/default.nix
Normal file
55
pkgs/development/python-modules/oralb-ble/default.nix
Normal 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 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "plugwise";
|
pname = "plugwise";
|
||||||
version = "0.25.4";
|
version = "0.25.6";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = "python-plugwise";
|
repo = "python-plugwise";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-avriroWSgBn80PzGEuvp/5yad9Q4onSxWLaLlpXDReo=";
|
sha256 = "sha256-n7+cEJC/RIbA4e5b19HncFOhzWhUZ8etxYsiER7zd8E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "prometheus-client";
|
pname = "prometheus-client";
|
||||||
version = "0.14.1";
|
version = "0.15.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
@ -15,8 +15,8 @@ buildPythonPackage rec {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "prometheus";
|
owner = "prometheus";
|
||||||
repo = "client_python";
|
repo = "client_python";
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-hvBdWOMDuzF91Hv4u//tF+z6la0JfiTQHlpS4TnWpmk=";
|
hash = "sha256-LabvQMNiRH4jclMnN0P4M3w25NQasNQEu1HWvRDQQ2o=";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
|
|
@ -11,14 +11,15 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "PyGithub";
|
pname = "PyGithub";
|
||||||
version = "1.56";
|
version = "1.57";
|
||||||
|
format = "setuptools";
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "PyGithub";
|
owner = "PyGithub";
|
||||||
repo = "PyGithub";
|
repo = "PyGithub";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-L6xrv3dAT/sWt/7ZeDy3P095g7Lpht52LkfCVYNLkbA=";
|
sha256 = "sha256-7CNvSOwDXXcJ082/Fmgr6OtTQeA30yDjt/Oq2nx4vEk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -36,7 +37,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python library to access the GitHub API v3";
|
description = "Python library to access the GitHub API v3";
|
||||||
homepage = "https://github.com/PyGithub/PyGithub";
|
homepage = "https://github.com/PyGithub/PyGithub";
|
||||||
platforms = platforms.all;
|
changelog = "https://github.com/PyGithub/PyGithub/raw/v${version}/doc/changes.rst";
|
||||||
license = licenses.lgpl3Plus;
|
license = licenses.lgpl3Plus;
|
||||||
maintainers = with maintainers; [ jhhuh ];
|
maintainers = with maintainers; [ jhhuh ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyatmo";
|
pname = "pyatmo";
|
||||||
version = "7.2.0";
|
version = "7.3.0";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||||
owner = "jabesq";
|
owner = "jabesq";
|
||||||
repo = "pyatmo";
|
repo = "pyatmo";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-5RlYTgxWm6BM/V2+1IF/rje5dNirN7PJs0eSiYeOpOQ=";
|
sha256 = "sha256-3NgAsXMdt4FsE30oxeTfunpP2e+iqLFZkhMJbc5jVGw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pydaikin";
|
pname = "pydaikin";
|
||||||
version = "2.7.2";
|
version = "2.8.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "mustang51";
|
owner = "mustang51";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-IONmzrCW/5nAEa7GlWMZsnweQWTSUwV4HwhXww6/9ig=";
|
hash = "sha256-AZDwoq4lCThzwHI0WCzrV9Il2MHp0LKxWg/dscGw0q0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pydeconz";
|
pname = "pydeconz";
|
||||||
version = "104";
|
version = "105";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "Kane610";
|
owner = "Kane610";
|
||||||
repo = "deconz";
|
repo = "deconz";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-bG2dhWa+KnSsigmOHE4wShaS56M9z6vqrFNek3PLbic=";
|
hash = "sha256-8GQJ4PCl8te3sovC5FwWoaQnXIRR27b7gPwfmyPRVBE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pylutron-caseta";
|
pname = "pylutron-caseta";
|
||||||
version = "0.17.0";
|
version = "0.17.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "gurumitts";
|
owner = "gurumitts";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-8keKhwbvqIMxbfmd9GGF7uacOyvqb8G/ifq+pr4Z700=";
|
hash = "sha256-W3OfYNVendYOrwN/WGeAkNAnZctvlssZ3Bvp5caPZao=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyrmvtransport";
|
pname = "pyrmvtransport";
|
||||||
version = "0.3.2";
|
version = "0.3.3";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||||
owner = "cgtobi";
|
owner = "cgtobi";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0m74m3dhxmbv10hsvs7cpshzs3pg66va5lyq94i5j1nxrl9i7spb";
|
sha256 = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -9,14 +9,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pysma";
|
pname = "pysma";
|
||||||
version = "0.6.12";
|
version = "0.7.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-uxMxqx5qbahMvTm3akiOTODhKLNVhHzBAUsOcZo/35I=";
|
sha256 = "sha256-hIrdT0b9XKw1UoPZtQQ7IaW+HV8wuA9Rwoo8XYdGyw8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyswitchbot";
|
pname = "pyswitchbot";
|
||||||
version = "0.19.15";
|
version = "0.20.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||||
owner = "Danielhiversen";
|
owner = "Danielhiversen";
|
||||||
repo = "pySwitchbot";
|
repo = "pySwitchbot";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-iWd67JEnlI60mvd5hhMPRooZ3VECTt+M9UFvXWdJVPg=";
|
hash = "sha256-GNjyDkqhOP9sq2qoAZCdSrUNte3FynVxhy9RSUn9j/c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyxiaomigateway";
|
pname = "pyxiaomigateway";
|
||||||
version = "0.14.1";
|
version = "0.14.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Danielhiversen";
|
owner = "Danielhiversen";
|
||||||
repo = "PyXiaomiGateway";
|
repo = "PyXiaomiGateway";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-e/FqqUl90VFDJD6ZFbFqXKH3s2sBaDjSFEvaKJhDlGg=";
|
sha256 = "sha256-TAbZvs1RrUy9+l2KpfbBopc3poTy+M+Q3ERQLFYbQis=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ cryptography ];
|
propagatedBuildInputs = [ cryptography ];
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, python
|
, python
|
||||||
|
, pythonOlder
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, cython
|
, cython
|
||||||
, gfortran
|
, gfortran
|
||||||
|
@ -14,6 +15,7 @@
|
||||||
, pytest-xdist
|
, pytest-xdist
|
||||||
, numpy
|
, numpy
|
||||||
, pybind11
|
, pybind11
|
||||||
|
, libxcrypt
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
|
@ -28,7 +30,12 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ];
|
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 ];
|
propagatedBuildInputs = [ numpy ];
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "scrapy";
|
pname = "scrapy";
|
||||||
version = "2.7.0";
|
version = "2.7.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit version;
|
inherit version;
|
||||||
pname = "Scrapy";
|
pname = "Scrapy";
|
||||||
hash = "sha256-Ssvg8fX7XqkTU1EriVjtMEvCX2373ig5oNh6SUNRWLk=";
|
hash = "sha256-MPpAg1PSSx35ed8upK+9GbSuAvsiB/IY0kYzLx4c8U4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "sensor-state-data";
|
pname = "sensor-state-data";
|
||||||
version = "2.9.1";
|
version = "2.10.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||||
owner = "Bluetooth-Devices";
|
owner = "Bluetooth-Devices";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-bBLBDdwVUCh8VA/6w/5DmJNvayaWHNIe1kRhnOQ2Llc=";
|
hash = "sha256-pCo9CMX+CQBFuK5rbMHsxQEdBHvp1EZA7A9Ykm68NCw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "subarulink";
|
pname = "subarulink";
|
||||||
version = "0.5.0";
|
version = "0.6.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "G-Two";
|
owner = "G-Two";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-q+a+OFFMAGl8KQi+KZ8h21+Pj0XEqP9ZIJii2PCgD6E=";
|
hash = "sha256-esZ+nIHIXKfilb8dBFbAbQQFI6fFRUcoFVCPdnqGXYw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "xknx";
|
pname = "xknx";
|
||||||
version = "1.1.0";
|
version = "1.2.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "XKNX";
|
owner = "XKNX";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "sha256-Nam6TnjTAt5oV+IQ+6cS8L0/j/lp+x9adRHUTs69GA0=";
|
hash = "sha256-IHZvmVloBSLcK3GZV9urFeqRxOG76O9O/3ZDNTz4wjQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -41,6 +41,8 @@ buildPythonPackage rec {
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
# Test requires network access
|
# Test requires network access
|
||||||
"test_scan_timeout"
|
"test_scan_timeout"
|
||||||
|
"test_start_secure_routing_knx_keys"
|
||||||
|
"test_start_secure_routing_manual"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "yalexs-ble";
|
pname = "yalexs-ble";
|
||||||
version = "1.9.2";
|
version = "1.9.5";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||||
owner = "bdraco";
|
owner = "bdraco";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-ypZ0VDGgQcwlMS1POW+lvTlmd02P7bPR2Qo0lDyBYUw=";
|
hash = "sha256-cU4aeJlRBwxQm6a/rqpO2HVZfz/vfEo4P5x+BjKqqeo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "zha-quirks";
|
pname = "zha-quirks";
|
||||||
version = "0.0.83";
|
version = "0.0.84";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||||
owner = "zigpy";
|
owner = "zigpy";
|
||||||
repo = "zha-device-handlers";
|
repo = "zha-device-handlers";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-N+DSaPohwkMJ+YjbnUi7k8GQ+YFd6Ng8n0yesEnOnRA=";
|
hash = "sha256-x8DOUQjjOlLaIhsLLbGNEE+MYBcMD+VsmcCDU0XxxcE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "zigpy-zigate";
|
pname = "zigpy-zigate";
|
||||||
version = "0.10.2";
|
version = "0.10.3";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||||
owner = "zigpy";
|
owner = "zigpy";
|
||||||
repo = "zigpy-zigate";
|
repo = "zigpy-zigate";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-Vb87G+R4SvAhCF3h/U5Q4/avxPgfIjklWdWGaiIWGhk=";
|
hash = "sha256-zO20ySRO9XFcDB8TkUJW2MxkhDIBpHp9Z24gupssOaY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "zigpy";
|
pname = "zigpy";
|
||||||
version = "0.51.3";
|
version = "0.51.5";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||||
owner = "zigpy";
|
owner = "zigpy";
|
||||||
repo = "zigpy";
|
repo = "zigpy";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-IfYWuJfmQtJnVANyiBE3AurhucqZ8qzYXBV3jprS5qw=";
|
hash = "sha256-6OSP23lEdl15IjSqGYLCW5+F6rki+rzmXm82QRzabwU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "flow";
|
pname = "flow";
|
||||||
version = "0.191.0";
|
version = "0.192.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "facebook";
|
owner = "facebook";
|
||||||
repo = "flow";
|
repo = "flow";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-WS2Mm8hK03fXfjLLSL9V0itgmv8/tDQhN6G/C6SucOs=";
|
sha256 = "sha256-Eqn90vA48PKea2Qrj7sN1hWoU31KzAr7xbfF8Fwi9uw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
makeFlags = [ "FLOW_RELEASE=1" ];
|
makeFlags = [ "FLOW_RELEASE=1" ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "bazelisk";
|
pname = "bazelisk";
|
||||||
version = "1.14.0";
|
version = "1.15.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bazelbuild";
|
owner = "bazelbuild";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-y3DVU2xHYZGUqf+kXhBDpTHACloqOXiMFY9bWU/QfOg=";
|
sha256 = "sha256-+JAAei783S9umDSMSQq50ovYm1MCID33W6dolTxBEvU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg=";
|
vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg=";
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "bundletool";
|
pname = "bundletool";
|
||||||
version = "1.12.1";
|
version = "1.13.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
|
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
|
||||||
sha256 = "sha256-yn8Nz2f0UffzTrI+g1MoDpOYj7frq6/US86auYkcs3I=";
|
sha256 = "sha256-9Fks0DrUgk6N218pPvgAHrU0P9kjCOJhQx8ILzloC+I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "ctlptl";
|
pname = "ctlptl";
|
||||||
version = "0.8.11";
|
version = "0.8.12";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tilt-dev";
|
owner = "tilt-dev";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-69xFfDNitLu8KUQP9ij0ndV6JCzp9wrLsHKwEjuhYdY=";
|
sha256 = "sha256-h0JR641+VBiTJY8INXhxwvsyZGLH4YRdkddwo2IUDQk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s=";
|
vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s=";
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
tree-sitter-devicetree = lib.importJSON ./tree-sitter-devicetree.json;
|
tree-sitter-devicetree = lib.importJSON ./tree-sitter-devicetree.json;
|
||||||
tree-sitter-dockerfile = lib.importJSON ./tree-sitter-dockerfile.json;
|
tree-sitter-dockerfile = lib.importJSON ./tree-sitter-dockerfile.json;
|
||||||
tree-sitter-dot = lib.importJSON ./tree-sitter-dot.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-elisp = lib.importJSON ./tree-sitter-elisp.json;
|
||||||
tree-sitter-elixir = lib.importJSON ./tree-sitter-elixir.json;
|
tree-sitter-elixir = lib.importJSON ./tree-sitter-elixir.json;
|
||||||
tree-sitter-elm = lib.importJSON ./tree-sitter-elm.json;
|
tree-sitter-elm = lib.importJSON ./tree-sitter-elm.json;
|
||||||
|
|
|
@ -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
|
||||||
|
}
|
|
@ -224,6 +224,10 @@ let
|
||||||
orga = "connorlay";
|
orga = "connorlay";
|
||||||
repo = "tree-sitter-surface";
|
repo = "tree-sitter-surface";
|
||||||
};
|
};
|
||||||
|
"tree-sitter-eex" = {
|
||||||
|
orga = "connorlay";
|
||||||
|
repo = "tree-sitter-eex";
|
||||||
|
};
|
||||||
"tree-sitter-heex" = {
|
"tree-sitter-heex" = {
|
||||||
orga = "connorlay";
|
orga = "connorlay";
|
||||||
repo = "tree-sitter-heex";
|
repo = "tree-sitter-heex";
|
||||||
|
|
|
@ -10,16 +10,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-release";
|
pname = "cargo-release";
|
||||||
version = "0.22.2";
|
version = "0.23.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "crate-ci";
|
owner = "crate-ci";
|
||||||
repo = "cargo-release";
|
repo = "cargo-release";
|
||||||
rev = "v${version}";
|
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 ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-udeps";
|
pname = "cargo-udeps";
|
||||||
version = "0.1.33";
|
version = "0.1.35";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "est31";
|
owner = "est31";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Fl/4RsWHjWYJ76mD59m9Gcs2hz7bwnd0YWpZnVgMKjg=";
|
sha256 = "sha256-FVOrF90kgcxWmeyxBnmGyOwb1aycAQelqskOYYpAXhI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-kQwg1R+rvg2Tw27pTkrOi5QpPF3Q1woPsjac9RDYCyg=";
|
cargoSha256 = "sha256-JTRel8bOJbBdeDyJjO/xc+ZUQ1EunMPlyWeFrWrsVEI=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "flyctl";
|
pname = "flyctl";
|
||||||
version = "0.0.427";
|
version = "0.0.429";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "superfly";
|
owner = "superfly";
|
||||||
repo = "flyctl";
|
repo = "flyctl";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-rY/RrgkT3SjkAw1rQaTNHYecMzLy+go/BSd6/Hbz1qM=";
|
sha256 = "sha256-rx+5wHd6RyvsoL6176zBCgAZLCAXfdOIgZ41Vq48rdI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-wMVvDB/6ZDY3EwTWRJ1weCIlRZM+Ye24UnRl1YZzAcA=";
|
vendorSha256 = "sha256-pc9+m6oZGYBqDwE642HB4Ku549L3bMA52jWSmzV3tHc=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
|
|
@ -4,16 +4,16 @@ let
|
||||||
# comments with variant added for update script
|
# comments with variant added for update script
|
||||||
# ./update-zen.py zen
|
# ./update-zen.py zen
|
||||||
zenVariant = {
|
zenVariant = {
|
||||||
version = "6.0.6"; #zen
|
version = "6.0.7"; #zen
|
||||||
suffix = "zen1"; #zen
|
suffix = "zen1"; #zen
|
||||||
sha256 = "11y942camfhwd32zkfyn232acgznp3n18g65kyp8k46hrkbhbxds"; #zen
|
sha256 = "011wlc0h99vx830qmgy569srhb3rzhyy5j235pf7m541392vh41g"; #zen
|
||||||
isLqx = false;
|
isLqx = false;
|
||||||
};
|
};
|
||||||
# ./update-zen.py lqx
|
# ./update-zen.py lqx
|
||||||
lqxVariant = {
|
lqxVariant = {
|
||||||
version = "6.0.6"; #lqx
|
version = "6.0.7"; #lqx
|
||||||
suffix = "lqx1"; #lqx
|
suffix = "lqx1"; #lqx
|
||||||
sha256 = "0f0bz2pmwwmbqdss1diblzn4lis1pw31pb4gkay4a5p61f4rw1mz"; #lqx
|
sha256 = "09h99fdzicbc4kkl51dqwgqqa9416hd7bvrghr4pdjqrw4z15557"; #lqx
|
||||||
isLqx = true;
|
isLqx = true;
|
||||||
};
|
};
|
||||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||||
|
|
|
@ -2,8 +2,10 @@
|
||||||
# Do not edit!
|
# Do not edit!
|
||||||
|
|
||||||
{
|
{
|
||||||
version = "2022.10.5";
|
version = "2022.11.1";
|
||||||
components = {
|
components = {
|
||||||
|
"3_day_blinds" = ps: with ps; [
|
||||||
|
];
|
||||||
"abode" = ps: with ps; [
|
"abode" = ps: with ps; [
|
||||||
abodepy
|
abodepy
|
||||||
];
|
];
|
||||||
|
@ -51,6 +53,21 @@
|
||||||
"airthings" = ps: with ps; [
|
"airthings" = ps: with ps; [
|
||||||
airthings-cloud
|
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; [
|
"airtouch4" = ps: with ps; [
|
||||||
airtouch4pyapi
|
airtouch4pyapi
|
||||||
];
|
];
|
||||||
|
@ -98,6 +115,8 @@
|
||||||
amcrest
|
amcrest
|
||||||
ha-ffmpeg
|
ha-ffmpeg
|
||||||
];
|
];
|
||||||
|
"amp_motorization" = ps: with ps; [
|
||||||
|
];
|
||||||
"ampio" = ps: with ps; [
|
"ampio" = ps: with ps; [
|
||||||
asmog
|
asmog
|
||||||
];
|
];
|
||||||
|
@ -203,6 +222,8 @@
|
||||||
yalexs-ble
|
yalexs-ble
|
||||||
yalexs
|
yalexs
|
||||||
];
|
];
|
||||||
|
"august_ble" = ps: with ps; [
|
||||||
|
];
|
||||||
"aurora" = ps: with ps; [
|
"aurora" = ps: with ps; [
|
||||||
auroranoaa
|
auroranoaa
|
||||||
];
|
];
|
||||||
|
@ -281,6 +302,10 @@
|
||||||
"blinksticklight" = ps: with ps; [
|
"blinksticklight" = ps: with ps; [
|
||||||
BlinkStick
|
BlinkStick
|
||||||
];
|
];
|
||||||
|
"bliss_automation" = ps: with ps; [
|
||||||
|
];
|
||||||
|
"bloc_blinds" = ps: with ps; [
|
||||||
|
];
|
||||||
"blockchain" = ps: with ps; [
|
"blockchain" = ps: with ps; [
|
||||||
]; # missing inputs: python-blockchain-api
|
]; # missing inputs: python-blockchain-api
|
||||||
"bloomsky" = ps: with ps; [
|
"bloomsky" = ps: with ps; [
|
||||||
|
@ -352,6 +377,8 @@
|
||||||
"braviatv" = ps: with ps; [
|
"braviatv" = ps: with ps; [
|
||||||
pybravia
|
pybravia
|
||||||
];
|
];
|
||||||
|
"brel_home" = ps: with ps; [
|
||||||
|
];
|
||||||
"broadlink" = ps: with ps; [
|
"broadlink" = ps: with ps; [
|
||||||
broadlink
|
broadlink
|
||||||
];
|
];
|
||||||
|
@ -367,7 +394,9 @@
|
||||||
brunt
|
brunt
|
||||||
];
|
];
|
||||||
"bsblan" = ps: with ps; [
|
"bsblan" = ps: with ps; [
|
||||||
bsblan
|
python-bsblan
|
||||||
|
];
|
||||||
|
"bswitch" = ps: with ps; [
|
||||||
];
|
];
|
||||||
"bt_home_hub_5" = ps: with ps; [
|
"bt_home_hub_5" = ps: with ps; [
|
||||||
]; # missing inputs: bthomehub5-devicelist
|
]; # missing inputs: bthomehub5-devicelist
|
||||||
|
@ -388,6 +417,10 @@
|
||||||
pyudev
|
pyudev
|
||||||
sqlalchemy
|
sqlalchemy
|
||||||
];
|
];
|
||||||
|
"bticino" = ps: with ps; [
|
||||||
|
];
|
||||||
|
"bubendorff" = ps: with ps; [
|
||||||
|
];
|
||||||
"buienradar" = ps: with ps; [
|
"buienradar" = ps: with ps; [
|
||||||
buienradar
|
buienradar
|
||||||
];
|
];
|
||||||
|
@ -499,6 +532,8 @@
|
||||||
];
|
];
|
||||||
"cover" = ps: with ps; [
|
"cover" = ps: with ps; [
|
||||||
];
|
];
|
||||||
|
"cozytouch" = ps: with ps; [
|
||||||
|
];
|
||||||
"cppm_tracker" = ps: with ps; [
|
"cppm_tracker" = ps: with ps; [
|
||||||
]; # missing inputs: clearpasspy
|
]; # missing inputs: clearpasspy
|
||||||
"cpuspeed" = ps: with ps; [
|
"cpuspeed" = ps: with ps; [
|
||||||
|
@ -517,6 +552,8 @@
|
||||||
];
|
];
|
||||||
"currencylayer" = ps: with ps; [
|
"currencylayer" = ps: with ps; [
|
||||||
];
|
];
|
||||||
|
"dacia" = ps: with ps; [
|
||||||
|
];
|
||||||
"daikin" = ps: with ps; [
|
"daikin" = ps: with ps; [
|
||||||
pydaikin
|
pydaikin
|
||||||
];
|
];
|
||||||
|
@ -616,6 +653,10 @@
|
||||||
"dialogflow" = ps: with ps; [
|
"dialogflow" = ps: with ps; [
|
||||||
aiohttp-cors
|
aiohttp-cors
|
||||||
];
|
];
|
||||||
|
"diaz" = ps: with ps; [
|
||||||
|
];
|
||||||
|
"digital_loggers" = ps: with ps; [
|
||||||
|
];
|
||||||
"digital_ocean" = ps: with ps; [
|
"digital_ocean" = ps: with ps; [
|
||||||
digital-ocean
|
digital-ocean
|
||||||
];
|
];
|
||||||
|
@ -668,6 +709,8 @@
|
||||||
aiohttp-cors
|
aiohttp-cors
|
||||||
doorbirdpy
|
doorbirdpy
|
||||||
];
|
];
|
||||||
|
"dooya" = ps: with ps; [
|
||||||
|
];
|
||||||
"dovado" = ps: with ps; [
|
"dovado" = ps: with ps; [
|
||||||
]; # missing inputs: dovado
|
]; # missing inputs: dovado
|
||||||
"downloader" = ps: with ps; [
|
"downloader" = ps: with ps; [
|
||||||
|
@ -944,6 +987,8 @@
|
||||||
"flexit" = ps: with ps; [
|
"flexit" = ps: with ps; [
|
||||||
pymodbus
|
pymodbus
|
||||||
];
|
];
|
||||||
|
"flexom" = ps: with ps; [
|
||||||
|
];
|
||||||
"flic" = ps: with ps; [
|
"flic" = ps: with ps; [
|
||||||
pyflic
|
pyflic
|
||||||
];
|
];
|
||||||
|
@ -1038,12 +1083,15 @@
|
||||||
"garages_amsterdam" = ps: with ps; [
|
"garages_amsterdam" = ps: with ps; [
|
||||||
garages-amsterdam
|
garages-amsterdam
|
||||||
];
|
];
|
||||||
|
"gaviota" = ps: with ps; [
|
||||||
|
];
|
||||||
"gc100" = ps: with ps; [
|
"gc100" = ps: with ps; [
|
||||||
]; # missing inputs: python-gc100
|
]; # missing inputs: python-gc100
|
||||||
"gdacs" = ps: with ps; [
|
"gdacs" = ps: with ps; [
|
||||||
aio-georss-gdacs
|
aio-georss-gdacs
|
||||||
];
|
];
|
||||||
"generic" = ps: with ps; [
|
"generic" = ps: with ps; [
|
||||||
|
aiohttp-cors
|
||||||
av
|
av
|
||||||
pillow
|
pillow
|
||||||
];
|
];
|
||||||
|
@ -1210,6 +1258,8 @@
|
||||||
pillow
|
pillow
|
||||||
sqlalchemy
|
sqlalchemy
|
||||||
];
|
];
|
||||||
|
"havana_shade" = ps: with ps; [
|
||||||
|
];
|
||||||
"haveibeenpwned" = ps: with ps; [
|
"haveibeenpwned" = ps: with ps; [
|
||||||
];
|
];
|
||||||
"hddtemp" = ps: with ps; [
|
"hddtemp" = ps: with ps; [
|
||||||
|
@ -1219,12 +1269,16 @@
|
||||||
];
|
];
|
||||||
"heatmiser" = ps: with ps; [
|
"heatmiser" = ps: with ps; [
|
||||||
]; # missing inputs: heatmiserV3
|
]; # missing inputs: heatmiserV3
|
||||||
|
"heiwa" = ps: with ps; [
|
||||||
|
];
|
||||||
"heos" = ps: with ps; [
|
"heos" = ps: with ps; [
|
||||||
pyheos
|
pyheos
|
||||||
];
|
];
|
||||||
"here_travel_time" = ps: with ps; [
|
"here_travel_time" = ps: with ps; [
|
||||||
herepy
|
herepy
|
||||||
];
|
];
|
||||||
|
"hi_kumo" = ps: with ps; [
|
||||||
|
];
|
||||||
"hikvision" = ps: with ps; [
|
"hikvision" = ps: with ps; [
|
||||||
]; # missing inputs: pyhik
|
]; # missing inputs: pyhik
|
||||||
"hikvisioncam" = ps: with ps; [
|
"hikvisioncam" = ps: with ps; [
|
||||||
|
@ -1340,12 +1394,15 @@
|
||||||
aiohue
|
aiohue
|
||||||
];
|
];
|
||||||
"huisbaasje" = ps: with ps; [
|
"huisbaasje" = ps: with ps; [
|
||||||
]; # missing inputs: energyflip-client
|
energyflip-client
|
||||||
|
];
|
||||||
"humidifier" = ps: with ps; [
|
"humidifier" = ps: with ps; [
|
||||||
];
|
];
|
||||||
"hunterdouglas_powerview" = ps: with ps; [
|
"hunterdouglas_powerview" = ps: with ps; [
|
||||||
aiopvapi
|
aiopvapi
|
||||||
];
|
];
|
||||||
|
"hurrican_shutters_wholesale" = ps: with ps; [
|
||||||
|
];
|
||||||
"hvv_departures" = ps: with ps; [
|
"hvv_departures" = ps: with ps; [
|
||||||
pygti
|
pygti
|
||||||
];
|
];
|
||||||
|
@ -1442,6 +1499,8 @@
|
||||||
];
|
];
|
||||||
"input_text" = ps: with ps; [
|
"input_text" = ps: with ps; [
|
||||||
];
|
];
|
||||||
|
"inspired_shades" = ps: with ps; [
|
||||||
|
];
|
||||||
"insteon" = ps: with ps; [
|
"insteon" = ps: with ps; [
|
||||||
aiohttp-cors
|
aiohttp-cors
|
||||||
fnvhash
|
fnvhash
|
||||||
|
@ -1491,6 +1550,8 @@
|
||||||
"islamic_prayer_times" = ps: with ps; [
|
"islamic_prayer_times" = ps: with ps; [
|
||||||
prayer-times-calculator
|
prayer-times-calculator
|
||||||
];
|
];
|
||||||
|
"ismartwindow" = ps: with ps; [
|
||||||
|
];
|
||||||
"iss" = ps: with ps; [
|
"iss" = ps: with ps; [
|
||||||
]; # missing inputs: pyiss
|
]; # missing inputs: pyiss
|
||||||
"isy994" = ps: with ps; [
|
"isy994" = ps: with ps; [
|
||||||
|
@ -1640,6 +1701,8 @@
|
||||||
pyudev
|
pyudev
|
||||||
sqlalchemy
|
sqlalchemy
|
||||||
];
|
];
|
||||||
|
"legrand" = ps: with ps; [
|
||||||
|
];
|
||||||
"lg_netcast" = ps: with ps; [
|
"lg_netcast" = ps: with ps; [
|
||||||
pylgnetcast
|
pylgnetcast
|
||||||
];
|
];
|
||||||
|
@ -1656,6 +1719,7 @@
|
||||||
aiohttp-cors
|
aiohttp-cors
|
||||||
aiolifx
|
aiolifx
|
||||||
aiolifx-effects
|
aiolifx-effects
|
||||||
|
aiolifx-themes
|
||||||
ifaddr
|
ifaddr
|
||||||
];
|
];
|
||||||
"lifx_cloud" = ps: with ps; [
|
"lifx_cloud" = ps: with ps; [
|
||||||
|
@ -1736,6 +1800,8 @@
|
||||||
"lutron_caseta" = ps: with ps; [
|
"lutron_caseta" = ps: with ps; [
|
||||||
pylutron-caseta
|
pylutron-caseta
|
||||||
];
|
];
|
||||||
|
"luxaflex" = ps: with ps; [
|
||||||
|
];
|
||||||
"lw12wifi" = ps: with ps; [
|
"lw12wifi" = ps: with ps; [
|
||||||
]; # missing inputs: lw12
|
]; # missing inputs: lw12
|
||||||
"lyric" = ps: with ps; [
|
"lyric" = ps: with ps; [
|
||||||
|
@ -1764,6 +1830,10 @@
|
||||||
pillow
|
pillow
|
||||||
sqlalchemy
|
sqlalchemy
|
||||||
];
|
];
|
||||||
|
"marantz" = ps: with ps; [
|
||||||
|
];
|
||||||
|
"martec" = ps: with ps; [
|
||||||
|
];
|
||||||
"marytts" = ps: with ps; [
|
"marytts" = ps: with ps; [
|
||||||
]; # missing inputs: speak2mary
|
]; # missing inputs: speak2mary
|
||||||
"mastodon" = ps: with ps; [
|
"mastodon" = ps: with ps; [
|
||||||
|
@ -2043,6 +2113,8 @@
|
||||||
"nexia" = ps: with ps; [
|
"nexia" = ps: with ps; [
|
||||||
nexia
|
nexia
|
||||||
];
|
];
|
||||||
|
"nexity" = ps: with ps; [
|
||||||
|
];
|
||||||
"nextbus" = ps: with ps; [
|
"nextbus" = ps: with ps; [
|
||||||
py-nextbusnext
|
py-nextbusnext
|
||||||
];
|
];
|
||||||
|
@ -2076,8 +2148,9 @@
|
||||||
aiohttp-cors
|
aiohttp-cors
|
||||||
getmac
|
getmac
|
||||||
ifaddr
|
ifaddr
|
||||||
|
mac-vendor-lookup
|
||||||
netmap
|
netmap
|
||||||
]; # missing inputs: mac-vendor-lookup
|
];
|
||||||
"nmbs" = ps: with ps; [
|
"nmbs" = ps: with ps; [
|
||||||
]; # missing inputs: pyrail
|
]; # missing inputs: pyrail
|
||||||
"no_ip" = ps: with ps; [
|
"no_ip" = ps: with ps; [
|
||||||
|
@ -2115,6 +2188,8 @@
|
||||||
"nut" = ps: with ps; [
|
"nut" = ps: with ps; [
|
||||||
pynut2
|
pynut2
|
||||||
];
|
];
|
||||||
|
"nutrichef" = ps: with ps; [
|
||||||
|
];
|
||||||
"nws" = ps: with ps; [
|
"nws" = ps: with ps; [
|
||||||
pynws
|
pynws
|
||||||
];
|
];
|
||||||
|
@ -2216,6 +2291,21 @@
|
||||||
"opple" = ps: with ps; [
|
"opple" = ps: with ps; [
|
||||||
pyoppleio
|
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; [
|
"oru" = ps: with ps; [
|
||||||
]; # missing inputs: oru
|
]; # missing inputs: oru
|
||||||
"orvibo" = ps: with ps; [
|
"orvibo" = ps: with ps; [
|
||||||
|
@ -2265,6 +2355,8 @@
|
||||||
pillow
|
pillow
|
||||||
sqlalchemy
|
sqlalchemy
|
||||||
];
|
];
|
||||||
|
"pcs_lighting" = ps: with ps; [
|
||||||
|
];
|
||||||
"peco" = ps: with ps; [
|
"peco" = ps: with ps; [
|
||||||
peco
|
peco
|
||||||
];
|
];
|
||||||
|
@ -2468,6 +2560,8 @@
|
||||||
];
|
];
|
||||||
"raspyrfm" = ps: with ps; [
|
"raspyrfm" = ps: with ps; [
|
||||||
]; # missing inputs: raspyrfm-client
|
]; # missing inputs: raspyrfm-client
|
||||||
|
"raven_rock_mfg" = ps: with ps; [
|
||||||
|
];
|
||||||
"rdw" = ps: with ps; [
|
"rdw" = ps: with ps; [
|
||||||
vehicle
|
vehicle
|
||||||
];
|
];
|
||||||
|
@ -2508,6 +2602,8 @@
|
||||||
];
|
];
|
||||||
"rest_command" = ps: with ps; [
|
"rest_command" = ps: with ps; [
|
||||||
];
|
];
|
||||||
|
"rexel" = ps: with ps; [
|
||||||
|
];
|
||||||
"rflink" = ps: with ps; [
|
"rflink" = ps: with ps; [
|
||||||
rflink
|
rflink
|
||||||
];
|
];
|
||||||
|
@ -2535,6 +2631,8 @@
|
||||||
"rmvtransport" = ps: with ps; [
|
"rmvtransport" = ps: with ps; [
|
||||||
pyrmvtransport
|
pyrmvtransport
|
||||||
];
|
];
|
||||||
|
"roborock" = ps: with ps; [
|
||||||
|
];
|
||||||
"rocketchat" = ps: with ps; [
|
"rocketchat" = ps: with ps; [
|
||||||
]; # missing inputs: rocketchat-API
|
]; # missing inputs: rocketchat-API
|
||||||
"roku" = ps: with ps; [
|
"roku" = ps: with ps; [
|
||||||
|
@ -2616,6 +2714,8 @@
|
||||||
lxml
|
lxml
|
||||||
xmltodict
|
xmltodict
|
||||||
];
|
];
|
||||||
|
"screenaway" = ps: with ps; [
|
||||||
|
];
|
||||||
"screenlogic" = ps: with ps; [
|
"screenlogic" = ps: with ps; [
|
||||||
screenlogicpy
|
screenlogicpy
|
||||||
];
|
];
|
||||||
|
@ -2647,6 +2747,8 @@
|
||||||
fnvhash
|
fnvhash
|
||||||
sqlalchemy
|
sqlalchemy
|
||||||
];
|
];
|
||||||
|
"sensorblue" = ps: with ps; [
|
||||||
|
];
|
||||||
"sensorpro" = ps: with ps; [
|
"sensorpro" = ps: with ps; [
|
||||||
aiohttp-cors
|
aiohttp-cors
|
||||||
bleak-retry-connector
|
bleak-retry-connector
|
||||||
|
@ -2704,6 +2806,7 @@
|
||||||
"shell_command" = ps: with ps; [
|
"shell_command" = ps: with ps; [
|
||||||
];
|
];
|
||||||
"shelly" = ps: with ps; [
|
"shelly" = ps: with ps; [
|
||||||
|
aiohttp-cors
|
||||||
aioshelly
|
aioshelly
|
||||||
];
|
];
|
||||||
"shiftr" = ps: with ps; [
|
"shiftr" = ps: with ps; [
|
||||||
|
@ -2732,6 +2835,8 @@
|
||||||
"simplisafe" = ps: with ps; [
|
"simplisafe" = ps: with ps; [
|
||||||
simplisafe-python
|
simplisafe-python
|
||||||
];
|
];
|
||||||
|
"simply_automated" = ps: with ps; [
|
||||||
|
];
|
||||||
"simulated" = ps: with ps; [
|
"simulated" = ps: with ps; [
|
||||||
];
|
];
|
||||||
"sinch" = ps: with ps; [
|
"sinch" = ps: with ps; [
|
||||||
|
@ -2770,9 +2875,15 @@
|
||||||
aiohttp-cors
|
aiohttp-cors
|
||||||
pysmappee
|
pysmappee
|
||||||
];
|
];
|
||||||
|
"smart_blinds" = ps: with ps; [
|
||||||
|
];
|
||||||
|
"smart_home" = ps: with ps; [
|
||||||
|
];
|
||||||
"smart_meter_texas" = ps: with ps; [
|
"smart_meter_texas" = ps: with ps; [
|
||||||
smart-meter-texas
|
smart-meter-texas
|
||||||
];
|
];
|
||||||
|
"smarther" = ps: with ps; [
|
||||||
|
];
|
||||||
"smartthings" = ps: with ps; [
|
"smartthings" = ps: with ps; [
|
||||||
pyturbojpeg
|
pyturbojpeg
|
||||||
aiohttp-cors
|
aiohttp-cors
|
||||||
|
@ -2803,6 +2914,21 @@
|
||||||
"snmp" = ps: with ps; [
|
"snmp" = ps: with ps; [
|
||||||
pysnmplib
|
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" = ps: with ps; [
|
||||||
solaredge
|
solaredge
|
||||||
stringcase
|
stringcase
|
||||||
|
@ -2818,6 +2944,8 @@
|
||||||
"soma" = ps: with ps; [
|
"soma" = ps: with ps; [
|
||||||
pysoma
|
pysoma
|
||||||
];
|
];
|
||||||
|
"somfy" = ps: with ps; [
|
||||||
|
];
|
||||||
"somfy_mylink" = ps: with ps; [
|
"somfy_mylink" = ps: with ps; [
|
||||||
somfy-mylink-synergy
|
somfy-mylink-synergy
|
||||||
];
|
];
|
||||||
|
@ -2967,6 +3095,8 @@
|
||||||
];
|
];
|
||||||
"switchmate" = ps: with ps; [
|
"switchmate" = ps: with ps; [
|
||||||
]; # missing inputs: pySwitchmate
|
]; # missing inputs: pySwitchmate
|
||||||
|
"symfonisk" = ps: with ps; [
|
||||||
|
];
|
||||||
"syncthing" = ps: with ps; [
|
"syncthing" = ps: with ps; [
|
||||||
aiosyncthing
|
aiosyncthing
|
||||||
];
|
];
|
||||||
|
@ -3073,6 +3203,8 @@
|
||||||
sqlalchemy
|
sqlalchemy
|
||||||
thermobeacon-ble
|
thermobeacon-ble
|
||||||
];
|
];
|
||||||
|
"thermoplus" = ps: with ps; [
|
||||||
|
];
|
||||||
"thermopro" = ps: with ps; [
|
"thermopro" = ps: with ps; [
|
||||||
aiohttp-cors
|
aiohttp-cors
|
||||||
bleak-retry-connector
|
bleak-retry-connector
|
||||||
|
@ -3243,6 +3375,8 @@
|
||||||
"ukraine_alarm" = ps: with ps; [
|
"ukraine_alarm" = ps: with ps; [
|
||||||
uasiren
|
uasiren
|
||||||
];
|
];
|
||||||
|
"ultraloq" = ps: with ps; [
|
||||||
|
];
|
||||||
"unifi" = ps: with ps; [
|
"unifi" = ps: with ps; [
|
||||||
aiounifi
|
aiounifi
|
||||||
];
|
];
|
||||||
|
@ -3277,6 +3411,8 @@
|
||||||
ifaddr
|
ifaddr
|
||||||
zeroconf
|
zeroconf
|
||||||
];
|
];
|
||||||
|
"uprise_smart_shades" = ps: with ps; [
|
||||||
|
];
|
||||||
"uptime" = ps: with ps; [
|
"uptime" = ps: with ps; [
|
||||||
];
|
];
|
||||||
"uptimerobot" = ps: with ps; [
|
"uptimerobot" = ps: with ps; [
|
||||||
|
@ -3557,6 +3693,7 @@
|
||||||
py-zabbix
|
py-zabbix
|
||||||
];
|
];
|
||||||
"zamg" = ps: with ps; [
|
"zamg" = ps: with ps; [
|
||||||
|
zamg
|
||||||
];
|
];
|
||||||
"zengge" = ps: with ps; [
|
"zengge" = ps: with ps; [
|
||||||
bluepy
|
bluepy
|
||||||
|
@ -3630,6 +3767,7 @@
|
||||||
"airly"
|
"airly"
|
||||||
"airnow"
|
"airnow"
|
||||||
"airthings"
|
"airthings"
|
||||||
|
"airthings_ble"
|
||||||
"airtouch4"
|
"airtouch4"
|
||||||
"airvisual"
|
"airvisual"
|
||||||
"airzone"
|
"airzone"
|
||||||
|
@ -3695,6 +3833,7 @@
|
||||||
"canary"
|
"canary"
|
||||||
"cast"
|
"cast"
|
||||||
"cert_expiry"
|
"cert_expiry"
|
||||||
|
"clicksend_tts"
|
||||||
"climate"
|
"climate"
|
||||||
"cloud"
|
"cloud"
|
||||||
"cloudflare"
|
"cloudflare"
|
||||||
|
@ -3871,6 +4010,7 @@
|
||||||
"http"
|
"http"
|
||||||
"huawei_lte"
|
"huawei_lte"
|
||||||
"hue"
|
"hue"
|
||||||
|
"huisbaasje"
|
||||||
"humidifier"
|
"humidifier"
|
||||||
"hunterdouglas_powerview"
|
"hunterdouglas_powerview"
|
||||||
"hvv_departures"
|
"hvv_departures"
|
||||||
|
@ -4005,6 +4145,7 @@
|
||||||
"nextdns"
|
"nextdns"
|
||||||
"nightscout"
|
"nightscout"
|
||||||
"nina"
|
"nina"
|
||||||
|
"nmap_tracker"
|
||||||
"no_ip"
|
"no_ip"
|
||||||
"nobo_hub"
|
"nobo_hub"
|
||||||
"notify"
|
"notify"
|
||||||
|
@ -4033,6 +4174,7 @@
|
||||||
"openuv"
|
"openuv"
|
||||||
"openweathermap"
|
"openweathermap"
|
||||||
"opnsense"
|
"opnsense"
|
||||||
|
"oralb"
|
||||||
"overkiz"
|
"overkiz"
|
||||||
"ovo_energy"
|
"ovo_energy"
|
||||||
"owntracks"
|
"owntracks"
|
||||||
|
@ -4145,6 +4287,7 @@
|
||||||
"smtp"
|
"smtp"
|
||||||
"snips"
|
"snips"
|
||||||
"snmp"
|
"snmp"
|
||||||
|
"snooz"
|
||||||
"solaredge"
|
"solaredge"
|
||||||
"solarlog"
|
"solarlog"
|
||||||
"solax"
|
"solax"
|
||||||
|
@ -4297,6 +4440,7 @@
|
||||||
"yeelight"
|
"yeelight"
|
||||||
"yolink"
|
"yolink"
|
||||||
"youless"
|
"youless"
|
||||||
|
"zamg"
|
||||||
"zeroconf"
|
"zeroconf"
|
||||||
"zerproc"
|
"zerproc"
|
||||||
"zha"
|
"zha"
|
||||||
|
|
|
@ -41,26 +41,15 @@ let
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
bsblan = super.bsblan.overridePythonAttrs (oldAttrs: rec {
|
gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: rec {
|
||||||
version = "0.5.0";
|
version = "2.2.3";
|
||||||
postPatch = null;
|
|
||||||
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.cattrs ];
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "liudger";
|
owner = "allenporter";
|
||||||
repo = "python-bsblan";
|
repo = "gcal_sync";
|
||||||
rev = "v.${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-yzlHcIb5QlG+jAgEtKlAcY7rESiUY7nD1YwqK63wgcg=";
|
hash = "sha256-5PoKdJBrNhPfcDxmprc/1jX7weIs7HSxFzzvjKOjGbY=";
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
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=";
|
|
||||||
};
|
};
|
||||||
|
doCheck = false; # requires aiohttp>=1.0.0
|
||||||
});
|
});
|
||||||
|
|
||||||
gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec {
|
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>0.3.0 breaks home-assistant tests
|
||||||
pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec {
|
pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec {
|
||||||
version = "0.3.0";
|
version = "0.3.0";
|
||||||
|
@ -115,9 +94,6 @@ let
|
||||||
aioopenexchangerates = super.aioopenexchangerates.overridePythonAttrs (oldAttrs: {
|
aioopenexchangerates = super.aioopenexchangerates.overridePythonAttrs (oldAttrs: {
|
||||||
doCheck = false; # requires aiohttp>=1.0.0
|
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: {
|
hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: {
|
||||||
doCheck = false; # requires aiohttp>=1.0.0
|
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 {
|
pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec {
|
||||||
doCheck = false; # requires pytest-aiohttp>=1.0.0
|
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);
|
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
||||||
|
|
||||||
# Don't forget to run parse-requirements.py after updating
|
# Don't forget to run parse-requirements.py after updating
|
||||||
hassVersion = "2022.10.5";
|
hassVersion = "2022.11.1";
|
||||||
|
|
||||||
in python.pkgs.buildPythonApplication rec {
|
in python.pkgs.buildPythonApplication rec {
|
||||||
pname = "homeassistant";
|
pname = "homeassistant";
|
||||||
|
@ -272,7 +254,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||||
owner = "home-assistant";
|
owner = "home-assistant";
|
||||||
repo = "core";
|
repo = "core";
|
||||||
rev = version;
|
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
|
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||||
|
|
|
@ -4,7 +4,7 @@ buildPythonPackage rec {
|
||||||
# the frontend version corresponding to a specific home-assistant version can be found here
|
# 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
|
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||||
pname = "home-assistant-frontend";
|
pname = "home-assistant-frontend";
|
||||||
version = "20221010.0";
|
version = "20221102.1";
|
||||||
format = "wheel";
|
format = "wheel";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
|
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||||
pname = "home_assistant_frontend";
|
pname = "home_assistant_frontend";
|
||||||
dist = "py3";
|
dist = "py3";
|
||||||
python = "py3";
|
python = "py3";
|
||||||
sha256 = "sha256-TyaEnXHnaFk+V06BjeblYv6VnXsmYCc/7mYicJsBEY8=";
|
sha256 = "sha256-HAFJxrBI6wB1XMe+71tF/bijuQAoyAw8LBQbfv+Vqco=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# there is nothing to strip in this package
|
# there is nothing to strip in this package
|
||||||
|
|
|
@ -168,8 +168,8 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def get_pkg_version(package: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]:
|
def get_pkg_version(attr_path: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]:
|
||||||
pkg = packages.get(f"{PKG_SET}.{package}", None)
|
pkg = packages.get(attr_path, None)
|
||||||
if not pkg:
|
if not pkg:
|
||||||
return None
|
return None
|
||||||
return pkg["version"]
|
return pkg["version"]
|
||||||
|
@ -198,9 +198,11 @@ def main() -> None:
|
||||||
extras = name[name.find("[")+1:name.find("]")].split(",")
|
extras = name[name.find("[")+1:name.find("]")].split(",")
|
||||||
name = name[:name.find("[")]
|
name = name[:name.find("[")]
|
||||||
attr_path = name_to_attr_path(name, packages)
|
attr_path = name_to_attr_path(name, packages)
|
||||||
if our_version := get_pkg_version(name, packages):
|
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):
|
if Version.parse(our_version) < Version.parse(required_version):
|
||||||
outdated[name] = {
|
outdated[attr_name] = {
|
||||||
'wanted': required_version,
|
'wanted': required_version,
|
||||||
'current': our_version
|
'current': our_version
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,6 +47,10 @@ let
|
||||||
# bytearrray mismatch
|
# bytearrray mismatch
|
||||||
"test_rfy_cover"
|
"test_rfy_cover"
|
||||||
];
|
];
|
||||||
|
zha = [
|
||||||
|
# 'manual_pick_radio_type' == 'choose_serial_port'
|
||||||
|
"test_options_flow_migration_reset_old_adapter"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
extraPytestFlagsArray = {
|
extraPytestFlagsArray = {
|
||||||
|
@ -62,6 +66,10 @@ let
|
||||||
# Flaky: AssertionError: assert '0.0' == '12.0'
|
# Flaky: AssertionError: assert '0.0' == '12.0'
|
||||||
"--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed"
|
"--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 = [
|
skybell = [
|
||||||
# Sandbox network limitations: Cannot connect to host cloud.myskybell.com:443
|
# Sandbox network limitations: Cannot connect to host cloud.myskybell.com:443
|
||||||
"--deselect tests/components/skybell/test_config_flow.py::test_flow_user_unknown_error"
|
"--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 // {
|
meta = old.meta // {
|
||||||
broken = lib.elem component [
|
broken = lib.elem component [
|
||||||
"modem_callerid"
|
|
||||||
"subaru"
|
|
||||||
];
|
];
|
||||||
# upstream only tests on Linux, so do we.
|
# upstream only tests on Linux, so do we.
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
|
|
|
@ -48,13 +48,13 @@ in {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nextcloud24 = generic {
|
nextcloud24 = generic {
|
||||||
version = "24.0.6";
|
version = "24.0.7";
|
||||||
sha256 = "b26dff9980a47e7e722805fdbbf87e07f59a3817b03ecc32698e028e9baf0301";
|
sha256 = "a1c7344a4eb27260a9f6f6e6f586bdc4fb35e1e9330e1a6e8d46c05634db6384";
|
||||||
};
|
};
|
||||||
|
|
||||||
nextcloud25 = generic {
|
nextcloud25 = generic {
|
||||||
version = "25.0.0";
|
version = "25.0.1";
|
||||||
sha256 = "2c05ac9d7b72b44ef8b3d2ae03ff0fd6121e254b8054556f5163bd8760dd8f49";
|
sha256 = "72d4076924caf19139c40178597af6211799e20440ce196fb43b9c4e47d77515";
|
||||||
};
|
};
|
||||||
|
|
||||||
# tip: get the sha with:
|
# tip: get the sha with:
|
||||||
|
|
|
@ -5,15 +5,15 @@
|
||||||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "2022-11-03";
|
version = "2022-11-04";
|
||||||
pname = "oh-my-zsh";
|
pname = "oh-my-zsh";
|
||||||
rev = "b3b336b0f95644ceda7758871191cdf040b897b2";
|
rev = "80fdbc9b91a9acca42fb90065b5e64a9722978a7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
inherit rev;
|
inherit rev;
|
||||||
owner = "ohmyzsh";
|
owner = "ohmyzsh";
|
||||||
repo = "ohmyzsh";
|
repo = "ohmyzsh";
|
||||||
sha256 = "azQ2ceqRnvugNI/1ORZXb+5zrv0PXvwYd2Zc85VXSo4=";
|
sha256 = "dapyDDtQ8JUE3PpmHo9DLtt0gEBOrHqoC8wMZeQFUts=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "clair";
|
pname = "clair";
|
||||||
version = "4.4.4";
|
version = "4.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "quay";
|
owner = "quay";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-QfNFms1OxKPk6vimagMFGWJSl9L7JEM1rIK5kNpZlfg=";
|
hash = "sha256-/Czgdl6OxfXSQGvoanA8eoGdzK/wCgGH3wy5aLf0DSM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-Y3eymnLVbDmisV3RDAYkV+I6kTe/CoG0yLvZBOrTfig=";
|
vendorSha256 = "sha256-XWsnEjVA/fqiLevn6sxjzlDfuy937idIcXdTY56FrdA=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
makeWrapper
|
makeWrapper
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "eksctl";
|
pname = "eksctl";
|
||||||
version = "0.115.0";
|
version = "0.117.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "weaveworks";
|
owner = "weaveworks";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-IIxg0xaRfd7jKS4AkSFHcObQmKSRCnQ+K68by8aZlAc=";
|
sha256 = "sha256-3OYhwl+oJNSAYI5RLJgdZgq8teqkjCHy5r/XOqJdz7I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-glMu2GwMWsuIjLjCwskH90wn690tosLTCThd4LUZobo=";
|
vendorSha256 = "sha256-a5E6a+DFrbAA2/sznrKbE4IP68f49+Nbiujx94snryQ=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "btrfs-progs";
|
pname = "btrfs-progs";
|
||||||
version = "6.0";
|
version = "6.0.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
|
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 = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tio";
|
pname = "tio";
|
||||||
version = "2.1";
|
version = "2.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tio";
|
owner = "tio";
|
||||||
repo = "tio";
|
repo = "tio";
|
||||||
rev = "v${version}";
|
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; {
|
meta = with lib; {
|
||||||
description = "Serial console TTY";
|
description = "Serial console TTY";
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "ghostunnel";
|
pname = "ghostunnel";
|
||||||
version = "1.6.1";
|
version = "1.7.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ghostunnel";
|
owner = "ghostunnel";
|
||||||
repo = "ghostunnel";
|
repo = "ghostunnel";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-VameENcHZ6AttV0D8ekPGGFoMHTiTXAY2FxK/Nxwjmk=";
|
sha256 = "sha256-vODSjTpo2oTY42fONhUU8Xn119cTYUGQ6RJaLnS9q3k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, fetchpatch
|
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, coreutils
|
, coreutils
|
||||||
, pam
|
, pam
|
||||||
|
@ -15,21 +14,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "sudo";
|
pname = "sudo";
|
||||||
version = "1.9.12";
|
version = "1.9.12p1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
|
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 = ''
|
prePatch = ''
|
||||||
# do not set sticky bit in nix store
|
# do not set sticky bit in nix store
|
||||||
substituteInPlace src/Makefile.in --replace 04755 0755
|
substituteInPlace src/Makefile.in --replace 04755 0755
|
||||||
|
|
|
@ -2,15 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "witness";
|
pname = "witness";
|
||||||
version = "0.1.11";
|
version = "0.1.12";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "testifysec";
|
owner = "testifysec";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
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 ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "natscli";
|
pname = "natscli";
|
||||||
version = "0.0.34";
|
version = "0.0.35";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nats-io";
|
owner = "nats-io";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-tDs0OrMeWLhBUnngJRBmAauwMA/zdMC4ED7xcCED4Zs=";
|
sha256 = "sha256-Sro0EwHP1pszuOYP6abZO5XjJvbXrDDeSAbzPA2p00M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-Wv0V1/BbO8cP9Qj1TBCDpPTpbv3xzT8eCLPBhCPxRKo=";
|
vendorSha256 = "sha256-HSKBUw9ZO150hLXyGX66U9XpLX2yowxYVdcdDVdqrAc=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "NATS Command Line Interface";
|
description = "NATS Command Line Interface";
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "biblatex-check";
|
pname = "biblatex-check";
|
||||||
version = "1.0.1";
|
version = "1.0.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Pezmc";
|
owner = "Pezmc";
|
||||||
repo = "BibLatex-Check";
|
repo = "BibLatex-Check";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Pe6Ume7vH8WJG2EqOw31g3VYilfFsDBmNHtHcUXxqf0=";
|
sha256 = "sha256-8oHX56+kRWWl8t22DqLAFinjPngRMo3vXxXuVXBwutM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ python3 ];
|
buildInputs = [ python3 ];
|
||||||
|
|
|
@ -41,6 +41,7 @@ mapAliases ({
|
||||||
Babel = babel; # added 2022-05-06
|
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
|
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
|
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
|
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
|
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
|
class-registry = phx-class-registry; # added 2021-10-05
|
||||||
|
|
|
@ -238,6 +238,8 @@ self: super: with self; {
|
||||||
|
|
||||||
aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { };
|
aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { };
|
||||||
|
|
||||||
|
aiolifx-themes = callPackage ../development/python-modules/aiolifx-themes { };
|
||||||
|
|
||||||
aiolimiter = callPackage ../development/python-modules/aiolimiter { };
|
aiolimiter = callPackage ../development/python-modules/aiolimiter { };
|
||||||
|
|
||||||
aiolip = callPackage ../development/python-modules/aiolip { };
|
aiolip = callPackage ../development/python-modules/aiolip { };
|
||||||
|
@ -1394,8 +1396,6 @@ self: super: with self; {
|
||||||
|
|
||||||
bsdiff4 = callPackage ../development/python-modules/bsdiff4 { };
|
bsdiff4 = callPackage ../development/python-modules/bsdiff4 { };
|
||||||
|
|
||||||
bsblan = callPackage ../development/python-modules/bsblan { };
|
|
||||||
|
|
||||||
bson = callPackage ../development/python-modules/bson { };
|
bson = callPackage ../development/python-modules/bson { };
|
||||||
|
|
||||||
bsuite = callPackage ../development/python-modules/bsuite { };
|
bsuite = callPackage ../development/python-modules/bsuite { };
|
||||||
|
@ -5433,6 +5433,8 @@ self: super: with self; {
|
||||||
|
|
||||||
mac_alias = callPackage ../development/python-modules/mac_alias { };
|
mac_alias = callPackage ../development/python-modules/mac_alias { };
|
||||||
|
|
||||||
|
mac-vendor-lookup = callPackage ../development/python-modules/mac-vendor-lookup { };
|
||||||
|
|
||||||
macfsevents = callPackage ../development/python-modules/macfsevents {
|
macfsevents = callPackage ../development/python-modules/macfsevents {
|
||||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices;
|
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices;
|
||||||
};
|
};
|
||||||
|
@ -6488,6 +6490,8 @@ self: super: with self; {
|
||||||
|
|
||||||
opuslib = callPackage ../development/python-modules/opuslib { };
|
opuslib = callPackage ../development/python-modules/opuslib { };
|
||||||
|
|
||||||
|
oralb-ble = callPackage ../development/python-modules/oralb-ble { };
|
||||||
|
|
||||||
orderedmultidict = callPackage ../development/python-modules/orderedmultidict { };
|
orderedmultidict = callPackage ../development/python-modules/orderedmultidict { };
|
||||||
|
|
||||||
ordered-set = callPackage ../development/python-modules/ordered-set { };
|
ordered-set = callPackage ../development/python-modules/ordered-set { };
|
||||||
|
|
Loading…
Reference in a new issue