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

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-09-23 06:18:24 +00:00 committed by GitHub
parent fafe628a8d e5b35e8b3f
commit 9ef6f25592
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 54 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/graphics/pizarra/default.nix
View file

@ -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 ];
@ -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 ];
};

4
pkgs/applications/networking/flexget/default.nix
View file

@ -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 = ''

6
pkgs/data/misc/v2ray-geoip/default.nix
View file

@ -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 = ''

11
pkgs/development/libraries/opencv/3.x.nix
View file

@ -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

8
pkgs/development/libraries/opencv/4.x.nix
View file

@ -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";

6
pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch
View file

@ -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})

4
pkgs/development/php-packages/apcu/default.nix
View file

@ -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;

4
pkgs/development/php-packages/composer/default.nix
View file

@ -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;

4
pkgs/development/php-packages/mailparse/default.nix
View file

@ -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 = ''

4
pkgs/development/php-packages/mongodb/default.nix
View file

@ -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 = [

4
pkgs/development/php-packages/phpstan/default.nix
View file

@ -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;

4
pkgs/development/php-packages/protobuf/default.nix
View file

@ -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 ];

13
pkgs/development/python-modules/keyring/default.nix
View file

@ -14,28 +14,29 @@
buildPythonPackage rec {
pname = "keyring";
version = "23.9.1";
version = "23.9.3";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-OeT2VyI40mFagvyqSF5gi4S1A88IDckkxDu7rLEcHBg=";
hash = "sha256-abAd2DxC9ZAlD+eh9QP8IpsU3oOFcxSxkzo92/WVxKU=";
};
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
importlib-metadata
] ++ lib.optionals stdenv.isLinux [
dbus-python
propagatedBuildInputs = [
jaraco_classes
] ++ lib.optionals stdenv.isLinux [
jeepney
secretstorage
] ++ lib.optionals (pythonOlder "3.10") [
importlib-metadata
];
pythonImportsCheck = [
"keyring"
"keyring.backend"

4
pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix
View file

@ -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 = ''

6
pkgs/development/tools/analysis/actionlint/default.nix
View file

@ -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 ];

6
pkgs/development/tools/misc/terraformer/default.nix
View file

@ -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 = [ "." ];

4
pkgs/servers/sql/postgresql/ext/pgroonga.nix
View file

@ -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 ];

4
pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
View file

@ -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 ];

4
pkgs/servers/sql/postgresql/ext/rum.nix
View file

@ -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 ];

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

@ -3251,7 +3251,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 { };