Merge staging-next into staging
This commit is contained in:
@@ -4352,7 +4352,10 @@
|
||||
github = "caniko";
|
||||
githubId = 29519599;
|
||||
name = "Can H. Tartanoglu";
|
||||
keys = [ { fingerprint = "DF95 1EC0 9B8F 8094 C616 5589 1D63 6EDE 97DC 0280"; } ];
|
||||
keys = [
|
||||
{ fingerprint = "DF95 1EC0 9B8F 8094 C616 5589 1D63 6EDE 97DC 0280"; }
|
||||
{ fingerprint = "818D 507F 1E62 139F 8A17 EAA6 4623 DEA0 6FDA CFE1"; }
|
||||
];
|
||||
};
|
||||
canndrew = {
|
||||
email = "shum@canndrew.org";
|
||||
|
||||
@@ -60,7 +60,6 @@ in
|
||||
"pata_oldpiix"
|
||||
"pata_pcmcia"
|
||||
"pata_pdc2027x"
|
||||
"pata_qdi"
|
||||
"pata_rz1000"
|
||||
"pata_serverworks"
|
||||
"pata_sil680"
|
||||
@@ -68,7 +67,6 @@ in
|
||||
"pata_sl82c105"
|
||||
"pata_triflex"
|
||||
"pata_via"
|
||||
"pata_winbond"
|
||||
|
||||
# SCSI support (incomplete).
|
||||
"3w-9xxx"
|
||||
@@ -106,7 +104,11 @@ in
|
||||
"vmxnet3"
|
||||
"vsock"
|
||||
]
|
||||
++ lib.optional platform.isx86 "vmw_balloon"
|
||||
++ lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "7.0") [
|
||||
"pata_qdi"
|
||||
"pata_winbond"
|
||||
]
|
||||
++ lib.optionals platform.isx86 [ "vmw_balloon" ]
|
||||
++ lib.optionals (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) [
|
||||
"vmw_vmci"
|
||||
"vmwgfx"
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame2003-plus";
|
||||
version = "0-unstable-2026-02-27";
|
||||
version = "0-unstable-2026-03-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame2003-plus-libretro";
|
||||
rev = "3a69de934a184cda6551c64ab4b503b0c2958634";
|
||||
hash = "sha256-+/semhVh3TgqHYYhzFjOy7cjzQgFxoWxlgz9e34Zvt4=";
|
||||
rev = "53453e57676ff31131441f08c0b734c9ad84e4f0";
|
||||
hash = "sha256-IpVv/bpT7AHF8QaGFGgTWei5JKuy7H5/O70W2n88s1c=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ast-grep";
|
||||
version = "0.41.0";
|
||||
version = "0.41.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-cL7RtGFhIKTlfP7wEjdjT8uTxB/tG2joob+HN5NG1G8=";
|
||||
hash = "sha256-AijxixgT8X/c1UtMD6l4BFvYGj3Up0C1CtfwCRdxSfw=";
|
||||
};
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm .cargo/config.toml
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-zPl9fUG+RdddB7r4nWHETHsULf/hDDFpTf8h3xe7UiI=";
|
||||
cargoHash = "sha256-OIf59YUuu8ohpGXRdeiPaM/xdH4ZaQYoCuBG/NNhZcc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "beans";
|
||||
version = "0.4.0";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hmans";
|
||||
repo = "beans";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3SgTqR5DGAb5r+VU3YknoWATqglq8G7QV3kTVUSL9u4=";
|
||||
hash = "sha256-wJXdl4C9jwtEyKVgdXRU9GCBqjkdJ6N58pK5kEL9tnY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TprfPZ/clb7PLMAkxF0y78bCef4XarhgHlIhIPn1nQA=";
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "btrpa-scan";
|
||||
version = "0.6.0-unstable-2026-02-18";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HackingDave";
|
||||
repo = "btrpa-scan";
|
||||
rev = "aa286d8d7a5ff11926f1b9f064ec9e00eeeeb5a6";
|
||||
hash = "sha256-Q0+seEDvBQ2s+f8djM71JV84yzODe+gBEZZV1UTKKGg=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ hatchling ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
bleak
|
||||
cryptography
|
||||
flask
|
||||
flask-socketio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "btrpa_scan" ];
|
||||
|
||||
meta = {
|
||||
description = "Bluetooth Low Energy (BLE) scanner";
|
||||
homepage = "https://github.com/HackingDave/btrpa-scan";
|
||||
changelog = "https://github.com/HackingDave/btrpa-scan/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "btrpa-scan";
|
||||
};
|
||||
})
|
||||
@@ -7,27 +7,24 @@
|
||||
openssl,
|
||||
stdenv,
|
||||
makeWrapper,
|
||||
gitUpdater,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-msrv";
|
||||
version = "0.18.4";
|
||||
version = "0.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foresterre";
|
||||
repo = "cargo-msrv";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-dvCKi40c9PmM05MK+0VGWxny0ZA+9YO/M3zmv5Qv6b0=";
|
||||
sha256 = "sha256-GsreJpQ+WsiKIRbQx4gXyH24JnoMUgJSVLFvljWxJq8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cIyoGFIxtX4/Dn4RbtMB75WQj+UO44V182u6C5smgSw=";
|
||||
cargoHash = "sha256-+7O+9wS72QCHNYcXJUFyc4I9PFH5B8OvisVKf5bBDdY=";
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
ignoredVersions = ".(rc|beta).*";
|
||||
};
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex=^v([0-9.]+)$" ];
|
||||
};
|
||||
|
||||
# Integration tests fail
|
||||
|
||||
@@ -34,8 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# requires internet access
|
||||
"--skip=detects_target_dependencies"
|
||||
"--skip=query::tests_lints::feature_missing"
|
||||
# platform specific tests
|
||||
"--skip=target_feature"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "files-cli";
|
||||
version = "2.15.207";
|
||||
version = "2.15.211";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-C+44FE85aBrVIeCnlqihjr8hmCGjz/61B4pummQl+EM=";
|
||||
hash = "sha256-iN56+OV0xjPtj5SajVF7HkUAWv4dPxlPDhnwSo+Nb80=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0WaJ0Vd1zcsum/C+F5ol9KQihutdWtK/LWweTgvcwD8=";
|
||||
vendorHash = "sha256-FOH+S6T5luTrrKZRC1EzUvwBlWpMuW7QCYdtHlx+7EU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -21,16 +21,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "halloy";
|
||||
version = "2026.2";
|
||||
version = "2026.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "squidowl";
|
||||
repo = "halloy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-xx4r6vdUeh0yr986+Z67xtViQA7mMpsXmTohu3jIwMs=";
|
||||
hash = "sha256-gWN+KcAoMTRySZObRleDCNfUukprGkNGFELD7xT/x/Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-86v1GjMkzP5Gc+6/evBw2XpMitBfazLAhNB4AQ7yPNs=";
|
||||
cargoHash = "sha256-g9Q2YCjgC5MBX/Tv/dvRuHIxo7qq5J7hjsw3YeTn0jI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
wafHook,
|
||||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "hlsdk-portable";
|
||||
|
||||
# Taken from build script: https://github.com/FWGS/hlsdk-portable/blob/afe7d33e15c75fa61fc5a8e287bc484146e7c377/wscript#L10
|
||||
version = "2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FWGS";
|
||||
repo = "hlsdk-portable";
|
||||
fetchSubmodules = true;
|
||||
rev = "afe7d33e15c75fa61fc5a8e287bc484146e7c377";
|
||||
hash = "sha256-lR5otfTur9yRcyAt/NkcCIYcqsMg2QQ+EdkA8o18vA0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
wafHook
|
||||
];
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
wafConfigureFlags = [ "-T release" ] ++ lib.optionals stdenv.buildPlatform.is64bit [ "-8" ];
|
||||
|
||||
wafInstallFlags = [ "--destdir=${placeholder "out"}" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/FWGS/hlsdk-portable";
|
||||
description = "Portable crossplatform Half-Life SDK for GoldSource and Xash3D engines";
|
||||
license = lib.licenses.unfree;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ r4v3n6101 ];
|
||||
};
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"branch": "v0.54.1-b",
|
||||
"commit_hash": "4b07770b9ef1cceb2e6f56d33538aaffb9186b9c",
|
||||
"commit_message": "[gha] Nix: update inputs",
|
||||
"date": "2026-03-03",
|
||||
"tag": "v0.54.1"
|
||||
"branch": "v0.54.2-b",
|
||||
"commit_hash": "59f9f2688ac508a0584d1462151195a6c4992f99",
|
||||
"commit_message": "version: bump to 0.54.2",
|
||||
"date": "2026-03-10",
|
||||
"tag": "v0.54.2"
|
||||
}
|
||||
|
||||
@@ -80,14 +80,14 @@ let
|
||||
in
|
||||
customStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland" + optionalString debug "-debug";
|
||||
version = "0.54.1";
|
||||
version = "0.54.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland";
|
||||
fetchSubmodules = true;
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dBp+WAfAGkqavjM77Ki7/wi/Bn23Bg7uHPI06OeHk4c=";
|
||||
hash = "sha256-YF31zdrg7ctjD2CR+8rzKNsR0luYgoq8lhRkzd6myL8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "idescriptor";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iDescriptor";
|
||||
repo = "iDescriptor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-p6iJP4duesUiYEH8pgGgX5GOdaOhaAegPPphBaXU4VM=";
|
||||
hash = "sha256-tBTAJqXDqWAqrxQlEEi2kDcVqrB6WrBquxvKV2dkpQ4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ipatool-go";
|
||||
inherit (finalAttrs) version src;
|
||||
modRoot = "lib/ipatool-go";
|
||||
vendorHash = "sha256-4ZCNgLAcZtEd7zDbIu3kyP/Cyp6TaBM9gyZEohgzCk8=";
|
||||
vendorHash = "sha256-SGdyyZU8Ze/1lJS4tKbHyfCv2yYleGcqoyA9Uzb8r/k=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
env.GOWORK = "off";
|
||||
|
||||
@@ -58,16 +58,16 @@ assert (extraParameters != null) -> set != null;
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "Iosevka${toString set}";
|
||||
version = "34.2.0";
|
||||
version = "34.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "be5invis";
|
||||
repo = "iosevka";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AK1lIC16F2CKSfRtF4SwOLAZr+v6VdjZIEOrios1uaw=";
|
||||
hash = "sha256-yj46lNYOzaopu5Mo68jwh+xf/q/bjMmQdprh6e56eeY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-N5IxbuwchR0hIaOVR5m3SQmkopCMhu86QqhD1pztoB4=";
|
||||
npmDepsHash = "sha256-it0YwPcoYCIMddktgywBuYvvx3Psghoii3pu0K3RDlI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
remarshal
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "komari-agent";
|
||||
version = "1.1.41";
|
||||
version = "1.1.80";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "komari-monitor";
|
||||
repo = "komari-agent";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-GgvquOI5l+FiRNUJ5dvJc9frwwy4Zjq4s2h9bFhkchM=";
|
||||
hash = "sha256-KyUnmrHzTJ4NdVr25hCeHbeMkwr/UAbm30BbO32fqTk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5RL/dDR/Or9GRCPVQmUYKTV82q7xuN2Mqc4/86WmbqY=";
|
||||
|
||||
@@ -47,14 +47,14 @@ in
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "10.8.2";
|
||||
version = "10.8.3";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-1T7i7L92Q0ErGi3BzgIcTNkcBUcP/V7lPGjblJFoAKA=";
|
||||
hash = "sha256-6MAlspPwPIdHbhAOPufUASckRFcuBA2c6HwyKw8DQpo=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mdwatch";
|
||||
version = "0.1.18";
|
||||
version = "0.1.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "santoshxshrestha";
|
||||
repo = "mdwatch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XXDBDyX4XrGVC0cgkPNXyR1qULqJPA/azZbTyKU+m8k=";
|
||||
hash = "sha256-aAa9Y1aKfZVnUyNkEUM7FJKEvQsX9BUqGlTb9zhZzTk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rjo7TcKJ0TwLANQ822SIAubJnT6fZFDPV2GOc5MRHn4=";
|
||||
cargoHash = "sha256-boa/Y0PfINniA3WNS6DailBcHZ2K6yhxjOE0Eanevc8=";
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "merve";
|
||||
version = "1.0.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nodejs";
|
||||
repo = "merve";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IqUpvnrbnsXlI//xRLbcseMFVLQrwdDCyW1oud3+Ekk=";
|
||||
hash = "sha256-oPEEE7CuiNSdfpKgbYk9LhM16oFPgoste6qGZfcp6YQ=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -16,12 +16,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "morgen";
|
||||
version = "3.6.19";
|
||||
version = "4.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
name = "morgen-${version}.deb";
|
||||
url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
|
||||
hash = "sha256-9zIs5Z6o9cH7dcVGGCKfCBr/9rR9wvQbs6BZJC3KFiQ=";
|
||||
hash = "sha256-BAUZAylPJKKUcR3VXQ2pm5VDuJjxM9AnDzujZvuE3BA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mprisence";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lazykern";
|
||||
repo = "mprisence";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0Mty4LZRsjHlS0CLE8Nh6VV/TUSpO5eTlUfSDXgXgwM=";
|
||||
hash = "sha256-tzxuofwhYq6iRZ+f+T9KkXCV9gIplYc1LdB85D75hBA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rX7RY5OJnvSDhtjXAEt4XpSZfMu19szdmslMZv5ZTxk=";
|
||||
cargoHash = "sha256-W4/ppT37h+Ho7oVKA/2KhCjQeZX0NiIqdopQmBWf/Xc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
alsa-lib,
|
||||
fftwSinglePrec,
|
||||
@@ -10,15 +10,19 @@
|
||||
libvorbis,
|
||||
soundtouch,
|
||||
qt5,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nootka";
|
||||
# drop patch when updating to next release
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/nootka/nootka-${finalAttrs.version}-source.tar.bz2";
|
||||
hash = "sha256-ZHdyLZ3+TCpQ77tcNuDlN2124qLDZu9DdH5x7RI1HIs=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SeeLook";
|
||||
repo = "nootka";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-lRgFCPeIBefwsHMsE8eHLxT9GQUT0iUCyIrJz+mltp0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -50,13 +54,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Application for practicing playing musical scores and ear training";
|
||||
mainProgram = "nootka";
|
||||
homepage = "https://nootka.sourceforge.io/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
mmlb
|
||||
maintainers = [
|
||||
lib.maintainers.mmlb
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -143,6 +143,10 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/462dfe0eb4b66948fe48de44545cc22bb64fdf9f/community/onnxruntime/0001-Remove-MATH_NO_EXCEPT-macro.patch";
|
||||
hash = "sha256-BdeGYevZExWWCuJ1lSw0Roy3h+9EbJgFF8qMwVxSn1A=";
|
||||
})
|
||||
|
||||
# Fix build of ignored outputs after Protobuf 34 added `[[nodiscard]]` to
|
||||
# many functions.
|
||||
./protobuf34-nodiscard.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -253,6 +257,8 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ABSL_ENABLE_INSTALL" true)
|
||||
# leads to failing builds, which isn't particularly useful for Nixpkgs
|
||||
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=unused-variable")
|
||||
(lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
|
||||
(lib.cmakeBool "FETCHCONTENT_QUIET" false)
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202407.src}")
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
diff --git a/onnxruntime/core/framework/graph_partitioner.cc b/onnxruntime/core/framework/graph_partitioner.cc
|
||||
index 43caf4766d..fabc2a26a0 100644
|
||||
--- a/onnxruntime/core/framework/graph_partitioner.cc
|
||||
+++ b/onnxruntime/core/framework/graph_partitioner.cc
|
||||
@@ -957,7 +957,7 @@
|
||||
|
||||
AllocatorPtr allocator = output_buffer_holder->buffer_allocator;
|
||||
IAllocatorUniquePtr<void> buffer = IAllocator::MakeUniquePtr<void>(allocator, buffer_size);
|
||||
- model_proto.SerializeToArray(buffer.get(), static_cast<int>(buffer_size));
|
||||
+ ORT_RETURN_IF_NOT(model_proto.SerializeToArray(buffer.get(), static_cast<int>(buffer_size)), "Failed to serialize to array");
|
||||
|
||||
*output_buffer_holder->buffer_size_ptr = buffer_size;
|
||||
*output_buffer_holder->buffer_ptr = buffer.release();
|
||||
@@ -970,7 +970,7 @@
|
||||
auto out_stream_buf = std::make_unique<epctx::OutStreamBuf>(*output_write_func_holder);
|
||||
std::ostream out_stream(out_stream_buf.get());
|
||||
|
||||
- model_proto.SerializeToOstream(&out_stream);
|
||||
+ ORT_RETURN_IF_NOT(model_proto.SerializeToOstream(&out_stream), "Failed to serialize to out stream");
|
||||
out_stream.flush();
|
||||
ORT_RETURN_IF_ERROR(out_stream_buf->GetStatus());
|
||||
} else {
|
||||
diff --git a/onnxruntime/python/onnxruntime_pybind_schema.cc b/onnxruntime/python/onnxruntime_pybind_schema.cc
|
||||
index cd1d2a8da1..05da1a1447 100644
|
||||
--- a/onnxruntime/python/onnxruntime_pybind_schema.cc
|
||||
+++ b/onnxruntime/python/onnxruntime_pybind_schema.cc
|
||||
@@ -169,7 +169,7 @@
|
||||
"_default_value",
|
||||
[](ONNX_NAMESPACE::OpSchema::Attribute* attr) -> py::bytes {
|
||||
std::string out;
|
||||
- attr->default_value.SerializeToString(&out);
|
||||
+ (void)attr->default_value.SerializeToString(&out);
|
||||
return out;
|
||||
})
|
||||
.def_readonly("required", &ONNX_NAMESPACE::OpSchema::Attribute::required);
|
||||
diff --git a/onnxruntime/test/ep_graph/test_ep_graph.cc b/onnxruntime/test/ep_graph/test_ep_graph.cc
|
||||
index 7e6d157799..f08b09990d 100644
|
||||
--- a/onnxruntime/test/ep_graph/test_ep_graph.cc
|
||||
+++ b/onnxruntime/test/ep_graph/test_ep_graph.cc
|
||||
@@ -232,7 +232,7 @@
|
||||
handle_initializer_data));
|
||||
|
||||
std::ofstream ofs(serialized_model_path, std::ios::binary);
|
||||
- model_proto.SerializeToOstream(&ofs);
|
||||
+ ASSERT_TRUE(model_proto.SerializeToOstream(&ofs));
|
||||
ofs.flush();
|
||||
|
||||
ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
|
||||
@@ -357,7 +357,7 @@
|
||||
handle_initializer_data));
|
||||
|
||||
std::ofstream ofs(serialized_model_path, std::ios::binary);
|
||||
- model_proto.SerializeToOstream(&ofs);
|
||||
+ ASSERT_TRUE(model_proto.SerializeToOstream(&ofs));
|
||||
ofs.flush();
|
||||
|
||||
ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
|
||||
@@ -487,7 +487,7 @@
|
||||
handle_initializer_data));
|
||||
|
||||
std::ofstream ofs(serialized_model_path, std::ios::binary);
|
||||
- model_proto.SerializeToOstream(&ofs);
|
||||
+ ASSERT_TRUE(model_proto.SerializeToOstream(&ofs));
|
||||
ofs.flush();
|
||||
|
||||
ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
|
||||
@@ -552,7 +552,7 @@
|
||||
ASSERT_CXX_ORTSTATUS_OK(OrtEpUtils::OrtGraphToProto(test_graph->GetOrtGraph(), model_proto));
|
||||
|
||||
std::ofstream ofs(serialized_model_path, std::ios::binary);
|
||||
- model_proto.SerializeToOstream(&ofs);
|
||||
+ ASSERT_TRUE(model_proto.SerializeToOstream(&ofs));
|
||||
ofs.flush();
|
||||
|
||||
ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
|
||||
diff --git a/onnxruntime/test/optimizer/graph_transform_test_builder.cc b/onnxruntime/test/optimizer/graph_transform_test_builder.cc
|
||||
index 756cc4159e..8323851385 100644
|
||||
--- a/onnxruntime/test/optimizer/graph_transform_test_builder.cc
|
||||
+++ b/onnxruntime/test/optimizer/graph_transform_test_builder.cc
|
||||
@@ -158,7 +158,7 @@
|
||||
|
||||
// Serialize the model to a string.
|
||||
std::string model_data;
|
||||
- model.ToProto().SerializeToString(&model_data);
|
||||
+ ASSERT_TRUE(model.ToProto().SerializeToString(&model_data));
|
||||
std::shared_ptr<IExecutionProvider> ep_shared = ep ? std::move(ep) : nullptr;
|
||||
|
||||
auto run_model = [&](TransformerLevel level, std::vector<OrtValue>& fetches,
|
||||
diff --git a/onnxruntime/test/optimizer/nchwc_optimizer_test.cc b/onnxruntime/test/optimizer/nchwc_optimizer_test.cc
|
||||
index 538f600404..111692d4ca 100644
|
||||
--- a/onnxruntime/test/optimizer/nchwc_optimizer_test.cc
|
||||
+++ b/onnxruntime/test/optimizer/nchwc_optimizer_test.cc
|
||||
@@ -185,7 +185,7 @@
|
||||
|
||||
// Serialize the model to a string.
|
||||
std::string model_data;
|
||||
- model.ToProto().SerializeToString(&model_data);
|
||||
+ ASSERT_TRUE(model.ToProto().SerializeToString(&model_data));
|
||||
|
||||
auto run_model = [&](TransformerLevel level, std::vector<OrtValue>& fetches) {
|
||||
SessionOptions session_options;
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
version = "0.8.9";
|
||||
version = "0.8.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-webui";
|
||||
repo = "open-webui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RNVmPg2//z/djARWgbTbKbdYmDwAcTSYjiSuZHV88vM=";
|
||||
hash = "sha256-wXkU3j0Bzpd2H5aVkqmKyUHxukRamBYQh8HBXB8tLpM=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
@@ -32,7 +32,7 @@ let
|
||||
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-W3AquYTXffAW9T5R2Nn9Idpbh/EPDpJNIB7D0yFWezU=";
|
||||
npmDepsHash = "sha256-ZiIEGeKee/qEhe44SGlPTDhwP+vL9K8RkFEOeUdzUI8=";
|
||||
|
||||
# See https://github.com/open-webui/open-webui/issues/15880
|
||||
npmFlags = [
|
||||
@@ -202,12 +202,17 @@ python3Packages.buildPythonApplication rec {
|
||||
psycopg2-binary
|
||||
];
|
||||
|
||||
mariadb = [
|
||||
mariadb
|
||||
];
|
||||
|
||||
all = [
|
||||
azure-search-documents
|
||||
colbert-ai
|
||||
elasticsearch
|
||||
firecrawl-py
|
||||
gcp-storage-emulator
|
||||
mariadb
|
||||
moto
|
||||
oracledb
|
||||
pinecone-client
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rime-wanxiang";
|
||||
version = "15.0.0";
|
||||
version = "15.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amzxyz";
|
||||
repo = "rime_wanxiang";
|
||||
tag = "v" + finalAttrs.version;
|
||||
hash = "sha256-6IeUpcyi4DsKRJLFjJH0zGHz2ZWqA7qMz4brIJPU8q0=";
|
||||
hash = "sha256-jX3QJO5gi5zk8ZbRTT2GGnevPDXzqs/H0MoxKiFOuJY=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
Generated
+13
-13
@@ -4,30 +4,30 @@ version = 3
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "1.1.3"
|
||||
version = "1.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
|
||||
checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.177"
|
||||
version = "0.2.182"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
|
||||
checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.7.6"
|
||||
version = "2.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
|
||||
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.12.2"
|
||||
version = "1.12.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
|
||||
checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@@ -37,9 +37,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.4.13"
|
||||
version = "0.4.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
|
||||
checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@@ -48,13 +48,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.8.8"
|
||||
version = "0.8.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
|
||||
checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
|
||||
|
||||
[[package]]
|
||||
name = "rure"
|
||||
version = "0.2.4"
|
||||
version = "0.2.5"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"regex",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"pname": "rure",
|
||||
"version": "0.2.4",
|
||||
"hash": "sha256:02wgpjllvlqhcpj8w59qwfjhxch3qy5i2qg3a1v1555dhhzqnnwl"
|
||||
"version": "0.2.5",
|
||||
"hash": "sha256:1fnpmk5xl332cbjshd3lfckvkspbr1dic4id5w6xhb0vm6xz9xy9"
|
||||
}
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stasis";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saltnpepper97";
|
||||
repo = "stasis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Rq3JnZAYzysIPdcVVM/ctKBARPGxKzzae2owVwqNPt8=";
|
||||
hash = "sha256-WgfBaBBQSbEgwl14BFiANiK77Mj7ptXqX9Q3CWA2MJ8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wAuiD66MFoQoAxsDL2bGV1GIUn7mw2TVespuD1gJcuQ=";
|
||||
cargoHash = "sha256-rXyRvLQ1r7AxBgegOCtexGlBomd6tMDK2X2xUE50Mkg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vacuum-tube";
|
||||
version = "1.5.8";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shy1132";
|
||||
repo = "VacuumTube";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-R8Rk+GbSrqODHbAaCpF5x8z7t0VRY+uoUZmIwfOuMVw=";
|
||||
hash = "sha256-BnFI517pXKsHQ8AJMRzAlXBTLMLhjyEasIhZdSHtyC0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-RT0w4FjZlWJbUjYz5w+H+3sJJq05R+jqsJxAhLwPak4=";
|
||||
npmDepsHash = "sha256-R7DISsTJv/DDi8uJTWF+6/P8K86BguxtZNsaL2qCxhY=";
|
||||
makeCacheWritable = true;
|
||||
|
||||
env = {
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "vunnel";
|
||||
version = "0.55.2";
|
||||
version = "0.55.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "vunnel";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8+TVIvWqNRGWghJlY+eoE/T6frdI6IzyYhqPrOi1xlk=";
|
||||
hash = "sha256-gjkrANO97sdSeW2U+Ah5eo/bbwn32xqmZDrUi5cjD60=";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
gitMinimal,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "worktrunk";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "max-sixty";
|
||||
repo = "worktrunk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JawxnNoEv8ZDLaZmOlMrvsa/cEzmOFYv7oHWmPeOIbc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aEUnR3Dk3LFo3vJf+k550YiP3pSN6a7175d91yEned0=";
|
||||
|
||||
cargoBuildFlags = [ "--package=worktrunk" ];
|
||||
|
||||
# vergen-gitcl calls `git describe` at build time; VERGEN_IDEMPOTENT makes it
|
||||
# fall back gracefully when no git history is available (Nix sandbox).
|
||||
env.VERGEN_IDEMPOTENT = "1";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
# wt reads config from $HOME; provide a throwaway dir so it doesn't fail.
|
||||
export HOME="$(mktemp -d)"
|
||||
|
||||
installShellCompletion --cmd wt \
|
||||
--bash <($out/bin/wt config shell completions bash) \
|
||||
--fish <($out/bin/wt config shell completions fish) \
|
||||
--zsh <($out/bin/wt config shell completions zsh)
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ gitMinimal ];
|
||||
|
||||
checkFlags = [
|
||||
# Expects to run inside a git repository
|
||||
"--skip=git::recover::tests::test_current_or_recover_returns_repo_when_cwd_exists"
|
||||
# Insta snapshot mismatch across git versions
|
||||
"--skip=git::recover::tests::test_hint_for_repo_suggests_switch"
|
||||
# Expects `which` on PATH
|
||||
"--skip=output::commit_generation::tests::test_command_exists_known_command"
|
||||
# Integration tests use insta snapshots with environment-specific paths
|
||||
"--skip=integration_tests::"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Git worktree manager for parallel AI agent workflows";
|
||||
longDescription = ''
|
||||
worktrunk wraps git worktree with a simpler interface and integrates with
|
||||
AI coding tools like Claude Code, Cursor, and Aider.
|
||||
'';
|
||||
homepage = "https://worktrunk.dev/";
|
||||
changelog = "https://github.com/max-sixty/worktrunk/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "wt";
|
||||
maintainers = with lib.maintainers; [ siriobalmelli ];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,102 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
ensureNewerSourcesForZipFilesHook,
|
||||
python3,
|
||||
pkg-config,
|
||||
wafHook,
|
||||
SDL2,
|
||||
libx11,
|
||||
freetype,
|
||||
opusfile,
|
||||
libopus,
|
||||
libogg,
|
||||
libvorbis,
|
||||
bzip2,
|
||||
hlsdk-portable,
|
||||
makeWrapper,
|
||||
|
||||
# Options
|
||||
buildSdk ? false,
|
||||
buildServer ? false,
|
||||
}:
|
||||
let
|
||||
exe = if buildServer then "xash" else "xash3d";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "xash3d-fwgs";
|
||||
version = "0-unstable-2026-02-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FWGS";
|
||||
repo = "xash3d-fwgs";
|
||||
rev = "2c004e6cb78f0b435f2923a5105c9df43130e337";
|
||||
hash = "sha256-Bh0JaeDO/RrMSQKvqJGbmrQoG1aR7Q+5YnBEedARliU=";
|
||||
postCheckout = ''
|
||||
cd $out/3rdparty
|
||||
git submodule update --init --recursive \
|
||||
MultiEmulator extras/xash-extras gl-wes-v2 gl4es/gl4es \
|
||||
libbacktrace/libbacktrace library_suffix maintui mainui nanogl \
|
||||
vgui_support
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
ensureNewerSourcesForZipFilesHook
|
||||
python3
|
||||
pkg-config
|
||||
wafHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals (!buildServer) [
|
||||
freetype
|
||||
opusfile
|
||||
libopus
|
||||
libogg
|
||||
libvorbis
|
||||
bzip2
|
||||
SDL2
|
||||
]
|
||||
++ lib.optionals (!buildServer && stdenv.isLinux) [
|
||||
libx11
|
||||
];
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
wafConfigureFlags = [
|
||||
"-T release"
|
||||
]
|
||||
++ lib.optionals buildServer [
|
||||
"-d"
|
||||
]
|
||||
++ lib.optionals (!buildServer) [
|
||||
"--sdl-use-pkgconfig"
|
||||
]
|
||||
++ lib.optionals stdenv.buildPlatform.is64bit [ "-8" ];
|
||||
|
||||
wafInstallFlags = [ "--destdir=${placeholder "out"}/lib" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
mv $out/lib/${exe} $out/bin/${exe}-unwrapped
|
||||
makeWrapper $out/bin/${exe}-unwrapped $out/bin/${exe} \
|
||||
--set XASH3D_RODIR $out/lib/valve \
|
||||
--run "export XASH3D_BASEDIR=\$HOME/.xash3d/" \
|
||||
--prefix ${
|
||||
if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"
|
||||
} : "$out/lib"
|
||||
''
|
||||
+ lib.optionalString buildSdk "cp -TR ${hlsdk-portable}/valve $out/lib/valve";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/FWGS/xash3d-fwgs";
|
||||
description = "Xash3D FWGS engine";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ r4v3n6101 ];
|
||||
mainProgram = exe;
|
||||
};
|
||||
}
|
||||
@@ -6,50 +6,60 @@
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
mkCoqDerivation {
|
||||
pname = "iris";
|
||||
domain = "gitlab.mpi-sws.org";
|
||||
owner = "iris";
|
||||
inherit version;
|
||||
defaultVersion =
|
||||
let
|
||||
case = case: out: { inherit case out; };
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch coq.coq-version [
|
||||
(case (range "8.19" "9.1") "4.4.0")
|
||||
(case (range "8.18" "8.19") "4.2.0")
|
||||
(case (range "8.16" "8.18") "4.1.0")
|
||||
(case (range "8.13" "8.17") "4.0.0")
|
||||
(case (range "8.12" "8.14") "3.5.0")
|
||||
(case (range "8.11" "8.13") "3.4.0")
|
||||
(case (range "8.9" "8.10") "3.3.0")
|
||||
] null;
|
||||
release."4.4.0".sha256 = "sha256-zpuaIdH2ScOuZB0Vt1TEHAbsmcT1DyoDsJpftT1M7qw=";
|
||||
release."4.3.0".sha256 = "sha256-3qhjiFI+A3I3fD8rFfJL5Hek77wScfn/FNNbDyGqA1k=";
|
||||
release."4.2.0".sha256 = "sha256-HuiHIe+5letgr1NN1biZZFq0qlWUbFmoVI7Q91+UIfM=";
|
||||
release."4.1.0".sha256 = "sha256-nTZUeZOXiH7HsfGbMKDE7vGrNVCkbMaWxdMWUcTUNlo=";
|
||||
release."4.0.0".sha256 = "sha256-Jc9TmgGvkiDaz9IOoExyeryU1E+Q37GN24NIM397/Gg=";
|
||||
release."3.6.0".sha256 = "sha256:02vbq597fjxd5znzxdb54wfp36412wz2d4yash4q8yddgl1kakmj";
|
||||
release."3.5.0".sha256 = "0hh14m0anfcv65rxm982ps2vp95vk9fwrpv4br8bxd9vz0091d70";
|
||||
release."3.4.0".sha256 = "0vdc2mdqn5jjd6yz028c0c6blzrvpl0c7apx6xas7ll60136slrb";
|
||||
release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp";
|
||||
releaseRev = v: "iris-${v}";
|
||||
let
|
||||
derivation = mkCoqDerivation {
|
||||
pname = "iris";
|
||||
domain = "gitlab.mpi-sws.org";
|
||||
owner = "iris";
|
||||
inherit version;
|
||||
defaultVersion =
|
||||
let
|
||||
case = case: out: { inherit case out; };
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch coq.coq-version [
|
||||
(case (range "8.19" "9.1") "4.4.0")
|
||||
(case (range "8.18" "8.19") "4.2.0")
|
||||
(case (range "8.16" "8.18") "4.1.0")
|
||||
(case (range "8.13" "8.17") "4.0.0")
|
||||
(case (range "8.12" "8.14") "3.5.0")
|
||||
(case (range "8.11" "8.13") "3.4.0")
|
||||
(case (range "8.9" "8.10") "3.3.0")
|
||||
] null;
|
||||
release."4.4.0".sha256 = "sha256-zpuaIdH2ScOuZB0Vt1TEHAbsmcT1DyoDsJpftT1M7qw=";
|
||||
release."4.3.0".sha256 = "sha256-3qhjiFI+A3I3fD8rFfJL5Hek77wScfn/FNNbDyGqA1k=";
|
||||
release."4.2.0".sha256 = "sha256-HuiHIe+5letgr1NN1biZZFq0qlWUbFmoVI7Q91+UIfM=";
|
||||
release."4.1.0".sha256 = "sha256-nTZUeZOXiH7HsfGbMKDE7vGrNVCkbMaWxdMWUcTUNlo=";
|
||||
release."4.0.0".sha256 = "sha256-Jc9TmgGvkiDaz9IOoExyeryU1E+Q37GN24NIM397/Gg=";
|
||||
release."3.6.0".sha256 = "sha256:02vbq597fjxd5znzxdb54wfp36412wz2d4yash4q8yddgl1kakmj";
|
||||
release."3.5.0".sha256 = "0hh14m0anfcv65rxm982ps2vp95vk9fwrpv4br8bxd9vz0091d70";
|
||||
release."3.4.0".sha256 = "0vdc2mdqn5jjd6yz028c0c6blzrvpl0c7apx6xas7ll60136slrb";
|
||||
release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp";
|
||||
releaseRev = v: "iris-${v}";
|
||||
|
||||
propagatedBuildInputs = [ stdpp ];
|
||||
propagatedBuildInputs = [ stdpp ];
|
||||
|
||||
preBuild = ''
|
||||
if [[ -f coq-lint.sh ]]
|
||||
then patchShebangs coq-lint.sh
|
||||
fi
|
||||
'';
|
||||
preBuild = ''
|
||||
if [[ -f coq-lint.sh ]]
|
||||
then patchShebangs coq-lint.sh
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Coq development of the Iris Project";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [
|
||||
lib.maintainers.vbgl
|
||||
lib.maintainers.ineol
|
||||
];
|
||||
meta = {
|
||||
description = "Coq development of the Iris Project";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [
|
||||
lib.maintainers.vbgl
|
||||
lib.maintainers.ineol
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
in
|
||||
# this is just a wrapper for rocqPackages.iris for Rocq >= 9.0
|
||||
if coq.rocqPackages ? iris then
|
||||
coq.rocqPackages.iris.override {
|
||||
inherit version stdpp;
|
||||
inherit (coq.rocqPackages) rocq-core;
|
||||
}
|
||||
else
|
||||
derivation
|
||||
|
||||
@@ -6,50 +6,60 @@
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
mkCoqDerivation {
|
||||
pname = "stdpp";
|
||||
inherit version;
|
||||
domain = "gitlab.mpi-sws.org";
|
||||
owner = "iris";
|
||||
defaultVersion =
|
||||
let
|
||||
case = case: out: { inherit case out; };
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch coq.coq-version [
|
||||
(case (range "8.19" "9.1") "1.12.0")
|
||||
(case (range "8.18" "8.19") "1.10.0")
|
||||
(case (range "8.16" "8.18") "1.9.0")
|
||||
(case (range "8.13" "8.17") "1.8.0")
|
||||
(case (range "8.12" "8.14") "1.6.0")
|
||||
(case (range "8.11" "8.13") "1.5.0")
|
||||
(case (range "8.8" "8.10") "1.4.0")
|
||||
] null;
|
||||
release."1.12.0".sha256 = "sha256-2o8YMkKbXrKHwtfpkdAovxl+2NZZk958GjSSd9wcEIU=";
|
||||
release."1.11.0".sha256 = "sha256-yqnkaA5gUdZBJZ3JnvPYh11vKQRl0BAnior1yGowG7k=";
|
||||
release."1.10.0".sha256 = "sha256-bfynevIKxAltvt76lsqVxBmifFkzEhyX8lRgTKxr21I=";
|
||||
release."1.9.0".sha256 = "sha256-OXeB+XhdyzWMp5Karsz8obp0rTeMKrtG7fu/tmc9aeI=";
|
||||
release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU=";
|
||||
release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y";
|
||||
release."1.6.0".sha256 = "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v";
|
||||
release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf";
|
||||
release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r";
|
||||
releaseRev = v: "coq-stdpp-${v}";
|
||||
let
|
||||
derivation = mkCoqDerivation {
|
||||
pname = "stdpp";
|
||||
inherit version;
|
||||
domain = "gitlab.mpi-sws.org";
|
||||
owner = "iris";
|
||||
defaultVersion =
|
||||
let
|
||||
case = case: out: { inherit case out; };
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch coq.coq-version [
|
||||
(case (range "8.19" "9.1") "1.12.0")
|
||||
(case (range "8.18" "8.19") "1.10.0")
|
||||
(case (range "8.16" "8.18") "1.9.0")
|
||||
(case (range "8.13" "8.17") "1.8.0")
|
||||
(case (range "8.12" "8.14") "1.6.0")
|
||||
(case (range "8.11" "8.13") "1.5.0")
|
||||
(case (range "8.8" "8.10") "1.4.0")
|
||||
] null;
|
||||
release."1.12.0".sha256 = "sha256-2o8YMkKbXrKHwtfpkdAovxl+2NZZk958GjSSd9wcEIU=";
|
||||
release."1.11.0".sha256 = "sha256-yqnkaA5gUdZBJZ3JnvPYh11vKQRl0BAnior1yGowG7k=";
|
||||
release."1.10.0".sha256 = "sha256-bfynevIKxAltvt76lsqVxBmifFkzEhyX8lRgTKxr21I=";
|
||||
release."1.9.0".sha256 = "sha256-OXeB+XhdyzWMp5Karsz8obp0rTeMKrtG7fu/tmc9aeI=";
|
||||
release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU=";
|
||||
release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y";
|
||||
release."1.6.0".sha256 = "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v";
|
||||
release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf";
|
||||
release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r";
|
||||
releaseRev = v: "coq-stdpp-${v}";
|
||||
|
||||
propagatedBuildInputs = [ stdlib ];
|
||||
propagatedBuildInputs = [ stdlib ];
|
||||
|
||||
preBuild = ''
|
||||
if [[ -f coq-lint.sh ]]
|
||||
then patchShebangs coq-lint.sh
|
||||
fi
|
||||
'';
|
||||
preBuild = ''
|
||||
if [[ -f coq-lint.sh ]]
|
||||
then patchShebangs coq-lint.sh
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Extended “Standard Library” for Coq";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [
|
||||
lib.maintainers.vbgl
|
||||
lib.maintainers.ineol
|
||||
];
|
||||
meta = {
|
||||
description = "Extended “Standard Library” for Coq";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [
|
||||
lib.maintainers.vbgl
|
||||
lib.maintainers.ineol
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
in
|
||||
# this is just a wrapper for rocqPackages.stdpp for Rocq >= 9.0
|
||||
if coq.rocqPackages ? stdpp then
|
||||
coq.rocqPackages.stdpp.override {
|
||||
inherit version stdlib;
|
||||
inherit (coq.rocqPackages) rocq-core;
|
||||
}
|
||||
else
|
||||
derivation
|
||||
|
||||
@@ -443,6 +443,15 @@ with haskellLib;
|
||||
# 2025-02-14: Too strict bounds on attoparsec < 0.14
|
||||
attoparsec-varword = doJailbreak (dontCheck super.attoparsec-varword);
|
||||
|
||||
# Fix t_iter test which fails randomly, but frequently. No upstream feedback so far.
|
||||
# https://github.com/haskell/attoparsec/issues/232
|
||||
attoparsec = overrideCabal (drv: {
|
||||
testFlags = drv.testFlags or [ ] ++ [
|
||||
"-p"
|
||||
"$0!=\"tests.buf.t_iter\""
|
||||
];
|
||||
}) super.attoparsec;
|
||||
|
||||
# These packages (and their reverse deps) cannot be built with profiling enabled.
|
||||
ghc-heap-view = lib.pipe super.ghc-heap-view [
|
||||
disableLibraryProfiling
|
||||
@@ -2723,12 +2732,12 @@ with haskellLib;
|
||||
doJailbreak
|
||||
# 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
|
||||
(overrideSrc rec {
|
||||
version = "14.5";
|
||||
version = "14.6";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "PostgREST";
|
||||
repo = "postgrest";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qeFBq+d8AjwXp4YleOa0hLnBppI5+Tm1OEgB1QHWqY8=";
|
||||
hash = "sha256-VGEkb5Skq2u9MCJdz9xGJOoK0Dg22vAxXFRx2Xg9Dv8=";
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
@@ -30,18 +30,25 @@
|
||||
scipy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "devito";
|
||||
version = "4.8.20";
|
||||
version = "4.8.21";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devitocodes";
|
||||
repo = "devito";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7GlpvPjiUckzh1s2Pwfaoy/bMsAW1FscnyxGaADyie8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nD1bUFv24lnonajUG6m5yhGUAC0pVtSKTX69JwSt69E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# codepy >=2025.1 turned GCCToolchain into a frozen dataclass,
|
||||
# breaking devito's imperative attribute assignments and renaming
|
||||
# several API parameters. Upstream pins codepy<2025; patch instead.
|
||||
./fix-codepy-compat.patch
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [ "pip" ];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
@@ -88,6 +95,9 @@ buildPythonPackage rec {
|
||||
# Download dataset from the internet
|
||||
"test_gs_2d_float"
|
||||
"test_gs_2d_int"
|
||||
|
||||
# Numerical precision issue: assert Data(False)
|
||||
"test_cire_n_strides"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False
|
||||
@@ -152,8 +162,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Code generation framework for automated finite difference computation";
|
||||
homepage = "https://www.devitoproject.org/";
|
||||
changelog = "https://github.com/devitocodes/devito/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/devitocodes/devito/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
--- a/devito/arch/compiler.py
|
||||
+++ b/devito/arch/compiler.py
|
||||
@@ -145,6 +145,14 @@
|
||||
|
||||
|
||||
class Compiler(GCCToolchain):
|
||||
+ # codepy >=2025.1 turned GCCToolchain into a frozen dataclass, which
|
||||
+ # forbids attribute assignment. Override the frozen __setattr__ /
|
||||
+ # __delattr__ so that Compiler (and its subclasses) can keep setting
|
||||
+ # attributes imperatively.
|
||||
+ def __setattr__(self, name, value):
|
||||
+ object.__setattr__(self, name, value)
|
||||
+ def __delattr__(self, name):
|
||||
+ object.__delattr__(self, name)
|
||||
"""
|
||||
Base class for all compiler classes.
|
||||
|
||||
@@ -196,7 +204,11 @@
|
||||
else:
|
||||
self._name = maybe_name
|
||||
|
||||
- super().__init__(**kwargs)
|
||||
+ # codepy >=2025.1: GCCToolchain is a frozen dataclass whose __init__
|
||||
+ # requires all fields as positional args. Skip it entirely and
|
||||
+ # initialise the fields that Compiler never sets itself.
|
||||
+ self.o_ext = '.o'
|
||||
+ self.features = set()
|
||||
|
||||
self.__lookup_cmds__()
|
||||
self._cpp = kwargs.get('cpp', self._default_cpp)
|
||||
@@ -355,12 +367,12 @@
|
||||
) from e
|
||||
debug(f"Make <{' '.join(args)}>")
|
||||
|
||||
- def _cmdline(self, files, object=False):
|
||||
+ def _cmdline(self, files, *, is_object=False):
|
||||
"""
|
||||
Sanitize command line to remove all shell string escape such as
|
||||
mpicc/mpicxx would add, e.g., `-Wl\\,-rpath,/path/to/lib`.
|
||||
"""
|
||||
- cc_line = super()._cmdline(files, object=object)
|
||||
+ cc_line = super()._cmdline(files, is_object=is_object)
|
||||
return [s.replace('\\', '') for s in cc_line]
|
||||
|
||||
def jit_compile(self, soname, code):
|
||||
@@ -417,9 +429,11 @@
|
||||
# when running the test suite in parallel)
|
||||
with warnings.catch_warnings():
|
||||
warnings.simplefilter('ignore')
|
||||
- _, _, _, recompiled = compile_from_string(self, target, code, src_file,
|
||||
- cache_dir=cache_dir, debug=debug,
|
||||
- sleep_delay=sleep_delay)
|
||||
+ # codepy >=2025.1: source_name is now keyword-only.
|
||||
+ _, _, _, recompiled = compile_from_string(
|
||||
+ self, target, code, source_name=src_file,
|
||||
+ cache_dir=cache_dir, debug=debug,
|
||||
+ sleep_delay=sleep_delay)
|
||||
|
||||
return recompiled, src_file
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "dissect-database";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.database";
|
||||
tag = version;
|
||||
hash = "sha256-ZMiYPAiumPg9nd7+OAnrVAwrnx0I5reClRgIerStpfE=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-z3Ra8BjPGozcx5bF+FKcA/bnsO8F++UBUEQ2tBd+X5Q=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -41,8 +41,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Dissect module implementing a parser for various database formats";
|
||||
homepage = "https://github.com/fox-it/dissect.database";
|
||||
changelog = "https://github.com/fox-it/dissect.database/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/fox-it/dissect.database/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
# tests
|
||||
qt5,
|
||||
pyqt5,
|
||||
pytest-qt,
|
||||
pytestCheckHook,
|
||||
|
||||
@@ -77,6 +78,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pyqt5
|
||||
pytest-qt
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pyqt5,
|
||||
pyqt6,
|
||||
pytestCheckHook,
|
||||
uv-build,
|
||||
}:
|
||||
@@ -27,9 +27,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ uv-build ];
|
||||
|
||||
dependencies = [ pyqt5 ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pyqt6
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "qasync" ];
|
||||
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.1.51";
|
||||
version = "3.1.52";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-3PbMO0BCkmEErvARg3c9ckJGSoIy81CG77rfsx3r+S8=";
|
||||
hash = "sha256-CSjZtlkoO74xzKndG3CTQVfPOyjkCKP1U8Qiu1AEV2Q=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
config,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
@@ -10,7 +9,6 @@
|
||||
|
||||
# buildInputs
|
||||
ffmpeg,
|
||||
cudaPackages,
|
||||
|
||||
# build-system
|
||||
cmake,
|
||||
@@ -21,7 +19,8 @@
|
||||
pytestCheckHook,
|
||||
torchvision,
|
||||
|
||||
cudaSupport ? config.cudaSupport,
|
||||
cudaSupport ? torch.cudaSupport,
|
||||
cudaPackages,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
@@ -167,6 +166,9 @@ buildPythonPackage (finalAttrs: {
|
||||
homepage = "https://github.com/meta-pytorch/torchcodec";
|
||||
changelog = "https://github.com/meta-pytorch/torchcodec/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
caniko
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,7 @@ set -eu -o pipefail
|
||||
|
||||
source_file=pkgs/development/python-modules/types-aiobotocore-packages/default.nix
|
||||
|
||||
nix-update python314Packages.types-aiobotocore --commit --build
|
||||
#nix-update python3Packages.types-aiobotocore --commit --build
|
||||
|
||||
packages=(
|
||||
types-aiobotocore-accessanalyzer
|
||||
@@ -133,7 +133,7 @@ packages=(
|
||||
types-aiobotocore-entityresolution
|
||||
types-aiobotocore-es
|
||||
types-aiobotocore-events
|
||||
types-aiobotocore-evidently
|
||||
# types-aiobotocore-evidently
|
||||
types-aiobotocore-finspace
|
||||
types-aiobotocore-finspace-data
|
||||
types-aiobotocore-firehose
|
||||
@@ -165,7 +165,7 @@ packages=(
|
||||
types-aiobotocore-iot
|
||||
types-aiobotocore-iot-data
|
||||
types-aiobotocore-iot-jobs-data
|
||||
types-aiobotocore-iotanalytics
|
||||
# types-aiobotocore-iotanalytics
|
||||
types-aiobotocore-iotdeviceadvisor
|
||||
types-aiobotocore-iotevents
|
||||
types-aiobotocore-iotevents-data
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
mkRocqDerivation,
|
||||
stdlib,
|
||||
rocq-core,
|
||||
stdpp,
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
mkRocqDerivation {
|
||||
pname = "iris";
|
||||
domain = "gitlab.mpi-sws.org";
|
||||
owner = "iris";
|
||||
inherit version;
|
||||
defaultVersion =
|
||||
let
|
||||
case = case: out: { inherit case out; };
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch rocq-core.rocq-version [
|
||||
(case (range "9.0" "9.2") "4.5.0")
|
||||
] null;
|
||||
release."4.5.0".sha256 = "sha256-oGqo+W1prLtAwRwo2U15VGhmrkDIPPE6uMbNrTa8iAQ=";
|
||||
releaseRev = v: "iris-${v}";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
stdlib
|
||||
stdpp
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
if [[ -f coq-lint.sh ]]
|
||||
then patchShebangs coq-lint.sh
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Rocq development of the Iris Project";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [
|
||||
lib.maintainers.vbgl
|
||||
lib.maintainers.ineol
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
mkRocqDerivation,
|
||||
rocq-core,
|
||||
stdlib,
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
mkRocqDerivation {
|
||||
pname = "stdpp";
|
||||
inherit version;
|
||||
domain = "gitlab.mpi-sws.org";
|
||||
owner = "iris";
|
||||
defaultVersion =
|
||||
let
|
||||
case = case: out: { inherit case out; };
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch rocq-core.rocq-version [
|
||||
(case (range "9.0" "9.2") "1.13.0")
|
||||
] null;
|
||||
release."1.13.0".sha256 = "sha256-kj8oBzarsLB4DDQ43yz4ViQbyzuISqext28wC2Fh3Sw=";
|
||||
releaseRev = v: "stdpp-${v}";
|
||||
|
||||
propagatedBuildInputs = [ stdlib ];
|
||||
|
||||
preBuild = ''
|
||||
if [[ -f coq-lint.sh ]]
|
||||
then patchShebangs coq-lint.sh
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Extended “Standard Library” for Rocq";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [
|
||||
lib.maintainers.vbgl
|
||||
lib.maintainers.ineol
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -23,8 +23,8 @@ let
|
||||
[ ];
|
||||
in
|
||||
buildNodejs {
|
||||
version = "25.8.0";
|
||||
sha256 = "5d00429cb856cc72200ec6c08e8cdda75ea9618256de8d899fa049c23f4a2eee";
|
||||
version = "25.8.1";
|
||||
sha256 = "0b25b2b5fab80ea8b43fdaa7451f50065571e0bfda2524ca42bde8b98fe4d2d9";
|
||||
patches =
|
||||
(
|
||||
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
|
||||
|
||||
@@ -11368,6 +11368,8 @@ with pkgs;
|
||||
xonotic
|
||||
;
|
||||
|
||||
xash-dedicated = callPackage ../by-name/xa/xash3d-fwgs/package.nix { buildServer = true; };
|
||||
|
||||
xonotic-glx =
|
||||
(callPackage ../games/xonotic {
|
||||
withSDL = false;
|
||||
|
||||
@@ -38,6 +38,7 @@ let
|
||||
|
||||
bignums = callPackage ../development/rocq-modules/bignums { };
|
||||
hierarchy-builder = callPackage ../development/rocq-modules/hierarchy-builder { };
|
||||
iris = callPackage ../development/rocq-modules/iris { };
|
||||
mathcomp = callPackage ../development/rocq-modules/mathcomp { };
|
||||
mathcomp-boot = self.mathcomp.boot;
|
||||
mathcomp-order = self.mathcomp.order;
|
||||
@@ -52,6 +53,7 @@ let
|
||||
relation-algebra = callPackage ../development/rocq-modules/relation-algebra { };
|
||||
rocq-elpi = callPackage ../development/rocq-modules/rocq-elpi { };
|
||||
stdlib = callPackage ../development/rocq-modules/stdlib { };
|
||||
stdpp = callPackage ../development/rocq-modules/stdpp { };
|
||||
vsrocq-language-server = callPackage ../development/rocq-modules/vsrocq-language-server { };
|
||||
|
||||
filterPackages = doesFilter: if doesFilter then filterRocqPackages self else self;
|
||||
|
||||
Reference in New Issue
Block a user