From 6c0a704e0e613fb50846aefa151e88c954b60f9f Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 29 Dec 2020 16:46:54 -0400 Subject: [PATCH 01/12] jellyfin: add openFirewall option --- nixos/modules/services/misc/jellyfin.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index 6a47dc3628f..64b774a220b 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -29,6 +29,16 @@ in default = "jellyfin"; description = "Group under which jellyfin runs."; }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open the default ports in the firewall for the media server. The + HTTP/HTTPS ports can be changed in the Web UI, so this option should + only be used if they are unchanged. + ''; + }; }; }; @@ -104,6 +114,12 @@ in jellyfin = {}; }; + networking.firewall = mkIf cfg.openFirewall { + # from https://jellyfin.org/docs/general/networking/index.html + allowedTCPPorts = [ 8096 8920 ]; + allowedUDPPorts = [ 1900 7359 ]; + }; + }; meta.maintainers = with lib.maintainers; [ minijackson ]; From 94d7d46e20ad1673d73d4a4e53883f8e216807ec Mon Sep 17 00:00:00 2001 From: Luis Hebendanz Date: Sat, 10 Apr 2021 01:46:18 +0200 Subject: [PATCH 02/12] firefox/wrapper.nix: Fixed firefox is always 'managed by your organization' --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 26fb49ef2a3..390b26a1b9e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -115,8 +115,7 @@ let }; } ) {} extensions; - } // - { + } // lib.optionalAttrs usesNixExtensions { Extensions = { Install = lib.foldr (e: ret: ret ++ [ "${e.outPath}/${e.extid}.xpi" ] From 43a54d59a13bbf1c68afaa0ef96bb9f95fae6aad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 04:16:27 +0000 Subject: [PATCH 03/12] amber: 0.5.8 -> 0.5.9 --- pkgs/tools/text/amber/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index e9ceaffa734..632a318e862 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "amber"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0j9h9zzg6n4mhq2bqj71k5db595ilbgd9dn6ygmzsm74619q4454"; + sha256 = "sha256-mmgJCD7kJjvpxyagsoe5CSzqIEZcIiYMAMP3axRphv4="; }; - cargoSha256 = "0h47xqqq8f8m28rl1s6r305cf3dvk94aa86j6m0rk535i2jqfvhp"; + cargoSha256 = "sha256-opRinhTmhZxpAwHNiVOLXL8boQf09Y1NXrWQ6HWQYQ0="; buildInputs = lib.optional stdenv.isDarwin Security; From b20d30e606078222145ce861e6bfa76fcc77102a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 06:07:26 +0000 Subject: [PATCH 04/12] cargo-deny: 0.9.0 -> 0.9.1 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 73e3cfd3c4c..955df96b228 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-ZjXAZN93ij42WVYSOgvKAzFZ/cZ2RTFKT2sr44j7TVc="; + sha256 = "sha256-v7Gdemn0IeO6lOg/kT6VKuL5ZSOqA9A721Wv5QStO2Q="; }; - cargoSha256 = "sha256-eQv9pFegHTjjjFURiD/yN/srtONAwAH3vwfrSY/LM/Q="; + cargoSha256 = "sha256-SF7LfxmUMX7f+9BmYTzdjTFplXj5j0e181yRVTIEGH4="; doCheck = false; From eb195be9d5b9b5573aa0de2ba1dde6bfb354d90e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 09:24:35 +0000 Subject: [PATCH 05/12] frangipanni: 0.4.0 -> 0.4.2 --- pkgs/tools/text/frangipanni/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/frangipanni/default.nix b/pkgs/tools/text/frangipanni/default.nix index 1f0dcfa9417..def134af505 100644 --- a/pkgs/tools/text/frangipanni/default.nix +++ b/pkgs/tools/text/frangipanni/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frangipanni"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "birchb1024"; repo = "frangipanni"; rev = "v${version}"; - sha256 = "sha256-NgRDXrAsfnj1cqO+2AN8nSuxS9KGNIl+pJkCADmDOqY="; + sha256 = "sha256-RzXfsaT/CUyWCpB5JGgl511gxgvzerqgwjpORgzyPCQ="; }; vendorSha256 = "sha256-TSN5M/UCTtfoTf1hDCfrJMCFdSwL/NVXssgt4aefom8="; From 558b4bcf16c27dd460049ce2d1dbf6a30487f01f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 12:14:04 +0000 Subject: [PATCH 06/12] imgproxy: 2.16.2 -> 2.16.3 --- pkgs/servers/imgproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 49259f49f2e..f4f890d0f93 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.16.2"; + version = "2.16.3"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-wr4yOrzZT/4WtRze9Yp+M18jusxdddoDd4xs5P7d5oQ="; + sha256 = "sha256-WK5TAI+dYmBLNp1A0p9DbWF7ZEw3dqr+Cuwy7LzrdBM="; rev = "v${version}"; }; From 6ed757b460731d10200e7d90a6266e5b6dc7048b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 13:15:23 +0000 Subject: [PATCH 07/12] lazygit: 0.26.1 -> 0.27.3 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 1d8e4115309..cd0fb4a3330 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.26.1"; + version = "0.27.3"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-naTO5cckUfs32z7bm5jGGEuo8db11fnTnQdUDKK2W/I="; + sha256 = "sha256-giHAeD7hhda9YV+NQuZ6w0eow79egGhUCIX0dPvhrWk="; }; vendorSha256 = null; From e0e9ab3b623f92d3ee050fcd4f7d664651b575ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 16:06:11 +0000 Subject: [PATCH 08/12] minio: 2021-03-26T00-00-41Z -> 2021-04-06T23-11-00Z --- pkgs/servers/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index dcf7f7bf9f6..3fed8691ec5 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "minio"; - version = "2021-03-26T00-00-41Z"; + version = "2021-04-06T23-11-00Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-WH7gAO8ghwMhLU/ioHrZUgIk1h6yeUzM+xg1GnkFDHM="; + sha256 = "sha256-gwf6qA63EFxGQxk8DiAiqLpIYVhVQDQYPffLNP5JfVw="; }; vendorSha256 = "sha256-VeYc+UtocpeNSV+0MocZj/83X/SMMv5PX2cPIPBV/sk="; From 5ac1f45541638836da28322f7b61cbfb9f3eb38d Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 10 Apr 2021 18:25:40 +0100 Subject: [PATCH 09/12] octant: 0.18.0 -> 0.19.0 --- .../networking/cluster/octant/default.nix | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 734a1eb3ac3..6f97be468f5 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -1,27 +1,27 @@ { lib, stdenv, fetchzip }: -let - inherit (stdenv.hostPlatform) system; - suffix = { - x86_64-linux = "Linux-64bit"; - aarch64-linux = "Linux-arm64"; - x86_64-darwin = "macOS-64bit"; - }.${system} or (throw "Unsupported system: ${system}"); - baseurl = "https://github.com/vmware-tanzu/octant/releases/download"; - fetchsrc = version: sha256: fetchzip { - url = "${baseurl}/v${version}/octant_${version}_${suffix}.tar.gz"; - sha256 = sha256."${system}"; - }; -in stdenv.mkDerivation rec { pname = "octant"; - version = "0.18.0"; + version = "0.19.0"; - src = fetchsrc version { - x86_64-linux = "sha256-D/pHOXR7XQoJCGqUep1lBAY4239HH35m+evFd21pcK0="; - aarch64-linux = "sha256-aL1axz3ebqrKQ3xK2UgDMQ+o6ZKgIvwy6Phici7WT2c="; - x86_64-darwin = "sha256-MFxOAAEnLur0LJJNU0SSlO+bH4f18zOfZNA49fKEQEw="; - }; + src = + let + inherit (stdenv.hostPlatform) system; + suffix = { + x86_64-linux = "Linux-64bit"; + aarch64-linux = "Linux-arm64"; + x86_64-darwin = "macOS-64bit"; + }.${system} or (throw "Unsupported system: ${system}"); + fetchsrc = version: sha256: fetchzip { + url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/octant_${version}_${suffix}.tar.gz"; + sha256 = sha256.${system}; + }; + in + fetchsrc version { + x86_64-linux = "sha256-TKvUBof4TLcHr9hg6AOLjVd1NcAX9HHVuuABdFKRNQA="; + aarch64-linux = "sha256-BJb7h6kJZ3QhdlEqNHkiFp91uYLXzYHvKftxEAhjY38="; + x86_64-darwin = "sha256-Ig98IqLmlN9D4iXrP9SXYwTrQOvbtQ/tQW+uEmntm+I="; + }; dontConfigure = true; dontBuild = true; From 37b3deb758e88bc1a695cc3abe7fc82ea3c1fb4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sat, 10 Apr 2021 20:55:25 +0200 Subject: [PATCH 10/12] imgproxy: fix build on Darwin --- pkgs/servers/imgproxy/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 49259f49f2e..a3cb7a278f7 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -1,4 +1,5 @@ -{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection }: +{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection +, stdenv, libunwind }: buildGoModule rec { pname = "imgproxy"; @@ -17,7 +18,8 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gobject-introspection vips ]; + buildInputs = [ gobject-introspection vips ] + ++ lib.optionals stdenv.isDarwin [ libunwind ]; preBuild = '' export CGO_LDFLAGS_ALLOW='-(s|w)' From 0b78980d678deeef61f76f50fbd395daba2f4467 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Apr 2021 23:52:25 +0200 Subject: [PATCH 11/12] python3Packages.pyenvisalink: init at 4.1 --- .../python-modules/pyenvisalink/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pyenvisalink/default.nix diff --git a/pkgs/development/python-modules/pyenvisalink/default.nix b/pkgs/development/python-modules/pyenvisalink/default.nix new file mode 100644 index 00000000000..54a552f88fe --- /dev/null +++ b/pkgs/development/python-modules/pyenvisalink/default.nix @@ -0,0 +1,36 @@ +{ lib +, async-timeout +, buildPythonPackage +, colorlog +, fetchPypi +, pyserial +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyenvisalink"; + version = "4.1"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1h30gmmynihmjkd107skk2gpi210b6gfdahwqmydyj5isxrvzmq2"; + }; + + propagatedBuildInputs = [ + async-timeout + colorlog + pyserial + ]; + + # Tests require an Envisalink device + doCheck = false; + pythonImportsCheck = [ "pyenvisalink" ]; + + meta = with lib; { + description = "Python interface for Envisalink 2DS/3 Alarm API"; + homepage = "https://github.com/Cinntax/pyenvisalink"; + 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 486a1b2c21e..68832d87e9b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5716,6 +5716,8 @@ in { inherit (pkgs) enchant2; }; + pyenvisalink = callPackage ../development/python-modules/pyenvisalink { }; + pyepsg = callPackage ../development/python-modules/pyepsg { }; pyerfa = callPackage ../development/python-modules/pyerfa { }; From 2ea8e240ff2abe079d2d31e764db7dbb9ef0d193 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Apr 2021 23:52:41 +0200 Subject: [PATCH 12/12] 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 391352fc797..0a801fa2c2f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -227,7 +227,7 @@ "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient "environment_canada" = ps: with ps; [ ]; # missing inputs: env_canada "envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat - "envisalink" = ps: with ps; [ ]; # missing inputs: pyenvisalink + "envisalink" = ps: with ps; [ pyenvisalink ]; "ephember" = ps: with ps; [ ]; # missing inputs: pyephember "epson" = ps: with ps; [ ]; # missing inputs: epson-projector "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter