Merge master into staging-next
This commit is contained in:
commit
3ac64dc20d
@ -1,16 +1,23 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, cmake
|
||||
, python3
|
||||
, withDynarec ? (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64)
|
||||
, runCommand
|
||||
, hello-x86_64
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
cmake,
|
||||
python3,
|
||||
withDynarec ? (
|
||||
stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64 || stdenv.hostPlatform.isLoongArch64
|
||||
),
|
||||
runCommand,
|
||||
hello-x86_64,
|
||||
}:
|
||||
|
||||
# Currently only supported on ARM & RISC-V
|
||||
assert withDynarec -> (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64);
|
||||
# Currently only supported on specific archs
|
||||
assert
|
||||
withDynarec
|
||||
-> (
|
||||
stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64 || stdenv.hostPlatform.isLoongArch64
|
||||
);
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "box64";
|
||||
@ -28,23 +35,27 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DNOGIT=ON"
|
||||
cmakeFlags =
|
||||
[
|
||||
(lib.cmakeBool "NOGIT" true)
|
||||
|
||||
# Arch mega-option
|
||||
"-DARM64=${lib.boolToString stdenv.hostPlatform.isAarch64}"
|
||||
"-DRV64=${lib.boolToString stdenv.hostPlatform.isRiscV64}"
|
||||
"-DPPC64LE=${lib.boolToString (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)}"
|
||||
"-DLARCH64=${lib.boolToString stdenv.hostPlatform.isLoongArch64}"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isx86_64 [
|
||||
# x86_64 has no arch-specific mega-option, manually enable the options that apply to it
|
||||
"-DLD80BITS=ON"
|
||||
"-DNOALIGN=ON"
|
||||
] ++ [
|
||||
# Arch dynarec
|
||||
"-DARM_DYNAREC=${lib.boolToString (withDynarec && stdenv.hostPlatform.isAarch64)}"
|
||||
"-DRV64_DYNAREC=${lib.boolToString (withDynarec && stdenv.hostPlatform.isRiscV64)}"
|
||||
];
|
||||
# Arch mega-option
|
||||
(lib.cmakeBool "ARM64" stdenv.hostPlatform.isAarch64)
|
||||
(lib.cmakeBool "RV64" stdenv.hostPlatform.isRiscV64)
|
||||
(lib.cmakeBool "PPC64LE" (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian))
|
||||
(lib.cmakeBool "LARCH64" stdenv.hostPlatform.isLoongArch64)
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isx86_64 [
|
||||
# x86_64 has no arch-specific mega-option, manually enable the options that apply to it
|
||||
(lib.cmakeBool "LD80BITS" true)
|
||||
(lib.cmakeBool "NOALIGN" true)
|
||||
]
|
||||
++ [
|
||||
# Arch dynarec
|
||||
(lib.cmakeBool "ARM_DYNAREC" (withDynarec && stdenv.hostPlatform.isAarch64))
|
||||
(lib.cmakeBool "RV64_DYNAREC" (withDynarec && stdenv.hostPlatform.isRiscV64))
|
||||
(lib.cmakeBool "LARCH64_DYNAREC" (withDynarec && stdenv.hostPlatform.isLoongArch64))
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -71,24 +82,33 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
tests.hello = runCommand "box64-test-hello" {
|
||||
nativeBuildInputs = [ finalAttrs.finalPackage ];
|
||||
} ''
|
||||
# There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to
|
||||
# tell what problems the emulator has run into.
|
||||
BOX64_NOBANNER=0 BOX64_LOG=1 box64 ${hello-x86_64}/bin/hello --version | tee $out
|
||||
'';
|
||||
updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
tests.hello =
|
||||
runCommand "box64-test-hello" { nativeBuildInputs = [ finalAttrs.finalPackage ]; }
|
||||
# There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to
|
||||
# tell what problems the emulator has run into.
|
||||
''
|
||||
BOX64_NOBANNER=0 BOX64_LOG=1 box64 ${lib.getExe hello-x86_64} --version | tee $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://box86.org/";
|
||||
description = "Lets you run x86_64 Linux programs on non-x86_64 Linux systems";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gador OPNA2608 ];
|
||||
changelog = "https://github.com/ptitSeb/box64/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
gador
|
||||
OPNA2608
|
||||
];
|
||||
mainProgram = "box64";
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" "loongarch64-linux" "mips64el-linux" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"riscv64-linux"
|
||||
"powerpc64le-linux"
|
||||
"loongarch64-linux"
|
||||
"mips64el-linux"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
@ -4,11 +4,11 @@
|
||||
lib,
|
||||
}: let
|
||||
pname = "upscayl";
|
||||
version = "2.11.0";
|
||||
version = "2.11.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
|
||||
hash = "sha256-XhvOzARP8Ytlf23vNMYZ5x1UKvKOlM/69yhysasW3dA=";
|
||||
hash = "sha256-owxSm8t7rHM5ywJPp8sJQ5aAyNKgrbyJY6qFp78/UhM=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
hash = "sha256-BFB4bdfh3hI7D1m7a20ckPPyP9CYXW7mjqeTZ/21Gqs=";
|
||||
version = "6.1.0";
|
||||
vendorHash = "sha256-a8ZPhzs7sNIJLjQ9Y87Zf9SXAsmbdVn250Q0OQwy69A=";
|
||||
hash = "sha256-33qUmET1BYAv6e8ZaFNSa7jrn8WGf3BqY8Nud/ZywSY=";
|
||||
version = "6.2.0";
|
||||
vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA=";
|
||||
patches = [ ];
|
||||
}
|
||||
|
@ -71,13 +71,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "2953";
|
||||
version = "3015";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-IqR0tdTdrydrMCgOfNbRnVESN3pEzti3bAuTH9i3wQQ=";
|
||||
hash = "sha256-/n5SiTU5//Vx/vtIev8Yxc/xYwjxVpPhiTr1LnDp4fs=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mlkit";
|
||||
version = "4.7.9";
|
||||
version = "4.7.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "melsman";
|
||||
repo = "mlkit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Q5HKNilXhoOaCMY05A09VzK4CpLPte78bivs1c78euM=";
|
||||
sha256 = "sha256-ZHNr920N8pmz6ho5keT8Q/svCj4efEhwYwagpB+pMf8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook mlton ];
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "24.3.0";
|
||||
version = "24.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
owner = "esphome";
|
||||
repo = "aioesphomeapi";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wQR3dwN5O++TdtQh+Wcj7c7TNMaRj2lMlOuXOAPVU0Q=";
|
||||
hash = "sha256-i/tmPTDb5DJRSj//Ju9OERx8A9S69WkWyoN+j2MO6mI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cpyparsing";
|
||||
version = "2.4.7.2.3.2";
|
||||
version = "2.4.7.2.3.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "evhub";
|
||||
repo = "cpyparsing";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vnzZdJ7pZz1QxlTqw5UKjxB4GVcXuCfKWX4lu3ORWas=";
|
||||
hash = "sha256-Ob3aSxJXM/J1KQ2dwxew9fH3g2WVU2KI6lynDz31r+Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "edk2-pytool-library";
|
||||
version = "0.21.5";
|
||||
version = "0.21.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "tianocore";
|
||||
repo = "edk2-pytool-library";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4Sb8Lu/nYUXgGt9gVv+j32cwW7TjXfH8z+fwzKaOeM8=";
|
||||
hash = "sha256-vVgqx6qccGNdgt/VkHEfMeiICkLDm8o7iqjNx0UlD38=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openai";
|
||||
version = "1.30.3";
|
||||
version = "1.30.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7.1";
|
||||
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
owner = "openai";
|
||||
repo = "openai-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Z11gyTZ3UMlcWV3OFxVgMcFF11W+nm2dj2KK1ivTjEI=";
|
||||
hash = "sha256-tzHU5yO7o7wxdqYnp7tBctvWGY7SYq5u6VnU3iPGPuk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peft";
|
||||
version = "0.10.0";
|
||||
version = "0.11.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Aln5WyDgNnxOUwyhOz9NGsnV1zXt/Rs57ULxR5ZJXNM=";
|
||||
hash = "sha256-FV/S/N9wA+rUos/uQIzvPWmWCIFi8wi2Tt6jMzvYfYQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
@ -52,7 +52,7 @@
|
||||
unittestCheckHook,
|
||||
}:
|
||||
let
|
||||
version = "7.1.0";
|
||||
version = "7.2.0";
|
||||
api = [
|
||||
aiohttp
|
||||
fastapi
|
||||
@ -154,7 +154,7 @@ buildPythonPackage {
|
||||
owner = "neuml";
|
||||
repo = "txtai";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L+L2jRkCQKOgd1k3N4mft0Kt6kvCN81lgSQUjoon5rk=";
|
||||
hash = "sha256-2d31wzUz0/FcrejDIog2EI4BXgjd7XXpN4tRXpLk5DI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
Loading…
Reference in New Issue
Block a user