From 9a497aab1bcc2fc7a8acf2119df83a83290ff9ba Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 20 Dec 2022 18:44:39 -0500 Subject: [PATCH 1/8] systemd-stage-1: Improve test-instrumentation output --- nixos/modules/system/boot/systemd/initrd.nix | 11 +++++++++++ nixos/modules/testing/test-instrumentation.nix | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 31702499b0f1..196f44ccd783 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -148,6 +148,16 @@ in { visible = false; }; + extraConfig = mkOption { + default = ""; + type = types.lines; + example = "DefaultLimitCORE=infinity"; + description = lib.mdDoc '' + Extra config options for systemd. See systemd-system.conf(5) man page + for available options. + ''; + }; + contents = mkOption { description = lib.mdDoc "Set of files that have to be linked into the initrd"; example = literalExpression '' @@ -352,6 +362,7 @@ in { "/etc/systemd/system.conf".text = '' [Manager] DefaultEnvironment=PATH=/bin:/sbin ${optionalString (isBool cfg.emergencyAccess && cfg.emergencyAccess) "SYSTEMD_SULOGIN_FORCE=1"} + ${cfg.extraConfig} ''; "/lib/modules".source = "${modulesClosure}/lib/modules"; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 4ab2578eb81e..028099c64643 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -96,6 +96,12 @@ in MaxLevelConsole=debug ''; + boot.initrd.systemd.contents."/etc/systemd/journald.conf".text = '' + [Journal] + ForwardToConsole=yes + MaxLevelConsole=debug + ''; + systemd.extraConfig = '' # Don't clobber the console with duplicate systemd messages. ShowStatus=no @@ -107,6 +113,8 @@ in DefaultTimeoutStartSec=300 ''; + boot.initrd.systemd.extraConfig = config.systemd.extraConfig; + boot.consoleLogLevel = 7; # Prevent tests from accessing the Internet. From bfad8cd5e0c52e2c8db7dab6a843c8d0f0e89f59 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sun, 25 Dec 2022 23:06:52 +0000 Subject: [PATCH 2/8] paperless-ngx: add celery wrapper --- pkgs/applications/office/paperless-ngx/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index c31436edef8c..eaad04c64f6f 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -200,6 +200,9 @@ python.pkgs.pythonPackages.buildPythonApplication rec { makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix PATH : "${path}" + makeWrapper ${python.pkgs.celery}/bin/celery $out/bin/celery \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/lib/paperless-ngx/src" \ + --prefix PATH : "${path}" ''; checkInputs = with python.pkgs.pythonPackages; [ From 2d7b8ef56f960645cf4833426e354ac90e3b4c45 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sun, 25 Dec 2022 23:07:17 +0000 Subject: [PATCH 3/8] nixos/paperless: update for paperless-ngx 1.10.2 --- nixos/modules/services/misc/paperless.nix | 26 ++++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 6a98d5cb686d..33a8394dff2d 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -211,19 +211,15 @@ in ]; systemd.services.paperless-scheduler = { - description = "Paperless scheduler"; + description = "Paperless Celery Beat"; serviceConfig = defaultServiceConfig // { User = cfg.user; - ExecStart = "${pkg}/bin/paperless-ngx qcluster"; + ExecStart = "${pkg}/bin/celery --app paperless beat --loglevel INFO"; Restart = "on-failure"; - # The `mbind` syscall is needed for running the classifier. - SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ]; - # Needs to talk to mail server for automated import rules - PrivateNetwork = false; }; environment = env; wantedBy = [ "multi-user.target" ]; - wants = [ "paperless-consumer.service" "paperless-web.service" ]; + wants = [ "paperless-consumer.service" "paperless-web.service" "paperless-task-queue.service" ]; preStart = '' ln -sf ${manage} ${cfg.dataDir}/paperless-manage @@ -250,6 +246,20 @@ in after = [ "redis-paperless.service" ]; }; + systemd.services.paperless-task-queue = { + description = "Paperless Celery Workers"; + serviceConfig = defaultServiceConfig // { + User = cfg.user; + ExecStart = "${pkg}/bin/celery --app paperless worker --loglevel INFO"; + Restart = "on-failure"; + # The `mbind` syscall is needed for running the classifier. + SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ]; + # Needs to talk to mail server for automated import rules + PrivateNetwork = false; + }; + environment = env; + }; + # Reading the user-provided password file requires root access systemd.services.paperless-copy-password = mkIf (cfg.passwordFile != null) { requiredBy = [ "paperless-scheduler.service" ]; @@ -301,7 +311,7 @@ in }; # Allow the web interface to access the private /tmp directory of the server. # This is required to support uploading files via the web interface. - unitConfig.JoinsNamespaceOf = "paperless-scheduler.service"; + unitConfig.JoinsNamespaceOf = "paperless-task-queue.service"; # Bind to `paperless-scheduler` so that the web server never runs # during migrations bindsTo = [ "paperless-scheduler.service" ]; From c5b3696c8e17383851a2cf719fc0d9a779f71437 Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Wed, 28 Dec 2022 00:08:33 +0000 Subject: [PATCH 4/8] signal-desktop-beta: v6.2.0-beta.1 -> v6.2.0-beta.2 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index de091aec53d4..6c7aed47c271 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -6,7 +6,7 @@ }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.2.0-beta.1"; - hash = "sha256-OA7DHe/sfW8xpqJPEu7BWotpnaJYj5SatPB21byZHrY="; + version = "6.2.0-beta.2"; + hash = "sha256-NVwX2xG8QGVjENy6fSA13WQyTlYuF5frcS3asDDg4Ik="; }; } From 8e311bfac4f46758e037b3c58333e8a13e782614 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 27 Dec 2022 19:29:03 -0500 Subject: [PATCH 5/8] jumpy: remove duplicate build inputs --- pkgs/games/jumpy/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index 332db4a7a0fe..6d05cc48270f 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec { xorg.libX11 xorg.libXcursor xorg.libXi - xorg.libXi xorg.libXrandr ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa From 8c89ee54be14f26b3555c5ce442d45cbb21bae2c Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 27 Dec 2022 21:03:59 -0500 Subject: [PATCH 6/8] goreleaser: 1.13.1 -> 1.14.0 Diff: https://github.com/goreleaser/goreleaser/compare/v1.13.1...v1.14.0 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index d364af728bb0..d8fce4bb58ab 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KItiCVb1H/XgVZT6f0g/VvvXhhHf6MvMEqQsr62c6d0="; + sha256 = "sha256-Vp0oB5DVhYXIk45pDGADEes+OQApE7XFsIk0enSFMqo="; }; - vendorSha256 = "sha256-UpQ2yFprWdwE67MR5voPjgY7wqrtw/ZQbt05Tbo50XY="; + vendorSha256 = "sha256-LxQxO5hr+w04UZKqCh4dGteBA08GmXfCtpI8glKajkU="; ldflags = [ "-s" From 9d7339877a6d615fad1a0dd488e9d2dc7197fa63 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 27 Dec 2022 21:09:10 -0500 Subject: [PATCH 7/8] nixos/environment: fix variables type --- nixos/modules/config/shells-environment.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index d5ec420f3044..bc6583442edf 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -42,7 +42,7 @@ in strings. The latter is concatenated, interspersed with colon characters. ''; - type = with types; attrsOf (oneOf [ str path (listOf str) ]); + type = with types; attrsOf (oneOf [ (listOf str) str path ]); apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else "${v}"); }; From 57dbff4228a9d8fba7aedf439ffdd841a2326427 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Dec 2022 03:23:54 +0000 Subject: [PATCH 8/8] erlang_odbc: 24.3.4.6 -> 24.3.4.7 --- pkgs/development/interpreters/erlang/R24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index dc572a2023cd..2f1a548c88bb 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.6"; - sha256 = "sha256-mQbWiHWz4sz4H1cqkhYM8GHe278ylI7VC5zuLBxUsJc="; + version = "24.3.4.7"; + sha256 = "sha256-cOtoSlK3S2irPX8vQ81rPXBH3aWriyoUmidUyaFs11E="; }