Merge staging-next into staging
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "datafusion-cli";
|
||||
version = "49.0.2";
|
||||
version = "50.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "datafusion-cli-source";
|
||||
owner = "apache";
|
||||
repo = "arrow-datafusion";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/vqesGd0O/oZCx2UJLrFS1EeiLu7HkhHWhvGBEIZKdQ=";
|
||||
hash = "sha256-CXElFGaWC+oU5EZcDfWkSE/cXxY4GO2AJy9FerWqVkI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-E7RT9n7zLoRGD4eNx5Fm89NtCxl2KujxfVhAeP+56vY=";
|
||||
cargoHash = "sha256-bC+IYH8iAVJTEFf2sm0JYY/XhgrbDfeO9HsWTf3OtCw=";
|
||||
|
||||
buildAndTestSubdir = "datafusion-cli";
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "newt";
|
||||
version = "1.4.4";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "newt";
|
||||
tag = version;
|
||||
hash = "sha256-wY9zaBDDNqXAAHlFYADS16yp9TOLIIFkjevQL3K0ySE=";
|
||||
hash = "sha256-uIlBAqe93MqMSN0Nghlfa1cLbMlcg3iMCzIu0U16h5o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XYj2hMsK7Gfrk25bRz/ooDkrXmuUdBQSF/ojF7OTQ4I=";
|
||||
vendorHash = "sha256-FeDNv1mLTvXYUDOHzyPP7uA+fOt/j0VT7CM6IyoMuTQ=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace main.go \
|
||||
|
||||
@@ -28,16 +28,16 @@ in
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "pangolin";
|
||||
version = "1.9.4";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "pangolin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2tTe8HlkTMHK6W+rLaiOKA/m4yLq63BQP5Pu+Jcxu88=";
|
||||
hash = "sha256-q5HnXJCx8wvHT+D/Pa+752xh57m/odesRjoqSdCHfrI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-K3G8t+RwG87Sc7zp/zQZNJmBgezk95bpUpHzqnVaThQ=";
|
||||
npmDepsHash = "sha256-ivG/7KTmWPjnXzO+ISc+2bsNqW/0VPhFbg1229A64cw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
esbuild
|
||||
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hmcl";
|
||||
version = "3.6.16";
|
||||
version = "3.6.17";
|
||||
|
||||
src = fetchurl {
|
||||
# HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key.
|
||||
# See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28
|
||||
url = "https://github.com/HMCL-dev/HMCL/releases/download/release-${finalAttrs.version}/HMCL-${finalAttrs.version}.jar";
|
||||
hash = "sha256-C3a8pjMllkmTpChucFBunW8uixnnvqrXg06BhLAg6Y8=";
|
||||
hash = "sha256-LNEb5YpvuMQGPy1114+y+59ZZNfBuC/Il813NkqHDMg=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "marge-bot";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "marge-org";
|
||||
repo = "marge-bot";
|
||||
rev = version;
|
||||
hash = "sha256-Sz/jr5q5A0NikJPaU9r0+BYNJojLvZS3vDPte/nUIf8=";
|
||||
hash = "sha256-JaxUEXBxaZIh6fmOjSAa5FZnrO2uAnY3zKoO/mBukUU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -36,6 +36,8 @@
|
||||
devExtraCmakeFlags ? [ ],
|
||||
getVersionFile,
|
||||
fetchpatch,
|
||||
# for tests
|
||||
libllvm,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -206,8 +208,6 @@ stdenv.mkDerivation (
|
||||
++ lib.optionals enablePolly [
|
||||
# Just like the `gnu-install-dirs` patch, but for `polly`.
|
||||
(getVersionFile "llvm/gnu-install-dirs-polly.patch")
|
||||
]
|
||||
++ [
|
||||
# Just like the `llvm-lit-cfg` patch, but for `polly`.
|
||||
(getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch")
|
||||
]
|
||||
@@ -591,8 +591,15 @@ stdenv.mkDerivation (
|
||||
|
||||
checkTarget = "check-all";
|
||||
|
||||
# For the update script:
|
||||
passthru.monorepoSrc = monorepoSrc;
|
||||
passthru = {
|
||||
# For the update script:
|
||||
inherit monorepoSrc;
|
||||
tests.withoutOptionalFeatures = libllvm.override {
|
||||
enablePFM = false;
|
||||
enablePolly = false;
|
||||
enableTerminfo = false;
|
||||
};
|
||||
};
|
||||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
meta = llvm_meta // {
|
||||
|
||||
@@ -93,7 +93,7 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
let
|
||||
version = "9.0.0";
|
||||
version = "9.0.1";
|
||||
agent = [
|
||||
mcpadapt
|
||||
smolagents
|
||||
@@ -241,7 +241,7 @@ let
|
||||
owner = "neuml";
|
||||
repo = "txtai";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tsbOythB/b4KTd2uncVYUPG4IjlbmNb1teVkq7N19PY=";
|
||||
hash = "sha256-ciQDKpqTdgYe4oIgd2uxY7491SMr9Snha9XyTpxgXyY=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
|
||||
@@ -342,34 +342,39 @@ let
|
||||
'';
|
||||
|
||||
# From: https://github.com/godotengine/godot/blob/4.2.2-stable/SConstruct
|
||||
sconsFlags = mkSconsFlagsFromAttrSet {
|
||||
# Options from 'SConstruct'
|
||||
precision = withPrecision; # Floating-point precision level
|
||||
production = true; # Set defaults to build Godot for use in production
|
||||
platform = withPlatform;
|
||||
inherit target;
|
||||
debug_symbols = true;
|
||||
sconsFlags = mkSconsFlagsFromAttrSet (
|
||||
{
|
||||
# Options from 'SConstruct'
|
||||
precision = withPrecision; # Floating-point precision level
|
||||
production = true; # Set defaults to build Godot for use in production
|
||||
platform = withPlatform;
|
||||
inherit target;
|
||||
debug_symbols = true;
|
||||
|
||||
# Options from 'platform/linuxbsd/detect.py'
|
||||
alsa = withAlsa;
|
||||
dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings
|
||||
fontconfig = withFontconfig; # Use fontconfig for system fonts support
|
||||
pulseaudio = withPulseaudio; # Use PulseAudio
|
||||
speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support
|
||||
touch = withTouch; # Enable touch events
|
||||
udev = withUdev; # Use udev for gamepad connection callbacks
|
||||
wayland = withWayland; # Compile with Wayland support
|
||||
x11 = withX11; # Compile with X11 support
|
||||
# Options from 'platform/linuxbsd/detect.py'
|
||||
alsa = withAlsa;
|
||||
dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings
|
||||
fontconfig = withFontconfig; # Use fontconfig for system fonts support
|
||||
pulseaudio = withPulseaudio; # Use PulseAudio
|
||||
speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support
|
||||
touch = withTouch; # Enable touch events
|
||||
udev = withUdev; # Use udev for gamepad connection callbacks
|
||||
wayland = withWayland; # Compile with Wayland support
|
||||
x11 = withX11; # Compile with X11 support
|
||||
|
||||
module_mono_enabled = withMono;
|
||||
module_mono_enabled = withMono;
|
||||
|
||||
# aliasing bugs exist with hardening+LTO
|
||||
# https://github.com/godotengine/godot/pull/104501
|
||||
ccflags = "-fno-strict-aliasing";
|
||||
linkflags = "-Wl,--build-id";
|
||||
# aliasing bugs exist with hardening+LTO
|
||||
# https://github.com/godotengine/godot/pull/104501
|
||||
ccflags = "-fno-strict-aliasing";
|
||||
linkflags = "-Wl,--build-id";
|
||||
|
||||
use_sowrap = false;
|
||||
};
|
||||
use_sowrap = false;
|
||||
}
|
||||
// lib.optionalAttrs (lib.versionAtLeast version "4.5") {
|
||||
redirect_build_objects = false; # Avoid copying build objects to output
|
||||
}
|
||||
);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user