Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
44c7b403da
1
.github/workflows/periodic-merge-24h.yml
vendored
1
.github/workflows/periodic-merge-24h.yml
vendored
@ -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
|
||||
|
||||
1
.github/workflows/periodic-merge-6h.yml
vendored
1
.github/workflows/periodic-merge-6h.yml
vendored
@ -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
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -214,7 +214,7 @@ in {
|
||||
RestrictRealtime = true;
|
||||
PrivateMounts = true;
|
||||
SystemCallFilter = [
|
||||
"@system-service @pkey"
|
||||
"@system-service @pkey @chown"
|
||||
"~@privileged @resources"
|
||||
];
|
||||
SystemCallArchitectures = "native";
|
||||
|
||||
@ -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"
|
||||
}
|
||||
}
|
||||
|
||||
@ -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
|
||||
];
|
||||
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user