From f83a8afc99364cf0085ae9764edbc611fd1a487f Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 24 Dec 2022 22:40:48 +0400 Subject: [PATCH 01/20] kotatogram-desktop/tg_owt: supply right openssl version tg_owt doesn't really support openssl 3.x yet, video/voice chats don't work --- .../instant-messengers/telegram/kotatogram-desktop/tg_owt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index e171622616ae..e35a73798529 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -6,7 +6,7 @@ , ninja , yasm , libjpeg -, openssl +, openssl_1_1 , libopus , ffmpeg_4 , protobuf @@ -75,7 +75,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ libjpeg - openssl + openssl_1_1 libopus ffmpeg_4 protobuf From 2ed8ff81c5660a62c1c85846f6edb4af858b4e3e Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Sat, 14 Jan 2023 12:57:36 +0100 Subject: [PATCH 02/20] ceph: add missing python library required by mgr dashboard module --- pkgs/tools/filesystems/ceph/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index be7d0dfb3407..bc3a12b935db 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -115,6 +115,7 @@ let ceph-python-env = python.withPackages (ps: [ ps.sphinx ps.flask + ps.routes ps.cython ps.setuptools ps.virtualenv From c590d510379f99c6037c0657e38962f89a84ed92 Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Mon, 16 Jan 2023 10:30:12 +0100 Subject: [PATCH 03/20] ceph: comment where to find python dependencies Co-authored-by: Martin Weinelt --- pkgs/tools/filesystems/ceph/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index bc3a12b935db..922586b323f5 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -113,6 +113,7 @@ let }; ceph-python-env = python.withPackages (ps: [ + # Check .requires files below https://github.com/ceph/ceph/tree/main/debian for dependencies ps.sphinx ps.flask ps.routes From eadb69597733d7ecba20c2620bb22246ce35af72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Jan 2023 11:26:55 +0000 Subject: [PATCH 04/20] awscli2: 2.9.13 -> 2.9.15 --- pkgs/tools/admin/awscli2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 81ee4f449c32..5b0f472a582d 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -25,14 +25,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.13"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.15"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-XI2cgyqdy1e/+khyu1QPwekkGRAZLn10yfHO3J528IA="; + hash = "sha256-yOqxz6ZsBV7iNKjG3NlV8SUHaezlchiUx8RRShRU6xo="; }; nativeBuildInputs = [ From bacb53e6f9af8e6689d0c311ab090d2e8410146e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Tue, 17 Jan 2023 20:51:36 +0300 Subject: [PATCH 05/20] xfce.xfce4-screenshooter: 1.10.2 -> 1.10.3 --- .../xfce/applications/xfce4-screenshooter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 8e08a2baa4f8..f0129fe9001a 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -12,10 +12,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.10.2"; + version = "1.10.3"; odd-unstable = false; - sha256 = "sha256-UpfQgKcrxFm7VvMEVV4fsvRnJPZSLJWexx9lZlFWJW8="; + sha256 = "sha256-L+qlxzNgjsoMi+VsbOFG7L/IITbF1iqMWqujhk0rAcA="; buildInputs = [ exo From 988feead01eb2766dbd65c5b7996f8e3d9034eb7 Mon Sep 17 00:00:00 2001 From: Bruno Inec Date: Wed, 14 Dec 2022 16:14:29 +0100 Subject: [PATCH 06/20] nixos/goeland: init --- .../from_md/release-notes/rl-2305.section.xml | 8 +++ .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/goeland.nix | 58 +++++++++++++++++++ .../feedreaders/goeland/default.nix | 9 +-- 5 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 nixos/modules/services/mail/goeland.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 5e2a65061fc6..821a9312dae2 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -83,6 +83,14 @@ networking.stevenblack. + + + goeland, + an alternative to rss2email written in golang with many + filters. Available as + services.goeland. + + atuin, diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 8c67815ada56..da7596a3089c 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -30,6 +30,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable). +- [goeland](https://github.com/slurdge/goeland), an alternative to rss2email written in golang with many filters. Available as [services.goeland](#opt-services.goeland.enable). + - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). - [mmsd](https://gitlab.com/kop316/mmsd), a lower level daemon that transmits and recieves MMSes. Available as [services.mmsd](#opt-services.mmsd.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dce6e878540d..45a7acdedc41 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -530,6 +530,7 @@ ./services/mail/dovecot.nix ./services/mail/dspam.nix ./services/mail/exim.nix + ./services/mail/goeland.nix ./services/mail/listmonk.nix ./services/mail/maddy.nix ./services/mail/mail.nix diff --git a/nixos/modules/services/mail/goeland.nix b/nixos/modules/services/mail/goeland.nix new file mode 100644 index 000000000000..aeeee97ea41c --- /dev/null +++ b/nixos/modules/services/mail/goeland.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.goeland; + tomlFormat = pkgs.formats.toml { }; +in +{ + options.services.goeland = { + enable = mkEnableOption (mdDoc "goeland"); + + settings = mkOption { + description = mdDoc '' + Configuration of goeland. + See the [example config file](https://github.com/slurdge/goeland/blob/master/cmd/asset/config.default.toml) for the available options. + ''; + default = { }; + type = types.submodule { + freeformType = tomlFormat.type; + }; + }; + schedule = mkOption { + type = types.str; + default = "12h"; + example = "Mon, 00:00:00"; + description = mdDoc "How often to run goeland, in systemd time format"; + }; + databaseDirectory = mkOption { + type = types.path; + default = "/var/lib/goeland"; + description = mdDoc "Directory where the goeland database will reside if using the `unseen` filter"; + }; + }; + + config = mkIf cfg.enable { + systemd.tmpfiles.rules = [ "d ${cfg.databaseDirectory} 0750 goeland goeland -" ]; + + services.goeland.settings.database = "${cfg.databaseDirectory}/goeland.db"; + + systemd.services.goeland = { + serviceConfig = let confFile = tomlFormat.generate "config.toml" cfg.settings; in { + ExecStart = "${pkgs.goeland}/bin/goeland run -c ${confFile}"; + User = "goeland"; + }; + startAt = cfg.schedule; + }; + + users.users.goeland = { + description = "goeland user"; + group = "goeland"; + isSystemUser = true; + }; + users.groups.goeland = { }; + }; + + meta.maintainers = with maintainers; [ sweenu ]; +} diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix index 946e145a5707..270cb7cdb622 100644 --- a/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -23,14 +23,15 @@ buildGoModule rec { ]; meta = with lib; { - description = "An alternative to RSS2Email written in golang with many filters."; + description = "An alternative to rss2email written in golang with many filters"; longDescription = '' - Goeland excels at creating beautiful emails from RSS, - tailored for daily or weekly digest. It include a number of + Goeland excels at creating beautiful emails from RSS feeds, + tailored for daily or weekly digest. It includes a number of filters that can transform the RSS content along the way. - It can also consume other sources, such as a Imgur tag. + It can also consume other sources, such as Imgur tags. ''; homepage = "https://github.com/slurdge/goeland"; + changelog = "https://github.com/slurdge/goeland/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = [ maintainers.sweenu ]; }; From 8f10857af43c0f43fa1c64aa19add3e509ad7734 Mon Sep 17 00:00:00 2001 From: Bruno Inec Date: Fri, 6 Jan 2023 15:37:44 +0100 Subject: [PATCH 07/20] let systemd handle /var/lib/goeland creation --- nixos/modules/services/mail/goeland.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/goeland.nix b/nixos/modules/services/mail/goeland.nix index aeeee97ea41c..e4a32de1dc3c 100644 --- a/nixos/modules/services/mail/goeland.nix +++ b/nixos/modules/services/mail/goeland.nix @@ -34,14 +34,15 @@ in }; config = mkIf cfg.enable { - systemd.tmpfiles.rules = [ "d ${cfg.databaseDirectory} 0750 goeland goeland -" ]; - services.goeland.settings.database = "${cfg.databaseDirectory}/goeland.db"; systemd.services.goeland = { serviceConfig = let confFile = tomlFormat.generate "config.toml" cfg.settings; in { ExecStart = "${pkgs.goeland}/bin/goeland run -c ${confFile}"; User = "goeland"; + Group = "goeland"; + StateDirectory = "goeland"; + StateDirectoryMode = "0750"; }; startAt = cfg.schedule; }; From 15414ff8e1ec38f367ed47f7c33d46faded39d69 Mon Sep 17 00:00:00 2001 From: Bruno Inec Date: Wed, 18 Jan 2023 15:18:36 +0100 Subject: [PATCH 08/20] databaseDirectory -> StateDir and changed description --- nixos/modules/services/mail/goeland.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/mail/goeland.nix b/nixos/modules/services/mail/goeland.nix index e4a32de1dc3c..de2f7b457d7a 100644 --- a/nixos/modules/services/mail/goeland.nix +++ b/nixos/modules/services/mail/goeland.nix @@ -16,25 +16,28 @@ in See the [example config file](https://github.com/slurdge/goeland/blob/master/cmd/asset/config.default.toml) for the available options. ''; default = { }; - type = types.submodule { - freeformType = tomlFormat.type; - }; + type = tomlFormat.type; }; schedule = mkOption { type = types.str; default = "12h"; example = "Mon, 00:00:00"; - description = mdDoc "How often to run goeland, in systemd time format"; + description = mdDoc "How often to run goeland, in systemd time format."; }; - databaseDirectory = mkOption { + stateDir = mkOption { type = types.path; default = "/var/lib/goeland"; - description = mdDoc "Directory where the goeland database will reside if using the `unseen` filter"; + description = mdDoc '' + The data directory for goeland where the database will reside if using the unseen filter. + If left as the default value this directory will automatically be created before the goeland + server starts, otherwise you are responsible for ensuring the directory exists with + appropriate ownership and permissions. + ''; }; }; config = mkIf cfg.enable { - services.goeland.settings.database = "${cfg.databaseDirectory}/goeland.db"; + services.goeland.settings.database = "${cfg.stateDir}/goeland.db"; systemd.services.goeland = { serviceConfig = let confFile = tomlFormat.generate "config.toml" cfg.settings; in { From 5edf9bd76ffb0ac02bbd4d70c3c330d4267b5d78 Mon Sep 17 00:00:00 2001 From: Bruno Inec Date: Wed, 18 Jan 2023 15:22:08 +0100 Subject: [PATCH 09/20] Apply suggestion Co-authored-by: Aaron Andersen --- nixos/modules/services/mail/goeland.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/mail/goeland.nix b/nixos/modules/services/mail/goeland.nix index de2f7b457d7a..c407ffafcf18 100644 --- a/nixos/modules/services/mail/goeland.nix +++ b/nixos/modules/services/mail/goeland.nix @@ -40,13 +40,17 @@ in services.goeland.settings.database = "${cfg.stateDir}/goeland.db"; systemd.services.goeland = { - serviceConfig = let confFile = tomlFormat.generate "config.toml" cfg.settings; in { - ExecStart = "${pkgs.goeland}/bin/goeland run -c ${confFile}"; - User = "goeland"; - Group = "goeland"; - StateDirectory = "goeland"; - StateDirectoryMode = "0750"; - }; + serviceConfig = let confFile = tomlFormat.generate "config.toml" cfg.settings; in mkMerge [ + { + ExecStart = "${pkgs.goeland}/bin/goeland run -c ${confFile}"; + User = "goeland"; + Group = "goeland"; + } + (mkIf (cfg.stateDir == "/var/lib/goeland") { + StateDirectory = "goeland"; + StateDirectoryMode = "0750"; + }) + ]; startAt = cfg.schedule; }; From edb6b1096601ec5553608e7ea6874a65ae9e5381 Mon Sep 17 00:00:00 2001 From: Bruno Inec Date: Fri, 20 Jan 2023 00:38:52 +0100 Subject: [PATCH 10/20] add warning if not using password_file --- nixos/modules/services/mail/goeland.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/mail/goeland.nix b/nixos/modules/services/mail/goeland.nix index c407ffafcf18..949ecfe91a4e 100644 --- a/nixos/modules/services/mail/goeland.nix +++ b/nixos/modules/services/mail/goeland.nix @@ -60,6 +60,17 @@ in isSystemUser = true; }; users.groups.goeland = { }; + + warnings = + if hasAttr "password" cfg.settings.email + then [ + '' + It is not recommended to set the "services.goeland.settings.email.password" + option as it will be in cleartext in the Nix store. + Please use "services.goeland.settings.email.password_file" instead. + '' + ] + else [ ]; }; meta.maintainers = with maintainers; [ sweenu ]; From 46250442825b3870a61e614385d41ab3dd050a52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 00:41:08 +0000 Subject: [PATCH 11/20] mtxclient: 0.9.0 -> 0.9.1 --- pkgs/development/libraries/mtxclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 7513614a51e8..505e58c1ec37 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - hash = "sha256-39tdTY2emN3/FxZxwl6dcQn1bOgybws166wqFPJl68M="; + hash = "sha256-34iwYn9EOAl2c9UWERyzgwlZ+539jW9FygNYwgZ7ClU="; }; postPatch = '' From bb7b6e68aa46bbdd2162b881a8985f7e31d895f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 13:00:49 +0000 Subject: [PATCH 12/20] python310Packages.plaid-python: 11.3.0 -> 11.4.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 2c14b258a11d..51f96c24ab58 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "11.3.0"; + version = "11.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-zZGnKFLsT29IX8EK1Tv5I1Ser+9tREzkJcYY6+Fid6o="; + hash = "sha256-5IHFChiIm/6x3xr+F+RIAZ3kDYQsXs+baFqUasjI8qs="; }; propagatedBuildInputs = [ From dbbb062d479e938e662ba27f0edcebbad6518fe7 Mon Sep 17 00:00:00 2001 From: Bruno Inec Date: Fri, 20 Jan 2023 14:39:35 +0100 Subject: [PATCH 13/20] Apply suggestion Co-authored-by: Aaron Andersen --- nixos/modules/services/mail/goeland.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/mail/goeland.nix b/nixos/modules/services/mail/goeland.nix index 949ecfe91a4e..13092a65ed90 100644 --- a/nixos/modules/services/mail/goeland.nix +++ b/nixos/modules/services/mail/goeland.nix @@ -61,16 +61,13 @@ in }; users.groups.goeland = { }; - warnings = - if hasAttr "password" cfg.settings.email - then [ - '' - It is not recommended to set the "services.goeland.settings.email.password" - option as it will be in cleartext in the Nix store. - Please use "services.goeland.settings.email.password_file" instead. - '' - ] - else [ ]; + warnings = optionals (hasAttr "password" cfg.settings.email) [ + '' + It is not recommended to set the "services.goeland.settings.email.password" + option as it will be in cleartext in the Nix store. + Please use "services.goeland.settings.email.password_file" instead. + '' + ]; }; meta.maintainers = with maintainers; [ sweenu ]; From 227f7f7a5a93652b8685cfb208d27643fc4937f6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 20 Jan 2023 18:22:13 +0100 Subject: [PATCH 14/20] element-{web,desktop}: 1.11.17 -> 1.11.20 ChangeLogs web: * https://github.com/vector-im/element-web/releases/tag/v1.11.18 * https://github.com/vector-im/element-web/releases/tag/v1.11.19 * https://github.com/vector-im/element-web/releases/tag/v1.11.20 ChangeLogs desktop: * https://github.com/vector-im/element-desktop/releases/tag/v1.11.18 * https://github.com/vector-im/element-desktop/releases/tag/v1.11.19 * https://github.com/vector-im/element-desktop/releases/tag/v1.11.20 --- .../networking/instant-messengers/element/pin.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 64a164c9b01e..cc0578f71fec 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.17", - "desktopSrcHash": "VB7p/ThiwphcCd3loSwQ61TthR2ji0nX6l32Jrgv/NE=", - "desktopYarnHash": "15jsznsqxvi1bs26pmb7zfrybl071k3g3g6i0pm34mzs2r9nvrii", - "webSrcHash": "YeXsDyyoQnWNDnfx/7fMHooi48ST+LiA5ACy0gBnQaQ=", - "webYarnHash": "1zniyg869glhajcmcgq34qwmhb4jq2hbjqhhz6a79p892yx97chp" + "version": "1.11.20", + "desktopSrcHash": "mlB2UvRYzaJ6FWGDOqyZY6NTY7QoWCiCvmFDyWTPuMQ=", + "desktopYarnHash": "0ccwsy9ma7sn6d5f9jfv40dhj0y6aax8msx9bihjdmx989nkkh2m", + "webSrcHash": "55oLS89Pmy4d7DhBQc4i6boQIH2LgujE7kl6QwcKltw=", + "webYarnHash": "1aiq5wvb8cz2a5rc0h11s16fnyak0p9zhzbqwhf1rs6c1gav7777" } From 30e35ce15578163f7bac26c2221a66edf8e956e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 19:08:59 +0000 Subject: [PATCH 15/20] flexget: 3.5.17 -> 3.5.18 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 6a8bed0c92bc..5aadf802e430 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.17"; + version = "3.5.18"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-7r/3rB0TI/sRTi69+tx24dGjETBhX0KS1Arhg8aeoCk="; + hash = "sha256-gMOpKXLUihiNcpHF6045D1ZcYwTgyjaVIFpDRCln5rI="; }; postPatch = '' From 3ac988f89e2e1b6d157c2a84044ba0396e51e6cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 20 Jan 2023 13:50:36 -0800 Subject: [PATCH 16/20] prs: 0.4.1 -> 0.5.0 https://gitlab.com/timvisee/prs/-/tags/v0.5.0 --- pkgs/tools/security/prs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix index c6981b915795..33df7e7948ce 100644 --- a/pkgs/tools/security/prs/default.nix +++ b/pkgs/tools/security/prs/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "refs/tags/v${version}"; - hash = "sha256-kElHgThpNVPzr9DSdSFjxTmJ0ivfajgk6nekGRwb2dI="; + hash = "sha256-9/XKz+yOCFEB1VI2EK0xF5ecyBPeGztpGPo/aXQ6v5E="; }; - cargoHash = "sha256-dob1WVJEPLYkPi7kPP5A6yxxe+BSRdQTgWUUiLvVlbg="; + cargoHash = "sha256-kxIgToqhJhUgJcxnGRGG6I+YqM2diFgQDyn1jBxWAw8="; postPatch = '' # The GPGME backend is recommended From 4c47864b7cd482b4478344c12fb79e8182271590 Mon Sep 17 00:00:00 2001 From: nvmd Date: Sat, 21 Jan 2023 01:58:50 +0300 Subject: [PATCH 17/20] utm: 4.0.8 -> 4.1.5 --- pkgs/os-specific/darwin/utm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix index 979780e3ca70..2e21945288e4 100644 --- a/pkgs/os-specific/darwin/utm/default.nix +++ b/pkgs/os-specific/darwin/utm/default.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.0.8"; + version = "4.1.5"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - sha256 = "sha256-a6GQyiW8pqw6fN3WVuTVUfnsl/qPtmzDxUvWNElli5k="; + hash = "sha256-YOmTf50UUvvh4noWnmV6WsoWSua0tpWTgLTg+Cdr3bQ="; }; nativeBuildInputs = [ undmg ]; From 093e3eb20d3ffd03577e1dcd4dc24fa3fbc6e257 Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Fri, 20 Jan 2023 23:54:49 +0100 Subject: [PATCH 18/20] ceph: enable dashboard in nixos test --- nixos/tests/ceph-single-node.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/tests/ceph-single-node.nix b/nixos/tests/ceph-single-node.nix index 4fe5dc59ff8f..4a5636fac156 100644 --- a/nixos/tests/ceph-single-node.nix +++ b/nixos/tests/ceph-single-node.nix @@ -181,6 +181,17 @@ let monA.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'") monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + + # Enable the dashboard and recheck health + monA.succeed( + "ceph mgr module enable dashboard", + "ceph config set mgr mgr/dashboard/ssl false", + # default is 8080 but it's better to be explicit + "ceph config set mgr mgr/dashboard/server_port 8080", + ) + monA.wait_for_open_port(8080) + monA.wait_until_succeeds("curl -q --fail http://localhost:8080") + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") ''; in { name = "basic-single-node-ceph-cluster"; From 604d6e43a5f39c0e255d04681c9ca6c5707b26cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 21 Jan 2023 00:13:00 +0100 Subject: [PATCH 19/20] nixos/no-x-libs: fix infinite recursion accidentally introduced in #204287 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75ded916919d..2a5d3d46f7f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20690,7 +20690,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenGL; }; - libdevil-nox = libdevil.override { + libdevil-nox = callPackage ../development/libraries/libdevil { inherit (darwin.apple_sdk.frameworks) OpenGL; withXorg = false; }; From 3a1f02b46bed23aeba2f0528669107d6b00b2ecc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 21 Jan 2023 11:28:04 +1000 Subject: [PATCH 20/20] .github/workflows/labels.yml: fix typo mistake in https://github.com/NixOS/nixpkgs/commit/d1570428a2685b40925fe90916b68862b0895e94 --- .github/workflows/labels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index f5d071fcc882..35f5f24ce309 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -16,7 +16,7 @@ permissions: jobs: labels: runs-on: ubuntu-latest - if: github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" + if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/labeler@v4 with: