From 5c2ab1bfaf0f20616a67c825d8bf4936dc033f29 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 20 Sep 2022 22:52:12 +0800 Subject: [PATCH 01/19] casync: fix cross compilation by passing the correct sphinx --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2e5be60d40a..96ab5d1ed5cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3247,7 +3247,7 @@ with pkgs; keystone = callPackage ../development/libraries/keystone { }; casync = callPackage ../applications/networking/sync/casync { - sphinx = python3Packages.sphinx; + sphinx = buildPackages.python3Packages.sphinx; }; cataract = callPackage ../applications/misc/cataract { }; From ee48dd961b1094e55dc2206a9c27e74080f30c28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 04:27:15 +0000 Subject: [PATCH 02/19] python310Packages.sphinx-jupyterbook-latex: 0.4.6 -> 0.5.0 --- .../python-modules/sphinx-jupyterbook-latex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix index b087ed2bd39e..6c80d6715dcc 100644 --- a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix +++ b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinx-jupyterbook-latex"; - version = "0.4.6"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_jupyterbook_latex"; - sha256 = "8ff3775b11ab4798e6e8ec983601d7aea4c3b8e8b5d28ca758578ede3a791334"; + sha256 = "sha256-XEYsrMcg85loIYvD3ikfgGXGeox0q03H/0wRgTaz+SI="; }; postPatch = '' From 595ed0ec110db51a49c77fabb109bf92de898976 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 21 Sep 2022 13:08:28 +0200 Subject: [PATCH 03/19] opencv: 4.5.4 -> 4.6.0 --- pkgs/development/libraries/opencv/4.x.nix | 8 ++++---- .../opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index ce7f98223357..664f39c0c6cd 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -76,20 +76,20 @@ }: let - version = "4.5.4"; + version = "4.6.0"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "sha256-eIESkc/yYiZZ5iY4t/rAPd+jfjuMYR3srCBC4fO3g70="; + sha256 = "sha256-zPkMc6xEDZU5TlBH3LAzvB17XgocSPeHVMG/U6kfpxg="; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "sha256-RkCIGukZ8KJkmVZQAZTWdVcVKD2I3NcfGShcqzKhQD0="; + sha256 = "sha256-hjRqT7V4Sz7t4IEy89F5M+b0x2ObBbqF8GWLKhWFXtE="; }; # Contrib must be built in order to enable Tesseract support: @@ -177,7 +177,7 @@ let dst = ".cache/ade"; }; - # See opencv/modules/wechat_qrcode/CMakeLists.txt + # See opencv_contrib/modules/wechat_qrcode/CMakeLists.txt wechat_qrcode = { src = fetchFromGitHub { owner = "opencv"; diff --git a/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch b/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch index bb398f7546b0..abeb0d9fde4b 100644 --- a/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch +++ b/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 23a6ca6959..27e121943a 100644 +index 00886cc131..e412771322 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake -@@ -255,21 +255,12 @@ endif() +@@ -257,23 +257,12 @@ endif() # --- OpenEXR (optional) --- if(WITH_OPENEXR) ocv_clear_vars(HAVE_OPENEXR) @@ -20,7 +20,9 @@ index 23a6ca6959..27e121943a 100644 - set(OPENEXR_LIBRARIES IlmImf) - add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr") - if(OPENEXR_VERSION) # check via TARGET doesn't work +- set(BUILD_OPENEXR ON) - set(HAVE_OPENEXR YES) +- set(BUILD_OPENEXR ON) - endif() + set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS}) + set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}) From 637d86afdc05cd07855634026f350ed47d003f57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 05:18:03 +0000 Subject: [PATCH 04/19] terraformer: 0.8.21 -> 0.8.22 --- pkgs/development/tools/misc/terraformer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terraformer/default.nix b/pkgs/development/tools/misc/terraformer/default.nix index eddefa44ed87..46a5be62a746 100644 --- a/pkgs/development/tools/misc/terraformer/default.nix +++ b/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.21"; + version = "0.8.22"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-IcxXR+EQItfUtUfBOlRi8VvxZ3y4OE8mdbch5KqG+wg="; + sha256 = "sha256-TuzQ9qIpioKK4tc1J9Spxt52716Z3yTEufyaRDL57gI="; }; - vendorSha256 = "sha256-zek9c5y6HEvY0eFdv78RDS8+Q2/++34VHRJsIONse6c="; + vendorSha256 = "sha256-fcCvwjqSTeFo0AwTVwWTdygvIPf0EUnZkWqNrQ6eugI="; subPackages = [ "." ]; From 7e72adb2a97c70be38983e682ba38b7cb5110fbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 08:25:23 +0000 Subject: [PATCH 05/19] actionlint: 1.6.18 -> 1.6.19 --- pkgs/development/tools/analysis/actionlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 03a6d1e06c78..8fefd667a2da 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.18"; + version = "1.6.19"; subPackages = [ "cmd/actionlint" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-tRR7Pjxo4UdKklTMFDRW6Xi81IhH+NV3BbgWpgFd1zY="; + sha256 = "sha256-sWsn5jX4kQbK9rOW5FC94mdBwXNAR2a48XFHe37eK6U="; }; - vendorSha256 = "sha256-icl6z41Y5H47U3EgFHL9/xJrfdk43ZfAPbWkKM73sa0="; + vendorSha256 = "sha256-vWU3tEC+ZlrrTnX3fbuEuZRoSg1KtfpgpXmK4+HWrNY="; nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; From 86a12a6f4524bcbd94a5c4a6db006fdfd8db1f43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 11:48:21 +0000 Subject: [PATCH 06/19] flexget: 3.3.27 -> 3.3.28 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index c4a76bdcfce1..aeda298bed5a 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.27"; + version = "3.3.28"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-0FHhYsm2Uwag0e2i7ip32EWjS4Fx6vA9eW1ojSBB5Hc="; + hash = "sha256-u0X4Nqz0oGqpd1agWK83ho4xayRBiy0RynclhjHc69Q="; }; postPatch = '' From 383b0ea9a5d5c674cedae7f9faee43da8054082e Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Fri, 23 Sep 2022 01:10:07 +0200 Subject: [PATCH 07/19] postgresqlPackages.rum: 1.3.12 -> 1.3.13 https://github.com/postgrespro/rum/releases/tag/1.3.13 --- pkgs/servers/sql/postgresql/ext/rum.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix index f1f32bb7cd39..8edd9a2fb47b 100644 --- a/pkgs/servers/sql/postgresql/ext/rum.nix +++ b/pkgs/servers/sql/postgresql/ext/rum.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rum"; - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "postgrespro"; repo = "rum"; rev = version; - hash = "sha256-dI3R1L3dXvEt6Ell7HuGc6XqK8YDf0RmN+JLDtv+uYI="; + hash = "sha256-yy2xeDnk3fENN+En0st4mv60nZlqPafIzwf68jwJ5fE="; }; buildInputs = [ postgresql ]; From d948d26a97dafde706cf1c1aef7ceb3f20981ccb Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 23 Sep 2022 01:31:13 +0200 Subject: [PATCH 08/19] opencv3: 3.4.15 -> 3.4.18 --- pkgs/development/libraries/opencv/3.x.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 00c595d1d2da..550a7f39373a 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -40,20 +40,20 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; assert enablePython -> pythonPackages != null; let - version = "3.4.15"; + version = "3.4.18"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - hash = "sha256-dLwQM2VhVlBV4xazS2rItTscKYeeNlNT0G8G1A1mOmc="; + hash = "sha256-PgwAZNoPknFT0jCLt3TCzend6OYFY3iUIzDf/FptAYA="; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - hash = "sha256-FJDRMmSOT5jA+n2Ke0gEH7n5rgGvB1UzYpYZ1vmucjg="; + hash = "sha256-TEF/GHglOmsshlC6q4iw14ZMpvA0SaKwlidomAN+sRc="; }; # Contrib must be built in order to enable Tesseract support: @@ -155,11 +155,6 @@ stdenv.mkDerivation { # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch - # Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release. - (fetchpatch { - url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch"; - sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41"; - }) ]; # This prevents cmake from using libraries in impure paths (which From 4f5da70ee69f9136f92f32a13a35a284739ad5b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Sep 2022 01:35:23 +0000 Subject: [PATCH 09/19] php80Extensions.mailparse: 3.1.3 -> 3.1.4 --- pkgs/development/php-packages/mailparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/mailparse/default.nix b/pkgs/development/php-packages/mailparse/default.nix index de3ec2d11d4b..b1eda79d915c 100644 --- a/pkgs/development/php-packages/mailparse/default.nix +++ b/pkgs/development/php-packages/mailparse/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "mailparse"; - version = "3.1.3"; - sha256 = "sha256-hlnKYtyaTX0V8H+XoOIULLWCUcjncs02Zp7HQNIpJHE="; + version = "3.1.4"; + sha256 = "sha256-FHSSGzLH7vglFE4r4ZsenUdQWtQJcpgz/VDCXqzflXc="; internalDeps = [ php.extensions.mbstring ]; postConfigure = '' From 873728aca3883c6fbe51ac55118199142dd11bcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Sep 2022 01:39:32 +0000 Subject: [PATCH 10/19] pizarra: 1.7.3 -> 1.7.4 --- pkgs/applications/graphics/pizarra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/applications/graphics/pizarra/default.nix index 6a288bd3bea9..524a8589dce3 100644 --- a/pkgs/applications/graphics/pizarra/default.nix +++ b/pkgs/applications/graphics/pizarra/default.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "pizarra"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitLab { owner = "categulario"; repo = "pizarra-gtk"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-XP+P2w6s47JQV4spKeMKe/Ktxid7uokGYH4IEJ5VHSc="; + sha256 = "sha256-fWwAmzF3ppCvJZ0K4EDrmP8SVPVRayEQTtbhNscZIF0="; }; - cargoSha256 = "sha256-JQZ/95tRlmsrb0EJaPlE8G0fMSeEgLnDi3pkLjcJz/o="; + cargoSha256 = "sha256-pxRJXUeFGdVj6iCFZ4Y8b9z5hw83g8YywpKztTZ0g+4="; nativeBuildInputs = [ wrapGAppsHook pkg-config gdk-pixbuf ]; From 70a9cd722942dd2add3ef7dc4fc6e0567f9140b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Sep 2022 01:44:34 +0000 Subject: [PATCH 11/19] php80Packages.composer: 2.4.1 -> 2.4.2 --- pkgs/development/php-packages/composer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 8918b423ed16..bdf5b1f82537 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.4.1"; + version = "2.4.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-6oz2MI7Hb/lkXDgYhBp1iAlrncJ2c0X71L1JLdim3KY="; + sha256 = "sha256-j+mKAQUMksxoErjq071bbgvNxXXOepOyQr3kl6MddzI="; }; dontUnpack = true; From 29a5c6e399d4ceef455efeb891582f011e4fb8ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Sep 2022 01:46:32 +0000 Subject: [PATCH 12/19] php80Extensions.apcu: 5.1.21 -> 5.1.22 --- pkgs/development/php-packages/apcu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 150c761ae511..2755c09d944c 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "apcu"; - version = "5.1.21"; - sha256 = "sha256-EDNTBEhpbufK3shQUPbfUTX7EzAHLvKnRWk5Ks/s+8E="; + version = "5.1.22"; + sha256 = "sha256-AQoNj9ES4e16UqNWGR2jaWprdjGUI/ew396u6vy0Gh4="; buildInputs = [ pcre2 ]; doCheck = true; From 85e8506aa715c9d0eb74e0c238c0f0d8d3f94dec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Sep 2022 01:47:37 +0000 Subject: [PATCH 13/19] php80Packages.phpstan: 1.8.3 -> 1.8.5 --- pkgs/development/php-packages/phpstan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index e8d731d755f6..31a823ddff75 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "1.8.3"; + version = "1.8.5"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-hKpwTpeEYKDvkkmwU7olW+a1pWiQTPDlN7Wy1IDk4UY="; + sha256 = "sha256-4OScF/hdzWA4kT7YZ/ltZdkmUO42YaTTtTfbl9iRr1I="; }; dontUnpack = true; From 3c4b51f390c47e2669d3befa6c13b84acb68bfc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Sep 2022 01:57:26 +0000 Subject: [PATCH 14/19] postgresql11Packages.plpgsql_check: 2.1.9 -> 2.2.1 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 99dd72577887..a38b6a5ecba0 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.1.9"; + version = "2.2.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O24iXHNIjtkGs1GfZbEBlIc1bGTbKICdhz8Q/gqS33s="; + sha256 = "sha256-0x7alz0EySMcqi4yZm5z6pZeL6glf8AYHG+dVBBtnIU="; }; buildInputs = [ postgresql ]; From 4da697d2a08c28bdab0ac2ce3f88eeac3df323fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Sep 2022 02:01:20 +0000 Subject: [PATCH 15/19] php80Extensions.mongodb: 1.14.0 -> 1.14.1 --- pkgs/development/php-packages/mongodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 14a729188f6c..dcc1a0c0c043 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -14,8 +14,8 @@ buildPecl { pname = "mongodb"; - version = "1.14.0"; - sha256 = "sha256-VXdeaSB6f5xDxiiDIg87xgDT4/Zjr1AAC+cK0+5RgY4="; + version = "1.14.1"; + sha256 = "sha256-uuKodv3ME9bNATn7Wyrv1RydXISmpPxTvr2+PxYtg14="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 307ac4259cef23887e84f17d843505795b0d4b57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Sep 2022 02:02:00 +0000 Subject: [PATCH 16/19] postgresql11Packages.pgroonga: 2.3.8 -> 2.3.9 --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index b1d666f0b7a0..8d8f7c48235d 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.8"; + version = "2.3.9"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-/xlnwnUMW7JuUcSnZUV4nqCFcrfGDvXToz7IJykHCGI="; + sha256 = "sha256-qCS0ndupiRUSI0+BX+o56dgDN9/jPLPdAD16N+gGHqo="; }; nativeBuildInputs = [ pkg-config ]; From e3d72295badd1ce12452f577ec1ad57b6c045465 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Sep 2022 02:02:39 +0000 Subject: [PATCH 17/19] php80Extensions.protobuf: 3.21.5 -> 3.21.6 --- pkgs/development/php-packages/protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix index c07e71702ff3..a5b22e97953a 100644 --- a/pkgs/development/php-packages/protobuf/default.nix +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "protobuf"; - version = "3.21.5"; - sha256 = "sha256-B8ytFyUJ8fLBwHmaKXxfOy0h6tRELjqc5IxUUl/YU5w="; + version = "3.21.6"; + sha256 = "sha256-vyJbWsY/adrMK2PLdu+Zm1paopY+5qct2Y2AS2a70gg="; buildInputs = [ pcre2 ]; From 1ff786cd889d0118f28061a643eb94a1d818e0d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 22:00:53 +0000 Subject: [PATCH 18/19] v2ray-geoip: 202209170841 -> 202209220104 --- 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 de9f2fbcd91f..e870de14d57f 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 = "202209170841"; + version = "202209220104"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "9487b31412243e602ee3332ff3cce63a15906733"; - sha256 = "sha256-gKzrPBiifC2Lg050tFJynFd6DZ4vzSoPB6wbR4OzMFQ="; + rev = "4eaa41ebcfc2aafaa5b363b8efdd867c53e3435b"; + sha256 = "sha256-B0a6Zqd9WmlwBY6Kj0ZKNjZXzZWaNhRL0tLT0PM+gGA="; }; installPhase = '' From c00c3c2cc05b608806e1c990276f956c1d7f1a00 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 22 Sep 2022 23:25:22 -0400 Subject: [PATCH 19/19] pizarra: fix meta.homepage --- pkgs/applications/graphics/pizarra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/applications/graphics/pizarra/default.nix index 524a8589dce3..e428d02d9dcd 100644 --- a/pkgs/applications/graphics/pizarra/default.nix +++ b/pkgs/applications/graphics/pizarra/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { - Text - Grids ''; - homepage = "https://pizarra.categulario.tk/en/"; + homepage = "https://pizarra.categulario.xyz/en/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mglolenstine ]; };