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

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-01-26 12:01:24 +00:00 committed by GitHub
parent d7e7d75f99 4c90db6ced
commit 636db670cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 99 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -167,11 +167,11 @@
"vendorHash": null
},
"bitbucket": {
"hash": "sha256-EsupdOP2aWLGeQrtuTyPg4ppM/j0WT0q/UV60oK732Y=",
"hash": "sha256-4uwMg2DXd7T4WqdfwcZHtsPMTTCqrwSngh01DYW5yko=",
"homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket",
"owner": "DrFaust92",
"repo": "terraform-provider-bitbucket",
"rev": "v2.29.2",
"rev": "v2.30.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0="
},
@ -816,11 +816,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-EewM1/7zzmJ5KL+/KqstFg6rQT8YpvMULScYeD2ClUQ=",
"hash": "sha256-L8y00f+57hndpVevliJ2kNqpGeNR2Jv/FHbqkAUIRMI=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v4.104.2",
"rev": "v4.105.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -861,20 +861,20 @@
"vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY="
},
"opentelekomcloud": {
"hash": "sha256-brODSqSwZXy3B/F5jqPz1h5UJ2hNncG7tIpICJjoBW4=",
"hash": "sha256-D2RPpG1RE+bM7rVvmItczpRExMXK0RaKfJsnifvXRTs=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.32.2",
"rev": "v1.32.3",
"spdx": "MPL-2.0",
"vendorHash": "sha256-p01ZIAt8cUv/UklRnMu+TTmfEw8jdde9C4nUJrhA7wE="
"vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ="
},
"opsgenie": {
"hash": "sha256-6lbJyBppfRqqmYpPgyzUTvnvHPSWjE3SJULqliZ2iUI=",
"hash": "sha256-NMaTTZQyEJ0vb+eDNTGRozTrme78Vo+/GuIR43AeDbU=",
"homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie",
"owner": "opsgenie",
"repo": "terraform-provider-opsgenie",
"rev": "v0.6.18",
"rev": "v0.6.19",
"spdx": "MPL-2.0",
"vendorHash": null
},

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

@ -5,7 +5,7 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.5.18";
version = "3.5.21";
format = "pyproject";
# Fetch from GitHub in order to use `requirements.in`
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-gMOpKXLUihiNcpHF6045D1ZcYwTgyjaVIFpDRCln5rI=";
hash = "sha256-VVZvr0h98bWJW9FNFr3/pw7pSqF62hCnr6iv9xSzXf8=";
};
postPatch = ''

9
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file

@ -1,13 +1,12 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = {
dir = "Signal";
version = "6.2.0";
hash = "sha256-auOcMlwKPj5rsnlhK34sYe4JxlHCjb3e2ye8Cs12Qtc=";
version = "6.3.0";
hash = "sha256-Mg7znebHiREC9QI5T7bWT4QXL8biDVBp0Z6Jgeid/gY=";
};
signal-desktop-beta = {
dir = "Signal Beta";
ringrtcPrefix = "@signalapp/";
version = "6.3.0-beta.1";
hash = "sha256-cYJWhnyiWULnIZvI2/k1koLCd2zrL4CVMohcnSZa/TY=";
version = "6.4.0-beta.1";
hash = "sha256-GR7RWFT20i5dx6XYrp73inCOQ2Hj2UjSXf5jmjfDKMU=";
};
}

3
pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix
View file

@ -1,6 +1,5 @@
{ pname
, dir
, ringrtcPrefix ? ""
, version
, hash
, stdenv
@ -161,7 +160,7 @@ stdenv.mkDerivation rec {
--replace "/opt/${dir}/${pname}" $out/bin/${pname}
autoPatchelf --no-recurse -- "$out/lib/${dir}/"
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/${ringrtcPrefix}ringrtc/build/linux/libringrtc-x64.node"
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node"
'';
# Tests if the application launches and waits for "Link your phone to Signal Desktop":

28
pkgs/development/libraries/exprtk/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "exprtk";
version = "unstable-2021-12-31";
src = fetchFromGitHub {
owner = "ArashPartow";
repo = "exprtk";
rev = "806c519c91fd08ba4fa19380dbf3f6e42de9e2d1";
hash = "sha256-5/k+y3gNJeggfwXmtAVqmaiV+BXX+WKtWwZWcQSrQDM=";
};
dontBuild = true;
installPhase = ''
runHook preInstall
install -Dm644 exprtk.hpp "$out/include/exprtk.hpp"
runHook postInstall
'';
meta = with lib; {
description = "The C++ Mathematical Expression Toolkit Library";
homepage = "https://www.partow.net/programming/exprtk/index.html";
license = licenses.mit;
maintainers = with maintainers; [ anselmschueler ];
};
}

2
pkgs/development/libraries/libdatrie/default.nix
View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
installShellFiles
];
buildInputs = [ libiconv ];
buildInputs = lib.optional stdenv.isDarwin libiconv;
preAutoreconf = let
reports = "https://github.com/tlwg/libdatrie/issues";

4
pkgs/development/python-modules/azure-eventhub/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "azure-eventhub";
version = "5.10.1";
version = "5.11.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-LV+o7dMVCFIQfq9d2wYY34LghIP5FN06zDpUPtkELFQ=";
sha256 = "sha256-Z1tekAHjO2kVe5g/MpB1U9m38pBQ8J03+pDZdJgzcgE=";
};
propagatedBuildInputs = [

15
pkgs/development/python-modules/flask-security-too/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
# extras: babel
, babel
@ -45,12 +46,15 @@
buildPythonPackage rec {
pname = "flask-security-too";
version = "5.0.2";
version = "5.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "Flask-Security-Too";
inherit version;
sha256 = "sha256-Nv7g2l0bPSEcrydFU7d1NHjCCJl8Ykq7hOu6QmHeZcI=";
hash = "sha256-nSo7fdY9tiE7PnhosXh1eBfVa5l6a43XNvp6vKvrq5Y=";
};
propagatedBuildInputs = [
@ -103,10 +107,13 @@ buildPythonPackage rec {
++ passthru.optional-dependencies.mfa;
pythonImportsCheck = [ "flask_security" ];
pythonImportsCheck = [
"flask_security"
];
meta = with lib; {
homepage = "https://pypi.org/project/Flask-Security-Too/";
changelog = "https://github.com/Flask-Middleware/flask-security/blob/${version}/CHANGES.rst";
homepage = "https://github.com/Flask-Middleware/flask-security";
description = "Simple security for Flask apps (fork)";
license = licenses.mit;
maintainers = with maintainers; [ gador ];

4
pkgs/development/python-modules/google-cloud-dlp/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-dlp";
version = "3.11.0";
version = "3.11.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-5zysTKqmzRAiePBwLkbUhiAG91sKwao2BCTOBnVHlYg=";
hash = "sha256-TwVY6/4TSY8cPj3y/A7+cxpyVJ9+lPg+vAKNhfBNfqI=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-firestore/default.nix
View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-firestore";
version = "2.9.0";
version = "2.9.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-gEgTYUsaac9dJIxCZJU/axjwiNqttUQiL6UskhzjsJg=";
hash = "sha256-WxUiufi+rXBPuSBcC/Ktp0tEkcaA457o0WexweS9MMI=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-redis/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "google-cloud-redis";
version = "2.11.0";
version = "2.11.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-dWpsiitG58iCw8z8Hd10eAXXfRRBlq90m0cs1YjeMqE=";
hash = "sha256-dRavwtaU+dpRZkO49Q0Btmh2Mi/zUWbvZbImrfUkrAM=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-speech/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
version = "2.17.0";
version = "2.17.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Lb2oV2r7CE1qc5iaxzGpIm3xZKpsORx1Nofkjno6xNs=";
hash = "sha256-gWcYMY9Ztm5d9CkQXPtAZaDgrKwU90EZBdznuWWDp9o=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-translate/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.10.0";
version = "3.10.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-SdhAsksalGug0eW9rVlAGpEGIUjreKkFIj3v9x54G6I=";
hash = "sha256-++1k8lhJfJ7e/oK//IyYx9W/RacQa/1RwdrhyvCYWEM=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-vision/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
version = "3.3.0";
version = "3.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Rj6yR/8V65wOILVSlLEi6+IRgNk3t/t7grVaHc8sRJY=";
hash = "sha256-G7v09CA1pJ2OSL7gBzYvfRGrjPjQElxnyeUvP2vpFJQ=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/googlemaps/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "googlemaps";
version = "4.7.3";
version = "4.9.0";
format = "setuptools";
disabled = pythonOlder "3.5";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "googlemaps";
repo = "google-maps-services-python";
rev = "refs/tags/v${version}";
hash = "sha256-SwNUoC4x1Z+cqBvuBtDZNZMDcs4XwLj7LWntZ4gZ+vo=";
hash = "sha256-Ji9GDVQdDmneOcjrmfaG84HJNCz4igHJQmnwk9xiUlM=";
};
propagatedBuildInputs = [

5
pkgs/development/python-modules/panflute/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec{
pname = "panflute";
version = "2.2.3";
version = "2.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-AJMz+gt8Wa45aFZSLm15RjiiJlJnkWC4Lobk8o8Pu8Y=";
hash = "sha256-zv2d/EjM2XMqU9tXYQcB0igG2jl6ipflzI3AcLVYZco=";
};
propagatedBuildInputs = [
@ -30,6 +30,7 @@ buildPythonPackage rec{
meta = with lib; {
description = "Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions";
homepage = "http://scorreia.com/software/panflute";
changelog = "https://github.com/sergiocorreia/panflute/releases/tag/${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ synthetica ];
};

9
pkgs/development/tools/rust/probe-run/default.nix
View file

@ -3,6 +3,7 @@
, rustPlatform
, fetchCrate
, pkg-config
, DarwinTools
, libusb1
, libiconv
, AppKit
@ -11,17 +12,19 @@
rustPlatform.buildRustPackage rec {
pname = "probe-run";
version = "0.3.5";
version = "0.3.6";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-C9JxQVsS1Bv9euQ7l+p5aehiGLKdrUMcno9z8UoZKR4=";
sha256 = "sha256-HYFVdj1kASu+VKnDJA35zblPsgUeYC9YVlS84Hkx1Sk=";
};
cargoSha256 = "sha256-kmdRwAq6EOniGHC7JhB6Iov1E4hbQbxHlOcc6gUDOhY=";
cargoSha256 = "sha256-nhs9qNFd1GK70sL5sPPeMazuPUP67epHayXnw3aXTfk=";
nativeBuildInputs = [
pkg-config
] ++ lib.optionals stdenv.isDarwin [
DarwinTools
];
buildInputs = [

6
pkgs/games/ddnet/default.nix
View file

@ -30,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "16.4";
version = "16.5";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
sha256 = "sha256-8t4UKytYmkELEMQ06jIj7C9cdOc5L22AnigwkGBzx20=";
sha256 = "sha256-fHe72ew+qoSyOqXU9Hs9EyecrYDjEqTm+Ii9Zja9up4=";
};
nativeBuildInputs = [ cmake ninja pkg-config ];
@ -63,9 +63,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DAUTOUPDATE=OFF"
"-GNinja"
];
postPatch = ''

10
pkgs/os-specific/linux/zfs/default.nix
View file

@ -226,9 +226,9 @@ in {
latestCompatibleLinuxPackages = linuxPackages_6_1;
# this package should point to the latest release.
version = "2.1.8";
version = "2.1.9";
sha256 = "sha256-/+23SEtywa7b1dgvQNmEGrfqXzM1mlk00TSpuiCkQOk=";
sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc=";
};
zfsUnstable = common {
@ -240,10 +240,10 @@ in {
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
version = "2.1.9-staging-2023-01-19";
rev = "04b02785b67f9b976c43643dd52ce6cdbc22e11e";
version = "2.1.10-staging-2023-01-24";
rev = "92e0d9d183ce6752cd52f7277c8321d81df9ffee";
sha256 = "sha256-/+23SEtywa7b1dgvQNmEGrfqXzM1mlk00TSpuiCkQOk=";
sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc=";
isUnstable = true;
};

11
pkgs/servers/sql/postgresql/ext/timescaledb.nix
View file

@ -1,9 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5 }:
# # To enable on NixOS:
# config.services.postgresql = {
# extraPlugins = [ pkgs.timescaledb ];
# extraConfig = "shared_preload_libraries = 'timescaledb'";
# config.services.postgresql = let
# # The postgresql pkgs has to be taken from the
# # postgresql package used, so the extensions
# # are built for the correct postgresql version.
# postgresqlPackages = config.services.postgresql.package.pkgs;
# in {
# extraPlugins = with postgresqlPackages; [ timescaledb ];
# settings.shared_preload_libraries = "timescaledb";
# }
stdenv.mkDerivation rec {

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

@ -529,6 +529,7 @@ with pkgs;
probe-run = callPackage ../development/tools/rust/probe-run {
inherit (darwin.apple_sdk.frameworks) AppKit IOKit;
inherit (darwin) DarwinTools;
};
mix2nix = callPackage ../development/tools/mix2nix { };
@ -19404,6 +19405,8 @@ with pkgs;
expat = callPackage ../development/libraries/expat { };
exprtk = callPackage ../development/libraries/exprtk { };
eventlog = callPackage ../development/libraries/eventlog { };
faac = callPackage ../development/libraries/faac { };