From 6816a0ef8d64162400e040cf636e4809d09136f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jun 2021 17:10:50 +0000 Subject: [PATCH 01/61] expenses: 0.2.1 -> 0.2.2 --- pkgs/applications/misc/expenses/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix index 63f942c2c593..cd40b381cb74 100644 --- a/pkgs/applications/misc/expenses/default.nix +++ b/pkgs/applications/misc/expenses/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "expenses"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "expenses"; rev = "v${version}"; - sha256 = "11wxaqbnrrg0rykx5905chi6rhmai1nqggdbhh6hiappr5rksl0j"; + sha256 = "sha256-CaIbLtP7ziv9UBQE+QsNnqX65OV+6GIvkLwKm1G++iY="; }; - vendorSha256 = "1kwj63wl4kb16zl3lmi9bzj1az7vi453asdy52na0mjx4ymmjyk1"; + vendorSha256 = "sha256-NWTFxF4QCH1q1xx+hmVmpvDeOlqH5Ai2+0ParE5px9M="; - # package does not contain any tests as of v0.2.1 + # package does not contain any tests as of v0.2.2 doCheck = false; buildInputs = [ sqlite ]; From ce036f6b0ece39a11d9258028a43420858fed6c1 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 28 Jun 2021 00:15:14 +0300 Subject: [PATCH 02/61] =?UTF-8?q?sfm:=200.1=20=E2=86=92=200.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/sfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sfm/default.nix b/pkgs/applications/misc/sfm/default.nix index 3bbcc939d2fb..4f17fa879500 100644 --- a/pkgs/applications/misc/sfm/default.nix +++ b/pkgs/applications/misc/sfm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sfm"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "afify"; repo = pname; rev = "v${version}"; - hash = "sha256-i4WzYaJKityIt+LPWCbd6UsPBaYoaS397l5BInOXQQA="; + hash = "sha256-DwXKrSqcebNI5N9REXyMV16W2kr72IH9+sKSVehc5zw="; }; configFile = lib.optionalString (conf!=null) (lib.writeText "config.def.h" conf); From 89d27238203125dc5bf6072af6f09edb3379a9c6 Mon Sep 17 00:00:00 2001 From: kat witch Date: Sun, 27 Jun 2021 22:17:15 +0100 Subject: [PATCH 03/61] nixos/fvwm: gestures -> enableGestures as of #118256 --- nixos/modules/services/x11/window-managers/fvwm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/window-managers/fvwm.nix b/nixos/modules/services/x11/window-managers/fvwm.nix index 9a51b9cd6602..e283886ecc40 100644 --- a/nixos/modules/services/x11/window-managers/fvwm.nix +++ b/nixos/modules/services/x11/window-managers/fvwm.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.xserver.windowManager.fvwm; - fvwm = pkgs.fvwm.override { gestures = cfg.gestures; }; + fvwm = pkgs.fvwm.override { enableGestures = cfg.gestures; }; in { From 1f4e3da9d5f491b40d4a10ed12392c7172b042ea Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 28 Jun 2021 09:49:56 -0700 Subject: [PATCH 04/61] python3Packages.matrix-nio: 0.18.1 -> 0.18.3 --- pkgs/development/python-modules/matrix-nio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 4fad524bfa73..d16260dd57eb 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.18.1"; + version = "0.18.3"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "QHNirglqSxGMmbST96LUp9MHoGj0yAwLoTRlsbMqwaM="; + sha256 = "1sjdqzlk8vgv0748ayhnadw1bip3i4bfga4knb94cfkd3s4rgb39"; }; postPatch = '' From ab1567e8121dfcdb4f7a395b39a3a345f41c7474 Mon Sep 17 00:00:00 2001 From: Alexandru Scvortov Date: Mon, 28 Jun 2021 20:33:17 +0100 Subject: [PATCH 05/61] kubernetes: fix conntrack-tools package name, missing dir, and tests --- nixos/modules/services/cluster/kubernetes/pki.nix | 1 + nixos/modules/services/cluster/kubernetes/proxy.nix | 2 +- nixos/tests/kubernetes/base.nix | 9 ++++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index 8de6a3ba0d80..d9311d3e3a04 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -189,6 +189,7 @@ in # manually paste it in place. Just symlink. # otherwise, create the target file, ready for users to insert the token + mkdir -p $(dirname ${certmgrAPITokenPath}) if [ -f "${cfsslAPITokenPath}" ]; then ln -fs "${cfsslAPITokenPath}" "${certmgrAPITokenPath}" else diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix index 7aa449f9aa21..42729f54643b 100644 --- a/nixos/modules/services/cluster/kubernetes/proxy.nix +++ b/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -59,7 +59,7 @@ in description = "Kubernetes Proxy Service"; wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; - path = with pkgs; [ iptables conntrack_tools ]; + path = with pkgs; [ iptables conntrack-tools ]; serviceConfig = { Slice = "kubernetes.slice"; ExecStart = ''${top.package}/bin/kube-proxy \ diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index 8cfac10b6dc4..1f23ca55fb23 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -40,7 +40,7 @@ let allowedTCPPorts = [ 10250 # kubelet ]; - trustedInterfaces = ["docker0"]; + trustedInterfaces = ["mynet"]; extraCommands = concatMapStrings (node: '' iptables -A INPUT -s ${node.config.networking.primaryIPAddress} -j ACCEPT @@ -61,6 +61,13 @@ let advertiseAddress = master.ip; }; masterAddress = "${masterName}.${config.networking.domain}"; + # workaround for: + # https://github.com/kubernetes/kubernetes/issues/102676 + # (workaround from) https://github.com/kubernetes/kubernetes/issues/95488 + kubelet.extraOpts = ''\ + --cgroups-per-qos=false \ + --enforce-node-allocatable="" \ + ''; }; } (optionalAttrs (any (role: role == "master") machine.roles) { From bfe0f44b28b69ed0bc590c20f34c7a63af05723d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jun 2021 20:25:07 +0000 Subject: [PATCH 06/61] fish: 3.2.2 -> 3.3.0 --- pkgs/shells/fish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index a5754290426d..23edf2068175 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -134,7 +134,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -144,7 +144,7 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "WUTaGoiT0RsIKKT9kTbuF0VJ2v+z0K392JF4Vv5rQAk="; + sha256 = "sha256-pCFeTKsqWxAbC4hDcgvaPH65jooU3KCVC47xfpQoL6o="; }; # Fix FHS paths in tests From 8c8b704c79b7cb4fc533a8d0004804a9e4136cdd Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Mon, 28 Jun 2021 16:24:52 -0500 Subject: [PATCH 07/61] openjdk: 11.0.10+11 -> 11.0.11+9 fixes #128407 --- pkgs/development/compilers/openjdk/11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index d7aaf2dcb55e..bf85fd353350 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -11,7 +11,7 @@ let major = "11"; minor = "0"; - update = "10"; + update = "11"; build = "9"; openjdk = stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ let owner = "openjdk"; repo = "jdk${major}u"; rev = "jdk-${version}"; - sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw"; + sha256 = "0jncsj424340xjfwv6sx5hy9sas80qa3ymkx0ng3by3z01y5rgfx"; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; From 7262a1e04640e20db991c115e20f4aaa3cb9bbd3 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Tue, 29 Jun 2021 08:43:02 +0200 Subject: [PATCH 08/61] protoc-gen-go: 1.27.0 -> 1.27.1 --- pkgs/development/tools/protoc-gen-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix index 063da92a6ad3..79f97ddd745c 100644 --- a/pkgs/development/tools/protoc-gen-go/default.nix +++ b/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - sha256 = "sha256-1L0GYXrtTYkk5eLXkfVxzbZMZKgyzSpkDaI8itb6NnA="; + sha256 = "sha256-wkUvMsoJP38KMD5b3Fz65R1cnpeTtDcVqgE7tNlZXys="; }; vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y="; From 9125a1f063c0bc3bfcefd2125377123cffc1a0b3 Mon Sep 17 00:00:00 2001 From: Daniel Ebbert Date: Tue, 29 Jun 2021 08:50:50 +0200 Subject: [PATCH 09/61] owncloud-client: 2.6.3.14058 -> 2.8.2.4246 --- .../networking/owncloud-client/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 761d0e6b2440..34ab19f6e27a 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,16 +1,16 @@ -{ lib, fetchurl, mkDerivation, cmake, pkg-config, qtbase, qtkeychain, sqlite, libsecret }: +{ lib, fetchurl, mkDerivation, cmake, extra-cmake-modules, pkg-config, qtbase, qtkeychain, sqlite, libsecret }: mkDerivation rec { pname = "owncloud-client"; - version = "2.6.3.14058"; + version = "2.8.2.4246"; src = fetchurl { - url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "1xcklhvbyg34clm9as2rjnjfwxpwq77lmdxj6qc0w7q43viqvlz3"; + url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz"; + sha256 = "0cc2e5154a1349bd21941ac3c32e8621778a9ff150730a19de2710e22d32fc43"; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ qtbase qtkeychain sqlite ]; + nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; + buildInputs = [ qtbase qtkeychain sqlite libsecret ]; qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" From 007b856b9bfce67b48f4ec75a22b9fad48a42c6a Mon Sep 17 00:00:00 2001 From: diffumist Date: Tue, 29 Jun 2021 14:56:51 +0800 Subject: [PATCH 10/61] maintainer-list: update diffumist email --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7a5c9fcbd7f1..32a8c592d285 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2562,7 +2562,7 @@ name = "Diego Lelis"; }; diffumist = { - email = "diffumist@gmail.com"; + email = "git@diffumist.me"; github = "diffumist"; githubId = 32810399; name = "Diffumist"; From 1eb70b952cd324e98021e3109b1710837129579b Mon Sep 17 00:00:00 2001 From: diffumist Date: Tue, 29 Jun 2021 15:04:36 +0800 Subject: [PATCH 11/61] materia-kde-theme: 20210612 -> 20210624 --- pkgs/data/themes/materia-kde/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/materia-kde/default.nix b/pkgs/data/themes/materia-kde/default.nix index bdadebbf60d5..bf3b56ae6666 100644 --- a/pkgs/data/themes/materia-kde/default.nix +++ b/pkgs/data/themes/materia-kde/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "materia-kde-theme"; - version = "20210612"; + version = "20210624"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "materia-kde"; rev = version; - sha256 = "P76rLj7x4KpYb3hdHBSUM8X/RcxKoJl1THIXHdfPoAY="; + sha256 = "jmUJAWoQ/GVPNQOjlyZBg4rIIo+rhzr5imnCFAWOtrA="; }; makeFlags = [ "PREFIX=$(out)" ]; From 66ca618b336643e6d593c1dd1bf57ce653c6b5d5 Mon Sep 17 00:00:00 2001 From: mtreca Date: Tue, 29 Jun 2021 11:24:41 +0200 Subject: [PATCH 12/61] sumo: 1.8.0 -> 1.9.2 --- pkgs/applications/science/networking/sumo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index af252da04f81..9cdf576b9c68 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "sumo"; - version = "1.8.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "eclipse"; repo = "sumo"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1w9im1zz8xnkdwmv4v11kn1xcqm889268g1fw4y2s9f6shi41mxx"; + sha256 = "0zpd331vy1kfi4hfiszv3m8wl4m0wdfr3zzza200kkaakw5hjxhs"; fetchSubmodules = true; }; @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { jdk libGL libGLU - libX11 libjpeg libpng libtiff @@ -44,6 +43,7 @@ stdenv.mkDerivation rec { zlib python3 ] ++ (with xorg; [ + libX11 libXcursor libXext libXfixes From 6beaa711035c6fec6842d2f65320e9dc4f3b85c4 Mon Sep 17 00:00:00 2001 From: mtreca Date: Tue, 29 Jun 2021 11:25:14 +0200 Subject: [PATCH 13/61] maintainers: update mtreca --- maintainers/maintainer-list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b55f2d16bfc8..1226812e7edc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7102,10 +7102,10 @@ name = "Marko Poikonen"; }; mtreca = { - email = "maxime@treca.dev"; - name = "Maxime Tréca"; + email = "maxime.treca@gmail.com"; github = "mtreca"; githubId = 16440823; + name = "Maxime Tréca"; }; mtreskin = { email = "zerthurd@gmail.com"; From 577baa24a90660fcda9afe2843da7317441150ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 13:45:59 +0200 Subject: [PATCH 14/61] python3Packages.zwave-js-server-python: 0.26.1 -> 0.27.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 2976c5e24bad..778f9c448ed5 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.26.1"; + version = "0.27.0"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "1rh6wim5hr9lygvgria7lr6x61sdyrv3drrrirgv9p9gl3rxcj6m"; + sha256 = "sha256-ClZ9B20NphN5XewqEtHpUMNHuuVxs1RJBcxWi6TzT1Y="; }; propagatedBuildInputs = [ From 89400f1deca2cbe337e9abcf022e2b2a9683bed1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 29 Jun 2021 14:51:55 +0200 Subject: [PATCH 15/61] libint: restrict to x86_64-linux The build on aarch64-linux does proceed within 10h. --- pkgs/development/libraries/libint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix index 6df3d5a7eb3e..330fe8eac26b 100644 --- a/pkgs/development/libraries/libint/default.nix +++ b/pkgs/development/libraries/libint/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/evaleev/libint"; license = with licenses; [ lgpl3Only gpl3Only ]; maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From f71e493dea00c9fc9f585f1cc4ffdbf8c3862876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Jun 2021 14:01:05 +0200 Subject: [PATCH 16/61] python3Packages.smart-meter-texas: init at 0.4.3 --- .../smart-meter-texas/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/smart-meter-texas/default.nix diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix new file mode 100644 index 000000000000..abdcd7317bc5 --- /dev/null +++ b/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, python-dateutil +, tenacity +}: + +buildPythonPackage rec { + pname = "smart-meter-texas"; + version = "0.4.3"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "grahamwetzler"; + repo = "smart-meter-texas"; + rev = "v${version}"; + sha256 = "09n03wbyjh1b1gsiibf17fg86x7k1i1r1kpp94p7w1lcdbmn8v5c"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + propagatedBuildInputs = [ + aiohttp + python-dateutil + tenacity + ]; + + # no tests implemented + doCheck = false; + + meta = with lib; { + description = "Connect to and retrieve data from the unofficial Smart Meter Texas API"; + homepage = "https://github.com/grahamwetzler/smart-meter-texas"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efe5f4268780..ef6b5270294c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7984,6 +7984,8 @@ in { sly = callPackage ../development/python-modules/sly { }; + smart-meter-texas = callPackage ../development/python-modules/smart-meter-texas { }; + smart-open = callPackage ../development/python-modules/smart-open { }; smarthab = callPackage ../development/python-modules/smarthab { }; From 6d682ef306c48a3949688a2f9702d21e894a015f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Jun 2021 14:01:21 +0200 Subject: [PATCH 17/61] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index aa7ea6cd449a..605c2afefbcd 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -767,7 +767,7 @@ "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ pysma ]; "smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; - "smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas + "smart_meter_texas" = ps: with ps; [ smart-meter-texas ]; "smarthab" = ps: with ps; [ smarthab ]; "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa pysmartapp pysmartthings ]; "smarttub" = ps: with ps; [ python-smarttub ]; From 2e25f443c9ec15b9f034612709f188777411a884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Jun 2021 14:03:00 +0200 Subject: [PATCH 18/61] home-assistant: test smart_meter_texas component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1159cbbd57d8..d945dbee5b58 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -657,6 +657,7 @@ in with py.pkgs; buildPythonApplication rec { "sleepiq" "sma" "smappee" + "smart_meter_texas" "smarthab" "smartthings" "smarttub" From 87d1763f6cd01684ba89dbade4b0ce0cef87c26e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 29 Jun 2021 15:36:34 +0200 Subject: [PATCH 19/61] unity3d: update sha1 to sha256 --- pkgs/development/tools/unity3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 9333864c69b9..5470c45b138a 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; - sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv"; + sha256 = "10gppnqacs1qzahj077nkcgbfz2lryd0dxnfcmvyc64xpxnj9nlk"; }; nosuidLib = ./unity-nosuid.c; From 4ec0164ab19c7645f42db39597d6e908915b57fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Jun 2021 12:39:59 +0200 Subject: [PATCH 20/61] python3Packages.somfy-mylink-synergy: init at 1.0.6 --- .../somfy-mylink-synergy/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/somfy-mylink-synergy/default.nix diff --git a/pkgs/development/python-modules/somfy-mylink-synergy/default.nix b/pkgs/development/python-modules/somfy-mylink-synergy/default.nix new file mode 100644 index 000000000000..b0fa5948c0da --- /dev/null +++ b/pkgs/development/python-modules/somfy-mylink-synergy/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "somfy-mylink-synergy"; + version = "1.0.6"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "bendews"; + repo = "somfy-mylink-synergy"; + rev = "v${version}"; + sha256 = "1aa178b5lxdzfa4z7sjw6ky39dkfazp7dqs9dq78z2zay2sqgmgr"; + }; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "somfy_mylink_synergy" ]; + + meta = with lib; { + description = "Python API to utilise the Somfy Synergy JsonRPC API"; + homepage = "https://github.com/bendews/somfy-mylink-synergy"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efe5f4268780..d6ba1bc526c9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8058,6 +8058,8 @@ in { somecomfort = callPackage ../development/python-modules/somecomfort { }; + somfy-mylink-synergy = callPackage ../development/python-modules/somfy-mylink-synergy { }; + sonarr = callPackage ../development/python-modules/sonarr { }; sopel = callPackage ../development/python-modules/sopel { }; From e3ff8f5658113c09af31d8484fe868447e88c20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Jun 2021 12:41:16 +0200 Subject: [PATCH 21/61] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index aa7ea6cd449a..fbd78657789e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -785,7 +785,7 @@ "solax" = ps: with ps; [ solax ]; "soma" = ps: with ps; [ pysoma ]; "somfy" = ps: with ps; [ aiohttp-cors pymfy ]; - "somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy + "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; "sonarr" = ps: with ps; [ sonarr ]; "songpal" = ps: with ps; [ python-songpal ]; "sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; From b2bbee0263ddf0e97b72c10ffad5761cfecbfc5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Jun 2021 12:42:08 +0200 Subject: [PATCH 22/61] home-assistant: test somfy_mylink component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1159cbbd57d8..69673c95840a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -666,6 +666,7 @@ in with py.pkgs; buildPythonApplication rec { "solaredge" "soma" "somfy" + "somfy_mylink" "sonarr" "songpal" "sonos" From 4de7808be39322923641baab9f99bc9d880f3c5b Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Thu, 24 Jun 2021 08:47:10 -0600 Subject: [PATCH 23/61] matrix-synapse: 1.36.0 -> 1.37.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 c65627311439..bf9ee13b3b78 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.36.0"; + version = "1.37.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OMbSd64mD2+6GVUxGL4lvQlKAiBuen0PjvyVdk/ePbI="; + sha256 = "sha256-BWGbfDBB1jX0PJSR8WCZE3FE1pDs0fRg8/fML3FsJHA="; }; patches = [ From 9a6cc8c6a23636c4569175a0581dc78385dc2fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Jun 2021 17:23:01 +0200 Subject: [PATCH 24/61] fava: 1.18 -> 1.19 https://beancount.github.io/fava/changelog.html#v1-19-2021-05-18 --- pkgs/applications/office/fava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index cdef23cff4c5..92f48eb91b82 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.18"; + version = "1.19"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "21336b695708497e6f00cab77135b174c51feb2713b657e0e208282960885bf5"; + sha256 = "def7c0210bf0ce8dfffdb46ce21b3efcf71eba5a4e903565258419e4c53c2d43"; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; From 50839b44984e0a0750226509b26a45e014828214 Mon Sep 17 00:00:00 2001 From: elseym Date: Tue, 29 Jun 2021 17:47:07 +0200 Subject: [PATCH 25/61] atlassian-confluence: 7.11.0 -> 7.12.2 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 61b664d5705a..2928688e5ddd 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.11.0"; + version = "7.12.2"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-/D/fMg+WRkGGV4NG73gvVDZwwi/8BB0w6IWK/OQ3caA="; + sha256 = "sha256-SZFyHU6Uy/opwfW0B+hnp+3wQkf+6w2/P25JH+BfLGY="; }; buildPhase = '' From 0ed38b838c25670036b42d24e615ff263b370022 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 30 Jun 2021 00:31:29 +0800 Subject: [PATCH 26/61] irqbalance: 1.7.0 -> 1.8.0 --- pkgs/os-specific/linux/irqbalance/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 7cb05f7fe989..4b7a4527e2c7 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -2,16 +2,17 @@ stdenv.mkDerivation rec { pname = "irqbalance"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; rev = "v${version}"; - sha256 = "1677ap6z4hvwga0vb8hrvpc0qggyarg9mlg11pxywz7mq94vdx19"; + sha256 = "sha256-K+Nv6HqBZb0pwfNV127QDq+suaUD7TTV413S6j8NdUU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ glib ncurses libcap_ng ]; LDFLAGS = "-lncurses"; @@ -26,10 +27,12 @@ stdenv.mkDerivation rec { --replace ' $IRQBALANCE_ARGS' "" ''; - meta = { + meta = with lib; { homepage = "https://github.com/Irqbalance/irqbalance"; + changelog = "https://github.com/Irqbalance/irqbalance/releases/tag/v${version}"; description = "A daemon to help balance the cpu load generated by interrupts across all of a systems cpus"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ fortuneteller2k ]; }; } From e97c8973583ecfdf2c179c07c16acadf1a99e6c7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 29 Jun 2021 20:21:36 +0200 Subject: [PATCH 27/61] python3Packages.maestral: 1.4.4 -> 1.4.5 --- pkgs/development/python-modules/maestral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 86794cba4d14..d974038e7b0a 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.4.4"; + version = "1.4.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "03scg4y13jbi8n454hc4vq8p02isbhppqx0zhbady639p7l3ggfg"; + sha256 = "sha256-kyOBF+qsl/+9u0P+EmfxbuJNGMqPSLCWJUlcZMyKJH4="; }; propagatedBuildInputs = [ From a82cae55d30e2ebc34ffe54cbe7c62a8936b6b29 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 29 Jun 2021 20:21:53 +0200 Subject: [PATCH 28/61] maestral-gui: 1.4.4 -> 1.4.5 --- pkgs/applications/networking/maestral-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index d35120e575be..53b439b9f715 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.4.4"; + version = "1.4.5"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-4IrLwpdMepXBxjgR6euENuVKaPRU0dLiApJO45DB2C4="; + sha256 = "sha256-HaEQTmpyM1r/+rTkki93aStdzdnhNmkfNJTZRTPehTw="; }; propagatedBuildInputs = with python3.pkgs; [ From 4eace804a5209942e78456be3e2034438f0eef80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 20:45:39 +0200 Subject: [PATCH 29/61] python3Packages.hikvision: init at 2.0.4 --- .../python-modules/hikvision/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/hikvision/default.nix diff --git a/pkgs/development/python-modules/hikvision/default.nix b/pkgs/development/python-modules/hikvision/default.nix new file mode 100644 index 000000000000..274157c9616d --- /dev/null +++ b/pkgs/development/python-modules/hikvision/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "hikvision"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "fbradyirl"; + repo = pname; + rev = "v${version}"; + sha256 = "1l0zvir4hf1pcwwcmrhkspbdljzmi4lknxar5bkipdanpsm588mn"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "hikvision.api" ]; + + meta = with lib; { + description = "Python module for interacting with Hikvision IP Cameras"; + homepage = "https://github.com/fbradyirl/hikvision"; + 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 97c37464dfdc..4b4759026f95 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3246,6 +3246,8 @@ in { hijri-converter = callPackage ../development/python-modules/hijri-converter { }; + hikvision = callPackage ../development/python-modules/hikvision { }; + hiredis = callPackage ../development/python-modules/hiredis { }; hiro = callPackage ../development/python-modules/hiro { }; From 0f2266fa95ea211e8251a37f0a2c00d0a5d1c833 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 20:47:10 +0200 Subject: [PATCH 30/61] 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 38f628e7a51e..3bd484d8e410 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -347,7 +347,7 @@ "heos" = ps: with ps; [ pyheos ]; "here_travel_time" = ps: with ps; [ herepy ]; "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik - "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision + "hikvisioncam" = ps: with ps; [ hikvision ]; "hisense_aehw4a1" = ps: with ps; [ pyaehw4a1 ]; "history" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "history_stats" = ps: with ps; [ sqlalchemy ]; From 7b54a8b453ed4f5de76e0efa28a3fa2cd0dafb4f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 20:55:52 +0200 Subject: [PATCH 31/61] exploitdb: 2021-06-25 -> 2021-06-29 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index d5d9138a15a4..ded48ffb273a 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-06-25"; + version = "2021-06-29"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-xaRk/H2jITtU+93+7KxrYTTl0cCObvqcd+F9NNhjMjo="; + sha256 = "sha256-RF7+fo6I7rz7PTSHRDikeRpM0f4Bugn+Tt5Z7mjIKIM="; }; installPhase = '' From f9326f6c4c5f7905cd1d6e0a89b1db612e0a5eb9 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 29 Jun 2021 21:20:08 +0200 Subject: [PATCH 32/61] cockroachdb: remove myself as maintainer --- pkgs/servers/sql/cockroachdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 63cbbf16b302..2026ad05f3ff 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -65,6 +65,6 @@ buildGoPackage rec { description = "A scalable, survivable, strongly-consistent SQL database"; license = licenses.bsl11; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ rushmorem thoughtpolice rvolosatovs ]; + maintainers = with maintainers; [ rushmorem thoughtpolice ]; }; } From 0877a5a2fddff02546dff01a3890450762d168f7 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 29 Jun 2021 21:20:32 +0200 Subject: [PATCH 33/61] bspwm: remove myself as maintainer --- pkgs/applications/window-managers/bspwm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index c07c3389e3c0..e7c0eecbf82e 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tiling window manager based on binary space partitioning"; homepage = "https://github.com/baskerville/bspwm"; - maintainers = with maintainers; [ meisternu epitrochoid rvolosatovs ]; + maintainers = with maintainers; [ meisternu epitrochoid ]; license = licenses.bsd2; platforms = platforms.linux; }; From 059c8fc437ea45c1224760be28e83e49d34b7eb1 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 29 Jun 2021 21:21:56 +0200 Subject: [PATCH 34/61] mbed-cli: remove myself as maintainer --- pkgs/development/tools/mbed-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix index 127fa1bef863..12e7d1915477 100644 --- a/pkgs/development/tools/mbed-cli/default.nix +++ b/pkgs/development/tools/mbed-cli/default.nix @@ -28,7 +28,7 @@ buildPythonApplication rec { homepage = "https://github.com/ARMmbed/mbed-cli"; description = "Arm Mbed Command Line Interface"; license = licenses.asl20; - maintainers = with maintainers; [ rvolosatovs ]; + maintainers = with maintainers; [ ]; }; } From b24622c31d8dd07c70add79e87eb0669b96f820f Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 29 Jun 2021 21:25:45 +0200 Subject: [PATCH 35/61] go-sct: remove myself as maintainer --- pkgs/tools/X11/go-sct/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index 8744c493b71c..801ddc96c4a0 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with lib; { description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift"; license = licenses.mit; - maintainers = with maintainers; [ rvolosatovs cstrahan ]; + maintainers = with maintainers; [ cstrahan ]; platforms = platforms.linux ++ platforms.windows; }; } From d7ea598b27ccd5b05726a260eebdf4ab80131e4a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 30 Jun 2021 06:09:55 +1000 Subject: [PATCH 36/61] gh: 1.11.0 -> 1.12.0 https://github.com/cli/cli/releases/tag/v1.12.0 --- .../version-management/git-and-tools/gh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 707aefdf0c14..82b4fbd8a60b 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-rUGhKiTB5uVMbW0HdOEvubGkWh1ARUXCnGR7ezmsT3g="; + sha256 = "sha256-b0pbcRcdfkHrqlALHcUzmVujkeKNFHdWd3ENPXZ5WYk="; }; vendorSha256 = "sha256-ndsjmY/UCFyegm8yP7BopYMh5eZ8/fftWfxW4r5los0="; From 5edaead2dc639d6ce4d65106c0e667f335e255bc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 30 Jun 2021 06:12:32 +1000 Subject: [PATCH 37/61] delta: 0.8.1 -> 0.8.2 https://github.com/dandavison/delta/releases/tag/0.8.2 --- .../version-management/git-and-tools/delta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 1afee7808978..72a27cf06016 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-YS4XuP5V7HLhz6PTwbz4mqVdzRDQvpwwL7oYeQW8Xcs="; + sha256 = "sha256-ztRwUf73ioygkgmE9t/EKJPerJJscJYG4YNeNdzXH1g="; }; - cargoSha256 = "sha256-wX7x6SbbEWFBo5HeXTjb3r4IJ2leP4T0nVqf43Bl94k="; + cargoSha256 = "sha256-cCMHMGHfI0JyIL8+q2fyzamBGGHZx3mc2FpwTUa4S9Y="; nativeBuildInputs = [ installShellFiles ]; From b93605da8fa8f803a5d8d8cc59e81ce0d6309291 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 28 Jun 2021 22:35:27 +0200 Subject: [PATCH 38/61] minikube: 1.20.0 -> 1.21.0 --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 929c254a1bd2..ac7a301fe06d 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.20.0"; + version = "1.21.0"; - vendorSha256 = "sha256-ncgf2C4PZMoVMZIMDn9LwP2EDqg7T/WbUPRd/SqGGnU="; + vendorSha256 = "sha256-3G9QO5OMnMkMCsGIze/E9bvx6fvlXtOqiv8lGTkLN3s="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-TnvbO8OLjnI5WGy3QR4OZbesOBat2VsL7ElCnj2Tkmk="; + sha256 = "sha256-PbCwGPJZvnJCIVK7FYa1gI4aO4sIeh8iQtYOHAQBaZE="; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; From 7a14444ae15f6363e7af446983aa939ecc9bbcb0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 22:28:22 +0200 Subject: [PATCH 39/61] python3Packages.hass-nabucasa: 0.43.1 -> 0.44.0 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index f69f140017e0..201337ef7717 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.43.1"; + version = "0.44.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-eQdbAQRKqnJGxnSTkk3gld9TX9MpP3J8LFNYH6peVIY="; + sha256 = "sha256-cfKuqkIgmbo7/kUIpJFbckyQ0uDrxXmdsI7qORX0PWc="; }; propagatedBuildInputs = [ From ed6322629865c501a34a3fa9db1f490db577de7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Jun 2021 22:40:05 +0200 Subject: [PATCH 40/61] python3Packages.pyrfxtrx: init at 0.27.0 --- .../python-modules/pyrfxtrx/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pyrfxtrx/default.nix diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix new file mode 100644 index 000000000000..6b63ac8f9fe2 --- /dev/null +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyrfxtrx"; + version = "0.27.0"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyRFXtrx"; + rev = version; + sha256 = "0nzgy56b2v3bnn9idlb67qkzj4cj5j9v1436ri1y305fqwjy48nm"; + }; + + propagatedBuildInputs = [ + pyserial + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Library to communicate with the RFXtrx family of devices"; + homepage = "https://github.com/Danielhiversen/pyRFXtrx"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a508c692953..64d825ebdfc9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5341,6 +5341,8 @@ in { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; + pyrogram = callPackage ../development/python-modules/pyrogram { }; pysbd = callPackage ../development/python-modules/pysbd { }; From 7d5239daee27c5420a4e0404b0b289c98f3afc2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Jun 2021 22:40:34 +0200 Subject: [PATCH 41/61] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 95209dd0229a..84672233f7ab 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -696,7 +696,7 @@ "rest" = ps: with ps; [ jsonpath xmltodict ]; "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ rflink ]; - "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx + "rfxtrx" = ps: with ps; [ pyrfxtrx ]; "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ]; "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "risco" = ps: with ps; [ pyrisco ]; From 722ea721ab6ce59a784057185efd57eb555b923f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Jun 2021 22:41:32 +0200 Subject: [PATCH 42/61] home-assistant: test rfxtrx component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1159cbbd57d8..d0c0d9b7f5ad 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -625,6 +625,7 @@ in with py.pkgs; buildPythonApplication rec { "rest" "rest_command" "rflink" + "rfxtrx" "ring" "risco" "rituals_perfume_genie" From b4bab183beabc51c7b571a0fc3b76a5d591579d2 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 29 Jun 2021 21:46:30 +0100 Subject: [PATCH 43/61] tektoncd-cli: 1.19.0 -> 1.19.1 --- pkgs/applications/networking/cluster/tektoncd-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 03f02c55ad2d..a7778af231d6 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-fWcHjpfbpj2lrJ0FawhQJuSxAEX1WwOY7m+CAgag4qk="; + sha256 = "sha256-duJSTk5LmJWbaVYybZZHWDe8E/ZqZLCCsdPIiH5d/G4="; }; vendorSha256 = null; From 55017c227772afa471c2e75062f1101d54e243f7 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 29 Jun 2021 21:54:54 +0100 Subject: [PATCH 44/61] deno: 1.11.2 -> 1.11.3 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 85f7c294e9d6..b469a49eb722 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/dy+jAm9TioDF8rZtLNFlKcu7ASzvvoVq4dun4gkiCA="; + sha256 = "sha256-Ru75eyyyaaFDD71AzDE5kgLsiB7thjqrJvvnA/PdvrA="; }; - cargoSha256 = "sha256-AUNDwbiGHiA+GADnLo/CmKAMhv68BPnvXsZaWacDJ2Y="; + cargoSha256 = "sha256-8UnsmIDdFEKp4diJ6Cr/fsbPKlw7wGHmGjXu5oqh2HI="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From 8da867297a6494a6777ad7cbe73a1d69aa9ff392 Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 29 Jun 2021 22:51:16 +0200 Subject: [PATCH 45/61] fishPlugins.pure: 3.4.2 -> 4.1.1 The repository of the project has been transferred to a GitHub organisation. See https://github.com/pure-fish/pure/issues/249. The tests of this package are also failing upstream, so they have been temporarily disabled here too. --- pkgs/shells/fish/plugins/pure.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix index 3221f6b97ca7..68da97633c4f 100644 --- a/pkgs/shells/fish/plugins/pure.nix +++ b/pkgs/shells/fish/plugins/pure.nix @@ -2,15 +2,23 @@ buildFishPlugin rec { pname = "pure"; - version = "3.4.2"; + version = "4.1.1"; src = fetchFromGitHub { - owner = "rafaelrinaldi"; + owner = "pure-fish"; repo = "pure"; rev = "v${version}"; - sha256 = "134sz3f98gb6z2vgd5kkm6dd8pka5gijk843c32s616w35y07sga"; + sha256 = "1x1h65l8582p7h7w5986sc9vfd7b88a7hsi68dbikm090gz8nlxx"; }; + # The tests aren't passing either on the project's CI. + # The release notes of the program for v3.5.0 say: + # > Tests are going crazy at the moment, should be fixed once fishtape 3.0 + # > is released, and we do the switch. + # This is tracked in https://github.com/pure-fish/pure/issues/272 + # and https://github.com/pure-fish/pure/pull/275. + doCheck = false; + checkInputs = [ git ]; checkPlugins = [ fishtape ]; checkPhase = '' From f32b99cb31479f7716f1d1476d0c06d70898dbbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Jun 2021 22:56:11 +0200 Subject: [PATCH 46/61] abcmidi: 2021.06.24 -> 2021.06.27 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 6038d1586e56..16c6e0fc8a07 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.06.24"; + version = "2021.06.27"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-FaB1QTl4xCTz/sbgptXQHtD0wadXG3UCgdZoOPCOH0U="; + sha256 = "sha256-tLKxs1p1CIU/2XV1fMgWrwdtePeXOBZUMjz46kgp9C0="; }; meta = with lib; { From 7da8d833067b9d35c65571c5d9eab8c4fd533a34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 22:59:17 +0200 Subject: [PATCH 47/61] python3Packages.requests-pkcs12: 1.9 -> 1.10 --- pkgs/development/python-modules/requests-pkcs12/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix index c58e8a926c82..29d7b85f9e6e 100644 --- a/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - sha256 = "09nm3c6v911d1vwwi0f7mzapbkq7rnsl7026pb13j6ma8pkxznms"; + sha256 = "sha256-HIUCzHxOsbk1OmcxkRK9GQ+SZ6Uf1xDylOe2pUYz3Hk="; }; propagatedBuildInputs = [ From d65c0f9f919296f93f6fa4426467fccd4ed601f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 23:02:01 +0200 Subject: [PATCH 48/61] stegseek: 0.5 -> 0.6 --- pkgs/tools/security/stegseek/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/stegseek/default.nix b/pkgs/tools/security/stegseek/default.nix index d2fb825b5296..f898b5eab0e6 100644 --- a/pkgs/tools/security/stegseek/default.nix +++ b/pkgs/tools/security/stegseek/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "stegseek"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "RickdeJager"; repo = pname; rev = "v${version}"; - sha256 = "19hzr5533b607ihmjj71x682qjr45s75cqxh9zap21z16346ahqn"; + sha256 = "sha256-B5oJffYOYfsH0YRq/Bq0ciIlCsCONyScFBjP7a1lIzo="; }; nativeBuildInputs = [ cmake ]; From 8dbcdacaadd103cc12457441f42b8627d835a18d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 23:05:38 +0200 Subject: [PATCH 49/61] traitor: 0.0.3 -> 0.0.7 --- pkgs/tools/security/traitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/tools/security/traitor/default.nix index 8718c92cd3d7..2da9262709ad 100644 --- a/pkgs/tools/security/traitor/default.nix +++ b/pkgs/tools/security/traitor/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "traitor"; - version = "0.0.3"; + version = "0.0.7"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "0mffh4k87ybl0mpglgi2yfwksygrh62mcmkcmfcbszlh5pagsch1"; + sha256 = "sha256-UuWJe4nVr87ab3yskqKxnclMg9EywlcgaM/WOREXD/c="; }; vendorSha256 = null; From ee9ee7646bd882de5db44384e04c39af117348c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 23:12:50 +0200 Subject: [PATCH 50/61] terrascan: 1.6.0 -> 1.7.0 --- pkgs/tools/security/terrascan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 8fa8ded7b664..36ccb89dcfeb 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AIHfG5Z5I91zcogHxGRP7pLauYHICX6NL0bJTp982sQ="; + sha256 = "sha256-P16CS1W42Q/glsB9G0kagB5oSgwLb5cGMvKFc9jzd8s="; }; - vendorSha256 = "sha256-XzZ3RudyD6YKyc3e3HvUrkXToXs2aFSSCScQgmCfxgQ="; + vendorSha256 = "sha256-22T7C4/ph3z+O1c9uC1p2xzg0JFV+TEdfy4iiIS4Y40="; # tests want to download a vulnerable Terraform project doCheck = false; From d34cee35a3ac22ce19376ff94ca3212b2fba5505 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 23:16:29 +0200 Subject: [PATCH 51/61] sqlfluff: 0.6.0a2 -> 0.6.0 --- pkgs/development/tools/database/sqlfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 01f4941c8e4f..12e5c8c14abd 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.0a2"; + version = "0.6.0"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "13hzr0jialzi2nlvqwvff3w0h6jikqvcg0p2p4irwlisg4db8w7w"; + sha256 = "sha256-RW3+NpKZns3Jo1b3GfTymUE74pVoJi9f0zi4j4mUGiY="; }; propagatedBuildInputs = with python3.pkgs; [ From e77f1cb7cdd48593c132e8fb41d07de3af771e46 Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Tue, 29 Jun 2021 23:23:54 +0200 Subject: [PATCH 52/61] logseq: 0.2.0 -> 0.2.2 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 20648cf7a4c7..d28a12396ee1 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "uFINB8WXFbtI/WMFvqirAygzwK7I/8+8YPeyCd+xQ5w="; + sha256 = "03l5w0fg3laiz85k4g4w98ngaziyfr9s24xshjrfl71q6r9s813m"; name = "${pname}-${version}.AppImage"; }; From a888795ce7d50d9ca3e0a24a7ff7627b915aa8f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 23:24:54 +0200 Subject: [PATCH 53/61] knockpy: 5.0.0 -> 5.1.0 --- pkgs/tools/security/knockpy/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/tools/security/knockpy/default.nix index 89eda45322c7..8189145846b3 100644 --- a/pkgs/tools/security/knockpy/default.nix +++ b/pkgs/tools/security/knockpy/default.nix @@ -5,30 +5,28 @@ python3.pkgs.buildPythonApplication rec { pname = "knockpy"; - version = "5.0.0"; + version = "5.1.0"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = "guelfoweb"; repo = "knock"; rev = version; - sha256 = "1h7sibdxx8y53xm1wydyng418n4j6baiys257msq03cs04jlm7h9"; + sha256 = "sha256-4W6/omGPmQFuZ/2AVNgCs2q0ti/P8OY4o7b4/g9q+Rc="; }; propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 colorama + matplotlib + networkx + pyqt5 requests ]; - postPatch = '' - # https://github.com/guelfoweb/knock/pull/95 - substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" - ''; - # Project has no tests doCheck = false; + pythonImportsCheck = [ "knockpy" ]; meta = with lib; { From 0b13e8e8907d9c69f78bfa50292dcf0a66f6db41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 23:19:06 +0200 Subject: [PATCH 54/61] python3Packages.pubnub: 5.1.3 -> 5.1.4 --- pkgs/development/python-modules/pubnub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 89dd4d1cbf0e..478782b488c8 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pubnub"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = pname; repo = "python"; rev = "v${version}"; - sha256 = "0mpw2wzbpb60lnrsnw8mc88mxxhslpnc5nvkjyc3v2dbqs5cnmy5"; + sha256 = "sha256-aDmmF3T5v6NX3kut7cydEJNRw4mkrGt4X0+WOm/ZCVo="; }; propagatedBuildInputs = [ From 39a492c91cb942476647e7c08f6d73093e6cacae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 23:41:51 +0200 Subject: [PATCH 55/61] python3Packages.pytenable: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/pytenable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 2482e4230961..5b0dfb29be2b 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "tenable"; repo = "pyTenable"; rev = version; - sha256 = "sha256-APwBC1fL5JtYL5E/pabQpwGD1OtFMNPeWi/b9+hbhBE="; + sha256 = "sha256-9qkNQ3+yDplPHIXDwlghpJP1f+UoDYObWpPhl6UVtHU="; }; propagatedBuildInputs = [ From 53bdcb70be02d2e455e4b9a55b8320d56642bc01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 23:43:07 +0200 Subject: [PATCH 56/61] python3Packages.adafruit-platformdetect: 3.14.0 -> 3.14.2 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index adb72d0cd03b..114130595339 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.14.0"; + version = "3.14.2"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "1v33546cflsbm6k8mhmi1r5c8fqjlirvzmf62a604xns8wrxb88h"; + sha256 = "sha256-SFqSTNKZMETRf9RxSD6skzAVpxepmW+JG/gqZgFX06A="; }; nativeBuildInputs = [ setuptools-scm ]; From 994671a25951a0b1fa7788f47b945408df164628 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 30 Jun 2021 02:01:13 +0300 Subject: [PATCH 57/61] quakespasm: 0.93.1 -> 0.93.2 (#128654) --- pkgs/games/quakespasm/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index 64b7c8f7920d..41589caed6db 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: + stdenv.mkDerivation rec { pname = "quakespasm"; majorVersion = "0.93"; - version = "${majorVersion}.1"; + version = "${majorVersion}.2"; src = fetchurl { url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tgz"; - sha256 = "1bimv18f6rzhyjz78yvw2vqr5n0kdqbcqmq7cb3m951xgsxfcgpd"; + sha256 = "0qm0j5drybvvq8xadfyppkpk3rxqsxbywzm6iwsjwdf0iia3gss5"; }; sourceRoot = "${pname}-${version}/Quake"; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "An engine for iD software's Quake"; homepage = "http://quakespasm.sourceforge.net/"; longDescription = '' @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { and smoother mouse input - though no CD support. ''; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.m3tti ]; + platforms = platforms.linux; + maintainers = with maintainers; [ m3tti ]; }; } From 7e59c1971572b261fc1a738c2d12ea33bd73bba5 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Tue, 29 Jun 2021 11:20:29 -0600 Subject: [PATCH 58/61] nixos-option: remove if `nix.package` is unstable This was done in a0a61c3e34873d02034cb804975ad2981328b5b4, but users typically install `nixUnstable` via `nix.package`, not by overlaying `pkgs.nix` directly. --- nixos/modules/installer/tools/tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index cb2dbf6c8591..1dc0578daca6 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -40,7 +40,7 @@ let }; nixos-option = - if lib.versionAtLeast (lib.getVersion pkgs.nix) "2.4pre" + if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre" then null else pkgs.callPackage ./nixos-option { }; From a105c611e6623b439380c1c8084fa40a34620d13 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 30 Jun 2021 01:21:29 +0200 Subject: [PATCH 59/61] spdx-license-list-data: 3.12 -> 3.13 (#128678) --- pkgs/data/misc/spdx-license-list-data/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index f4ab4c058512..107d3804e620 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub }: +{ stdenvNoCC, lib, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.12"; + version = "3.13"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - sha256 = "09xci8dzblg3d30jf7s43zialbcxlxly03zrkiymcvnzixg8v48f"; + sha256 = "184qfz8jifkd4jvqkdfmcgplf12cdx83gynb7mxzmkfg2xymlr0g"; }; installPhase = '' From e266a62d6d01686527d46ac6956a340e442b9178 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 30 Jun 2021 01:17:32 +0200 Subject: [PATCH 60/61] xwayland: Fix build options Logs https://hydra.nixos.org/build/146088556/nixlog/7 show `WARNING: Unknown options: "default-font-path, xwayland-eglstream"` The option names should contain underscores https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/meson_options.txt#L9 --- pkgs/servers/x11/xorg/xwayland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index e1b2597d4f45..286125902fab 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -83,8 +83,8 @@ stdenv.mkDerivation rec { zlib ]; mesonFlags = [ - "-Dxwayland-eglstream=true" - "-Ddefault-font-path=${defaultFontPath}" + "-Dxwayland_eglstream=true" + "-Ddefault_font-path=${defaultFontPath}" "-Dxkb_bin_dir=${xkbcomp}/bin" "-Dxkb_dir=${xkeyboard_config}/etc/X11/xkb" "-Dxkb_output_dir=${placeholder "out"}/share/X11/xkb/compiled" From c50de910d13971efb923c7cecf22ddc121aec066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Kne=C5=BEevi=C4=87?= Date: Wed, 30 Jun 2021 01:48:02 +0200 Subject: [PATCH 61/61] Remove knl as maintainer for oauth2_proxy (#128483) Co-authored-by: fortune Co-authored-by: Nikola Knezevic --- pkgs/servers/oauth2-proxy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index fe4335a74114..a5aee60d8bb1 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { description = "A reverse proxy that provides authentication with Google, Github, or other providers"; homepage = "https://github.com/oauth2-proxy/oauth2-proxy/"; license = licenses.mit; - maintainers = with maintainers; teams.serokell.members ++ [ knl ]; + maintainers = teams.serokell.members; }; }