b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-04-01 00:02:15 +00:00 committed by GitHub
parent ebaefe3b6b 5e2ced2025
commit 1652173e67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 111 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
nixos/tests/gitlab.nix
View file

@ -6,7 +6,7 @@ in
import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
name = "gitlab";
meta = with pkgs.lib.maintainers; {
maintainers = [ globin ];
maintainers = [ globin yayayayaka ];
};
nodes = {
@ -112,21 +112,27 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
"${pkgs.sudo}/bin/sudo -u gitlab -H gitlab-rake gitlab:check 1>&2"
)
gitlab.succeed(
"echo \"Authorization: Bearer \$(curl -X POST -H 'Content-Type: application/json' -d @${auth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers"
"echo \"Authorization: Bearer $(curl -X POST -H 'Content-Type: application/json' -d @${auth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers"
)
'' + optionalString doSetup ''
gitlab.succeed(
"curl -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createProject} http://gitlab/api/v4/projects"
"""[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createProject} http://gitlab/api/v4/projects)" = "201" ]"""
)
gitlab.succeed(
"curl -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${putFile} http://gitlab/api/v4/projects/1/repository/files/some-file.txt"
"""[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${putFile} http://gitlab/api/v4/projects/2/repository/files/some-file.txt)" = "201" ]"""
)
'' + ''
gitlab.succeed(
"curl -H @/tmp/headers http://gitlab/api/v4/projects/1/repository/archive.tar.gz > /tmp/archive.tar.gz"
"""[ "$(curl -o /dev/null -w '%{http_code}' -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.gz)" = "200" ]"""
)
gitlab.succeed(
"curl -H @/tmp/headers http://gitlab/api/v4/projects/1/repository/archive.tar.bz2 > /tmp/archive.tar.bz2"
"""curl -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.gz > /tmp/archive.tar.gz"""
)
gitlab.succeed(
"""[ "$(curl -o /dev/null -w '%{http_code}' -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.bz2)" = "200" ]"""
)
gitlab.succeed(
"""curl -o /dev/null -w '%{http_code}' -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.bz2 > /tmp/archive.tar.bz2"""
)
gitlab.succeed("test -s /tmp/archive.tar.gz")
gitlab.succeed("test -s /tmp/archive.tar.bz2")

18
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -19,22 +19,22 @@
}
},
"beta": {
"version": "100.0.4896.60",
"sha256": "1p7zggnhsz9gj3zil0nyas4ym5bd94vs0z6mdg7r1l0s0vrsaphf",
"sha256bin64": "059zrf3mm04iyzmgp594m3m7pw4458vym3wpawmdn94h5zi705i7",
"version": "101.0.4951.15",
"sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y",
"sha256bin64": "0z2rx7mw9wg5ly8wmxkflk8f9gifq4cxqvi224v9dr11qqj8gwm2",
"deps": {
"gn": {
"version": "2022-01-21",
"version": "2022-03-14",
"url": "https://gn.googlesource.com/gn",
"rev": "0725d7827575b239594fbc8fd5192873a1d62f44",
"sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr"
"rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
"sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
}
}
},
"dev": {
"version": "101.0.4951.7",
"sha256": "0xnvbiqi50hgky35qaivcyzfp05nnwfwqrd50dksqkzycl8avb4z",
"sha256bin64": "19my3zr9d3w2ypl9cm1xa15vhyv9add1f283alb9fmh2qwhl4scg",
"version": "101.0.4951.15",
"sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y",
"sha256bin64": "0m1q85ai9pyam9anh8aiv7hyadam0hjkkhnsa6s05d82k8kz5rvc",
"deps": {
"gn": {
"version": "2022-03-14",

8
pkgs/applications/networking/cluster/fluxcd/default.nix
View file

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.28.4";
sha256 = "1b98hna3qhg7gzs5rqpkrxdvas7zjzavzmi9rzn9936rw88lpgx6";
manifestsSha256 = "0k8hpkcnxw2w1pvdkvvmmqzrmsrrbij5f734iwh4n9fd326bqgwc";
version = "0.28.5";
sha256 = "11k8sb8pjhrg8ar256rfdw736cg32m6n8xcfhyqc3r4pkj3ksli8";
manifestsSha256 = "1gjya8xcmx065ywx7bc2xdsp3qj2y47b7l1dlr4y0hzp19pclmcw";
manifests = fetchzip {
url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-IL9RjmMQahFZ04FXKxH6L2PHsOM1MJnqCJorRdr49FY=";
vendorSha256 = "sha256-kxI2sOaY66XLIRMT1l3VLQh1XR4nvvsYvsdZbVLxbHM=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

9
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -697,6 +697,15 @@
"vendorSha256": "0kkkrdbapyvfzmnbh5kmhlcz5l8g8gf0mfwbya66iy1bb6f6w4mz",
"version": "1.3.0"
},
"namecheap": {
"owner": "namecheap",
"provider-source-address": "registry.terraform.io/namecheap/namecheap",
"repo": "terraform-provider-namecheap",
"rev": "v2.1.0",
"sha256": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
"vendorSha256": null,
"version": "2.1.0"
},
"ncloud": {
"owner": "NaverCloudPlatform",
"provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud",

4
pkgs/development/python-modules/aioguardian/default.nix
View file

@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "aioguardian";
version = "2021.11.0";
version = "2022.03.1";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-jQIRACm0d0a5mQqlwxSTgLZfJFvGLWuJTb/MacppmS4=";
sha256 = "sha256-UiRTyUAoTcohRkTBF5Jvd/uY2zAbHV5z4HC8Oc0QNTs=";
};
format = "pyproject";

11
pkgs/development/python-modules/idasen/default.nix
View file

@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "newAM";
repo = "idasen";
rev = "v${version}";
sha256 = "sha256-s8CnYMUVl2VbGbVxICSaKH5DxTA+NP/zPX1z7vfMqi4=";
hash = "sha256-s8CnYMUVl2VbGbVxICSaKH5DxTA+NP/zPX1z7vfMqi4=";
};
nativeBuildInputs = [
@ -39,7 +39,14 @@ buildPythonPackage rec {
pytest-asyncio
];
pythonImportsCheck = [ "idasen" ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'voluptuous = "^0.12"' 'voluptuous = "*"'
'';
pythonImportsCheck = [
"idasen"
];
meta = with lib; {
description = "Python API and CLI for the ikea IDÅSEN desk";

4
pkgs/development/python-modules/python-awair/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "python-awair";
version = "0.2.2";
version = "0.2.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "ahayworth";
repo = "python_awair";
rev = version;
sha256 = "sha256-5+s1aSvt+rXyumvf/qZ58Uvmq0p45mu23Djbwgih3qI=";
sha256 = "sha256-Roqmwamv/2/O87jfyymCGgRlw/woUhCNIuM9MLT3+Cw=";
};
nativeBuildInputs = [ poetry-core ];

4
pkgs/development/python-modules/qiskit-optimization/default.nix
View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "qiskit-optimization";
version = "0.3.1";
version = "0.3.2";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = pname;
rev = version;
sha256 = "sha256-6oqhM5sEu0id0qYrhdVyx0xXUvwxBgZSPvrlAnmtY5A=";
sha256 = "sha256-SWrHNHZjynpWcwwrWzRPpbNWz8EhVujMoY8uIJQeT6U=";
};
postPatch = ''

4
pkgs/development/python-modules/simplisafe-python/default.nix
View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "simplisafe-python";
version = "2022.03.0";
version = "2022.03.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-B4Tg122S2lJaBXBKUSN2ndt5EOiC5HyORTQXofZKUpw=";
sha256 = "sha256-WWpGRgmjOBCdsxESEpfZEigK7mfutromx6EEr/C/cO0=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/voluptuous/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "voluptuous";
version = "0.12.2";
version = "0.13.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-TbGsUHnbkkmCDUnIkctGYKb4yuNQSRIQq850H6v1ZRM=";
sha256 = "sha256-yuakUmtDS2QoFrNKAOEYbVpfXgyUirlNKpGOAeWHQGY=";
};
checkInputs = [

34
pkgs/development/python-modules/youtube-transcript-api/default.nix
View file

@ -1,22 +1,40 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests, mock, httpretty, pytestCheckHook }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, mock
, httpretty
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "youtube-transcript-api";
version = "0.4.3";
version = "0.4.4";
format = "setuptools";
disabled = pythonOlder "3.7";
# PyPI tarball is missing some test files
src = fetchFromGitHub {
owner = "jdepoix";
repo = "youtube-transcript-api";
repo = pname;
rev = "v${version}";
sha256 = "1krak5j2faj6951cl13h7hg9i3kyp6nslcbi608k8hxlbd80hc5h";
hash = "sha256-RNPWTgAOwS+tXGLQYyIyka36xS1E1499OAP84aT6m3A=";
};
propagatedBuildInputs = [ requests ];
propagatedBuildInputs = [
requests
];
checkInputs = [ mock httpretty pytestCheckHook ];
checkInputs = [
mock
httpretty
pytestCheckHook
];
pythonImportsCheck = [ "youtube_transcript_api" ];
pythonImportsCheck = [
"youtube_transcript_api"
];
meta = with lib; {
description = "Python API which allows you to get the transcripts/subtitles for a given YouTube video";

4
pkgs/servers/calibre-web/default.nix
View file

@ -7,13 +7,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "calibre-web";
version = "0.6.16";
version = "0.6.17";
src = fetchFromGitHub {
owner = "janeczku";
repo = "calibre-web";
rev = version;
sha256 = "sha256-vRnzsV9pubAmyVSxZpBK+mD9Bkbt6BQYo5S0Jsl26Ns=";
sha256 = "sha256-K2va9as+z00txpg/0fR89+kpMzpQSiSSIV489NDs8Bs=";
};
propagatedBuildInputs = with python3Packages; [

1
pkgs/servers/home-assistant/default.nix
View file

@ -30,6 +30,7 @@ let
defaultOverrides = [
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
(mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=")
(mkOverride "voluptuous" "0.12.2" "sha256-TbGsUHnbkkmCDUnIkctGYKb4yuNQSRIQq850H6v1ZRM=")
# pytest-aiohttp>0.3.0 breaks home-assistant tests
(self: super: {

6
pkgs/tools/admin/trivy/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "trivy";
version = "0.24.4";
version = "0.25.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IroWxLfDVkS6mFweQioOxjSBA1yXrcdtqFG0W+Sb8Sc=";
sha256 = "sha256-jlLE8io7/Yhu0rF7brV9YhDIsZBANZtatnWbgoHMReg=";
};
vendorSha256 = "sha256-OGwqRrhj/+oCCaXnb2s4N6a+vhTZHwe2HidAn0UaFXM=";
vendorSha256 = "sha256-hOurOL7xowgBs9gXa++X7+iOKJJ6WjekGGFiR9Q0OEU=";
excludedPackages = "misc";

6
pkgs/tools/misc/dsq/default.nix
View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "dsq";
version = "0.9.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "multiprocessio";
repo = "dsq";
rev = version;
hash = "sha256-JzS94kfvgZDz4tIXa4veY3XSFeMDBN61sU8/+5V5y9Y=";
hash = "sha256-4g9fu5taFtb7VzVa0X8s6SbEO9qTFD0ff+CVJpr376c=";
};
vendorSha256 = "sha256-9Exy2VLxOd4lgwbIOZ6NJ45NABO9a0rLjmZ+Cd7jjLM=";
vendorSha256 = "sha256-YPH/uPPNT1byXOtCrNyU68H4mHO8arl6l5hs9WMcxVk=";
nativeBuildInputs = [ diffutils ];

5
pkgs/tools/security/exploitdb/default.nix
View file

@ -2,14 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-03-24";
version = "2022-03-31";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-G2KFDNNM4NJ7DgQu1+uNjgixzyLFnF0G0YQ29PgYZ/0=";
sha256 = "sha256-T7vPDbB330Uv276+oGnEYK1xGpJCMzzZiQXx4uW1kc4=";
};
nativeBuildInputs = [ makeWrapper ];

25
pkgs/tools/security/kubescape/default.nix
View file

@ -6,37 +6,48 @@
buildGoModule rec {
pname = "kubescape";
version = "2.0.149";
version = "2.0.150";
src = fetchFromGitHub {
owner = "armosec";
repo = pname;
rev = "v${version}";
hash = "sha256-m6tJjC5BXxFC+bSOHbKXXGZQlJIM0+fIA+JYWBntgk8=";
hash = "sha256-1D/ixtZI7/H05MD6zRtZCF8yhW1FhvRpdPWieAPwxHs=";
};
nativeBuildInputs = [
installShellFiles
];
vendorSha256 = "sha256-vplHaaT7x0ZSpvityJF5aGKDARvGPBT9DMltOpUkOMo=";
modRoot = "cmd";
vendorSha256 = "sha256-Nznf793OMQ7ZCWb5voVcLyMiBa1Z8Dswp7Tdn1AzlJA=";
ldflags = [
"-s"
"-w"
"-X github.com/armosec/kubescape/clihandler/cmd.BuildNumber=v${version}"
"-X github.com/armosec/kubescape/core/cautils.BuildNumber=v${version}"
];
postBuild = ''
# kubescape/cmd should be called kubescape
mv $GOPATH/bin/{cmd,kubescape}
'';
postInstall = ''
# Running kubescape to generate completions outputs error warnings
# but does not crash and completes successfully
# https://github.com/armosec/kubescape/issues/200
installShellCompletion --cmd kubescape \
--bash <($out/bin/kubescape completion bash) \
--fish <($out/bin/kubescape completion fish) \
--zsh <($out/bin/kubescape completion zsh)
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$out/bin/kubescape --help
$out/bin/kubescape --version | grep "v${version}"
runHook postInstallCheck
'';
meta = with lib; {
description = "Tool for testing if Kubernetes is deployed securely";
homepage = "https://github.com/armosec/kubescape";

4
pkgs/top-level/all-packages.nix
View file

@ -5156,7 +5156,9 @@ with pkgs;
tridactyl-native = callPackage ../tools/networking/tridactyl-native { };
trivy = callPackage ../tools/admin/trivy { };
trivy = callPackage ../tools/admin/trivy {
buildGoModule = buildGo118Module;
};
trompeloeil = callPackage ../development/libraries/trompeloeil { };