From a20fd6e97e1b48f085ebc894a43e00cd6e055ea4 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sun, 13 Nov 2022 02:35:38 +0800 Subject: [PATCH 01/20] zotero: 6.0.16 -> 6.0.18 --- pkgs/applications/office/zotero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 9c233f469247..c638a4b2713b 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.16"; + version = "6.0.18"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-PqC7PqpRSm/Yt3pK8TuzcrhtfJSeJX6th2xb2n/Bul8="; + sha256 = "sha256-MIBhvhgttqfUO42ipVNXhdKbcN/0YPtFK8Ox8KlafG0="; }; nativeBuildInputs = [ wrapGAppsHook ]; From 9b5fafa4d3fc001b4e80524ee4890f8a9bf9b2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Nov 2022 03:31:17 +0100 Subject: [PATCH 02/20] python310Packages.apprise: 1.1.0 -> 1.2.0 --- .../development/python-modules/apprise/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 864dd570209e..0eca7e2e977f 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -7,30 +7,29 @@ , gntp , installShellFiles , markdown -, mock , paho-mqtt +, pytest-mock +, pytest-xdist , pytestCheckHook , pythonOlder , pyyaml , requests , requests-oauthlib -, slixmpp }: buildPythonPackage rec { pname = "apprise"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-92eoBwp3fcKb9zCBeeC2ndLeZeZpM+2JsZmef/5yO2A="; + hash = "sha256-bjGvoY9HRS6szVb7fug9kkUsU00V85JAftGg48RlJEs="; }; nativeBuildInputs = [ - babel installShellFiles ]; @@ -44,11 +43,12 @@ buildPythonPackage rec { ]; checkInputs = [ + babel gntp - mock paho-mqtt + pytest-mock + pytest-xdist pytestCheckHook - slixmpp ]; disabledTests = [ From 029bc7714a589476a4f2eae6e27d39b9638331ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Nov 2022 03:31:03 +0100 Subject: [PATCH 03/20] changedetection-io: 0.39.21.1 -> 0.39.22.1 --- .../web-apps/changedetection-io/default.nix | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index 888ccf675e96..ac09e5325889 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -31,14 +31,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.39.21.1"; + version = "0.39.22.1"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = version; - sha256 = "sha256-cX2HwlsWOJ34msEnPP38jq+kzSxOM/spe0Ja2lZ/Q7w="; + sha256 = "sha256-qK44m64/skmeoBgHToTyOpeWUF2kgks10OHoAoLim+k="; }; postPatch = '' @@ -49,33 +49,35 @@ py.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with py.pkgs; [ - flask - flask-wtf + apprise + beautifulsoup4 + brotli + chardet + cryptography eventlet - validators - timeago - inscriptis feedgen + flask flask-login flask-restful + flask-wtf + inscriptis jinja2 jinja2-time - pytz - brotli - requests - urllib3 - chardet - wtforms jsonpath-ng jq - apprise - paho-mqtt - cryptography - beautifulsoup4 lxml - selenium - werkzeug + paho-mqtt + pillow playwright + pytz + requests + selenium + setuptools + timeago + urllib3 + validators + werkzeug + wtforms ] ++ requests.optional-dependencies.socks; # tests can currently not be run in one pytest invocation and without docker From 693a660f07fe14d16affbe59c70c710e55105235 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Mon, 28 Nov 2022 21:30:24 +0100 Subject: [PATCH 04/20] python3Packages.apsw: 3.39.4.0 -> 3.40.0.0 Signed-off-by: Florian Brandes --- pkgs/development/python-modules/apsw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index b93a3187afe5..f8fdf1612174 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.39.4.0"; + version = "3.40.0.0"; format = "setuptools"; disabled = isPyPy; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-vFPvevtAAEHG34G2ZPbETo/Erjem4G9r7xvkEoPBlLQ="; + hash = "sha256-Bi2pW+8vFLcYnatlqsfnwqfCpV2cjannYaTqgIlfNNM="; }; buildInputs = [ From 4eeced50c462efdce2b7aed0929c08d01ac757f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Nov 2022 04:07:04 +0000 Subject: [PATCH 05/20] python310Packages.retrying: 1.3.3 -> 1.3.4 --- pkgs/development/python-modules/retrying/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index 5e2451affb90..9d5f7ee5256d 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "retrying"; - version = "1.3.3"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "0fwp86xv0rvkncjdvy2mwcvbglw4w9k0fva25i7zx8kd19b3kh08"; + sha256 = "sha256-NF2oxXZb2YKx0ZFd65EC/T0fetFr2EqXALhfZNJOjz4="; }; propagatedBuildInputs = [ six ]; From 8b868b5616c3406c8737c4dba50f394528475732 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 29 Nov 2022 16:28:06 +0100 Subject: [PATCH 06/20] racket-minimal: fix build on aarch64-darwin This commit fixed a previous patch so that signatures are effectively removed and then added. --- .../interpreters/racket/force-remove-codesign-then-add.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch b/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch index 38cd7f52e237..98e2cb102db9 100644 --- a/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch +++ b/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch @@ -5,6 +5,6 @@ (void - (if remove? -+ (if #t ++ (begin (remove-signature file) (add-ad-hoc-signature file))) From 07182bf0633a911d13d6544aff7a31f7793ef7f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Nov 2022 21:33:29 +0100 Subject: [PATCH 07/20] python310Packages.retrying: add pythonImportsCheck - disable on older Python releases --- .../python-modules/retrying/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index 9d5f7ee5256d..36e76f6bc6c7 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -2,26 +2,36 @@ , buildPythonPackage , fetchPypi , six +, pythonOlder }: buildPythonPackage rec { pname = "retrying"; version = "1.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NF2oxXZb2YKx0ZFd65EC/T0fetFr2EqXALhfZNJOjz4="; + hash = "sha256-NF2oxXZb2YKx0ZFd65EC/T0fetFr2EqXALhfZNJOjz4="; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; # doesn't ship tests in tarball doCheck = false; - meta = with lib; { - homepage = "https://github.com/rholder/retrying"; - description = "General-purpose retrying library"; - license = licenses.asl20; - }; + pythonImportsCheck = [ + "retrying" + ]; + meta = with lib; { + description = "General-purpose retrying library"; + homepage = "https://github.com/rholder/retrying"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; } From 7bd19b77b5ef42931c34ec36b9e4b5f725cb0408 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Nov 2022 02:38:29 +0000 Subject: [PATCH 08/20] texstudio: 4.4.0 -> 4.4.1 --- pkgs/applications/editors/texstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 6a0f498fa554..96fb32e80f36 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - hash = "sha256-BaTfebLilUeDNtCJZmgAx+hN+L+4MtnuL6t3wQRX/Ns="; + hash = "sha256-3w9JKX0tT5J3tJthIxJ+ZMlG8+gEeQAl9Gn+Zyjhmt4="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; From a07717429f5b7a6ca4bfabff269ae2834562a5df Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 29 Nov 2022 22:01:56 -0500 Subject: [PATCH 09/20] faketty: 1.0.10 -> 1.0.11 --- pkgs/tools/misc/faketty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/tools/misc/faketty/default.nix index 288286aa9b30..197bddd09559 100644 --- a/pkgs/tools/misc/faketty/default.nix +++ b/pkgs/tools/misc/faketty/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "faketty"; - version = "1.0.10"; + version = "1.0.11"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Jljq22xbXakwKdf5TXBXzuKuKJOBjf6lzCy8aHrVC3U="; + sha256 = "sha256-HMeJNUF4VT2WdGwAW21GvCp33Bg2HB8NCHv0+3cf74U="; }; - cargoSha256 = "sha256-K0hNnqw178b7noHW76DMR0BoYhkrQpPQeHaH6Azt3Xo="; + cargoSha256 = "sha256-jhSleyhBquU0PxmVPGo1CkuwrzLG7WG5ANPmZ14/ui0="; postPatch = '' patchShebangs tests/test.sh From f0a546f4c2ac36a3ae3f59ceaa7d1961b334c81d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Nov 2022 03:20:04 +0000 Subject: [PATCH 10/20] trivy: 0.34.0 -> 0.35.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 245da2e199a9..9200dd917495 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6xALedNX37+xUhvsVz7lWgqDppK0b3avUJ3zA6W2n6M="; + sha256 = "sha256-0lEKXCQ7os6hyqEuugNI8ogZiqJZq58VGafEKrcmV3I="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-CBsu2p66XgpeInKw/F6f6ULyoLc6cTtlXzNv3fI41YU="; + vendorSha256 = "sha256-cl6EShtXhe72fbKIMbma9pEGLPBVSNZMiHWi94BbkMM="; excludedPackages = "misc"; From 16f1d25e44baa62cb16f74ad9515122d293d25ea Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 30 Nov 2022 11:59:38 +0800 Subject: [PATCH 11/20] plasma-workspace: 5.26.4 -> 5.26.4.1 --- pkgs/desktops/plasma-5/srcs.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index f0b263ae4cf4..ae1dd2433625 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -396,11 +396,11 @@ }; }; plasma-workspace = { - version = "5.26.4"; + version = "5.26.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.4/plasma-workspace-5.26.4.tar.xz"; - sha256 = "06pbghl8gpq63gg9jj29jsizgfq7bcqj9kx48gkqcwvd9gd1q1f9"; - name = "plasma-workspace-5.26.4.tar.xz"; + url = "${mirror}/stable/plasma/5.26.4/plasma-workspace-5.26.4.1.tar.xz"; + sha256 = "7fcca23ff8de6f4aa2261f0180be54422f25047002b7ca6c648e7216459b80fc"; + name = "plasma-workspace-5.26.4.1.tar.xz"; }; }; plasma-workspace-wallpapers = { From 637b7c9d2039354503fbdd9e1e3c9603b7da4148 Mon Sep 17 00:00:00 2001 From: toastal Date: Wed, 30 Nov 2022 12:23:38 +0700 Subject: [PATCH 12/20] =?UTF-8?q?lightningcss:=201.16.1=20=E2=86=92=201.17?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/lightningcss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index 4713211454be..088b91e212ab 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/development/tools/lightningcss/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "v${version}"; - sha256 = "sha256-Mr3sqPrP9fIuQrE+XtDe5lu8dGwYNtKElfxFvLIllb4="; + sha256 = "sha256-N99e3paDwsl8lerijmq2srEdKaf3oJ1FJx6RUDQbXZg="; }; - cargoSha256 = "sha256-mF7bUcy5np/odQvhz0PEsWWgWRL2k8X0VaO9y1pDtzE="; + cargoSha256 = "sha256-AkAOYq8VTtKMSqH4WDq48jepc58blkCQPB4EeppuUkk="; buildFeatures = [ "cli" ]; From f1f741c80ac981d3f4d39143227cf243a1c4cc67 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 30 Nov 2022 01:02:40 -0500 Subject: [PATCH 13/20] cargo-zigbuild: 0.14.1 -> 0.14.2 Diff: https://github.com/messense/cargo-zigbuild/compare/v0.14.1...v0.14.2 Changelog: https://github.com/messense/cargo-zigbuild/releases/tag/v0.14.2 --- pkgs/development/tools/rust/cargo-zigbuild/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 258d1d39459c..f0e7e4577e07 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9MmIu7oNdLLOl4zsx/A1v0dEc54bN+J6T2GcLFOvMpQ="; + sha256 = "sha256-koEKWtcpkxK2h562ZIjM0PvvLit7TMo03Ikg2SLMEWM="; }; - cargoSha256 = "sha256-3UNjJRpNrDdrU63R7z+6TJR7lq8waPceDscx2yo+QeE="; + cargoSha256 = "sha256-CAaSnnCL+F1av6UYj4QKMEEXSFIAKroBQxew4SO1oU8="; nativeBuildInputs = [ makeWrapper ]; @@ -23,6 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A tool to compile Cargo projects with zig as the linker"; homepage = "https://github.com/messense/cargo-zigbuild"; + changelog = "https://github.com/messense/cargo-zigbuild/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; From 1853c7df0f50be9a95eff3ac11124d624ef752b0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 23 Nov 2022 06:28:16 +0100 Subject: [PATCH 14/20] =?UTF-8?q?ocamlPackages.calendar:=202.5=20=E2=86=92?= =?UTF-8?q?=203.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/calendar/default.nix | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index 4c089b76f3ed..cf349eeb8bb1 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -1,27 +1,25 @@ -{ stdenv, lib, fetchurl, ocaml, findlib }: +{ lib, buildDunePackage, fetchFromGitHub, re }: -stdenv.mkDerivation rec { - pname = "ocaml-calendar"; - version = "2.5"; +buildDunePackage rec { + pname = "calendar"; + version = "3.0.0"; + minimalOCamlVersion = "4.03"; - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/915/calendar-${version}.tar.bz2"; - sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f"; + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-+VQzi6pEMqzV1ZR84Yjdu4jsJEWtx+7bd6PQGX7TiEs="; }; - nativeBuildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ re ]; strictDeps = true; - createFindlibDestdir = true; - meta = { - homepage = "https://forge.ocamlcore.org/projects/calendar/"; - description = "An Objective Caml library managing dates and times"; - license = "LGPL"; - platforms = ocaml.meta.platforms or [ ]; - maintainers = [ - lib.maintainers.gal_bolle - ]; + inherit (src.meta) homepage; + description = "A library for handling dates and times"; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.gal_bolle ]; }; } From 1b68f3a0ddbb69173083a12d4e83a606ce6bdf49 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 30 Nov 2022 09:16:53 +0100 Subject: [PATCH 15/20] pkgsMusl.jfsutils: fix build (#203250) --- pkgs/tools/filesystems/jfsutils/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 9b7b520ce3aa..599326c8fbfb 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { url = "https://sources.debian.org/data/main/j/jfsutils/1.1.15-4/debian/patches/add_sysmacros.patch"; sha256 = "1qcwvxs4d0d24w5x98z59arqfx2n7f0d9xaqhjcg6w8n34vkhnyc"; }) + # fix for musl + (fetchpatch { + name = "musl-fix-includes.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/jfsutils/musl-fix-includes.patch?id=567823dca7dc1f8ce919efbe99762d2d5c020124"; + sha256 = "sha256-FjdUOI+y+MdSWxTR+csH41uR0P+PWWTfIMPwQjBfQtQ="; + }) ]; nativeBuildInputs = [ autoreconfHook ]; From c55d02f41bba94b6d4c07c44f86e2bbfa188b4ce Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 30 Nov 2022 09:17:05 +0100 Subject: [PATCH 16/20] pkgsMusl.bridge-utils: fix build (#203256) --- pkgs/os-specific/linux/bridge-utils/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index cbbf77c67c8a..a03cb12727ce 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { pname = "bridge-utils"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-ph2L5PGhQFxgyO841UTwwYwFszubB+W0sxAzU2Fl5g4="; }; - patches = [ ./autoconf-ar.patch ]; + patches = [ + ./autoconf-ar.patch + + (fetchpatch { + name = "musl-includes.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/bridge-utils/fix-PATH_MAX-on-ppc64le.patch?id=12c9046eee3a0a35665dc4e280c1f5ae2af5845d"; + sha256 = "sha256-uY1tgJhcm1DFctg9scmC8e+mgowgz4f/oF0+k+x+jqw="; + }) + ]; nativeBuildInputs = [ autoreconfHook ]; From 01932120abb9fc141995e92196083d3801cc1dfa Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 7 Nov 2022 13:57:13 +0100 Subject: [PATCH 17/20] nixos/netbox: set path of dynamic content By default this paths are set in the Nix store, and so no media, reports, or scripts could be added / modified --- nixos/modules/services/web-apps/netbox.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix index f09a8dfc5b21..7ae2d89adc47 100644 --- a/nixos/modules/services/web-apps/netbox.nix +++ b/nixos/modules/services/web-apps/netbox.nix @@ -9,6 +9,10 @@ let name = "configuration.py"; text = '' STATIC_ROOT = '${staticDir}' + MEDIA_ROOT = '${cfg.dataDir}/media' + REPORTS_ROOT = '${cfg.dataDir}/reports' + SCRIPTS_ROOT = '${cfg.dataDir}/scripts' + ALLOWED_HOSTS = ['*'] DATABASE = { 'NAME': 'netbox', From 31f1a9a2a99570dcea1f459e6ddda7f66e861519 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 7 Nov 2022 13:58:22 +0100 Subject: [PATCH 18/20] nixos/netbox: fix ldap configuration --- nixos/modules/services/web-apps/netbox.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix index 7ae2d89adc47..800af234e278 100644 --- a/nixos/modules/services/web-apps/netbox.nix +++ b/nixos/modules/services/web-apps/netbox.nix @@ -46,11 +46,10 @@ let installPhase = old.installPhase + '' ln -s ${configFile} $out/opt/netbox/netbox/netbox/configuration.py '' + optionalString cfg.enableLdap '' - ln -s ${ldapConfigPath} $out/opt/netbox/netbox/netbox/ldap_config.py + ln -s ${cfg.ldapConfigPath} $out/opt/netbox/netbox/netbox/ldap_config.py ''; })).override { - plugins = ps: ((cfg.plugins ps) - ++ optionals cfg.enableLdap [ ps.django-auth-ldap ]); + inherit (cfg) plugins; }; netboxManageScript = with pkgs; (writeScriptBin "netbox-manage" '' #!${stdenv.shell} @@ -143,6 +142,8 @@ in { }; config = mkIf cfg.enable { + services.netbox.plugins = mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]); + services.redis.servers.netbox.enable = true; services.postgresql = { From ed4a7faf43c35d35f144baede6644c1ae382729c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 30 Nov 2022 10:27:28 +0100 Subject: [PATCH 19/20] chromiumBeta: 108.0.5359.48 -> 108.0.5359.71 (#203681) * chromiumBeta: 108.0.5359.48 -> 108.0.5359.62 * chromiumBeta: 108.0.5359.62 -> 108.0.5359.71 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c7ee4b263dfb..0dcd4c96c219 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "108.0.5359.48", - "sha256": "0nk33rv4q22kgr9197y6a4w8yazgifsm5qvmmia41nnl24sqik57", - "sha256bin64": "062anw2i8rfi4v8zl0jdqxzn24xzl3ny24cbiyk8dyyf55r914v0", + "version": "108.0.5359.71", + "sha256": "0pgzf6xrd71is1dld1arhq366vjp8p54x75zyx6y7vcjqj0a0v6b", + "sha256bin64": "14sarqyw2pdcnkk2xnsdq58wg0s576fjvqfg0ishprm7ndks1z6m", "deps": { "gn": { "version": "2022-10-05", From ccd9ac9ff4d2dd64696a228700fb447b25416ef0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Nov 2022 15:18:26 +0000 Subject: [PATCH 20/20] mailspring: 1.10.5 -> 1.10.7 --- .../networking/mailreaders/mailspring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index a5a9b3ac89b4..07de3be99651 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.10.5"; + version = "1.10.7"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "sha256-eVwb7E04DzGdqfH4T+gkvmBtvN7ja4o8u7LvHk/581I="; + sha256 = "sha256-r/xutH3BLYCsFmmYJ1hdphLLktCzdAeM1Uwp1l1C1LQ="; }; nativeBuildInputs = [