Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-02-27 12:01:07 +00:00 committed by GitHub
commit ba4b337e37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 957 additions and 1067 deletions

View file

@ -32,7 +32,7 @@ lmpfrlib,,,,,5.3,alexshpilkin
loadkit,,,,,,alerque
lpeg,,,,,,vyp
lpeg_patterns,,,,,,
lpeglabel,,,,,,
lpeglabel,,,,1.6.0,,
lpty,,,,,,
lrexlib-gnu,,,,,,
lrexlib-pcre,,,,,,vyp

1 name src ref server version luaversion maintainers
32 loadkit alerque
33 lpeg vyp
34 lpeg_patterns
35 lpeglabel 1.6.0
36 lpty
37 lrexlib-gnu
38 lrexlib-pcre vyp

View file

@ -270,3 +270,5 @@ In addition to numerous new and upgraded packages, this release has the followin
- The option `services.nomad.extraSettingsPlugins` has been fixed to allow more than one plugin in the path.
- The option `services.prometheus.exporters.pihole.interval` does not exist anymore and has been removed.
- `k3s` can now be configured with an EnvironmentFile for its systemd service, allowing secrets to be provided without ending up in the Nix Store.

View file

@ -106,6 +106,14 @@ in
description = lib.mdDoc "Only run the server. This option only makes sense for a server.";
};
environmentFile = mkOption {
type = types.nullOr types.path;
description = lib.mdDoc ''
File path containing environment variables for configuring the k3s service in the format of an EnvironmentFile. See systemd.exec(5).
'';
default = null;
};
configPath = mkOption {
type = types.nullOr types.path;
default = null;
@ -154,6 +162,7 @@ in
LimitNPROC = "infinity";
LimitCORE = "infinity";
TasksMax = "infinity";
EnvironmentFile = cfg.environmentFile;
ExecStart = concatStringsSep " \\\n " (
[
"${cfg.package}/bin/k3s ${cfg.role}"

View file

@ -12,7 +12,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
services.redis.servers."".enable = true;
environment.systemPackages = with pkgs; [ (python38.withPackages (ps: [ ps.twisted ps.txredisapi ps.mock ]))];
environment.systemPackages = with pkgs; [ (python3.withPackages (ps: [ ps.twisted ps.txredisapi ps.mock ]))];
};
};

View file

@ -41,8 +41,8 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isDarwin [
Security
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
CoreFoundation SystemConfiguration
CoreFoundation
SystemConfiguration
];
depositContractSpec = fetchurl {

View file

@ -17,13 +17,13 @@
buildDotnetModule rec {
pname = "denaro";
version = "2023.2.0";
version = "2023.2.2";
src = fetchFromGitHub {
owner = "nlogozzo";
repo = "NickvisionMoney";
rev = version;
hash = "sha256-ot6VfCzGrJnLaw658QsOe9M0HiqNDrtxvLWpXj9nXko=";
hash = "sha256-B84uzJ+B7kGU+O2tuObrIFCvgUfszLd1VU7F5tL90bU=";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;

View file

@ -21,7 +21,7 @@
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; })
(fetchNuGet { pname = "Hazzik.Qif"; version = "1.0.3"; sha256 = "16v6cfy3pa0qy699v843pss3418rvq5agz6n43sikzh69vzl2azy"; })
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.2"; sha256 = "0xipbci6pshj825a1r8nlc19hf26n4ba33sx7dbx727ja5lyjv8m"; })
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.3"; sha256 = "00rdsirs32vlqpa1hri3f1m368b05d4r0k95wv5n2y0xi5i8lml6"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; })
@ -53,7 +53,6 @@
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; })
(fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.4"; sha256 = "1v9wly6v2bj244wch6ijfx2imrbgmafn1w9km44718fngdxfhysq"; })
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; })
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; })
(fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.4"; sha256 = "14qr84h88jfvy263yx51zjm059aqgwlvgi6g02yxhbr2m7brs4mm"; })
(fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.4"; sha256 = "1s1dv1qfgjsvcdbwf2pl48c6k60hkxwyy6z5w8g32fypksnvb7cs"; })

View file

@ -9,43 +9,43 @@
let
pname = "1password";
version = if channel == "stable" then "8.9.14" else "8.10.0-20.BETA";
version = if channel == "stable" then "8.10.0" else "8.10.1-19.BETA";
sources = {
stable = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
sha256 = "sha256-rlLzPDPOmzamDnRxuvgrpAW0QrMINw/PsdLxOiBpMnA=";
sha256 = "sha256-mIplIW1XGb7EVlPIHgzL16zvVa/3ypfwTMtVSiSvYYE=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
sha256 = "sha256-hJTqFr6/KOl4C+1oyo/zrnCbqvRQin6HjyLKOppUl/M=";
sha256 = "sha256-xjbqZ/+sw3jBzbqhzd/mP7CZOCLYYi6KpX8Ypy/8/Es=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
sha256 = "sha256-3/aiUj+WYZfPItYrYNQKsUSpkRTgOhyb8L5gURt1O74=";
sha256 = "sha256-06wOSKzxZ7xVAUyIa4Fv48Z6nbMsQ/o74mEyVkmgkJs=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
sha256 = "sha256-n0xqD5WbcC9B6spisa5V7JJRXGZubBwzJFUS8edvz/Q=";
sha256 = "sha256-zDu3PBj6kvDVpiFuoOuNlmyiSK4ZVuUWX3rBBwlwEvo=";
};
};
beta = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
sha256 = "sha256-r2MRyw0dfD3vGnCcPW624K5rSaNSCjTVW4cWFgPAIaY=";
sha256 = "sha256-F/dnA9mqtXXp5vx6OQ5aPrdeEBMg9g6nozzMMNAZWHk=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
sha256 = "sha256-98sv4yLvLw8J5uQBB66qTV3lRWnyeZiifhEOW7shz8s=";
sha256 = "sha256-u8ktPt7W4teCJoXq1eEdKZCEsKxjhep/7DMHSMtuFBA=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
sha256 = "sha256-ezHk6OgUsmFfMfsY+yyWqn+6JgHSmpkFWGNCCaBv/Bo=";
sha256 = "sha256-dZ1Vv4oocDYlw2sibnokUyAKcZ2W7zKofTX2ELamilI=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
sha256 = "sha256-JmCrEBucXGPpGbiKOxA8vu6bUVYsavfsYA5QY58Grnw=";
sha256 = "sha256-JA2U/PfW2+qHPjqIGQL5gWIdqtd5G1lL3+hecYh2lcE=";
};
};
};

View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "avalanchego";
version = "1.9.8";
version = "1.9.9";
src = fetchFromGitHub {
owner = "ava-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-5Zyrmo74k6Pl2pyVo3oX/haFsR8mHlM05ubPllintFQ=";
hash = "sha256-xaFSqcVVRXy1JYOWGnzoPKLnnxk9NgZ3FIZR3qydOLM=";
};
vendorHash = "sha256-CpXszXmySPHQehFy6XSOJFXq8ZGixO928+zrP7/vwCQ=";
vendorHash = "sha256-ZCIy1cQ62MNLor39Pi0/nU6KsbgG1z7SowMpj9tXLT8=";
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
proxyVendor = true;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmsman";
version = "3.16.1";
version = "3.16.4";
src = fetchFromGitHub {
owner = "Praqma";
repo = "helmsman";
rev = "v${version}";
sha256 = "sha256-QhAmedSDBi1aRNmp4LR5Xv4HMzcextzT67g9nxN4eko=";
sha256 = "sha256-8hv68O4U9bPjqqtVOpmY3DwfeTGEZJGVkzIyYhS14aM=";
};
vendorHash = "sha256-bVgYj0e/z57sIvVZXAzLkKqKLa0Pe0CT57Vc7Df1oWE=";
vendorHash = "sha256-aSpv4TGp0YLdk/RYEvfYswlEWnv8sy9iflXGGCcKPHs=";
doCheck = false;

View file

@ -693,13 +693,13 @@
"vendorHash": "sha256-NXSquRqBaENxWX+ZukDJie/EU+wdEQSxvZQEZqjL+ug="
},
"lxd": {
"hash": "sha256-2YqziG5HZbD/Io/vKYZFZK1PFYVYHOjzHah7s3xEtR0=",
"hash": "sha256-4BDpVWfdSYTKPTCgKIHOqgNaxgdIGjW5yRh9Ezs/0zY=",
"homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd",
"owner": "terraform-lxd",
"repo": "terraform-provider-lxd",
"rev": "v1.9.0",
"rev": "v1.9.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-CLr28g/uI9ZU4xIcA76v/BX6gJV91elvFIlYFoSxkfw="
"vendorHash": "sha256-RVELewqJtH4tuHJWfcLcMH7cM0dr7Yse+UnqrLaNyCc="
},
"mailgun": {
"hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=",

View file

@ -2,19 +2,19 @@
buildGoModule rec {
pname = "go-graft";
version = "0.2.17";
version = "0.2.18";
src = fetchFromGitHub {
owner = "mzz2017";
repo = "gg";
rev = "v${version}";
sha256 = "sha256-UhRsgUz9au7e47cS6yrIJXc/8ZxVDpMHWBjoAcw+oCM=";
sha256 = "sha256-07fP3dVFs4MZrFOH/8/4e3LHjFGZd7pNu6J3LBOWAd8=";
};
CGO_ENABLED = 0;
ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ];
vendorHash = "sha256-EiBt2SxUQY05Wr7KJbK+fs3U3iSmqECJ0glS8B2Ox9Q=";
vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14=";
subPackages = [ "." ];
meta = with lib; {

View file

@ -39,7 +39,7 @@
stdenv.mkDerivation rec {
pname = "armcord";
version = "3.1.4";
version = "3.1.6";
src =
let
@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
{
x86_64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_amd64.deb";
sha256 = "sha256-B/zDcW43ChhnAnGL+UEAt/QChxxEpv+yMgO7WsUi84k=";
sha256 = "sha256-xCwAkRtsFmGOIyCftjNqUsaw7/PcxSgWGqW/D1NhC5M=";
};
aarch64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_arm64.deb";
sha256 = "sha256-cFmxs7HeF+jxtmZ827bQbRyuXhQx++x5iTIefZ55928=";
sha256 = "sha256-ka8hwHhMVTXNS1rktTs3yXfXnyxSmRt41IE8z/ftUVc=";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

View file

@ -107,6 +107,8 @@ stdenv.mkDerivation rec {
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
;
enableParallelBuilding = true;
env.NIX_CFLAGS_COMPILE = '' -I${librem}/include/rem -I${gsm}/include/gsm
-DHAVE_INTTYPES_H -D__GLIBC__
-D__need_timeval -D__need_timespec -D__need_time_t '';

View file

@ -26,13 +26,13 @@
buildPythonApplication rec {
pname = "commitizen";
version = "2.42.0";
version = "2.42.1";
src = fetchFromGitHub {
owner = "commitizen-tools";
repo = pname;
rev = "v${version}";
hash = "sha256-13WEbF6in+zYZXWYqlYA98qJkKxjmcpQY9GuGS+DDtk=";
hash = "sha256-lrZfMqmslwx3B2WkvFosm3EmCHgpZEA/fOzR6UYf6f8=";
};
format = "pyproject";

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "ddccontrol-db";
version = "20230124";
version = "20230223";
src = fetchFromGitHub {
owner = "ddccontrol";
repo = pname;
rev = version;
sha256 = "sha256-coKdlV2DCZ0S3hg9bQEfE9/FaUbFX5w6IMj/kAqERic=";
sha256 = "sha256-ehmMSriBYVOeKbXDybpnbYwBEQJcN0NQJ3zaneMxFmQ=";
};
nativeBuildInputs = [ autoreconfHook intltool ];

View file

@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
;
enableParallelBuilding = true;
meta = {
description = "A library for real-time communications with async IO support and a complete SIP stack";
homepage = "https://github.com/baresip/re";

View file

@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}"
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
;
enableParallelBuilding = true;
meta = {
description = "A library for real-time audio and video processing";
homepage = "https://github.com/baresip/rem";

File diff suppressed because it is too large Load diff

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "atlassian-python-api";
version = "3.33.0";
version = "3.34.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "atlassian-api";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-vn2bI6wyYAhCxkiL4oEpJFwFicJScvhMfwLD6g6pVw8=";
sha256 = "sha256-en+4EKkmTQWMgnGZaGs+O9Yh2TI03xW111wbp9O8dYE=";
};
propagatedBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "azure-mgmt-containerservice";
version = "21.1.0";
version = "21.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-5EOythXO7spLzzlqDWrwcdkkJAMH9W8OBv96rYaWxAY=";
hash = "sha256-pJLnSuSbXbarOiXwfnjSDNmyU7ZOl2IUUVaEA8mQriQ=";
};
propagatedBuildInputs = [

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.34.8";
version = "0.34.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
hash = "sha256-0pSMBPUA3djl7roVyFWe6ml9OOmWooAhwNXjsBgeLmU=";
hash = "sha256-2QTY6mZkhaXHeZcLKxW7BkzOj2jYJx1v4TKG5YBcSC0=";
};
propagatedBuildInputs = [

View file

@ -1,28 +1,30 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchPypi
, lib
, django
, funcy
, redis
, six
, pytest-django
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "django-cacheops";
version = "6.1";
version = "6.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-toTvOf1DQYnTy7fYVBfNlyr2NSiaAyRHmCRztKifcn0=";
hash = "sha256-zHP9ChwUeZJT/yCopFeRo8jSgCIXswHnDPoIroGeQ48=";
};
propagatedBuildInputs = [
django
funcy
redis
six
];
nativeCheckInputs = [
@ -51,6 +53,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A slick ORM cache with automatic granular event-driven invalidation for Django";
homepage = "https://github.com/Suor/django-cacheops";
changelog = "https://github.com/Suor/django-cacheops/blob/${version}/CHANGELOG";
license = licenses.bsd3;
maintainers = with maintainers; [ onny ];
};

View file

@ -4,18 +4,21 @@
, colorama
, tqdm
, pytestCheckHook
, pythonOlder
, ffmpeg
, procps
}:
buildPythonPackage rec {
pname = "ffmpeg-progress-yield";
version = "0.7.0";
version = "0.7.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-rt+Qg1H9t5PC4cyis9xuyf8myfxWLkTq3aD83+O4qmA=";
hash = "sha256-wK33h+Qg737hSv+2HF4hvfBDDsJpI+7mGbRgUQvrZb0=";
};
propagatedBuildInputs = [ colorama tqdm ];
@ -34,6 +37,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Run an ffmpeg command with progress";
homepage = "https://github.com/slhck/ffmpeg-progress-yield";
changelog = "https://github.com/slhck/ffmpeg-progress-yield/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ prusnak ];
};

View file

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "2.14.1";
version = "2.15.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-KLPGICGwT3j5FYwVfb/K6+n/tQTt0pda0PIo6/AgTG8=";
hash = "sha256-PKVX/A1AT3EqHahBLnGlXNY7aiZZdbCmvsQ/+KNV7UA=";
};
propagatedBuildInputs = [

View file

@ -8,11 +8,12 @@
, pypubsub
, pyqrcode
, pyserial
, pytap2
, pytestCheckHook
, pythonOlder
, pyyaml
, setuptools
, tabulate
, pytap2
, timeago
}:
@ -39,6 +40,7 @@ buildPythonPackage rec {
pyqrcode
pyserial
pyyaml
setuptools
tabulate
timeago
];

View file

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "mne-python";
version = "1.3.0";
version = "1.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "mne-tools";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-3N9S8QhQ3vtC9SZBQqvwVpE8V062VVWTV3nBhPI1lmA=";
hash = "sha256-jvrk6m1Cd5ig2LXq6sAIbHDhmtG1gH/7WNAc7oet+tg=";
};
propagatedBuildInputs = [

View file

@ -56,6 +56,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for probabilistic programming with NumPy";
homepage = "https://num.pyro.ai/";
changelog = "https://github.com/pyro-ppl/numpyro/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};

View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "12.1.6";
version = "12.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-6DuvA1HAMr4A9mNH9jFKH9IWOt4010iZewldCDWWmPE=";
hash = "sha256-C7LF3mJwmu6mBA0Od2L1P0RxJWckC74irNuRkE9kxfY=";
};
postPatch = ''

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyoverkiz";
version = "1.7.4";
version = "1.7.6";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iMicknl";
repo = "python-overkiz-api";
rev = "refs/tags/v${version}";
hash = "sha256-I115lMEg/baWuUZThfisNYSck/QdiYecjhhRqgSkLB8=";
hash = "sha256-nmXOmoPH8w4Soj8lhI7wl3uYVmKw3xSuIkmCF0XI7RI=";
};
postPatch = ''

View file

@ -0,0 +1,25 @@
From b3eabd314f050a7491e82bc1560e8d8633569a06 Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Fri, 24 Feb 2023 11:03:41 +0800
Subject: [PATCH] Fix build on linux arm64
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index ef99bcc..81c2dcb 100644
--- a/setup.py
+++ b/setup.py
@@ -80,7 +80,7 @@ else:
elif platform == 'linux':
# the oldest mainline github runner available is ubuntu 20.04,
# which runs glibc 2.31:
- oses = 'manylinux_2_31_x86_64'
+ oses = 'manylinux_2_31_{}'.format(architecture0)
else:
pythons = 'py2.py3'
oses = 'any'
--
2.39.1

View file

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, pytestCheckHook
, numpy
, libsndfile
@ -12,15 +11,19 @@
buildPythonPackage rec {
pname = "soundfile";
version = "0.11.0";
version = "0.12.1";
# https://github.com/bastibe/python-soundfile/issues/157
disabled = isPyPy || stdenv.isi686;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-kxc4ock+hoTC0+HVFKxjRAzoJ+x4PqCi0+RzDj3FjBg=";
hash = "sha256-6OEBeyzx3adnrvGdL9nuXr4H4FDUMPd6Cnxmugi4za4=";
};
patches = [
./0001-Fix-build-on-linux-arm64.patch
];
postPatch = ''
substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'"
'';
@ -29,10 +32,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [ numpy libsndfile cffi ];
propagatedNativeBuildInputs = [ cffi ];
preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
export PYSOUNDFILE_ARCHITECTURE=x86_64
'';
meta = {
description = "An audio library based on libsndfile, CFFI and NumPy";
license = lib.licenses.bsd3;

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "yalexs-ble";
version = "2.0.3";
version = "2.0.4";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ka1CkDm8ahyj0VaxfRIHOt5rqrVWj2EZa2LXE2gqXlI=";
hash = "sha256-8jZxAG1NVFkWbQF1HwyQbqd0NVRgpluspdtgRaF4zhg=";
};
nativeBuildInputs = [

View file

@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "ameba";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "crystal-ameba";
repo = "ameba";
rev = "refs/tags/v${version}";
hash = "sha256-UNMOLbZeSdvTuDgveQ/vRC+PlAdVo1bGnpMz3g1seY8=";
hash = "sha256-coZU3cufQgSCid10zEvmHG7ddLbZhnrvl9ffw4Y6h74=";
};
format = "make";

View file

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "datree";
version = "1.8.24";
version = "1.8.27";
src = fetchFromGitHub {
owner = "datreeio";
repo = "datree";
rev = "refs/tags/${version}";
hash = "sha256-C6APYGe0zLj/SYaSOoYKr/4yyAs0EKJmDfcJlqltKdg=";
hash = "sha256-52xAm0D8yzUPvox1byHcyUTg8mILakOnVh8q0a2yR1M=";
};
vendorHash = "sha256-mkVguYzjNGgFUdATjGfenCx3h97LS3SEOkYo3CuP9fA=";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-mockery";
version = "2.20.0";
version = "2.20.2";
src = fetchFromGitHub {
owner = "vektra";
repo = "mockery";
rev = "v${version}";
sha256 = "sha256-lWh0aX+VuSL0w592lNqXpwHq/b2WeDyYiBzm224qnzc=";
sha256 = "sha256-MIEVAEjXM3QNz3PnjB/g5Ury+N9NJhxtcXF+SLAvqR4=";
};
preCheck = ''
@ -22,7 +22,7 @@ buildGoModule rec {
CGO_ENABLED = false;
vendorHash = "sha256-Dl8Q6fQa7BKp06a4OT82+wHYQRN1aWZ2qK25GzhOw8A=";
vendorHash = "sha256-3lx3wHnPQ/slRXnlVAnI1ZqSykDXNivjwg1WUITGj64=";
meta = with lib; {
homepage = "https://github.com/vektra/mockery";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "grpc-gateway";
version = "2.15.0";
version = "2.15.1";
src = fetchFromGitHub {
owner = "grpc-ecosystem";
repo = "grpc-gateway";
rev = "v${version}";
sha256 = "sha256-NOcV3XrSFeb/LYzeZQ0M1l1l4TkC+fVqAXCDUTaMN3c=";
sha256 = "sha256-fI9C0E5sMeZ8NDH7YMpbJ1So+PQ+isswbZWd0r7unis=";
};
vendorSha256 = "sha256-zYKRWJ09SnE0Y9iahTyODas/04an8x9w+rsY0x4/NRM=";
vendorHash = "sha256-JY788tDOo373ucUGzG4zNQbrGo8fdvWda/nMF0NpEE8=";
meta = with lib; {
description =

View file

@ -2,13 +2,13 @@
luarocks.overrideAttrs (old: {
pname = "luarocks-nix";
version = "unstable-2022-10-12";
version = "unstable-2023-02-26";
src = fetchFromGitHub {
owner = "nix-community";
repo = "luarocks-nix";
rev = "7b3cc90ebf07813ed511f530cc50d602e9502001";
sha256 = "sha256-zN+8BzUkKUQU/6BWg1kcsL3XV9qehnwm1L4vRKOejPs=";
rev = "4cfea3d5d826db4cfbc809ef8bb5f0a9f3a18919";
sha256 = "sha256-7L8B+/C7Kzt25Ec+OsM2rliYB2/wyZQ3OT63V7AaOxo=";
};
patches = [ ];

View file

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.30.3";
version = "1.31.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Dg4ZX1CpjZuCXDu3GxbaRIwdhDuJ50j53b6XETfFGAU=";
sha256 = "sha256-0S5BSXWnv4DMcc8cijRQx6NyDReg5aJJT65TeNFlkkw=";
};
cargoSha256 = "sha256-6V9djLUmPEQDewKEN0ND7zyXSrKdakXZdYSRsyXWNuE=";
cargoSha256 = "sha256-DZICb85B9pWT8bV06FYjS604RdomB5nqtR55R00CT8c=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

View file

@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.60.1";
version = "0.63.0";
shas = {
x86_64-linux = "sha256-P8H+XJqrt9jdKM885L1epMldp+stwmEw+0Gtd2x3r4g=";
aarch64-linux = "sha256-frHpBP2pL3o4efFLHP2r3zsWJrNT93yYu2Qkxv+7m8Y=";
x86_64-darwin = "sha256-taewoYBkyikqWueLSD9dW1EDjzkV68Xplid1UaLZgRM=";
aarch64-darwin = "sha256-s2YEVbuYpiT/qrmE37aXk13MetrnJo6l+s1Q2y6b5kU=";
x86_64-linux = "sha256-D1NLAFMD1B4NOaBFsKBin5Gs+hmNC9LgNy3Z+w/1VGs=";
aarch64-linux = "sha256-3V2WWMCjJNiuCRmx66ISBk+pzvCKCqvOE9F3YWESABo=";
x86_64-darwin = "sha256-rUWSHxlFDT4cDoTLhSgRr04+2/oroeIiWURHbNDcMF8=";
aarch64-darwin = "sha256-LaoIjHrBqWn0BIpAOaiHAg5qCGoPlSHtFhiAi4og9q0=";
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.465";
version = "0.0.470";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
hash = "sha256-1+xlKRVFQuGDENWWtPYpNHroNp5jZZojsBPo9G2Aay8=";
hash = "sha256-6D106qRd3dsSpZqlOVVV/I38YsjFTEtApvWtCc+LVNw=";
};
vendorHash = "sha256-ExHzf4L0Ibb+tYfBV45hEaUJgSQhgpHk40QhHa5dpQ8=";

View file

@ -100,7 +100,7 @@ python3Packages.buildPythonApplication {
# Remove all ImageProcessor functionality since that is closed source
(fetchurl {
url = "https://sources.debian.org/data/main/h/hplip/3.22.4%2Bdfsg0-1/debian/patches/0028-Remove-ImageProcessor-binary-installs.patch";
url = "https://web.archive.org/web/20230226174550/https://sources.debian.org/data/main/h/hplip/3.22.10+dfsg0-1/debian/patches/0028-Remove-ImageProcessor-binary-installs.patch";
sha256 = "sha256:18njrq5wrf3fi4lnpd1jqmaqr7ph5d7jxm7f15b1wwrbxir1rmml";
})

View file

@ -1,34 +1,26 @@
{ lib, fetchFromGitHub, fetchpatch, rustPlatform }:
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "notify_push";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "nextcloud";
repo = pname;
rev = "v${version}";
hash = "sha256-LkC2mD3klMQRF3z5QuVPcRHzz33VJP+UcN6LxsQXq7Q=";
hash = "sha256-DGWdVsKA8Y1r+/n+vPkRmFt1EAwPYDmFiUcyWZrXeRM=";
};
cargoHash = "sha256-GZikXM3AvhC2gtwE2wYbGV+aRV+QKothWQG17Vzi2Lc=";
cargoHash = "sha256-H0rkY3hQaOBP8Cai22ppQpZJS1vyFx5uo4k9Paa2yS0=";
passthru = {
test_client = rustPlatform.buildRustPackage {
pname = "${pname}-test_client";
inherit src version;
cargoPatches = [
# fix test client not being able to connect
(fetchpatch {
url = "https://github.com/nextcloud/notify_push/commit/03aa38d917bfcba4d07f72b6aedac6a5057cad81.patch";
hash = "sha256-dcN62tA05HH1RTvG0puonJjKMQn1EouA8iuz82vh2aU=";
})
];
buildAndTestSubdir = "test_client";
cargoHash = "sha256-RALqjI6DlWmfgKvyaH4RiSyqWsIqUyY9f709hOi2ldc=";
cargoHash = "sha256-a8KcWnHr1bCS255ChOC6piXfVo/nJy/yVHNLCuHXoq4=";
};
};

View file

@ -130,9 +130,9 @@
]
},
"notify_push": {
"sha256": "1raxkzdcd9mixg30ifv22lzf10j47n79n05yqbf6mjagrgj0rr7f",
"url": "https://github.com/nextcloud/notify_push/releases/download/v0.5.0/notify_push.tar.gz",
"version": "0.5.0",
"sha256": "1vfa68spnyfivcx0vp49mimf5xg7hsxnifd06imd1c0mw3nlfm4p",
"url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.0/notify_push-v0.6.0.tar.gz",
"version": "0.6.0",
"description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions",
"homepage": "",
"licenses": [

View file

@ -110,9 +110,9 @@
]
},
"notify_push": {
"sha256": "1raxkzdcd9mixg30ifv22lzf10j47n79n05yqbf6mjagrgj0rr7f",
"url": "https://github.com/nextcloud/notify_push/releases/download/v0.5.0/notify_push.tar.gz",
"version": "0.5.0",
"sha256": "1vfa68spnyfivcx0vp49mimf5xg7hsxnifd06imd1c0mw3nlfm4p",
"url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.0/notify_push-v0.6.0.tar.gz",
"version": "0.6.0",
"description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions",
"homepage": "",
"licenses": [

View file

@ -6,18 +6,23 @@
}:
buildGoModule rec {
pname = "aws-sso-cli";
version = "1.9.6";
version = "1.9.9";
src = fetchFromGitHub {
owner = "synfinatic";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3IqWmd3Qi2eVSR9vmZSTt5GLrlO4akjOGdpzndh6nT8=";
sha256 = "sha256-ulnRVyfJ0L1iJ3zVvn3VUYGXDV/UwhqdcC8D4wnjNys=";
};
vendorSha256 = "sha256-f0HrQzHK1JDWmRrnqG/N4X8TG0DP/IRWd6b7QR/vyzo=";
vendorSha256 = "sha256-myjHRZXTjsLXD8kibcdf1/Nhvx50fDsFtmZd63DpiiI=";
nativeBuildInputs = [ makeWrapper ];
ldflags = [
"-X main.Version=${version}"
"-X main.Tag=nixpkgs"
];
postInstall = ''
wrapProgram $out/bin/aws-sso \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "boxxy";
version = "0.3.4";
version = "0.3.5";
src = fetchFromGitHub {
owner = "queer";
repo = "boxxy";
rev = "v${version}";
hash = "sha256-bFDGZhwawOPzXR0ODD61h/wVUibNVl7ayiV9jfvTI6c=";
hash = "sha256-BTVbx6Fk10A2SayXAH4hRRcUqI6+3VEW25vj3sdApqI=";
};
cargoHash = "sha256-oO0cb5PZ2BdJnB+Uyu5ZHpYR5znoeGa/RpyQAXLlrBQ=";
cargoHash = "sha256-eCi8dcaeNjuU7a7W4IJqz9bRbde6PLy/WJCipgancRE=";
meta = with lib; {
description = "Puts bad Linux applications in a box with only their files";

View file

@ -0,0 +1,26 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "mqtt-benchmark";
version = "0.2.0";
src = fetchFromGitHub {
owner = "krylovsk";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-gejLDtJ1geO4eDBapHjXgpc+M2TRGKcv5YzybmIyQSs=";
};
vendorHash = "sha256-ZN5tNDIisbhMMOA2bVJnE96GPdZ54HXTneFQewwJmHI=";
meta = with lib; {
description = "MQTT broker benchmarking tool";
homepage = "https://github.com/krylovsk/mqtt-benchmark";
changelog = "https://github.com/krylovsk/mqtt-benchmark/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, openssl, libevent, libpcap, libnet, zlib }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, libevent, libpcap, libnet, zlib }:
stdenv.mkDerivation rec {
pname = "sslsplit";
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "1p43z9ln5rbc76v0j1k3r4nhvfw71hq8jzsallb54z9hvwfvqp3l";
};
patches = [
(fetchpatch {
name = "fix-openssl-3-build.patch";
url = "https://github.com/droe/sslsplit/commit/e17de8454a65d2b9ba432856971405dfcf1e7522.patch";
hash = "sha256-sEwP7f2PSqXdMqLub9zrfQgH8I4oe9klVPzNpJjrPJ8=";
})
];
buildInputs = [ openssl libevent libpcap libnet zlib ];
makeFlags = [

View file

@ -2,14 +2,15 @@
buildGoModule rec {
pname = "kube-bench";
version = "0.6.11";
version = "0.6.12";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fh7kVYajpn8DKteyvAJf3dk1UrSXFX2gKtTAvuiOjpY=";
rev = "refs/tags/v${version}";
hash = "sha256-QF3aSb8Od8KaINuOs981gDJlp8Iv/WUve+LH+rkrBis=";
};
vendorHash = "sha256-PM8VnPNMLhDhRVy6xafW0kuTHgd374r0Ol2U9k8LNIw=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "naabu";
version = "2.1.1";
version = "2.1.2";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "naabu";
rev = "v${version}";
sha256 = "sha256-XX9c5Qix79eRZkmZxDjFiiTnh66bBLhSunUrIS2FdCA=";
rev = "refs/tags/v${version}";
hash = "sha256-o+5UOyFg1jhFmBDtkVPgJVk50fPt0uxvV6qiPrRtQZw=";
};
vendorSha256 = "sha256-w3prgkemFPLZ/OC0TPQL7kzKPcBLhYTw/IHP1vQlC2s=";
vendorHash = "sha256-Y7eQeoTt0TM4ZKWKVbltYY+k9Vq0TroVywQduwvlLQg=";
buildInputs = [
libpcap
@ -36,6 +36,7 @@ buildGoModule rec {
all ports that return a reply.
'';
homepage = "https://github.com/projectdiscovery/naabu";
changelog = "https://github.com/projectdiscovery/naabu/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};

View file

@ -0,0 +1,25 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "zfxtop";
version = "0.2.1";
src = fetchFromGitHub {
owner = "ssleert";
repo = "zfxtop";
rev = version;
hash = "sha256-9o32sryffcCt/sBnaT5QzD5oLRfJHgq1yKP8d0pk2JQ=";
};
vendorHash = "sha256-H1X7j77Wp8ipgNTMZbFwoSA7NrILahFK8YwoP1W3h2c=";
meta = with lib; {
description = "fetch top for gen Z with X written by bubbletea enjoyer";
homepage = "https://github.com/ssleert/zfxtop";
license = licenses.bsd2;
maintainers = with maintainers; [ wozeparrot ];
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mark";
version = "8.7";
version = "8.8";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = "mark";
rev = version;
sha256 = "sha256-A6EfP7l95eg9uL6NDqiPSzQ59JmTdE96UqunHETns9M=";
sha256 = "sha256-GPL+1NXoy3Wk088XbBrVjZR7rTG8OsAMWJnprTbmnco=";
};
vendorHash = "sha256-LJ288Z8xz/Xoy5I2OAk9v5hxRUkQcRTmNaQ31kHE8gQ=";
vendorHash = "sha256-V14i+8h0HxxHVDNfgaHUxdzEnB+mKL5iGjBwMjPDZ9s=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];

View file

@ -12,23 +12,20 @@
stdenv.mkDerivation rec {
pname = "mmdoc";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "ryantm";
repo = "mmdoc";
rev = version;
hash = "sha256-ZPdAMlKGwEO54hxHcQh1xgu6eUGsoX12xD/9JehzRdw=";
hash = "sha256-1e6TS4TjshicUdT7wuvLsDpotr2LUxbn15r+eNXMo2M=";
};
nativeBuildInputs = [ ninja meson pkg-config xxd ];
buildInputs = [ cmark-gfm fastJson libzip ];
doCheck = stdenv.isx86_64;
meta = with lib; {
broken = stdenv.isDarwin;
description = "Minimal Markdown Documentation";
homepage = "https://github.com/ryantm/mmdoc";
license = licenses.cc0;

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rnr";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "ismaelgv";
repo = pname;
rev = "v${version}";
sha256 = "1r1ahh8bmqrc7zb4bq5ka8bsngncf7im51nf5il49cvysij1i4q8";
sha256 = "sha256-g/PnvOZzlWzEHf3vvYANeJ2ogQ/6duNzhlKpKMBoBFU=";
};
cargoSha256 = "sha256-qgKL+y+w+9ADClxLNwglHMufaysY0K9g29PyuXZ7x7g=";
cargoSha256 = "sha256-+oDRNBQ03MknhcTpZFKt0ipJY43LPOKbGF014rrs6dw=";
meta = with lib; {
description = "A command-line tool to batch rename files and directories";

View file

@ -12269,9 +12269,7 @@ with pkgs;
ssldump = callPackage ../tools/networking/ssldump { };
sslsplit = callPackage ../tools/networking/sslsplit {
openssl = openssl_1_1;
};
sslsplit = callPackage ../tools/networking/sslsplit { };
sstp = callPackage ../tools/networking/sstp {};
@ -22325,6 +22323,8 @@ with pkgs;
mpeg2dec = libmpeg2;
mqtt-benchmark = callPackage ../tools/networking/mqtt-benchmark { };
mqttui = callPackage ../tools/networking/mqttui {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -39126,6 +39126,8 @@ with pkgs;
zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
zfxtop = callPackage ../tools/system/zfxtop { };
zrepl = callPackage ../tools/backup/zrepl { };
uhubctl = callPackage ../tools/misc/uhubctl {};