Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-03-28 06:01:28 +00:00 committed by GitHub
commit d278f7ec1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 55 additions and 36 deletions

View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "boxbuddy";
version = "2.1.4";
version = "2.1.5";
src = fetchFromGitHub {
owner = "Dvlv";
repo = "BoxBuddyRS";
rev = version;
hash = "sha256-954jMFWSIDDqtMitgc8456SMcQLzi6LhLbVvOC45fxQ=";
hash = "sha256-XMLgUYOv2ObHqYxqPch5i0Q1/BvfDuC1Lti5FYAVmnk=";
};
cargoHash = "sha256-08d0mPSGYySxw2uq16MNOu2Y39kjqyfZ8rJ2yTOL3/w=";
cargoHash = "sha256-zbhdGpF3TonGlvRXCWF00PhIc0k1ZO2xIMXuwYD90mY=";
# The software assumes it is installed either in flatpak or in the home directory
# so the xdg data path needs to be patched here

View File

@ -12,11 +12,11 @@
}:
stdenv.mkDerivation rec {
pname = "microsoft-identity-broker";
version = "1.7.0";
version = "2.0.0";
src = fetchurl {
url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/${pname}/${pname}_${version}_amd64.deb";
hash = "sha256-81hKYQKbSimAScO6L13GdweFfzoVpeQzKuV8GJ6kZ1U=";
hash = "sha256-HJ5Q462ziYd+JB1paj0f0OENSJLHqNcX59Fxe+/5RYE=";
};
nativeBuildInputs = [ dpkg makeWrapper openjdk11 zip ];

View File

@ -25,13 +25,13 @@
buildDotnetModule rec {
pname = "ryujinx";
version = "1.1.1239"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
version = "1.1.1242"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "d26ef2eec309a7a7b30b103c245044d1cdc08add";
sha256 = "0kdhxkgnnzhvmwlnzb5d0xx2f240y5h0vc1fhwiqk2cvwly5nd6y";
rev = "c94a73ec60f3f75b36179cbc93d046701ed96253";
sha256 = "0wksc3c63insll1jl0w6pa7vfgvkc50dzkwip676q3j8749fpzql";
};
dotnet-sdk = dotnetCorePackages.sdk_8_0;

View File

@ -6,7 +6,7 @@ mkCoqDerivation {
owner = "HoTT";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.14" "8.18"; out = coq.coq-version; }
{ case = range "8.14" "8.19"; out = coq.coq-version; }
] null;
releaseRev = v: "V${v}";
release."8.14".sha256 = "sha256-7kXk2pmYsTNodHA+Qts3BoMsewvzmCbYvxw9Sgwyvq0=";
@ -14,6 +14,7 @@ mkCoqDerivation {
release."8.16".sha256 = "sha256-xcEbz4ZQ+U7mb0SEJopaczfoRc2GSgF2BGzUSWI0/HY=";
release."8.17".sha256 = "sha256-GjTUpzL9UzJm4C2ilCaYEufLG3hcj7rJPc5Op+OMal8=";
release."8.18".sha256 = "sha256-URoUoQOsG0432wg9i6pTRomWQZ+ewutq2+V29TBrVzc=";
release."8.19".sha256 = "sha256-igG3mhR6uPXV+SCtPH9PBw/eAtTFFry6HPT5ypWj3tQ=";
# versions of HoTT for Coq 8.17 and onwards will use dune
# opam-name = if lib.versions.isLe "8.17" coq.coq-version then "coq-hott" else null;

View File

@ -8,6 +8,7 @@ mkCoqDerivation {
repo = "coq-dpdgraph";
inherit version;
defaultVersion = lib.switch coq.coq-version [
{ case = "8.19"; out = "1.0+8.19"; }
{ case = "8.18"; out = "1.0+8.18"; }
{ case = "8.17"; out = "1.0+8.17"; }
{ case = "8.16"; out = "1.0+8.16"; }
@ -22,6 +23,7 @@ mkCoqDerivation {
{ case = "8.7"; out = "0.6.2"; }
] null;
release."1.0+8.19".sha256 = "sha256-L1vjEydYiwDFTXES3sgfdaO/D50AbTJKBXUKUCgbpto=";
release."1.0+8.18".sha256 = "sha256-z14MI1VSYzPqmF1PqDXzymXWRMYoTlQAfR/P3Pdf7fI=";
release."1.0+8.17".sha256 = "sha256-gcvL3vseLKEF9xinT0579jXBBaA5E3rJ5KaU8RfKtm4=";
release."1.0+8.16".sha256 = "sha256-xy4xcVHaD1OHBdGUzUy3SeZnHtOf1+UIh6YjUYFINm0=";

View File

@ -24,13 +24,13 @@ let
in
stdenv.mkDerivation rec {
pname = "ctranslate2";
version = "4.0.0";
version = "4.1.1";
src = fetchFromGitHub {
owner = "OpenNMT";
repo = "CTranslate2";
rev = "v${version}";
hash = "sha256-pySnkDnV41rqr4OcNonPtSgv4AJYcF5vtkBg6Ad/IvU=";
hash = "sha256-vA1KnHRxIX0lYUfwXTbxjnrrBjFmqp2kwpxBNorVf0Y=";
fetchSubmodules = true;
};

View File

@ -1,7 +1,9 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonRelaxDepsHook
, pytestCheckHook
, hatchling
, argostranslate
, flask
, flask-swagger
@ -11,6 +13,8 @@
, flask-session
, waitress
, expiringdict
, langdetect
, lexilang
, ltpycld2
, morfessor
, appdirs
@ -27,8 +31,7 @@
buildPythonPackage rec {
pname = "libretranslate";
version = "1.5.6";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "LibreTranslate";
@ -37,7 +40,14 @@ buildPythonPackage rec {
hash = "sha256-43VnxgtapMRKyXxqsvBgSMUxvpbLI+iOfW3FA0/POpE=";
};
propagatedBuildInputs = [
build-system = [
hatchling
pythonRelaxDepsHook
];
pythonRelaxDeps = true;
dependencies = [
argostranslate
flask
flask-swagger
@ -47,6 +57,8 @@ buildPythonPackage rec {
flask-session
waitress
expiringdict
langdetect
lexilang
ltpycld2
morfessor
appdirs
@ -59,14 +71,6 @@ buildPythonPackage rec {
polib
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "==" ">="
substituteInPlace setup.py \
--replace "'pytest-runner'" ""
'';
postInstall = ''
# expose static files to be able to serve them via web-server
mkdir -p $out/share/libretranslate

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "preshed";
version = "4.0.0";
version = "3.0.9";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-XisLKgfdGo3uqtZhIBmEXGAu4kkH9pNuqvF6q9VuVEw=";
hash = "sha256-chhjxSRP/NJlGtCSiVGix8d7EC9OEaJRrYXTfudiFmA=";
};
nativeBuildInputs = [
@ -41,6 +41,9 @@ buildPythonPackage rec {
"preshed"
];
# don't update to 4.0.0, version was yanked
passthru.skipBulkUpdate = true;
meta = with lib; {
description = "Cython hash tables that assume keys are pre-hashed";
homepage = "https://github.com/explosion/preshed";

View File

@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "postgres-lsp";
version = "unstable-2024-01-11";
version = "0-unstable-2024-03-24";
src = fetchFromGitHub {
owner = "supabase";
repo = "postgres_lsp";
rev = "bbc24cc541cd1619997193ed81ad887252c7e467";
hash = "sha256-llVsHSEUDRsqjSTGr3hGUK6jYlKPX60rpjngBk1TG2Y=";
rev = "43ca9b675cb152ca7f38cfa6aff6dd2131dfa9a2";
hash = "sha256-n7Qbt9fGzC0CcleAtTWDInPz4oaPjI+pvIPrR5EYJ9U=";
fetchSubmodules = true;
};
cargoHash = "sha256-Npx/sSbMr4PKnNPslvjpOyKH0bpQLzW6cLNW+7H/TQ0=";
cargoHash = "sha256-UEcHlkbYMA6xETMryWXsDHyAZYtLncRJn2jA6tvw7gQ=";
nativeBuildInputs = [
protobuf

View File

@ -19,14 +19,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2024.3.0";
version = "2024.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ha15MLTScFmgYjIRwCQ46DD+Zm64r+KReJTS8jfZX0o=";
hash = "sha256-lWDQp3I8AJT5iTT8wMj/ZL6ykw2NNeLXdq1obnMP7Ao=";
};
nativeBuildInputs = with python.pkgs; [

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, rustPlatform
, installShellFiles
, darwin
@ -11,16 +12,24 @@
rustPlatform.buildRustPackage rec {
pname = "lsd";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
owner = "lsd-rs";
repo = "lsd";
rev = "v${version}";
hash = "sha256-pPCcKEmB1/BS6Q2j1fytwpZa/5KXIJu0ip0Zq97m6uw=";
hash = "sha256-ZMaI0Q/xmYJHWvU4Tha+XVV55zKLukrqkROfBzu/JsQ=";
};
cargoHash = "sha256-E0ui9cmuSqUMTkKvNNuEPOVd/gs4O2oW0aPxlyI9qoA=";
cargoPatches = [
# fix cargo lock file
(fetchpatch {
url = "https://github.com/lsd-rs/lsd/pull/1021/commits/7593fd7ea0985e273c82b6e80e66a801772024de.patch";
hash = "sha256-ykKLVSM6FbL4Jt5Zk7LuPKcYw/wrpiwU8vhuGz8Pbi0=";
})
];
cargoHash = "sha256-TDHHY5F4lVrKd7r0QfrfUV2xzT6HMA/PtOIStMryaBA=";
nativeBuildInputs = [ installShellFiles pandoc ];

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ooniprobe-cli";
version = "3.20.1";
version = "3.21.0";
src = fetchFromGitHub {
owner = "ooni";
repo = "probe-cli";
rev = "v${version}";
hash = "sha256-XjIrae4HPFB1Rv8yIAUh6Xj9UVU55Wx7SuyKJ0BvmXY=";
hash = "sha256-bV1eEuHYaqDKRImEMX9LP/3R3/lVpKpBfweRjucKtTc=";
};
vendorHash = "sha256-HYU+oS+iqdl2jQJc3h9T+MSc/Hq2W6UqP+oPSEyfcOU=";
vendorHash = "sha256-I88cALmc8iTaVJ36ntQLw+wRMM2GLWMWLhv8EDJDRgg=";
subPackages = [ "cmd/ooniprobe" ];