Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-09-23 12:01:34 +00:00 committed by GitHub
commit ef833a6fd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 110 additions and 86 deletions

View file

@ -123,7 +123,11 @@ in {
host = cfg.address;
port = cfg.port;
klippy_uds_address = cfg.klipperSocket;
};
file_manager = {
config_path = cfg.configDir;
};
database = {
database_path = "${cfg.stateDir}/database";
};
};
@ -153,6 +157,7 @@ in {
serviceConfig = {
WorkingDirectory = cfg.stateDir;
PrivateTmp = true;
Group = cfg.group;
User = cfg.user;
};
@ -175,4 +180,9 @@ in {
});
'';
};
meta.maintainers = with maintainers; [
cab404
vtuan10
];
}

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
version = "3.11.14";
version = "3.11.15";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "sha256-5HQ64jCM8kyWLqxFqsFN3lJgM/JlWf1/RYKSpAFYTYE=";
sha256 = "sha256-l3Fv0gKKGYrbxpGHH6MXflK5fCrGoq3Qu+XkqFqMJJk=";
};
nativeBuildInputs = [

View file

@ -26,13 +26,13 @@
stdenv.mkDerivation (finalAttrs: rec {
pname = "SwayNotificationCenter";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "ErikReider";
repo = "SwayNotificationCenter";
rev = "v${version}";
hash = "sha256-s4yacSK5ajuq+BeGcPX+/o9wuDOcTOdZu4p8nPS8wk4=";
hash = "sha256-Z8CFSaH4RsZ/Qgj+l+36p7smbiGV5RRQhZBBcA3iyK8=";
};
nativeBuildInputs = [

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.26.3";
version = "0.26.5";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
sha256 = "sha256-Czjx6YTyFKAP8ZuwBpTpRfjDdRdd8GQ0ggbe5LMb8uA=";
sha256 = "sha256-IARb8MGFIg2X5rOipQyM2qL3fXa6xRS58cavR4ytH+k=";
};
ldflags = [
@ -20,7 +20,7 @@ buildGoModule rec {
tags = [ "netgo" ];
vendorSha256 = "sha256-rnROcJA4f0YjDGKEncrMmf/43VKrbgpmM3TvV1MMiWU=";
vendorSha256 = "sha256-gNZBq1fdNYmcRe5MmLrrGtff2cEf/YFxJ9I2rkH+umE=";
# TODO investigate why some config tests are failing
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "waypoint";
version = "0.10.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vyPYKEmAc2kmcCGF28wMq7oZa4ZcSKp5SyCMounspQA=";
sha256 = "sha256-9iqHO+idW6Rxe0osD4fjkhvO5TF122r1J8QlV/haaNw=";
};
vendorSha256 = "sha256-/WyqxK+FFSfR/Gyxy7K65KZDVfBM5Pp7WnoafF0AeQY=";
vendorSha256 = "sha256-fBsRmUE72lot9Ju/hUqpdSSXvMktRGP+H4WQ0GOCxrY=";
nativeBuildInputs = [ go-bindata installShellFiles ];

View file

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.28";
version = "3.3.29";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-u0X4Nqz0oGqpd1agWK83ho4xayRBiy0RynclhjHc69Q=";
hash = "sha256-BUOjcde6/9IzkEBR1TsDBPr4rArRs83X/vwYQr+72ww=";
};
postPatch = ''

View file

@ -30,12 +30,12 @@
buildPythonApplication rec {
pname = "streamlit";
version = "1.12.2";
version = "1.13.0";
format = "wheel"; # source currently requires pipenv
src = fetchPypi {
inherit pname version format;
hash = "sha256-xW0Hdf6zkRb/kKiwHuFb4nIS7lCruIlDYHIF0m0dmSM=";
hash = "sha256-MjGm9CT4p/Nl3J5G1Pu2ajY0/VcMdHabimn3ktkoXTo=";
};
propagatedBuildInputs = [

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "argparse";
version = "2.6";
version = "2.9";
src = fetchFromGitHub {
owner = "p-ranav";
repo = "argparse";
rev = "v${version}";
sha256 = "sha256-imLDuVbzkiE5hcQVarZGeNzNZE0/8LHMQqAiUYzPVks=";
sha256 = "sha256-vbf4kePi5gfg9ub4aP1cCK1jtiA65bUS9+5Ghgvxt/E=";
};
nativeBuildInputs = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioairq";
version = "0.1.1";
version = "0.2.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "CorantGmbH";
repo = pname;
rev = "v${version}";
hash = "sha256-BvesFiXiVlgfaffWfNcP1K9XUOL2qU8F/sdvRKNcuS4=";
rev = "refs/tags/v${version}";
hash = "sha256-qPpa6eo33IPCHSv3LFQXpRzomfrbAMqHlRi+IdoxHEc=";
};
propagatedBuildInputs = [

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioaladdinconnect";
version = "0.1.45";
version = "0.1.46";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "AIOAladdinConnect";
inherit version;
hash = "sha256-Fc34DPhN27wzEGSkRSpynqi9EGw1r3Iwp5rtT4eMMBI=";
hash = "sha256-tSPoumEWdlzyxHhyXd7jD58pdJzfw1CCJM1MYBAdxOk=";
};
propagatedBuildInputs = [

View file

@ -19,7 +19,6 @@
, uvloop
}:
buildPythonPackage rec {
pname = "black";
version = "22.8.0";
@ -37,7 +36,7 @@ buildPythonPackage rec {
# Black starts a local server and needs to bind a local address.
__darwinAllowLocalNetworking = true;
checkInputs = [ pytestCheckHook parameterized ];
checkInputs = [ pytestCheckHook parameterized aiohttp ];
preCheck = ''
export PATH="$PATH:$out/bin"
@ -64,18 +63,20 @@ buildPythonPackage rec {
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
propagatedBuildInputs = [
aiohttp
aiohttp-cors
click
colorama
mypy-extensions
pathspec
platformdirs
tomli
uvloop
] ++ lib.optional (pythonOlder "3.8") typed-ast
++ lib.optional (pythonOlder "3.10") typing-extensions;
passthru.optional-dependencies = {
d = [ aiohttp aiohttp-cors ];
colorama = [ colorama ];
uvloop = [ uvloop ];
};
meta = with lib; {
description = "The uncompromising Python code formatter";
homepage = "https://github.com/psf/black";

View file

@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "coinmetrics-api-client";
version = "2022.8.29.6";
version = "2022.9.22.15";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-EPPRKOdFbLLYw0K5C4nojR8GueekoFW7xIlwKeSV1EY=";
hash = "sha256-37tuZDsGQAmbWSEGc7rjrXtCoSxuBN3MDMmjWHr0eS4=";
};
nativeBuildInputs = [ poetry-core ];

View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "2.13.6";
version = "2.13.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-1ksbqghjKwh0IvL3SsNcwVrQtJJ82ZHJDp/u35sorSg=";
hash = "sha256-ZQofVdFmK0Rs9w7tdX7op1IFglK0BH2vhjjdvnUE0yY=";
};
propagatedBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "govee-ble";
version = "0.17.2";
version = "0.17.3";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-Kj1RCDQiDAt01yjoRVPdpi2dlF8V1rwnx+n7WGTRdQ0=";
rev = "refs/tags/v${version}";
hash = "sha256-0tUTqSxpOYhdrXbe0/Rqr9HkQ8kJKJFK6GHLX6740hc=";
};
nativeBuildInputs = [

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pykeyatome";
version = "2.0.0";
version = "2.1.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "jugla";
repo = "pyKeyAtome";
rev = "refs/tags/V${version}";
sha256 = "sha256-rmiZ687h8imJXxyepDZor9JyjT2jbg1Lsd5oUtsQtro=";
sha256 = "sha256-DUnER/Vom5Yc3syx4kPP1WbI7FpC+XGK9X4c1RrJJFk=";
};
propagatedBuildInputs = [

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "vt-py";
version = "0.15.0";
version = "0.16.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "VirusTotal";
repo = pname;
rev = version;
sha256 = "sha256-T0QvYVh5VRxpRdFWsnYpYdAypRc3yYwsXdsOiykRj0s=";
rev = "refs/tags/${version}";
sha256 = "sha256-Z2rTZCPquyNA+81FCJV1f8p2YvOdSLZFGzPGplzmESc=";
};
propagatedBuildInputs = [

View file

@ -1,40 +1,21 @@
{ stdenvNoCC, callPackage, fetchurl, autoPatchelfHook, unzip, openssl, lib }:
let
dists = {
aarch64-darwin = {
arch = "aarch64";
shortName = "darwin";
sha256 = "sha256-R17Ga4C6PSxfL1bz6IBjx0dYFmX93i0y8uqxG1eZKd4=";
};
{ lib
, stdenvNoCC
, callPackage
, fetchurl
, autoPatchelfHook
, unzip
, openssl
, writeShellScript
, curl
, jq
, common-updater-scripts
}:
aarch64-linux = {
arch = "aarch64";
shortName = "linux";
sha256 = "sha256-KSC4gdsJZJoPjMEs+VigVuqlUDhg4sL054WRlAbB+eA=";
};
x86_64-darwin = {
arch = "x64";
shortName = "darwin";
sha256 = "sha256-CVqFPvZScNTudE2wgUctwGDgTyaMeN8dUNmLatcKo5M=";
};
x86_64-linux = {
arch = "x64";
shortName = "linux";
sha256 = "sha256-N3hGPyp9wvb7jjpaFLJcdNIRyLvegjAe+MiV2aMS1nE=";
};
};
dist = dists.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
in
stdenvNoCC.mkDerivation rec {
version = "0.1.11";
version = "0.1.13";
pname = "bun";
src = fetchurl {
url = "https://github.com/Jarred-Sumner/bun-releases-for-updater/releases/download/bun-v${version}/bun-${dist.shortName}-${dist.arch}.zip";
sha256 = dist.sha256;
};
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
strictDeps = true;
nativeBuildInputs = [ unzip ] ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ];
@ -48,7 +29,39 @@ stdenvNoCC.mkDerivation rec {
install -Dm 755 ./bun $out/bin/bun
runHook postInstall
'';
passthru = {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
sha256 = "RYTRcc8xccRmxuKOXwX3bBWJSXLI2/XfH4/7ZdcUBdE=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
sha256 = "LixLrzSsgbXyfpFKiksM4zNS5iDU3tXOrr7fP8yJknM=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
sha256 = "SGZcT2uVy6egr99FzyaykUWLuZBqDsvbCM/lsgy//g0=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
sha256 = "ssZtJi+CEVn7MjPMqFkwv1lnwE7a7ttkmiuoT0Y6wao=";
};
};
updateScript = writeShellScript "update-bun" ''
set -o errexit
export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}"
NEW_VERSION=$(curl --silent https://api.github.com/repos/oven-sh/bun/releases/latest | jq '.tag_name | ltrimstr("bun-v")' --raw-output)
if [[ "${version}" = "$NEW_VERSION" ]]; then
echo "The new version same as the old version."
exit 0
fi
for platform in ${lib.escapeShellArgs meta.platforms}; do
update-source-version "bun" "0" "${lib.fakeSha256}" --source-key="sources.$platform"
update-source-version "bun" "$NEW_VERSION" --source-key="sources.$platform"
done
'';
};
meta = with lib; {
homepage = "https://bun.sh";
changelog = "https://github.com/Jarred-Sumner/bun/releases/tag/bun-v${version}";
@ -62,6 +75,6 @@ stdenvNoCC.mkDerivation rec {
lgpl21Only # javascriptcore and webkit
];
maintainers = with maintainers; [ DAlperin jk ];
platforms = builtins.attrNames dists;
platforms = builtins.attrNames passthru.sources;
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tile38";
version = "1.29.0";
version = "1.29.1";
src = fetchFromGitHub {
owner = "tidwall";
repo = pname;
rev = version;
sha256 = "sha256-sb/DKfQ9dmItxKqICVjG5cslpf8lHzLcs5gd6ue/Zn8=";
sha256 = "sha256-/C4gCFLeI12ZrNG8ZY0H7mvojm9ekxqs2x0fKl4dgPU=";
};
vendorSha256 = "sha256-/7dDPUXutyzkWq6EVVINFKzhuaiBCv5GrAF5pWG3ikc=";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
version = "0.44.2";
version = "0.44.3";
src = fetchurl {
url = "https://downloads.metabase.com/v${version}/metabase.jar";
hash = "sha256-I0cShK9/29kIjLtPDGlyysypofFV9Ai4Dbqt4IwTSA8=";
hash = "sha256-74/G0SJRvyBiIIsCgh9LlINF6MS5UrCKmnfTKPLIpr0=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "nfs-ganesha";
version = "4.0.7";
version = "4.0.8";
src = fetchFromGitHub {
owner = "nfs-ganesha";
repo = "nfs-ganesha";
rev = "V${version}";
sha256 = "sha256-SI8n3QdjI72QXQsK+LOj4wmmKQGPU+Y1Ysmfo+N+fY0=";
sha256 = "sha256-03zrEWwPQi7ED6Yr3HgzQyOtqJjjnUj5nChgGV6v0zk=";
};
preConfigure = "cd src";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "neo4j";
version = "4.4.10";
version = "4.4.11";
src = fetchurl {
url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
sha256 = "sha256-hp7Lic42/kV7TUxPyqSP3y8tc5xFMjvSyMzfCaoRq78=";
sha256 = "sha256-KIENqsXeSl1bd84tp9fD2kxczxMoi62IW4M8NblhAMg=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -9,13 +9,13 @@
buildPythonApplication rec {
pname = "nix-update";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
sha256 = "sha256-CkdiNXWhMYjqdxHSSB5qjEiD6cZF6NQfjCUMrLxz8/Q=";
sha256 = "sha256-q3kC+CJ0+NRz3rqHFuJkiI4RCSAXZczqDiyfQB2CrFQ=";
};
makeWrapperArgs = [

View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "rnp";
version = "0.16.1";
version = "0.16.2";
src = fetchFromGitHub {
owner = "rnpgp";
repo = "rnp";
rev = "v${version}";
sha256 = "sha256-EpmQ9dCbc46OEbWJy/9wi/WKAZ14azCojpS5k6Awx6w=";
sha256 = "sha256-KHItrpuKXaLGF1mcpju/RJFnm2yPZyYq4eIoRGqf5Y8=";
};
# in master post 0.16.0, see https://github.com/rnpgp/rnp/issues/1835