Merge master into staging-next
This commit is contained in:
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.59";
|
||||
hash = "sha256-j8tZSPTHlCFVCCCUl54MqvA3eRczfu8byEEbn7KHTPY=";
|
||||
version = "2.1.66";
|
||||
hash = "sha256-+vn4qbv3SCsq8PPv3uBsDx+XfmpbfO3HYgA8f0V1FLU=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
gsettings-desktop-schemas,
|
||||
gobject-introspection,
|
||||
python3,
|
||||
fetchpatch,
|
||||
|
||||
# vim to be used, should support the GUI mode.
|
||||
vim,
|
||||
@@ -38,6 +39,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-FDStUt989sQXX6kpqStrdjOdAMlLAepcDba9ul9tcps=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Until next version, patch to build with boost 1.89
|
||||
(fetchpatch {
|
||||
url = "https://github.com/astroidmail/astroid/commit/b84962a7920aaa9b0cc4a85a0c9fd1802495b1bc.patch";
|
||||
hash = "sha256-QO5hoWscSMcxWLjPn/NT2MaIKrgMvTJeutitm4GaKZY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
|
||||
sed -i "s~ -geom 10x10~~g" src/config.cc
|
||||
|
||||
@@ -25,6 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--replace-fail "cmake_minimum_required( VERSION 2.8 )" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
# fixes: error: 'sprintf' is deprecated: This function is provided for compatibility reasons only.
|
||||
NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isClang "-Wno-error=deprecated-declarations";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/vietjtnguyen/argagg";
|
||||
description = "Argument Aggregator";
|
||||
|
||||
@@ -1,46 +1,46 @@
|
||||
{
|
||||
"version": "2.1.59",
|
||||
"buildDate": "2026-02-25T23:40:08Z",
|
||||
"version": "2.1.66",
|
||||
"buildDate": "2026-03-04T00:21:37Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "ef70dae6ed08b5538f6d157a8c8591f72c262fb8e570c94711bad3ae4ee44afa",
|
||||
"size": 187104656
|
||||
"checksum": "7ada6848516636e229eca0b5061585741c02b46d6b285f121c11a58c4c4875b8",
|
||||
"size": 193616080
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "b3b69beae466ac1b7659bf5710ec1d5e7b20c848418cc701019462e0923ff0e0",
|
||||
"size": 192258768
|
||||
"checksum": "bf072c24f815f18246b7ce492c4b0a8a5ae2c0189c20aa950d602d6fd7a51126",
|
||||
"size": 199683904
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "78b0ea5a64793149f550ad3ddcfcbc7147128a600243839f703fb5b6a2194859",
|
||||
"size": 224884646
|
||||
"checksum": "2fcbd25c344c56efe6a3db2c19f22575a88f24e3a129ad0f1fe59e9004094528",
|
||||
"size": 234065035
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "7a4a653982b07e0a8157f8d3b2c2f8e442520ab07b2fa2e692ba054dbba210c9",
|
||||
"size": 227880817
|
||||
"checksum": "23c277040f5e5125232f8689ed2698b7a09a0cd9b2863adb49220d25ea9deea4",
|
||||
"size": 237111222
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "4f16635c098b8302d5eaf83fe726c3582e00d91cf56a37d18d0c91efbcac6cd9",
|
||||
"size": 217281606
|
||||
"checksum": "2677f8a01d29b6857e41e09476701483f35e1bc25fa4cc8fe2490b864f01d9dd",
|
||||
"size": 224600507
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "3adaebe59f10524bd9d19ebb3d090c3207b67143c0f40ec1cfc544409f8ded60",
|
||||
"size": 219578057
|
||||
"checksum": "52e7006c66553aae1fd06985a1c9c8248530adc8769ada887d40a5643fc3bd8d",
|
||||
"size": 227712806
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "6dfdfa45ce01928317abb6c3774e0c533952c471002e468dd254022acd39e268",
|
||||
"size": 236043424
|
||||
"checksum": "fadd391dfed8e8abadb3be8f41af792a26845e5a5fc6fc0daf72282beaa6517e",
|
||||
"size": 243029664
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "aadd9629f391a76e23bab6d06f8a6fe38f01137831012c96356cac178820e960",
|
||||
"size": 228253856
|
||||
"checksum": "6629d9bbce902bc984ab1d240c77668e40895bf61c9ae65b3595d5d071c3d649",
|
||||
"size": 234732704
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.59",
|
||||
"version": "2.1.66",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.59",
|
||||
"version": "2.1.66",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.1.59";
|
||||
version = "2.1.66";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-Dam9aJ0qBdqU40ACfzGQHuytW6ur0fMLm8D5fIKd1TE=";
|
||||
hash = "sha256-bZDWmtYUKL6Yrkuz70B4CgJLGn63W68G1MQa5ggivbg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-K+8xoBc3apvxQ9hCpYywqgBcfLxMWSxacgJcMH8mK7E=";
|
||||
npmDepsHash = "sha256-brrbatyYO2PH4EbduuEkknql4W0MQCMMKL1LvAQnx2s=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
fetchpatch2,
|
||||
writeScriptBin,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -94,6 +95,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
nativeInstallCheckInputs = [
|
||||
cacert
|
||||
versionCheckHook
|
||||
(writeScriptBin "corepack" "") # Some tests expect to find a `corepack` in the PATH
|
||||
];
|
||||
# Built-in SQLite support is only available in Node.js 22+, and required to run the tests.
|
||||
preInstallCheck = lib.optional (lib.versionAtLeast nodejs.version "22") ''
|
||||
|
||||
@@ -33,6 +33,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://github.com/thliebig/CSXCAD/commit/b8ea64e11320910109a49b6da5352e1a1a18a736.patch";
|
||||
hash = "sha256-mpQmpvrEDjOKgEAZ5laIIepG+PWqSr637tOY7FQst2s=";
|
||||
})
|
||||
# Finding `boost_system` fails because the stub compiled library of
|
||||
# Boost.System, which has been a header-only library since 1.69, was
|
||||
# removed in 1.89.
|
||||
# Upstream PR: https://github.com/thliebig/CSXCAD/pull/68
|
||||
(fetchpatch {
|
||||
name = "boost-1.89.patch";
|
||||
url = "https://github.com/thliebig/CSXCAD/commit/3ec8a3390eced48d919b5261fdaa140197fe40c4.patch";
|
||||
hash = "sha256-3T5m0GbDY8k1EcHWQWWXMA0S1RREpJykfgZRcPcgljQ=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,28 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchFromCodeberg,
|
||||
buildGo124Module,
|
||||
fetchFromCodeberg,
|
||||
fetchYarnDeps,
|
||||
nodejs,
|
||||
yarn,
|
||||
yarnConfigHook,
|
||||
nixosTests,
|
||||
}:
|
||||
let
|
||||
owner = "superseriousbusiness";
|
||||
repo = "gotosocial";
|
||||
|
||||
buildGo124Module (finalAttrs: {
|
||||
pname = "gotosocial";
|
||||
version = "0.21.0";
|
||||
|
||||
web-assets = fetchurl {
|
||||
url = "https://codeberg.org/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz";
|
||||
hash = "sha256-eExVquNTXkvxg0SAR60kXi5mnROp+tHNO3os1K+rWzU=";
|
||||
};
|
||||
in
|
||||
buildGo124Module rec {
|
||||
inherit version;
|
||||
pname = repo;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
inherit owner repo;
|
||||
tag = "v${version}";
|
||||
owner = "superseriousbusiness";
|
||||
repo = "gotosocial";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ifSm3tV8P435v7WUS2BYXfVS3FHu9Axz3IQWGdTw3Bg=";
|
||||
};
|
||||
|
||||
@@ -31,17 +24,46 @@ buildGo124Module rec {
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.Version=${version}"
|
||||
"-X main.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
tags = [
|
||||
"kvformat"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
yarn
|
||||
yarnConfigHook
|
||||
];
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/web/source/yarn.lock";
|
||||
hash = "sha256-rfZxslIEoOTufENIvk8Eq5wzdD3rUpUP3wrMjmLH44k=";
|
||||
};
|
||||
|
||||
# manually calling yarnConfigHook in sub-directory
|
||||
dontYarnInstallDeps = true;
|
||||
|
||||
postConfigure = ''
|
||||
pushd ./web/source
|
||||
runHook yarnConfigHook
|
||||
popd
|
||||
'';
|
||||
|
||||
# preparing assets
|
||||
# https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/.goreleaser.yml#L12
|
||||
preBuild = ''
|
||||
go run ./vendor/github.com/go-swagger/go-swagger/cmd/swagger generate spec --scan-models --exclude-deps -o web/assets/swagger.yaml
|
||||
substituteInPlace web/assets/swagger.yaml --replace-fail "REPLACE_ME" "${finalAttrs.version}"
|
||||
yarn --offline --cwd ./web/source ts-patch install
|
||||
yarn --offline --cwd ./web/source build
|
||||
./scripts/bundle_licenses.sh
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
tar xf ${web-assets}
|
||||
mkdir -p $out/share/gotosocial
|
||||
mv web $out/share/gotosocial/
|
||||
mkdir -p $out/share/gotosocial/web
|
||||
mv web/{assets,template} $out/share/gotosocial/web
|
||||
'';
|
||||
|
||||
# tests are working only on x86_64-linux
|
||||
@@ -63,7 +85,7 @@ buildGo124Module rec {
|
||||
|
||||
meta = {
|
||||
homepage = "https://gotosocial.org";
|
||||
changelog = "https://codeberg.org/superseriousbusiness/gotosocial/releases/tag/v${version}";
|
||||
changelog = "https://codeberg.org/superseriousbusiness/gotosocial/releases/tag/v${finalAttrs.version}";
|
||||
description = "Fast, fun, ActivityPub server, powered by Go";
|
||||
longDescription = ''
|
||||
ActivityPub social network server, written in Golang.
|
||||
@@ -78,4 +100,4 @@ buildGo124Module rec {
|
||||
];
|
||||
license = lib.licenses.agpl3Only;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,7 +11,7 @@ Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mkosi/sandbox.py b/mkosi/sandbox.py
|
||||
index 4a41f333a764bc41abbd36302bd9fe86baa45a3f..1ce102597f1935deadcec475ec873eab9ca03c22 100755
|
||||
index 4a41f333a764bc41abbd36302bd9fe86baa45a3f..1f7f133912c022a9fb3258437f4ed09872d79dd4 100755
|
||||
--- a/mkosi/sandbox.py
|
||||
+++ b/mkosi/sandbox.py
|
||||
@@ -124,7 +124,7 @@ class cap_user_data_t(ctypes.Structure):
|
||||
@@ -19,7 +19,7 @@ index 4a41f333a764bc41abbd36302bd9fe86baa45a3f..1ce102597f1935deadcec475ec873eab
|
||||
|
||||
|
||||
-libc = ctypes.CDLL(None, use_errno=True)
|
||||
+libc = ctypes.CDLL("@LIBC@", use_errno=True)
|
||||
+libc = ctypes.CDLL("@LIBC@" if os.path.exists("@LIBC@") else None, use_errno=True)
|
||||
|
||||
libc.syscall.restype = ctypes.c_long
|
||||
libc.unshare.argtypes = (ctypes.c_int,)
|
||||
@@ -28,7 +28,7 @@ index 4a41f333a764bc41abbd36302bd9fe86baa45a3f..1ce102597f1935deadcec475ec873eab
|
||||
return
|
||||
|
||||
- libseccomp = ctypes.CDLL("libseccomp.so.2")
|
||||
+ libseccomp = ctypes.CDLL("@LIBSECCOMP@")
|
||||
+ libseccomp = ctypes.CDLL("@LIBSECCOMP@" if os.path.exists("@LIBSECCOMP@") else "libseccomp.so.2")
|
||||
if libseccomp is None:
|
||||
raise FileNotFoundError("libseccomp.so.2")
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "newdoc";
|
||||
version = "2.18.6";
|
||||
version = "2.18.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redhat-documentation";
|
||||
repo = "newdoc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fd5B6xC/wKiaepHy5GsHeyqzghcnNCOT7GySfIEW8IM=";
|
||||
hash = "sha256-hAqmBH/Di9Zo5mB1lFp/wPAyRndoHWQRdRSWal1QFF8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6VIC+OZifbIRWKtbG+MFLxhK8C2PM1pFr3MjF2hf6vs=";
|
||||
cargoHash = "sha256-S8rjpRsL50f3YqLTwIpch0/sBQZhIlFnMu25tIZFXtU=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ else
|
||||
''
|
||||
# Install XDG Desktop file and its icon
|
||||
install -Dm444 ${appimageContents}/${internal_filename}.desktop -t $out/share/applications
|
||||
install -Dm444 ${appimageContents}/${internal_filename}.png -t $out/share/pixmaps
|
||||
install -Dm444 ${appimageContents}/${internal_filename}.png -t $out/share/icons/hicolor/512x512/apps
|
||||
|
||||
# Replace wrong exec statement in XDG Desktop file
|
||||
substituteInPlace $out/share/applications/${internal_filename}.desktop \
|
||||
|
||||
@@ -25,6 +25,11 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
env.CGO_ENABLED = 1;
|
||||
|
||||
ldflags = [
|
||||
"-X=github.com/ory/cli/buildinfo.Version=v${finalAttrs.version}"
|
||||
"-X=github.com/ory/cli/buildinfo.GitHash=${finalAttrs.src.rev}"
|
||||
];
|
||||
|
||||
tags = [
|
||||
"sqlite"
|
||||
];
|
||||
@@ -49,6 +54,7 @@ buildGoModule (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
luleyleo
|
||||
nicolas-goudry
|
||||
debtquity
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-OmLPeawkiLQed4HVT/H9qhxSa3Lgl90efWLverudbDs=";
|
||||
hash = "sha256-gx944B8/KKwkQeZrEBcVYscaAwA1OJOqBbvCd/E8xZY=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -35,14 +35,6 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-5yd4YHVJH5+iBN5z0SYdTB0ay6vY4XwM/CCDjbEux74=";
|
||||
};
|
||||
|
||||
# display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.
|
||||
# This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware.
|
||||
# It would be better to fix the OpenGL problem, but that seems much more intrusive.
|
||||
postPatch = ''
|
||||
substituteInPlace app/src/display.c \
|
||||
--replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
meson
|
||||
|
||||
@@ -30,6 +30,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
"chromadb"
|
||||
"psutil"
|
||||
"setuptools"
|
||||
"stop-words"
|
||||
"ollama"
|
||||
];
|
||||
|
||||
|
||||
@@ -20,16 +20,16 @@ let
|
||||
television = rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "television";
|
||||
|
||||
version = "0.15.2";
|
||||
version = "0.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexpasmantier";
|
||||
repo = "television";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-IE5l6j7sWRBcnujmCh78H5dGIAZtr5Nl62f2F5aQX1g=";
|
||||
hash = "sha256-ZVQdh9C0kd6O+PDcSSCPvzPa66Cl3J+2so1sTKjSM1I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WHRSjq7J6qugWHiKlvVeLCmkg+M81AXbghavM1sVsLE=";
|
||||
cargoHash = "sha256-eQBwoDSvRPAIJ7l2QsyQtCEdwWXdBjf/8Y1FoikkrSw=";
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "timoni";
|
||||
version = "0.25.2";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stefanprodan";
|
||||
repo = "timoni";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-u59+FGBURP3p1zosZU+6IfCZMHl4plrf/8/FUUgj/qw=";
|
||||
hash = "sha256-KdUFIGbP6tG7LVYUJFhVtgSfc1FSjlNOLCc+kQqGP4A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bWhXhZJHdiWY/Yz0l2VAPKJrMVb9XbvVEGPNZIQtvFQ=";
|
||||
vendorHash = "sha256-UGpwdcITI8/aJ3Mt4dJ3xJRxLrohX2sHD3DGEJgQeo4=";
|
||||
|
||||
subPackages = [ "cmd/timoni" ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "versitygw";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "versity";
|
||||
repo = "versitygw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XdBIDSiBJVpiQgpQXI0qIbaqFVswxEoXGze2Nxes3lg=";
|
||||
hash = "sha256-1SQE0bhv8L70Fdm6CvV2/kq945jvzZretVPsT8dGOJY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-z+m5ez17yF+GcUHyKU6a3Q69A6ACBVk0gCjKIaIJ554=";
|
||||
vendorHash = "sha256-x9KrZRso/7LfBCbBfCvwqnFKOWS4SEYw6DwxpEAHfZ8=";
|
||||
|
||||
# Require access to online S3 services
|
||||
doCheck = false;
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
libiconv,
|
||||
bashNonInteractive,
|
||||
updateAutotoolsGnuConfigScriptsHook,
|
||||
gnulib,
|
||||
}:
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
@@ -69,20 +68,6 @@ stdenv.mkDerivation rec {
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isMinGW ''
|
||||
sed -i "s/@GNULIB_CLOSE@/1/" */*/unistd.in.h
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isCygwin ''
|
||||
for gnulib in \
|
||||
./libtextstyle/lib \
|
||||
./gettext-tools/libgettextpo \
|
||||
./gettext-tools/gnulib-lib \
|
||||
./gettext-runtime/libasprintf/gnulib-lib \
|
||||
./gettext-runtime/intl/gnulib-lib \
|
||||
./gettext-runtime/gnulib-lib
|
||||
do
|
||||
cd "$gnulib"
|
||||
patch -p2 < ${gnulib.patches.memcpy-fix}
|
||||
cd -
|
||||
done
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -1,106 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
cxxopts,
|
||||
deepsearch-toolkit,
|
||||
docling-core,
|
||||
fasttext,
|
||||
fmt,
|
||||
loguru,
|
||||
matplotlib,
|
||||
nlohmann_json,
|
||||
pandas,
|
||||
pcre2,
|
||||
pkg-config,
|
||||
poetry-core,
|
||||
pybind11,
|
||||
python-dotenv,
|
||||
requests,
|
||||
rich,
|
||||
sentencepiece,
|
||||
tabulate,
|
||||
tqdm,
|
||||
utf8cpp,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deepsearch-glm";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DS4SD";
|
||||
repo = "deepsearch-glm";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3sJNkrx0tTm6RMYAwV8Aha7x8dZjf4tGdds8OScRff8=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
pybind11
|
||||
];
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = "-I${lib.getDev utf8cpp}/include/utf8cpp";
|
||||
USE_SYSTEM_DEPS = true;
|
||||
};
|
||||
|
||||
optional-dependencies = {
|
||||
docling = [
|
||||
docling-core
|
||||
pandas
|
||||
];
|
||||
pyplot = [
|
||||
matplotlib
|
||||
];
|
||||
toolkit = [
|
||||
deepsearch-toolkit
|
||||
python-dotenv
|
||||
];
|
||||
utils = [
|
||||
pandas
|
||||
python-dotenv
|
||||
requests
|
||||
rich
|
||||
tabulate
|
||||
tqdm
|
||||
];
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
cxxopts
|
||||
fasttext
|
||||
fmt
|
||||
loguru
|
||||
nlohmann_json
|
||||
pcre2
|
||||
sentencepiece
|
||||
utf8cpp
|
||||
zlib
|
||||
];
|
||||
|
||||
# Test suite insists on downloading models, data etc. from s3 bucket
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"deepsearch_glm"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/DS4SD/deepsearch-glm/releases/tag/v${version}";
|
||||
description = "Create fast graph language models from converted PDF documents for knowledge extraction and Q&A";
|
||||
homepage = "https://github.com/DS4SD/deepsearch-glm";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ booxter ];
|
||||
};
|
||||
}
|
||||
@@ -62,14 +62,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "gftools";
|
||||
version = "0.9.993";
|
||||
version = "0.9.994";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = "gftools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YtT84/SNtKzAD7yYEw4iVOrSo+477M8hhnQxx0wYLsE=";
|
||||
hash = "sha256-9JTYmInM9kCZHjZQxtvs+qDwmrgJVUmJ+XAp3afIAYQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "knx-frontend";
|
||||
version = "2026.2.13.222258";
|
||||
version = "2026.3.2.183756";
|
||||
pyproject = true;
|
||||
|
||||
# TODO: source build, uses yarn.lock
|
||||
src = fetchPypi {
|
||||
pname = "knx_frontend";
|
||||
inherit version;
|
||||
hash = "sha256-GypWNCGTzP7LYilVRZ//Eu0P8RjHJ946CzRXl64mISQ=";
|
||||
hash = "sha256-OaY14AY3iaAbs8EDCLDI1LmwjtOcz1NBBWhZEU2apjI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -19,8 +19,7 @@
|
||||
numpy,
|
||||
protobuf,
|
||||
pillow,
|
||||
decorator,
|
||||
astor,
|
||||
networkx,
|
||||
opt-einsum,
|
||||
rdma-core,
|
||||
safetensors,
|
||||
@@ -74,15 +73,18 @@ buildPythonPackage {
|
||||
|
||||
buildInputs = lib.optionals cudaSupport [ rdma-core ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
opt-einsum
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
setuptools
|
||||
httpx
|
||||
numpy
|
||||
protobuf
|
||||
pillow
|
||||
decorator
|
||||
astor
|
||||
opt-einsum
|
||||
networkx
|
||||
safetensors
|
||||
typing-extensions
|
||||
];
|
||||
@@ -133,6 +135,7 @@ buildPythonPackage {
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
broken = true;
|
||||
description = "Machine Learning Framework from Industrial Practice";
|
||||
homepage = "https://github.com/PaddlePaddle/Paddle";
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
@@ -10719,7 +10719,6 @@ with pkgs;
|
||||
trustedqsl = tqsl; # Alias added 2019-02-10
|
||||
|
||||
transmission_4 = callPackage ../applications/networking/p2p/transmission/4.nix {
|
||||
fmt = fmt_9;
|
||||
libutp = libutp_3_4;
|
||||
};
|
||||
libtransmission_4 = transmission_4.override {
|
||||
|
||||
@@ -137,6 +137,7 @@ mapAliases {
|
||||
datatable = throw "'datatable' has been removed due to lack of upstream maintenance"; # added 2026-02-02
|
||||
dateutil = throw "'dateutil' has been renamed to/replaced by 'python-dateutil'"; # Converted to throw 2025-10-29
|
||||
debian = throw "'debian' has been renamed to/replaced by 'python-debian'"; # Converted to throw 2025-10-29
|
||||
deepsearch-glm = throw "'deepsearch-glm' has been removed due to lack of upstream maintenance"; # Added 2025-03-04
|
||||
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
|
||||
digital-ocean = throw "'digital-ocean' has been renamed to/replaced by 'python-digitalocean'"; # Converted to throw 2025-10-29
|
||||
|
||||
@@ -3770,10 +3770,6 @@ self: super: with self; {
|
||||
|
||||
deepmerge = callPackage ../development/python-modules/deepmerge { };
|
||||
|
||||
deepsearch-glm = callPackage ../development/python-modules/deepsearch-glm {
|
||||
inherit (pkgs) loguru sentencepiece fasttext;
|
||||
};
|
||||
|
||||
deepsearch-toolkit = callPackage ../development/python-modules/deepsearch-toolkit { };
|
||||
|
||||
deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { };
|
||||
|
||||
Reference in New Issue
Block a user