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-04-28 06:01:06 +00:00 committed by GitHub
parent bb7e037425 fb132593f2
commit 0872ce03f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 93 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -15265,6 +15265,12 @@
githubId = 1755789;
name = "Robert Irelan";
};
tennox = {
email = "tennox+nix@txlab.io";
github = "tennox";
githubId = 2084639;
name = "Manu";
};
teozkr = {
email = "teo@nullable.se";
github = "nightkr";

6
pkgs/development/python-modules/ansible-later/default.nix
View file

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "ansible-later";
version = "3.2.2";
version = "3.3.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -33,13 +33,13 @@ buildPythonPackage rec {
owner = "thegeeklab";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-kqvWrNygriFG+jVjezJNe5CwUix38Ge0hQgu351Qyjw=";
hash = "sha256-7k81eEcM+BXNrln6+Lu0+1LjsZdYkUidrRQCdlBbQB8=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'version = "0.0.0"' 'version = "${version}"' \
--replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" ""
--replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --no-cov-on-fail" ""
'';
pythonRelaxDeps = [

4
pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "appthreat-vulnerability-db";
version = "5.0.4";
version = "5.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "AppThreat";
repo = "vulnerability-db";
rev = "refs/tags/v${version}";
hash = "sha256-MdjzQsZfMU295aQt9SepRCwutihidya3Dga/E1fFL9o=";
hash = "sha256-lbaDoLEOMzMGwqBx6gBynVpXz/NM/uCJELwd4d1IEwk=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/bc-detect-secrets/default.nix
View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "bc-detect-secrets";
version = "1.4.21";
version = "1.4.23";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "bridgecrewio";
repo = "detect-secrets";
rev = "refs/tags/${version}";
hash = "sha256-yidDRKG0Lko+aqoCX7sBKsoOUOTEk3GX/gEx8oTCNSc=";
hash = "sha256-lMsGcCD7Qz8OMge6URtrARiR6YPRZRN87dbIlpFdvhY=";
};
propagatedBuildInputs = [

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

@ -45,11 +45,20 @@ buildPythonPackage rec {
sourceRoot = "source/${pname}";
patches = [
# https://github.com/quantumlib/Cirq/pull/5991
(fetchpatch {
url = "https://build.opensuse.org/public/source/openSUSE:Factory/python-cirq/cirq-pr5991-np1.24.patch?rev=8";
stripLen = 1;
hash = "sha256-d2FpaxM1PsPWT9ZM9v2gVrnLCy9zmvkkyAVgo85eL3U=";
})
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "matplotlib~=3.0" "matplotlib" \
--replace "networkx~=2.4" "networkx" \
--replace "numpy~=1.16" "numpy"
--replace "numpy>=1.16,<1.24" "numpy"
'';
propagatedBuildInputs = [
@ -91,6 +100,8 @@ buildPythonPackage rec {
"test_metadata_search_path"
# Fails due pandas MultiIndex. Maybe issue with pandas version in nix?
"test_benchmark_2q_xeb_fidelities"
# https://github.com/quantumlib/Cirq/pull/5991
"test_json_and_repr_data"
];
meta = with lib; {

2
pkgs/development/python-modules/cirq-google/default.nix
View file

@ -32,6 +32,8 @@ buildPythonPackage rec {
disabledTestPaths = [
# No need to test the version number
"cirq_google/_version_test.py"
# Trace/BPT trap: 5
"cirq_google/engine/calibration_test.py"
];
disabledTests = [

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

@ -31,4 +31,9 @@ buildPythonPackage rec {
# No need to test the version number
"cirq_ionq/_version_test.py"
];
disabledTests = [
# DeprecationWarning: decompose_to_device was used but is deprecated.
"test_decompose_operation_deprecated"
];
}

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

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "fastapi-mail";
version = "1.2.7";
version = "1.2.8";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "sabuhish";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-zZjC8tNM6rjpgbMw4MHPVr1UOEhjlgCFcZMvSDmKfzs=";
hash = "sha256-9u7+TYO0TmzyLcCxZL86ibC3hNH5b722t5fWimRHaW0=";
};
postPatch = ''

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "marshmallow-dataclass";
version = "8.5.13";
version = "8.5.14";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "lovasoa";
repo = "marshmallow_dataclass";
rev = "refs/tags/v${version}";
hash = "sha256-zLJMUbiGu+ewY4+IbHKBGWav6UY62aqXQSqLT+oIeI0=";
hash = "sha256-ckz2EQj8gtD+YxNCxisswfSu9FcD//ZeSZRrLBhrld0=";
};
propagatedBuildInputs = [

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "pontos";
version = "23.4.6";
version = "23.4.7";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-b96tfdr/Ya8qK3e+/sXWjlsi8gExX5f/5WgQxWuQfq8=";
hash = "sha256-8EZzxVluFl/EnnJZpu3Mo1KtZVIC36/UvgBeUaPLouo=";
};
nativeBuildInputs = [

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

@ -6,7 +6,7 @@
buildPythonPackage rec {
pname = "pydevccu";
version = "0.1.5";
version = "0.1.6";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-scgWD40jjt8qPGygV11Rfd4Z1voBlErScabLLcmQqGg=";
hash = "sha256-r6QjtKEnMmWRfDAnxP5zMChCVwyi9Z2lFrYu7hPrTUg=";
};
# Module has no tests

1
pkgs/development/python-modules/pyquil/default.nix
View file

@ -40,6 +40,7 @@ buildPythonPackage rec {
pythonRelaxDeps = [
"lark"
"networkx"
];
nativeBuildInputs = [

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

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "vertica-python";
version = "1.3.1";
version = "1.3.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Ju7talF2Tyz6P51XfVea22eKM/wDUP3ugcAWj2tB4CA=";
hash = "sha256-NmTwYQwWzV1ga4u+XApQNZsel52Tg8B5Z7vUnUmQoC8=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/build-managers/bob/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "bob";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "benchkram";
repo = pname;
rev = version;
hash = "sha256-KRg2fHDI562WG4aOpUI/+ColNYJsU/IuHu+/gD++2G4=";
hash = "sha256-zmWfOLBb+GWw9v6LdCC7/WaP1Wz7UipPwqkmI1+rG8Q=";
};
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];

4
pkgs/development/tools/ddosify/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddosify";
version = "0.16.2";
version = "0.16.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-AieMl5/S+ywX29Xu510YqeFKV9IyDZYepO1r/kHklSo=";
sha256 = "sha256-YPy/CP0Pt/D6Vu2pDaJcCrJTEorMvTgGx/+9U7RrG88=";
};
vendorHash = "sha256-/kxHK3dX1RXB3Z5suSKsTHF7xaklCoyzUTbU1lcYwwg=";

4
pkgs/development/tools/language-servers/lua-language-server/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lua-language-server";
version = "3.6.18";
version = "3.6.19";
src = fetchFromGitHub {
owner = "luals";
repo = "lua-language-server";
rev = version;
sha256 = "sha256-EnrJ5CBqE+KLXMZajMex3h6lxBjQBMoL1AxpiHGmGOE=";
sha256 = "sha256-AKPCS2w8PAW2jm5pquCouIHHq5PYFtrPWtIM5N6VAwA=";
fetchSubmodules = true;
};

6
pkgs/os-specific/linux/nvidia-x11/default.nix
View file

@ -56,11 +56,11 @@ rec {
# Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver
vulkan_beta = generic rec {
version = "525.47.18";
version = "525.47.22";
persistencedVersion = "525.85.05";
settingsVersion = "525.85.05";
sha256_64bit = "sha256-L0H7o7zkN1pHHadaIC8nH+JMGt1IzuubEH6KgViU2Ic=";
openSha256 = "sha256-xlRTE+QdAxSomIdvLb5dxklSeu/JVjI8IeYDzSloOo4=";
sha256_64bit = "sha256-y8XgeGljiR2q/Wzp2btCQ8Wa+9KvWsWxZHb+NIqfCYQ=";
openSha256 = "sha256-Y8XL8BJWSV2K1p4VR8T9Z2DOqySgQqkB4Dvf6E6vcxI=";
settingsSha256 = "sha256-ck6ra8y8nn5kA3L9/VcRR2W2RaWvfVbgBiOh2dRJr/8=";
persistencedSha256 = "sha256-dt/Tqxp7ZfnbLel9BavjWDoEdLJvdJRwFjTFOBYYKLI=";
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";

4
pkgs/servers/tracing/tempo/default.nix
View file

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "tempo";
version = "2.0.1";
version = "2.1.0";
src = fetchFromGitHub {
owner = "grafana";
repo = "tempo";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-gqdskpAwv6/FDscnz4akWtYR8eIKSK4gXOnXFo27TVk=";
sha256 = "sha256-fhRIr9dFcfD3hFw6fnrV4yWEcz+CB5xph3KpxnKEWis=";
};
vendorSha256 = null;

6
pkgs/shells/nushell/nu_scripts/default.nix
View file

@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation rec {
pname = "nu_scripts";
version = "unstable-2023-03-16";
version = "unstable-2023-04-26";
src = fetchFromGitHub {
owner = "nushell";
repo = pname;
rev = "00b0039653be5dd2e6567ce8feea82064d27ae11";
sha256 = "0m17cj5wzp94f01kwgs1dh76zwsl2irr7b06i9sb5skqxmmdnjnz";
rev = "724f89c330dc5b93a2fde29f732cbd5b8d73785c";
hash = "sha256-aCLFbxVE8/hWsPNPLt2Qn8CaBkYJJLSDgpl6LYvFVYc=";
};
installPhase = ''

2
pkgs/shells/nushell/plugins/query.nix
View file

@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
src = nushell.src;
cargoHash = "sha256-tHTAz3/4EihdVGXAePCmcOUOjeaqjrY6fIESOGcCW/8=";
cargoHash = "sha256-BKeEAgvhHP01K/q8itwFfFIH8BAS9e1dat449i3M4ig=";
buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];

6
pkgs/tools/graphics/sic-image-cli/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "sic-image-cli";
version = "0.22.1";
version = "0.22.2";
src = fetchFromGitHub {
owner = "foresterre";
repo = "sic";
rev = "v${version}";
sha256 = "sha256-qUhxJw6c1WBJRS1lNg0opux5ePoVlDCLOWUHRCWgkBk=";
sha256 = "sha256-Ph1pAJJmkkeMbWe3DtxAdvp7bshQIbgmqCI4uf84ZGw=";
};
cargoSha256 = "sha256-ZhEI6yTOVu1dAIoJhKfE3YiM9QJPnhLd49irmPfNLDM=";
cargoSha256 = "sha256-FzbGOakAZPui7XObdwLDOfYrgleuePUDSUFPGBRkQKQ=";
nativeBuildInputs = [ installShellFiles nasm ];

26
pkgs/tools/misc/portal/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "portal";
version = "1.2.2";
src = fetchFromGitHub {
owner = "SpatiumPortae";
repo = pname;
rev = "v${version}";
sha256 = "sha256-80ZWMYGH5D5C5Lw97Sic3duw+oXBzIxQjJ+6uQLBwJQ=";
};
vendorSha256 = "sha256-SbNFi5DE3zhTUw0rsX6n+dpYcdDsaDh+zVUrfxgo/4g=";
subPackages = [ "cmd/portal/" ];
ldflags = [ "-s -X main.version=${version}" ]; # from: https://github.com/SpatiumPortae/portal/blob/master/Makefile#L3
meta = with lib; {
description = "A quick and easy command-line file transfer utility from any computer to another";
homepage = "https://github.com/SpatiumPortae/portal";
changelog = "https://github.com/SpatiumPortae/portal/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ tennox ];
};
}

8
pkgs/tools/system/erdtree/default.nix
View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "erdtree";
version = "1.8.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "solidiquis";
repo = pname;
rev = "v${version}";
hash = "sha256-RKIQM5RJygVL15Q3B30DXnqTSbVPJZdb8YNitanzOEA=";
hash = "sha256-Bn3gW8jfiX7tuANktAKO5ceokFtvURy2UZoL0+IBPaM=";
};
cargoHash = "sha256-5bK+gJRBX0Xij5TUGD6BVWDDUJzUzHNPWoLwSXLF9iY=";
cargoHash = "sha256-Z3R8EmclmEditbGBb1Dd1hgGm34boCSI/fh3TBXxMG0=";
meta = with lib; {
description = "File-tree visualizer and disk usage analyzer";
@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/solidiquis/erdtree/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda zendo ];
mainProgram = "et";
mainProgram = "erd";
};
}

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

@ -5574,6 +5574,8 @@ with pkgs;
electron = electron_22;
};
portal = callPackage ../tools/misc/portal { };
pouf = callPackage ../tools/misc/pouf { };
poweralertd = callPackage ../tools/misc/poweralertd { };