From 7230b47079d5fa3363a4337d937dedf69a47fc5b Mon Sep 17 00:00:00 2001 From: meutraa Date: Wed, 24 Feb 2021 09:54:30 +0000 Subject: [PATCH 01/22] androidStudioPackages: change --set JAVA_HOME to --set-default in wrapper --- pkgs/applications/editors/android-studio/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 1c3c4aade5f..6be6defd198 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -72,8 +72,8 @@ let installPhase = '' cp -r . $out wrapProgram $out/bin/studio.sh \ + --set-default JAVA_HOME "$out/jre" \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --set JAVA_HOME "$out/jre" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ --set FONTCONFIG_FILE ${fontsConf} \ --prefix PATH : "${lib.makeBinPath [ From 3014dbcee2c45d15fa0d986b3871308aa0fd104b Mon Sep 17 00:00:00 2001 From: meutraa Date: Wed, 24 Feb 2021 10:33:59 +0000 Subject: [PATCH 02/22] androidStudioPackages.{canary,dev}: 2020.3.1.5 -> 2020.3.1.7 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 1dc8b9ca7ff..566beec0c5b 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -19,8 +19,8 @@ let sha256Hash = "10c4qfq6d9ggs88s8h3pryhlnzw17m60qci78rjbh32wmm02sciz"; }; latestVersion = { # canary & dev - version = "2020.3.1.5"; # "Android Studio Arctic Fox (2020.3.1) Canary 5" - sha256Hash = "0x749sbg7qa5ncwwaywcldlhyyyyfh05bms2czz1rv6h7zgq16vq"; + version = "2020.3.1.7"; # "Android Studio Arctic Fox (2020.3.1) Canary 7" + sha256Hash = "03gq4s8rmg7si0r2y1w26v9bjwhj6gzmrdny5z3j5pq8xsfjfqiw"; }; in { # Attributes are named by their corresponding release channels From 6e1b2278fbdcb7b5ecc17836e57849b62b2bf562 Mon Sep 17 00:00:00 2001 From: meutraa Date: Wed, 24 Feb 2021 10:44:54 +0000 Subject: [PATCH 03/22] androidStudioPackages.beta: 4.2.0.20 -> 4.2.0.21 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 566beec0c5b..fa4f7a40d96 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9"; }; betaVersion = { - version = "4.2.0.20"; # "Android Studio 4.2 Beta 4" - build = "202.7094744"; - sha256Hash = "10c4qfq6d9ggs88s8h3pryhlnzw17m60qci78rjbh32wmm02sciz"; + version = "4.2.0.21"; # "Android Studio 4.2 Beta 5" + build = "202.7141121"; + sha256Hash = "05610xf9zz3yxarx6fv83fynlvqw9jl7h2a40yj3xx5kb7mzdnf2"; }; latestVersion = { # canary & dev version = "2020.3.1.7"; # "Android Studio Arctic Fox (2020.3.1) Canary 7" From ded029fd0d43f1af4d57c00ab7e695400f18f20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Sat, 27 Feb 2021 20:04:07 +0100 Subject: [PATCH 04/22] sameboy: 0.13.6 -> 0.14 --- pkgs/misc/emulators/sameboy/default.nix | 28 +++++++++++++------------ 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/misc/emulators/sameboy/default.nix index d23129eba7e..1253bd346a6 100644 --- a/pkgs/misc/emulators/sameboy/default.nix +++ b/pkgs/misc/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.13.6"; + version = "0.14"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "04w8lybi7ssnax37ka4qw7pmcm7cgnmk90p9m73zbyp5chgpqqzc"; + sha256 = "1faggrp0hka0dy97n4skdcxj1fcv8dy072fpbpiw7144x0byy5mn"; }; enableParallelBuilding = true; @@ -16,20 +16,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rgbds glib wrapGAppsHook ]; buildInputs = [ SDL2 ]; - makeFlags = "CONF=release DATA_DIR=$(out)/share/sameboy/"; + makeFlags = [ + "CONF=release" + "CAN_INSTALL=true" + "PREFIX=$(out)" + "DATA_DIR=$(out)/share/sameboy/" + ]; - patchPhase = '' - sed 's/-Werror //g' -i Makefile - sed 's@"libgtk-3.so"@"${gtk3}/lib/libgtk-3.so"@g' -i OpenDialog/gtk.c + postPatch = '' + substituteInPlace Makefile \ + --replace "-Werror " "" + substituteInPlace OpenDialog/gtk.c \ + --replace '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"' ''; - installPhase = '' - pushd build/bin/SDL - install -Dm755 sameboy $out/bin/sameboy - rm sameboy - mkdir -p $out/share/sameboy - cp -r * $out/share/sameboy - popd + preInstall = '' + mkdir -p $out/bin ''; meta = with lib; { From 5a07a6900072eac36954f8b2c324c407ba469b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Sun, 28 Feb 2021 16:42:53 +0100 Subject: [PATCH 05/22] sameboy: 0.14 -> 0.14.1 --- pkgs/misc/emulators/sameboy/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/misc/emulators/sameboy/default.nix index 1253bd346a6..6b209840169 100644 --- a/pkgs/misc/emulators/sameboy/default.nix +++ b/pkgs/misc/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.14"; + version = "0.14.1"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "1faggrp0hka0dy97n4skdcxj1fcv8dy072fpbpiw7144x0byy5mn"; + sha256 = "0h42cixbf0m2qiwrqzygh0x166h9ikxa5dzi3jbqld2dygk932n7"; }; enableParallelBuilding = true; @@ -18,22 +18,15 @@ stdenv.mkDerivation rec { makeFlags = [ "CONF=release" - "CAN_INSTALL=true" + "FREEDESKTOP=true" "PREFIX=$(out)" - "DATA_DIR=$(out)/share/sameboy/" ]; postPatch = '' - substituteInPlace Makefile \ - --replace "-Werror " "" substituteInPlace OpenDialog/gtk.c \ --replace '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"' ''; - preInstall = '' - mkdir -p $out/bin - ''; - meta = with lib; { homepage = "https://sameboy.github.io"; description = "Game Boy, Game Boy Color, and Super Game Boy emulator"; From d191f2278d710c135ea105e103d4b148f696df01 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sat, 27 Feb 2021 22:16:38 -0800 Subject: [PATCH 06/22] python3Packages.grpcio: remove cctools from build inputs This fixes `aarch64-darwin` build in #105026. Without this the `strip` in `PATH` is the one from `darwin.cctools`, which doesn't preserve code signatures, resulting in code that cannot run and pass `pythonImportsCheckPhase`. The dependency on cctools was introduced in #44902 in 2018, but it doesn't seem to be necessary on `x86_64-darwin` today. --- pkgs/development/python-modules/grpcio/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 1b1ffb975fb..0fe6b9343eb 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , buildPythonPackage -, darwin , grpc , six , protobuf @@ -20,8 +19,7 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cython pkg-config ] - ++ lib.optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = [ cython pkg-config ]; buildInputs = [ c-ares openssl zlib ]; propagatedBuildInputs = [ six protobuf ] From d4cced08b90f4c6b0f5ead3a39a2a53fa271253c Mon Sep 17 00:00:00 2001 From: robertoszek Date: Sun, 28 Feb 2021 17:40:49 +0100 Subject: [PATCH 07/22] maintainers: add robertoszek --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2d122346fca..22d8c2b960e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8039,6 +8039,12 @@ githubId = 3708689; name = "Roberto Di Remigio"; }; + robertoszek = { + email = "robertoszek@robertoszek.xyz"; + github = "robertoszek"; + githubId = 1080963; + name = "Roberto"; + }; robgssp = { email = "robgssp@gmail.com"; github = "robgssp"; From 1a96fcd85f701b62f11e7d5af6c81d8d7649294a Mon Sep 17 00:00:00 2001 From: Akshat Agarwal Date: Thu, 18 Feb 2021 11:40:37 +0530 Subject: [PATCH 08/22] cargo-criterion: init at 1.0.0 Signed-off-by: Akshat Agarwal --- .../tools/rust/cargo-criterion/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-criterion/default.nix diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/development/tools/rust/cargo-criterion/default.nix new file mode 100644 index 00000000000..931fb8fd984 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-criterion/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-criterion"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "bheisler"; + repo = pname; + rev = version; + sha256 = "0czagclrn4yhlvlh06wsyiybz69r7mmk3182fywzn9vd0xlclxpi"; + }; + + cargoSha256 = "sha256-XZuZ81hB/GQDopJyfSkxQiehSwJz7VWoJR6/m3WLil8="; + + meta = with lib; { + description = "Cargo extension for running Criterion.rs benchmarks"; + homepage = "https://github.com/bheisler/cargo-criterion"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ humancalico ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdc4262a486..80aba32f153 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10869,6 +10869,7 @@ in cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; cargo-deb = callPackage ../tools/package-management/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; }; From 220e13292aad0369826427134171ab1de9c8ce99 Mon Sep 17 00:00:00 2001 From: Johannes Rosenberger Date: Mon, 1 Mar 2021 13:02:17 +0100 Subject: [PATCH 09/22] crate2nix: 0.8.0 -> 0.9.0 --- pkgs/development/tools/rust/crate2nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix index a941d43bb9d..9432c4fd85d 100644 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ b/pkgs/development/tools/rust/crate2nix/default.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "crate2nix"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "kolloch"; repo = pname; rev = version; - sha256 = "sha256-pqg1BsEq3kGmUzt1zpQvXgdnRcIsiuIyvtUBi3VxtZ4="; + sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM="; } + "/crate2nix"; - cargoSha256 = "sha256-dAMWrGNMleQ3lDbG46Hr4qvCyxR+QcPOUZw9r2/CxV4="; + cargoSha256 = "sha256-6V0ifH63/s5XLo4BCexPtvlUH0UQPHFW8YHF8OCH3ik="; nativeBuildInputs = [ makeWrapper ]; From a01cffac18366cd6c051900ce52f8af7878e57ad Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 1 Mar 2021 07:30:26 -0500 Subject: [PATCH 10/22] cargo-play: init at 0.5.0 --- .../tools/rust/cargo-play/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-play/default.nix diff --git a/pkgs/development/tools/rust/cargo-play/default.nix b/pkgs/development/tools/rust/cargo-play/default.nix new file mode 100644 index 00000000000..5e12c1cae1d --- /dev/null +++ b/pkgs/development/tools/rust/cargo-play/default.nix @@ -0,0 +1,25 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-play"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "fanzeyi"; + repo = pname; + rev = "v${version}"; + sha256 = "01r00akfmvpzp924yqqybd9s0pwiwxy8vklsg4m9ypzljc3nlv02"; + }; + + cargoSha256 = "0fvsdyivq5991ka6avh12aqdkjx0myk61kmzlr19p2vlfpg70q07"; + + # some tests require internet access + doCheck = false; + + meta = with lib; { + description = "Run your rust code without setting up cargo"; + homepage = "https://github.com/fanzeyi/cargo-play"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0dc67cc07e..d8e124f9353 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10849,6 +10849,7 @@ in cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; + cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; }; From 6966ee9c781337d1bbace2d1d304d67cc69fd3da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Mar 2021 15:52:35 +0100 Subject: [PATCH 11/22] python3Packages.chirpstack-api: init at 3.9.4 --- .../python-modules/chirpstack-api/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/chirpstack-api/default.nix diff --git a/pkgs/development/python-modules/chirpstack-api/default.nix b/pkgs/development/python-modules/chirpstack-api/default.nix new file mode 100644 index 00000000000..a019dd65199 --- /dev/null +++ b/pkgs/development/python-modules/chirpstack-api/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, grpcio +}: + +buildPythonPackage rec { + pname = "chirpstack-api"; + version = "3.9.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "08djidy3fyhghyzvndcjas3hb1s9d7719gvmgbl8bzxjm4h2c433"; + }; + + propagatedBuildInputs = [ + google-api-core + grpcio + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "chirpstack_api" ]; + + meta = with lib; { + description = "ChirpStack gRPC API message and service wrappers for Python"; + homepage = "https://github.com/brocaar/chirpstack-api"; + 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 205813ddb1c..fde4264426e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1281,6 +1281,8 @@ in { chevron = callPackage ../development/python-modules/chevron { }; + chirpstack-api = callPackage ../development/python-modules/chirpstack-api { }; + ci-info = callPackage ../development/python-modules/ci-info { }; ci-py = callPackage ../development/python-modules/ci-py { }; From c052fdb7c694a61057ad7a72d2b3358002da5aec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Mar 2021 16:13:21 +0100 Subject: [PATCH 12/22] python3Packages.pymediaroom: init at 0.6.4.1 --- .../python-modules/pymediaroom/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pymediaroom/default.nix diff --git a/pkgs/development/python-modules/pymediaroom/default.nix b/pkgs/development/python-modules/pymediaroom/default.nix new file mode 100644 index 00000000000..e977cb23d75 --- /dev/null +++ b/pkgs/development/python-modules/pymediaroom/default.nix @@ -0,0 +1,36 @@ +{ lib +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, xmltodict +}: + +buildPythonPackage rec { + pname = "pymediaroom"; + version = "0.6.4.1"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "dgomes"; + repo = pname; + rev = version; + sha256 = "1klf2dxd8rlq3n4b9m03lzwcsasn9vi6m3hzrjqhqnprhrnp0xmy"; + }; + + propagatedBuildInputs = [ + async-timeout + xmltodict + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pymediaroom" ]; + + meta = with lib; { + description = "Python Remote Control for Mediaroom STB"; + homepage = "https://github.com/dgomes/pymediaroom"; + 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 205813ddb1c..06e7d0fcd82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5704,6 +5704,8 @@ in { pymediainfo = callPackage ../development/python-modules/pymediainfo { }; + pymediaroom = callPackage ../development/python-modules/pymediaroom { }; + pymeeus = callPackage ../development/python-modules/pymeeus { }; pymemoize = callPackage ../development/python-modules/pymemoize { }; From e4b18f119f960541a8f4ae5430d6ffa87441466f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Mar 2021 16:14:21 +0100 Subject: [PATCH 13/22] 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 2836f8a64e3..f08a783857b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -480,7 +480,7 @@ "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; "media_player" = ps: with ps; [ aiohttp-cors ]; "media_source" = ps: with ps; [ aiohttp-cors ]; - "mediaroom" = ps: with ps; [ ]; # missing inputs: pymediaroom + "mediaroom" = ps: with ps; [ pymediaroom ]; "melcloud" = ps: with ps; [ ]; # missing inputs: pymelcloud "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate "meraki" = ps: with ps; [ aiohttp-cors ]; From 9cdd1484b39ba14312214f4af7ed6028446e1e75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Mar 2021 16:23:32 +0100 Subject: [PATCH 14/22] python3Packages.aiopylgtv: init at 0.4.0 --- .../python-modules/aiopylgtv/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/aiopylgtv/default.nix diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix new file mode 100644 index 00000000000..200bc41b7a5 --- /dev/null +++ b/pkgs/development/python-modules/aiopylgtv/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pythonOlder +, sqlitedict +, websockets +}: + +buildPythonPackage rec { + pname = "aiopylgtv"; + version = "0.4.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bendavid"; + repo = pname; + rev = version; + sha256 = "0x0xcnlz42arsp53zlq5wyv9pwif1in8j2pv48gh0pkdnz9s86b6"; + }; + + propagatedBuildInputs = [ + numpy + sqlitedict + websockets + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "aiopylgtv" ]; + + meta = with lib; { + description = "Python library to control webOS based LG TV units"; + homepage = "https://github.com/bendavid/aiopylgtv"; + 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 205813ddb1c..a857ff64fe5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -284,6 +284,8 @@ in { aiopulse = callPackage ../development/python-modules/aiopulse { }; + aiopylgtv = callPackage ../development/python-modules/aiopylgtv { }; + aiorecollect = callPackage ../development/python-modules/aiorecollect { }; aioredis = callPackage ../development/python-modules/aioredis { }; From d9723cb4681c8d8da06d68e0e60f271c8c886531 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Mar 2021 16:24:25 +0100 Subject: [PATCH 15/22] 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 2836f8a64e3..f1e5dcb376f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -924,7 +924,7 @@ "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; - "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv + "webostv" = ps: with ps; [ aiopylgtv ]; "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ python-whois ]; From 1cb701f588a0444fe427e037f9195e439715ed85 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 1 Mar 2021 16:28:14 +0100 Subject: [PATCH 16/22] shattered-pixel-dungeon: 0.9.1d -> 0.9.2 --- pkgs/games/shattered-pixel-dungeon/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index eea8d5650be..3639eb46ffe 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -2,7 +2,7 @@ , makeWrapper , fetchFromGitHub , nixosTests -, gradle_5 +, gradle , perl , jre , libpulseaudio @@ -10,13 +10,15 @@ let pname = "shattered-pixel-dungeon"; - version = "0.9.1d"; + version = "0.9.2"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; - rev = "v${version}"; - sha256 = "0f9vi1iffh477zi03hi07rmfbkb8i4chwvv43vs70mgjh4qx7247"; + # NOTE: always use the commit sha, not the tag. Tags _will_ disappear! + # https://github.com/00-Evan/shattered-pixel-dungeon/issues/596 + rev = "5be9ee815f1fc6e3511a09a367d3f9d8dc55c783"; + sha256 = "0wknrf7jjnkshj4gmb1ksqiqif1rq53ffi3y29ynhcz68sa0frx6"; }; postPatch = '' @@ -31,7 +33,7 @@ let deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit version src postPatch; - nativeBuildInputs = [ gradle_5 perl ]; + nativeBuildInputs = [ gradle perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) # https://github.com/gradle/gradle/issues/4426 @@ -52,7 +54,7 @@ let in stdenv.mkDerivation rec { inherit pname version src postPatch; - nativeBuildInputs = [ gradle_5 perl makeWrapper ]; + nativeBuildInputs = [ gradle perl makeWrapper ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -86,4 +88,3 @@ in stdenv.mkDerivation rec { broken = stdenv.isDarwin; }; } - From 14b60caa6eba65191c3586e9a917c99b5dcb8726 Mon Sep 17 00:00:00 2001 From: robertoszek Date: Sun, 28 Feb 2021 17:41:09 +0100 Subject: [PATCH 17/22] pleroma-bot: init at 0.8.6 added pythonImportsCheck Update pkgs/development/python-modules/pleroma-bot/default.nix Co-authored-by: Fabian Affolter Update pkgs/top-level/all-packages.nix Co-authored-by: Sandro changed fetcher and added checkInput tests Update pkgs/development/python-modules/pleroma-bot/default.nix Co-authored-by: Fabian Affolter change to pytestCheckHook Update pkgs/development/python-modules/pleroma-bot/default.nix Co-authored-by: Fabian Affolter formatting with nixpkgs-fmt attribute ordering use version Co-authored-by: Sandro --- .../python-modules/pleroma-bot/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pleroma-bot/default.nix diff --git a/pkgs/development/python-modules/pleroma-bot/default.nix b/pkgs/development/python-modules/pleroma-bot/default.nix new file mode 100644 index 00000000000..1dca45eca76 --- /dev/null +++ b/pkgs/development/python-modules/pleroma-bot/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, requests-mock +, oauthlib +, requests_oauthlib +, requests +, pyaml +}: + +buildPythonPackage rec { + pname = "pleroma-bot"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "robertoszek"; + repo = "pleroma-bot"; + rev = version; + sha256 = "1q0xhgqq41zbqiawpd4kbdx41zhwxxp5ipn1c2rc8d7pjyb5p75w"; + }; + + propagatedBuildInputs = [ pyaml requests requests_oauthlib oauthlib ]; + checkInputs = [ pytestCheckHook requests-mock ]; + + pythonImportsCheck = [ "pleroma_bot" ]; + + meta = with lib; { + homepage = "https://robertoszek.github.io/pleroma-bot/"; + description = "Bot for mirroring one or multiple Twitter accounts in Pleroma/Mastodon"; + license = licenses.mit; + maintainers = with maintainers; [ robertoszek ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78aa21f044f..466c316367d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24041,6 +24041,8 @@ in stdenv = stdenv_32bit; }; + pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { }; + polybar = callPackage ../applications/misc/polybar { }; polybarFull = callPackage ../applications/misc/polybar { From 4e2b38d13754c27ebed6457df03a4f49be966e9f Mon Sep 17 00:00:00 2001 From: timds Date: Mon, 1 Mar 2021 17:05:51 +0100 Subject: [PATCH 18/22] wal-g: enable support for brotli compression Brotli support was always on until v0.2.10. It is enabled by default in the wal-g's 'official' releases and build instructions, so it makes sense to enable it in nixpkgs too. wal-g has a Makefile (not used by nixpkgs) which statically links to brotli v1.0.7 (a C library). Nixpkgs dynamically links to brotli v1.0.9. --- pkgs/tools/backup/wal-g/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index f3c415f3cd0..de7f678fde8 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -17,7 +17,10 @@ buildGoModule rec { subPackages = [ "main/pg" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version} -X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" ]; + buildFlagsArray = [ + "-tags=brotli" + "-ldflags=-s -w -X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version} -X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" + ]; postInstall = '' mv $out/bin/pg $out/bin/wal-g From 2f00f46269b4852212689f1a2b0b8481bd7faeb6 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sun, 28 Feb 2021 16:02:03 -0800 Subject: [PATCH 19/22] cryptopp: run configure.sh before make This prevents failure on `aarch64-darwin`. --- pkgs/development/libraries/crypto++/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 0402af92b3b..6c4a3bfc084 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { substituteInPlace GNUmakefile \ --replace "AR = libtool" "AR = ar" \ --replace "ARFLAGS = -static -o" "ARFLAGS = -cru" + + # See https://github.com/weidai11/cryptopp/issues/1011 + substituteInPlace GNUmakefile \ + --replace "ZOPT = -O0" "ZOPT =" + ''; + + preConfigure = '' + sh TestScripts/configure.sh ''; makeFlags = [ "PREFIX=${placeholder "out"}" ]; From 5eb119eff991a16326fd2908927b30dc932474af Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 1 Mar 2021 12:01:47 -0500 Subject: [PATCH 20/22] =?UTF-8?q?Revert=20"minecraft:=202.2.1441=20?= =?UTF-8?q?=E2=86=92=202.2.1867"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/games/minecraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index c2b9718cd25..3d0b53035ed 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.2.1867"; + version = "2.2.1441"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "1gpagrinam595153jbxwagcq20ij2dk8nn6zajy2iyqmj12y66ay"; + sha256 = "03q579hvxnsh7d00j6lmfh53rixdpf33xb5zlz7659pvb9j5w0cm"; }; icon = fetchurl { From e9c39c7b7328692d3f1bfe592172c12c4fdbdc5f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 28 Feb 2021 11:38:20 -0500 Subject: [PATCH 21/22] python3Packages.sagemaker: 2.25.2 -> 2.26.0 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 6d0414577bc..ddb93a21357 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.25.2"; + version = "2.26.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oacqDLgt11fplc6e3ruCrwDV/iRhoTgx1mu3Pm/5kmw="; + sha256 = "sha256-CT0vXt6x+cp4yHZtfBiRq+/Aurd4Q7Zagn4lNRqji/o="; }; pythonImportsCheck = [ From 662e3b88aede51891f181226b021831b26948d88 Mon Sep 17 00:00:00 2001 From: Varris Date: Fri, 29 Jan 2021 13:38:41 +0100 Subject: [PATCH 22/22] linux: Enable CONFIG_UNICODE to support casefold Required to mount filesystems with casefold enabled. Fixes #109432 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 24c992dc907..0d93dd485a4 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -416,6 +416,8 @@ let NLS_ISO8859_1 = module; # VFAT default for the iocharset= mount option DEVTMPFS = yes; + + UNICODE = whenAtLeast "5.2" yes; # Casefolding support for filesystems }; security = {