Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-07 18:00:59 +00:00 committed by GitHub
commit 15c347a298
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 84 additions and 59 deletions

View file

@ -1,8 +1,8 @@
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
let
humioCtlVersion = "0.28.4";
sha256 = "sha256-X2pc15InfCzVbZ2fmBdr+GKgOySIruA1yD61HcLO164=";
humioCtlVersion = "0.28.5";
sha256 = "sha256-h6zQG9jjHpAxaJUaFoVmRyR1A/bk57CKBIkOGPcdJP0=";
vendorSha256 = "sha256-867x33Aq27D2m14NqqsdByC39pjjyJZbfX3jmwVU2yo=";
in buildGoModule {
name = "humioctl-${humioCtlVersion}";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.24.12";
version = "0.24.13";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
sha256 = "sha256-GuN+OAzuNus1B32ZSsnrJPrE7MQ0ZqNKDmoNe7Sa7Zs=";
sha256 = "sha256-5gMRjnrk1FyTj3Lzp+6scLuqfP8rCUvDDBK33/RzG28=";
};
buildFlagsArray = ''

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libcyaml";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "tlsa";
repo = "libcyaml";
rev = "v${version}";
sha256 = "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93";
sha256 = "sha256-LtU1r95YoLuQ2JCphxbMojxKyXnt50XEARGUPftLgsU=";
};
buildInputs = [ libyaml ];

View file

@ -1,33 +1,36 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pyserial
, pytestCheckHook
, websockets
}:
buildPythonPackage rec {
pname = "aqualogic";
version = "2.6";
version = "3.3";
src = fetchFromGitHub {
owner = "swilson";
repo = pname;
rev = version;
sha256 = "sha256-dAC/0OjvrC8J/5pu5vcOKV/WqgkAlz0LuFl0up6FQRM=";
sha256 = "sha256-6YvkSUtBc3Nl/Ap3LjU0IKY2bE4k86XdSoLo+/c8dDs=";
};
patches = [
(fetchpatch {
name = "allow-iobase-objects.patch";
url = "https://github.com/swilson/aqualogic/commit/185fe25a86c82c497a55c78914b55ed39f5ca339.patch";
sha256 = "072jrrsqv86bn3skibjc57111jlpm8pq2503997fl3h4v6ziwdxg";
})
propagatedBuildInputs = [
pyserial
websockets
];
propagatedBuildInputs = [ pyserial ];
checkInputs = [
aiohttp
pytestCheckHook
];
checkInputs = [ pytestCheckHook ];
# With 3.3 the event loop is not terminated after the first test
# https://github.com/swilson/aqualogic/issues/9
doCheck = false;
pythonImportsCheck = [ "aqualogic" ];

View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "bitarray";
version = "2.2.0";
version = "2.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-xF7u+qYA9vL2hD/EaZhprl18HouPtY/zgFhM6bx6cII=";
sha256 = "sha256-MbQNcWofBkLqnidBwpt1YpkHXbLh0evnUOPiwUafWJ0=";
};
checkPhase = ''

View file

@ -2,39 +2,48 @@
, buildPythonPackage
, fetchPypi
, mock
, twisted
, pyopenssl
, pytestCheckHook
, service-identity
, twisted
}:
buildPythonPackage rec {
pname = "foolscap";
version = "20.4.0";
version = "21.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "0rbw9makjmawkcxnkkngybj3n14s0dnzn9gkqqq2krcm514kmlb9";
sha256 = "sha256-6dGFU4YNk1joXXZi2c2L84JtUbTs1ICgXfv0/EU2P4Q=";
};
propagatedBuildInputs = [ mock twisted pyopenssl service-identity ];
propagatedBuildInputs = [
mock
twisted
pyopenssl
service-identity
];
checkPhase = ''
# Either uncomment this, or remove this custom check phase entirely, if
# you wish to do battle with the foolscap tests. ~ C.
# trial foolscap
'';
checkInputs = [
pytestCheckHook
];
disabledTestPaths = [
# Not all dependencies are present
"src/foolscap/test/test_connection.py"
];
pythonImportsCheck = [ "foolscap" ];
meta = with lib; {
homepage = "http://foolscap.lothar.com/";
description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model";
description = "RPC protocol for Python that follows the distributed object-capability model";
longDescription = ''
"Foolscap" is the name for the next-generation RPC protocol,
intended to replace Perspective Broker (part of Twisted).
Foolscap is a protocol to implement a distributed
object-capabilities model in Python.
"Foolscap" is the name for the next-generation RPC protocol, intended to
replace Perspective Broker (part of Twisted). Foolscap is a protocol to
implement a distributed object-capabilities model in Python.
'';
# See http://foolscap.lothar.com/trac/browser/LICENSE.
homepage = "https://github.com/warner/foolscap";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "hstspreload";
version = "2021.6.28";
version = "2021.7.5";
disabled = isPy27;
src = fetchFromGitHub {
owner = "sethmlarson";
repo = pname;
rev = version;
sha256 = "sha256-SZGyn79R3+IwtoZ+khgFnl0WosRoCcKNk8efGxbOugc=";
sha256 = "sha256-/89K41MrTdF68+BVkfnv+0d+6rBHdRGKpN2Psfr2Wog=";
};
# tests require network connection

View file

@ -1,22 +1,34 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "httmock";
version = "1.3.0";
pname = "httmock";
version = "1.4.0";
src = fetchFromGitHub {
owner = "patrys";
repo = "httmock";
rev = version;
sha256 = "1dy7pjq4gz476jcnbbpzk8w8qxr9l8wwgw9x2c7lf6fzsgnf404q";
sha256 = "sha256-yid4vh1do0zqVzd1VV7gc+Du4VPrkeGFsDHqNbHL28I=";
};
checkInputs = [ requests ];
checkInputs = [
requests
pytestCheckHook
];
pytestFlagsArray = [ "tests.py" ];
pythonImportsCheck = [ "httmock" ];
meta = with lib; {
description = "A mocking library for requests";
homepage = "https://github.com/patrys/httmock";
license = licenses.asl20;
homepage = "https://github.com/patrys/httmock";
license = licenses.asl20;
maintainers = with maintainers; [ nyanloutre ];
};
}

View file

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pg8000";
version = "1.19.5";
version = "1.20.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-3LmvucuHrMeTiK5jPEXPf4Bqq+O7XYzxVFcraZOT+Tc=";
sha256 = "sha256-SQ7CKpJgHwRUs+1MjU7N3DD2bA4/eD8OzFgQN3SajFU=";
};
propagatedBuildInputs = [

View file

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pymetar";
version = "1.2";
version = "1.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "f9a8caa21eff5367427da55a469ef396293ae4cc93797ab2f1a66a2924fbdc68";
sha256 = "sha256-zhuXOZIIzh5p0CDOsiUNTqeXDoHFcf1BPg868fc7CIg=";
};
checkPhase = ''
@ -23,7 +23,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A command-line tool to show the weather report by a given station ID";
homepage = "http://www.schwarzvogel.de/software/pymetar.html";
homepage = "https://github.com/klausman/pymetar";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ erosennin ];
};

View file

@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.5.6";
version = "2.5.7";
dontConfigure = true;
dontBuild = true;
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "sha256-YBGKIfBTU7MRm1Om4Jknd5Nu77qJftCgjuohcO/9X/w=";
sha256 = "sha256-dKJQv/omXT/L5dWYkveXodNNt5Q3i1WDIA9nwmo0Sfc=";
};
nativeBuildInputs = [

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "0.9.6";
version = "0.9.8";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = version;
sha256 = "sha256-FWJ7fSJysT5LVFio49nbN0T0b+zWwiV7NvEJlojbNKs=";
sha256 = "sha256-WT3r6qw/lCZy6hdfAJmoAgUqjSLPVT8fKX4DnqDnhOs=";
};
cargoSha256 = "sha256-/VmCuHPURQTyeIumMaWVrFu18ZgVR0klpc/bO1f1w4o=";
cargoSha256 = "sha256-0R/9VndP/Oh5/yP7NsBC25jiCSRVNEXhbVksElLXeEc=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "0.172.1";
version = "0.173.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xTLNAcqvk5GDs9HsNvL+4SPeT8baFMg7J0yW+E8x+Gc=";
sha256 = "sha256-v3Sln1qtYDdWCWJSKErxUoPAUzwWrTYM0j5X+mz+1xo=";
};
vendorSha256 = "sha256-Zd48I7e5zCbSXz5RVckMXQMpqvf6gAoajx5yLk2ODmU=";
vendorSha256 = "sha256-yX8Ffdzq22JHA2owtHurH8AEgqPgPjz+N06oD5ZiZmM=";
buildFlagsArray = [
"-ldflags="

View file

@ -5,6 +5,7 @@
, cargo
, sphinx
, Security
, libiconv
, prefix ? "uutils-"
, buildMulticallBinary ? true
}:
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ];
buildInputs = lib.optional stdenv.isDarwin Security;
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
makeFlags = [
"CARGO=${cargo}/bin/cargo"