From a7764796a62236e936cdf018a4a737fccc134ec5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Jan 2021 20:47:55 +0100 Subject: [PATCH 1/7] python3Packages.airly: init at 1.0.0 --- .../python-modules/airly/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/airly/default.nix diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix new file mode 100644 index 000000000000..e75653fb684a --- /dev/null +++ b/pkgs/development/python-modules/airly/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "airly"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ak-ambi"; + repo = "python-airly"; + rev = "v${version}"; + sha256 = "0an6nbl0i5pahxm6x4z03s9apzgqrw9zf7srjcs0r3y1ppicb4s6"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "InstallationsLoaderTestCase" + "MeasurementsSessionTestCase" + ]; + pythonImportsCheck = [ "airly" ]; + + meta = with lib; { + description = "Python module for getting air quality data from Airly sensors"; + homepage = "https://github.com/ak-ambi/python-airly"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad775f0712b3..97b2116fff6a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -269,6 +269,8 @@ in { aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; + airly = callPackage ../development/python-modules/airly { }; + ajpy = callPackage ../development/python-modules/ajpy { }; alabaster = callPackage ../development/python-modules/alabaster { }; From 59c3c445c811551273c35c307aa095ba2e2dab61 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Jan 2021 20:51:19 +0100 Subject: [PATCH 2/7] home-assistant: update component-packages --- 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 6df1239537eb..cb3a9ae86687 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -15,7 +15,7 @@ "aftership" = ps: with ps; [ pyaftership ]; "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; - "airly" = ps: with ps; [ ]; # missing inputs: airly + "airly" = ps: with ps; [ airly ]; "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; From ac24eaff9e9389d9504edf9467c0a8df39b5f66b Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 7 Jan 2021 19:56:22 +0100 Subject: [PATCH 3/7] busybox: 1.32.0 -> 1.32.1 Fixes #108675, a tty deadlock issue that affected one of the texinfoInteractive tests. Co-Authored-By: Sandro --- pkgs/os-specific/linux/busybox/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 99909e6262ef..c157c492043c 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -48,14 +48,15 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.32.0"; + pname = "busybox"; + version = "1.32.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { - url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "w12H8dBLKxU9M8J1wmMuQNOIqI8ZqecXJ+C7v/Uf5ok="; + url = "https://busybox.net/downloads/${pname}-${version}.tar.bz2"; + sha256 = "1vhd59qmrdyrr1q7rvxmyl96z192mxl089hi87yl0hcp6fyw8mwx"; }; hardeningDisable = [ "format" "pie" ] From 24fb219e2c5dafacc8b88a668ef8665a2329d0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 8 Jan 2021 11:04:04 +0100 Subject: [PATCH 4/7] sentencepiece: 0.1.94 -> 0.1.95 Changelog: https://github.com/google/sentencepiece/releases/tag/v0.1.95 --- pkgs/development/libraries/sentencepiece/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index e918a3b3d1d2..03b7da63fa78 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.94"; + version = "0.1.95"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256:11cqw4hx33gw2jmrg11jyp7fj9pwzwjwzqcn24jfsbgh6n8gks5x"; + hash = "sha256-xpVihdSpjO/mJWM5nzVg9CND3oAEdfCwXQW0jqLVDBA="; }; nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; From d2e4f3c6d9ac2337c0b0f06847ee089d8930b457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 8 Jan 2021 11:16:34 +0100 Subject: [PATCH 5/7] sentencepiece: move gperftools from nativeBuildInputs to buildInputs --- pkgs/development/libraries/sentencepiece/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index 03b7da63fa78..7aeb77a1ece8 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { hash = "sha256-xpVihdSpjO/mJWM5nzVg9CND3oAEdfCwXQW0jqLVDBA="; }; - nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; + nativeBuildInputs = [ cmake ]; + + buildInputs = lib.optionals withGPerfTools [ gperftools ]; outputs = [ "bin" "dev" "out" ]; From 823848a6d6dec613bce875da07cd78c4287c73ce Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Sat, 9 Jan 2021 23:52:38 +0000 Subject: [PATCH 6/7] terraform-ls: 0.11.0 -> 0.12.0 --- pkgs/development/tools/misc/terraform-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 220042079fd4..498508d091fc 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "XOKaNpYR31lKpA33+7WU2KYjgEx4g6gpp3IAjWtb3Zk="; + sha256 = "w9PLKLFjKehtub1LbVX9TbvKkj/S1t0MwZIZurF2x18="; }; - vendorSha256 = "8NdeCD558r0tV+ZR4MvLl5CzeNj8cUGtqwvJ2ZhS7mI="; + vendorSha256 = "J8ovcUeQsb58Bq/EM9mvYqtuDY1bXTEVCC9/AH+UttU="; # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; From 2032339e5bbce8a57655b8742190ecb32b7af863 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 10 Jan 2021 10:43:12 +1000 Subject: [PATCH 7/7] mmv-go: 0.1.2 -> 0.1.3 https://github.com/itchyny/mmv/releases/tag/v0.1.3 --- pkgs/tools/misc/mmv-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mmv-go/default.nix b/pkgs/tools/misc/mmv-go/default.nix index d05614d579ab..8787e4a838f6 100644 --- a/pkgs/tools/misc/mmv-go/default.nix +++ b/pkgs/tools/misc/mmv-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mmv-go"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "itchyny"; repo = "mmv"; rev = "v${version}"; - sha256 = "0kpf6abzhsikm7vyk5735p8sfjhsh7klla9qnmc43mgh0560f020"; + sha256 = "12k5zzyr0lhjadc9kza04v0zgb20v7m4syaqwc7qvn3kfvv1mz8s"; }; - vendorSha256 = "1nnfi5zad7nlp44mj0fdg09q8pm093di7rr7pknl9whqghv36dfi"; + vendorSha256 = "0xnrai15ww9lfk02bc9p5ssycwnqkyjj5ch1srh7yvnbw3fakx68"; buildFlagsArray = [ "-ldflags=-s -w -X main.revision=${src.rev}" ];