From b43196dffcd410abf8fed49b4ebf2517e710f63f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jan 2022 01:02:52 +0100 Subject: [PATCH 01/25] python3Packages.pydevccu: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/pydevccu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix index f4ee3f6ad652..f6d1fbeeaa26 100644 --- a/pkgs/development/python-modules/pydevccu/default.nix +++ b/pkgs/development/python-modules/pydevccu/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pydevccu"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-bLXACJPiHZlJzoDm7N9RWskN+qQddSkGFX9d4YcTaLo="; + sha256 = "sha256-awTy1yQdiKvqcUb8ecgOMhgpzpF7HvFZw/W8urA92LU="; }; # Module has no tests From 7ec65f335437c5ad70c885cea0d907688e472f2f Mon Sep 17 00:00:00 2001 From: Will Jones Date: Fri, 14 Jan 2022 13:50:31 +0000 Subject: [PATCH 02/25] git-lfs: Build subcommands The current version of `git-lfs` doesn't work very well due to a missing code-generation step in its build process. This commit fixes its derivation so that this step is run. --- pkgs/applications/version-management/git-lfs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index c5422d9a6c6c..78a393eb5e44 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -19,6 +19,12 @@ buildGoPackage rec { subPackages = [ "." ]; + preBuild = '' + pushd go/src/github.com/git-lfs/git-lfs + go generate ./commands + popd + ''; + postBuild = '' make -C go/src/${goPackagePath} man ''; From ce00fa6d26ec7cb4647b82b72611b42ae1c49ed0 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Mon, 17 Jan 2022 12:17:55 +0100 Subject: [PATCH 03/25] dash: add test --- pkgs/shells/dash/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 2a0d73145607..a1f789dc3a33 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -5,6 +5,8 @@ , fetchurl , fetchpatch , libedit +, runCommand +, dash }: stdenv.mkDerivation rec { @@ -52,5 +54,13 @@ stdenv.mkDerivation rec { passthru = { shellPath = "/bin/dash"; + tests = { + "execute-simple-command" = runCommand "${pname}-execute-simple-command" { } '' + mkdir $out + ${dash}/bin/dash -c 'echo "Hello World!" > $out/success' + [ -s $out/success ] + grep -q "Hello World" $out/success + ''; + }; }; } From 88362d1a35ba4ac92e9bf728b68c32f14468daa3 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 19 Jan 2022 19:45:49 +0100 Subject: [PATCH 04/25] nixos/matrix-synapse: Remove webclient from default listener Webclient only allows serving a web directory under /_matrix/client This only incentivizes running the client under the same domain as the homeserver. Which is not recommended due to CORS. --- nixos/modules/services/misc/matrix-synapse.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 404163d2de6c..bee4d7667c8e 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -294,7 +294,7 @@ in { description = '' List of resources to host on this listener. ''; - example = ["client" "webclient" "federation"]; + example = ["client" "federation"]; }; compress = mkOption { type = types.bool; @@ -319,7 +319,7 @@ in { tls = true; x_forwarded = false; resources = [ - { names = ["client" "webclient"]; compress = true; } + { names = ["client"]; compress = true; } { names = ["federation"]; compress = false; } ]; }]; From a1c057209bc83e3fe778d64520b48ee27be03035 Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Thu, 20 Jan 2022 14:00:00 -0500 Subject: [PATCH 05/25] plex-mpv-shim: fix tray icon --- pkgs/applications/video/plex-mpv-shim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index f5678276004e..2d0643c4ddb9 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }: +{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc, pystray, tkinter }: buildPythonApplication rec { pname = "plex-mpv-shim"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "0hgv9g17dkrh3zbsx27n80yvkgix9j2x0rgg6d3qsf7hp5j3xw4r"; }; - propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; + propagatedBuildInputs = [ mpv requests python-mpv-jsonipc pystray tkinter ]; # does not contain tests doCheck = false; From 2f4574a21346f257b1f5864ef95878f5dcef22d2 Mon Sep 17 00:00:00 2001 From: nialov Date: Sat, 22 Jan 2022 23:44:11 +0200 Subject: [PATCH 06/25] maintainers: add nialov --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 12c684640bbb..84e890278135 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8564,6 +8564,12 @@ githubId = 7845120; name = "Alex Martens"; }; + nialov = { + email = "nikolasovaskainen@gmail.com"; + github = "nialov"; + githubId = 47318483; + name = "Nikolas Ovaskainen"; + }; nikitavoloboev = { email = "nikita.voloboev@gmail.com"; github = "nikitavoloboev"; From 2a701e80619658fd6554f2c2370545b511da087e Mon Sep 17 00:00:00 2001 From: Lara Date: Wed, 22 Dec 2021 15:23:49 +0000 Subject: [PATCH 07/25] nixos/matrix-synapse: Wrap register_new_matrix_user `register_new_matrix_user` is a script provided by the matrix-synapse package to create a new matrix user on the command line. This commit provides a wrapper around `register_new_matrix_user` that automatically passes the url (and `registration_shared_secret`, if present) as CLI arguments. --- .../modules/services/misc/matrix-synapse.nix | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 404163d2de6c..de13a153c6f0 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -119,6 +119,30 @@ ${cfg.extraConfig} hasLocalPostgresDB = let args = cfg.database_args; in usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ])); + + registerNewMatrixUser = + let + isIpv6 = x: lib.length (lib.splitString ":" x) > 1; + listener = + lib.findFirst ( + listener: lib.any ( + resource: lib.any ( + name: name == "client" + ) resource.names + ) listener.resources + ) (lib.last cfg.listeners) cfg.listeners; + in + pkgs.writeShellScriptBin "matrix-synapse-register_new_matrix_user" '' + exec ${cfg.package}/bin/register_new_matrix_user \ + $@ \ + ${lib.concatMapStringsSep " " (x: "-c ${x}") ([ configFile ] ++ cfg.extraConfigFiles)} \ + "${listener.type}://${ + if (isIpv6 listener.bind_address) then + "[${listener.bind_address}]" + else + "${listener.bind_address}" + }:${builtins.toString listener.port}/" + ''; in { options = { services.matrix-synapse = { @@ -792,6 +816,8 @@ in { UMask = "0077"; }; }; + + environment.systemPackages = [ registerNewMatrixUser ]; }; imports = [ From e5e0fc67ae5c847b8b9fed2f32e3f0845fd3ee91 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 23 Jan 2022 14:14:38 +0100 Subject: [PATCH 08/25] wiki-js: 2.5.268 -> 2.5.272 ChangeLog: https://github.com/Requarks/wiki/releases/tag/2.5.272 --- pkgs/servers/web-apps/wiki-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index bfbe46388d2d..3b4af1b86a84 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.268"; + version = "2.5.272"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz"; - sha256 = "sha256-Ec4trrVETbgKs41aIc4Ne02c969Qc44QtoBf8tyk4+I="; + sha256 = "sha256-30thDjmjc24tChgih0FZyIUU6/aKKl4MAD5yqn0yYa4="; }; sourceRoot = "."; From e925610ca3242af9ae1e4acc6b286bd0870309ba Mon Sep 17 00:00:00 2001 From: nialov Date: Sat, 22 Jan 2022 23:47:06 +0200 Subject: [PATCH 09/25] python3Packages.pygeos: init at 0.12.0 --- .../python-modules/pygeos/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/pygeos/default.nix diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix new file mode 100644 index 000000000000..57970ad2f348 --- /dev/null +++ b/pkgs/development/python-modules/pygeos/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, geos +, pytestCheckHook +, cython +, numpy +}: + +buildPythonPackage rec { + pname = "pygeos"; + version = "0.12.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-PEFULvZ8ZgFfRDrj5uaDUDqKIh+cJPsjgPauQq7RYAo="; + }; + + nativeBuildInputs = [ + geos # for geos-config + cython + ]; + + propagatedBuildInputs = [ numpy ]; + + # The cythonized extensions are required to exist in the pygeos/ directory + # for the package to function. Therefore override of buildPhase was + # necessary. + buildPhase = '' + ${python.interpreter} setup.py build_ext --inplace + ${python.interpreter} setup.py bdist_wheel + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pygeos" ]; + + meta = with lib; { + description = "Wraps GEOS geometry functions in numpy ufuncs."; + homepage = "https://github.com/pygeos/pygeos"; + license = licenses.bsd3; + maintainers = with maintainers; [ nialov ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index beb14495df4b..8d0324a70d94 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6803,6 +6803,8 @@ in { pygeoip = callPackage ../development/python-modules/pygeoip { }; + pygeos = callPackage ../development/python-modules/pygeos { }; + pygetwindow = callPackage ../development/python-modules/pygetwindow { }; pygit2 = callPackage ../development/python-modules/pygit2 { }; From 4f22e7e994d80733592f3d28cac344148a9a3b70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Jan 2022 23:31:00 +0000 Subject: [PATCH 10/25] cargo-release: 0.19.0 -> 0.19.3 --- pkgs/tools/package-management/cargo-release/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 49864ad50840..92d9532b2283 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.19.0"; + version = "0.19.3"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-u1XXkenMIflbXACxOeeq7Mg5ubel4oFXpL/uy6McQf0="; + sha256 = "sha256-/lY6NQN1oYH+gNyYLXVoqHhikJxd1R0KbpZvuSemnwI="; }; - cargoSha256 = "sha256-7QOaSEaX2JXtTQQo3RXbMpZg6V2wzfoQbId9QOD9sCA="; + cargoSha256 = "sha256-iw4RPW4VwfsvDgaxphBIlSPM5IhCyVv07mrCpIPKaPI="; nativeBuildInputs = [ pkg-config ]; From 4861b5971b9bbe5ffd881b97bf6ec530121e52cf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 24 Jan 2022 13:23:22 +0100 Subject: [PATCH 11/25] ocamlPackages.ocamlbuild: rename name to pname&version --- pkgs/development/tools/ocaml/ocamlbuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index e3043d46ee5e..7f53ba9203d9 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib }: stdenv.mkDerivation rec { - name = "ocamlbuild-${version}"; + pname = "ocaml${ocaml.version}-ocamlbuild"; version = "0.14.0"; src = fetchFromGitHub { From 0383246382df1b521076a2b7a1c11a25da087493 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 23:15:31 +0100 Subject: [PATCH 12/25] gitless: relax pygit2 constraint and limit to Python 3 --- .../version-management/gitless/default.nix | 35 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index ed8cd551fca5..a72183472588 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -1,27 +1,42 @@ -{ fetchFromGitHub, python, lib }: +{ lib +, fetchFromGitHub +, python3 +}: -with python.pkgs; -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "gitless"; version = "0.8.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "gitless-vcs"; - repo = "gitless"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-xo5EWtP2aN8YzP8ro3bnxZwUGUp0PHD0g8hk+Y+gExE="; + hash = "sha256-xo5EWtP2aN8YzP8ro3bnxZwUGUp0PHD0g8hk+Y+gExE="; }; - propagatedBuildInputs = with pythonPackages; [ sh pygit2 clint ]; + propagatedBuildInputs = with python3.pkgs; [ + sh + pygit2 + clint + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pygit2==0.28.2" "pygit2>=0.28.2" + ''; doCheck = false; + pythonImportsCheck = [ + "gitless" + ]; + meta = with lib; { + description = "Version control system built on top of Git"; homepage = "https://gitless.com/"; - description = "A version control system built on top of Git"; - license = licenses.gpl2; + license = licenses.mit; + maintainers = with maintainers; [ cransom ]; platforms = platforms.all; - maintainers = [ maintainers.cransom ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de4423285068..79ab433991b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1781,7 +1781,7 @@ with pkgs; github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite; - gitless = callPackage ../applications/version-management/gitless { python = python3; }; + gitless = callPackage ../applications/version-management/gitless { }; gistyc = with python3Packages; toPythonApplication gistyc; From 97f90da9fa19c0788a31b2fe46788b1818706604 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 25 Jan 2022 03:18:54 +0100 Subject: [PATCH 13/25] mpd: 0.23.4 -> 0.23.5 --- pkgs/servers/mpd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 0833ede1bb46..9eff996f78c3 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -13,7 +13,7 @@ # Outputs , alsa-lib, libjack2, libpulseaudio, libshout, pipewire # Misc -, icu, sqlite, avahi, dbus, pcre, libgcrypt, expat +, icu, sqlite, avahi, dbus, pcre2, libgcrypt, expat # Services , yajl # Client support @@ -79,7 +79,7 @@ let dbus = [ dbus ]; expat = [ expat ]; icu = [ icu ]; - pcre = [ pcre ]; + pcre = [ pcre2 ]; sqlite = [ sqlite ]; syslog = [ ]; systemd = [ systemd ]; @@ -116,13 +116,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.4"; + version = "0.23.5"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-siMFLV1fKdRt8To6AhLXmAAsgqZCA/bbvmlhbb6hLic="; + sha256 = "sha256-zsxh/rUJtcuke0zYBrh225Qd6RKo1SiFDbMmROdkyjI="; }; buildInputs = [ From 32f16772c5502aee74563e0a5096b66c15393494 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jan 2022 17:01:11 +0100 Subject: [PATCH 14/25] python3Packages.siosocks: disable blocking tests --- pkgs/development/python-modules/siosocks/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/siosocks/default.nix b/pkgs/development/python-modules/siosocks/default.nix index 2a4803ef8bd2..4292c167782a 100644 --- a/pkgs/development/python-modules/siosocks/default.nix +++ b/pkgs/development/python-modules/siosocks/default.nix @@ -30,6 +30,13 @@ buildPythonPackage rec { pytest-trio ]; + disabledTestPaths = [ + # Timeout on Hydra + "tests/test_trio.py" + "tests/test_sansio.py" + "tests/test_socketserver.py" + ]; + pythonImportsCheck = [ "siosocks" ]; From eda25592175c47d37f45a051fcac7168e6aa20f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jan 2022 17:01:33 +0100 Subject: [PATCH 15/25] python3Packages.aioftp: remove pytest-cov --- pkgs/development/python-modules/aioftp/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index e9988249e270..fab3a32a6a0e 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchPypi , pytest-asyncio -, pytest-cov , pytestCheckHook , pythonOlder , siosocks @@ -29,7 +28,6 @@ buildPythonPackage rec { checkInputs = [ async-timeout pytest-asyncio - pytest-cov pytestCheckHook trustme ]; From ec07330c8bad2c40d8475386e5790739eea74405 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jan 2022 17:43:31 +0100 Subject: [PATCH 16/25] python3Packages.sunpy: disable failing tests --- .../python-modules/sunpy/default.nix | 58 ++++++++++++------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index e2838ad526e8..4e61f8665ba6 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -32,6 +32,8 @@ buildPythonPackage rec { pname = "sunpy"; version = "3.1.3"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -40,36 +42,36 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools-scm astropy-extension-helpers + setuptools-scm ]; propagatedBuildInputs = [ - numpy - scipy - matplotlib - pandas + asdf astropy astropy-helpers - h5netcdf - parfive - sqlalchemy - scikitimage - towncrier - glymur beautifulsoup4 drms + glymur + h5netcdf + matplotlib + numpy + pandas + parfive python-dateutil - zeep + scikitimage + scipy + sqlalchemy + towncrier tqdm - asdf + zeep ]; checkInputs = [ hypothesis - pytestCheckHook pytest-astropy pytest-mock + pytestCheckHook ]; # darwin has write permission issues @@ -81,11 +83,20 @@ buildPythonPackage rec { disabledTests = [ "rst" + "test_sunpy_warnings_logging" + "test_main_nonexisting_module" + "test_main_stdlib_module" ]; disabledTestPaths = [ "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/helioprojective-1.0.0.yaml" "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentric-1.0.0.yaml" + "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliographic_carrington-*.yaml" + "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/geocentricearthequatorial-1.0.0.yaml" + "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/geocentricsolarecliptic-1.0.0.yaml" + "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentricearthecliptic-1.0.0.yaml" + "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentricinertial-1.0.0.yaml" + "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/map/generic_map-1.0.0.yaml" # requires mpl-animators package "sunpy/map/tests/test_compositemap.py" "sunpy/map/tests/test_mapbase.py" @@ -100,17 +111,24 @@ buildPythonPackage rec { "sunpy/visualization/colormaps/tests/test_cm.py" # requires cdflib package "sunpy/timeseries/tests/test_timeseries_factory.py" + # distutils is deprecated + "sunpy/io/setup_package.py" ]; pytestFlagsArray = [ - "--deselect=sunpy/tests/tests/test_self_test.py::test_main_nonexisting_module" - "--deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module" + "-W" + "ignore::DeprecationWarning" ]; + # Wants a configuration file + # pythonImportsCheck = [ + # "sunpy" + # ]; + meta = with lib; { - description = "SunPy: Python for Solar Physics"; + description = "Python for Solar Physics"; homepage = "https://sunpy.org"; license = licenses.bsd2; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 8ef0fd5ff14faf645bd00e27004489189f7d9291 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jan 2022 16:36:39 +0100 Subject: [PATCH 17/25] checkov: 2.0.753 -> 2.0.762 --- pkgs/development/tools/analysis/checkov/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index ed20d8e0ef8a..ab6cbbeba5c9 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,13 +22,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.753"; + version = "2.0.762"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-6CBe4BuztW3EoLWqGmuRmWfVfb1gP5cPEzYnyBtPEsE="; + hash = "sha256-7YINKTvEAAOGoGkc4t2YwuMBF4rvOxRD2XhJxJBWvis="; }; nativeBuildInputs = with py.pkgs; [ @@ -81,7 +81,8 @@ buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0" + --replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0" \ + --replace "prettytable>=3.0.0" "prettytable" ''; preCheck = '' From edf59fe71ae49be70b9ceefa6051e9055ae7cb7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jan 2022 18:11:51 +0100 Subject: [PATCH 18/25] python3Packages.qcs-api-client: 0.20.9 -> 0.20.10 --- pkgs/development/python-modules/qcs-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 49c1c993e32e..41412e16f8fc 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.20.9"; + version = "0.20.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "v${version}"; - hash = "sha256-bQ+5TZzjxGnNRsENEW/sN7sF6SOcgWl4MFtLekD0D+8="; + hash = "sha256-pBC8pFrk6iNYPS3/LKaVo+ds2okN56bxzvffEfs6SrU="; }; nativeBuildInputs = [ From d4061dcc6e429510c3ac4e1fc3da34325eed8096 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 25 Jan 2022 18:29:16 +0100 Subject: [PATCH 19/25] nixos/home-assistant: allow capset with components using ping command --- nixos/modules/services/misc/home-assistant.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 2de25d87ed39..ac4c0222aac3 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -278,6 +278,11 @@ in { "bluetooth_tracker" "bluetooth_le_tracker" ]; + componentsUsingPing = [ + # Components that require the capset syscall for the ping wrapper + "ping" + "wake_on_lan" + ]; componentsUsingSerialDevices = [ # Components that require access to serial devices (/dev/tty*) # List generated from home-assistant documentation: @@ -382,6 +387,8 @@ in { SystemCallFilter = [ "@system-service" "~@privileged" + ] ++ optionals (any useComponent componentsUsingPing) [ + "capset" ]; UMask = "0077"; }; From d9ad2b40f14cf5c8e668e7efb51de5c4a987a371 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 25 Jan 2022 18:30:43 +0100 Subject: [PATCH 20/25] nixos/tests/home-assistant: test ping via wake_on_lan component Let the home-assistant instance linger around for 30s so it can run regular jobs and trigger more code paths that could result in errors. --- nixos/tests/home-assistant.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 1ab5755863f7..5b1c07c92da3 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -49,6 +49,12 @@ in { payload_on = "let_there_be_light"; payload_off = "off"; }]; + wake_on_lan = {}; + switch = [{ + platform = "wake_on_lan"; + mac = "00:11:22:33:44:55"; + host = "127.0.0.1"; + }]; # tests component-based capability assignment (CAP_NET_BIND_SERVICE) emulated_hue = { host_ip = "127.0.0.1"; @@ -99,6 +105,10 @@ in { print("\n### home-assistant.log ###\n") print(output_log + "\n") + # wait for home-assistant to fully boot + hass.sleep(30) + hass.wait_for_unit("home-assistant.service") + with subtest("Check that no errors were logged"): assert "ERROR" not in output_log From 9bdb1f9287581a5b7fe48f4d22c26f4a14678acc Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 25 Jan 2022 12:14:05 -0700 Subject: [PATCH 21/25] matrix-synapse: 1.50.2 -> 1.51.0 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 68f6150496ce..b94257e6d5e2 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.50.2"; + version = "1.51.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dy5VCrrmZjWAAkcyfCzUaPLDGSyA0zlP6n8vhS0V8N0="; + sha256 = "sha256-qhwFRveFCwflQmVCwzThC8sP+YCqckgCaXAc3IRms0g="; }; buildInputs = [ openssl ]; From e2b54ce4497e393412d83e1bffbbc456bb19b1bd Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 12 Jan 2022 10:31:30 +0100 Subject: [PATCH 22/25] python3Packages.pywlroots: 0.14.12 -> 0.15.3 --- .../python-modules/pywlroots/default.nix | 13 +++++++--- .../python-modules/pywlroots/xwayland.patch | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +-- 3 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/python-modules/pywlroots/xwayland.patch diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 901161d634fe..a1f466cfe67a 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -12,21 +12,27 @@ , wayland , pywayland , xkbcommon +, xorg , pytestCheckHook }: buildPythonPackage rec { pname = "pywlroots"; - version = "0.14.12"; + version = "0.15.3"; src = fetchPypi { inherit pname version; - sha256 = "80v1kuiYL3OdtDVJj0EvgrO9x1eN8xxUyRuI4Wb4giI="; + sha256 = "sCHeiD6KugHZLtxcVcLggdHC1gqCxStuHy1065TbGiY="; }; + # The XWayland detection uses some hard-coded FHS paths. Since we + # know wlroots was built with xwayland support, replace its + # detection with `return True`. + patches = [ ./xwayland.patch ]; + nativeBuildInputs = [ pkg-config ]; propagatedNativeBuildInputs = [ cffi ]; - buildInputs = [ libinput libxkbcommon pixman udev wayland wlroots ]; + buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots ]; propagatedBuildInputs = [ cffi pywayland xkbcommon ]; checkInputs = [ pytestCheckHook ]; @@ -40,6 +46,7 @@ buildPythonPackage rec { homepage = "https://github.com/flacjacket/pywlroots"; description = "Python bindings to wlroots using cffi"; license = licenses.ncsa; + platforms = platforms.linux; maintainers = with maintainers; [ chvp ]; }; } diff --git a/pkgs/development/python-modules/pywlroots/xwayland.patch b/pkgs/development/python-modules/pywlroots/xwayland.patch new file mode 100644 index 000000000000..f3aaecca2642 --- /dev/null +++ b/pkgs/development/python-modules/pywlroots/xwayland.patch @@ -0,0 +1,25 @@ +diff --git a/wlroots/ffi_build.py b/wlroots/ffi_build.py +index bb07ff8..f19efe3 100644 +--- a/wlroots/ffi_build.py ++++ b/wlroots/ffi_build.py +@@ -55,19 +55,7 @@ def has_xwayland() -> bool: + Check for XWayland headers. If present, wlroots was built with XWayland support, so + pywlroots can be too. + """ +- try: +- FFI().verify( +- "#include ", +- define_macros=[("WLR_USE_UNSTABLE", 1)], +- include_dirs=["/usr/include/pixman-1", include_dir.as_posix()], +- ) +- return True +- except VerificationError: +- print("If XWayland support is not required, ignore the above error message.") +- print( +- "If support is required, ensure wlroots was built with -Dxwayland=enabled." +- ) +- return False ++ return True + + + # backend.h diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5244fb8caf10..55b0ad935869 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8278,9 +8278,7 @@ in { pywizlight = callPackage ../development/python-modules/pywizlight { }; - pywlroots = callPackage ../development/python-modules/pywlroots { - wlroots = pkgs.wlroots_0_14; - }; + pywlroots = callPackage ../development/python-modules/pywlroots { }; pyxattr = callPackage ../development/python-modules/pyxattr { }; From baf9192e65084c82f5909f8a053ff629a891fc7e Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 24 Jan 2022 21:09:29 +0100 Subject: [PATCH 23/25] qtile: 0.19.0 -> 0.20.0 --- pkgs/applications/window-managers/qtile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 2bd92ee6cf66..a505c852a95c 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -3,13 +3,13 @@ let unwrapped = python3Packages.buildPythonPackage rec { pname = "qtile"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "BLHGVPMQd8O4h5TVx/F/klzSra+FZYogp22V6Yq04T0="; + sha256 = "TRmul3t//izJRdViTvxFz29JZeGYsWc7WsJjagQ35nw="; }; postPatch = '' From cf710999c63893957b1d1e01f1062af9a2c6b181 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jan 2022 22:02:29 +0100 Subject: [PATCH 24/25] python3Packages.hahomematic: 0.21.2 -> 0.27.0 --- pkgs/development/python-modules/hahomematic/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index c20ff49b5cb0..58f3224e70a2 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -5,6 +5,7 @@ , pydevccu , pytest-aiohttp , pytestCheckHook +, python-slugify , pythonOlder , voluptuous , websocket-client @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.21.2"; + version = "0.27.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,11 +23,12 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-oD4HXdzlQJZ/+ceF9zfmGs6S8DEVoxzLv5h/IURJnOY="; + sha256 = "sha256-RPUj0We1nsKgAl1DTpa3pCD7gMm590N00+xwOVFIOaw="; }; propagatedBuildInputs = [ aiohttp + python-slugify voluptuous ]; From be3e6db3226e39842c2bff45a1cf220f0187d374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 Jan 2022 19:15:43 +0000 Subject: [PATCH 25/25] libdeltachat: 1.71.0 -> 1.72.0 https://github.com/deltachat/deltachat-core-rust/blob/1.72.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 0777a85be37a..48c20c8b7ca5 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.71.0"; + version = "1.72.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-zpjg7R6/fmDfvFTsooak3B+gwbCadwxiQfbKREqEXY8="; + hash = "sha256-/StX22pSQtfOYbBTFL7vh0Y0V038Ohyq+qoDECITD80="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-BHjb2mtB7b2KhQtdlLwDPg7plkS3uYku7AfxRExQhfs="; + hash = "sha256-Jwf95oTyGsOikVMKAg+EaDNY78VW+kECD+lhNePSKWE="; }; nativeBuildInputs = [