mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 13:00:23 +00:00
Merge master into staging-nixos
This commit is contained in:
@@ -12380,6 +12380,20 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
notmuch-nvim = buildVimPlugin {
|
||||
pname = "notmuch.nvim";
|
||||
version = "0.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yousefakbar";
|
||||
repo = "notmuch.nvim";
|
||||
tag = "v0.4.0";
|
||||
hash = "sha256-A+vlH8fUNd3/lTH++sp90YXRqe3/uTxOTNw43CJQQyc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/yousefakbar/notmuch.nvim/";
|
||||
meta.license = unfree;
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nterm-nvim = buildVimPlugin {
|
||||
pname = "nterm.nvim";
|
||||
version = "0-unstable-2022-05-10";
|
||||
@@ -19778,6 +19792,20 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
vim-be-better = buildVimPlugin {
|
||||
pname = "vim-be-better";
|
||||
version = "0-unstable-2025-06-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "szymonwilczek";
|
||||
repo = "vim-be-better";
|
||||
rev = "60e0214598d9d0bac8253e8b53a72eace4af92d3";
|
||||
hash = "sha256-bbIhh5A1135UVMdQxUVMEHlqf1tCSbDP8QYQGg/OMa0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/szymonwilczek/vim-be-better/";
|
||||
meta.license = unfree;
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
vim-be-good = buildVimPlugin {
|
||||
pname = "vim-be-good";
|
||||
version = "0-unstable-2024-12-05";
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
yarnConfigHook,
|
||||
python3,
|
||||
# Misc dependencies
|
||||
notmuch,
|
||||
file,
|
||||
charm-freeze,
|
||||
code-minimap,
|
||||
dailies,
|
||||
@@ -3162,6 +3164,32 @@ assertNoAdditions {
|
||||
};
|
||||
});
|
||||
|
||||
notmuch-nvim = super.notmuch-nvim.overrideAttrs {
|
||||
checkInputs = [
|
||||
notmuch
|
||||
];
|
||||
|
||||
# NOTE: for best user experience, consider installing optional handlers to display attachements within neovim. For instance: [ w3m catimg mupdf-headless pandoc zip ]
|
||||
# See https://github.com/yousefakbar/notmuch.nvim/blob/v0.4.0/lua/notmuch/handlers.lua for supported handlers.
|
||||
runtimeDeps = [
|
||||
file
|
||||
notmuch
|
||||
];
|
||||
|
||||
postPatch =
|
||||
let
|
||||
ext = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
notmuchLib = "${lib.getLib notmuch}/lib/libnotmuch${ext}";
|
||||
in
|
||||
# bash
|
||||
''
|
||||
substituteInPlace lua/notmuch/cnotmuch.lua \
|
||||
--replace-fail 'ffi.load("notmuch")' 'ffi.load("${notmuchLib}")'
|
||||
'';
|
||||
|
||||
meta.license = lib.licenses.mit;
|
||||
};
|
||||
|
||||
NrrwRgn = super.NrrwRgn.overrideAttrs (old: {
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.vim;
|
||||
|
||||
@@ -882,6 +882,7 @@ https://github.com/nordtheme/vim/,,nord-vim
|
||||
https://github.com/shaunsingh/nord.nvim/,,
|
||||
https://github.com/alexvzyl/nordic.nvim/,,
|
||||
https://github.com/vigoux/notifier.nvim/,,
|
||||
https://github.com/yousefakbar/notmuch.nvim/,,
|
||||
https://github.com/jlesquembre/nterm.nvim/,,
|
||||
https://github.com/nacro90/numb.nvim/,,
|
||||
https://github.com/nvchad/nvchad/,,
|
||||
@@ -1410,6 +1411,7 @@ https://github.com/jenterkin/vim-autosource/,,
|
||||
https://github.com/gioele/vim-autoswap/,,
|
||||
https://github.com/bazelbuild/vim-bazel/,,
|
||||
https://github.com/moll/vim-bbye/,,
|
||||
https://github.com/szymonwilczek/vim-be-better/,,
|
||||
https://github.com/ThePrimeagen/vim-be-good/,,
|
||||
https://github.com/nathangrigg/vim-beancount/,,
|
||||
https://github.com/sheoak/vim-bepoptimist/,,
|
||||
|
||||
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
name = "tinymist";
|
||||
publisher = "myriad-dreamin";
|
||||
inherit (tinymist) version;
|
||||
hash = "sha256-FLWUeRPoqzHjwBrf0OOejaAVY+KBOpNBb9OJMdfLr04=";
|
||||
hash = "sha256-P0WAqrTf8adCtQ8SOjY7bkfGJo5VBXqazt0WhW8prcw=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "quarto";
|
||||
publisher = "quarto";
|
||||
version = "1.135.0";
|
||||
hash = "sha256-KxdiW/WFQN7nCZhhB7wntChcv+VV3E8d5FfArCt+0KQ=";
|
||||
version = "1.137.0";
|
||||
hash = "sha256-huXW4duf8MbilHPlYMyMPxMd+s0Gv9BejE20PxcYsjo=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/quarto.quarto/changelog";
|
||||
|
||||
@@ -23,11 +23,11 @@ stdenvNoCC.mkDerivation (
|
||||
sources = {
|
||||
aarch64-darwin = {
|
||||
name = "Aptakube_${finalAttrs.version}_universal.dmg";
|
||||
hash = "sha256-SgkLQ4dHEja58EDTHs6qi7CGw6mT3tKPNQxS2LKDHn0=";
|
||||
hash = "sha256-HMLxQnZsXRUjR/O0OEVfvKVTZyy9X9/3OZ6j1yWyIKA=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
name = "aptakube_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-I0QkI/utkEck3WiDt9NtN5zwqfPX2GJCx4PUzLnCE58=";
|
||||
hash = "sha256-IFLft9ee9jxTq4xzvFVX45u2x5QCLxAtKfLgbIOMsF8=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (
|
||||
in
|
||||
{
|
||||
pname = "aptakube";
|
||||
version = "1.19.3";
|
||||
version = "1.19.6";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "beads";
|
||||
version = "1.0.3";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gastownhall";
|
||||
repo = "beads";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-K3X67XgUl55mZS4r4V/KTbXPNqCV7fPHi8HnrDime+E=";
|
||||
hash = "sha256-HSZ1z4WaHQDPomW6nNs8iUnld36BuHnOVaODD5mxY00=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Rn1MnasYUOBbIgjFx0E6R2Zak6la1VajDkHqoiFpHtw=";
|
||||
vendorHash = "sha256-WWEwGpCwMPD7jaz02zN745RQQqYTQttehbcT3J9hayM=";
|
||||
|
||||
subPackages = [ "cmd/bd" ];
|
||||
|
||||
@@ -56,6 +56,9 @@ buildGoModule (finalAttrs: {
|
||||
skippedTests = [
|
||||
# Upstream test bug: version gap 0.55.0->1.0.0 triggers "very old" warning instead of expected "ok"
|
||||
"TestCheckMetadataVersionTracking"
|
||||
# Installs a hook with a `#!/usr/bin/env sh` shebang, then exercises it via
|
||||
# `git worktree add`; /usr/bin/env doesn't exist in the Nix build sandbox
|
||||
"TestInstallHooksBeads_WorktreeAccess"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Checks for /etc/passwd which isn't available in sandbox
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bootdev-cli";
|
||||
version = "1.32.1";
|
||||
version = "1.32.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bootdotdev";
|
||||
repo = "bootdev";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DScpeUQdkzJy+RVkA8ZmGzp5Z9YzkvZViCoov64WAJk=";
|
||||
hash = "sha256-GD/VD4NCCC4ptf37T/JfKB7m8GabhtC8NCLeeX+DfkY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZDioEU5uPCkd+kC83cLlpgzyOsnpj2S7N+lQgsQb8uY=";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"url": "https://web.archive.org/web/20260817204316/https://2vks4.upcloudobjects.com/capacities-desktop-app/Capacities-1.68.2.AppImage",
|
||||
"sha256": "08vgblqa913q01qlw79k8wdi6nxmrza5fh2d60j5w9m4zd6f9d6m",
|
||||
"version": "1.68.2"
|
||||
"url": "https://web.archive.org/web/20260906031911/https://2vks4.upcloudobjects.com/capacities-desktop-app/Capacities-1.70.2.AppImage",
|
||||
"sha256": "0zp9fhcfnzb7zmy9i9m65aqavxr8my08z7nwkrfzq763minlawga",
|
||||
"version": "1.70.2"
|
||||
}
|
||||
|
||||
@@ -3,65 +3,80 @@
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
makeWrapper,
|
||||
node-gyp,
|
||||
nodejs,
|
||||
pnpm_10,
|
||||
pnpm_11,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
python3,
|
||||
stdenv,
|
||||
|
||||
# tests
|
||||
runCommand,
|
||||
testers,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdxgen";
|
||||
version = "11.10.0";
|
||||
version = "13.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdxgen";
|
||||
repo = "cdxgen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RmgR6OfNrZUYFyn36zTHERIHlzszaFqTX8b4Rf2TF/U=";
|
||||
hash = "sha256-wnvAeZprSUDCFO5UXyycrF2cZ+a/E70k5V8CM6IJ0NM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
nodejs
|
||||
node-gyp # required for sqlite3 bindings
|
||||
pnpmConfigHook
|
||||
pnpm_10
|
||||
python3 # required for sqlite3 bindings
|
||||
pnpm_11
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin cctools.libtool;
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-o7u/ZZS/5PgOtWd07zO4a01mUWZowUTL+JDJ2442mGc=";
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-hVa6Um0WkcsI8MwwkqwFwOqESTMzR2Ox9DSmESzEDfQ=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pushd node_modules/sqlite3
|
||||
node-gyp rebuild
|
||||
popd
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/lib
|
||||
cp -r * $out/lib
|
||||
|
||||
makeWrapper ${nodejs}/bin/node "$out/bin/cdxgen" --add-flags "$out/lib/bin/cdxgen.js"
|
||||
makeWrapper ${nodejs}/bin/node "$out/bin/cdxgen-evinse" --add-flags "$out/lib/bin/evinse.js"
|
||||
makeWrapper ${nodejs}/bin/node "$out/bin/cdxgen-repl" --add-flags "$out/lib/bin/repl.js"
|
||||
makeWrapper ${nodejs}/bin/node "$out/bin/cdxgen-verify" --add-flags "$out/lib/bin/verify.js"
|
||||
|
||||
for name in audit convert evinse hbom repl sign tracebom validate verify; do
|
||||
makeWrapper ${nodejs}/bin/node "$out/bin/cdxgen-$name" --add-flags "$out/lib/bin/$name.js"
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# Remove broken development symlinks
|
||||
find $out -xtype l -print -delete
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
sbom =
|
||||
runCommand "${finalAttrs.pname}-${finalAttrs.version}-test-sbom"
|
||||
{
|
||||
nativeBuildInputs = [ finalAttrs.finalPackage ];
|
||||
}
|
||||
''
|
||||
pushd ${finalAttrs.src}/test/repotests/npm-smoke
|
||||
cdxgen -t npm -o $out/bom.json .
|
||||
grep -q '"bomFormat"' "$out/bom.json"
|
||||
popd
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Creates CycloneDX Software Bill-of-Materials (SBOM) for your projects from source and container images";
|
||||
mainProgram = "cdxgen";
|
||||
@@ -70,5 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
quincepie
|
||||
];
|
||||
teams = with lib.teams; [ ngi ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "civicrm-core";
|
||||
version = "6.17.2";
|
||||
version = "6.17.3";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
dontUnpack = false;
|
||||
@@ -14,10 +14,10 @@ php.buildComposerProject2 (finalAttrs: {
|
||||
owner = "civicrm";
|
||||
repo = "civicrm-core";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-KYMDBO22HPS16QlJIFEughcGumADNB1cbY/zmSRK91M=";
|
||||
hash = "sha256-9BZ/xjJGvZO0V8QJV8yuZj5uRmWbS68/KF1q7Xrz5/8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lKqQtn0iF3MmiO947/ZoMeLmNpTW01WJZlcL7Cj5yuE=";
|
||||
vendorHash = "sha256-40i9jTbY7NgfHvjL1/COyRpteRfveBGkHMnv00gdem8=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -16,7 +16,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ctx7";
|
||||
version = "0.5.9";
|
||||
version = "0.5.10";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "upstash";
|
||||
repo = "context7";
|
||||
tag = "${finalAttrs.pname}@${finalAttrs.version}";
|
||||
hash = "sha256-QBVy3KkZLuSe7sDu/im1upxLwkEG8kg3Ef8Qo761Qc4=";
|
||||
hash = "sha256-XN6lGp135VdRFlYhgZzOjLo3+QyzEP4Q8O6QMSR2wyw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-1ZrQ+GMGgBNyycp/Xp2/meGwxaWTh+c53qgaEy30dl8=";
|
||||
hash = "sha256-3CaLAMU4WdmGt2YF1XQ7fc1dQh6ENP792Q9idKNYDYs=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "cv";
|
||||
version = "0.3.71";
|
||||
version = "0.3.72";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
dontUnpack = false;
|
||||
@@ -15,10 +15,10 @@ php.buildComposerProject2 (finalAttrs: {
|
||||
owner = "civicrm";
|
||||
repo = "cv";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-1InNm8ayshrACLUJ4MXb6DTnD9vxRVtwnK9oFAxMMho=";
|
||||
hash = "sha256-haK/DYas0KJjOEyqFcGqGbf2dAikbR7XFdI15fHcZcg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7+roKbgbSx00CrHDOwp7yxcSTdq9YDNgTLIdjLT05oM=";
|
||||
vendorHash = "sha256-gL0mleLCSDvR93oQW+O//j/ANs7oYYKfKgGOGQkCFJI=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "feh";
|
||||
version = "3.12.3";
|
||||
version = "3.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derf";
|
||||
repo = "feh";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-mPXr/X3rBYT/RtPyGJyBbiV8Xpntck43UxHe8vLG6Mc=";
|
||||
hash = "sha256-ri8Ij/i+mayPtM4rLNhwlt8DfcLeID911flQG/TPH0Q=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "folo";
|
||||
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RSSNext";
|
||||
repo = "Folo";
|
||||
tag = "desktop/v${finalAttrs.version}";
|
||||
hash = "sha256-Nq0EKH9Em5U+iNoWG/aZP2eiDYcJOGQGScZIlbrQvTw=";
|
||||
hash = "sha256-lK371YSqYcYzVjDJCfAbrl+wdAbDzmT6R4SlZXjiZLc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-HnDXcofw8xUM2W0hoFbjYbCV269XixVA/4hFjoGEVLA=";
|
||||
hash = "sha256-bdqcY+ylviWHnbIvPxwRZimenXWFS5bJfDeFxMtOVM0=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -1,23 +1,24 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromCodeberg,
|
||||
fetchgit,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "forgejo-mcp";
|
||||
version = "2.30.2";
|
||||
version = "2.33.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "goern";
|
||||
repo = "forgejo-mcp";
|
||||
# Plain git fetch: upstream's Forgejo instance has source-archive
|
||||
# downloads disabled, so fetchFromForgejo (tarball-based) cannot be used.
|
||||
src = fetchgit {
|
||||
url = "https://git.b4mad.industries/agentic-forges/forgejo-mcp.git";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-czL2jfFalnbDzvtEAOLS82c+zuGpWgUrMFlu/vj1C8Q=";
|
||||
hash = "sha256-yC2qBZLC0ArAwVULzFo5A7LlBRqLEhCZsFCW7o+7YSU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QDJRbF4mZzBv1vxvo1ZQJaUJayRHj1jMgjaRfAmLMik=";
|
||||
vendorHash = "sha256-WoeTy80iC3j9LoekCF7f0yZ9GIQyl6Gx+KGvHABW7OM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -35,9 +36,9 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Model Context Protocol (MCP) server for interacting with the Forgejo REST API";
|
||||
longDescription = "This Model Context Protocol (MCP) server provides tools and resources for interacting with the Forgejo (specifically Codeberg.org) REST API";
|
||||
homepage = "https://codeberg.org/goern/forgejo-mcp";
|
||||
changelog = "https://codeberg.org/goern/forgejo-mcp/src/tag/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
longDescription = "This Model Context Protocol (MCP) server provides tools and resources for interacting with the Forgejo REST API";
|
||||
homepage = "https://git.b4mad.industries/agentic-forges/forgejo-mcp";
|
||||
changelog = "https://git.b4mad.industries/agentic-forges/forgejo-mcp/src/tag/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ malik ];
|
||||
mainProgram = "forgejo-mcp";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ggml";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ggml-org";
|
||||
repo = "ggml";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Howxsb05/WsDDPAFtyGtn2TJup3TDUBNaR9TWiATMq4=";
|
||||
hash = "sha256-QArqnQ5//Ft9Knm1Caqz68t4ikNQnk+O+OZUTfZlVCk=";
|
||||
};
|
||||
|
||||
# The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gluesql";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gluesql";
|
||||
repo = "gluesql";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/Yb6ksHxFscB/t7fID11fNHldJ0lDmN9DXbiaG+mUwY=";
|
||||
hash = "sha256-O2OkrUSeQQT7x4Z3chdFjpY1M1m/TAoU9viMgM9hCXg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
git config --global user.email "nobody@example.com"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-P2YH3mf1Olrjzwl6ldwzO0xMC0yccqA7T2mrWZ5qSKM=";
|
||||
cargoHash = "sha256-U58pcgrFU4Kwz5vm5pOk4LOtEa19LVKEfqVp61G7VjM=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gogup";
|
||||
version = "1.8.1";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nao1215";
|
||||
repo = "gup";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-3GOdORigV+5pqFySnlsL/ZOUqAIFQicfDCzeOCFa+A0=";
|
||||
hash = "sha256-3wOhKJdIrTBIbiNJGm2LjgV2ocxIznZXXoh5mHthlvU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qYMUIy9yvWAedA2fL0KKoysaHHoKFJnzl58pInXpa60=";
|
||||
vendorHash = "sha256-L5dVJrso+A5yjeSW8VQkxkgZ2lhrjAR1Wl/Z6cLUP8Y=";
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "grpc-health-probe";
|
||||
version = "0.4.56";
|
||||
version = "0.4.57";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc-ecosystem";
|
||||
repo = "grpc-health-probe";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-cBXXM28x5lZJlnglfFMk6ZAymMS54vaX7q0fIcgEsts=";
|
||||
hash = "sha256-nMpc8q/jWg+4zpTuuuEq7GrKzRx080fOKrbUrU68HAo=";
|
||||
};
|
||||
|
||||
tags = [
|
||||
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X main.versionTag=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-UBIXT4Y0t7zdCvNmC4m3XIb0VD2higEe6Tci78EJ5uQ=";
|
||||
vendorHash = "sha256-EvpWRfdKYi/iJJkt5q1cq66p+3aoG7zbpYyfBPnvfRs=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gvm-libs";
|
||||
version = "23.9.3";
|
||||
version = "23.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = "gvm-libs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/UqYa1IrMqFEVbBGwRIzFIdJ+McLIsbwBZFVwg+UHuI=";
|
||||
hash = "sha256-v4MiVL+eIXS+nmLZC4dEcQWxtlgnwVDGnHw2pZLFPCE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
catch2_3,
|
||||
cppad,
|
||||
gmp,
|
||||
llvmPackages,
|
||||
matio,
|
||||
mpfr,
|
||||
python3Packages,
|
||||
@@ -37,6 +38,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jrl-cmakemodules";
|
||||
version = "2.3.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
srictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jrl-umi3218";
|
||||
repo = "jrl-cmakemodules";
|
||||
@@ -65,6 +69,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3Packages.pytest
|
||||
simde
|
||||
suitesparse
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
# Otherwise `FindCHOLMOD` fails
|
||||
# Could NOT find OpenMP_C (missing: OpenMP_C_FLAGS OpenMP_C_LIB_NAMES)
|
||||
llvmPackages.openmp
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "jwtinfo";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lmammino";
|
||||
repo = "jwtinfo";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-o2SbPTnYSqsjpTl1Z8uSZZLeHx4lxunwDdig4UuVFKg=";
|
||||
hash = "sha256-vtlYQdvLpxdN4WyBY4oQUaIZmTyE1GFGIIiho9IvTi8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-v5kJ+XznzewkmC3qo1e2xMLc1fS8gYYNd/9+IDFkbvw=";
|
||||
cargoHash = "sha256-ydocnud3f9Cxd7qsYjeyNS7hv0g2Qry84IOw/dqemHY=";
|
||||
|
||||
meta = {
|
||||
description = "Command-line tool to get information about JWTs";
|
||||
|
||||
@@ -11,16 +11,16 @@ buildNpmPackage (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "kener";
|
||||
version = "4.1.2";
|
||||
version = "4.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rajnandan1";
|
||||
repo = "kener";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+G0RBzSKu3RPvTAAkHtL7KMaNkCUDsawr6Qgyk7BXfo=";
|
||||
hash = "sha256-PzXRnMfSCpmoIiwg/uqF8DJ1ILM1i2TPF63SjSly7Vc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-QnsR46mhakCLXqaCBEIZYMTGj3puqLPs4inyV/ZFwAY=";
|
||||
npmDepsHash = "sha256-tbySYkOEiRyeUgF91+GuGd5HE4JyCaeHvSD4ddMf/20=";
|
||||
postFixup = ''
|
||||
makeWrapper ${nodejs}/bin/node $out/bin/kener-server \
|
||||
--add-flags $out/lib/node_modules/kener/build/main.js \
|
||||
|
||||
@@ -47,8 +47,8 @@
|
||||
let
|
||||
# Upstream reads these from git, which the release tarball does not ship.
|
||||
# They are purely informational: `llama-server --version`, `/props`, and the web UI.
|
||||
buildNumber = "10621";
|
||||
buildCommit = "c1d0e7a";
|
||||
buildNumber = "10809";
|
||||
buildCommit = "5266f24";
|
||||
|
||||
# It's necessary to consistently use backendStdenv when building with CUDA support,
|
||||
# otherwise we get libstdc++ errors downstream.
|
||||
@@ -84,7 +84,7 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -98,7 +98,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vVq7+eUN6NXZuqm7Jwlr4iFDV1PjNzQ6nK9AR2zvZYM=";
|
||||
hash = "sha256-WImZjO3U9EXZUNP/FMpxo8PaTjQW8X2SBTfGwwFlZIM=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
||||
@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkpasswd
|
||||
];
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isDarwin; # ERROR: All 46 tests were run, 46 failed unexpectedly.
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Rich and powerful protocol-independent mail framework";
|
||||
|
||||
@@ -10,17 +10,18 @@
|
||||
pnpmConfigHook,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mo-viewer";
|
||||
version = "1.6.3";
|
||||
version = "1.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "mo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DbcktOAdcg/v5q3gYgxMvSHVtwXODz9xHoPqiiWBaP4=";
|
||||
hash = "sha256-8A3km3N9pGm/gBvIxManVgBV5opMZIoNR/JE93gX5yk=";
|
||||
};
|
||||
|
||||
frontend = stdenvNoCC.mkDerivation (finalFrontendAttrs: {
|
||||
@@ -34,7 +35,7 @@ buildGoModule (finalAttrs: {
|
||||
sourceRoot = "${finalFrontendAttrs.src.name}/internal/frontend";
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-thlwYvB7y6RFwLknbQt5evF4xQVzllrQqVYDdKSbEUM=";
|
||||
hash = "sha256-tjeDH6wiA3KjUyhpQfvrSsXqSRf1bOOA0vPfkUR8Kvc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -62,7 +63,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
});
|
||||
|
||||
vendorHash = "sha256-rmtJswO3DWWxpb2uk91aIatc7ugNmsqzwlEeKdX7ITE=";
|
||||
vendorHash = "sha256-gaw85ILGr3iDWZ8ibRAA7l+UROCaItDBauCVtbZNa0U=";
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${finalAttrs.frontend} internal/static/dist
|
||||
@@ -93,6 +94,13 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"frontend"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/k1LoW/mo";
|
||||
description = "Markdown viewer that opens .md files in a browser";
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "nest-cli";
|
||||
version = "11.0.18";
|
||||
version = "12.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nestjs";
|
||||
repo = "nest-cli";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-fqVsvox7c50bZ5jqGrpu3QiQG+ghY3eh8SETrdKnRCY=";
|
||||
hash = "sha256-jMdqq1vQAN9ftOIycldiRkGFqzuJha7rp/KtSmdruEQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-1M53H0tLD3+9To4kxt136P7kOvzo3gfWEFkFlcUSy6g=";
|
||||
npmDepsHash = "sha256-g7f4cNfYMD7v1bTeokYvAlupd9/v527Z8jLc4aUeqTE=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
env = {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nixfmt-rs";
|
||||
version = "0.4.1";
|
||||
version = "0.5.3";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "Mic92";
|
||||
repo = "nixfmt-rs";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-MsSefbTC6u9GAEB9PhDSz9GvWTCASgTxysIHRrqGINc=";
|
||||
hash = "sha256-ELXgj/ij6m5aipXVb7vdzD/+77YHTyytVv900Bcp1yU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QSckmh8hBpQjpg0/4rwlpJZ2uxEZ1sPQvZfjmi4NFEc=";
|
||||
cargoHash = "sha256-LVn9QxJU2r6urD6MA7Z52ajXcgE2Q6dmjirgA/jBKUw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "10.1.1";
|
||||
version = "10.2.1";
|
||||
pname = "oxipng";
|
||||
|
||||
# do not use fetchCrate (only repository includes tests)
|
||||
@@ -13,10 +13,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "oxipng";
|
||||
repo = "oxipng";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-G06GAlxEVOqt2xHq+JOLSYbsa++aArbu+sb0ypQn9u4=";
|
||||
hash = "sha256-NWDd56sZ/7W8cq9P3o8ifjLhyR+ZHEYrh1fUbyGYhBQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gRWDpxZGy01lWgCIse4Tf7gjwxzosozONB3LD5pX5KQ=";
|
||||
cargoHash = "sha256-9DD1EHNtxLN3vwJQFIdibw1SnEgKHlCZAqq7GkDSQh4=";
|
||||
|
||||
# don't require qemu for aarch64-linux tests
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prevail";
|
||||
version = "0.2.0";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vbpf";
|
||||
repo = "prevail";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-qlQSoz9GE2Z2rzmrPIj+HnIQmNxiBSgvR40FR9psuDc=";
|
||||
hash = "sha256-c4km7WO9K0Hb0mTOkilXLwpFC8pJ8MEIqqlpBLJoC10=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,7 +6,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
|
||||
FetchContent_Declare(GSL
|
||||
- GIT_REPOSITORY "https://github.com/microsoft/GSL"
|
||||
- GIT_TAG "v4.2.0"
|
||||
- GIT_TAG "v4.2.2"
|
||||
- GIT_SHALLOW ON
|
||||
+ SOURCE_DIR "@gslSrc@"
|
||||
)
|
||||
@@ -17,7 +17,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
if (prevail_ENABLE_TESTS)
|
||||
FetchContent_Declare(Catch2
|
||||
- GIT_REPOSITORY "https://github.com/catchorg/Catch2.git"
|
||||
- GIT_TAG "v3.13.0"
|
||||
- GIT_TAG "v3.15.3"
|
||||
- GIT_SHALLOW ON
|
||||
+ SOURCE_DIR "@catch2Src@"
|
||||
)
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "readeck";
|
||||
version = "0.23.1";
|
||||
version = "0.23.2";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "readeck";
|
||||
repo = "readeck";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-iB8QXkBSQBbdztN00znoiCRbyhU2gB+B+UvIcKOFspc=";
|
||||
hash = "sha256-veoQz28B4HAxwtY2pDVO9EymUCYJs73BhD8r4x4MtBk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -34,7 +34,6 @@ buildGoModule (finalAttrs: {
|
||||
env.NODE_PATH = "$npmDeps";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace go.mod --replace-fail "1.26.6" "1.26.5"
|
||||
templ generate
|
||||
'';
|
||||
|
||||
@@ -70,10 +69,10 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${finalAttrs.src}/web";
|
||||
hash = "sha256-y+bma874Xd/N2urPia8vYFzavgBJsM29VuSS5iQWayA=";
|
||||
hash = "sha256-PURkorsNLDMe64g6tzKCcbuX490QXBgatZCnjBTk3+U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hAqQRtlaHcMrtatMowL/lmS5U+Jx6AmF0Q2tuiXqTTs=";
|
||||
vendorHash = "sha256-s72IaPhsTz3XawNiVYO1LMs88CO/qPOxyUAG0FA/2J0=";
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) readeck; };
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rime-wanxiang";
|
||||
version = "17.5.8";
|
||||
version = "17.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amzxyz";
|
||||
repo = "rime-wanxiang";
|
||||
tag = "v" + finalAttrs.version;
|
||||
hash = "sha256-QAiDWgNzQRjSLvxZVySZ4W2GtJ1swHjuhW8LXul0jhk=";
|
||||
hash = "sha256-RKQy47FIRbBH12fDoPA2e1Ypg76YZUpX1iQ+VHrYlME=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rusthound-ce";
|
||||
version = "2.5.5";
|
||||
version = "2.5.9";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-+Rdy1eGW7m3nA5blFsZGOj7Kpc2ra73AU9V8c9+97/k=";
|
||||
hash = "sha256-VJFgUKsmOD0pt2GABeSufWBaE+3zr0q5bv2h7f6opNg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-krhpWu6Cn3/6v0f/My8BgntDz2OqP/U9Z2I30Y86IU0=";
|
||||
cargoHash = "sha256-dHJawFfPnU80aocE1oHqdOzX48WgiIz+qknTq9Mt3Ks=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -40,6 +40,11 @@ python3.pkgs.buildPythonApplication {
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"src/sas/example_data/" = "sas/example_data"' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt6.wrapQtAppsHook
|
||||
pyside-tools-rcc
|
||||
|
||||
@@ -14,7 +14,7 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scs";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "cvxgrp";
|
||||
repo = "scs";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5Mq/mi2pW9DHXjhUEjflBeZMjJN+aJZRenVlRlloBcw=";
|
||||
hash = "sha256-vk9S4ZKuFg/MWNDlO/Wxmvqg9jrJy29YZcoDrL7gwDs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
@@ -65,5 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/cvxgrp/scs/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "serie";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lusingander";
|
||||
repo = "serie";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-FD4GIDaPnd44xgT+NsDuhRuL7CnPZFVX96ATWlUGrHo=";
|
||||
hash = "sha256-V1EC9moM8vXLf7YxiVaJG/EOmGCiXNz58vT/JSr9uXc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NQxjqe1kzEIxr6G5Iac9DQVIG26lox77AumgKLtYQ48=";
|
||||
cargoHash = "sha256-p1vseh8vv2UFVhL11gxkc231iZKSmsuk+zAZYZpjXz4=";
|
||||
|
||||
nativeCheckInputs = [ gitMinimal ];
|
||||
|
||||
|
||||
45
pkgs/by-name/sh/shellshot/package.nix
Normal file
45
pkgs/by-name/sh/shellshot/package.nix
Normal file
@@ -0,0 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "shellshot";
|
||||
version = "0.6.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lhenry-dev";
|
||||
repo = "shellshot";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eBwdCP3Bu2puB9pz+a+MR8nDeQTYQoTvdq2hHsaQX0I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-a6DPo/1Q+LtgKwxP2FgcVyHcPrNLV61q58SCMKNGBUw=";
|
||||
|
||||
checkFlags = [
|
||||
# Tries to make a HTTPS request that fails due to purposely missing CA trust-store in build sandbox
|
||||
"--skip=theme::tests::test_load_from_url_valid"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Transform your command-line output into clean, shareable images with a single command";
|
||||
homepage = "https://github.com/lhenry-dev/shellshot";
|
||||
changelog = "https://github.com/lhenry-dev/shellshot/releases/tag/v${finalAttrs.version}";
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ kpbaks ];
|
||||
mainProgram = "shellshot";
|
||||
};
|
||||
})
|
||||
@@ -69,6 +69,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
cudaPackages.cuda_cudart
|
||||
cudaPackages.cccl
|
||||
cudaPackages.libcublas
|
||||
cudaPackages.cuda_nvrtc
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -19,14 +19,14 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tabularis";
|
||||
version = "0.21.0";
|
||||
version = "0.22.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TabularisDB";
|
||||
repo = "tabularis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-81Y5sVeDJtzD1V8cj3KQhEkhreI7NaVhrHZlH9pO/T0=";
|
||||
hash = "sha256-RXkyhgicrUCuQ0Ei4mnBwPwSAEtmWA35kVn9oGQEYX0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoHash = "sha256-Rqjjsw+Pk2H2zoyIOuDlkBhkl8DJOgri5Ko95wcaoIM=";
|
||||
cargoHash = "sha256-z3dMc9mnBfyjsSVWh/7nQWmogndl/bfrbvuz7X0JIMM=";
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "terminator";
|
||||
version = "2.1.5";
|
||||
version = "2.1.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnome-terminator";
|
||||
repo = "terminator";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RM/7jUWGDV0EdMyMeLsCrvevH+5hZSJVAKmtalxNKG8=";
|
||||
hash = "sha256-U96YPoRxSiF6k2k3J2QFzwodbosQVs3lb/lpf0CToyg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tinymist";
|
||||
# Please update the corresponding vscode extension when updating
|
||||
# this derivation.
|
||||
version = "0.15.2";
|
||||
version = "0.15.6";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -23,10 +23,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "Myriad-Dreamin";
|
||||
repo = "tinymist";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wNSMjfU3upsqKQQUYx76iFGC+5ghcErlxy65ZJ/LvHk=";
|
||||
hash = "sha256-2Wh0/HB0DfHMB+z/PFPsLlJCFxy8qKWrFMuxmv5fmZk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NEvINvHMD9tVG9kyj84AC8DEAbR0ndjkCHpwR4OD6YA=";
|
||||
cargoHash = "sha256-WcGCWjN8qEcJ+4jBYF3lu744A3xR+XZUGzW5i8e3dWU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "todoist-cli";
|
||||
version = "3.3.2";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Doist";
|
||||
repo = "todoist-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vkLqq76NmPrNZ411K98fc7tXB4O1KyuZRhes6wCgoZM=";
|
||||
sha256 = "sha256-RYk1MSL15dt8aTeRxNPcVNYXnaDRURiITfMEBqR4DIA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-/aP5URXvyTNzRuEIPgcIOh222jfvoAdMmLWGzVplqhQ=";
|
||||
npmDepsHash = "sha256-JDFKNVm8G/s4fVsXjKzh0DWmqXDbTJ7huv3LO5mq+rU=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "verilator";
|
||||
version = "5.050";
|
||||
version = "5.052";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "verilator";
|
||||
repo = "verilator";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZOwBBbVNP0PaYUvrjdvbWu88fZOZ6IJ8BHAiajcOjP8=";
|
||||
hash = "sha256-3xeodLkal/crtcB091lthUe/7/wC+sjAYRqNyl7/kv0=";
|
||||
};
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [
|
||||
|
||||
@@ -118,7 +118,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
(cmakeBool "WHISPER_BUILD_EXAMPLES" true)
|
||||
(cmakeBool "GGML_CUDA" cudaSupport)
|
||||
(cmakeBool "GGML_HIPBLAS" rocmSupport)
|
||||
(cmakeBool "GGML_HIP" rocmSupport)
|
||||
(cmakeBool "GGML_VULKAN" vulkanSupport)
|
||||
(cmakeBool "WHISPER_SDL2" withSDL)
|
||||
(cmakeBool "GGML_LTO" true)
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 17a4944..33406f3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -10,7 +10,7 @@ include(BuildType)
|
||||
# Request C++14 standard, using new CMake variables.
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
||||
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto -Wall")
|
||||
|
||||
@@ -9,15 +9,15 @@
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wmderland";
|
||||
version = "unstable-2020-07-17";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aesophor";
|
||||
repo = "wmderland";
|
||||
rev = "a40a3505dd735b401d937203ab6d8d1978307d72";
|
||||
sha256 = "0npmlnybblp82mfpinjbz7dhwqgpdqc1s63wc1zs8mlcs19pdh98";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kzd5Wo+HruPC8R7UENyvjTOXBs0gmYWd5wVykr/DQHY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -51,9 +51,10 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
description = "Modern and minimal X11 tiling window manager";
|
||||
homepage = "https://github.com/aesophor/wmderland";
|
||||
changelog = "https://github.com/aesophor/wmderland/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = libx11.meta.platforms;
|
||||
maintainers = with lib.maintainers; [ takagiy ];
|
||||
mainProgram = "wmderland";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wmderlandc";
|
||||
version = "unstable-2020-07-17";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aesophor";
|
||||
repo = "wmderland";
|
||||
rev = "a40a3505dd735b401d937203ab6d8d1978307d72";
|
||||
sha256 = "0npmlnybblp82mfpinjbz7dhwqgpdqc1s63wc1zs8mlcs19pdh98";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kzd5Wo+HruPC8R7UENyvjTOXBs0gmYWd5wVykr/DQHY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/ipc-client";
|
||||
@@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Tiny program to interact with wmderland";
|
||||
homepage = "https://github.com/aesophor/wmderland/tree/master/ipc-client";
|
||||
changelog = "https://github.com/aesophor/wmderland/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ takagiy ];
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "workstyle";
|
||||
version = "unstable-2023-08-23";
|
||||
version = "0-unstable-2023-04-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pierrechevalier83";
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wrangler";
|
||||
version = "4.126.0";
|
||||
version = "4.129.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "workers-sdk";
|
||||
rev = "wrangler@${finalAttrs.version}";
|
||||
hash = "sha256-b5JAdryIkuABxsBJ72YG9IwkK1iMg0KtSi2403U+nWY=";
|
||||
hash = "sha256-IRO2nbJkKg+eG+6d0H/XnzOHurFXiW60JwaJrx0R/No=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-hbOl7GkBTrZP5IiTEAPU9mTw+XdaSWNma/9ZgXfJxho=";
|
||||
hash = "sha256-X5ubr6K+iCzrAPs1cwz+lrH6UczlmESH3xUZykqP1dE=";
|
||||
};
|
||||
# pnpm packageManager version in workers-sdk root package.json may not match nixpkgs
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,205 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# nativeBuildInputs
|
||||
ninja,
|
||||
which,
|
||||
|
||||
# buildInputs
|
||||
pybind11,
|
||||
|
||||
# dependencies
|
||||
black,
|
||||
cloudpickle,
|
||||
fvcore,
|
||||
hydra-core,
|
||||
iopath,
|
||||
matplotlib,
|
||||
omegaconf,
|
||||
packaging,
|
||||
pillow,
|
||||
pycocotools,
|
||||
pydot,
|
||||
tabulate,
|
||||
tensorboard,
|
||||
termcolor,
|
||||
torch,
|
||||
tqdm,
|
||||
yacs,
|
||||
|
||||
# optional-dependencies
|
||||
fairscale,
|
||||
psutil,
|
||||
pygments,
|
||||
scipy,
|
||||
shapely,
|
||||
timm,
|
||||
|
||||
# tests
|
||||
av,
|
||||
opencv4,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
torchvision,
|
||||
pythonAtLeast,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "detectron2";
|
||||
version = "0.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookresearch";
|
||||
repo = "detectron2";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TosuUZ1hJrXF3VGzsGO2hmQJitGUxe7FyZyKjNh+zPA=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
# https://github.com/facebookresearch/detectron2/issues/5010
|
||||
''
|
||||
substituteInPlace detectron2/data/transforms/transform.py \
|
||||
--replace-fail "interp=Image.LINEAR" "interp=Image.BILINEAR"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
ninja
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs = [ pybind11 ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"black"
|
||||
"iopath"
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"future"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
black
|
||||
cloudpickle
|
||||
fvcore
|
||||
hydra-core
|
||||
iopath
|
||||
matplotlib
|
||||
omegaconf
|
||||
packaging
|
||||
pillow
|
||||
pycocotools
|
||||
pydot # no idea why this is not in their setup.py
|
||||
tabulate
|
||||
tensorboard
|
||||
termcolor
|
||||
torch # not explicitly declared in setup.py because they expect you to install it yourself
|
||||
tqdm
|
||||
yacs
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
all = [
|
||||
fairscale
|
||||
timm
|
||||
scipy
|
||||
shapely
|
||||
pygments
|
||||
psutil
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
av
|
||||
opencv4
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
torchvision
|
||||
];
|
||||
|
||||
preCheck =
|
||||
# prevent import errors for C extension modules
|
||||
''
|
||||
rm -r detectron2
|
||||
'';
|
||||
|
||||
enabledTestPaths = [
|
||||
# prevent include $sourceRoot/projects/*/tests
|
||||
"tests"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# try import caffe2
|
||||
"tests/test_export_torchscript.py"
|
||||
"tests/test_model_analysis.py"
|
||||
"tests/modeling/test_backbone.py"
|
||||
"tests/modeling/test_roi_heads.py"
|
||||
"tests/modeling/test_rpn.py"
|
||||
"tests/structures/test_instances.py"
|
||||
# hangs for some reason
|
||||
"tests/modeling/test_model_e2e.py"
|
||||
# KeyError: 'precision'
|
||||
"tests/data/test_coco_evaluation.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# fails for some reason
|
||||
"test_checkpoint_resume"
|
||||
"test_map_style"
|
||||
# requires shapely
|
||||
"test_resize_and_crop"
|
||||
# require caffe2
|
||||
"test_predict_boxes_tracing"
|
||||
"test_predict_probs_tracing"
|
||||
"testMaskRCNN"
|
||||
"testRetinaNet"
|
||||
# require coco dataset
|
||||
"test_default_trainer"
|
||||
"test_unknown_category"
|
||||
"test_build_dataloader_train"
|
||||
"test_build_iterable_dataloader_train"
|
||||
# require network access
|
||||
"test_opencv_exif_orientation"
|
||||
"test_read_exif_orientation"
|
||||
# use deprecated api, numpy.bool
|
||||
"test_BWmode_nomask"
|
||||
"test_draw_binary_mask"
|
||||
"test_draw_empty_mask_predictions"
|
||||
"test_draw_instance_predictions"
|
||||
"test_draw_no_metadata"
|
||||
"test_overlay_instances"
|
||||
"test_overlay_instances_no_boxes"
|
||||
"test_get_bounding_box"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
"test_build_batch_dataloader_inference"
|
||||
"test_build_dataloader_inference"
|
||||
"test_build_iterable_dataloader_inference"
|
||||
"test_to_iterable"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# RuntimeError: required keyword attribute 'value' has the wrong type
|
||||
"test_apply_deltas_tracing"
|
||||
"test_imagelist_padding_tracing"
|
||||
"test_roi_pooler_tracing"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# AttributeError: '...' object has no attribute '__annotations__'
|
||||
"test_default_anchor_generator_centered"
|
||||
"test_scriptability_cpu"
|
||||
"test_scriptable_cpu"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "detectron2" ];
|
||||
|
||||
meta = {
|
||||
description = "Facebooks's next-generation platform for object detection, segmentation and other visual recognition tasks";
|
||||
homepage = "https://github.com/facebookresearch/detectron2";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ happysalada ];
|
||||
};
|
||||
})
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202609051";
|
||||
version = "0.1.202609061";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HLo9HnSeWYLMMvaJuJqah/2lsP0FPRmQsI2pkIJpTjY=";
|
||||
hash = "sha256-1rmUWgSUHpT3iGIe3ENEtLu2XPWbJ8xBL4/Kv3s2qds=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -71,10 +71,12 @@ buildPythonPackage (finalAttrs: {
|
||||
# * https://github.com/NixOS/nixpkgs/pull/288829#discussion_r1493852211
|
||||
# for more info.
|
||||
postInstall = ''
|
||||
mkdir -p $out/${python.sitePackages}/jax_plugins/nvidia/cuda_nvcc/bin
|
||||
ln -s ${lib.getExe' cudaPackages.cuda_nvcc "ptxas"} $out/${python.sitePackages}/jax_plugins/nvidia/cuda_nvcc/bin/ptxas
|
||||
ln -s ${lib.getExe' cudaPackages.cuda_nvcc "nvlink"} $out/${python.sitePackages}/jax_plugins/nvidia/cuda_nvcc/bin/nvlink
|
||||
ln -s ${cudaPackages.cuda_nvcc}/nvvm $out/${python.sitePackages}/jax_plugins/nvidia/cuda_nvcc/nvvm
|
||||
export OUTPATH="$out/${python.sitePackages}/jax_plugins/nvidia/cuda_nvcc"
|
||||
export BINPATH="$OUTPATH/bin"
|
||||
mkdir -p $BINPATH
|
||||
ln -s ${lib.getExe' cudaPackages.cuda_nvcc "ptxas"} $BINPATH/ptxas
|
||||
ln -s ${lib.getExe' cudaPackages.cuda_nvcc "nvlink"} $BINPATH/nvlink
|
||||
ln -s ${cudaPackages.cuda_nvcc}/nvvm $OUTPATH/nvvm
|
||||
'';
|
||||
|
||||
# jax-cuda12-pjrt contains shared libraries that open other shared libraries via dlopen
|
||||
@@ -101,10 +103,33 @@ buildPythonPackage (finalAttrs: {
|
||||
homepage = "https://github.com/jax-ml/jax/tree/main/jax_plugins/cuda";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
teams = [ lib.teams.cuda ];
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
natsukium
|
||||
];
|
||||
platforms = lib.attrNames platforms;
|
||||
# see CUDA compatibility matrix
|
||||
# https://jax.readthedocs.io/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder
|
||||
broken = !(lib.versionAtLeast cudaPackages.cudnn.version "9.1");
|
||||
problems =
|
||||
lib.optionalAttrs (cudaPackages.cudaMajorVersion != "12") {
|
||||
unsupported-cuda-version = {
|
||||
message = ''
|
||||
Incompatible cudaPackages version.
|
||||
- Expected: 12
|
||||
- Got: ${cudaPackages.cudaMajorVersion}
|
||||
'';
|
||||
kind = "broken";
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs (lib.versionAtLeast cudaPackages.cudnn.version "10.0") {
|
||||
unsupported-cudnn-version = {
|
||||
message = ''
|
||||
cudaPackages.cudnn is too new (${cudaPackages.cudnn.version}).
|
||||
|
||||
See CUDA compatibility matrix
|
||||
https://docs.jax.dev/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder
|
||||
'';
|
||||
kind = "broken";
|
||||
};
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
@@ -70,9 +70,10 @@ buildPythonPackage {
|
||||
# * https://github.com/NixOS/nixpkgs/pull/375186
|
||||
# for more info.
|
||||
postInstall = ''
|
||||
mkdir -p $out/${python.sitePackages}/jax_cuda12_plugin/cuda/bin
|
||||
ln -s ${lib.getExe' cudaPackages.cuda_nvcc "ptxas"} $out/${python.sitePackages}/jax_cuda12_plugin/cuda/bin
|
||||
ln -s ${lib.getExe' cudaPackages.cuda_nvcc "nvlink"} $out/${python.sitePackages}/jax_cuda12_plugin/cuda/bin
|
||||
export BINPATH="$out/${python.sitePackages}/jax_cuda12_plugin/cuda/bin"
|
||||
mkdir -p $BINPATH
|
||||
ln -s ${lib.getExe' cudaPackages.cuda_nvcc "ptxas"} $BINPATH/ptxas
|
||||
ln -s ${lib.getExe' cudaPackages.cuda_nvcc "nvlink"} $BINPATH/nvlink
|
||||
'';
|
||||
|
||||
# jax-cuda12-plugin contains shared libraries that open other shared libraries via dlopen
|
||||
@@ -97,10 +98,33 @@ buildPythonPackage {
|
||||
homepage = "https://github.com/jax-ml/jax/tree/main/jax_plugins/cuda";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
teams = [ lib.teams.cuda ];
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
natsukium
|
||||
];
|
||||
platforms = lib.attrNames platforms;
|
||||
# see CUDA compatibility matrix
|
||||
# https://jax.readthedocs.io/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder
|
||||
broken = !(lib.versionAtLeast cudaPackages.cudnn.version "9.1");
|
||||
problems =
|
||||
lib.optionalAttrs (cudaPackages.cudaMajorVersion != "12") {
|
||||
unsupported-cuda-version = {
|
||||
message = ''
|
||||
Incompatible cudaPackages version.
|
||||
- Expected: 12
|
||||
- Got: ${cudaPackages.cudaMajorVersion}
|
||||
'';
|
||||
kind = "broken";
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs (lib.versionAtLeast cudaPackages.cudnn.version "10.0") {
|
||||
unsupported-cudnn-version = {
|
||||
message = ''
|
||||
cudaPackages.cudnn is too new (${cudaPackages.cudnn.version}).
|
||||
|
||||
See CUDA compatibility matrix
|
||||
https://docs.jax.dev/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder
|
||||
'';
|
||||
kind = "broken";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
132
pkgs/development/python-modules/jax-cuda13-pjrt/default.nix
Normal file
132
pkgs/development/python-modules/jax-cuda13-pjrt/default.nix
Normal file
@@ -0,0 +1,132 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
addDriverRunpath,
|
||||
autoPatchelfHook,
|
||||
pypaInstallHook,
|
||||
wheelUnpackHook,
|
||||
cudaPackages,
|
||||
python,
|
||||
jaxlib,
|
||||
}:
|
||||
let
|
||||
inherit (jaxlib) version;
|
||||
|
||||
platforms = {
|
||||
x86_64-linux = {
|
||||
name = "manylinux_2_27_x86_64";
|
||||
hash = "sha256-TKiiYaVIWtuFL96VTkuRRfVCwNivRwSojgX67jVBryE=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
name = "manylinux_2_27_aarch64";
|
||||
hash = "sha256-gZx0TjXd8Cckv0WWpijSvjhzaah82mBXUTfuQ37NeXo=";
|
||||
};
|
||||
};
|
||||
currentPlatform = platforms.${stdenv.hostPlatform.system};
|
||||
|
||||
cudaLibPath = lib.makeLibraryPath (
|
||||
with cudaPackages;
|
||||
[
|
||||
(lib.getLib libcublas) # libcublas.so
|
||||
(lib.getLib cuda_cupti) # libcupti.so
|
||||
(lib.getLib cuda_cudart) # libcudart.so
|
||||
(lib.getLib cudnn) # libcudnn.so
|
||||
(lib.getLib libcufft) # libcufft.so
|
||||
(lib.getLib libcusolver) # libcusolver.so
|
||||
(lib.getLib libcusparse) # libcusparse.so
|
||||
(lib.getLib nccl) # libnccl.so
|
||||
(lib.getLib libnvjitlink) # libnvJitLink.so
|
||||
(lib.getLib addDriverRunpath.driverLink) # libcuda.so
|
||||
]
|
||||
);
|
||||
|
||||
in
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "jax-cuda13-pjrt";
|
||||
inherit version;
|
||||
pyproject = false;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "jax_cuda13_pjrt";
|
||||
inherit version;
|
||||
format = "wheel";
|
||||
python = "py3";
|
||||
dist = "py3";
|
||||
platform = currentPlatform.name;
|
||||
inherit (currentPlatform) hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
pypaInstallHook
|
||||
wheelUnpackHook
|
||||
];
|
||||
|
||||
# jax-cuda13-pjrt looks for ptxas, nvlink and nvvm at runtime, eg when running `jax.random.PRNGKey(0)`.
|
||||
# Linking into $out is the least bad solution. See
|
||||
# * https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621
|
||||
# * https://github.com/NixOS/nixpkgs/pull/288829#discussion_r1493852211
|
||||
# for more info.
|
||||
postInstall = ''
|
||||
export OUTPATH="$out/${python.sitePackages}/jax_plugins/nvidia/cu13"
|
||||
export BINPATH="$OUTPATH/bin"
|
||||
mkdir -p $BINPATH
|
||||
ln -s ${lib.getExe' cudaPackages.cuda_nvcc "ptxas"} $BINPATH/ptxas
|
||||
ln -s ${lib.getExe' cudaPackages.cuda_nvcc "nvlink"} $BINPATH/nvlink
|
||||
ln -s ${cudaPackages.cuda_nvcc}/nvvm $OUTPATH/nvvm
|
||||
'';
|
||||
|
||||
# jax-cuda13-pjrt contains shared libraries that open other shared libraries via dlopen
|
||||
# and these implicit dependencies are not recognized by ldd or
|
||||
# autoPatchelfHook. That means we need to sneak them into rpath. This step
|
||||
# must be done after autoPatchelfHook and the automatic stripping of
|
||||
# artifacts. autoPatchelfHook runs in postFixup and auto-stripping runs in the
|
||||
# patchPhase.
|
||||
preInstallCheck = ''
|
||||
patchelf --add-rpath "${cudaLibPath}" $out/${python.sitePackages}/jax_plugins/xla_cuda13/xla_cuda_plugin.so
|
||||
'';
|
||||
|
||||
# FIXME: there are no tests, but we need to run preInstallCheck above
|
||||
doCheck = true;
|
||||
|
||||
pythonImportsCheck = [ "jax_plugins" ];
|
||||
|
||||
passthru = {
|
||||
inherit cudaLibPath;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "JAX XLA PJRT Plugin for NVIDIA GPUs";
|
||||
homepage = "https://github.com/jax-ml/jax/tree/main/jax_plugins/cuda";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
license = lib.licenses.asl20;
|
||||
teams = [ lib.teams.cuda ];
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
platforms = lib.attrNames platforms;
|
||||
problems =
|
||||
lib.optionalAttrs (cudaPackages.cudaMajorVersion != "13") {
|
||||
unsupported-cuda-version = {
|
||||
message = ''
|
||||
Incompatible cudaPackages version.
|
||||
- Expected: 13
|
||||
- Got: ${cudaPackages.cudaMajorVersion}
|
||||
'';
|
||||
kind = "broken";
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs (lib.versionAtLeast cudaPackages.cudnn.version "10.0") {
|
||||
unsupported-cudnn-version = {
|
||||
message = ''
|
||||
cudaPackages.cudnn is too new (${cudaPackages.cudnn.version}).
|
||||
|
||||
See CUDA compatibility matrix
|
||||
https://docs.jax.dev/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder
|
||||
'';
|
||||
kind = "broken";
|
||||
};
|
||||
};
|
||||
};
|
||||
})
|
||||
127
pkgs/development/python-modules/jax-cuda13-plugin/default.nix
Normal file
127
pkgs/development/python-modules/jax-cuda13-plugin/default.nix
Normal file
@@ -0,0 +1,127 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
autoPatchelfHook,
|
||||
pypaInstallHook,
|
||||
wheelUnpackHook,
|
||||
cudaPackages,
|
||||
python,
|
||||
jaxlib,
|
||||
jax-cuda13-pjrt,
|
||||
}:
|
||||
let
|
||||
inherit (jaxlib) version;
|
||||
inherit (jax-cuda13-pjrt) cudaLibPath;
|
||||
|
||||
platforms = {
|
||||
x86_64-linux = {
|
||||
name = "manylinux_2_27_x86_64";
|
||||
hashes = {
|
||||
cp312 = "sha256-2zSLkZmBC+W1OAwRObTUgC1t7G8Mpr8Z/LgYgFNB9ZA=";
|
||||
cp313 = "sha256-C1ebRy0AbJPOUGORCbdkhfLReJ3k4b+fAOz2eXN9Jf0=";
|
||||
cp314 = "sha256-6CAG8dgVLjTPUySYWk1tcKHfrSXSWzP6Qhfhh8Z9vNI=";
|
||||
};
|
||||
};
|
||||
aarch64-linux = {
|
||||
name = "manylinux_2_27_aarch64";
|
||||
hashes = {
|
||||
cp312 = "sha256-9udjg5/ChxzqewgrphHNOlufxQhstED7tMkgmPmxtWc=";
|
||||
cp313 = "sha256-TqmizXyPmKVGVCF1mZW1HntI20yopYFFvOUyYnYC2CA=";
|
||||
cp314 = "sha256-74XFhZxLy91yNLtvh152zfh0ElzV4eZBfJVzfUzeRNc=";
|
||||
};
|
||||
};
|
||||
};
|
||||
currentPlatform =
|
||||
platforms.${stdenv.hostPlatform.system}
|
||||
or (throw "jax-cuda13-plugin is not supported on ${stdenv.hostPlatform.system}");
|
||||
|
||||
dist = "cp${lib.replaceStrings [ "." ] [ "" ] python.pythonVersion}";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "jax-cuda13-plugin";
|
||||
inherit version;
|
||||
pyproject = false;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "jax_cuda13_plugin";
|
||||
inherit version dist;
|
||||
format = "wheel";
|
||||
python = dist;
|
||||
abi = dist;
|
||||
platform = currentPlatform.name;
|
||||
hash =
|
||||
currentPlatform.hashes.${dist}
|
||||
or (throw "python${python.pythonVersion}Packages.jax-cuda12-plugin is not supported");
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
pypaInstallHook
|
||||
wheelUnpackHook
|
||||
];
|
||||
|
||||
# jax-cuda13-plugin looks for ptxas at runtime, e.g. with a triton kernel.
|
||||
# Linking into $out is the least bad solution. See
|
||||
# * https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621
|
||||
# * https://github.com/NixOS/nixpkgs/pull/288829#discussion_r1493852211
|
||||
# * https://github.com/NixOS/nixpkgs/pull/375186
|
||||
# for more info.
|
||||
postInstall = ''
|
||||
export BINPATH="$out/${python.sitePackages}/jax_cuda13_plugin/cuda/bin"
|
||||
mkdir -p $BINPATH
|
||||
ln -s ${lib.getExe' cudaPackages.cuda_nvcc "ptxas"} $BINPATH
|
||||
ln -s ${lib.getExe' cudaPackages.cuda_nvcc "nvlink"} $BINPATH
|
||||
'';
|
||||
|
||||
# jax-cuda12-plugin contains shared libraries that open other shared libraries via dlopen
|
||||
# and these implicit dependencies are not recognized by ldd or
|
||||
# autoPatchelfHook. That means we need to sneak them into rpath. This step
|
||||
# must be done after autoPatchelfHook and the automatic stripping of
|
||||
# artifacts. autoPatchelfHook runs in postFixup and auto-stripping runs in the
|
||||
# patchPhase.
|
||||
preInstallCheck = ''
|
||||
patchelf --add-rpath "${cudaLibPath}" $out/${python.sitePackages}/jax_cuda13_plugin/*.so
|
||||
'';
|
||||
|
||||
dependencies = [ jax-cuda13-pjrt ];
|
||||
|
||||
pythonImportsCheck = [ "jax_cuda13_plugin" ];
|
||||
|
||||
# FIXME: there are no tests, but we need to run preInstallCheck above
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "JAX Plugin for CUDA13";
|
||||
homepage = "https://github.com/jax-ml/jax/tree/main/jax_plugins/cuda";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
license = lib.licenses.asl20;
|
||||
teams = [ lib.teams.cuda ];
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
platforms = lib.attrNames platforms;
|
||||
problems =
|
||||
lib.optionalAttrs (cudaPackages.cudaMajorVersion != "13") {
|
||||
unsupported-cuda-version = {
|
||||
message = ''
|
||||
Incompatible cudaPackages version.
|
||||
- Expected: 13
|
||||
- Got: ${cudaPackages.cudaMajorVersion}
|
||||
'';
|
||||
kind = "broken";
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs (lib.versionAtLeast cudaPackages.cudnn.version "10.0") {
|
||||
unsupported-cudnn-version = {
|
||||
message = ''
|
||||
cudaPackages.cudnn is too new (${cudaPackages.cudnn.version}).
|
||||
|
||||
See CUDA compatibility matrix
|
||||
https://docs.jax.dev/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder
|
||||
'';
|
||||
kind = "broken";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -7,6 +7,7 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
cudaPackages,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
@@ -20,6 +21,7 @@
|
||||
|
||||
# optional-dependencies
|
||||
jax-cuda12-plugin,
|
||||
jax-cuda13-plugin,
|
||||
|
||||
# tests
|
||||
absl-py,
|
||||
@@ -69,11 +71,25 @@ buildPythonPackage (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals cudaSupport finalAttrs.passthru.optional-dependencies.cuda;
|
||||
|
||||
optional-dependencies = lib.fix (self: {
|
||||
cuda = [ jax-cuda12-plugin ];
|
||||
cuda12 = self.cuda;
|
||||
cuda12_local = self.cuda;
|
||||
});
|
||||
optional-dependencies =
|
||||
let
|
||||
inherit (cudaPackages) cudaMajorVersion;
|
||||
cuda12 = [ jax-cuda12-plugin ];
|
||||
cuda13 = [ jax-cuda13-plugin ];
|
||||
in
|
||||
{
|
||||
cuda =
|
||||
if cudaMajorVersion == "12" then
|
||||
cuda12
|
||||
else if cudaMajorVersion == "13" then
|
||||
cuda13
|
||||
else
|
||||
throw "Unsupported cudaPackages version (${cudaMajorVersion}). Supported versions are 12 and 13.";
|
||||
cuda12 = cuda12;
|
||||
cuda12_local = cuda12;
|
||||
cuda13 = cuda13;
|
||||
cuda13_local = cuda13;
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
absl-py
|
||||
@@ -85,11 +101,7 @@ buildPythonPackage (finalAttrs: {
|
||||
pytest-xdist
|
||||
];
|
||||
|
||||
# high parallelism will result in the tests getting stuck
|
||||
dontUsePytestXdist = true;
|
||||
|
||||
pytestFlags = [
|
||||
"--numprocesses=4"
|
||||
"-Wignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
@@ -101,13 +113,18 @@ buildPythonPackage (finalAttrs: {
|
||||
"tests/"
|
||||
];
|
||||
|
||||
# Prevents `tests/export_back_compat_test.py::CompatTest::test_*` tests from failing on darwin with
|
||||
# PermissionError: [Errno 13] Permission denied: '/tmp/back_compat_testdata/test_*.py'
|
||||
# See https://github.com/google/jax/blob/jaxlib-v0.4.27/jax/_src/internal_test_util/export_back_compat_test_util.py#L240-L241
|
||||
# NOTE: this doesn't seem to be an issue on linux
|
||||
preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
export TEST_UNDECLARED_OUTPUTS_DIR=$(mktemp -d)
|
||||
'';
|
||||
preCheck =
|
||||
# Prevents `tests/export_back_compat_test.py::CompatTest::test_*` tests from failing on darwin with
|
||||
# PermissionError: [Errno 13] Permission denied: '/tmp/back_compat_testdata/test_*.py'
|
||||
# See https://github.com/google/jax/blob/jaxlib-v0.4.27/jax/_src/internal_test_util/export_back_compat_test_util.py#L240-L241
|
||||
# NOTE: this doesn't seem to be an issue on linux
|
||||
lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
export TEST_UNDECLARED_OUTPUTS_DIR=$(mktemp -d)
|
||||
''
|
||||
# Disable CUDA during tests when cudaSupport is enabled but no GPU is available
|
||||
+ lib.optionalString cudaSupport ''
|
||||
export JAX_PLATFORMS=cpu
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Exceeds tolerance when the machine is busy
|
||||
@@ -129,6 +146,13 @@ buildPythonPackage (finalAttrs: {
|
||||
"test_custom_root_with_aux"
|
||||
"testEigvalsGrad_shape"
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
# AssertionError: 'INFO' not found in "DEBUG:2026-09-05 10:11:42,262:jax._src.path:40: etils.epath was not found...
|
||||
"test_subprocess_stderr_debug_logging"
|
||||
|
||||
# AssertionError: 'INFO' not found in 'I0905 10:11:44.349869 24500 pjrt_api.cc:119] GetPjrtApi was found for cuda at...
|
||||
"test_subprocess_stderr_info_logging"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isx86_64 [
|
||||
# The Mosaic GPU interpreter emulates tcgen05 MMA on the CPU backend and compares the
|
||||
# result with `assert_array_equal`. On x86_64 the two sides contract differently and
|
||||
@@ -151,24 +175,26 @@ buildPythonPackage (finalAttrs: {
|
||||
# Run these tests with eg
|
||||
#
|
||||
# NIXPKGS_ALLOW_UNFREE=1 nixglhost -- nix run --impure .#python3Packages.jax.passthru.tests.test_cuda_jaxlibBin
|
||||
passthru.tests = {
|
||||
# jaxlib-build is broken as of 2024-12-20
|
||||
# test_cuda_jaxlibSource = callPackage ./test-cuda.nix {
|
||||
# jax = jax.override { jaxlib = jaxlib-build; };
|
||||
# };
|
||||
test_cuda_jaxlibBin = callPackage ./test-cuda.nix {
|
||||
jax = jax.override { jaxlib = jaxlib-bin; };
|
||||
passthru = {
|
||||
tests = {
|
||||
# jaxlib-build is broken as of 2024-12-20
|
||||
# test_cuda_jaxlibSource = callPackage ./test-cuda.nix {
|
||||
# jax = jax.override { jaxlib = jaxlib-build; };
|
||||
# };
|
||||
test_cuda_jaxlibBin = callPackage ./test-cuda.nix {
|
||||
jax = jax.override { jaxlib = jaxlib-bin; };
|
||||
};
|
||||
# updater fails to pick the correct branch
|
||||
skipBulkUpdate = true;
|
||||
};
|
||||
};
|
||||
|
||||
# updater fails to pick the correct branch
|
||||
passthru.skipBulkUpdate = true;
|
||||
|
||||
meta = {
|
||||
description = "Source-built JAX frontend: differentiate, compile, and transform Numpy code";
|
||||
homepage = "https://github.com/jax-ml/jax";
|
||||
changelog = "https://docs.jax.dev/en/latest/changelog.html";
|
||||
license = lib.licenses.asl20;
|
||||
teams = [ lib.teams.cuda ];
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
samuela
|
||||
|
||||
@@ -16,8 +16,11 @@ for py in "312" "313" "314"; do
|
||||
prefetch "$py" "aarch64-darwin" "jaxlib-bin"
|
||||
prefetch "$py" "x86_64-linux" "jax-cuda12-plugin"
|
||||
prefetch "$py" "aarch64-linux" "jax-cuda12-plugin"
|
||||
prefetch "$py" "x86_64-linux" "jax-cuda13-plugin"
|
||||
prefetch "$py" "aarch64-linux" "jax-cuda13-plugin"
|
||||
done
|
||||
|
||||
for arch in "x86_64-linux" "aarch64-linux"; do
|
||||
prefetch "312" "$arch" "jax-cuda12-pjrt"
|
||||
prefetch "312" "$arch" "jax-cuda13-pjrt"
|
||||
done
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "microsoft-kiota-abstractions";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-python";
|
||||
tag = "microsoft-kiota-abstractions-v${finalAttrs.version}";
|
||||
hash = "sha256-m1ebEOYEdmuFMtpxGtPJeQ1MqnckzWbITPVZ96mZ5Ec=";
|
||||
hash = "sha256-J33Bxo9TwHRCPzDw/Jduo9HHxoofB5h/HsNX6R9FfFI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/packages/abstractions/";
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "microsoft-kiota-authentication-azure";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-python";
|
||||
tag = "microsoft-kiota-authentication-azure-v${finalAttrs.version}";
|
||||
hash = "sha256-m1ebEOYEdmuFMtpxGtPJeQ1MqnckzWbITPVZ96mZ5Ec=";
|
||||
hash = "sha256-J33Bxo9TwHRCPzDw/Jduo9HHxoofB5h/HsNX6R9FfFI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/packages/authentication/azure/";
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "microsoft-kiota-http";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-python";
|
||||
tag = "microsoft-kiota-http-v${finalAttrs.version}";
|
||||
hash = "sha256-m1ebEOYEdmuFMtpxGtPJeQ1MqnckzWbITPVZ96mZ5Ec=";
|
||||
hash = "sha256-J33Bxo9TwHRCPzDw/Jduo9HHxoofB5h/HsNX6R9FfFI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/packages/http/httpx/";
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "microsoft-kiota-serialization-form";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-python";
|
||||
tag = "microsoft-kiota-serialization-form-v${finalAttrs.version}";
|
||||
hash = "sha256-m1ebEOYEdmuFMtpxGtPJeQ1MqnckzWbITPVZ96mZ5Ec=";
|
||||
hash = "sha256-J33Bxo9TwHRCPzDw/Jduo9HHxoofB5h/HsNX6R9FfFI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/packages/serialization/form/";
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "microsoft-kiota-serialization-json";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-python";
|
||||
tag = "microsoft-kiota-serialization-json-v${finalAttrs.version}";
|
||||
hash = "sha256-m1ebEOYEdmuFMtpxGtPJeQ1MqnckzWbITPVZ96mZ5Ec=";
|
||||
hash = "sha256-J33Bxo9TwHRCPzDw/Jduo9HHxoofB5h/HsNX6R9FfFI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/packages/serialization/json/";
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "microsoft-kiota-serialization-multipart";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-python";
|
||||
tag = "microsoft-kiota-serialization-multipart-v${version}";
|
||||
hash = "sha256-m1ebEOYEdmuFMtpxGtPJeQ1MqnckzWbITPVZ96mZ5Ec=";
|
||||
hash = "sha256-J33Bxo9TwHRCPzDw/Jduo9HHxoofB5h/HsNX6R9FfFI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/packages/serialization/multipart/";
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "microsoft-kiota-serialization-text";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-python";
|
||||
tag = "microsoft-kiota-serialization-text-v${version}";
|
||||
hash = "sha256-m1ebEOYEdmuFMtpxGtPJeQ1MqnckzWbITPVZ96mZ5Ec=";
|
||||
hash = "sha256-J33Bxo9TwHRCPzDw/Jduo9HHxoofB5h/HsNX6R9FfFI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/packages/serialization/text/";
|
||||
|
||||
@@ -19,14 +19,15 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mizani";
|
||||
version = "0.14.4";
|
||||
version = "0.14.5";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "has2k1";
|
||||
repo = "mizani";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aBBT0zrBFi2LW1pU83sxeRJh0B2IXa/0UNyXMfWSyAI=";
|
||||
hash = "sha256-dKBj8hAYg+2CKYa2f0YRbbllrSacwFcejwnxvcw7F2k=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
@@ -31,6 +32,8 @@
|
||||
xmltodict,
|
||||
|
||||
# test
|
||||
iana-etc,
|
||||
libredirect,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
@@ -42,14 +45,14 @@ let
|
||||
in
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "parsedmarc";
|
||||
version = "10.4.3";
|
||||
version = "11.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "domainaware";
|
||||
repo = "parsedmarc";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-q5Zc0iWDBuuYfesmB2r8BeE32EmVsFPiChnXLEwX+SE=";
|
||||
hash = "sha256-tPGpYIKIi5TK5t4vwo/bUpVfgq4UhYW0IAn5sFYexrs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -95,11 +98,15 @@ buildPythonPackage (finalAttrs: {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
echo "nameserver 127.0.0.1" > resolv.conf
|
||||
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \
|
||||
LD_PRELOAD=${libredirect}/lib/libredirect.so
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# contacts DNS servers at 1.1.1.1 and 8.8.8.8
|
||||
"test_general_dns_settings_with_defaults"
|
||||
"testErrorRaisedAfterRetriesExhausted"
|
||||
"testTransientErrorIsRetried"
|
||||
# AssertionError
|
||||
"testWithoutAssumeUtcNaiveIsLocal"
|
||||
];
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
pure-magic-rs,
|
||||
pydub,
|
||||
pyfaup-rs,
|
||||
python-socks,
|
||||
pytz,
|
||||
requests,
|
||||
rfc3161-client,
|
||||
@@ -26,22 +27,23 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "playwrightcapture";
|
||||
version = "1.40.8";
|
||||
version = "1.41.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lookyloo";
|
||||
repo = "PlaywrightCapture";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UWWHU0ePW8ThHbC1jumpYot8k/yZLeBou9nsIEbObEA=";
|
||||
hash = "sha256-aHdYewNwEc063QYLpZXTrg28uPVuy6NMS3JLokuH30k=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"aiohttp"
|
||||
"aiohttp-socks"
|
||||
"aiohttp"
|
||||
"beautifulsoup4"
|
||||
"orjson"
|
||||
"playwright"
|
||||
"python-socks"
|
||||
"setuptools"
|
||||
"tzdata"
|
||||
];
|
||||
@@ -60,6 +62,7 @@ buildPythonPackage (finalAttrs: {
|
||||
playwright-stealth
|
||||
pure-magic-rs
|
||||
pyfaup-rs
|
||||
python-socks
|
||||
pytz
|
||||
requests
|
||||
rfc3161-client
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "prefect";
|
||||
version = "3.8.4";
|
||||
version = "3.8.5";
|
||||
pyproject = true;
|
||||
|
||||
# keeps list elements containing spaces intact, which disabledTests below needs
|
||||
@@ -102,7 +102,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "PrefectHQ";
|
||||
repo = "prefect";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-o5mYaGuYDBixac99T68niXKoDOENHGfExGhs3vDEONc=";
|
||||
hash = "sha256-ZKPYdsTo/SaptGo3TiBiBZq64JCXPLJFztHg1KVNAPE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "py-cpuinfo2";
|
||||
version = "10.1.0";
|
||||
version = "10.1.1";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "akx";
|
||||
repo = "py-cpuinfo2";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pNesRzR2LynC/if95SZH+47sW6WOJ9soXCyX8TQrpso=";
|
||||
hash = "sha256-7w5d8TEfNeSuS7CSaHolOuHri948v6JccIPtIbQr77o=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypdf";
|
||||
version = "6.15.0";
|
||||
version = "6.16.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
tag = version;
|
||||
# fetch sample files used in tests
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-e39xclCnXlX4oagx4TnFCf99VKdJZeM2Kc3set1KXuo=";
|
||||
hash = "sha256-SgEYnhScwvWy8J7Wxp0TdGZkX++99cUs8E7+7su1zcg=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -38,14 +38,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rasterio";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rasterio";
|
||||
repo = "rasterio";
|
||||
tag = version;
|
||||
hash = "sha256-Jg9GNw93uA+Lg7/kiQb+tfXXuoggQI0Nkz7cwRqq8FQ=";
|
||||
hash = "sha256-sg7c18+Gd6KObPQS7h9Jwj5iXUx5Cz1lcKSRERDMdL0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -78,10 +78,12 @@ buildPythonPackage (finalAttrs: {
|
||||
disabledTests = [
|
||||
# Requires network access
|
||||
"test_dataset_reader"
|
||||
# for some reason, str date representation are not the same
|
||||
"test_xarray_reader"
|
||||
"test_geoxarray_reader_coordinates"
|
||||
"test_geoxarray_reader_compat"
|
||||
|
||||
"test_async_reader_tile"
|
||||
"test_async_mosaic_tiler"
|
||||
"test_inherit_rasterio_env_empty"
|
||||
"test_inherit_rasterio_env_not_empty"
|
||||
"test_warp_masked_pixels_propagate"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
|
||||
repo = "scs-python";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-k6G336VZPnbYU1GfZrS+f0vEshMKhSJMWcH2dgD0CaY=";
|
||||
hash = "sha256-bwES05yte1fKN1D2NATneBFYpPhurf3ighQMeRPsxr4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -69,6 +69,8 @@ buildPythonPackage (finalAttrs: {
|
||||
downloadPage = "https://github.com/bodono/scs-python";
|
||||
changelog = "https://github.com/bodono/scs-python/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tensordict";
|
||||
version = "0.13.0";
|
||||
version = "0.14.1";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "pytorch";
|
||||
repo = "tensordict";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JL6S3Wc9PJbskOPhsr+0QFunZBkMcJCsvhLlz6ggAQ4=";
|
||||
hash = "sha256-p1h1JqstEwkrzhEIe3bxGVNBZRy8NS4wUzCRwQ8Aitk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -79,6 +79,11 @@ buildPythonPackage (finalAttrs: {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Hangs forever
|
||||
"test/distributed/test_distributed.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# TypeError: not all arguments converted during string formatting
|
||||
"test_dtensor"
|
||||
@@ -108,18 +113,6 @@ buildPythonPackage (finalAttrs: {
|
||||
"test_multiprocessing"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# torch._dynamo.exc.Unsupported: Graph break due to unsupported builtin None.ReferenceType.__new__.
|
||||
"test/test_compile.py"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Hangs forever
|
||||
"test/test_distributed.py"
|
||||
# Hangs after testing due to pool usage
|
||||
"test/test_h5.py"
|
||||
"test/test_memmap.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Pytorch dedicated tensor container";
|
||||
changelog = "https://github.com/pytorch/tensordict/releases/tag/${finalAttrs.src.tag}";
|
||||
|
||||
@@ -69,6 +69,7 @@
|
||||
# tests
|
||||
imageio,
|
||||
pytest-rerunfailures,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pyyaml,
|
||||
scipy,
|
||||
@@ -76,15 +77,18 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "torchrl";
|
||||
version = "0.13.3";
|
||||
version = "0.14.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
# No tags have been made for 0.14.0
|
||||
# https://github.com/pytorch/rl/pull/4108#issuecomment-5558175190
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "rl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GdiGZZlx8olRMzl4CJD11S1+q0+pOeCD2wrDPcji5p0=";
|
||||
# tag = "v${finalAttrs.version}";
|
||||
rev = "6e18e35b2c68be1a56afebfb0676d217925114cd";
|
||||
hash = "sha256-a1Ehbr6N5w9sVH1ygFhlPEm8J51zIrXB37N18OQqiDM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -190,11 +194,18 @@ buildPythonPackage (finalAttrs: {
|
||||
export XDG_RUNTIME_DIR=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pytestFlags = [
|
||||
# Tests memory consumption grows significantly with the number of parallel processes
|
||||
# -> Limit the number of parallel jobs to prevent OOMing
|
||||
"--maxprocesses=16"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
h5py
|
||||
gymnasium
|
||||
h5py
|
||||
imageio
|
||||
pytest-rerunfailures
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
pyyaml
|
||||
scipy
|
||||
@@ -310,7 +321,8 @@ buildPythonPackage (finalAttrs: {
|
||||
meta = {
|
||||
description = "Modular, primitive-first, python-first PyTorch library for Reinforcement Learning";
|
||||
homepage = "https://github.com/pytorch/rl";
|
||||
changelog = "https://github.com/pytorch/rl/releases/tag/${finalAttrs.src.tag}";
|
||||
# TODO: uncomment when src is using a git tag again
|
||||
# changelog = "https://github.com/pytorch/rl/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
|
||||
@@ -186,6 +186,7 @@ mapAliases {
|
||||
dedupe-pylbfgs = pylbfgs; # added 2026-06-28
|
||||
deepsearch-glm = throw "'deepsearch-glm' has been removed due to lack of upstream maintenance"; # Added 2025-03-04
|
||||
derpconf = throw "'derpconf' has been removed because it is unmaintained upstream"; # Added 2026-09-05
|
||||
detectron2 = throw "'detectron2' has been removed because it is unmaintained upstream"; # Added 2026-09-06
|
||||
dictionaries = throw "'dictionaries' has been removed as it was archived upstream"; # Added 2026-07-20
|
||||
dictpath = throw "'dictpath' has been renamed to/replaced by 'pathable'"; # Converted to throw 2025-10-29
|
||||
diff_cover = throw "'diff_cover' has been renamed to/replaced by 'diff-cover'"; # Converted to throw 2025-10-29
|
||||
|
||||
@@ -4318,8 +4318,6 @@ self: super: with self; {
|
||||
|
||||
detect-secrets = callPackage ../development/python-modules/detect-secrets { };
|
||||
|
||||
detectron2 = callPackage ../development/python-modules/detectron2 { };
|
||||
|
||||
developer-disk-image = callPackage ../development/python-modules/developer-disk-image { };
|
||||
|
||||
devgoldyutils = callPackage ../development/python-modules/devgoldyutils { };
|
||||
@@ -8692,6 +8690,10 @@ self: super: with self; {
|
||||
|
||||
jax-cuda12-plugin = callPackage ../development/python-modules/jax-cuda12-plugin { };
|
||||
|
||||
jax-cuda13-pjrt = callPackage ../development/python-modules/jax-cuda13-pjrt { };
|
||||
|
||||
jax-cuda13-plugin = callPackage ../development/python-modules/jax-cuda13-plugin { };
|
||||
|
||||
jax-jumpy = callPackage ../development/python-modules/jax-jumpy { };
|
||||
|
||||
jax-tap = callPackage ../development/python-modules/jax-tap { };
|
||||
|
||||
Reference in New Issue
Block a user