From 5fe775466225dd7fd9d99223be806fc03cdfc4c8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 Dec 2023 04:20:00 +0000 Subject: [PATCH 1/9] twilio-cli: 5.16.2 -> 5.16.3 Changelog: https://github.com/twilio/twilio-cli/blob/5.16.3/CHANGES.md --- pkgs/development/tools/twilio-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 9a89aa22c809..11a2bfe4e24b 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.16.2"; + version = "5.16.3"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-5YIv4Y46PnyvYt1GQZUrL1/00LldbGDqGjjpys3Sphs="; + hash = "sha256-CaH0NRK0KvR2F8/Fov16uzig5BvwRuUNf4SDFDu/SLs="; }; buildInputs = [ nodejs-slim ]; From ee0dfa51926c06dfc1df33e650318264b97f1aa0 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Fri, 1 Dec 2023 23:22:27 -0500 Subject: [PATCH 2/9] librewolf: 120.0-1 -> 120.0.1-1 --- .../networking/browsers/librewolf/src.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 9662b1b54e0d..65ce8374f357 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "120.0-1", + "packageVersion": "120.0.1-1", "source": { - "rev": "120.0-1", - "sha256": "1wms3kyimmfzl64rbphgap2sm87lwkl0pr24rx4rxf3px3bq97f3" + "rev": "120.0.1-1", + "sha256": "0kvfa97m7dq1b030d62zblpb445fkbgb2w19bckxwxv7mx36awy7" }, "settings": { - "rev": "b587388bdbe63511c478cb8b5f82c2e80040414c", - "sha256": "03cw6wh7358pgld4qgs534pl2lnfvwc0xl2yyb3n3pyvmba6cyrp" + "rev": "9dac02778ebed3e2614da52c36b7cede45f4f602", + "sha256": "0flk6v50cyiaajzcz9gm1hig00vkw9xdbjd5rdxidrmhcqxy24vy" }, "firefox": { - "version": "120.0", - "sha512": "31d5f9e1d4173280c8de6d9b8551bc6bba5e2c49b84f944f50d42002d5b39c2fb743bc130f26c81160388a102b8301b94a0a378ecdfa6f943860f971a860df8c" + "version": "120.0.1", + "sha512": "dd0e3eb234d58c39431d1f100834ef4bcc8cfb89ff471a37b948eda4dd3874b63b1979cda39a0db0dd3b4a579b5f09a7d2d1f39d26fd9f2b8d5635e4b8738b6c" } } From 5b7ae3565de3cf15882c1304d0dd0771004382c8 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 25 Nov 2023 10:27:47 +0100 Subject: [PATCH 3/9] sudo: fix meta license information (#269788) --- lib/licenses.nix | 6 ++++++ pkgs/tools/security/sudo/default.nix | 14 +++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 3bce847b03c4..baf92007123d 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1068,6 +1068,12 @@ in mkLicense lset) ({ url = "https://github.com/thestk/stk/blob/master/LICENSE"; }; + sudo = { + shortName = "sudo"; + fullName = "Sudo License (ISC-style)"; + url = "https://www.sudo.ws/about/license/"; + }; + sustainableUse = { shortName = "sustainable"; fullName = "Sustainable Use License"; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index e286f7e7aee3..40056ec72eb8 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -71,9 +71,8 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) sudo; }; - meta = { + meta = with lib; { description = "A command to run commands as root"; - longDescription = '' Sudo (su "do") allows a system administrator to delegate @@ -81,13 +80,10 @@ stdenv.mkDerivation rec { to run some (or all) commands as root or another user while providing an audit trail of the commands and their arguments. ''; - homepage = "https://www.sudo.ws/"; - - license = "https://www.sudo.ws/sudo/license.html"; - - maintainers = with lib.maintainers; [ delroth ]; - - platforms = lib.platforms.linux; + # From https://www.sudo.ws/about/license/ + license = with licenses; [ sudo bsd2 bsd3 zlib ]; + maintainers = with maintainers; [ delroth ]; + platforms = platforms.linux; }; } From 298f98bcd8247e143fe136f280848c48df6d830a Mon Sep 17 00:00:00 2001 From: Alexander Fuchs Date: Sat, 2 Dec 2023 16:14:02 +0100 Subject: [PATCH 4/9] maintainers: add alex-fu27 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4678aeb8811a..445aed56fe88 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -787,6 +787,12 @@ githubId = 2335822; name = "Alexandre Esteves"; }; + alex-fu27 = { + email = "alex.fu27@gmail.com"; + github = "alex-fu27"; + githubId = 49982580; + name = "Alexander Fuchs"; + }; alexnortung = { name = "alexnortung"; email = "alex_nortung@live.dk"; From c36d884e6aafc55f1ce06cfef41f702cb16ece6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Oct 2023 11:22:20 +0000 Subject: [PATCH 5/9] osinfo-db-tools: 1.10.0 -> 1.11.0 --- pkgs/tools/misc/osinfo-db-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index cf0ab2776ba5..be78d6c02600 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db-tools"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-gCzdU7QWcG6lhE8Ebdz7ZYwbSQa5+UDHmserxQmBymg="; + sha256 = "sha256-i6bTG7XvBwVuOIeeBwZxr7z+wOtBqH+ZUEULu4MbCh0="; }; nativeBuildInputs = [ From 5776e40f8b455972b9f92233180fd25fd7f69aa8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Dec 2023 19:29:08 +0100 Subject: [PATCH 6/9] python311Packages.zope-configuration: fix eval without aliases Consuming the `zope_testing` alias broke eval. --- .../development/python-modules/zope-configuration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix index b1c6e027a36d..e5a30f1e7d68 100644 --- a/pkgs/development/python-modules/zope-configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -7,7 +7,7 @@ , zope_interface , zope_schema , pytestCheckHook -, zope_testing +, zope-testing , zope_testrunner , manuel }: @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ manuel pytestCheckHook - zope_testing + zope-testing zope_testrunner ]; From 37ad50cdcf38b837929e914b9c2989606ef65917 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 2 Dec 2023 07:53:59 +1100 Subject: [PATCH 7/9] awscli2: sphinx disable test that is flaky on hydra --- pkgs/tools/admin/awscli2/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 37deb7960532..3a0b72a158de 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -13,6 +13,11 @@ let py = python3 // { pkgs = python3.pkgs.overrideScope (final: prev: { + sphinx = prev.sphinx.overridePythonAttrs (prev: { + disabledTests = prev.disabledTests ++ [ + "test_check_link_response_only" # fails on hydra https://hydra.nixos.org/build/242624087/nixlog/1 + ]; + }); ruamel-yaml = prev.ruamel-yaml.overridePythonAttrs (prev: { src = prev.src.override { version = "0.17.21"; From dffba14043168d767a12ff86c39464b8503d3d29 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sat, 2 Dec 2023 12:03:58 -0800 Subject: [PATCH 8/9] nixos/matrix-appservice-irc: fix syscall filter The pre-start script requires @chown; the service fails without it. --- nixos/modules/services/matrix/appservice-irc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/matrix/appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix index d153ffc2ace8..c79cd799b4d0 100644 --- a/nixos/modules/services/matrix/appservice-irc.nix +++ b/nixos/modules/services/matrix/appservice-irc.nix @@ -214,7 +214,7 @@ in { RestrictRealtime = true; PrivateMounts = true; SystemCallFilter = [ - "@system-service @pkey" + "@system-service @pkey @chown" "~@privileged @resources" ]; SystemCallArchitectures = "native"; From 13a5743c442d840284e58cb56958e462671881a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Dec 2023 19:47:53 +0100 Subject: [PATCH 9/9] workflows/periodic-merge: allow manual dispatch Currently there is an eval fix on master and waiting five hours for it to propagate into staging-next and staging is annoyingly long. --- .github/workflows/periodic-merge-24h.yml | 1 + .github/workflows/periodic-merge-6h.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 308d9057859e..9ce6a7c74cc1 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -13,6 +13,7 @@ on: # * is a special character in YAML so you have to quote this string # Merge every 24 hours - cron: '0 0 * * *' + workflow_dispatch: permissions: contents: read diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index 5d5f86db48f5..f3151ead6a0f 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -13,6 +13,7 @@ on: # * is a special character in YAML so you have to quote this string # Merge every 6 hours - cron: '0 */6 * * *' + workflow_dispatch: permissions: contents: read