Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-02-23 18:01:34 +00:00 committed by GitHub
commit cfc5c35a0b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
73 changed files with 353 additions and 206 deletions

View File

@ -2,11 +2,11 @@
let
pname = "ledger-live-desktop";
version = "2.75.0";
version = "2.77.1";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-sVaQbfpgHgd1OZgR+R0PUmNENfDOcNRfvO2AVKFyDqM=";
hash = "sha256-oXSgh2Vuq8SPdLagKz2gAwgg+GFhBRhd/8FnY7hxxJc=";
};
appimageContents = appimageTools.extractType2 {

View File

@ -9,43 +9,43 @@
let
pname = "1password";
version = if channel == "stable" then "8.10.24" else "8.10.26-38.BETA";
version = if channel == "stable" then "8.10.26" else "8.10.28-1.BETA";
sources = {
stable = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
hash = "sha256-vYk7WHGVOzrrep6vmA58ELa6aDsZFUw5D2StCYP0Ioc=";
hash = "sha256-w2Msl8eSQGX6euRcNJY4rET2yJpLWyfWzqvf0veFDU0=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
hash = "sha256-HuhoGG2aQ2NcbZlQfUmGUl0IvhXPO5uV7x4WKJRR7Ew=";
hash = "sha256-3Hq202h2BOUnk1XiAgeW2Tc2BBq3ZCN0EXTh8u3OQ6o=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-RHn1JJoRLWfqOTx0Di0nfHM7fbLs54DdWlI+PTQs1sQ=";
hash = "sha256-PXlmJfcMiTHdUoXfnk2Za86xUHozQF8cpKMJ75SmCjg=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-ZjmgkGTY6KQ0vv7ILMMLYsK7N2YLmJGCBS6954v0JX8=";
hash = "sha256-Wd5rsln8itagb/F5ZaDenBiBjJc8SlRxtlWD+JCDrVY=";
};
};
beta = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
hash = "sha256-7+rwEX/BP5KD77djrJXCl41zviwHfiEi+WZfQeOQksc=";
hash = "sha256-2XwSBJHvv0YYMQUHw2baiMJm5FizmxbaKoQaCIRc5UY=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
hash = "sha256-ELnO6cRgyZQHWTdB0143Z37Tdkc2iZUauFWTf3eL8AE=";
hash = "sha256-pxEGRpzMaxxJ+W2lSDZ7jNKHLQ22pgOKqD/Bt6ot2lk=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-fTpz1POmnqWcMtKCfkwyEFoyrZcpV5y7UP4DamsKbzU=";
hash = "sha256-WoitPHQ6yW5jmCGL976am73TTGbcqBfCvYnDKUORAVU=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-vAWPcOrjrcY8rC0N9PuNe+vivOkWvB6etW2QQWJJz1k=";
hash = "sha256-YE0TvbA7jXpISywC/AWFBfV09jjgY+DLHhRUYbxpaXE=";
};
};
};

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "cotp";
version = "1.4.4";
version = "1.4.5";
src = fetchFromGitHub {
owner = "replydev";
repo = "cotp";
rev = "v${version}";
hash = "sha256-S2658xkaDshQBYfy8mwuuBAKWGF4j+UYtapqPEf1wP4=";
hash = "sha256-q0SI/y4pSNoU+4aQzpkUNioqrxmLxiA2GD1pmyLUISw=";
};
cargoHash = "sha256-DGx/LsKzoITA4extStjULiuiHJx0sTlPloE8h8MvnXQ=";
cargoHash = "sha256-pwhihmrFzb7y4ztXnzJVeMbo5VBoyjJTEDh5ogECLrA=";
buildInputs = lib.optionals stdenv.isLinux [ libxcb ]
++ lib.optionals stdenv.isDarwin [ AppKit ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "atmos";
version = "1.63.0";
version = "1.64.0";
src = fetchFromGitHub {
owner = "cloudposse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3XmRTboq8DSIV4w6EFsbgl21eY3QA5DicE9nM5sAZOQ=";
sha256 = "sha256-wNsyZ0Y3siSZ+i/G3bH/S8wkrmK+FZ2sn5XByDkZ80c=";
};
vendorHash = "sha256-i7m9YXPlWqHtvC4Df7v5bLWt2tqeT933t2+Xit5RQxg=";

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeshark";
version = "52.1.45";
version = "52.1.50";
src = fetchFromGitHub {
owner = "kubeshark";
repo = "kubeshark";
rev = "v${version}";
hash = "sha256-XxdOXcdXkMedhhuVbWNnW0ONVmEhsXyFqyN2moj46Nc=";
hash = "sha256-Nefi/FgIrUqCu+46sedZSirrEEJJ2OnOE1PXTQM+y2o=";
};
vendorHash = "sha256-SmvO9DYOXxnmN2dmHPPOguVwEbWSH/xNLBB+idpzopo=";

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.55.3";
version = "0.55.8";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-FwLL2/V8LIihsr3/JBIuzUH37sRX2xw7nk+KlIIhzxs=";
hash = "sha256-6ffPHam6dFPurlm+VWCI+Z6m3eG+NX/ii8ANCbjtF5Y=";
};
vendorHash = "sha256-uFSkolmQV11cY+3ZWrlByHDFolpr2E+9/R95bhBn6zo=";
vendorHash = "sha256-gXqpBi89VVxHSuHzzcxVRAsdu7TRsNo/vQgI1tMVuaM=";
doCheck = false;

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "snakemake";
version = "8.4.8";
version = "8.4.12";
format = "setuptools";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-iF5+slcPTRK/3SmqR+4KK5KAK5LhKAe+nt+U/B5C3/8=";
hash = "sha256-ehQIrTw1+klFW+Hu4WsWaCJ0YoN2hIqryqqaoNQb1us=";
# https://github.com/python-versioneer/python-versioneer/issues/217
postFetch = ''
sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#'

View File

@ -41,14 +41,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gamescope";
version = "3.14.1";
version = "3.14.2";
src = fetchFromGitHub {
owner = "ValveSoftware";
repo = "gamescope";
rev = "refs/tags/${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-lJt6JVolorQdrhumkW9yjyItxqpw6ZtEUbkjNqzHfb8=";
hash = "sha256-Ym1kl9naAm1MGlxCk32ssvfiOlstHiZPy7Ga8EZegus=";
};
patches = [

View File

@ -8,13 +8,13 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "cosmic-icons";
version = "unstable-2024-02-07";
version = "unstable-2024-02-22";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "edd405ed84186ee24307deb7da6f25efc85986e9";
sha256 = "sha256-qz39vI9bRac9ZQg8FPrwv3/TW5zGlsvs2me5aE5vvZo=";
rev = "ee87327736728a9fb5a70c8688e9000f72829343";
sha256 = "sha256-W4t5uTkiOVGGHZEqD5tGbEPhHbNZp5qnYYHDG8N70vQ=";
};
nativeBuildInputs = [ just ];

View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "hugo";
version = "0.123.1";
version = "0.123.2";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
rev = "refs/tags/v${version}";
hash = "sha256-hT4yFyf6j3KW9e8rYEbd2h9HtflGmPv0C44YDUkuHZw=";
hash = "sha256-/FtRPRVmSRA/QcvQtzFm3PF9vDrt2uJPfAai3Q39/bA=";
};
vendorHash = "sha256-1cd0w9eIPSlhznOQaIiaPoIBnQ4DycVUbZwLOlJ+t8o=";

View File

@ -0,0 +1,45 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, catch2_3, libcpr, trompeloeil }:
stdenv.mkDerivation (finalAttrs: {
pname = "influxdb-cxx";
version = "0.7.2";
src = fetchFromGitHub {
owner = "offa";
repo = "influxdb-cxx";
rev = "v${finalAttrs.version}";
hash = "sha256-DFslPrbgqS3JGx62oWlsC+AN5J2CsFjGcDaDRCadw7E=";
};
patches = [
# Fix unclosed test case tag
(fetchpatch {
url = "https://github.com/offa/influxdb-cxx/commit/b31f94982fd1d50e89ce04f66c694bec108bf470.patch";
hash = "sha256-oSdpNlWV744VpzfiWzp0ziNKaReLTlyfJ+SF2qyH+TU=";
})
];
postPatch = ''
substituteInPlace CMakeLists.txt --replace "-Werror" ""
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ boost libcpr ]
++ lib.optionals finalAttrs.doCheck [ catch2_3 trompeloeil ];
cmakeFlags = [
(lib.cmakeBool "INFLUXCXX_TESTING" finalAttrs.doCheck)
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "-E;BoostSupportTest") # requires network access
];
doCheck = true;
meta = with lib; {
description = "InfluxDB C++ client library";
homepage = "https://github.com/offa/influxdb-cxx";
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
};
})

View File

@ -31,13 +31,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "2212";
version = "2249";
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "refs/tags/b${finalAttrs.version}";
hash = "sha256-lB+/iA0b5JmIgpmQ0/M32Q52Y0VVOCoeiBpLe4owYsc=";
hash = "sha256-ikJUToUbA60u/8azR6dPmPyodq/nQe5L2aotlYBclaE=";
};
postPatch = ''

View File

@ -27,15 +27,15 @@ let
++ optionals jpgSupport [ graphicsmagick exiftool ]
);
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "megapixels";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitLab {
owner = "postmarketOS";
repo = "megapixels";
rev = version;
hash = "sha256-ejTCYZMDkqz8P3vroq8XAl+pUGgcS56cm3tzOTE3rfc=";
owner = "megapixels-org";
repo = "Megapixels";
rev = finalAttrs.version;
hash = "sha256-J94kDSqQkfdltbYbzvJofd5o/Dhivtld475CaQs7+Ok=";
};
nativeBuildInputs = [
@ -64,12 +64,15 @@ stdenv.mkDerivation rec {
)
'';
strictDeps = true;
meta = with lib; {
description = "GTK4 camera application that knows how to deal with the media request api";
homepage = "https://gitlab.com/postmarketOS/megapixels";
changelog = "https://gitlab.com/postmarketOS/megapixels/-/tags/${version}";
homepage = "https://gitlab.com/megapixels-org/Megapixels";
changelog = "https://gitlab.com/megapixels-org/Megapixels/-/tags/${finalAttrs.version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ dotlambda ];
maintainers = with maintainers; [ dotlambda Luflosi ];
platforms = platforms.linux;
mainProgram = "megapixels";
};
}
})

View File

@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec {
"botocore"
"google-api-python-client"
"slack-sdk"
"pydantic"
];
nativeBuildInputs = with python3.pkgs; [

View File

@ -7,10 +7,10 @@
inherit buildUnstable;
}).overrideAttrs (finalAttrs: _: {
pname = "renode-unstable";
version = "1.14.0+20240219gitea2784757";
version = "1.14.0+20240222git83285cc63";
src = fetchurl {
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
hash = "sha256-ODf2vWQ0ZeYYmia5BgQvLm+BFCX/GjVvRqVAPPW/sq8=";
hash = "sha256-RFZdl2t1356h4Hvab6Gn3LZZnCWlQlK6C0otlXzVlMI=";
};
})

View File

@ -71,37 +71,32 @@ rustPlatform.buildRustPackage rec {
env.CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld";
addBuildInputRunpathsPhase = ''
declare _extraRunpaths
_sep=
for p in "''${pkgsHostTarget[@]}" ; do
if [[ -d "$p/lib" ]] ; then
_extraRunpaths+="$_sep$p/lib"
if [[ -z "$_sep" ]] ; then
_sep=:
fi
fi
done
addDlopenRunpaths = map (p: "${lib.getLib p}/lib") (
lib.optionals stdenv.hostPlatform.isLinux [
libxkbcommon
vulkan-loader
wayland
]
);
addDlopenRunpathsPhase = ''
elfHasDynamicSection() {
patchelf --print-rpath "$1" >& /dev/null
}
while IFS= read -r -d $'\0' path ; do
if elfHasDynamicSection "$path" ; then
patchelf "$path" --add-rpath "''${_extraRunpaths}"
fi
elfHasDynamicSection "$path" || continue
for dep in $addDlopenRunpaths ; do
patchelf "$path" --add-rpath "$dep"
done
done < <(
for o in $(getAllOutputNames) ; do
find "''${!o}" -type f -and "(" -executable -or -iname '*.so' ")" -print0
done
)
unset _extraRunpaths
unset _sep
'';
postPhases = lib.optionals stdenv.isLinux [ "addBuildInputRunpathsPhase" ];
postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ];
cargoTestFlags = [
"-p"

View File

@ -0,0 +1,13 @@
diff --git a/tests/tests.pro b/tests/tests2.pro
index 314cad227646..48f1c66ee3f7 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -6,7 +6,7 @@ QT += core gui sql printsupport dbus testlib widgets
#QMAKE_CXXFLAGS += -g -fsanitize=undefined,address -O2
#QMAKE_LFLAGS += -g -fsanitize=undefined,address -O2
-CONFIG += c++11 link_pkgconfig resources_big testcase no_testcase_installs
+CONFIG += c++14 link_pkgconfig resources_big testcase no_testcase_installs
#访问私有方法 -fno-access-control
QMAKE_CXXFLAGS += -g -Wall -fprofile-arcs -ftest-coverage -fno-access-control -O0 -fno-inline

View File

@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
hash = "sha256-G5UZ8lBrUo5G3jMae70p/zi9kOVqHWMNCedOy45L1PA=";
};
patches = [ ./0001-build-tests-with-cpp-14.patch ];
# don't use vendored htmltopdf
postPatch = ''
substituteInPlace deepin_reader.pro \

View File

@ -64,6 +64,7 @@ let
meta = with lib; {
license = licenses.gpl2Classpath;
sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
description = "${brand-name}, prebuilt OpenJDK binary";
platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms
maintainers = with maintainers; [ taku0 ];

View File

@ -121,6 +121,7 @@ let
meta = with lib; {
license = licenses.gpl2Classpath;
sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
description = "${brand-name}, prebuilt OpenJDK binary";
platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms
maintainers = with maintainers; [ taku0 ];

View File

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "yoda";
version = "1.9.9";
version = "1.9.10";
src = fetchurl {
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
hash = "sha256-68rVU2mhztzuOi3gWUB8hRZSukRJURP1wJ2MLlf1Fqo=";
hash = "sha256-CnCO6dcElF0zh8xDexX/3fOCxw/lurOe0r2/g8LCjG8=";
};
nativeBuildInputs = with python.pkgs; [

View File

@ -1,6 +1,6 @@
{ lib
, ocaml
, version ? if lib.versionAtLeast ocaml.version "5.1" then "0.14" else "0.12"
, version ? if lib.versionAtLeast ocaml.version "5.1" then "0.15" else "0.12"
, buildDunePackage
, bigstringaf
, cstruct
@ -24,9 +24,9 @@ let
minimalOCamlVersion = "5.0";
hash = "sha256-2EhHzoX/t4ZBSWrSS+PGq1zCxohc7a1q4lfsrFnZJqA=";
};
"0.14" = {
"0.15" = {
minimalOCamlVersion = "5.1";
hash = "sha256-UvhblH0+DecJQLW7qsDT54hB/qVkjnOvfYp1SrUchxs=";
hash = "sha256-gH7O8zfdqEmwXT29F6ko5vXGNudusV4iE2Z8kRJ3GKc=";
};
}."${version}";
in

View File

@ -0,0 +1,38 @@
{ lib
, buildDunePackage
, fetchurl
, alcotest
, type_eq
}:
buildDunePackage rec {
pname = "type_id";
version = "0.0.1";
minimalOCamlVersion = "4.08.1";
src = fetchurl {
url = "https://github.com/skolemlabs/${pname}/releases/download/${version}/${pname}-${version}.tbz";
hash = "sha256-hmVAD9vgU1HLnB7d1TX17V+Alf5ZXmvQgd2nLHnLhDk=";
};
propagatedBuildInputs = [
type_eq
];
checkInputs = [
alcotest
];
doCheck = true;
meta = {
description = "Type identifiers, useful for runtime type-safe casting/coersions";
homepage = "https://github.com/skolemlabs/type_id";
changelog = "https://github.com/skolemlabs/type_id/blob/${version}/CHANGES.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ sixstring982 ];
};
}

View File

@ -365,14 +365,14 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.34.47";
version = "1.34.48";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-hMeQgnm/btHo/v+Jxo6gWkDPR6TLFp30AVWOu/pLdYs=";
hash = "sha256-8MKDQUYTza7LtrJk70A9niRF5W3JTvsFGEtPXKqrQVg=";
};
nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.34.47";
version = "1.34.48";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-zB+sMY47KPTK5PZk2qFZj80dqof+WzErQCE3t2HtHEY=";
hash = "sha256-buGZMJAFtiyr7X2aj2Q78LHc/ozLIkdZXb4c8IYdvT4=";
};
nativeBuildInputs = [

View File

@ -1,33 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, click
, dateutils
, dbt-postgres
, fetchFromGitHub
, hatchling
, hypothesis
, importlib-metadata
, jinja2
, jsonschema
, more-itertools
, pydantic
, pytestCheckHook
, pythonOlder
, pyyaml
, typing-extensions
, hypothesis
, dbt-postgres
}:
buildPythonPackage rec {
pname = "dbt-semantic-interfaces";
version = "0.4.2";
version = "0.4.3";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "dbt-labs";
repo = pname;
repo = "dbt-semantic-interfaces";
rev = "refs/tags/v${version}";
hash = "sha256-Q3aKUyXB+HzPCpwbJ66zDv92n04Gb0w7ivWfga3UX3s=";
hash = "sha256-mYAOAi0Qb89zp4o7vRdR7fw7vrlXt1TFVqGR09QcRSA=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
click
dateutils
@ -40,10 +47,6 @@ buildPythonPackage rec {
typing-extensions
];
nativeBuildInputs = [
hatchling
];
nativeCheckInputs = [
pytestCheckHook
hypothesis
@ -59,7 +62,5 @@ buildPythonPackage rec {
homepage = "https://github.com/dbt-labs/dbt-semantic-interfaces";
license = licenses.asl20;
maintainers = with maintainers; [ pbsds ];
# https://github.com/dbt-labs/dbt-semantic-interfaces/issues/134
broken = versionAtLeast pydantic.version "2";
};
}

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "fastecdsa";
version = "2.3.1";
version = "2.3.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-8ZjORPaUbKuwKYip9J0U78QQ26XiEemDIbqdhzeyP/g=";
hash = "sha256-81JVptPkEQkWa11LCIZtWsu5ny4eZNOn50x3RmTNqEI=";
};
buildInputs = [

View File

@ -2,7 +2,6 @@
, anyascii
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, flaky
, google-cloud-storage
, mock
@ -11,13 +10,14 @@
, pytestCheckHook
, pythonOlder
, requests
, setuptools
, sqlalchemy
}:
buildPythonPackage rec {
pname = "filedepot";
version = "0.10.0";
format = "setuptools";
version = "0.11.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -25,16 +25,11 @@ buildPythonPackage rec {
owner = "amol-";
repo = "depot";
rev = "refs/tags/${version}";
hash = "sha256-vPceky5cvmy3MooWz7dRdy68VoAHN7i3a7egBs4dPE8=";
hash = "sha256-693H/u+Wg2G9sdoUkC6DQo9WkmIlKnh8NKv3ufK/eyQ=";
};
patches = [
# Add support for Pillow 10, https://github.com/amol-/depot/pull/84
(fetchpatch {
name = "support-pillow-10.patch";
url = "https://github.com/amol-/depot/commit/bdb73d1b3898279068b421bc061ecc18c5108fa4.patch";
hash = "sha256-7+VGrdJstkiy0bYAqA9FjF1NftZiurgyPd8Wlz6GUy8=";
})
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-ai-generativelanguage";
version = "0.5.2";
version = "0.5.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-njzyaFPXTRvZmWfB0uYufMNqhTBBN7fkKtS7bUyA8ME=";
hash = "sha256-s1RcPVKt99sX3kS12mRf3G3Q2Sg7Z3rvANZMFKyvceM=";
};
propagatedBuildInputs = [

View File

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "google-cloud-asset";
version = "3.24.1";
version = "3.24.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-aNTCDqj/0/qm4gwZrIKrn2yhgKshv1XwGlHd4zhzMgI=";
hash = "sha256-/sRsJZDbwTxFXGQI/s8fKwWPGTdS5vSQ+bl8znKp7fI=";
};
nativeBuildInputs = [

View File

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
version = "2.13.1";
version = "2.13.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-AhZ5KdSpxJS8jHfwJfLztMtyGZOnCwhb/lalrPZ9jog=";
hash = "sha256-2QJzq4t0oo18gbI3zFz5KxidOkfSuQ2sjNNnIlJ7ok4=";
};
nativeBuildInputs = [

View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-logging";
version = "1.4.1";
version = "1.4.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-HryKL26J6H2xW/EEPVceWd0ZATP7QAuolU77sw3QrWM=";
hash = "sha256-e9jlI/utitWKBZ/IMEtrFBw5k6FGdIxtmoujUFBcwPs=";
};
nativeBuildInputs = [

View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.40.0";
version = "2.41.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-4yTrV0OtvCmd9+5rNaTOJBAS/s52hyjwA7O1/lLyFtE=";
hash = "sha256-5DUFaQqzIvN/8Vo7MJNBrsMaB4HANO7Eb2nuzx3nDJc=";
};
nativeBuildInputs = [

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-datacatalog";
version = "3.18.1";
version = "3.18.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-xjf6yWXgfJFEHw1lYSryfe86UMsM1Y4fGRffDTne20U=";
hash = "sha256-USo8ldUbfsArvjw5+MOubFDOlXkV4GPowHYVsRHBHrk=";
};
nativeBuildInputs = [

View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-dlp";
version = "3.15.1";
version = "3.15.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-kZjw+TBXVX5O/OufGN/Y/J0NDX30RiqFqwndnGkUjBE=";
hash = "sha256-Ttza6UuVCUJUmoH9hFVWVzTfX4kTMS9EQ+ixoYm9xOg=";
};
nativeBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-language";
version = "2.13.1";
version = "2.13.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-8ZU9aJPTXNQ9CLK1UgwWWnAOSt584lyiKEAXiQsOWhU=";
hash = "sha256-gTrT3dypeJBxAJjnatSMN+pj6joUoPbX9CRsb7FcsqU=";
};
nativeBuildInputs = [

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
version = "2.19.1";
version = "2.19.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-P4vdD1zCDzDn0ydEXCw2C/aEFnJYR13knOM91eDFcZw=";
hash = "sha256-OIGwJiBOBkhwdGGpeD736ExscWvQZ6OGSxyz1Mn13HM=";
};
nativeBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-os-config";
version = "1.17.1";
version = "1.17.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-0DXo2h2gqO1z5quUyWI1Qb/CNaqyy1SNinyaPyRWuR0=";
hash = "sha256-d6LvrMM+n0PKd751zafDHrtUZUBpip/Nf+PcD6MuEsg=";
};
nativeBuildInputs = [

View File

@ -12,20 +12,25 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "2.19.4";
format = "setuptools";
version = "2.19.6";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-pfkoBZjwxKWBm7YwpQxF3IrNoMlK/srgoYNovMv6JlE=";
hash = "sha256-Tq5LyYRj29rq11l/dmb/4U/GKqvtEOPjIslcsFD6fb4=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
google-api-core
grpc-google-iam-v1

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-redis";
version = "2.15.1";
version = "2.15.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-RTDYMmkRjkP5VhN74Adlvm/vpqXd9lnu3ckjmItIi+Y=";
hash = "sha256-uq+TEU5Ky3Uuaga19Y58UL9oPrDhOGRf7OduCgFZwYg=";
};
nativeBuildInputs = [

View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
version = "1.12.1";
version = "1.12.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-JbMRLJhO9qJWnKcEcWCyNBxSjHDh0uct65loaqLhZ90=";
hash = "sha256-Lt5EalCHsjbw4fs5zKN5G66X6w2RJQV0AUVLGQ1Vcu4=";
};
nativeBuildInputs = [

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
version = "2.24.1";
version = "2.25.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-aPW5m1cZNXpbiWCUQs104QH+/rVueanW0yE5TCdgWoQ=";
hash = "sha256-Bwt6c3Ndhxzc9VkCOOnE/1m7X1JBcodrpVZGtcXrhrg=";
};
nativeBuildInputs = [

View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-tasks";
version = "2.16.0";
version = "2.16.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-oybkbzeqE4sW6RN5P7AFJV3rahTCykwJndQ8uAmhiCE=";
hash = "sha256-L1wVxYEVHZE9hA/KNI3JpfvRzBbsUR4/ZrL8agHwbjg=";
};
nativeBuildInputs = [

View File

@ -8,20 +8,25 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
version = "2.16.1";
format = "setuptools";
version = "2.16.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-8Mgf83pd3FFokpnb1g8DDthVBBY+hvBMmjdf2fpQswQ=";
hash = "sha256-6qyAnZp9B8XJ61hhORZULLL6UsFPnzHaf/SYn3F/jgw=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
google-api-core
proto-plus

View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-trace";
version = "1.13.1";
version = "1.13.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-KJpHnWbmrFVcixfvKQ/nvDWLy4Sn1lVDVsjkS/2+p5w=";
hash = "sha256-3Iy7ke+2sH+S/xkjjfD4snLRt9B0Zew52qcwSryyDNU=";
};
nativeBuildInputs = [

View File

@ -10,20 +10,25 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.12.1";
format = "setuptools";
version = "3.15.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Zhy4h5qjxjovclo+po+QGZvTVMlcoWnMLoOlEFmH0p4=";
hash = "sha256-bUwkR7wviOxeDTpneMPYX6s22iFLk4SxBlmyno259ZQ=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
google-api-core
google-cloud-core
@ -34,8 +39,8 @@ buildPythonPackage rec {
nativeCheckInputs = [
google-cloud-testutils
mock
pytestCheckHook
pytest-asyncio
pytestCheckHook
];
preCheck = ''
@ -50,6 +55,11 @@ buildPythonPackage rec {
"google.cloud.translate_v3beta1"
];
disabledTests = [
# Tests require PROJECT_ID
"test_list_glossaries"
];
meta = with lib; {
description = "Google Cloud Translation API client library";
homepage = "https://github.com/googleapis/python-translate";

View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-videointelligence";
version = "2.13.1";
version = "2.13.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-nZQVoV6ciXHZfbr26U4PKFU/sHJPoZNB5j7covnE9aw=";
hash = "sha256-wHfiVZmhB/GMfgV8pmHzdgCxtxxl2Q1s9cQgQ9rcjbE=";
};
nativeBuildInputs = [

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
version = "3.7.0";
version = "3.7.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-uHIhWpihTxcV28zv3OZrGf4mj26aBaR2isycRMtMeNM=";
hash = "sha256-hovm31u1SRxvMb7fYAryNmHAJ3bKVkwVHELGPgs0Zds=";
};
nativeBuildInputs = [

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-websecurityscanner";
version = "1.14.1";
version = "1.14.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-+RupyR6W5fYR1n28anASGIXI6J53CU4WG1QC+HIZi/Y=";
hash = "sha256-loiKMV7guByukm9XBohVbCDsV607i8PXiQaJ8GZS6Go=";
};
nativeBuildInputs = [

View File

@ -1,19 +1,22 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, grpcio
, fetchFromGitHub
, googleapis-common-protos
, grpcio
, pytestCheckHook
, setuptools
}:
buildPythonPackage rec {
pname = "grpc-google-iam-v1";
version = "0.12.7";
version = "0.13.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-AJGXp/HqqiIUnJbl4FSsWTS6ckGXTpJmPY01KKISA9E=";
src = fetchFromGitHub {
owner = "googleapis";
repo = "python-grpc-google-iam-v1";
rev = "refs/tags/v${version}";
hash = "sha256-pmwHDzOaXrgqXZiaxIn01CtiAG+XRBGr8BgzbG/F1uw=";
};
nativeBuildInputs = [
@ -25,17 +28,24 @@ buildPythonPackage rec {
googleapis-common-protos
];
# no tests run
doCheck = false;
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"google.iam"
"google.iam.v1"
];
pytestFlagsArray = [
"-W"
"ignore::DeprecationWarning"
];
meta = with lib; {
description = "GRPC library for the google-iam-v1 service";
homepage = "https://github.com/googleapis/googleapis";
homepage = "https://github.com/googleapis/python-grpc-google-iam-v1";
changelog = "https://github.com/googleapis/python-grpc-google-iam-v1/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "myuplink";
version = "0.4.0";
version = "0.4.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "pajzo";
repo = "myuplink";
rev = "refs/tags/${version}";
hash = "sha256-xITV5+d/9j8pjfvmnt8RfGHu4lfLu8cMFV0MzURy6hA=";
hash = "sha256-zd1ZTLwgPD1m4SR5QVZWUvkjZtlB+VEfCZDsRELuYzE=";
};
postPatch = ''

View File

@ -6,6 +6,7 @@
, pytest-mock
, pytestCheckHook
, python-dotenv
, pythonAtLeast
, pythonOlder
, setuptools
, typing-extensions
@ -14,7 +15,7 @@
buildPythonPackage rec {
pname = "pydantic";
version = "1.10.13";
version = "1.10.14";
pyproject = true;
disabled = pythonOlder "3.7";
@ -23,7 +24,7 @@ buildPythonPackage rec {
owner = "pydantic";
repo = "pydantic";
rev = "refs/tags/v${version}";
hash = "sha256-ruDVcCLPVuwIkHOjYVuKOoP3hHHr7ItIY55Y6hUgR74=";
hash = "sha256-tcaHSPZggVwyzCgDmwOgcGqUmUrJOmkdSNudJTFQ3bc=";
};
nativeBuildInputs = [
@ -62,6 +63,15 @@ buildPythonPackage rec {
export HOME=$(mktemp -d)
'';
disabledTests = lib.optionals (pythonAtLeast "3.12") [
# depends on distuils
"test_cython_function_untouched"
# AssertionError on exact types and wording
"test_model_subclassing_abstract_base_classes_without_implementation_raises_exception"
"test_partial_specification_name"
"test_secretfield"
];
enableParallelBuilding = true;
pythonImportsCheck = [ "pydantic" ];

View File

@ -54,8 +54,8 @@ buildPythonPackage {
torch
];
inherit (rerun) addBuildInputRunpathsPhase;
postPhases = lib.optionals stdenv.isLinux [ "addBuildInputRunpathsPhase" ];
inherit (rerun) addDlopenRunpaths addDlopenRunpathsPhase;
postPhases = lib.optionals stdenv.isLinux [ "addDlopenRunpathsPhase" ];
disabledTestPaths = [
# "fixture 'benchmark' not found"

View File

@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "snowflake-connector-python";
version = "3.7.0";
version = "3.7.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-sr+uxkBZMHsIyq2tQCFNSI/vtKI/zXVTrHX16nWKkWk=";
hash = "sha256-3GmC9lOGDt7xYUowR6FrywfiJ3Xm4JCAi79PdinEGR0=";
};
# snowflake-connector-python requires arrow 10.0.1, which we don't have in

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "teslajsonpy";
version = "3.9.10";
version = "3.9.11";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "zabuldon";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-DNac9rrHJkFWlYRLvDB49kjmJV2EMvs5Y2ndSGY7uvk=";
hash = "sha256-oGYXhSMwG566xdGCDMz9ajJ4HJXXcYBAJQf035iJQvE=";
};
nativeBuildInputs = [

View File

@ -52,7 +52,7 @@
, unittestCheckHook
}:
let
version = "6.3.0";
version = "7.0.0";
api = [ aiohttp fastapi uvicorn ];
# cloud = [ apache-libcloud ];
console = [ rich ];
@ -105,7 +105,7 @@ buildPythonPackage {
owner = "neuml";
repo = "txtai";
rev = "refs/tags/v${version}";
hash = "sha256-Efk4HAJsQtSGp4S8S1dFBmObJ9ff9u9bRrTa5lACpTU=";
hash = "sha256-dYAzbdGEu9gAUzptuSfej6T5LPyTneRWigdAMlGgeqM=";
};
nativeBuildInputs = [

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "types-awscrt";
version = "0.20.3";
version = "0.20.4";
pyproject = true;
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "types_awscrt";
inherit version;
hash = "sha256-BqhZGJoynKjmbVbO7vI5FIjjm4ePvSFB8RXqtNQW/iI=";
hash = "sha256-ECRVcMcoXpSTYrSucQxUvyhdZKJ0U9QnYkd7zuXNd6M=";
};
nativeBuildInputs = [

View File

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "wcmatch";
version = "8.5";
version = "8.5.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-hsF1ctD3XL87yxoY878vnnKzmpwIybSnTpkeGIKo77M=";
hash = "sha256-wAiMf2Qmz2vyflMOK3tzQDGQX35JBHX9g8fFAIq1gbM=";
};
nativeBuildInputs = [

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "xsdata";
version = "24.1";
version = "24.2.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -26,8 +26,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "tefra";
repo = "xsdata";
rev = "v${version}";
hash = "sha256-vdcCTJqvaRehGWfTd9GR/DypF9ftY4ite7SDMPc2Ups=";
rev = "refs/tags/v${version}";
hash = "sha256-o3G0isXShwNHaOiA4TNml0IhStB3X4jB9CgrVKViBlY=";
};
patches = [
@ -94,7 +94,7 @@ buildPythonPackage rec {
meta = {
description = "Naive XML & JSON bindings for Python";
homepage = "https://github.com/tefra/xsdata";
changelog = "https://github.com/tefra/xsdata/blob/${src.rev}/CHANGES.rst";
changelog = "https://github.com/tefra/xsdata/blob/${src.rev}/CHANGES.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "api-linter";
version = "1.63.5";
version = "1.63.6";
src = fetchFromGitHub {
owner = "googleapis";
repo = "api-linter";
rev = "v${version}";
hash = "sha256-jslSa3TlSb6nDl79ZcXHBkxs71OndVh3QZjVruv4puc=";
hash = "sha256-v4giqOTfHVfrEZk/4zf19OFhXJ1n+kqe2Yeioi/VK5w=";
};
vendorHash = "sha256-1p7fcg6ZMHxwrk6+KwGhy3jdXX3FpgufbYIv1BIGNKk=";

View File

@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sbt";
version = "1.9.8";
version = "1.9.9";
src = fetchurl {
url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
hash = "sha256-qG//418Ga2XV4C67SiytHPu0GPgwv19z0n8wc+7K/c0=";
hash = "sha256-xXyuYMISLKG7p3GE37TQ0l/GwYgFOUqzarYgiwwPJi8=";
};
postPatch = ''

View File

@ -7,18 +7,18 @@
buildGoModule rec {
pname = "extism-cli";
version = "1.0.3";
version = "1.1.0";
src = fetchFromGitHub {
owner = "extism";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-szs5tLjGCavHerQQi0Abla0kaHYQ/xN0O36Wrc1MG4Y=";
hash = "sha256-QC21BrT7uAbKPyLGjx0lBnQHN1nHek+BdCJ7EpJGV6s=";
};
modRoot = "./extism";
vendorHash = "sha256-IRqn4XmFA6vyjtgTaxYh7ndHkQYuKC1eHKNoGC7Hh+U=";
vendorHash = "sha256-UaMPtWmBKCcBR2KiubhW6F7knP6dM8sXQzUEaT59cRQ=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "go-tools";
version = "2023.1.6";
version = "2023.1.7";
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-tools";
rev = version;
sha256 = "sha256-Ecp3A3Go7mp8/ghMjTGqCNlRkCeEAb3fzRuwahWcM2I=";
sha256 = "sha256-oR3fsvZmeddN75WsxOMcYe/RAIjYz+ba03ADJfDUqNg=";
};
vendorHash = "sha256-dUO2Iw+RYk8s+3IV2/TSKjaX61YkD/AROq3177r+wKE=";

View File

@ -15,16 +15,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "texlab";
version = "5.12.3";
version = "5.12.4";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "texlab";
rev = "refs/tags/v${version}";
hash = "sha256-/QjaAzCPhXzsiRhnRRZcujmk1C9IONYlMfjp/a1iIDA=";
hash = "sha256-kLf0EG6jKJeKowNZ21cwE0a9w630GoljNwRckHrkajg=";
};
cargoHash = "sha256-VDRLbhgQkPkeTpQxRsq8QEU53Zd4b5F0phoq2cAWIK8=";
cargoHash = "sha256-5vEoreDRHRxsVNPwZpgmeClEFZ0SzLjb5EZLfmlqEJM=";
outputs = [ "out" ] ++ lib.optional (!isCross) "man";

View File

@ -21,20 +21,19 @@ let
"4.12.1" = "4.7-412";
"4.13.0" = "4.7-413";
"4.13.1" = "4.7-413";
"4.14.0" = "4.13-414";
"4.14.1" = "4.13-414";
"5.0.0" = "4.12-500";
"5.1.0" = "4.13-501";
"5.1.1" = "4.13.1-501";
"4.14.0" = "4.14-414";
"4.14.1" = "4.14-414";
"5.0.0" = "4.14-500";
"5.1.0" = "4.14-501";
"5.1.1" = "4.14-501";
};
hashes = {
"4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y=";
"4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU=";
"4.12-500" = "sha256-j49R7KVzNKlXDL7WibTHxPG4VSOVv0uaz5/yMZZjkH8=";
"4.13-414" = "sha256-AlzxqTuh5AkW9dnPIv51abv7r0A/VOS3JOT5IHix2wM=";
"4.13-501" = "sha256-G/VrI+qBVj2wxuB2qE9P1M73IvDmqmTrBFAA6mp+NRE=";
"4.13.1-501" = "sha256-NVfgX3DFsQghApEgWilCgr5O2WSkwKtenZZFSJ1wwa0=";
"4.14-414" = "sha256-eQGMyqN8FQHdXE1c94vDQg1kGx6CRDZimBxUctlzmT0=";
"4.14-500" = "sha256-7CPzJPh1UgzYiX8wPMbU5ZXz1wAJFNQQcp8WuGrR1w4=";
"4.14-501" = "sha256-t+npbpJAWMLOQpZCeIqi45ByDUQeIkU4vPSUplIDopI=";
};
version = lib.getAttr ocaml.version merlinVersions;

View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-component";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "cargo-component";
rev = "v${version}";
hash = "sha256-FmaJUdi3hJEd0Fo4tgzne47aP8U/SK+S0UDVEG/P6e8=";
hash = "sha256-MYJxwJuiBbZQzCpFoJ/iKv6ShkCYJIMu+QQEURHRBAU=";
};
cargoHash = "sha256-8Shw3YSHBFHkw57ZVNjJo/eg2fXvyTVKM9kPX17pfkM=";
cargoHash = "sha256-qh6/e4ya0+ZPYIJRYe87F65tWO3ZllZpIw9B5jE+YbU=";
nativeBuildInputs = [
pkg-config

View File

@ -0,0 +1,11 @@
--- a/external/android-emugl/CMakeLists.txt
+++ b/external/android-emugl/CMakeLists.txt
@@ -1,7 +1,7 @@
# Don't treat any warnings as error as we take the source directly from
# upstream and just compile it.
set(CMAKE_C_FLAGS "-Wall")
-set(CMAKE_CXX_FLAGS "-std=c++11 -Wall")
+set(CMAKE_CXX_FLAGS "-std=c++14 -Wall")
# Ensure -fPIC
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

View File

@ -130,6 +130,8 @@ stdenv.mkDerivation rec {
})
# Ensures generated desktop files work on store path change
./0001-NixOS-Use-anbox-from-PATH-in-desktop-files.patch
# Allows android-emugl to build with gtest 1.13+
./0002-NixOS-Build-android-emugl-with-cpp-14.patch
# Provide window icons
(fetchpatch {
url = "https://github.com/samueldr/anbox/commit/2387f4fcffc0e19e52e58fb6f8264fbe87aafe4d.patch";

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "rqlite";
version = "8.20.3";
version = "8.21.1";
src = fetchFromGitHub {
owner = "rqlite";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pblCeabZeAL45L4prwYwKh0uIG/I/2TnFciOJS1N3Ds=";
sha256 = "sha256-u6LmzqlRmG8uCl5acGlkqo2pt/vKkc/xuZQhq51gVfY=";
};
vendorHash = "sha256-FzxY6CTcFwSmW9LEKzPRtCsKxsGedwU9G3A3efYG9zk=";
vendorHash = "sha256-onR4n6ok6y9APRwGjBoMISbidGDVw19D48TkogRp1uM=";
subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "credhub-cli";
version = "2.9.26";
version = "2.9.27";
src = fetchFromGitHub {
owner = "cloudfoundry-incubator";
repo = "credhub-cli";
rev = version;
sha256 = "sha256-dohi1nlQniZnF3IL9lO2H6bkq4SaXoEnIat0KYR0lxg=";
sha256 = "sha256-qd6AKiFfDmh7O0HloV05yMGwP4htrPR+O3wQFSsZEps=";
};
# these tests require network access that we're not going to give them

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "croc";
version = "9.6.11";
version = "9.6.13";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iePSDd/CR+YRRbUUszAU8v1oaf7s4kgX1cjTU+WVmOs=";
sha256 = "sha256-uuE3Ci0JeWhYMHj5xO5UNZR4BOuaD15nMqFQFZIQCkY=";
};
vendorHash = "sha256-pUWUYV1Ts/dFXUzufIWt5ETRQVpxIGzxRFq9jviG0Fs=";

View File

@ -33381,8 +33381,6 @@ with pkgs;
mediathekview = callPackage ../applications/video/mediathekview { jre = temurin-bin-20; };
megapixels = callPackage ../applications/graphics/megapixels { };
meteo = callPackage ../applications/networking/weather/meteo { };
meld = callPackage ../applications/version-management/meld { };

View File

@ -1815,6 +1815,8 @@ let
type_eq = callPackage ../development/ocaml-modules/type_eq { };
type_id = callPackage ../development/ocaml-modules/type_id { };
tyxml = callPackage ../development/ocaml-modules/tyxml { };
tyxml-lwd = callPackage ../development/ocaml-modules/lwd/tyxml-lwd.nix { };