Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame2010";
|
||||
version = "0-unstable-2024-10-23";
|
||||
version = "0-unstable-2026-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame2010-libretro";
|
||||
rev = "c5b413b71e0a290c57fc351562cd47ba75bac105";
|
||||
hash = "sha256-p+uEhxjr/07YJxInhW7oJDr8KurD36JxnSfJo17FOxM=";
|
||||
rev = "29095383c0281100fee2ee09f1438d8ae990c510";
|
||||
hash = "sha256-syp/hoo0xZEs3poQZU1Ow4qLHRCF+31u5GrYw8aKiv4=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -23,6 +23,9 @@ rec {
|
||||
patch -p1 < ${source}/$patch_name
|
||||
done <${source}/assets/patches.txt
|
||||
|
||||
rm toolkit/components/ml/content/backends/OpenAIPipeline.mjs
|
||||
rm -rf toolkit/components/ml/vendor/openai
|
||||
|
||||
cp -r ${source}/themes/browser .
|
||||
cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json
|
||||
sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure
|
||||
@@ -40,8 +43,8 @@ rec {
|
||||
echo "patching appstrings.properties"
|
||||
find . -path '*/appstrings.properties' -exec sed -i s/Firefox/LibreWolf/ {} \;
|
||||
|
||||
for fn in $(find "${source}/l10n/en-US/browser" -type f -name '*.inc.ftl'); do
|
||||
target_fn=$(echo "$fn" | sed "s,${source}/l10n,browser/locales," | sed "s,\.inc\.ftl$,.ftl,")
|
||||
for fn in $(find "${source}/l10n/en-US/browser" -type f -name '*.inc.*'); do
|
||||
target_fn=$(echo "$fn" | sed "s,${source}/l10n/en-US/browser,browser/locales/en-US," | sed "s,\.inc,,")
|
||||
cat "$fn" >> "$target_fn"
|
||||
done
|
||||
'';
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "148.0.2-3",
|
||||
"packageVersion": "149.0-1",
|
||||
"source": {
|
||||
"rev": "148.0.2-3",
|
||||
"hash": "sha256-HPmzhmDvM3wccpKT9auKsV3w0tA9wQEs3sxFyBKCfqQ="
|
||||
"rev": "149.0-1",
|
||||
"hash": "sha256-lf9psaFT9PMk8CozjvUqBb6hxHct2kdzcVbQDbID+0U="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "148.0.2",
|
||||
"hash": "sha512-Vqk65SNfOHBPL1a2JG2t2t07zvHbeXzKECAvuRm6Lw4UWd76qkHPGI8mkQjvrvG3bMv64z1Q7L1SdlF2tDIL7w=="
|
||||
"version": "149.0",
|
||||
"hash": "sha512-zdhxp3OPtw2FpwPonEh00b9EGEtMmyiQGQKty/olwZlnXnRjBrtZ1mgh5uzRfgfJm2akjYJ/OazKbDsBK5U3Gg=="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,13 +69,13 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "servo";
|
||||
version = "0.0.5";
|
||||
version = "0.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "servo";
|
||||
repo = "servo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XBaILyWIM1BecnJrkoFy4Q/zf7+n65Mv/wOxT4OheiU=";
|
||||
hash = "sha256-eKog8kcZJXBMJz/Lr0+ZwU95HYZRljGWByJ84vPfiEY=";
|
||||
# Breaks reproducibility depending on whether the picked commit
|
||||
# has other ref-names or not, which may change over time, i.e. with
|
||||
# "ref-names: HEAD -> main" as long this commit is the branch HEAD
|
||||
@@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iGS56vh4tgpJDLoXp7ou0/4+9onb3W3MEBzjcEOXjsw=";
|
||||
cargoHash = "sha256-VP+hAQDfUVbOa2+Uq6hqG5YgQYRNI01+gDaR2MyYUTM=";
|
||||
|
||||
# set `HOME` to a temp dir for write access
|
||||
# Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)
|
||||
|
||||
@@ -2,65 +2,38 @@
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
stdenv,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
cmake,
|
||||
libx11,
|
||||
libxcb,
|
||||
qt5,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "whatsie";
|
||||
version = "4.16.3";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keshavbhatt";
|
||||
repo = "whatsie";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F6hQY3Br0iFDYkghBgRAyzLW6QhhG8UHOgkEgDjeQLg=";
|
||||
hash = "sha256-GVXwZZFfPqAmBrP95zleHc2PpMMBj/8xZdW4JpFdYVs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "whatsie";
|
||||
desktopName = "Whatsie";
|
||||
icon = "whatsie";
|
||||
exec = "whatsie";
|
||||
comment = finalAttrs.meta.description;
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libx11
|
||||
libxcb
|
||||
qt5.qtwebengine
|
||||
qt6.qtwebengine
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
qt5.wrapQtAppsHook
|
||||
qt5.qmake
|
||||
cmake
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
strictDeps = false;
|
||||
strictDeps = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preBuild = ''
|
||||
export QT_WEBENGINE_ICU_DATA_DIR=${qt5.qtwebengine.out}/resources
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 whatsie -t $out/bin
|
||||
install -Dm644 $src/snap/gui/icon.svg $out/share/icons/hicolor/scalable/apps/whatsie.svg
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/keshavbhatt/whatsie";
|
||||
description = "Feature rich WhatsApp Client for Desktop Linux";
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "zapzap";
|
||||
version = "6.3.4.1";
|
||||
version = "6.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafatosta";
|
||||
repo = "zapzap";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BKu78K0dVBw1NK/WkL95/fZUBuWXX4mkFQxdk1FV390=";
|
||||
hash = "sha256-3iFuJdiye0yt/6b6N1etS1YK+/QDS2p0eYXXtpPQDdE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,114 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
torch,
|
||||
setuptools,
|
||||
|
||||
# env
|
||||
symlinkJoin,
|
||||
cudaPackages,
|
||||
|
||||
# buildInputs
|
||||
pybind11,
|
||||
rdma-core,
|
||||
|
||||
config,
|
||||
cudaCapabilities ? torch.cudaCapabilities,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
}:
|
||||
let
|
||||
inherit (lib)
|
||||
getBin
|
||||
getInclude
|
||||
;
|
||||
|
||||
minSupportedCudaCapability = "8.0"; # build fails with 7.5
|
||||
|
||||
minCudaCapability = builtins.head (
|
||||
builtins.sort (a: b: builtins.compareVersions a b < 0) cudaCapabilities
|
||||
);
|
||||
|
||||
cudaCapabilities' =
|
||||
if lib.versionOlder minCudaCapability minSupportedCudaCapability then
|
||||
throw ''
|
||||
CUDA capability "${minCudaCapability}" from `cudaCapabilities` is incompatible with DeepEP.
|
||||
Only CUDA capabilities must be "${minSupportedCudaCapability}" or newer.
|
||||
Build `python3Packages.deep-ep` with a compatible `cudaCapabilities` list.
|
||||
''
|
||||
else
|
||||
cudaCapabilities;
|
||||
|
||||
disableSm90Features = lib.versionOlder minCudaCapability "9.0";
|
||||
in
|
||||
buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
pname = "deep-ep";
|
||||
version = "1.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepseek-ai";
|
||||
repo = "DeepEP";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xURR3uBAwKjDTNEG9p/vRRhH4Ldiz/u6kD/a+DPn5/Q=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
torch
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs cudaSupport (
|
||||
{
|
||||
TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep " " cudaCapabilities'}";
|
||||
|
||||
DISABLE_SM90_FEATURES =
|
||||
if disableSm90Features then
|
||||
lib.warn ''
|
||||
python3Packages.deepep: Disabling SM90 features as the provided `cudaCapabilities` list include '${minCudaCapability}'
|
||||
'' "1"
|
||||
else
|
||||
"0";
|
||||
|
||||
CUDA_HOME = symlinkJoin {
|
||||
name = "cuda-redist";
|
||||
paths = with cudaPackages; [
|
||||
(getBin cuda_nvcc)
|
||||
|
||||
(getInclude cuda_cccl) # <nv/target>
|
||||
(getInclude cuda_cudart) # cuda_runtime.h
|
||||
(getInclude libcublas) # cublas_v2.h
|
||||
(getInclude libcusolver) # cusolverDn.h
|
||||
(getInclude libcusparse) # cusparse.h
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
# nvshmem must be disabled (unsetting NVSHMEM_DIR) when supporting <9.0 capabilities
|
||||
# https://github.com/deepseek-ai/DeepEP/blob/v1.2.1/setup.py#L65
|
||||
// lib.optionalAttrs (!disableSm90Features) {
|
||||
NVSHMEM_DIR = (getInclude cudaPackages.libnvshmem).outPath;
|
||||
}
|
||||
);
|
||||
|
||||
buildInputs = [
|
||||
pybind11
|
||||
rdma-core
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "deep_ep" ];
|
||||
|
||||
# Tests check internode communications which is not possible in the sandbox
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Efficient expert-parallel communication library";
|
||||
homepage = "https://github.com/deepseek-ai/DeepEP";
|
||||
changelog = "https://github.com/deepseek-ai/DeepEP/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
broken = !cudaSupport;
|
||||
};
|
||||
})
|
||||
@@ -3756,6 +3756,8 @@ self: super: with self; {
|
||||
|
||||
deep-chainmap = callPackage ../development/python-modules/deep-chainmap { };
|
||||
|
||||
deep-ep = callPackage ../development/python-modules/deep-ep { };
|
||||
|
||||
deep-translator = callPackage ../development/python-modules/deep-translator { };
|
||||
|
||||
deepdiff = callPackage ../development/python-modules/deepdiff { };
|
||||
|
||||
Reference in New Issue
Block a user