From d8b840a60f70d07de496572fa706ace44f90ef78 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Mon, 30 May 2022 20:41:33 +0900 Subject: [PATCH 01/40] bpftrace: 0.14.1 -> 0.15.0 --- .../linux/bpftrace/btf-dump-new-0.6.0.patch | 39 ------------------- pkgs/os-specific/linux/bpftrace/default.nix | 9 +---- 2 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch diff --git a/pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch b/pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch deleted file mode 100644 index b5037192203c..000000000000 --- a/pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ur source/src/btf.cpp new/src/btf.cpp ---- source/src/btf.cpp 1970-01-01 09:00:01.000000000 +0900 -+++ new/src/btf.cpp 2021-12-04 21:46:59.337023489 +0900 -@@ -225,7 +225,7 @@ - char err_buf[256]; - int err; - -- dump = btf_dump__new(btf, nullptr, &opts, dump_printf); -+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf); - err = libbpf_get_error(dump); - if (err) - { -@@ -496,7 +496,7 @@ - char err_buf[256]; - int err; - -- dump = btf_dump__new(btf, nullptr, &opts, dump_printf); -+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf); - err = libbpf_get_error(dump); - if (err) - { -@@ -554,7 +554,7 @@ - char err_buf[256]; - int err; - -- dump = btf_dump__new(btf, nullptr, &opts, dump_printf); -+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf); - err = libbpf_get_error(dump); - if (err) - { -@@ -648,7 +648,7 @@ - char err_buf[256]; - int err; - -- dump = btf_dump__new(btf, nullptr, &opts, dump_printf); -+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf); - err = libbpf_get_error(dump); - if (err) - { diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 0dd477ee31d2..ebf15480c6e2 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.14.1"; + version = "0.15.0"; # Cherry-picked from merged PR, remove this hook on next update # https://github.com/iovisor/bpftrace/pull/2242 @@ -33,14 +33,9 @@ stdenv.mkDerivation rec { owner = "iovisor"; repo = "bpftrace"; rev = "v${version}"; - sha256 = "sha256-QDqHAEVM/XHCFMS0jMLdKJfDUOpkUqONOf8+Fbd5dCY="; + sha256 = "sha256-9adZAKSn00W2yNwVDbVB1/O5Y+10c4EkVJGCHyd4Tgg="; }; - # libbpf 0.6.0 relies on typeof in bpf/btf.h to pick the right version of - # btf_dump__new() but that's not valid c++. - # see https://github.com/iovisor/bpftrace/issues/2068 - patches = [ ./btf-dump-new-0.6.0.patch ]; - buildInputs = with llvmPackages; [ llvm libclang elfutils libelf bcc From 9f75123e00657d28e617d41c17280740bf08877a Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 10 Jun 2022 06:37:56 +0900 Subject: [PATCH 02/40] libbpf: 0.7.0 -> 0.8.0 --- pkgs/os-specific/linux/libbpf/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index cb2f4611fde0..e9b04ff64181 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -1,6 +1,5 @@ { fetchFromGitHub -, fetchpatch -, libelf +, elfutils , pkg-config , stdenv , zlib @@ -10,17 +9,17 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-NFVJ8JquWVzu+QoaaOMzhnu6/IqdP1FPhtJFidXA4L4="; + sha256 = "sha256-D2ASqSZFNShCdRCH8LDocLP/O4sME9nT73rk1KsJeJE="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libelf zlib ]; + buildInputs = [ elfutils zlib ]; enableParallelBuilding = true; makeFlags = [ "PREFIX=$(out)" "-C src" ]; From f167634b357bb205e3001797be83720dc6abaaa4 Mon Sep 17 00:00:00 2001 From: Daniel Glinka Date: Wed, 29 Jun 2022 07:47:23 -0400 Subject: [PATCH 03/40] maintainers: add 0xd61 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bff3019a09d2..ec8cec276644 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -85,6 +85,12 @@ githubId = 56617252; matrix = "@oxc45:matrix.org"; }; + _0xd61 = { + email = "dgl@degit.co"; + name = "Daniel Glinka"; + github = "0xd61"; + githubId = 8351869; + }; _1000101 = { email = "b1000101@pm.me"; github = "1000101"; From 08af758396433af628747879dc4430176c48992a Mon Sep 17 00:00:00 2001 From: Daniel Glinka Date: Wed, 29 Jun 2022 07:47:53 -0400 Subject: [PATCH 04/40] gf: init at unstable-2022-06-22 --- ...se-optional-freetype-with-pkg-config.patch | 13 ++++ pkgs/development/tools/misc/gf/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 79 insertions(+) create mode 100644 pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch create mode 100644 pkgs/development/tools/misc/gf/default.nix diff --git a/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch b/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch new file mode 100644 index 000000000000..7e748dca244e --- /dev/null +++ b/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch @@ -0,0 +1,13 @@ +diff --git a/build.sh b/build.sh +index e471563..32bdfab 100755 +--- a/build.sh ++++ b/build.sh +@@ -5,7 +5,7 @@ gdb --version > /dev/null 2>&1 || printf "\033[0;31mWarning\033[0m: GDB not dete + echo q | gdb | grep "(gdb)" > /dev/null 2>&1 || printf "\033[0;31mWarning\033[0m: Your copy of GDB appears to be non-standard or has been heavily reconfigured with .gdbinit.\nIf you are using GDB plugins like 'GDB Dashboard' you must remove them,\nas otherwise gf will be unable to communicate with GDB.\n" + + # Check if FreeType is available. +-if [ -d /usr/include/freetype2 ]; then extra_flags="$extra_flags -lfreetype -D UI_FREETYPE -I /usr/include/freetype2"; ++if pkg-config --cflags freetype2 > /dev/null; then extra_flags="$extra_flags -D UI_FREETYPE $(pkg-config --cflags --libs freetype2)"; + else printf "\033[0;31mWarning\033[0m: FreeType could not be found. The fallback font will be used.\n"; fi + + # Check if SSE2 is available. diff --git a/pkgs/development/tools/misc/gf/default.nix b/pkgs/development/tools/misc/gf/default.nix new file mode 100644 index 000000000000..f460b844ada0 --- /dev/null +++ b/pkgs/development/tools/misc/gf/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, makeWrapper +, fetchFromGitHub +, libX11 +, pkg-config +, gdb +, freetype +, freetypeSupport ? true +, extensions ? [ ] +}: + +stdenv.mkDerivation rec { + pname = "gf"; + version = "unstable-2022-06-22"; + + src = fetchFromGitHub { + repo = "gf"; + owner = "nakst"; + rev = "e0d6d2f59344f853a4a204d5313db6b6a5e5de7d"; + sha256 = "01fln4wnn1caqr4wa1nhcp0rqdx5m5nqyn2amvclp5hhi3h3qaiq"; + }; + + nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ libX11 gdb ] + ++ lib.optional freetypeSupport freetype; + + patches = [ + ./build-use-optional-freetype-with-pkg-config.patch + ]; + + postPatch = lib.forEach extensions (ext: '' + cp ${ext} ./${ext.name or (builtins.baseNameOf ext)} + ''); + + preConfigure = '' + patchShebangs build.sh + ''; + + buildPhase = '' + runHook preBuild + extra_flags=-DUI_FREETYPE_SUBPIXEL ./build.sh + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p "$out/bin" + cp gf2 "$out/bin/" + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/gf2 --prefix PATH : ${lib.makeBinPath[ gdb ]} + ''; + + meta = with lib; { + description = "A GDB Frontend"; + homepage = "https://github.com/nakst/gf"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ _0xd61 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15eb8b69dfaf..15aab98e3da0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16660,6 +16660,8 @@ with pkgs; readline = readline81; }; + gf = callPackage ../development/tools/misc/gf { }; + java-language-server = callPackage ../development/tools/java/java-language-server { }; jhiccup = callPackage ../development/tools/java/jhiccup { }; From 59128a34c3a133ecb0563f2fb177abc83d20fe02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 7 Jul 2022 14:25:13 +0200 Subject: [PATCH 05/40] nixos/i18n: always generate C locale --- nixos/modules/config/i18n.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index c55726d09c60..60af360a2a54 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -55,14 +55,18 @@ with lib; type = types.listOf types.str; default = builtins.map (l: l + "/UTF-8") (unique ( - [ config.i18n.defaultLocale ] ++ - (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) + [ + "C.UTF-8" + config.i18n.defaultLocale + ] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) )); defaultText = literalExpression '' builtins.map (l: l + "/UTF-8") (unique ( - [ config.i18n.defaultLocale ] ++ - (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) + [ + "C.UTF-8" + config.i18n.defaultLocale + ] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) )) ''; example = ["en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" "nl_NL/ISO-8859-1"]; From 539aeb1668a76c1f2f6eb469b8458b1025ca076e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 14:49:19 +0000 Subject: [PATCH 06/40] go-ethereum: 1.10.18 -> 1.10.20 --- pkgs/applications/blockchains/go-ethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index ef79e514638a..767d8e7ba00c 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.18"; + version = "1.10.20"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "1jfyhzklznjrdki6m8wjgqzp63b6n6vy7ws3l0al58zkaybnpikw"; + sha256 = "sha256-PIQP08QxGJmla7LKEtnEXmwJxDYh02q4fmRHZsYtthU="; }; - vendorSha256 = "10xpxz8ybgwqizqy9d3phza8mlxxpsbk4qsf271r7ls4qr5q1wxz"; + vendorSha256 = "sha256-AlXfKytDrQrp0gvnC5/gTlJAVJBAQNHm4MoBu9O9jM4="; doCheck = false; From 6e4203aa50c79ea68f10556d9a30a00845650b66 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 8 Jul 2022 10:47:05 +0200 Subject: [PATCH 07/40] python310Packages.typecode: Fix tests --- pkgs/development/python-modules/typecode/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index a177b845b4b3..2fa0010bdd03 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { "TestFileTypesDataDriven" # AssertionError: assert 'application/x-bytecode.python'... "test_compiled_python_1" + "test_package_json" ]; pythonImportsCheck = [ From ab77b42008c31c21eec66b7d6ff079a1ed7d12d4 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 8 Jul 2022 11:04:52 +0200 Subject: [PATCH 08/40] python310Packages.h5netcdf: 0.8.1 -> 1.0.1 --- .../python-modules/h5netcdf/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 23a8c4ddcb26..26902e09aaca 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -6,23 +6,21 @@ , pytestCheckHook , netcdf4 , pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "h5netcdf"; - version = "0.8.1"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "09bbnpsvwksb07wijn7flyyza56h5b2g2cw0hb3slmwxz6cgcjmr"; + sha256 = "sha256-d2cE+s2LgiRtbUBoxQXDibO3C5v5kgzPusfzXNxjTaw="; }; - patches = [ - (fetchpatch{ - url = "https://patch-diff.githubusercontent.com/raw/h5netcdf/h5netcdf/pull/82.patch"; - sha256 = "0x9bq9jl4kvw152adkpcyqslhpi7miv80hrnpl2w2y798mmbs0s4"; - }) - ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ h5py From 3b60f88f6e748a0e63c46e129f783919653ef0f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 11:14:55 +0000 Subject: [PATCH 09/40] python310Packages.aioskybell: 22.6.1 -> 22.7.0 --- pkgs/development/python-modules/aioskybell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix index db2573fa9599..0f3e8c041e0c 100644 --- a/pkgs/development/python-modules/aioskybell/default.nix +++ b/pkgs/development/python-modules/aioskybell/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aioskybell"; - version = "22.6.1"; + version = "22.7.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VaG8r4ULbjI7LkIPCit3bILZgOi9k7ddRQXwVzplaCM="; + hash = "sha256-aBT1fDFtq1vasTvCnAXKV2vmZ6LBLZqRCiepv1HDJ+Q="; }; propagatedBuildInputs = [ From 231e9367d7081dcc7e96f659cd6918ecf3d37539 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 11:30:37 +0000 Subject: [PATCH 10/40] fundoc: 0.4.1 -> 0.4.2 --- pkgs/development/tools/fundoc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/fundoc/default.nix b/pkgs/development/tools/fundoc/default.nix index 47484b78759c..f7a81a27701f 100644 --- a/pkgs/development/tools/fundoc/default.nix +++ b/pkgs/development/tools/fundoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fundoc"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "csssr"; repo = pname; rev = "v${version}"; - sha256 = "0nd03c2lz07ghaab67kgl5pw8z8mv6kwx3xzr4pqr7v5b983py6v"; + sha256 = "sha256-qmsr4bhErpMzS71NhLep0EWimZb/S3aEhMbeBNa5y8E="; }; - cargoSha256 = "sha256-6riBlCyqNN2nzgwfVfbRy1avT9b0PdetOrbmbaltsjE="; + cargoSha256 = "sha256-G2KRjkccS/rfrb7BtotbG6L4WaVnfwY1UEXLnVBLSzM="; meta = with lib; { description = "Language agnostic documentation generator"; From ff914ab7907a3538567edde8f8720595d838c2cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 11:57:35 +0000 Subject: [PATCH 11/40] python310Packages.asf-search: 4.0.1 -> 4.0.3 --- pkgs/development/python-modules/asf-search/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 0e534aa0f283..616402aa7174 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "4.0.1"; + version = "4.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-58roOxLFTu7WddgifuvaMoFlEh+iHrrL0rSJjAw35d0="; + hash = "sha256-Af6Nyrl1mrYTG24/nIv+x5Znk20HOubjjPAUvbdnj+Y="; }; propagatedBuildInputs = [ From f3b7105c7762b08e5f79dc876612cd5063090b81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 13:07:09 +0000 Subject: [PATCH 12/40] python310Packages.azure-servicebus: 7.7.0 -> 7.8.0 --- pkgs/development/python-modules/azure-servicebus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 7ea0941441f8..47849c9c6f1a 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.7.0"; + version = "7.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-D9CdVfPU7FwiAQd2Pw/CMJsHj8psYtVq3wYJlVHVA1s="; + hash = "sha256-KTvJXOJ3o2KUL9iPcus6m0qS3hAAB3Wz0uPgCttFqlk="; }; propagatedBuildInputs = [ From 3020f0014c0604e9ab9619c96e57fdf9d28839a3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 8 Jul 2022 18:22:14 +0200 Subject: [PATCH 13/40] php: sha256 -> hash --- pkgs/development/interpreters/php/8.0.nix | 2 +- pkgs/development/interpreters/php/8.1.nix | 2 +- pkgs/development/interpreters/php/generic.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 55a8f55a6799..f1ba12e06c02 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -3,7 +3,7 @@ let base = callPackage ./generic.nix (_args // { version = "8.0.20"; - sha256 = "y3Zmv2ftn2yYfUg2yvA9SzZFN+anXlbNXJhnYOzC/dg="; + hash = "sha256-y3Zmv2ftn2yYfUg2yvA9SzZFN+anXlbNXJhnYOzC/dg="; }); in diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 7c289dbb6cbd..c5ffbea888c2 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -3,7 +3,7 @@ let base = callPackage ./generic.nix (_args // { version = "8.1.7"; - sha256 = "uBZ1PrAFUR5pXZCUXCcJPDI2zHPbEmJlbZ+t1z6tfp0="; + hash = "sha256-uBZ1PrAFUR5pXZCUXCcJPDI2zHPbEmJlbZ+t1z6tfp0="; }); in diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 70052197d220..5984113574c2 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -29,7 +29,7 @@ let , xcbuild , version - , sha256 + , hash , extraPatches ? [ ] , packageOverrides ? (final: prev: { }) , phpAttrsOverrides ? (attrs: { }) @@ -290,7 +290,7 @@ let src = fetchurl { url = "https://www.php.net/distributions/php-${version}.tar.bz2"; - inherit sha256; + inherit hash; }; patches = [ ./fix-paths-php7.patch ] ++ extraPatches; From b429bc25083c82510e4505cea74c6c26c2cbd43c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 8 Jul 2022 18:23:30 +0200 Subject: [PATCH 14/40] php80: 8.0.20 -> 8.0.21 https://www.php.net/ChangeLog-8.php#8.0.21 --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index f1ba12e06c02..193eabe6c01f 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.20"; - hash = "sha256-y3Zmv2ftn2yYfUg2yvA9SzZFN+anXlbNXJhnYOzC/dg="; + version = "8.0.21"; + hash = "sha256-HLd2LR/+zOruuvufbiQTLKI/sUQ8tWMND8z1PwTPoSY="; }); in From e416f8806d273338effcef70acc3a43b7529fd10 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 8 Jul 2022 18:24:08 +0200 Subject: [PATCH 15/40] php81: 8.1.7 -> 8.1.8 Fixes CVE-2022-31627 https://www.php.net/ChangeLog-8.php#8.1.8 --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index c5ffbea888c2..e56ff13864bb 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.7"; - hash = "sha256-uBZ1PrAFUR5pXZCUXCcJPDI2zHPbEmJlbZ+t1z6tfp0="; + version = "8.1.8"; + hash = "sha256-uIFaWgJDFFPUJh41mL0fKFFuTANU8yjBKJDyV4cOTAE="; }); in From d9da51c6ba366cba6e84ad6f5c33482bbd040b42 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Jul 2022 21:11:49 +0200 Subject: [PATCH 16/40] librespeed-cli: 1.0.9 -> 1.0.10 --- pkgs/tools/misc/librespeed-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/librespeed-cli/default.nix b/pkgs/tools/misc/librespeed-cli/default.nix index 09d6de6ad9d3..fba0942dab52 100644 --- a/pkgs/tools/misc/librespeed-cli/default.nix +++ b/pkgs/tools/misc/librespeed-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "librespeed-cli"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "librespeed"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "sha256-rtZZgx5QNwYd6vXSts/ICSiXv7sMZA8ihHgxTjZ/6KQ="; + sha256 = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8="; }; vendorSha256 = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ="; From 3d947c1d277a8fef15c58705c5fee46f210543db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Jul 2022 21:12:56 +0200 Subject: [PATCH 17/40] pip-audit: 2.4.0 -> 2.4.1 --- pkgs/development/tools/pip-audit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 13fcc054dd6a..9b8ebf07197c 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -25,14 +25,14 @@ with py.pkgs; buildPythonApplication rec { pname = "pip-audit"; - version = "2.4.0"; + version = "2.4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "v${version}"; - hash = "sha256-l1oefdveAmmkRKnEOvdVp4efYd/nFkyDyVP5dxAG1CI="; + hash = "sha256-Uko8ZtVMu9a/WrgSREFY3c8O+psE6cWpyHKVrOTJOJE="; }; nativeBuildInputs = [ From a5aa0860b9c599eee3280fa4899ec0237a1eb260 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Jul 2022 21:33:03 +0200 Subject: [PATCH 18/40] python310Packages.elkm1-lib: 2.0.0 -> 2.0.2 --- pkgs/development/python-modules/elkm1-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 40f9aa451b69..f0815b15c71d 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.0.0"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - hash = "sha256-o0RQgAP38W7paVJonrfj54y2OhMmTihT9xiipEyNVaM="; + hash = "sha256-2UneQL8LT/zm0iusKay9SxeJClGrDi6yL0lRA8ugUms="; }; nativeBuildInputs = [ From aefbb8eb17ad01058a15d1bd0c8506d1073baa1f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Jul 2022 21:38:47 +0200 Subject: [PATCH 19/40] python310Packages.hahomematic: 1.9.4 -> 2022.7.1 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index ff6c4bf2cdb3..4fcc26b7137a 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.9.4"; + version = "2022.7.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-swi9m2vM573h+im3p97DT73LtalipoCnGMbcnBFyCfw="; + sha256 = "sha256-V+g4TlwnTuirmxoMmq/A0dGKqubEH8ObPuroXKbSH8U="; }; propagatedBuildInputs = [ From 541dc6185823eba8208a4b2c2640cbb04e500f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Fri, 8 Jul 2022 18:24:25 -0300 Subject: [PATCH 20/40] zen-kernels: linux_lqx, linux_zen: 5.18.9 -> 5.18.10 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index dbe93b778b89..10245a00a9b8 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "5.18.9"; #zen + version = "5.18.10"; #zen suffix = "zen1"; #zen - sha256 = "0smmy7axz874x22s8yram3k64n3w9npfh4irgan1if8k87pgx474"; #zen + sha256 = "0kqzs3g9w1sfin61sapc403pc65acsy18qk8ldkhzhjzv90fw4im"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "5.18.9"; #lqx + version = "5.18.10"; #lqx suffix = "lqx1"; #lqx - sha256 = "1dvdav0d3fw9frp1l2k525yai071gvign2z81fna3j63ddy2bxp1"; #lqx + sha256 = "0b666lwqhiydkikca2x55ljgpw9sba8r7jvcvp6nghm4yf3a11mp"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From 4b6837d9c36e589df86dbdb3802745d8f0d85130 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 00:16:55 +0200 Subject: [PATCH 21/40] python310Packages.pycec: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/pycec/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pycec/default.nix b/pkgs/development/python-modules/pycec/default.nix index c65ea3a695ff..640cc6b36561 100644 --- a/pkgs/development/python-modules/pycec/default.nix +++ b/pkgs/development/python-modules/pycec/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , libcec , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pycec"; - version = "0.5.1"; + version = "0.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "konikvranik"; repo = pname; rev = "v${version}"; - sha256 = "1ivnmihajhfkwwghgl0f8n9ragpirbmbj1mhj9bmjjc29zzdc3m6"; + sha256 = "sha256-H18petSiUdftZN8Q3fPmfSJA3OZks+gI+FAq9LwkRsk="; }; propagatedBuildInputs = [ @@ -24,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pycec" ]; + pythonImportsCheck = [ + "pycec" + ]; meta = with lib; { description = "Python modules to access HDMI CEC devices"; From c31e05fb633149ed30a4fa5f88e251ca061ab590 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 00:47:02 +0200 Subject: [PATCH 22/40] kubeaudit: 0.18.0 -> 0.19.0 --- pkgs/tools/security/kubeaudit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubeaudit/default.nix b/pkgs/tools/security/kubeaudit/default.nix index b6ee9f6dc0e1..2c9d32501ce9 100644 --- a/pkgs/tools/security/kubeaudit/default.nix +++ b/pkgs/tools/security/kubeaudit/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubeaudit"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - hash = "sha256-aMnhEY16SybE5Oavc6stw7xoyNblCwFJpzYHsDBENX4="; + hash = "sha256-exJGjFeqk3hM52Zgfs+2JEVdzVZf79ZRQH2krusiw8c="; }; - vendorSha256 = "sha256-plsnzeRIaJNNzrkzQYtxOqWejTDntPRemIhcfpxXgBg="; + vendorSha256 = "sha256-hi83C05eEXqQ6kMGv6n/fjsYAXveyVRqKZds5iv8Oio="; postInstall = '' mv $out/bin/cmd $out/bin/$pname From 2a6fe5c1dd8c8cf9245e66029eb98cacaf6758c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 00:50:04 +0200 Subject: [PATCH 23/40] kubescape: 2.0.160 -> 2.0.161 --- pkgs/tools/security/kubescape/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 499d66a43e4e..e8c9aa896e77 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "kubescape"; - version = "2.0.160"; + version = "2.0.161"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - hash = "sha256-IQ80AnI+mHdZxqgVuZvDLO6LuhLdgRGu6Hyz1kJ2v38="; + hash = "sha256-rsO6ZTQg5fmpp+5Zx36tQnDW1vf2k+FCI3cFbGZifVM="; }; - vendorSha256 = "sha256-x+Sxe4fBhOvE5An0dIqL5q3eEKzNJwugToGZ8NZ5GGA="; + vendorSha256 = "sha256-EinrVdGdYroh0X/ACAVD2gw4k0jrPHQ3Ucb3TUYKd8Q="; nativeBuildInputs = [ installShellFiles From fcc3bd053c85b2db6e49d79cd2934ace4687a31e Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 9 Jul 2022 00:57:40 +0200 Subject: [PATCH 24/40] slack: 4.26.1 -> 4.27.154 (darwin), 4.27.156 (linux) --- .../networking/instant-messengers/slack/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 953d5134377b..5d497546095b 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -44,14 +44,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.26.1"; - x86_64-darwin-sha256 = "0883nnnwjaii89x6idqcl68acw1fbijyhhrwy7inwgrdw233qqcd"; + x86_64-darwin-version = "4.27.154"; + x86_64-darwin-sha256 = "0a3cc9kkiq18vr4hk532vc59cza1hq8qh9x9hlhli4n72n3h7y3n"; - x86_64-linux-version = "4.26.1"; - x86_64-linux-sha256 = "0nw3cfypinzp8csli1myh3b9hvv2pg1d8p9izg7znfpnlwps8gy1"; + x86_64-linux-version = "4.27.156"; + x86_64-linux-sha256 = "sha256-/xtD+/+KGtPr4vQJm8ZczvpyPxfMBw0OE7hzTzFhSs0="; - aarch64-darwin-version = "4.26.1"; - aarch64-darwin-sha256 = "1p5qn5zyibpyiv5is70g1la9y6wc038j3sxjyxflgqsdvania7vq"; + aarch64-darwin-version = "4.27.154"; + aarch64-darwin-sha256 = "1n3vgcsbi1w49w4xqc5hyadb9qwvsqdiirfw9v4s65wsnark1iz6"; version = { x86_64-darwin = x86_64-darwin-version; From 510f1462a27568248cdb55312e19dec275f4ea73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 00:58:28 +0200 Subject: [PATCH 25/40] python310Packages.types-docutils: 0.18.3 -> 0.19.0 --- pkgs/development/python-modules/types-docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index ed7e9126a842..14b3e6ed5d25 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.18.3"; + version = "0.19.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-oO+DHcIGNfNQ+pz/WRIxwx0n51dx5Z/WyXm2wMfgMpI="; + hash = "sha256-lJNrGWGqzaYexrsKzxFpzXgwtSMLZFhVwdR4m68ZaF4="; }; # Module doesn't have tests From f3c77572f005485afa87c2879cb251102ed0ddc7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 01:02:36 +0200 Subject: [PATCH 26/40] python310Packages.types-setuptools: 57.4.18 -> 62.6.0 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 28c29d0c5de8..19708ad5733d 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.18"; + version = "62.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-juA9gj/n/aC9Nfrq4z01y1wltJcmPmpYs0xM/QX0C88="; + sha256 = "sha256-x3oytRZ7ng2Zwfezm39aPsABxxCZMd1jxRZS+eRmPQc="; }; # Module doesn't have tests From ea1d03479b0d6ac8e511062024f848845de26714 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 01:06:17 +0200 Subject: [PATCH 27/40] python310Packages.tldextract: 3.3.0 -> 3.3.1 --- pkgs/development/python-modules/tldextract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index fe32af267133..f92ea4b8dd8a 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.3.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rc0kq/Ic40UEF81aAPI7fldVTOiugnM03RK/y7YnTPE="; + hash = "sha256-/hWsMgXlolthaJNp+Yy0XHd4qPKvET18EVWezlGV8tY="; }; nativeBuildInputs = [ From 924540c6c7478092e4b9933a4b0f09454fcbb4d8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 9 Jul 2022 01:19:54 +0200 Subject: [PATCH 28/40] chromiumDev: 104.0.5112.20 -> 105.0.5148.2 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 548910540fa5..ff6b1705b0ce 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "104.0.5112.20", - "sha256": "0adzdk3m2l4pjlk82sqavwgxf6a5darbiwchmlrsxc58p9xxag4s", - "sha256bin64": "13p2w4wwd8ji5ydgz4x7w2q4rmn74w3z2fl999q7zaq1cra21pzd", + "version": "105.0.5148.2", + "sha256": "0qnkpda0chsxgfby5g38xmpkilyz2v12mrwlayfsp2iqhc7d07vz", + "sha256bin64": "045czwsra17iclgyzsnbbjr55lrmhzf97c2k0wwjrmd59cx4b1sa", "deps": { "gn": { - "version": "2022-06-08", + "version": "2022-06-22", "url": "https://gn.googlesource.com/gn", - "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", - "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" + "rev": "29accf5ac2eadfc53e687081583b7bc1592a8839", + "sha256": "0z9gaw8p88yhb7fi844pvylsbgjy3ni7bnca1yx37928fjw3ppln" } } }, From ae42114134a2b8c3b4c53a7c6ec01711fe3ca058 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 01:25:28 +0200 Subject: [PATCH 29/40] python310Packages.rstcheck-core: init at 1.0.2 --- .../python-modules/rstcheck-core/default.nix | 63 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/python-modules/rstcheck-core/default.nix diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix new file mode 100644 index 000000000000..a867a9434820 --- /dev/null +++ b/pkgs/development/python-modules/rstcheck-core/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, docutils +, fetchFromGitHub +, importlib-metadata +, mock +, poetry-core +, pydantic +, pytest-mock +, pytestCheckHook +, pythonOlder +, types-docutils +, typing-extensions +}: + +buildPythonPackage rec { + pname = "rstcheck-core"; + version = "1.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rstcheck"; + repo = pname; + rev = "v${version}"; + hash = "sha256-XNr+prK9VDP66ZaFvh3Qrx+eJs6mnVO8lvoMC/qrCLs="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + docutils + importlib-metadata + pydantic + types-docutils + typing-extensions + ]; + + checkInputs = [ + mock + pytest-mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' + ''; + + pythonImportsCheck = [ + "rstcheck_core" + ]; + + meta = with lib; { + description = "Library for checking syntax of reStructuredText"; + homepage = "https://github.com/rstcheck/rstcheck-core"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df044ef44b38..80ee4f3a2d80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9417,6 +9417,8 @@ in { rstcheck = callPackage ../development/python-modules/rstcheck { }; + rstcheck-core = callPackage ../development/python-modules/rstcheck-core { }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices; }; From eb480037ead352117441133d9ac7748f67a2a432 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 01:31:10 +0200 Subject: [PATCH 30/40] python310Packages.rstcheck: 5.0.0 -> 6.0.0.post1 --- .../python-modules/rstcheck/default.nix | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index 5bf519e99ec6..b5a3ccefc08c 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -1,26 +1,32 @@ { lib , buildPythonPackage +, colorama , docutils , fetchFromGitHub +, importlib-metadata , poetry-core +, pydantic , pytestCheckHook , pythonOlder +, rstcheck-core +, shellingham +, typer , types-docutils , typing-extensions }: buildPythonPackage rec { pname = "rstcheck"; - version = "5.0.0"; + version = "6.0.0.post1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "myint"; + owner = "rstcheck"; repo = pname; rev = "v${version}"; - hash = "sha256-vTUa/eP6/flxRLBuzdHoNoPoGAg6XWwu922az8tLgJM="; + hash = "sha256-Ljg1cciT9qKL9xtBxQ8OLygDpV/1yR5XiJOzHrLr6xw="; }; nativeBuildInputs = [ @@ -28,15 +34,28 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + colorama docutils + rstcheck-core + shellingham types-docutils typing-extensions + pydantic + typer + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + importlib-metadata ]; checkInputs = [ pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' + ''; + pythonImportsCheck = [ "rstcheck" ]; From 016e4b74f9bda284bf015267fb657a5f6da15b61 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 01:35:03 +0200 Subject: [PATCH 31/40] python310Packages.aiopyarr: 22.6.0 -> 22.7.0 --- pkgs/development/python-modules/aiopyarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix index b3789c291f70..a2e66b42af74 100644 --- a/pkgs/development/python-modules/aiopyarr/default.nix +++ b/pkgs/development/python-modules/aiopyarr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiopyarr"; - version = "22.6.0"; + version = "22.7.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - hash = "sha256-LfZEM1vPccQBrvNz9CGVlihg6YAB7FAvUZogu/ngZ4Y="; + hash = "sha256-ALFaWy/wY8PTuMixHEWaXXmKNSLf9Cm2pgffVHnAWLg="; }; propagatedBuildInputs = [ From 21a43e94ac0535f8d9bc36d2953cba59c7afff59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Jul 2022 01:15:49 +0000 Subject: [PATCH 32/40] python310Packages.mongomock: 4.0.0 -> 4.1.2 --- pkgs/development/python-modules/mongomock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix index 85e574f0b6d5..74c3eb285880 100644 --- a/pkgs/development/python-modules/mongomock/default.nix +++ b/pkgs/development/python-modules/mongomock/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "mongomock"; - version = "4.0.0"; + version = "4.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sYMsN0jUdETBiGc3PlzqdUwub2RKDPv9Zn8Xj2i97Pw="; + sha256 = "sha256-8GzWKvuK4+9jujE0mr0iCmV+8N1PAkOilYfFIT+TG30="; }; nativeBuildInputs = [ From 9f5664857b2a42b86cef541b4d1b8dcfc0e4ff32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Jul 2022 05:06:29 +0000 Subject: [PATCH 33/40] crowdin-cli: 3.7.8 -> 3.7.9 --- pkgs/tools/text/crowdin-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index f79f6670625a..d76d4e3ac949 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.7.8"; + version = "3.7.9"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-z9c12KKrh4hV7A92qinNCQGTxZI6IsmJ3Z+3ZcZZljk="; + sha256 = "sha256-goRqj/3BM7DPWlfJH9kgW9JQP1lGWQod6DO8fmcRPqc="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From b85fe98d49c7a12b925e7ac6a1192a0b03e873fb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 9 Jul 2022 13:46:33 +0800 Subject: [PATCH 34/40] v2ray-geoip: 202206230045 -> 202207070057 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index e4ab5df75842..790c323e57fc 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202206230045"; + version = "202207070057"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "2e2aba7f3dfb4139e8a882f85350045f2ef522d1"; - sha256 = "sha256-WFvS51RmkAWivYj0HFAT6S3euJk+GSYLDTN3cmkcCNs="; + rev = "cbabee03cf7b7b60b1167a8a14ba1eba9d9dbb77"; + sha256 = "sha256-bWhsV7+aj75nd8NDeb5D5UjvCChhtXq9lpkaZN41wDk="; }; installPhase = '' From cbee67a9bac75d0f3c0a591ad2ae9de038a833d1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 9 Jul 2022 13:45:41 +0800 Subject: [PATCH 35/40] v2ray-domain-list-community: 20220624025859 -> 20220708161253 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index a5bbb2b5c013..5323348c2f3c 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220624025859"; + version = "20220708161253"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-/4wfTtRsBzOCbx3I3H28tB935xDZPPwHOFFmjiV7kEI="; + sha256 = "sha256-RLfb4DmigoQAKp00RHjGKGjQhCHqxSOLNnphiv1ub8s="; }; vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo="; meta = with lib; { From 823653c46f738ea853b2fab22ebf1803a171fe58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Jul 2022 06:13:01 +0000 Subject: [PATCH 36/40] python310Packages.moku: 2.3 -> 2.4 --- pkgs/development/python-modules/moku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moku/default.nix b/pkgs/development/python-modules/moku/default.nix index 3ed68ce8b47a..de17bca79916 100644 --- a/pkgs/development/python-modules/moku/default.nix +++ b/pkgs/development/python-modules/moku/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "moku"; - version = "2.3"; + version = "2.4"; /* @@ -22,7 +22,7 @@ buildPythonPackage rec { */ src = fetchPypi { inherit pname version; - hash = "sha256-EzVcECjJyrr2NLQkG0Yp/jYBMnsEP1/FnS5O3UplszI="; + hash = "sha256-yFA2NkiRt6wjXJk6i7oxrjD597acAligWId3MDYwTd0="; }; /* From 1476f3689b057ab2d9b0a4e127a055e3ea7d9979 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Jul 2022 06:50:53 +0000 Subject: [PATCH 37/40] python310Packages.vertica-python: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/vertica-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 5836069d9992..3b994b7e50d0 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XccIN5lmrRTNAmK52XeMBZzuNOxSvXFK7COLh5lacDY="; + hash = "sha256-3t9W12tnZztNV6E/f5br3FeznqZQuT6/DAXrbR0sDAU="; }; propagatedBuildInputs = [ From b55d83f112ac82a05e8edcc7d5502da73c59e173 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 9 Jul 2022 08:18:37 +0100 Subject: [PATCH 38/40] decoder: pull patch pending upstream inclusion for -fno-common toolchains Without the change build fails on `staging` as: ld: decoder.o:(.bss.usageScreen+0x0): multiple definition of `usageScreen'; errors.o:(.bss.usageScreen+0x0): first defined here --- pkgs/tools/security/decoder/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/security/decoder/default.nix b/pkgs/tools/security/decoder/default.nix index baaacac5da8a..76dd3003d500 100644 --- a/pkgs/tools/security/decoder/default.nix +++ b/pkgs/tools/security/decoder/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , openssl }: @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-1sT1/iwtc2ievmLuNuooy9b14pTs1ZC5noDwzFelk7w="; }; + patches = [ + # Pull fix pending upstream inclusion for -fno-common toolchains: + # https://github.com/PeterPawn/decoder/pull/29 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/PeterPawn/decoder/commit/843ac477c31108023d8008581bf91c5a3acc1859.patch"; + sha256 = "sha256-rRylz8cxgNyPSqL/THdgEBpzcVx1K+xbjUn4PwP9Jn4="; + }) + ]; + buildInputs = [ openssl ]; From 80e1334f334027f22475ae6a58c4ba58f20af160 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 10:49:04 +0200 Subject: [PATCH 39/40] python310Packages.mongomock: disable on older Python releases - add format - adjust inputs --- .../python-modules/mongomock/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix index 74c3eb285880..e3dc90ef8082 100644 --- a/pkgs/development/python-modules/mongomock/default.nix +++ b/pkgs/development/python-modules/mongomock/default.nix @@ -1,19 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, packaging , pbr -, sentinels -, six , pytestCheckHook +, pythonOlder +, sentinels }: buildPythonPackage rec { pname = "mongomock"; version = "4.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8GzWKvuK4+9jujE0mr0iCmV+8N1PAkOilYfFIT+TG30="; + hash = "sha256-8GzWKvuK4+9jujE0mr0iCmV+8N1PAkOilYfFIT+TG30="; }; nativeBuildInputs = [ @@ -21,15 +25,17 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + packaging sentinels - six ]; checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "mongomock" ]; + pythonImportsCheck = [ + "mongomock" + ]; meta = with lib; { homepage = "https://github.com/mongomock/mongomock"; From d56221e143ab92187738ffa613d4a0b65d9db7b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 11:01:09 +0200 Subject: [PATCH 40/40] python310Packages.h5netcdf: add pythonImportsCheck --- .../python-modules/h5netcdf/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 26902e09aaca..7afa664c1a85 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -12,10 +12,13 @@ buildPythonPackage rec { pname = "h5netcdf"; version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d2cE+s2LgiRtbUBoxQXDibO3C5v5kgzPusfzXNxjTaw="; + hash = "sha256-d2cE+s2LgiRtbUBoxQXDibO3C5v5kgzPusfzXNxjTaw="; }; nativeBuildInputs = [ @@ -31,14 +34,16 @@ buildPythonPackage rec { netcdf4 ]; - disabled = pythonOlder "3.6"; - dontUseSetuptoolsCheck = true; - meta = { + pythonImportsCheck = [ + "h5netcdf" + ]; + + meta = with lib; { description = "netCDF4 via h5py"; homepage = "https://github.com/shoyer/h5netcdf"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - }