From 1537d093614d98258becf48b9872a58c21bcfc91 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Wed, 7 Jul 2021 13:41:35 +0200 Subject: [PATCH 01/15] uutils-coreutils: fix darwin build (missing libiconv) --- pkgs/tools/misc/uutils-coreutils/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index b2d3883176c6..209a38cdcc10 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -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" From ce35e2852d2b094314c6eec29843b3a5b33e7245 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 16:08:00 +0200 Subject: [PATCH 02/15] python3Packages.aqualogic: 2.6 -> 3.3 --- .../python-modules/aqualogic/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aqualogic/default.nix b/pkgs/development/python-modules/aqualogic/default.nix index 9a23ebd82a9f..255248e8d924 100644 --- a/pkgs/development/python-modules/aqualogic/default.nix +++ b/pkgs/development/python-modules/aqualogic/default.nix @@ -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" ]; From aea1a6c3cdea7b5886cfcf1e99f9ae085ad4d7a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 18:07:30 +0200 Subject: [PATCH 03/15] python3Packages.foolscap: 20.4.0 -> 21.7.0 --- .../python-modules/foolscap/default.nix | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index e0d38a5a1313..ea0c17d5524a 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -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; [ ]; }; - } From 652d498786800389ee3314f94e083b6828be90a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 16:30:03 +0200 Subject: [PATCH 04/15] python3Packages.hstspreload: 2021.6.28 -> 2021.7.5 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index e6a3837522e6..6833837b6968 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -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 From a7a7be8b94b57845b8af6bbf8829af384ce81fd3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 07:26:37 +0000 Subject: [PATCH 05/15] k9s: 0.24.12 -> 0.24.13 --- pkgs/applications/networking/cluster/k9s/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index b2788f8b0701..8da48f8485f4 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -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 = '' From fc745d501da187e928cb8879b73deeeb3efaee2e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 17:49:34 +0200 Subject: [PATCH 06/15] python3Packages.bitarray: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index d7e15d4c1e1b..28ae80020986 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -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 = '' From 8d113676ca61528b4defde7bacc303c5e3ef7f73 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 07:18:23 +0000 Subject: [PATCH 07/15] just: 0.9.6 -> 0.9.8 --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 8a8d4201451f..d7a2e7338592 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -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 ]; From 8211a76d5b01b375c7382ac883f9796774480d03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 06:41:26 +0000 Subject: [PATCH 08/15] humioctl: 0.28.4 -> 0.28.5 --- pkgs/applications/logging/humioctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 591d1569bdd6..f73c38591f95 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -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}"; From 7b48f6295d4370159b0749a66718dce8474aa3f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 23:47:15 +0000 Subject: [PATCH 09/15] libcyaml: 1.1.0 -> 1.2.0 --- pkgs/development/libraries/libcyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcyaml/default.nix b/pkgs/development/libraries/libcyaml/default.nix index b316b6b63956..0fabdb49ca11 100644 --- a/pkgs/development/libraries/libcyaml/default.nix +++ b/pkgs/development/libraries/libcyaml/default.nix @@ -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 ]; From 2b42d61cefabac24310fbe8eaa9e9be2e6b958c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 02:51:37 +0000 Subject: [PATCH 10/15] codeql: 2.5.6 -> 2.5.7 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index a2396314387c..df3c42b4718f 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -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 = [ From f62e46d62976148e99335ca860402c1dbc226a2a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 05:44:13 +0000 Subject: [PATCH 11/15] goreleaser: 0.172.1 -> 0.173.1 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 18c936befb4c..34195c2fffe0 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -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=" From 97111e82cad9ea979aad656db44cc03ac278a02c Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Wed, 7 Jul 2021 17:40:59 +0200 Subject: [PATCH 12/15] python3Packages.pymetar: 1.2 -> 1.3 The original homepage URL is inaccessible, changed it to the GitHub page. --- pkgs/development/python-modules/pymetar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index ef5273936cf4..b4ff976c8eac 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -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 ]; }; From addf2a6edf9a91464b5ab527b25dbdf18e36bcdd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 16:33:10 +0200 Subject: [PATCH 13/15] python3Packages.httmock: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/httmock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index cbf6b95ccd36..8976afaf852e 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "httmock"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "patrys"; repo = "httmock"; rev = version; - sha256 = "1dy7pjq4gz476jcnbbpzk8w8qxr9l8wwgw9x2c7lf6fzsgnf404q"; + sha256 = "sha256-yid4vh1do0zqVzd1VV7gc+Du4VPrkeGFsDHqNbHL28I="; }; checkInputs = [ requests ]; From ab7068523804ac953849b2d8de7a6b4ee178a28f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 16:40:06 +0200 Subject: [PATCH 14/15] python3Packages.httmock: enable tests --- .../python-modules/httmock/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index 8976afaf852e..7928189c7cd1 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -1,7 +1,12 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, pytestCheckHook +}: buildPythonPackage rec { - pname = "httmock"; + pname = "httmock"; version = "1.4.0"; src = fetchFromGitHub { @@ -11,12 +16,19 @@ buildPythonPackage rec { 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 ]; }; } From b749ff4f51211db2bd0d9931aedaf110467c1fbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 17:01:11 +0200 Subject: [PATCH 15/15] python3Packages.pg8000: 1.19.5 -> 1.20.0 --- pkgs/development/python-modules/pg8000/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 5560e918ac4a..db18611f20aa 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -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 = [