colin/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-05-05 06:01:19 +00:00 committed by GitHub
commit d32585d4cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 806 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/audio/spek/default.nix
View File

@ -1,19 +1,19 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg_4, wxGTK32, gtk3, wrapGAppsHook }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "spek";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitHub {
owner = "alexkay";
repo = "spek";
rev = "v${version}";
sha256 = "sha256-JLQx5LlnVe1TT1KVO3/QSVRqYL+pAMCxoDWrnkUNmRU=";
sha256 = "sha256-VYt2so2k3Rk3sLSV1Tf1G2pESYiXygrKr9Koop8ChCg=";
};
nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];
buildInputs = [ ffmpeg_4 wxGTK32 gtk3 ];
buildInputs = [ ffmpeg wxGTK32 gtk3 ];
meta = with lib; {
description = "Analyse your audio files by showing their spectrogram";

38
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -110,13 +110,13 @@
"vendorHash": null
},
"aws": {
"hash": "sha256-cmE7jJO49CuYdiKjrPaHhNCFoMbT0z4uSnFdC7Fnd9g=",
"hash": "sha256-oD8I7wWLdn9Yv6naRcq0myg1L2DcvP/a6VL/fUfdC+g=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v4.65.0",
"rev": "v4.66.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-UvbuWjxlou7lwvU5D6DaEXuCFvn8ECTbkNvKGrHwsu8="
"vendorHash": "sha256-tetNRSjQTgFzFLSdmRL6f+UlwKp62zr00JzFXJs8nMs="
},
"azuread": {
"hash": "sha256-YdlH1c2Oeu9wDiZvlzgYhY8CvWCMM3W/ilEkTU3mR1k=",
@ -566,13 +566,13 @@
"vendorHash": null
},
"ibm": {
"hash": "sha256-YIabiu1o2+gJ6ZK5F1PRnVqKP3gbhD96FkDfytX8Hak=",
"hash": "sha256-0ZIm6OTVTfbWcPMWsLNxmD3QDDbB72lvwsISkiWzcFQ=",
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
"owner": "IBM-Cloud",
"repo": "terraform-provider-ibm",
"rev": "v1.52.1",
"rev": "v1.53.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-BTt21bR4kgzyAuS3flalgOJuRxVPwwNOIR2nj2zdw9E="
"vendorHash": "sha256-bcCiNWwVSLI3F3ikTx8z/TtkbgjLAB8puSFTC9LTEMU="
},
"icinga2": {
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@ -819,13 +819,13 @@
"vendorHash": null
},
"okta": {
"hash": "sha256-pSGoD4WSfw6lTJTn/Yf8k60CtbPjZeEPJ7mH1c6cRD0=",
"hash": "sha256-NUczAdOYpqpHGpE2OaJtziggA5o+CUYSq2F/RkTL7YU=",
"homepage": "https://registry.terraform.io/providers/okta/okta",
"owner": "okta",
"repo": "terraform-provider-okta",
"rev": "v3.46.0",
"rev": "v4.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-DkC4BmFfckBtT12lr3rgU9Mg4Nb+7sXjDT/EdfbSFQM="
"vendorHash": "sha256-LjYPZaF8vy1WUNeI/TFIDjVh08sxf6nKLpvmQsCQFFo="
},
"oktaasa": {
"hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
@ -855,13 +855,13 @@
"vendorHash": "sha256-62q67aaOZA3fQmyL8bEHB+W497bcx9Xy7kKrbkjkbaI="
},
"opentelekomcloud": {
"hash": "sha256-bRvs4IxnUObX/ChPdCn97VUQSxTjV2tfnmBmWmgAXUA=",
"hash": "sha256-WgddD3gy8pTRAtkh6FHqFzN15aLkFz7KnPFUN0MS56Q=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.34.2",
"rev": "v1.34.3",
"spdx": "MPL-2.0",
"vendorHash": "sha256-VEreMBvqvBGUZz5EY5+0jbNDOVbmhYerfLYGa1rl+aw="
"vendorHash": "sha256-2EuGZxHrpPwDicSrIf/Jx/c4LhOtE5HvTz9LkJ4xCSY="
},
"opsgenie": {
"hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=",
@ -1180,12 +1180,12 @@
"vendorHash": "sha256-bNE5HxOcj0K2vdqWPVECeTojnWz0hF9mw0TnRRBhqkQ="
},
"vault": {
"hash": "sha256-etQTHPZ1bngVMpeQ/IZ8yaoe94ZPNT2IG4ip4d+73Xg=",
"hash": "sha256-eTHdmow16TJ/uJ4M5yFiYrwuYo4kYSnkPXymxAYVjuw=",
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-vault",
"rev": "v3.15.1",
"rev": "v3.15.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Ox8Onq44NdE/KMrmzbOpKetJKww9T2PvEliLbWU/bLU="
},
@ -1235,11 +1235,11 @@
"vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI="
},
"vultr": {
"hash": "sha256-QZYuxtY89ldGUPNz/DJlFU6HWUJgeJC2TM6cSDoeaYc=",
"hash": "sha256-4Um4UyDjtamy2s15K3Idm5edZj5BOy13+kr39wl9e0Q=",
"homepage": "https://registry.terraform.io/providers/vultr/vultr",
"owner": "vultr",
"repo": "terraform-provider-vultr",
"rev": "v2.14.1",
"rev": "v2.15.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1253,13 +1253,13 @@
"vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs="
},
"yandex": {
"hash": "sha256-UFAWifGu/3QKH8JLBYObLhO/PdCQ1f5e9hmehF8grak=",
"hash": "sha256-ij/KKv/e3KzT5c5KbsW7LszsqzVgwPF2jrnRFOw0uxw=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"proxyVendor": true,
"repo": "terraform-provider-yandex",
"rev": "v0.89.0",
"rev": "v0.90.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-RfSPCBDb4crv6GZPhsVSQOWnZ3xHa/VWln5pSg68Exg="
"vendorHash": "sha256-5pzIvNVgfFT4j18JNHxJ5ZappuS9nFjlpPC3dcsIQRQ="
}
}

4
pkgs/development/libraries/science/math/faiss/default.nix
View File

@ -31,7 +31,7 @@ assert cudaSupport -> nvidia-thrust.cudaSupport;
let
pname = "faiss";
version = "1.7.2";
version = "1.7.4";
inherit (cudaPackages) cudaFlags backendStdenv;
inherit (cudaFlags) cudaCapabilities dropDot;
@ -64,7 +64,7 @@ stdenv.mkDerivation {
owner = "facebookresearch";
repo = pname;
rev = "v${version}";
hash = "sha256-Tklf5AaqJbOs9qtBZVcxXPLAp+K54EViZLSOvEhmswg=";
hash = "sha256-WSce9X6sLZmGM5F0ZkK54VqpIy8u1VB0e9/l78co29M=";
};
buildInputs = [

7
pkgs/development/libraries/science/math/faiss/tests.nix
View File

@ -11,6 +11,8 @@ buildPythonPackage {
pname = "faiss-pytest-suite";
inherit (faiss) version;
format = "other";
src = "${faiss.src}/tests";
dontBuild = true;
@ -21,6 +23,11 @@ buildPythonPackage {
"test_contrib.py"
];
disabledTests = [
# https://github.com/facebookresearch/faiss/issues/2836
"test_update_codebooks_with_double"
];
nativeCheckInputs = [
faiss
pytestCheckHook

19
pkgs/development/libraries/tclx/default.nix
View File

@ -1,12 +1,17 @@
{ lib, fetchurl, tcl }:
{ lib
, fetchFromGitHub
, tcl
}:
tcl.mkTclDerivation rec {
pname = "tclx";
version = "8.4.1";
version = "8.6.1";
src = fetchurl {
url = "mirror://sourceforge/tclx/tclx${version}.tar.bz2";
sha256 = "1v2qwzzidz0is58fd1p7wfdbscxm3ip2wlbqkj5jdhf6drh1zd59";
src = fetchFromGitHub {
owner = "flightaware";
repo = "tclx";
rev = "v${version}";
hash = "sha256-HdbuU0IR8q/0g2fIs1xtug4oox/D24C8E2VbEJC5B1A=";
};
# required in order for tclx to properly detect tclx.tcl at runtime
@ -17,9 +22,9 @@ tcl.mkTclDerivation rec {
'';
meta = {
homepage = "https://tclx.sourceforge.net/";
homepage = "https://github.com/flightaware/tclx";
description = "Tcl extensions";
license = lib.licenses.tcltk;
maintainers = with lib.maintainers; [ kovirobi ];
maintainers = with lib.maintainers; [ kovirobi fgaz ];
};
}

4
pkgs/development/python-modules/aioesphomeapi/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "13.7.2";
version = "13.7.3";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-V4sOpgrDF+h+um/A7VwXKRE+aIUuus+eR1Z1tpt5C1g=";
hash = "sha256-Ywa3m/aUp+CBRdA80a9P2eDwlZfsVYFGbE7ZLggVfwM=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/auth0-python/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "auth0-python";
version = "4.1.1";
version = "4.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-or9lrvCWBTrbRhKDs12KVIukoeo2T8Sb2sex57DfArc=";
hash = "sha256-DyFRCQGjyv75YVBPN+1xWjKQtPUv29xblYu2TehkkVo=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/css-parser/default.nix
View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "css-parser";
version = "1.0.8";
version = "1.0.9";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-mU1qARWo9OK2ZI4rEnMwNtBfoWQniqI0YwyfA+UsjIA=";
hash = "sha256-GW24Is7yJ0WvaljRgM+CBpSc7Vi0j18+6Y8d4WJ0lbs=";
};
# Test suite not included in tarball yet

2
pkgs/development/python-modules/interface-meta/default.nix
View File

@ -21,7 +21,7 @@ buildPythonPackage rec {
poetry-core
];
propogatedBuildInputs = [
propagatedBuildInputs = [
poetry-dynamic-versioning
];

4
pkgs/development/python-modules/json-schema-for-humans/default.nix
View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "json-schema-for-humans";
version = "0.44.4";
version = "0.44.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "coveooss";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-31F7TzuXyu7KaUFcbul7ZWGH0MfakMJrh2Crel+T4Is=";
hash = "sha256-+RsJdlGMrjW2GFFLUcQBMwBnBlhST0knCleh2e3d10A=";
};
postPatch = ''

4
pkgs/development/python-modules/msgspec/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "msgspec";
version = "0.14.0";
version = "0.14.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "jcrist";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-adjLXMHJx9sP5qbg9sw+fV2h843KuG1NKqNyX3gEkVY=";
hash = "sha256-8EdAnHrgff+Xf7r/FuyGYZxpzEXusRTyXbNTNgPcHO0=";
};
# Requires libasan to be accessible

4
pkgs/development/python-modules/sqlmap/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "sqlmap";
version = "1.7.4";
version = "1.7.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-U0mfnTteVPYP7gxRci/+poUf1QTdZ0Kk+f59e9S/A+4=";
hash = "sha256-PQk3uEY1gjvs5BerfEAEZe4v6uZYpCZqCo+Qc7mSUw8=";
};
postPatch = ''

6
pkgs/development/tools/rust/cargo-llvm-lines/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-llvm-lines";
version = "0.4.28";
version = "0.4.29";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
hash = "sha256-ebsmQM3KLhNfBGRXosOlim+rMTg7aQu0LXL4iGr9FRQ=";
hash = "sha256-8FpNUCOK0vAyO7f1Uy+BaqDcZ0GEFvp7meULHtUncNA=";
};
cargoHash = "sha256-YXJfEofipN33aItuqzVZkPvszeZqLyikBoF+viQgCeM=";
cargoHash = "sha256-uIB+fMSVZGZ7OTgiTEeozjPR6CuMsLgEbq/9//of6xo=";
meta = with lib; {
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";

767
pkgs/games/jumpy/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

20
pkgs/games/jumpy/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, makeWrapper
, pkg-config
, zstd
@ -17,36 +16,23 @@
rustPlatform.buildRustPackage rec {
pname = "jumpy";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "fishfolk";
repo = pname;
rev = "v${version}";
sha256 = "sha256-03VPfSIlGB8Cc1jWzZSj9MBFBBmMjyx+RdHr3r3oolU=";
sha256 = "sha256-krO/iPGnzXeY3W8xSFerlKa1DvDl7ss00bGaAMkHUtw=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"bevy_simple_tilemap-0.10.1" = "sha256-Q/AsBZjsr+uTIh/oN0OsIJxntZ4nuc1AReo0Ronj930=";
"bones_asset-0.1.0" = "sha256-YyY5OsbRLkpAgvNifRiXfmzfsgFw/oFV1nQVCkXG4j4=";
};
};
patches = [
# removes unused patch in patch.crates-io, which cases the build to fail
# error: failed to load source for dependency `bevy_simple_tilemap`
# Caused by: attempting to update a git repository, but --frozen was specified
./remove-unused-patch.patch
# the crate version is outdated
(fetchpatch {
name = "bump-version-to-0-6-1.patch";
url = "https://github.com/fishfolk/jumpy/commit/15081c425056cdebba1bc90bfcaba50a2e24829f.patch";
hash = "sha256-dxLfy1HMdjh2VPbqMb/kwvDxeuptFi3W9tLzvg6TLsE=";
})
];
nativeBuildInputs = [
makeWrapper
pkg-config

22
pkgs/games/jumpy/remove-unused-patch.patch
View File

@ -1,22 +0,0 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4977,8 +4977,3 @@ dependencies = [
"libc",
"pkg-config",
]
-
-[[patch.unused]]
-name = "bevy_simple_tilemap"
-version = "0.11.0"
-source = "git+https://github.com/forbjok/bevy_simple_tilemap.git#9a1d4332e961327443adb16aca306f837b6f4da5"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -94,8 +94,6 @@ codegen-units = 1 # Improved rapier physics perf, so it might help other stuf
lto = true
[patch.crates-io]
-bevy_simple_tilemap = { git = "https://github.com/forbjok/bevy_simple_tilemap.git" }
-
bones_lib = { git = "https://github.com/fishfolk/bones" }
bones_bevy_asset = { git = "https://github.com/fishfolk/bones" }
type_ulid = { git = "https://github.com/fishfolk/bones" }

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.5.0";
version = "2023.5.1";
components = {
"3_day_blinds" = ps: with ps; [
];

6
pkgs/servers/home-assistant/default.nix
View File

@ -321,7 +321,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.5.0";
hassVersion = "2023.5.1";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -337,7 +337,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations
src = fetchPypi {
inherit pname version;
hash = "sha256-zTOOQiA9nSJJR59fjkR1k+JNOvqXh1XB21i4nzQq4ZQ=";
hash = "sha256-SnNZE2FFL+PVnAoX661d5d4P1drbSPZQsL25mi4TuNI=";
};
# Secondary source is git for tests
@ -345,7 +345,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-spH1gu045VQeC21OeOEYKTLkql0Gflpha927Kvd7q1w=";
hash = "sha256-ddD9hBN+UU9Z3zfNsymD7O5Fi5v1Xuh2wMPmfhrsoO8=";
};
nativeBuildInputs = with python3.pkgs; [

4
pkgs/servers/home-assistant/frontend.nix
View File

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20230503.1";
version = "20230503.2";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
hash = "sha256-h3M2mnlJOwo05zSmjlPKZVh5npR2IAKT2ff4gIz6f0Y=";
hash = "sha256-Iz7GviL5qRjEE+I15NpquJ3seHFJPnoMasChIti4mYY=";
};
# there is nothing to strip in this package

4
pkgs/tools/virtualization/google-guest-oslogin/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "google-guest-oslogin";
version = "20230406.02";
version = "20230502.00";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "guest-oslogin";
rev = version;
sha256 = "sha256-Eo/wgGytOIbpEsNdAiDt88HRrddy5CopRCFJy7pLKb0=";
sha256 = "sha256-66e0d6nE3880xsdI67O71TyZKQi3sGHkx7fLo3xVI7Q=";
};
postPatch = ''