From 97e51c67d4af80063664f34663a5e3db92db4d75 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 31 Dec 2020 13:57:43 +0100 Subject: [PATCH 01/19] nixos/moinmoin: fix module by switching to eventlet worker The service was failing with: gunicorn[2192104]: [2020-12-31 13:35:28 +0000] [2192104] [ERROR] Exception in worker process gunicorn[2192104]: Traceback (most recent call last): gunicorn[2192104]: File "/nix/store/jmc14qf1sfnlhw27xyyj862ghkmdkj5a-python2.7-gunicorn-19.10.0/lib/python2.7/site-packages/gunicorn/arbiter.py", line 586, in spawn_worker gunicorn[2192104]: worker.init_process() gunicorn[2192104]: File "/nix/store/jmc14qf1sfnlhw27xyyj862ghkmdkj5a-python2.7-gunicorn-19.10.0/lib/python2.7/site-packages/gunicorn/workers/ggevent.py", line 196, in init_process gunicorn[2192104]: self.patch() gunicorn[2192104]: File "/nix/store/jmc14qf1sfnlhw27xyyj862ghkmdkj5a-python2.7-gunicorn-19.10.0/lib/python2.7/site-packages/gunicorn/workers/ggevent.py", line 65, in patch gunicorn[2192104]: monkey.patch_all(subprocess=True) gunicorn[2192104]: File "/nix/store/fysf67w3i8iv1hfvp536nl8jbzqyk1s7-python-2.7.18-env/lib/python2.7/site-packages/gevent/monkey.py", line 1160, in patch_all gunicorn[2192104]: from gevent import events gunicorn[2192104]: File "/nix/store/fysf67w3i8iv1hfvp536nl8jbzqyk1s7-python-2.7.18-env/lib/python2.7/site-packages/gevent/events.py", line 67, in gunicorn[2192104]: from zope.interface import Interface gunicorn[2192104]: ImportError: No module named zope.interface --- nixos/modules/services/web-apps/moinmoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/moinmoin.nix b/nixos/modules/services/web-apps/moinmoin.nix index 3a876f75f4a..7a54255a46e 100644 --- a/nixos/modules/services/web-apps/moinmoin.nix +++ b/nixos/modules/services/web-apps/moinmoin.nix @@ -211,7 +211,7 @@ in environment = let penv = python.buildEnv.override { # setuptools: https://github.com/benoitc/gunicorn/issues/1716 - extraLibs = [ python.pkgs.gevent python.pkgs.setuptools pkg ]; + extraLibs = [ python.pkgs.eventlet python.pkgs.setuptools pkg ]; }; in { PYTHONPATH = "${dataDir}/${wikiIdent}/config:${penv}/${python.sitePackages}"; @@ -233,7 +233,7 @@ in ExecStart = ''${python.pkgs.gunicorn}/bin/gunicorn moin_wsgi \ --name gunicorn-${wikiIdent} \ --workers ${toString cfg.gunicorn.workers} \ - --worker-class gevent \ + --worker-class eventlet \ --bind unix:/run/moin/${wikiIdent}/gunicorn.sock ''; From 26d70f3e17005a1ab7dfe9d443d211c4d374354a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Feb 2021 22:58:39 +0100 Subject: [PATCH 02/19] python3Packages.nbformat: 5.0.8 -> 5.1.2 --- pkgs/development/python-modules/nbformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 3bd119179a4..a3143780e1c 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.0.8"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "f545b22138865bfbcc6b1ffe89ed5a2b8e2dc5d4fe876f2ca60d8e6f702a30f8"; + sha256 = "sha256-HSI+ZKGL+nzfLbLpuoqBgxL8KgcB0ukQtY32aAk4WlY="; }; LC_ALL="en_US.utf8"; From 9adb251cd05d8caa4e38cf418807e22b7b9471d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Feb 2021 23:00:00 +0100 Subject: [PATCH 03/19] python3Packages.papermill: 2.2.2 -> 2.3.2 --- pkgs/development/python-modules/papermill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 56536de8446..0311e783d39 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.2.2"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1c452b1c5a9ab52b94c99d8b7705ae7173f6aa88a3d28a5d30cffba48a46f5b6"; + sha256 = "sha256-ptwZXypS9b7Y1CkszqOa8PMzgyS+r9VikPlhbJUDNiM="; }; propagatedBuildInputs = [ From 3c758629c790c2cf5703a7db377ba10d312504be Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Wed, 17 Feb 2021 23:07:22 -0500 Subject: [PATCH 04/19] swappy: 1.2.1 -> 1.3.0 --- pkgs/applications/misc/swappy/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix index bf1fdf63fed..58dede64894 100644 --- a/pkgs/applications/misc/swappy/default.nix +++ b/pkgs/applications/misc/swappy/default.nix @@ -6,25 +6,23 @@ , pango , gtk , pkg-config -, cmake , scdoc , libnotify -, gio-sharp , glib }: stdenv.mkDerivation rec { - name = "swappy-${version}"; - version = "1.2.1"; + pname = "swappy"; + version = "1.3.0"; src = fetchFromGitHub { owner = "jtheoof"; - repo = "swappy"; + repo = pname; rev = "v${version}"; - sha256 = "14ac2jmnak7avcz0jhqjm30vk7pv3gq5aq5rdyh84k8c613kkicf"; + sha256 = "1bm184fbzylymh4kr7n8gy9plsdxif8xahc1zmkgdg1a0kwgws2x"; }; - nativeBuildInputs = [ glib meson ninja pkg-config cmake scdoc ]; + nativeBuildInputs = [ glib meson ninja pkg-config scdoc ]; buildInputs = [ cairo pango gtk libnotify wayland glib ]; @@ -37,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/jtheoof/swappy"; - description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS "; + description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; From 10da30cddcd5c03530f98f00f9e64bf0301dc09d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 18 Feb 2021 07:40:36 +0000 Subject: [PATCH 05/19] flatpak-builder: 1.0.11 -> 1.0.12 --- pkgs/development/tools/flatpak-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index dd9282c6896..75aa8a00f00 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -46,13 +46,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; - version = "1.0.11"; + version = "1.0.12"; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "EYNLdrvSs8S/GCYy0jGsnP1+C988y1j7WzcLfczM1Ew="; + sha256 = "sha256-R4DBuOCDj/tk6WOb14AUF5ZP2BjHxtXpr8pNVRHe0sg="; }; nativeBuildInputs = [ From 9a73f86cadc7cfe86bab93f8a7fc9c0825506ab7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 18 Feb 2021 12:22:50 +0000 Subject: [PATCH 06/19] nix-direnv: 1.2.1 -> 1.2.3 --- pkgs/tools/misc/nix-direnv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index efacd87d9a4..6aaf8cc8a52 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-D31ORVdS8P1OkPShsfjEFLVCcv8Bff9OyexUKKHdguQ="; + sha256 = "sha256-a0OyIONKtVWh9g/FZ6H0JSRuA1U48HSOX53G9z/h7t8="; }; # Substitute instead of wrapping because the resulting file is From 5abd0ceeb537865c7cc2b5892a544f6dd4a7d553 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Thu, 18 Feb 2021 13:28:34 +0100 Subject: [PATCH 07/19] ncompress: 4.2.4.6 -> 5.0 --- pkgs/tools/compression/ncompress/default.nix | 4 ++-- pkgs/tools/compression/ncompress/makefile.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index 438e169d23c..9c2de6b96a6 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -1,7 +1,7 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ncompress-4.2.4.6"; + name = "ncompress-5.0"; builder = ./builder.sh; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; - sha256 = "0sw3c7h80v9pagfqfx16ws9w2y3yrajrdk54bgiwdm0b0q06lyzv"; + sha256 = "004r086c11sw9vg2j3srgxpz98w8pycjl33bk3pgqnd0s92igrn4"; }; meta = { diff --git a/pkgs/tools/compression/ncompress/makefile.patch b/pkgs/tools/compression/ncompress/makefile.patch index b61b1272f8b..8669d5dd5dc 100644 --- a/pkgs/tools/compression/ncompress/makefile.patch +++ b/pkgs/tools/compression/ncompress/makefile.patch @@ -5,8 +5,8 @@ diff -Naur ncompress-4.2.4.2.orig/Makefile.def ncompress-4.2.4.2/Makefile.def # -DDEF_ERRNO=1 Define error (not defined in errno.h). # -DMAXSEG_64K=1 -BITS=16 Support segment processsor like 80286. # --options= $(CFLAGS) $(CPPFLAGS) -DDIRENT=1 -DUSERMEM=800000 -DREGISTERS=3 -+options= $(CFLAGS) $(CPPFLAGS) -DDIRENT=1 -DUSERMEM=800000 -DREGISTERS=3 -DNOFUNCDEF=1 +-options= $(CFLAGS) $(CPPFLAGS) -DUSERMEM=800000 ++options= $(CFLAGS) $(CPPFLAGS) -DUSERMEM=800000 -DNOFUNCDEF=1 # libary options LBOPT= $(LDFLAGS) From 4747d9ea9041b34999755b55343a811c690648b9 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Thu, 18 Feb 2021 13:32:06 +0100 Subject: [PATCH 08/19] ncompress: patch is no longer necessary since 4.2.4.6 --- pkgs/tools/compression/ncompress/makefile.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 pkgs/tools/compression/ncompress/makefile.patch diff --git a/pkgs/tools/compression/ncompress/makefile.patch b/pkgs/tools/compression/ncompress/makefile.patch deleted file mode 100644 index 8669d5dd5dc..00000000000 --- a/pkgs/tools/compression/ncompress/makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ncompress-4.2.4.2.orig/Makefile.def ncompress-4.2.4.2/Makefile.def ---- ncompress-4.2.4.2.orig/Makefile.def 2007-09-06 22:28:42.000000000 -0500 -+++ ncompress-4.2.4.2/Makefile.def 2009-08-18 12:30:53.000000000 -0500 -@@ -31,7 +33,7 @@ - # -DDEF_ERRNO=1 Define error (not defined in errno.h). - # -DMAXSEG_64K=1 -BITS=16 Support segment processsor like 80286. - # --options= $(CFLAGS) $(CPPFLAGS) -DUSERMEM=800000 -+options= $(CFLAGS) $(CPPFLAGS) -DUSERMEM=800000 -DNOFUNCDEF=1 - - # libary options - LBOPT= $(LDFLAGS) From 9e8284afd5b4615359dbe12416f029b69d2aa465 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Thu, 18 Feb 2021 13:35:13 +0100 Subject: [PATCH 09/19] remove patch in default.nix as well --- pkgs/tools/compression/ncompress/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index 9c2de6b96a6..617bb07dfab 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -5,8 +5,6 @@ stdenv.mkDerivation rec { builder = ./builder.sh; - patches = [ ./makefile.patch ]; - src = fetchurl { url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; sha256 = "004r086c11sw9vg2j3srgxpz98w8pycjl33bk3pgqnd0s92igrn4"; From 9d9921e3da4bf13d855a38d038320b62a5f654e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 18 Feb 2021 12:36:35 +0000 Subject: [PATCH 10/19] nushell: 0.26.0 -> 0.27.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index a0a070b9266..804fea0102f 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-v0u04xY4iEbOTeaPKmbHImNTzEgdqf1wZWV0hKOV6Vg="; + sha256 = "sha256-OesIOL5jn5a3yvOSayMXmZQK9XpYxspOvDvZ6OY5JD4="; }; - cargoSha256 = "sha256-0Ncjy6vZqiMNB+aRzf255tsIdrnpG0a4Xoid+mAAvUk="; + cargoSha256 = "sha256-YFtpg5IXhWJmBtX79MIBme4SKOoq+13UakvAJnTzJFo="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; From 83aadda3b55d76d1c6cfc66ca3db93b55bed63d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 18 Feb 2021 13:58:44 +0100 Subject: [PATCH 11/19] moinmoin: 1.9.10 -> 1.9.11 Fixes CVE-2020-25074 and CVE-2020-15275: https://github.com/moinwiki/moin-1.9/blob/1.9.11/docs/CHANGES#L13 --- pkgs/development/python-modules/moinmoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix index cc00643b71a..b4ecf28724a 100644 --- a/pkgs/development/python-modules/moinmoin/default.nix +++ b/pkgs/development/python-modules/moinmoin/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "moinmoin"; - version = "1.9.10"; + version = "1.9.11"; # SyntaxError in setup.py disabled = isPy3k; src = fetchurl { url = "http://static.moinmo.in/files/moin-${version}.tar.gz"; - sha256 = "0g05lnl1s8v61phi3z1g3b6lfj4g98grj9kw8nyjl246x0c489ja"; + sha256 = "sha256-Ar4x1V851P4MYlPfi0ngG3bQlWNMvRtW0YX2bh4MPPU="; }; patches = [ From b78942f0408fedf527e287cb758e9651153ce837 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 18 Feb 2021 15:07:26 +0100 Subject: [PATCH 12/19] tdesktop: 2.5.8 -> 2.5.9 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- .../instant-messengers/telegram/tdesktop/tg_owt.nix | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 693a01f5d89..7cbcc2392c6 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -22,12 +22,12 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "2.5.8"; + version = "2.5.9"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0zj1g24fi4m84p6zj9yk55v8sbhn0jdpdhp33y12d2msz0qwp2cw"; + sha256 = "1311dab9cil8hl1qlh01ynrczyjbldcsq1l6ibh818wb5lsgvvl2"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index b5a6579db57..7efac01c55a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm , libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf +, xorg, libXtst }: let - rev = "be23804afce3bb2e80a1d57a7c1318c71b82b7de"; - sha256 = "0avdxkig8z1ainzyxkm9vmlvkyqbjalwb4h9s9kcail82mnldnhc"; + rev = "a19877363082da634a3c851a4698376504d2eaee"; + sha256 = "03m6fkc3m2wbh821mr3ybsmd7sjllky44mizny96k4b249dkvzx7"; in stdenv.mkDerivation { pname = "tg_owt"; @@ -23,6 +24,7 @@ in stdenv.mkDerivation { buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf + xorg.libX11 libXtst ]; cmakeFlags = [ From 7b41fd7bffe63207a8a0701439a643974c031900 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 18 Feb 2021 15:33:25 +0100 Subject: [PATCH 13/19] signal-desktop: 1.39.6 -> 1.40.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 19e48bf88d6..03ef4abc2d0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.39.6"; # Please backport all updates to the stable channel. + version = "1.40.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "04fd81vc0dxk0b47crm5zacf4x79pdn483xicygnc1z6v7mnrmgk"; + sha256 = "1xd38a9mi23c4r873k37rzip68hfk3a4bk9j4j24v2kb3yvixrpp"; }; nativeBuildInputs = [ From 0972cacdbea723d18be210190bda56ccbecb87d4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 18 Feb 2021 15:44:52 +0100 Subject: [PATCH 14/19] vorta: 0.7.2 -> 0.7.3 ChangeLog: https://github.com/borgbase/vorta/releases/tag/v0.7.3 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index a1b5944a51e..690a25d6b4d 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "1amq0fz3xrnxplzd6ih2azx6b4k1w496kcr7f8agfp617f5rkwa5"; + sha256 = "sha256-nnnGqkT4sAunaT7GPysYQGeV34ZrRFaHK/gJRafvR3U="; }; postPatch = '' From c382780e9b853b7319d775625c8073966096f3a8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 18 Feb 2021 22:06:19 +0800 Subject: [PATCH 15/19] nixos/bluetooth: fix more stupidity on my part Say this 10 times so I don't forget: - just because something has been tested and confirmed working, doesn't mean that a trivial change can go in without testing simply because it looks OK. test, test, test. - just because something has been tested and confirmed working, doesn't mean that a trivial change can go in without testing simply because it looks OK. test, test, test. - just because something has been tested and confirmed working, doesn't mean that a trivial change can go in without testing simply because it looks OK. test, test, test. - just because something has been tested and confirmed working, doesn't mean that a trivial change can go in without testing simply because it looks OK. test, test, test. - just because something has been tested and confirmed working, doesn't mean that a trivial change can go in without testing simply because it looks OK. test, test, test. - just because something has been tested and confirmed working, doesn't mean that a trivial change can go in without testing simply because it looks OK. test, test, test. - just because something has been tested and confirmed working, doesn't mean that a trivial change can go in without testing simply because it looks OK. test, test, test. - just because something has been tested and confirmed working, doesn't mean that a trivial change can go in without testing simply because it looks OK. test, test, test. - just because something has been tested and confirmed working, doesn't mean that a trivial change can go in without testing simply because it looks OK. test, test, test. - just because something has been tested and confirmed working, doesn't mean that a trivial change can go in without testing simply because it looks OK. test, test, test. I'm sorry guys. --- nixos/modules/services/hardware/bluetooth.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index da36ae68b3f..08ad90126b1 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -104,7 +104,7 @@ in # will in fact load the configuration file at /etc/bluetooth/main.conf # so force it here to avoid any ambiguity and things suddenly breaking # if/when the bluez derivation is changed. - args = [ "-f /etc/bluetooth/main.conf" ] + args = [ "-f" "/etc/bluetooth/main.conf" ] ++ optional hasDisabledPlugins "--noplugin=${concatStringsSep "," cfg.disabledPlugins}"; in From 127ada735dd6133d5ffa339293c3bdc798eaf7c0 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 18 Feb 2021 15:59:34 +0100 Subject: [PATCH 16/19] fluxcd: 0.8.0 -> 0.8.1 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index a45f3553b92..767ac70c56f 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxcd"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "1k7zcn8l60qfgiixkjcmp94w87w88n475mmhf58vl5pfz21p9vky"; + sha256 = "1xxw6zk0lk4is220lydcx57mrsw6pk2rirsp4wjzvawjlv7wdv25"; }; - vendorSha256 = "16yixz47zrzjkb2k4n03zfivpc2cavcrrv4fz8s5a4xzfrcp4nvx"; + vendorSha256 = "0acxbmc4j1fcdja0s9g04f0kd34x54yfqismibfi40m2gzbg6ljr"; nativeBuildInputs = [ installShellFiles ]; From f16fcc0ba55c6d7df4244d29a80d1a1f37d519bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Feb 2021 13:05:20 +0100 Subject: [PATCH 17/19] python3Packages.librouteros: init at 3.1.0 --- .../python-modules/librouteros/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/librouteros/default.nix diff --git a/pkgs/development/python-modules/librouteros/default.nix b/pkgs/development/python-modules/librouteros/default.nix new file mode 100644 index 00000000000..32c9889681c --- /dev/null +++ b/pkgs/development/python-modules/librouteros/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, pytestCheckHook +, pytest-xdist +}: + +buildPythonPackage rec { + pname = "librouteros"; + version = "3.1.0"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "luqasz"; + repo = pname; + rev = version; + sha256 = "1skjwnqa3vcpq9gzgpw93wdmisq15fp0q07kzyq3fgx4yg7b6sql"; + }; + + checkInputs = [ + pytest-xdist + pytestCheckHook + ]; + + disabledTests = [ + # Disable tests which require QEMU to run + "test_login" + "test_long_word" + "test_query" + "test_add_then_remove" + "test_add_then_update" + "test_generator_ditch" + ]; + + pythonImportsCheck = [ "librouteros" ]; + + meta = with lib; { + description = "Python implementation of the MikroTik RouterOS API"; + homepage = "https://librouteros.readthedocs.io/"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 45dbfbb0117..f138554c839 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3704,6 +3704,8 @@ in { librosa = callPackage ../development/python-modules/librosa { }; + librouteros = callPackage ../development/python-modules/librouteros { }; + libsass = (callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; }); libsavitar = callPackage ../development/python-modules/libsavitar { }; From db9a9f95aa55205f3dfe6b64b25760b379ffdcd1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Feb 2021 13:06:01 +0100 Subject: [PATCH 18/19] 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 f7b945313b1..68d42d161e5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -496,7 +496,7 @@ "microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora - "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros + "mikrotik" = ps: with ps; [ librouteros ]; "mill" = ps: with ps; [ ]; # missing inputs: millheater "min_max" = ps: with ps; [ ]; "minecraft_server" = ps: with ps; [ aiodns getmac ]; # missing inputs: mcstatus From a1aec6be0b7fc5ba9ff296557c28b4f2224be76d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 18 Feb 2021 18:17:51 +0100 Subject: [PATCH 19/19] cargo-c: 0.7.2 -> 0.7.3 --- pkgs/development/tools/rust/cargo-c/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index c468ad0f4e1..15ec7518e8a 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.7.2"; + version = "0.7.3"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "1rgwj3kf31n4rz0b7jw67wsgyapdycfic7plm5gm4n9rlslp5ax5"; + sha256 = "0df87kx8dfq2fvz00k6advwg2iw9djkflhrbsjw0xhac78623c56"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "0jnawnkf4m7cqcq9iahnxa53l61a5riax400n96vxrqf3fa752c6"; + sha256 = "18l54jf9q5xb908bwyyil1sblxxa9mkrgr33gm0r6nxicw6kf8in"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0svmhq64aqw1vidq8jmw7w4xhhnyp04vcs9yzhjyz25c4cn9grsf"; + cargoSha256 = "0z7sjfnnmld5bijn14c7v7arh0vzqmbkjk7bf9ky67acq2r2cv2f"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]