Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt 2023-03-05 04:20:09 +01:00
commit d64bcfd19b
14 changed files with 51 additions and 42 deletions

View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cotp"; pname = "cotp";
version = "1.2.1"; version = "1.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "replydev"; owner = "replydev";
repo = "cotp"; repo = "cotp";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-DIb/lgJxwg+QuqzN/0YoUV1iZwRqh6PAN0KRK7TbWDs="; hash = "sha256-Pg07iq2jj8cUA4iQsY52cujmUZLYrbTG5Zj+lITxpls=";
}; };
cargoHash = "sha256-SFx2sjph/5ys5L1Q/ljQhzcybH4k89owI4+vzDsyKjw="; cargoHash = "sha256-9jOrDFLnzjxqN2h6e1/qKRn5RQKlfyeKKmjZthQX3jM=";
buildInputs = lib.optionals stdenv.isLinux [ libxcb ] buildInputs = lib.optionals stdenv.isLinux [ libxcb ]
++ lib.optionals stdenv.isDarwin [ AppKit ]; ++ lib.optionals stdenv.isDarwin [ AppKit ];

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kubecfg"; pname = "kubecfg";
version = "0.29.0"; version = "0.29.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubecfg"; owner = "kubecfg";
repo = "kubecfg"; repo = "kubecfg";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-41hctulZdFSBc+Yw4p2haR2VNIpa0bwntPCz3WUJyZg="; hash = "sha256-lHpXmJPOjyzlNl7fLQH6Ufj20YRzeGz4NGxd3Bgr3mA=";
}; };
vendorHash = "sha256-VGLGa1/8sdVC3H4hxpvF/t2YgbRlbeNTJMJb5zwknPw="; vendorHash = "sha256-VGLGa1/8sdVC3H4hxpvF/t2YgbRlbeNTJMJb5zwknPw=";

View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fizz"; pname = "fizz";
version = "2023.02.20.00"; version = "2023.02.27.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebookincubator"; owner = "facebookincubator";
repo = "fizz"; repo = "fizz";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-qgp0E/xCbvMIndwUkqsvZuFY7333NviOkljqiMOhKtw="; hash = "sha256-zb3O5YHQc+1cPcL0K3FwhMfr+/KFQU7SDVT1bEITF6E=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -1,11 +1,13 @@
{ lib, stdenv, fetchurl, autoreconfHook }: { lib, stdenv, fetchurl, autoreconfHook
, testers
}:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "libsodium"; pname = "libsodium";
version = "1.0.18"; version = "1.0.18";
src = fetchurl { src = fetchurl {
url = "https://download.libsodium.org/libsodium/releases/${pname}-${version}.tar.gz"; url = "https://download.libsodium.org/libsodium/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g"; sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g";
}; };
@ -26,11 +28,14 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = with lib; { meta = with lib; {
description = "A modern and easy-to-use crypto library"; description = "A modern and easy-to-use crypto library";
homepage = "http://doc.libsodium.org/"; homepage = "http://doc.libsodium.org/";
license = licenses.isc; license = licenses.isc;
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
pkgConfigModules = [ "libsodium" ];
platforms = platforms.all; platforms = platforms.all;
}; };
} })

View file

@ -16,7 +16,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fakeredis"; pname = "fakeredis";
version = "2.9.2"; version = "2.10.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc"; owner = "dsoftwareinc";
repo = "fakeredis-py"; repo = "fakeredis-py";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-YwUNjEM0Lmj14fTqQXy78LRzlfffy7KZOTulufkeRZA="; hash = "sha256-H1SeNlX/NqdewNY+rs5HLTK0dRnB1H+EQfzf2g/y1ek=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

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

View file

@ -1,18 +1,20 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchPypi
, pyserial , pyserial
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-velbus"; pname = "python-velbus";
version = "2.1.4"; version = "2.1.9";
format = "setuptools";
src = fetchFromGitHub { disabled = pythonOlder "3.7";
owner = "thomasdelaet";
repo = pname; src = fetchPypi {
rev = version; inherit pname version;
sha256 = "1z0a7fc9xfrcpwi9xiimxsgbzbp2iwyi1rij6vqd5z47mzi49fv9"; hash = "sha256-SbuECT6851E+QNyyPaNTnKmH54fYovemSto8gvfMIKg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -22,7 +24,9 @@ buildPythonPackage rec {
# Project has not tests # Project has not tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "velbus" ]; pythonImportsCheck = [
"velbus"
];
meta = with lib; { meta = with lib; {
description = "Python library to control the Velbus home automation system"; description = "Python library to control the Velbus home automation system";

View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "reolink-aio"; pname = "reolink-aio";
version = "0.5.2"; version = "0.5.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "starkillerOG"; owner = "starkillerOG";
repo = "reolink_aio"; repo = "reolink_aio";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-GLBekTsJqwzwtSYiYaJSeTt7qNs0gx2nOhlsfECFvKg="; hash = "sha256-pPWnK5Xui339D10vS2QA2Og+Qg3JM8c3CbvRxksl0NY=";
}; };
postPatch = '' postPatch = ''

View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "cirrus-cli"; pname = "cirrus-cli";
version = "0.94.4"; version = "0.95.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cirruslabs"; owner = "cirruslabs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-PnO9M3CQQnZotzCuE2rlGsoBzNO0PdsoMLlY3tNyEyk="; sha256 = "sha256-s+mScSSVjzCZ+9lwFdcC/F5oCdT51JNxlqP7uKlx+Y8=";
}; };
vendorSha256 = "sha256-gotc9M2UkRJtE4LZPCpqDTXQ/cnN4tk+3HG243tFoss="; vendorHash = "sha256-TZOBIivaoaO7EWBqV2zuL3Em5o4MButq4+TxvePu+qY=";
ldflags = [ ldflags = [
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "oh-my-posh"; pname = "oh-my-posh";
version = "14.9.1"; version = "14.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jandedobbeleer"; owner = "jandedobbeleer";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-oWif17MawHKiFRts9wfLA7XcSLMuogaPLziYzgKihas="; hash = "sha256-9ZIMAJVVrJk8ny3TgwXHSxrg713dSbPlgQnY/b0m2Ps=";
}; };
vendorHash = "sha256-JZ5UiL2vGsXy/xmz+NcAKYDmp5hq7bx54/OdUyQHUp0="; vendorHash = "sha256-JZ5UiL2vGsXy/xmz+NcAKYDmp5hq7bx54/OdUyQHUp0=";

View file

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "pscale"; pname = "pscale";
version = "0.129.0"; version = "0.130.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "planetscale"; owner = "planetscale";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-GdJyOZ0FqLBRGeQZ5+qLYXLL8JxqigYCVuDUUs1KbN4="; sha256 = "sha256-rrrjIyIMoCshq348bUBGzMcwYhEZMt1OA/pOoE4PEY8=";
}; };
vendorHash = "sha256-iXT+xvmVDfFVV/bYq+hnmkz2ODUQ4fHR8z2lcaK93TE="; vendorHash = "sha256-shs05gXqLjp+L3t5f7oh0BV8YRPtcoCzrTlmx1tOvP0=";
ldflags = [ ldflags = [
"-s" "-w" "-s" "-w"

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "richgo"; pname = "richgo";
version = "0.3.11"; version = "0.3.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kyoh86"; owner = "kyoh86";
repo = "richgo"; repo = "richgo";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-a8CxJKk9fKGYTDtY/mU/3gcdIeejg20sL8Tm4ozgDl4="; sha256 = "sha256-pOB1exuwGwSxStodKhLLwh1xBvLjopUn0k+sEARdA9g=";
}; };
vendorSha256 = "sha256-j2RZOt5IRb2oEQ6sFu+nXpVkDsnppA6h9YT4F7AiCoY="; vendorHash = "sha256-jIzBN5T5+eTFCYOdS5hj3yTGOfU8NTrFmnIu+dDjVeU=";
meta = with lib; { meta = with lib; {
description = "Enrich `go test` outputs with text decorations"; description = "Enrich `go test` outputs with text decorations";

View file

@ -33,7 +33,7 @@
let let
pname = "vector"; pname = "vector";
version = "0.27.0"; version = "0.28.0";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
inherit pname version; inherit pname version;
@ -42,10 +42,10 @@ rustPlatform.buildRustPackage {
owner = "vectordotdev"; owner = "vectordotdev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+jap7cexevEky3H+Ct9LXXUwHR5tnbzdN+b13pv3f70="; sha256 = "sha256-1HNOfIB1HmGthNkJca4tfxcq7nDTjN+tsbsP3rLlXi4=";
}; };
cargoSha256 = "sha256-KehBEwoz5N0zQLDk+9vwFSrn1TrVwljFj+asr7q7hmw="; cargoSha256 = "sha256-m4+9vET4VVgeVVN+nuFGi54OvdiubLO5gZE2mj5c+hc=";
nativeBuildInputs = [ pkg-config cmake perl ]; nativeBuildInputs = [ pkg-config cmake perl ];
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];

View file

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "nsc"; pname = "nsc";
version = "2.7.6"; version = "2.7.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nats-io"; owner = "nats-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-aieUCQ5JVJQs4RoTGaXwfTv3xC1ozSsQyfCLsD245go="; hash = "sha256-cgp/kkHgH5JIWMgrUHHHyuKedbJ3n6L9xBglXCcMYms=";
}; };
ldflags = [ ldflags = [
@ -23,7 +23,7 @@ buildGoModule rec {
"-X main.builtBy=nixpkgs" "-X main.builtBy=nixpkgs"
]; ];
vendorHash = "sha256-gDwppx0ORG+pXzTdGtUVbiFyTD/P7avt+/V89Gl0QYY="; vendorHash = "sha256-l9Fl0j8Fa/hiV/2ebmIlnFtekYLwDg3eMpY7lLBreGg=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];