Merge staging-next into staging
This commit is contained in:
@@ -300,11 +300,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"digitalocean_digitalocean": {
|
||||
"hash": "sha256-tfeSP2/3Eacvw5IfidiWqds1Z0DFwYRIj9maTGT4I8Y=",
|
||||
"hash": "sha256-gip5PGqFtu0d5JYX8Ki4QeFWPQA3eLuRWRriJQcJaog=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.69.0",
|
||||
"rev": "v2.70.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -462,11 +462,11 @@
|
||||
"vendorHash": "sha256-mzDFyk2oImRXt72kFV5Ln++ScgoecpJEJtzUKjvCaws="
|
||||
},
|
||||
"grafana_grafana": {
|
||||
"hash": "sha256-/ygaIYisQW6Vx33KxoKHeZKo8OkQL6jcjsTomVGUCr4=",
|
||||
"hash": "sha256-+LMaN6dmXSlFuu2jM/Ye1Pyut/TQ1zQ766y98hFQXHs=",
|
||||
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
|
||||
"owner": "grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v4.20.1",
|
||||
"rev": "v4.21.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Nf0aUnV0jLNnXAbWkRYwG/DIqQwZ9fFlwwmE/cDMbGQ="
|
||||
},
|
||||
|
||||
@@ -61,13 +61,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "audacity";
|
||||
version = "3.7.5";
|
||||
version = "3.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "audacity";
|
||||
repo = "audacity";
|
||||
rev = "Audacity-${finalAttrs.version}";
|
||||
hash = "sha256-gTky+wORQ6n3EepOUA8Y2zc8AocqjGP42N42G6FXRS8=";
|
||||
hash = "sha256-Y59bKs0l97HJWiCHYBkzbbHJsmraUkM2qRGfKSXjT80=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,26 +6,38 @@
|
||||
glib,
|
||||
glibc,
|
||||
libseccomp,
|
||||
systemd,
|
||||
systemdMinimal,
|
||||
nixosTests,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "conmon";
|
||||
version = "2.1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "conmon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XsVWcJsUc0Fkn7qGRJDG5xrQAsJr6KN7zMy3AtPuMTo=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/Kt49c8a+R/+Z3KmFLpRTG+BdfPDAOEUtSis3alLAUQ=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd $out
|
||||
git rev-parse HEAD > COMMIT
|
||||
rm -rf .git
|
||||
'';
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail "(GIT_COMMIT)" "(shell cat COMMIT)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
glib
|
||||
libseccomp
|
||||
systemd
|
||||
systemdMinimal
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isMusl) [
|
||||
glibc
|
||||
@@ -35,7 +47,6 @@ stdenv.mkDerivation rec {
|
||||
# manpage requires building the vendored go-md2man
|
||||
makeFlags = [
|
||||
"bin/conmon"
|
||||
"VERSION=${version}"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
@@ -49,13 +60,17 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru.tests = { inherit (nixosTests) cri-o podman; };
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/containers/conmon/releases/tag/${src.rev}";
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/containers/conmon/releases/tag/${finalAttrs.src.tag}";
|
||||
homepage = "https://github.com/containers/conmon";
|
||||
description = "OCI container runtime monitor";
|
||||
license = licenses.asl20;
|
||||
teams = [ teams.podman ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.asl20;
|
||||
teams = [ lib.teams.podman ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "conmon";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,10 +8,11 @@
|
||||
libcap,
|
||||
libseccomp,
|
||||
python3,
|
||||
systemd,
|
||||
systemdMinimal,
|
||||
yajl,
|
||||
nixosTests,
|
||||
criu,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -38,16 +39,22 @@ let
|
||||
];
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "crun";
|
||||
version = "1.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "crun";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-WBAwyDODMrUDlgonRbxaNQ+aN8K6YicY2JVArXDJem8=";
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd $out
|
||||
git rev-parse HEAD > COMMIT
|
||||
rm -rf .git
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -61,23 +68,25 @@ stdenv.mkDerivation rec {
|
||||
criu
|
||||
libcap
|
||||
libseccomp
|
||||
systemd
|
||||
systemdMinimal
|
||||
yajl
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
strictDeps = true;
|
||||
|
||||
NIX_LDFLAGS = "-lcriu";
|
||||
env = {
|
||||
NIX_LDFLAGS = "-lcriu";
|
||||
};
|
||||
|
||||
# we need this before autoreconfHook does its thing in order to initialize
|
||||
# config.h with the correct values
|
||||
postPatch = ''
|
||||
echo ${version} > .tarball-version
|
||||
echo '#define GIT_VERSION "${src.rev}"' > git-version.h
|
||||
echo ${finalAttrs.version} > .tarball-version
|
||||
echo "#define GIT_VERSION \"$(cat COMMIT)\"" > git-version.h
|
||||
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
e: "substituteInPlace Makefile.am --replace 'tests/${e}' ''"
|
||||
e: "substituteInPlace Makefile.am --replace-fail 'tests/${e}' ''"
|
||||
) disabledTests}
|
||||
'';
|
||||
|
||||
@@ -85,8 +94,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru.tests = { inherit (nixosTests) podman; };
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/containers/crun/releases/tag/${version}";
|
||||
changelog = "https://github.com/containers/crun/releases/tag/${finalAttrs.version}";
|
||||
description = "Fast and lightweight fully featured OCI runtime and C library for running containers";
|
||||
homepage = "https://github.com/containers/crun";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
@@ -94,4 +107,4 @@ stdenv.mkDerivation rec {
|
||||
teams = [ lib.teams.podman ];
|
||||
mainProgram = "crun";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "faugus-launcher";
|
||||
version = "1.10.4";
|
||||
version = "1.11.1";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Faugus";
|
||||
repo = "faugus-launcher";
|
||||
tag = version;
|
||||
hash = "sha256-FmbAlvjzUEjKDFEI1O9TJGpKl8/WJaCYUVT75+oG2vc=";
|
||||
hash = "sha256-FBsk7JfsXRTNFd6htMCNYFurvQtw42k8OIEj+vRyQqU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fna3d";
|
||||
version = "25.11";
|
||||
version = "25.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FNA-XNA";
|
||||
repo = "FNA3D";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-4+bJWmNagUtKJJHIHefQM7Tiu39+l4OE9q51c34DiEk=";
|
||||
hash = "sha256-nrCBW3UypXUYAt7Ccr3w64QikmN/Vg5TSlQ19/g+anM=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (final: {
|
||||
pname = "glaze";
|
||||
version = "6.0.1";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stephenberry";
|
||||
repo = "glaze";
|
||||
tag = "v${final.version}";
|
||||
hash = "sha256-eBgcIhmezfYYaqBrKh6elbTMIQCUXd3W9TAuS/RDXcA=";
|
||||
hash = "sha256-H1paMc0LH743aMHCO/Ocp96SaaoXLcl/MDmmbtSJG+Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "jsonschema-cli";
|
||||
version = "0.37.2";
|
||||
version = "0.37.4";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "jsonschema-cli";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-d/l43flElIooDs/daz7kNVumY7WophO3RwnxMsUGXzc=";
|
||||
hash = "sha256-qmxl4DzctXnDGeqZukMiurFoLt982ngDIo0Cum4kkcQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8fiAzUsYvWNjNhurvh6U2BXiQsBpTzsTo5DstK2MSB4=";
|
||||
cargoHash = "sha256-t2lRBVPk9bkvRsCxMNi30F3dkwr6angEGfD34UuH+EY=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libbytesize";
|
||||
version = "2.11";
|
||||
version = "2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storaged-project";
|
||||
repo = "libbytesize";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-scOnucn7xp6KKEtkpwfyrdzcntJF2l0h0fsQotcceLc=";
|
||||
hash = "sha256-MQADGFruQODQ8rxu1R8TF9zqd4jKLtyRQrWFds5UNS0=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
autoconf,
|
||||
automake,
|
||||
libtool,
|
||||
bash,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -18,12 +19,24 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-P3LaDMMNPyEnA8nO1Bm7H0mW/hVBr0cFdg+p2JmWcGI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"lib"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
];
|
||||
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "lunarclient";
|
||||
version = "3.5.9";
|
||||
version = "3.5.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
|
||||
hash = "sha512-Gl9bJ8Hn3aVn/oKxBNb7CjJHLQ6NjFH/x45euWjCYaTtxF3qOTzuEm2VrivpghiviZIUGPWHP7rOKH8OWzPjLQ==";
|
||||
hash = "sha512-YYsUyuJMYos8aiOCbQy7FlVRakfBXC63HiTbg3YBd8I+kR1zA38FWAkRZeAiA3WyUutmJLJxaDtwBzhq/QgQ7w==";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
strictDeps = true;
|
||||
|
||||
pname = "onnx";
|
||||
version = "1.19.1";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onnx";
|
||||
repo = "onnx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lIw65HAaNE+pOiHPpbOxzX+gk8ueJfuAHxs+DV99Jh0=";
|
||||
hash = "sha256-oWbrBx1jWznzeT2N+VrFH8LIqdzY/aXH5N0kb/vbg2M=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -50,44 +50,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
setuptools
|
||||
];
|
||||
|
||||
# NOTE: Most of these can be removed after bumping to 1.20.
|
||||
# See:
|
||||
# - https://github.com/onnx/onnx/issues/7472
|
||||
# - https://github.com/pytorch/pytorch/issues/167525
|
||||
# NOTE: Darwin requires a static build, so this patch is unnecessary on that platform.
|
||||
prePatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
nixLog "patching $PWD/CMakeLists.txt to allow tests to build with shared libraries"
|
||||
substituteInPlace "$PWD/CMakeLists.txt" \
|
||||
--replace-fail \
|
||||
'message(FATAL_ERROR "Tests requires static build")' \
|
||||
""
|
||||
|
||||
nixLog "patching $PWD/CMakeLists.txt to correctly link onnx_cpp2py_export with shared libraries"
|
||||
substituteInPlace "$PWD/CMakeLists.txt" \
|
||||
--replace-fail \
|
||||
'target_link_libraries(onnx_cpp2py_export PRIVATE $<LINK_LIBRARY:WHOLE_ARCHIVE,onnx>)' \
|
||||
'target_link_libraries(onnx_cpp2py_export PRIVATE $<BUILD_INTERFACE:onnx> $<BUILD_INTERFACE:onnx_proto>)'
|
||||
|
||||
nixLog "patching $PWD/CMakeLists.txt to fix symbol visibility"
|
||||
substituteInPlace "$PWD/CMakeLists.txt" \
|
||||
--replace-fail \
|
||||
'set_target_properties(onnx_proto PROPERTIES CXX_VISIBILITY_PRESET hidden)' \
|
||||
'# set_target_properties(onnx_proto PROPERTIES CXX_VISIBILITY_PRESET hidden)' \
|
||||
'set_target_properties(onnx_object PROPERTIES CXX_VISIBILITY_PRESET hidden)' \
|
||||
'# set_target_properties(onnx_object PROPERTIES CXX_VISIBILITY_PRESET hidden)' \
|
||||
--replace-fail \
|
||||
'set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1)' \
|
||||
'# set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1)' \
|
||||
--replace-fail \
|
||||
'set_target_properties(onnx PROPERTIES CXX_VISIBILITY_PRESET hidden)' \
|
||||
'# set_target_properties(onnx PROPERTIES CXX_VISIBILITY_PRESET hidden)' \
|
||||
--replace-fail \
|
||||
'set_target_properties(onnx PROPERTIES VISIBILITY_INLINES_HIDDEN ON)' \
|
||||
'# set_target_properties(onnx PROPERTIES VISIBILITY_INLINES_HIDDEN ON)'
|
||||
|
||||
nixLog "patching $PWD/cmake/ONNXConfig.cmake.in to fix CMake discovery"
|
||||
substituteInPlace "$PWD/cmake/ONNXConfig.cmake.in" \
|
||||
--replace-fail \
|
||||
'if((NOT @@ONNX_USE_PROTOBUF_SHARED_LIBS@@) AND @@Build_Protobuf@@)' \
|
||||
'if(NOT @ONNX_USE_PROTOBUF_SHARED_LIBS@)'
|
||||
'set_target_properties(onnx_object PROPERTIES VISIBILITY_INLINES_HIDDEN ON)' \
|
||||
'# set_target_properties(onnx_object PROPERTIES VISIBILITY_INLINES_HIDDEN ON)'
|
||||
'';
|
||||
|
||||
# NOTE: python3Packages.protobuf does not propagate a dependency on protobuf's dev output, so we must bring it in
|
||||
@@ -112,6 +84,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ONNX_ML = "0";
|
||||
ONNX_NAMESPACE = "onnx";
|
||||
ONNX_USE_PROTOBUF_SHARED_LIBS = "1";
|
||||
|
||||
nanobind_DIR = "${python3Packages.nanobind}/${python.sitePackages}/nanobind/cmake";
|
||||
};
|
||||
|
||||
cmakeFlags = mapAttrsToList cmakeFeature finalAttrs.env;
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "opencode";
|
||||
version = "1.0.126";
|
||||
version = "1.0.133";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sst";
|
||||
repo = "opencode";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-eW/+MoGh5V1t+4m+EDAm7dhTwJ+yqYmbLkZ9blYeXqQ=";
|
||||
hash = "sha256-aWzNnu7ZZovgIYQ59ErC/fKpenoFq/wcoizeQ5Ilnq8=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
@@ -70,7 +70,7 @@ let
|
||||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-/AP7wVUGO/LlYaQPglYIZ3/w0WKuO25PZNWEV7lKjGM=";
|
||||
outputHash = "sha256-sZNJOkMDw2/rO95oVKrMKfV86Of8qFzb6elFLppSRsI=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
libapparmor,
|
||||
libseccomp,
|
||||
libselinux,
|
||||
systemd,
|
||||
systemdMinimal,
|
||||
go-md2man,
|
||||
nixosTests,
|
||||
python3,
|
||||
@@ -83,7 +83,7 @@ buildGoModule (finalAttrs: {
|
||||
libseccomp
|
||||
libselinux
|
||||
lvm2
|
||||
systemd
|
||||
systemdMinimal
|
||||
];
|
||||
|
||||
env = {
|
||||
@@ -134,7 +134,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped)
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ systemdMinimal ]}":$RPATH $out/bin/.podman-wrapped
|
||||
substituteInPlace "$out/share/systemd/user/podman-user-wait-network-online.service" \
|
||||
--replace-fail sleep '${coreutils}/bin/sleep' \
|
||||
--replace-fail /bin/sh '${runtimeShell}'
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "prisma-language-server";
|
||||
version = "6.19.0";
|
||||
version = "31.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "language-tools";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-v+gCxUuwrLdl2rlvB2HGZvXZEdSxmdUrY1YE58iBKRQ=";
|
||||
hash = "sha256-hcLjvIi7EZQSr99OLHGWesziBc5HhkvD+dmGOTgOY/c=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/packages/language-server";
|
||||
npmDepsHash = "sha256-4NQO48a2f4k6CSWmIc/7UavNPNkAVIg0OyYArt/+vxI=";
|
||||
npmDepsHash = "sha256-lt/xIm7brU9itYhVdmmts5WpcZtQbWYcxXaRYKYp9H0=";
|
||||
|
||||
meta = {
|
||||
description = "Language server for Prisma";
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "9.14.0";
|
||||
version = "9.14.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = "snakemake";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XkPzv6W/SsF92V8hvs7+SQ+o7QeP9Sne3pvZyy8YBlA=";
|
||||
hash = "sha256-yRnoo6vaq2Gw+/WJ3Jjk4AMnj0OPylgPI2lezCzK/B4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -38,7 +38,7 @@ in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = if tde2eOnly then "tde2e" else "tdlib";
|
||||
version = "1.8.57";
|
||||
version = "1.8.58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdlib";
|
||||
@@ -47,8 +47,8 @@ stdenv.mkDerivation {
|
||||
# The tdlib authors do not set tags for minor versions, but
|
||||
# external programs depending on tdlib constrain the minor
|
||||
# version, hence we set a specific commit with a known version.
|
||||
rev = "6f4ee8703898f7829c442c74c5170beada171962";
|
||||
hash = "sha256-G0wy//IkI/hVDeMRdZey1sagShu0bEM9/m9z/t1K/Co=";
|
||||
rev = "282f96ca66421c348ed75aaca84471b3e39e64dd";
|
||||
hash = "sha256-Qry/jL/7pyPribh1Nn6L5hx5BfNNn+EG0YeOs5Z0M9Q=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfhummus";
|
||||
version = "4.8.0";
|
||||
version = "4.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "galkahana";
|
||||
repo = "PDF-Writer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VfuA1Xg0kudHfP/Hi1JvQfzVDuBumAkLr+SirPqSBTs=";
|
||||
hash = "sha256-uTy7XUUCje57pcwACNeeEMwdLCjsMMV5nSOmg9JpeRc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,27 +1,26 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
buildDunePackage,
|
||||
menhir,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "opam-file-format";
|
||||
version = "2.1.6";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Ka9pMYB99kM+5X7wf9F13gUrjouZucGevvkSY0TaXGg=";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml/opam-file-format/releases/download/${finalAttrs.version}/opam-file-format-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-SrU1Cw3L1EwFmrDFnYE2jzSvdwccDmXYHGpbm/ql6Ck=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
nativeBuildInputs = [ menhir ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Parser and printer for the opam file syntax";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ vbgl ];
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = with lib.maintainers; [ vbgl ];
|
||||
homepage = "https://github.com/ocaml/opam-file-format/";
|
||||
changelog = "https://github.com/ocaml/opam-file-format/raw/${version}/CHANGES";
|
||||
changelog = "https://github.com/ocaml/opam-file-format/raw/${finalAttrs.version}/CHANGES";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "onnxslim";
|
||||
version = "0.1.70";
|
||||
version = "0.1.78";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inisis";
|
||||
repo = "OnnxSlim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xShmJR0GWuGmuM0LZ0nBLDoC0m7c0iSWolUGUscVotA=";
|
||||
hash = "sha256-xLT00z9zeO4o5JN9W+5AfpANjc2+qAtFNnncLJptCoA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -4,15 +4,19 @@
|
||||
"adaptivecpp",
|
||||
"adios2",
|
||||
"adoptopenjdk-icedtea-web",
|
||||
"aider-chat",
|
||||
"aider-chat-full",
|
||||
"aider-chat-with-bedrock",
|
||||
"aider-chat-with-browser",
|
||||
"aider-chat-with-help",
|
||||
"aider-chat-with-playwright",
|
||||
"aitrack",
|
||||
"alpaca",
|
||||
"ants",
|
||||
"appcsxcad",
|
||||
"arpack-mpi",
|
||||
"audiobookshelf",
|
||||
"backgroundremover",
|
||||
"beets",
|
||||
"btop",
|
||||
"btop-cuda",
|
||||
"c3d",
|
||||
@@ -36,11 +40,15 @@
|
||||
"elmerfem",
|
||||
"elpa",
|
||||
"envision",
|
||||
"escrotum",
|
||||
"exhibit",
|
||||
"exo",
|
||||
"ezminc",
|
||||
"f3d",
|
||||
"ffcast",
|
||||
"ffmpeg-full",
|
||||
"ffmpeg_8-full",
|
||||
"ffsubsync",
|
||||
"fftwMpi",
|
||||
"firefox",
|
||||
"firefox-beta",
|
||||
@@ -55,9 +63,11 @@
|
||||
"galene-stt",
|
||||
"gdcm",
|
||||
"getdp",
|
||||
"git-sim",
|
||||
"globalarrays",
|
||||
"gromacsDoubleMpi",
|
||||
"gromacsMpi",
|
||||
"gruut",
|
||||
"hashcat",
|
||||
"haskellPackages.mpi-hs",
|
||||
"haskellPackages.mpi-hs-binary",
|
||||
@@ -65,6 +75,7 @@
|
||||
"haskellPackages.mpi-hs-store",
|
||||
"hdf5-fortran-mpi",
|
||||
"hdf5-mpi",
|
||||
"hieroglyphic",
|
||||
"highfive-mpi",
|
||||
"home-assistant-component-tests.tami4",
|
||||
"hp2p",
|
||||
@@ -73,6 +84,7 @@
|
||||
"hypre",
|
||||
"hyprpanel",
|
||||
"ieda",
|
||||
"imagination",
|
||||
"immich-machine-learning",
|
||||
"ior",
|
||||
"itk",
|
||||
@@ -81,6 +93,8 @@
|
||||
"kagen",
|
||||
"kahip",
|
||||
"kaminpar",
|
||||
"kdePackages.kdenlive",
|
||||
"kikoplay",
|
||||
"lacus",
|
||||
"lammps-mpi",
|
||||
"libcircle",
|
||||
@@ -97,6 +111,10 @@
|
||||
"maa-assistant-arknights",
|
||||
"maa-cli",
|
||||
"magika",
|
||||
"magika-cli",
|
||||
"manim",
|
||||
"manim-slides",
|
||||
"midivisualizer",
|
||||
"migrate",
|
||||
"minari",
|
||||
"mirtk",
|
||||
@@ -105,6 +123,7 @@
|
||||
"monado",
|
||||
"mpi",
|
||||
"mpifileutils",
|
||||
"mpvScripts.autosubsync-mpv",
|
||||
"mrtrix",
|
||||
"mumps-mpi",
|
||||
"nest-mpi",
|
||||
@@ -125,6 +144,7 @@
|
||||
"opensplat",
|
||||
"opentrack",
|
||||
"otb",
|
||||
"owncast",
|
||||
"owocr",
|
||||
"p4est",
|
||||
"p4est-dbg",
|
||||
@@ -134,17 +154,19 @@
|
||||
"parmmg",
|
||||
"pcl",
|
||||
"pdi",
|
||||
"peek",
|
||||
"petsc",
|
||||
"pfft",
|
||||
"pianotrans",
|
||||
"piper-phonemize",
|
||||
"piper-tts",
|
||||
"pitivi",
|
||||
"pnetcdf",
|
||||
"pnfft",
|
||||
"precice",
|
||||
"printrun",
|
||||
"python3Packages.accelerate",
|
||||
"python3Packages.adios2",
|
||||
"python3Packages.aigpy",
|
||||
"python3Packages.albumentations",
|
||||
"python3Packages.ale-py",
|
||||
"python3Packages.anndata",
|
||||
@@ -155,12 +177,10 @@
|
||||
"python3Packages.array-api-compat",
|
||||
"python3Packages.asteroid-filterbanks",
|
||||
"python3Packages.attacut",
|
||||
"python3Packages.auditok",
|
||||
"python3Packages.augmax",
|
||||
"python3Packages.ax-platform",
|
||||
"python3Packages.baselines",
|
||||
"python3Packages.beetcamp",
|
||||
"python3Packages.beets",
|
||||
"python3Packages.beets-audible",
|
||||
"python3Packages.bitsandbytes",
|
||||
"python3Packages.blackjax",
|
||||
"python3Packages.blosc2",
|
||||
@@ -173,6 +193,7 @@
|
||||
"python3Packages.cleanvision",
|
||||
"python3Packages.clip",
|
||||
"python3Packages.clip-anytorch",
|
||||
"python3Packages.clu",
|
||||
"python3Packages.cnvkit",
|
||||
"python3Packages.colbert-ai",
|
||||
"python3Packages.compressai",
|
||||
@@ -224,6 +245,7 @@
|
||||
"python3Packages.funsor",
|
||||
"python3Packages.fvcore",
|
||||
"python3Packages.gdcm",
|
||||
"python3Packages.gdsfactory",
|
||||
"python3Packages.geotorch",
|
||||
"python3Packages.gliner",
|
||||
"python3Packages.gluonts",
|
||||
@@ -235,6 +257,7 @@
|
||||
"python3Packages.gradio-client",
|
||||
"python3Packages.gradio-pdf",
|
||||
"python3Packages.graphtage",
|
||||
"python3Packages.gruut",
|
||||
"python3Packages.gstools",
|
||||
"python3Packages.guidance",
|
||||
"python3Packages.gymnasium",
|
||||
@@ -254,6 +277,7 @@
|
||||
"python3Packages.k-diffusion",
|
||||
"python3Packages.kahip",
|
||||
"python3Packages.keras",
|
||||
"python3Packages.kokoro",
|
||||
"python3Packages.kornia",
|
||||
"python3Packages.kornia-rs",
|
||||
"python3Packages.kserve",
|
||||
@@ -264,7 +288,6 @@
|
||||
"python3Packages.layoutparser",
|
||||
"python3Packages.lerobot",
|
||||
"python3Packages.libretranslate",
|
||||
"python3Packages.librosa",
|
||||
"python3Packages.libsupermesh",
|
||||
"python3Packages.lightning",
|
||||
"python3Packages.linear-operator",
|
||||
@@ -309,6 +332,7 @@
|
||||
"python3Packages.magika",
|
||||
"python3Packages.manga-ocr",
|
||||
"python3Packages.manifest-ml",
|
||||
"python3Packages.manimgl",
|
||||
"python3Packages.markitdown",
|
||||
"python3Packages.mayavi",
|
||||
"python3Packages.mdtraj",
|
||||
@@ -324,6 +348,7 @@
|
||||
"python3Packages.mmcv",
|
||||
"python3Packages.mmengine",
|
||||
"python3Packages.mne",
|
||||
"python3Packages.moderngl-window",
|
||||
"python3Packages.monai",
|
||||
"python3Packages.monotonic-alignment-search",
|
||||
"python3Packages.monty",
|
||||
@@ -365,6 +390,8 @@
|
||||
"python3Packages.pyannote-audio",
|
||||
"python3Packages.pyannote-pipeline",
|
||||
"python3Packages.pydmd",
|
||||
"python3Packages.pydub",
|
||||
"python3Packages.pyglet",
|
||||
"python3Packages.pykrige",
|
||||
"python3Packages.pylance",
|
||||
"python3Packages.pymanopt",
|
||||
@@ -374,11 +401,13 @@
|
||||
"python3Packages.pypasser",
|
||||
"python3Packages.pyprecice",
|
||||
"python3Packages.pyradiomics",
|
||||
"python3Packages.pyrender",
|
||||
"python3Packages.pyro-ppl",
|
||||
"python3Packages.pyseries",
|
||||
"python3Packages.pysilero-vad",
|
||||
"python3Packages.python-csxcad",
|
||||
"python3Packages.python-openems",
|
||||
"python3Packages.pytmx",
|
||||
"python3Packages.pytorch-bench",
|
||||
"python3Packages.pytorch-lightning",
|
||||
"python3Packages.pytorch-memlab",
|
||||
@@ -386,6 +415,7 @@
|
||||
"python3Packages.pytorch-msssim",
|
||||
"python3Packages.pytorch-pfn-extras",
|
||||
"python3Packages.pytorch-tabnet",
|
||||
"python3Packages.pytorch-tokenizers",
|
||||
"python3Packages.pytorch3d",
|
||||
"python3Packages.pytorchviz",
|
||||
"python3Packages.pyvista",
|
||||
@@ -395,7 +425,6 @@
|
||||
"python3Packages.rapidocr-onnxruntime",
|
||||
"python3Packages.rembg",
|
||||
"python3Packages.rerun-sdk",
|
||||
"python3Packages.resampy",
|
||||
"python3Packages.resize-right",
|
||||
"python3Packages.retinaface",
|
||||
"python3Packages.rlcard",
|
||||
@@ -456,6 +485,7 @@
|
||||
"python3Packages.torchbench",
|
||||
"python3Packages.torchcodec",
|
||||
"python3Packages.torchcrepe",
|
||||
"python3Packages.torchdata",
|
||||
"python3Packages.torchdiffeq",
|
||||
"python3Packages.torchinfo",
|
||||
"python3Packages.torchio",
|
||||
@@ -467,7 +497,7 @@
|
||||
"python3Packages.torchsnapshot",
|
||||
"python3Packages.torchsummary",
|
||||
"python3Packages.torchtnt",
|
||||
"python3Packages.torchtnt-nightly",
|
||||
"python3Packages.torchtune",
|
||||
"python3Packages.torchvision",
|
||||
"python3Packages.trainer",
|
||||
"python3Packages.transformers",
|
||||
@@ -483,6 +513,7 @@
|
||||
"python3Packages.unsloth-zoo",
|
||||
"python3Packages.unstructured-inference",
|
||||
"python3Packages.vllm",
|
||||
"python3Packages.vmas",
|
||||
"python3Packages.vtk",
|
||||
"python3Packages.wandb",
|
||||
"python3Packages.waymax",
|
||||
@@ -499,9 +530,12 @@
|
||||
"raxml-mpi",
|
||||
"rclip",
|
||||
"rembg",
|
||||
"restream",
|
||||
"rlama",
|
||||
"rofi-screenshot",
|
||||
"rtabmap",
|
||||
"scalapack",
|
||||
"scalapack-ilp64",
|
||||
"scipopt-ug",
|
||||
"seagoat",
|
||||
"siesta",
|
||||
@@ -512,7 +546,6 @@
|
||||
"slepc",
|
||||
"spfft",
|
||||
"spla",
|
||||
"supergee",
|
||||
"superlu_dist",
|
||||
"tabby",
|
||||
"tests.pkg-config.defaultPkgConfigPackages.ompi",
|
||||
@@ -530,8 +563,10 @@
|
||||
"thunderbird-unwrapped",
|
||||
"thunderbirdPackages.thunderbird",
|
||||
"thunderbirdPackages.thunderbird-latest",
|
||||
"tidal-dl",
|
||||
"tmpi",
|
||||
"tocpdf",
|
||||
"tone",
|
||||
"trilinos-mpi",
|
||||
"tt-metal",
|
||||
"tts",
|
||||
@@ -540,9 +575,11 @@
|
||||
"unbook",
|
||||
"unstructured-api",
|
||||
"vectorcode",
|
||||
"vimPlugins.aider-nvim",
|
||||
"vimPlugins.vectorcode-nvim",
|
||||
"viskores",
|
||||
"vllm",
|
||||
"vokoscreen",
|
||||
"vtk",
|
||||
"vtk-dicom",
|
||||
"vtk-full",
|
||||
@@ -555,6 +592,7 @@
|
||||
"wifite2",
|
||||
"witnessme",
|
||||
"wivrn",
|
||||
"wlr-layout-ui",
|
||||
"wyoming-faster-whisper",
|
||||
"wyoming-piper",
|
||||
"xyce-parallel"
|
||||
|
||||
@@ -46,14 +46,14 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension))
|
||||
};
|
||||
|
||||
zls_0_15 = finalAttrs: {
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigtools";
|
||||
repo = "zls";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-GFzSHUljcxy7sM1PaabbkQUdUnLwpherekPWJFxXtnk=";
|
||||
hash = "sha256-6IkRtQkn+qUHDz00QvCV/rb2yuF6xWEXug41CD8LLw8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zig_0_15.hook ];
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
# generated by zon2nix (https://github.com/nix-community/zon2nix)
|
||||
# manually removed tracy as instructed here: https://github.com/zigtools/zls/blob/ce6c8f02c78e622421cfc2405c67c5222819ec03/build.zig.zon#L9-L13
|
||||
|
||||
{ linkFarm, fetchzip }:
|
||||
|
||||
|
||||
@@ -11,19 +11,27 @@
|
||||
libseccomp,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
fetchpatch,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "scx_rustscheds";
|
||||
version = "1.0.18";
|
||||
version = "1.0.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sched-ext";
|
||||
repo = "scx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RkTY7gDcKbkNUKl7NJDX3Ac/I+dRG1Gj8rRHynbbxUU=";
|
||||
hash = "sha256-bOldw2Sob5aANmVzw6VwCgJ4+VzEsohKUxOxntow7VY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tuZhqDT1xMP+Pufwz6SBt44qNzHuGzcU9QmVNIg2zS0=";
|
||||
cargoHash = "sha256-ik05X+5jIdxtXYhN6fb1URW8TKKzgFuevi5+Wm2j15Y=";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/sched-ext/scx/pull/3127.patch";
|
||||
hash = "sha256-HpGJR3eBZKE+VsqGivjJp1n7JIORhZUxG87AsP1WWi0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -59,6 +67,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"--skip=cpumask"
|
||||
"--skip=topology"
|
||||
"--skip=proc_data::tests::test_thread_operations"
|
||||
"--skip=json::tests::test_with_resources"
|
||||
"--skip=json::tests::test_with_dir"
|
||||
];
|
||||
|
||||
passthru.tests.basic = nixosTests.scx;
|
||||
|
||||
Reference in New Issue
Block a user