Merge master into staging-next
This commit is contained in:
@@ -38,6 +38,10 @@
|
||||
webkitgtk_4_1,
|
||||
ripgrep,
|
||||
which,
|
||||
libxtst,
|
||||
libjpeg8,
|
||||
pipewire,
|
||||
libei,
|
||||
|
||||
# needed to fix "Save as Root"
|
||||
asar,
|
||||
@@ -257,6 +261,10 @@ stdenv.mkDerivation (
|
||||
systemdLibs
|
||||
webkitgtk_4_1
|
||||
libxkbfile
|
||||
libxtst
|
||||
libjpeg8.out
|
||||
pipewire
|
||||
libei
|
||||
];
|
||||
|
||||
runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
|
||||
@@ -35,17 +35,17 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-L0o9+vxfAkmtOHJvmf0G8WIbp3bXjAuuIAtTtFvbwjQ=";
|
||||
x86_64-darwin = "sha256-WYcRDrFLEjwyQhVdNASz3JUQlLuubDuPjBXa/ROs3h8=";
|
||||
aarch64-linux = "sha256-3CBrenqZs35gMWmVtI//4w0JGSKP8cbu3cJH14P4aEU=";
|
||||
aarch64-darwin = "sha256-0JVfgcYxgdaeWfeGFrfG3qxpWHilQte/dLiW33yxm8o=";
|
||||
armv7l-linux = "sha256-O8nDg1aJ0IbjbRS5kiNoFHzciyHErKK8PP+uujzJOxk=";
|
||||
x86_64-linux = "sha256-TTulHpCiT2eay2tb7e1ub164rgttBnB36Cc4JVoxf08=";
|
||||
x86_64-darwin = "sha256-fkJGd9dSX5OZ9peHbLha43mYBeEFsyd7rLprRajc60I=";
|
||||
aarch64-linux = "sha256-AOHmrVo5Q2iE6V/nHRniQVXfhDcL7bzBKdXfe8oZFP0=";
|
||||
aarch64-darwin = "sha256-dMSYvcryDd8Wqu8GHwnrp5pyRJwLzpV9BDLnpyWcxG0=";
|
||||
armv7l-linux = "sha256-L48bXLyX2dzHqcmJ752RLE8XUxrQRBLGhxdZwUO8mjw=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.124.2";
|
||||
version = "1.125.0";
|
||||
|
||||
# The update server (update.code.visualstudio.com) expects the version path
|
||||
# segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
|
||||
@@ -53,7 +53,7 @@ let
|
||||
downloadVersion = lib.versions.pad 3 version;
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "6928394f91b684055b873eecb8bc281365131f1c";
|
||||
rev = "93cfdd489c3b228840d0f86ec77c3636277c93ea";
|
||||
in
|
||||
buildVscode {
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
@@ -86,7 +86,7 @@ buildVscode {
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
hash = "sha256-S4RcYGjK9vEtPp+vTNFV4SN+7osYzfuCiXmQC39PYhI=";
|
||||
hash = "sha256-IKTCVqR+SA2nAaIGHwde6dWbcDPgp2mlXKYi9DK5mCE=";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
||||
@@ -101,11 +101,11 @@
|
||||
"vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
|
||||
},
|
||||
"baidubce_baiducloud": {
|
||||
"hash": "sha256-kA2s+STTaax/PEevdHdbGzhQcFPJFRin6ALu1FkRzsg=",
|
||||
"hash": "sha256-vSEPf0r7R5anuaTsAJFIx0GPTtrSKbRqqZoQA67Q2C0=",
|
||||
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
|
||||
"owner": "baidubce",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.23.3",
|
||||
"rev": "v1.23.5",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "crossplane-cli";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crossplane";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-9BlNhllLz4LHPMy6gkph5flztQZBHI1tIMlNa22YPh4=";
|
||||
hash = "sha256-X40vTjtai6zlZWvGG/wPt8us4AONcXZ9TxIZn2cPH2E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NHLryreDHxrqjo8VHR9R/MD8tDXYaZYyqgulxPOKUyA=";
|
||||
vendorHash = "sha256-WAGIhGW7R5BZuQmERbJhN3mFCLVSDsNqtAFYnrNo7XE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
spdlog,
|
||||
@@ -26,32 +25,16 @@ let
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.10.0.post5";
|
||||
version = "0.11.0.post0";
|
||||
pname = "dolfinx";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fenics";
|
||||
repo = "dolfinx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CK7YEtJtrx/Mto72RHT4Qjg5StO28Et+FeCYxk5T+8s=";
|
||||
hash = "sha256-brmU6AA7lN4TyHjHcg4mHUIj/OvJ16pfspEN95M4oOE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix wrong span extent in _lift_bc_interior_facets
|
||||
# https://github.com/FEniCS/dolfinx/pull/4102
|
||||
(fetchpatch {
|
||||
url = "https://github.com/FEniCS/dolfinx/commit/6daca34a075a6dcdfdf77feb13d55d5dbd20e4dd.patch";
|
||||
hash = "sha256-b/C1MqslS2OBCt+kK/+vJjW8pmsJx2FQ36qDtFA1ewI=";
|
||||
includes = [ "cpp/dolfinx/fem/assemble_vector_impl.h" ];
|
||||
})
|
||||
# Fix hdf5 interface for rank 1
|
||||
# https://github.com/FEniCS/dolfinx/pull/4043
|
||||
(fetchpatch {
|
||||
url = "https://github.com/FEniCS/dolfinx/commit/fce7c44f220d4cb94c5149ad28cd1ab00909c319.patch";
|
||||
hash = "sha256-EVm4Rx5UO/3pKIVvjgYAkN+i5QR+u0Nxwxotlf41t+Q=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
+484
-429
File diff suppressed because it is too large
Load Diff
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "i18next-cli";
|
||||
version = "1.63.1";
|
||||
version = "1.64.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "i18next";
|
||||
repo = "i18next-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7VlED5PGQTl36VVF8FucovPoFEWJvKlAuKhZYBWdXws=";
|
||||
hash = "sha256-wcWWatjeI0Z/NLVaFehtgbaVFEyjrYochVdjcntmUcA=";
|
||||
};
|
||||
|
||||
# NOTE: Generating lock-file
|
||||
@@ -21,7 +21,7 @@ buildNpmPackage rec {
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-9KmdeN6woxxwfaiGdUytOt83QDOYld3iG5NVEwXKsSM=";
|
||||
npmDepsHash = "sha256-kRl96n6ozc7lZdFYcXsEJbUDZuJiZRcfczJ8rIWZSDY=";
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--generate-lockfile" ];
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsupermesh";
|
||||
version = "2025.4";
|
||||
version = "2026.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firedrakeproject";
|
||||
repo = "libsupermesh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VIGfuSVneCBapZyU0GXyi6isUSdhD2Ylm4mCymSvzbo=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-f/5y3XherRbN/Eq3tfivrOHByF8LAXtYN3v9Vx82m8Q=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
homepage = "https://github.com/firedrakeproject/libsupermesh";
|
||||
description = "Parallel supermeshing library";
|
||||
changelog = "https://github.com/firedrakeproject/libsupermesh/releases/tag/v${finalAttrs.version}";
|
||||
changelog = "https://github.com/firedrakeproject/libsupermesh/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ qbisi ];
|
||||
|
||||
@@ -81,7 +81,7 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "9608";
|
||||
version = "9747";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -92,7 +92,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-nNQzEfSqVwusixHdiZCyAOtrQTQ7aAdV+S9qZywWWx0=";
|
||||
hash = "sha256-ecXJxidnlQRAyDftYIcTrER5U3+YQ+XfvAxA29pj+uI=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
@@ -125,7 +125,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
++ [ openssl ];
|
||||
|
||||
npmRoot = "tools/ui";
|
||||
npmDepsHash = "sha256-pjdbI6NcZRlJVd62xhgbLhWrwFYwgsIwjORqvo1+VD8=";
|
||||
npmDepsHash = "sha256-0dctM/apI3ysMIEVBaBXO9hZMWskpJpNpOws1gwiOYc=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src patches;
|
||||
@@ -138,7 +138,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
preConfigure = ''
|
||||
prependToVar cmakeFlags "-DLLAMA_BUILD_COMMIT:STRING=$(cat COMMIT)"
|
||||
pushd ${finalAttrs.npmRoot}
|
||||
npm run build
|
||||
LLAMA_BUILD_NUMBER=${finalAttrs.version} npm run build
|
||||
popd
|
||||
'';
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "malwoverview";
|
||||
version = "8.0.2";
|
||||
version = "8.0.4";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "alexandreborges";
|
||||
repo = "malwoverview";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dT1FnVm6J93mQHUfodVGgEFy7HAKFcHVicp4B9QKBrs=";
|
||||
hash = "sha256-zx4jW8EbEfbdhOqlFJjb/bO5NrHRRaCwT9LePdLz7x0=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nerdctl";
|
||||
version = "2.3.1";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "nerdctl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DsMLSHA+q8nsIpzOA84C3hCSGILansSx24l7z2unSj8=";
|
||||
hash = "sha256-p22gkg7fZSXNc5jFDtQQd0lLZ8kS1a+yGT70NfXpfS8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-x2u708zdmAHdrEaA/fretPuHKNbDVsiK6u/fZIa+Dhc=";
|
||||
vendorHash = "sha256-OSKKMIBs2ZBpE1D8HsdNHJxyNrwEYOMskIi7y/sVLh4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
+2729
-3153
File diff suppressed because it is too large
Load Diff
@@ -2,26 +2,25 @@
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "nezha-theme-admin";
|
||||
version = "2.0.4";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "admin-frontend";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oZFIkeHkuSLlu++FwzCUet7tmBe5zhCP5MGHhU528DA=";
|
||||
hash = "sha256-1MS+ZOTeK3tZMCDvh0MEkF4K04cOlA+uAsYwXmasdhY=";
|
||||
};
|
||||
|
||||
# TODO: Switch to the bun build function once available in nixpkgs
|
||||
# TODO: Remove after upstream fixes resolved missing.
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-2DkCVefxSfnlJkaEFZrjsWbwzddtqiNg1UUajRG5tLA=";
|
||||
npmDepsHash = "sha256-j7z4Zc2SnewnX3fXu8vqxSLx1S8Vz9+SivwpHuzNrIc=";
|
||||
npmPackFlags = [ "--ignore-scripts" ];
|
||||
npmBuildScript = "build-ignore-error";
|
||||
|
||||
@@ -34,7 +33,7 @@ buildNpmPackage (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; };
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Nezha monitoring admin frontend";
|
||||
|
||||
Executable
+25
@@ -0,0 +1,25 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p nix-update curl nodejs
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
version=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/nezhahq/admin-frontend/releases/latest | jq -r ".tag_name")
|
||||
version=${version#v}
|
||||
|
||||
if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
|
||||
echo "Already up to date!"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
TMPDIR=$(mktemp -d)
|
||||
trap 'rm -rf -- "${TMPDIR}"' EXIT
|
||||
|
||||
git clone "https://github.com/nezhahq/admin-frontend" -b "v$version" "$TMPDIR/src"
|
||||
pushd "$TMPDIR/src"
|
||||
rm package-lock.json
|
||||
npm install --package-lock-only --ignore-scripts
|
||||
popd
|
||||
|
||||
cp "$TMPDIR/src/package-lock.json" pkgs/by-name/ne/nezha-theme-admin/
|
||||
|
||||
nix-update "$UPDATE_NIX_ATTR_PATH"
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "nuclei-templates";
|
||||
version = "10.4.4";
|
||||
version = "10.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei-templates";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EDgFCMA6C1NPKd0ozIa2PBvn55DcODZFCYvO6YcvqSs=";
|
||||
hash = "sha256-6czf84bHyvHIT9rA2HUYqQe7lgODl4uRMP/8QepV3AU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
diff --git a/config/BuildSystem/config/packages/petsc4py.py b/config/BuildSystem/config/packages/petsc4py.py
|
||||
index 4a58243..831aa04 100644
|
||||
--- a/config/BuildSystem/config/packages/petsc4py.py
|
||||
+++ b/config/BuildSystem/config/packages/petsc4py.py
|
||||
@@ -37,7 +37,7 @@ class Configure(config.package.Package):
|
||||
|
||||
def Install(self):
|
||||
import os
|
||||
- installLibPath = os.path.join(self.installDir, 'lib')
|
||||
+ installLibPath = os.path.join(self.installDir, '@PYTHON_SITEPACKAGES@')
|
||||
if self.setCompilers.isDarwin(self.log):
|
||||
apple = 'You may need to\n (csh/tcsh) setenv MACOSX_DEPLOYMENT_TARGET 10.X\n (sh/bash) MACOSX_DEPLOYMENT_TARGET=10.X; export MACOSX_DEPLOYMENT_TARGET\nbefore running make on PETSc'
|
||||
else:
|
||||
@@ -70,7 +70,7 @@ class Configure(config.package.Package):
|
||||
newdir += 'NUMPY_INCLUDE="'+numpy_include+'" '
|
||||
|
||||
self.addDefine('HAVE_PETSC4PY',1)
|
||||
- self.addDefine('PETSC4PY_INSTALL_PATH','"'+os.path.join(self.installdir.dir,'lib')+'"')
|
||||
+ self.addDefine('PETSC4PY_INSTALL_PATH','"'+installLibPath+'"')
|
||||
self.addMakeMacro('PETSC4PY','yes')
|
||||
self.addMakeRule('petsc4pybuild','', \
|
||||
['@echo "*** Building petsc4py ***"',\
|
||||
@@ -3,7 +3,6 @@
|
||||
newScope,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
replaceVars,
|
||||
bash,
|
||||
pkg-config,
|
||||
gfortran,
|
||||
@@ -110,24 +109,24 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "petsc";
|
||||
version = "3.24.6";
|
||||
version = "3.25.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-PIW+dnIgnzQjpHqNBi4k730Bg7goO3G9zYVYoehvn7k=";
|
||||
hash = "sha256-Q+QrOdSZO9wqdQKKVfhJzKaB3U80WdlegYtdZW7ScCg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(replaceVars ./fix-petsc4py-install-prefix.patch {
|
||||
PYTHON_SITEPACKAGES = python3Packages.python.sitePackages;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./lib/petsc/bin
|
||||
|
||||
substituteInPlace config/example_template.py \
|
||||
--replace-fail "/usr/bin/env bash" "${bash}/bin/bash"
|
||||
|
||||
substituteInPlace config/BuildSystem/config/packages/petsc4py.py \
|
||||
--replace-fail "installLibPath = os.path.join(self.installDir, 'lib')" \
|
||||
"installLibPath = os.path.join(self.installDir, '${python3Packages.python.sitePackages}')" \
|
||||
--replace-fail "self.addDefine('PETSC4PY_INSTALL_PATH','\"'+os.path.join(self.installdir.dir,'lib')+'\"')" \
|
||||
"self.addDefine('PETSC4PY_INSTALL_PATH','\"'+installLibPath+'\"')"
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
@@ -232,11 +231,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# the library is installed and available.
|
||||
doInstallCheck = true;
|
||||
installCheckTarget = "check_install";
|
||||
|
||||
# The PETSC4PY=no flag disables the ex100 test,
|
||||
# which compiles C code to load Python modules for solving a math problem.
|
||||
# This test fails on the Darwin platform but is rarely a common use case for petsc4py.
|
||||
installCheckFlags = lib.optional stdenv.hostPlatform.isDarwin "PETSC4PY=no";
|
||||
# check_install is defined in PETSc's top-level makefile. Select it directly
|
||||
# instead of the default GNUmakefile wrapper, then check the installed prefix
|
||||
# by pointing PETSC_DIR at $out. PETSC_ARCH must be empty for prefix installs,
|
||||
# where lib/petsc/conf is not nested below an architecture-specific build dir.
|
||||
installCheckFlags = [
|
||||
"-f"
|
||||
"makefile"
|
||||
"PETSC_DIR=${placeholder "out"}"
|
||||
"PETSC_ARCH="
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
mpiCheckPhaseHook
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "slacky";
|
||||
version = "0.0.8";
|
||||
version = "0.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andirsun";
|
||||
repo = "Slacky";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PjFgvY6KNYiwDLnC3iccJuCGM7Sak/rJZ0EPe0CyUpE=";
|
||||
hash = "sha256-DnbB11hCWUa5RL30taFvOIG6EmKMaNSH6KnJc7XrrW4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-jkAhu17xgYH9LS+hYB5rUxbgKlwNVHKMgZh162ak5fE=";
|
||||
npmDepsHash = "sha256-GD7yni+AgpCaNCohHCa/I2fis1867mgGrdIuyEzi4wU=";
|
||||
|
||||
npmPackFlags = [
|
||||
"--ignore-scripts"
|
||||
|
||||
@@ -21,13 +21,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "slepc";
|
||||
version = "3.24.3";
|
||||
version = "3.25.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "slepc";
|
||||
repo = "slepc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eCCdADdhatarzordwPKpJPIQbFWYngMlJvMBoVcTOWk=";
|
||||
hash = "sha256-CLZ3l9H41MrXa4IEkiiGS7VSs3ASNk5/DnLMmJ7NY5U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "sub-store-frontend";
|
||||
version = "2.17.36";
|
||||
version = "2.26.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sub-store-org";
|
||||
repo = "Sub-Store-Front-End";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-tMmoq9y3NvuOoKhEN2/d0nrq2Y8+7VMYo6+OP/q67I8=";
|
||||
hash = "sha256-4AyxNC+wODu5ltvquZWvtGYi8P+p/+py2ZLQISW6nZQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -33,7 +33,7 @@ buildNpmPackage (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-L3uoUFks3QonOQl0kOHYwOM1deFiNSqe0chv5YFpH4o=";
|
||||
hash = "sha256-lj93WF3mqvgaD0qnZC+X4ubw8ohz8E5ICWYWbEITYnk=";
|
||||
};
|
||||
|
||||
npmConfigHook = pnpmConfigHook;
|
||||
|
||||
+17
-11
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
yasm,
|
||||
cpuinfo,
|
||||
libdovi,
|
||||
@@ -11,16 +12,19 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "svt-av1-psyex";
|
||||
version = "3.0.2-B";
|
||||
pname = "svt-av1-hdr";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BlueSwordM";
|
||||
repo = "svt-av1-psyex";
|
||||
owner = "juliobbv-p";
|
||||
repo = "svt-av1-hdr";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-klfrbow8UtpIPwIgt8tK7FP7Jp6In9nxfOZrdi1PsHo=";
|
||||
hash = "sha256-n66RPDTfBsPCR/4y8dpU3Au1WZHpkpln899e2+LKxto=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
cmakeBuildType = "Release";
|
||||
|
||||
cmakeFlags =
|
||||
@@ -38,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isx86_64 [
|
||||
yasm
|
||||
@@ -51,16 +56,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cpuinfo
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/BlueSwordM/svt-av1-psyex";
|
||||
homepage = "https://github.com/juliobbv-p/svt-av1-hdr";
|
||||
description = "Scalable Video Technology AV1 Encoder and Decoder";
|
||||
|
||||
longDescription = ''
|
||||
SVT-AV1-PSYEX is the Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)
|
||||
with perceptual enhancements for psychovisually optimal AV1 encoding.
|
||||
The goal is to create the best encoding implementation for perceptual quality with AV1.
|
||||
SVT-AV1-HDR is the Scalable Video Technology for AV1 (SVT-AV1 Encoder)
|
||||
with perceptual enhancements for psychovisually optimal SDR and HDR AV1 encoding.
|
||||
The goal is to create the best encoding implementation for perceptual quality with AV1,
|
||||
with additional optimizations for HDR encoding and content with film grain.
|
||||
'';
|
||||
|
||||
license = with lib.licenses; [
|
||||
@@ -69,8 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
johnrtitor
|
||||
ccicnce113424
|
||||
claraphyll
|
||||
];
|
||||
mainProgram = "SvtAv1EncApp";
|
||||
};
|
||||
@@ -0,0 +1,217 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
haskellPackages,
|
||||
supercollider-with-sc3-plugins,
|
||||
symlinkJoin,
|
||||
writeShellApplication,
|
||||
writeText,
|
||||
}:
|
||||
|
||||
let
|
||||
version = haskellPackages.tidal.version;
|
||||
|
||||
ghcWithTidal = haskellPackages.ghcWithPackages (haskellPackages': [
|
||||
haskellPackages'.tidal
|
||||
]);
|
||||
|
||||
tidalBoot = stdenvNoCC.mkDerivation {
|
||||
pname = "tidal-cycles-boot";
|
||||
inherit version;
|
||||
src = haskellPackages.tidal.src;
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 BootTidal.hs "$out/share/tidal-cycles/BootTidal.hs"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
mkQuark =
|
||||
{
|
||||
pname,
|
||||
version,
|
||||
quarkName,
|
||||
src,
|
||||
dependencies ? [ ],
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase =
|
||||
let
|
||||
linkDependencies = lib.concatMapStringsSep "\n" (dependency: ''
|
||||
ln -s ${dependency}/quark/* "$out/quark/"
|
||||
'') dependencies;
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/quark/${quarkName}"
|
||||
cp -R ./. "$out/quark/${quarkName}/"
|
||||
${linkDependencies}
|
||||
|
||||
printf '%s\n' \
|
||||
'Quarks.clear;' \
|
||||
"Quarks.install(\"$out\");" \
|
||||
'thisProcess.recompile();' \
|
||||
> "$out/install.scd"
|
||||
|
||||
printf '%s\n' \
|
||||
'includePaths:' \
|
||||
" - $out/quark" \
|
||||
'excludePaths:' \
|
||||
' []' \
|
||||
'postInlineWarnings: false' \
|
||||
'excludeDefaultPaths: false' \
|
||||
> "$out/sclang_conf.yaml"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
dirt-samples = mkQuark {
|
||||
pname = "dirt-samples";
|
||||
version = "unstable-2023-10-27";
|
||||
quarkName = "Dirt-Samples";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tidalcycles";
|
||||
repo = "dirt-samples";
|
||||
rev = "9a6dff8f9ec3cd55b287290cf04e01afa6b8f532";
|
||||
hash = "sha256-Mp8qBpsOvW9Zguv95Kv7EU6S3ICaF2aO02Wz6xGURtE=";
|
||||
};
|
||||
};
|
||||
|
||||
vowel = mkQuark {
|
||||
pname = "vowel";
|
||||
version = "unstable-2022-01-04";
|
||||
quarkName = "Vowel";
|
||||
src = fetchFromGitHub {
|
||||
owner = "supercollider-quarks";
|
||||
repo = "vowel";
|
||||
rev = "ab59caa870201ecf2604b3efdd2196e21a8b5446";
|
||||
hash = "sha256-zfF6cvAGDNYWYsE8dOIo38b+dIymd17Pexg0HiPFbxM=";
|
||||
};
|
||||
};
|
||||
|
||||
superdirt = mkQuark {
|
||||
pname = "superdirt";
|
||||
version = "unstable-2023-10-15";
|
||||
quarkName = "SuperDirt";
|
||||
src = fetchFromGitHub {
|
||||
owner = "musikinformatik";
|
||||
repo = "superdirt";
|
||||
rev = "c7f32998572984705d340e7c1b9ed9ad998a39b6";
|
||||
hash = "sha256-9qU9CHYAXbN1IE3xXDqGipuroifVaSVXj3c/cDfwM80=";
|
||||
};
|
||||
dependencies = [
|
||||
dirt-samples
|
||||
vowel
|
||||
];
|
||||
};
|
||||
|
||||
superdirtStartSc = writeText "superdirt-start.sc" "SuperDirt.start;";
|
||||
|
||||
tidalCycles = writeShellApplication {
|
||||
name = "tidal-cycles";
|
||||
runtimeInputs = [ ghcWithTidal ];
|
||||
text = ''
|
||||
exec ghci -ghci-script "${tidalBoot}/share/tidal-cycles/BootTidal.hs" "$@"
|
||||
'';
|
||||
};
|
||||
|
||||
sclangWithSuperDirt = writeShellApplication {
|
||||
name = "sclang-with-superdirt";
|
||||
runtimeInputs = [ supercollider-with-sc3-plugins ];
|
||||
text = ''
|
||||
exec sclang -l "${superdirt}/sclang_conf.yaml" "$@"
|
||||
'';
|
||||
};
|
||||
|
||||
superdirtStart = writeShellApplication {
|
||||
name = "superdirt-start";
|
||||
text = ''
|
||||
start_script="''${1:-${superdirtStartSc}}"
|
||||
|
||||
if [[ "$start_script" == "-h" || "$start_script" == "--help" ]]; then
|
||||
echo "Usage: superdirt-start [script]"
|
||||
echo
|
||||
echo "Start SuperDirt, optionally running a custom start script."
|
||||
echo
|
||||
echo "Options:"
|
||||
echo " -h --help Show this screen."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ ! -e "$start_script" ]]; then
|
||||
echo "The script \"$start_script\" does not exist, aborting." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
exec ${sclangWithSuperDirt}/bin/sclang-with-superdirt "$start_script"
|
||||
'';
|
||||
};
|
||||
|
||||
superdirtInstall = writeShellApplication {
|
||||
name = "superdirt-install";
|
||||
runtimeInputs = [ supercollider-with-sc3-plugins ];
|
||||
text = ''
|
||||
exec sclang "${superdirt}/install.scd"
|
||||
'';
|
||||
};
|
||||
in
|
||||
symlinkJoin {
|
||||
pname = "tidal-cycles-full";
|
||||
inherit version;
|
||||
|
||||
paths = [
|
||||
tidalCycles
|
||||
sclangWithSuperDirt
|
||||
superdirtStart
|
||||
superdirtInstall
|
||||
supercollider-with-sc3-plugins
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit
|
||||
dirt-samples
|
||||
ghcWithTidal
|
||||
superdirt
|
||||
superdirtStartSc
|
||||
tidalBoot
|
||||
vowel
|
||||
;
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "TidalCycles live-coding environment with SuperDirt";
|
||||
longDescription = ''
|
||||
This package provides the TidalCycles live-coding environment and
|
||||
SuperDirt setup helpers. It installs the `tidal-cycles`,
|
||||
`sclang-with-superdirt`, `superdirt-start`, and `superdirt-install`
|
||||
commands, and also makes the wrapped SuperCollider programs from
|
||||
`supercollider-with-sc3-plugins` available.
|
||||
'';
|
||||
homepage = "https://tidalcycles.org/";
|
||||
license = with lib.licenses; [
|
||||
gpl2Only
|
||||
gpl3Only
|
||||
gpl3Plus
|
||||
];
|
||||
mainProgram = "tidal-cycles";
|
||||
maintainers = with lib.maintainers; [ crertel ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"darwin": {
|
||||
"hash": "sha256-t+okGBJP+1/DTpQSGJLeTJp4aIE8dgfgWXZoAheD4j8=",
|
||||
"version": "0.2026.06.10.09.27.stable_01"
|
||||
"hash": "sha256-pIq5BHrSSBz/njrIlUFEmh0MlX6N7a8L5JiP3Vc//SI=",
|
||||
"version": "0.2026.06.17.09.49.stable_02"
|
||||
},
|
||||
"linux_x86_64": {
|
||||
"hash": "sha256-cL/usCvilNG4Hk8y0cy6Eg73s8FWhoFi5AtYQFa+Vl8=",
|
||||
"version": "0.2026.06.10.09.27.stable_01"
|
||||
"hash": "sha256-U8dX4kC5HHZpJNer3uleKV/JsC8rCQ+06aaSj3xG1dI=",
|
||||
"version": "0.2026.06.17.09.49.stable_02"
|
||||
},
|
||||
"linux_aarch64": {
|
||||
"hash": "sha256-YaiHMipeocIungev4SiitmobTr3NzFBv5kiY0rY2MNQ=",
|
||||
"version": "0.2026.06.10.09.27.stable_01"
|
||||
"hash": "sha256-qr3djDc9IRo1O6soaarWoxxPwAJUz71g1EuYGC8C3lg=",
|
||||
"version": "0.2026.06.17.09.49.stable_02"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "worktrunk";
|
||||
version = "0.58.0";
|
||||
version = "0.61.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "max-sixty";
|
||||
repo = "worktrunk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yjya7J35wXZoT2CCZhH2Qhgu6vjFzH3pHinMCiyMhe4=";
|
||||
hash = "sha256-jyj9e1E9wPxcMuWl3/nDrPTh68yNRuxMOEFmvjE3dRk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IrYjEjorYEnIhEPskAqqr9O4yf1GXJFh/TDhSWZiBZk=";
|
||||
cargoHash = "sha256-iKOLHyY28CXPAdPmjVocoubOVKPoBTqA/NJ522cC8+o=";
|
||||
|
||||
cargoBuildFlags = [ "--package=worktrunk" ];
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
# See ./redist.nix for documentation.
|
||||
inherit (import ./redist.nix { inherit _cuda lib; })
|
||||
_getJetsonMinSbsaCapability
|
||||
_redistSystemIsSupported
|
||||
getNixSystems
|
||||
getRedistSystem
|
||||
|
||||
@@ -108,13 +108,35 @@
|
||||
else
|
||||
[ ];
|
||||
|
||||
/**
|
||||
The lowest Jetson CUDA capability which uses the `linux-sbsa` redist (rather than `linux-aarch64`) for a given
|
||||
CUDA version. Jetson capabilities below this threshold use `linux-aarch64`.
|
||||
|
||||
The threshold depends on the CUDA version because NVIDIA moved Jetson onto the SBSA software stack incrementally:
|
||||
- CUDA 12 (JetPack 6): only Thor (10.1) is SBSA; Orin (8.7) is `linux-aarch64`.
|
||||
- CUDA 13 (JetPack 7.2): Orin (8.7) and Thor (11.0) are both SBSA.
|
||||
|
||||
# Type
|
||||
|
||||
```
|
||||
_getJetsonMinSbsaCapability :: (cudaMajorMinorVersion :: String) -> CudaCapability
|
||||
```
|
||||
|
||||
# Inputs
|
||||
|
||||
`cudaMajorMinorVersion`
|
||||
|
||||
: The major and minor version of CUDA (e.g. "12.6")
|
||||
*/
|
||||
_getJetsonMinSbsaCapability =
|
||||
cudaMajorMinorVersion: if lib.versionAtLeast cudaMajorMinorVersion "13.0" then "8.7" else "10.1";
|
||||
|
||||
/**
|
||||
Maps a Nix system to a NVIDIA redistributable system.
|
||||
|
||||
NOTE: Certain Nix systems can map to multiple NVIDIA redistributable systems. In particular, ARM systems can map to
|
||||
either `linux-sbsa` (for server-grade ARM chips) or `linux-aarch64` (for Jetson devices). Complicating matters
|
||||
further, as of CUDA 13.0, Jetson Thor devices use `linux-sbsa` instead of `linux-aarch64`. (It is unknown whether
|
||||
NVIDIA plans to make the Orin series use `linux-sbsa` as well for the CUDA 13.0 release.)
|
||||
further, as of CUDA 13.0, Jetson Thor and Orin devices use `linux-sbsa` instead of `linux-aarch64`.
|
||||
|
||||
NOTE: This function *will* be called by unsupported systems because `cudaPackages` is evaluated on all systems. As
|
||||
such, we need to handle unsupported systems gracefully.
|
||||
@@ -189,11 +211,13 @@
|
||||
if system == "x86_64-linux" then
|
||||
"linux-x86_64"
|
||||
else if system == "aarch64-linux" then
|
||||
# If all the Jetson devices are at least 10.1 (Thor, CUDA 12.9; CUDA 13.0 and later use 11.0 for Thor), then
|
||||
# we've got SBSA.
|
||||
# If all the Jetson devices are SBSA-compatible, then we've got SBSA.
|
||||
if
|
||||
let
|
||||
sbsaJetsonCapability = _cuda.lib._getJetsonMinSbsaCapability cudaMajorMinorVersion;
|
||||
in
|
||||
lib.all (
|
||||
cap: _cuda.db.cudaCapabilityToInfo.${cap}.isJetson -> lib.versionAtLeast cap "10.1"
|
||||
cap: _cuda.db.cudaCapabilityToInfo.${cap}.isJetson -> lib.versionAtLeast cap sbsaJetsonCapability
|
||||
) cudaCapabilities
|
||||
then
|
||||
"linux-sbsa"
|
||||
|
||||
@@ -24,6 +24,7 @@ let
|
||||
inherit (_cuda.lib)
|
||||
_cudaCapabilityIsDefault
|
||||
_cudaCapabilityIsSupported
|
||||
_getJetsonMinSbsaCapability
|
||||
_mkFailedAssertionsString
|
||||
getRedistSystem
|
||||
mkVersionedName
|
||||
@@ -121,11 +122,12 @@ let
|
||||
|
||||
assertions =
|
||||
let
|
||||
# Jetson devices (pre-Thor) cannot be targeted by the same binaries which target non-Jetson devices. While
|
||||
# Jetson devices (pre-Orin) cannot be targeted by the same binaries which target non-Jetson devices. While
|
||||
# NVIDIA provides both `linux-aarch64` and `linux-sbsa` packages, which both target `aarch64`,
|
||||
# they are built with different settings and cannot be mixed.
|
||||
preThorJetsonCudaCapabilities = filter (flip versionOlder "10.1") passthruExtra.requestedJetsonCudaCapabilities;
|
||||
postThorJetsonCudaCapabilities = filter (flip versionAtLeast "10.1") passthruExtra.requestedJetsonCudaCapabilities;
|
||||
sbsaJetsonCapability = _getJetsonMinSbsaCapability cudaMajorMinorVersion;
|
||||
preSbsaJetsonCudaCapabilities = filter (flip versionOlder sbsaJetsonCapability) passthruExtra.requestedJetsonCudaCapabilities;
|
||||
postSbsaJetsonCudaCapabilities = filter (flip versionAtLeast sbsaJetsonCapability) passthruExtra.requestedJetsonCudaCapabilities;
|
||||
|
||||
# Remove all known capabilities from the user's list to find unrecognized capabilities.
|
||||
unrecognizedCudaCapabilities = subtractLists allSortedCudaCapabilities passthruExtra.cudaCapabilities;
|
||||
@@ -166,25 +168,25 @@ let
|
||||
}
|
||||
{
|
||||
message =
|
||||
"Requested pre-Thor (10.1) Jetson CUDA capabilities (${toJSON preThorJetsonCudaCapabilities}) cannot be "
|
||||
+ "specified with other capabilities (${toJSON (subtractLists preThorJetsonCudaCapabilities passthruExtra.cudaCapabilities)})";
|
||||
"Requested pre-SBSA (${sbsaJetsonCapability}) Jetson CUDA capabilities (${toJSON preSbsaJetsonCudaCapabilities}) cannot be "
|
||||
+ "specified with other capabilities (${toJSON (subtractLists preSbsaJetsonCudaCapabilities passthruExtra.cudaCapabilities)})";
|
||||
assertion =
|
||||
# If there are preThorJetsonCudaCapabilities, they must be the only requested capabilities.
|
||||
preThorJetsonCudaCapabilities != [ ]
|
||||
-> preThorJetsonCudaCapabilities == passthruExtra.cudaCapabilities;
|
||||
preSbsaJetsonCudaCapabilities != [ ]
|
||||
-> preSbsaJetsonCudaCapabilities == passthruExtra.cudaCapabilities;
|
||||
}
|
||||
{
|
||||
message =
|
||||
"Requested pre-Thor (10.1) Jetson CUDA capabilities (${toJSON preThorJetsonCudaCapabilities}) require "
|
||||
"Requested pre-SBSA (${sbsaJetsonCapability}) Jetson CUDA capabilities (${toJSON preSbsaJetsonCudaCapabilities}) require "
|
||||
+ "computed NVIDIA hostRedistSystem (${passthruExtra.hostRedistSystem}) to be linux-aarch64";
|
||||
assertion =
|
||||
preThorJetsonCudaCapabilities != [ ] -> passthruExtra.hostRedistSystem == "linux-aarch64";
|
||||
preSbsaJetsonCudaCapabilities != [ ] -> passthruExtra.hostRedistSystem == "linux-aarch64";
|
||||
}
|
||||
{
|
||||
message =
|
||||
"Requested post-Thor (10.1) Jetson CUDA capabilities (${toJSON postThorJetsonCudaCapabilities}) require "
|
||||
"Requested post-SBSA (${sbsaJetsonCapability}) Jetson CUDA capabilities (${toJSON postSbsaJetsonCudaCapabilities}) require "
|
||||
+ "computed NVIDIA hostRedistSystem (${passthruExtra.hostRedistSystem}) to be linux-sbsa";
|
||||
assertion = postThorJetsonCudaCapabilities != [ ] -> passthruExtra.hostRedistSystem == "linux-sbsa";
|
||||
assertion = postSbsaJetsonCudaCapabilities != [ ] -> passthruExtra.hostRedistSystem == "linux-sbsa";
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "certipy-ad";
|
||||
version = "5.0.4";
|
||||
version = "5.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ly4k";
|
||||
repo = "Certipy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5STwBpX+8EsgRYMEirvqEhu4oMDs4hf4lDge1ShpKf4=";
|
||||
hash = "sha256-q9Gn3eBPKK8emm9upy3hJ1HaBdyTrMgek/hq+Xi2ZZg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "claude-agent-sdk";
|
||||
version = "0.2.107";
|
||||
version = "0.2.108";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anthropics";
|
||||
repo = "claude-agent-sdk-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+VlVdc2LoGNwawfbZT+gBdj9nEbOcsFJYStX+jmJfR0=";
|
||||
hash = "sha256-RL4YtNUoW6YFg/5eM8ZAlUNNDBuZLu01qNShN7Ddlxc=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fenics-basix";
|
||||
version = "0.10.0.post0";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fenics";
|
||||
repo = "basix";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iKG6Cs28D0scPEIRKoGk/CgquKzGZvIjf4UIj4MQXHA=";
|
||||
hash = "sha256-MBrK7O3iQ0XFONebbAFXBom9i985EyTAXrOlSMiIpk8=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fenics-ffcx";
|
||||
version = "0.10.1.post0";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fenics";
|
||||
repo = "ffcx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uV3sfK6tpdoVf+O/EYZw3yR1PdqkoXt4q66zwQ8h/Ks=";
|
||||
hash = "sha256-pAnoCLf1ObJ2jDOdQ0cr3qu3z+rNeAVFPnvegp/KqeM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fenics-ufl";
|
||||
version = "2025.2.1";
|
||||
version = "2026.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fenics";
|
||||
repo = "ufl";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7hibe/oVueK5YORhA81641b5UcE4MVyQvgVD0Fngje4=";
|
||||
hash = "sha256-FwU9QmkyYuUfxt4v8sHFv+YNHldx1g0e/TDezijTUb4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -2,37 +2,36 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchFromBitbucket,
|
||||
setuptools,
|
||||
numpy,
|
||||
scipy,
|
||||
sympy,
|
||||
recursivenodes,
|
||||
symengine,
|
||||
fenics-ufl,
|
||||
firedrake-ufl,
|
||||
pytestCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "firedrake-fiat";
|
||||
version = "2025.10.1";
|
||||
version = "2026.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firedrakeproject";
|
||||
repo = "fiat";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-x1/gf/QVez6GxPUafxdhxqyT0MkL6w2Qz6VAxRNufdc=";
|
||||
hash = "sha256-aO4iFDwt9l5+s+96kjxja92OWnJb64OBpYXu6oxk51c=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
let
|
||||
fiat-reference-data = fetchFromBitbucket {
|
||||
owner = "fenics-project";
|
||||
fiat-reference-data = fetchFromGitHub {
|
||||
owner = "firedrakeproject";
|
||||
repo = "fiat-reference-data";
|
||||
rev = "0c8c97f7e4919402129e5ff3b54e3f0b9e902b7c";
|
||||
hash = "sha256-vdCkmCkKvLSYACF6MnZ/WuKuCNAoC3uu1A/9m9KwBK8=";
|
||||
rev = "508bd755e024010f6fc691a36e51a8f4d7de7efe";
|
||||
hash = "sha256-Ylq5u3d54SnCiB3nLRkkQu7IkRVuMcUWPgIjn7SIQ0M=";
|
||||
};
|
||||
in
|
||||
''
|
||||
@@ -46,7 +45,7 @@ buildPythonPackage (finalAttrs: {
|
||||
scipy
|
||||
sympy
|
||||
recursivenodes
|
||||
fenics-ufl
|
||||
firedrake-ufl
|
||||
symengine
|
||||
];
|
||||
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
{
|
||||
fenics-ufl,
|
||||
}:
|
||||
|
||||
fenics-ufl.overrideAttrs (oldAttrs: rec {
|
||||
version = "2025.3.0";
|
||||
|
||||
src = oldAttrs.src.override {
|
||||
tag = version;
|
||||
hash = "sha256-BFeVwurTsFNirpjZlgaABzw/cLzWxXwbCHJQBHrLuOY=";
|
||||
};
|
||||
})
|
||||
@@ -15,7 +15,7 @@
|
||||
decorator,
|
||||
cachetools,
|
||||
mpi4py,
|
||||
fenics-ufl,
|
||||
firedrake-ufl,
|
||||
firedrake-fiat,
|
||||
h5py,
|
||||
libsupermesh,
|
||||
@@ -34,7 +34,6 @@
|
||||
scipy,
|
||||
sympy,
|
||||
islpy,
|
||||
vtk,
|
||||
matplotlib,
|
||||
immutabledict,
|
||||
|
||||
@@ -59,20 +58,20 @@ let
|
||||
in
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "firedrake";
|
||||
version = "2025.10.3";
|
||||
version = "2026.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firedrakeproject";
|
||||
repo = "firedrake";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9AkyVM0dpjdQqpuOBN60lCKIZJR0HXpp0g1Am/xUwbI=";
|
||||
hash = "sha256-scsxxs9k280R9+mM5CC7aIkKJ8rR1faexnUuMrDO9+k=";
|
||||
};
|
||||
|
||||
# relax build-dependency petsc4py
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml --replace-fail \
|
||||
"petsc4py==3.24.5" "petsc4py"
|
||||
"petsc4py==3.25.0" "petsc4py"
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -99,7 +98,7 @@ buildPythonPackage (finalAttrs: {
|
||||
decorator
|
||||
cachetools
|
||||
firedrakePackages.mpi4py
|
||||
fenics-ufl
|
||||
firedrake-ufl
|
||||
firedrake-fiat
|
||||
firedrakePackages.h5py
|
||||
immutabledict
|
||||
@@ -118,9 +117,6 @@ buildPythonPackage (finalAttrs: {
|
||||
rtree
|
||||
scipy
|
||||
sympy
|
||||
# vtk optional required by IO module, we can make it a hard dependency in nixpkgs,
|
||||
# see https://github.com/firedrakeproject/firedrake/pull/4713
|
||||
vtk
|
||||
# required by script spydump
|
||||
matplotlib
|
||||
]
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "petsctools";
|
||||
version = "2025.3";
|
||||
version = "2026.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firedrakeproject";
|
||||
repo = "petsctools";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5SV34KhympX58lWfFaQo5lVOeafcc/Y8HvYtZtY+4Eo=";
|
||||
hash = "sha256-IMDPjhyehOkyifSJ7nOJQbZu21w6Xyyz9fv/WLDpEgQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -43,6 +43,11 @@ buildPythonPackage (finalAttrs: {
|
||||
]
|
||||
++ finalAttrs.passthru.optional-dependencies.petsc4py;
|
||||
|
||||
disabledTests = [
|
||||
# Expects a double slash when PETSC_ARCH is empty.
|
||||
"test_get_petsc_dirs"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/firedrakeproject/petsctools";
|
||||
description = "Pythonic extensions for petsc4py and slepc4py";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyadjoint-ad";
|
||||
version = "2025.10.1";
|
||||
version = "2026.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolfin-adjoint";
|
||||
repo = "pyadjoint";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-UI1eRB9hy4lb/s18NjaAyjH3HvDwRbRzk0ZuWxf1Uuc=";
|
||||
hash = "sha256-ChtZQ5MJeQt1CqAsFHTCwbIJrcwBKlNxSF5zi6pHLsA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "resend";
|
||||
version = "2.30.1";
|
||||
version = "2.32.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "resend";
|
||||
repo = "resend-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-P9f5u7gOC7IqzlcmSIgxYX8+yn+57jifn2FP6zzHVRg=";
|
||||
hash = "sha256-wxro1Dgk7/ziPy2Z09teCyk99rxkDNODtlOugJDMUO0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
}:
|
||||
mkKdeDerivation rec {
|
||||
pname = "ktextaddons";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz";
|
||||
hash = "sha256-DX+CqXbvaC9FgisiHi8VzvwAOUiLyMcAprDnWUquveo=";
|
||||
hash = "sha256-QsdrZiDc6vqYuwKp4lrAWbSIGfmSO1VRfJ4IfYXUE64=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-eval-jobs";
|
||||
version = "2.34.1";
|
||||
version = "2.34.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
owner = "NixOS";
|
||||
repo = "nix-eval-jobs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OFGRoJOYhvZ3Enk5a8vMy0QNcG5ZxyzFhyHMrwKXde8=";
|
||||
hash = "sha256-YaVQAgBxWbUBFHXLBLzdUyVvuA/DDw80SEnn9iq0Veo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Hydra's builtin hydra-eval-jobs as a standalone";
|
||||
homepage = "https://github.com/nix-community/nix-eval-jobs";
|
||||
homepage = "https://github.com/NixOS/nix-eval-jobs";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
adisbladis
|
||||
|
||||
@@ -2133,6 +2133,7 @@ mapAliases {
|
||||
svnfs = throw "'svnfs' has been removed as it was unmaintained upstream"; # Added 2026-06-01
|
||||
svox = warnAlias "'svox' has been renamed to/replaced by 'picotts'" picotts; # Added 2026-03-04
|
||||
svt-av1-psy = warnAlias "'svt-av1-psy' has been replaced by 'svt-av1-psyex'" svt-av1-psyex; # Added 2026-01-10
|
||||
svt-av1-psyex = throw "'svt-av1-psyex' has been removed. Upstream suggests 'svt-av1-hdr' instead"; # Converted to throw 2026-06-23
|
||||
swagger-cli = throw "'swagger-cli' has been removed as it is broken and unmaintained. Upstream suggests using 'redocly' instead"; # Added 2026-04-23
|
||||
swig4 = throw "'swig4' has been renamed to/replaced by 'swig'"; # Converted to throw 2025-10-27
|
||||
swiProlog = throw "'swiProlog' has been renamed to/replaced by 'swi-prolog'"; # Converted to throw 2025-10-27
|
||||
|
||||
@@ -5662,6 +5662,8 @@ self: super: with self; {
|
||||
|
||||
firedrake-fiat = callPackage ../development/python-modules/firedrake-fiat { };
|
||||
|
||||
firedrake-ufl = callPackage ../development/python-modules/firedrake-ufl { };
|
||||
|
||||
fireflyalgorithm = callPackage ../development/python-modules/fireflyalgorithm { };
|
||||
|
||||
firetv = callPackage ../development/python-modules/firetv { };
|
||||
|
||||
Reference in New Issue
Block a user