From 27ad55351852d486a8b02fa1b534007c87c80cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 18 Jun 2021 00:21:29 +0200 Subject: [PATCH 1/8] python3Packages.python-ecobee-api: init at 0.2.13 --- .../python-ecobee-api/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/python-ecobee-api/default.nix diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix new file mode 100644 index 000000000000..dc35c0c022fb --- /dev/null +++ b/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "python-ecobee-api"; + version = "0.2.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "7c39f5aac854a2fb8fb33f41b351769a92ff784bc6112e7a5c1b9e1949a0fefe"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "pyecobee" ]; + + meta = with lib; { + description = "Python API for talking to Ecobee thermostats"; + homepage = "https://github.com/nkgilley/python-ecobee-api"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b42003c32dc..2939b8fba8ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5266,6 +5266,8 @@ in { python-csxcad = callPackage ../development/python-modules/python-csxcad { }; + python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { }; + python-openems = callPackage ../development/python-modules/python-openems { }; python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { }; From 4c1ec204d7f7e2c3cfbfdd93641b180cf2e5a34f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 18 Jun 2021 00:23:08 +0200 Subject: [PATCH 2/8] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 12606f75f486..1fccca43e7c1 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -203,7 +203,7 @@ "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface - "ecobee" = ps: with ps; [ ]; # missing inputs: python-ecobee-api + "ecobee" = ps: with ps; [ python-ecobee-api ]; "econet" = ps: with ps; [ pyeconet ]; "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] From 7865fdd5d11af720d4a5da2e3a48e36d3f1f2996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 18 Jun 2021 00:24:32 +0200 Subject: [PATCH 3/8] home-assistant: test ecobee component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d22b23c3b6e4..bce1ad21e711 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -349,6 +349,7 @@ in with py.pkgs; buildPythonApplication rec { "duckdns" "dyson" "eafm" + "ecobee" "econet" "efergy" "emonitor" From 4cd16361906916f5e7b604742d8e6ab8b9b2431c Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Fri, 18 Jun 2021 01:48:50 +0800 Subject: [PATCH 4/8] yaru: add myself as maintainer, format --- pkgs/data/themes/yaru/default.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index c158ec3f5a95..b37a921bbab8 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, - python3, gtk3, gnome, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, sassc +, pkg-config +, glib +, ninja +, python3 +, gtk3 +, gnome +, gtk-engine-murrine +, humanity-icon-theme +, hicolor-icon-theme +}: stdenv.mkDerivation rec { pname = "yaru"; @@ -13,7 +26,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; + buildInputs = [ gtk3 gnome.gnome-themes-extra ]; + propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -27,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fortuneteller2k ]; }; } From 955df64c44eee780c71fd4da5bcabda553c94f7a Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Fri, 18 Jun 2021 00:27:55 +0000 Subject: [PATCH 5/8] vscodium: 1.57.0 -> 1.57.1 --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 1a31d4e56fab..849f435eb368 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1pjqw0chyhmamgnbih05ach94xgz6kglx7n958y2652ps2q5fzhw"; - x86_64-darwin = "0k9rinsy0zz48pxprkyxshksgh6shk1h69fkrdi2q0f4mkvzmi3a"; - aarch64-linux = "0hd3kxg5pwkf0rhbq4f246x82nic24splpqj4h68qfw856p2zg7d"; - armv7l-linux = "0219yagcdiv1n3xbbk1rs94n4zwfv9s70yqrc0all7jl5xl1mbwh"; + x86_64-linux = "16s3hznyrz9w0cns8fk3pzk9ai5dj9y5p4n1rf3hrpg5hi9yxi5j"; + x86_64-darwin = "133p032c8gv3hx4x7kxdfhz4xvkpjmjnvy02sf05dxqv5nly4xx4"; + aarch64-linux = "183f674qyrlz0wqx6x48z6jhl8z30zmwsj8021hqi8px5ny99l1f"; + armv7l-linux = "0rf3ybha861r5pfp6rvh21abfagaiwqlsbxm7fhphrc5382lmxbs"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.57.0"; + version = "1.57.1"; pname = "vscodium"; executableName = "codium"; From b2cf7418e7ff53e41289c13714aab5446c38f714 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Thu, 17 Jun 2021 14:03:33 -0300 Subject: [PATCH 6/8] vscode-extensions.svsool.markdown-memo: init at 0.3.8 --- pkgs/misc/vscode-extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 1c54a455f7a3..b94d4b700bec 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1152,6 +1152,23 @@ let }; }; + svsool.markdown-memo = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-memo"; + publisher = "svsool"; + version = "0.3.8"; + sha256 = "eFiCCXxrOnXwJK1AOMfIDsPGsFG3ArLD1X/uAEH5lRY="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog"; + description = "Markdown knowledge base with bidirectional [[link]]s built on top of VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=svsool.markdown-memo"; + homepage = "https://github.com/svsool/vscode-memo"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; + }; + tamasfe.even-better-toml = buildVscodeMarketplaceExtension { mktplcRef = { name = "even-better-toml"; From f9d16c48af3780ea4707e75ae4eb4974ea124383 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Thu, 17 Jun 2021 00:26:32 -0300 Subject: [PATCH 7/8] vscode-extensions.Ionide.Ionide-fsharp: init at 5.5.5 --- pkgs/misc/vscode-extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index b94d4b700bec..d4b7071117fd 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -670,6 +670,23 @@ let }; }; + ionide.ionide-fsharp = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "Ionide-fsharp"; + publisher = "Ionide"; + version = "5.5.5"; + sha256 = "xrBNiIbZVJ0sGUk/4PudD8kSyX94QkrFtf7Ho/sB0Vs="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; + description = "Enhanced F# Language Features for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Ionide.Ionide-fsharp"; + homepage = "https://ionide.io"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; + }; + jakebecker.elixir-ls = buildVscodeMarketplaceExtension { mktplcRef = { name = "elixir-ls"; From ea12a8ea1742389348950c77e75097320bd9d2dd Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Thu, 17 Jun 2021 13:45:18 +0300 Subject: [PATCH 8/8] broot: 1.4.0 -> 1.6.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 0aeef02f32d1..d1f9ca80f705 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.4.0"; + version = "1.6.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-6UveXa0rMWt5FbmhB0CsYRMGMXxL8FB/XivB4Ec93PY="; + sha256 = "sha256-H/QT/fmQI9sHjl6wMJjrfjvbOhY9VyBkAGetvcUqGrE="; }; - cargoHash = "sha256-c6U1ZOaXZ7RnKD7q0WTkam9gL8SL/naSeHGbB5I82lk="; + cargoHash = "sha256-5mqLVbB/dLAk3Ck7ilHhVn0CB/6Ln82SaTxZ/vkx+9k="; nativeBuildInputs = [ installShellFiles