Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-03-13 09:24:36 +00:00
committed by GitHub
51 changed files with 1301 additions and 9360 deletions

View File

@@ -570,6 +570,8 @@
- `services.kmonad` now creates a determinate symlink (in `/dev/input/by-id/`) to each of KMonad virtual devices.
- `services.searx` now supports configuration of the favicons cache and other options available in SearXNG's `favicons.toml` file
- `services.gitea` now supports CAPTCHA usage through the `services.gitea.captcha` variable.
- `services.soft-serve` now restarts upon config change.

View File

@@ -603,9 +603,10 @@ in
''
)
+ ''
# clear cache after update (before migrations)
OLD_VERSION=$(cat ${cfg.dataDir}/version)
if [[ $OLD_VERSION != "${package.version}" ]]; then
# clear cache if package has changed (cache may contain cached paths
# to the old package)
OLD_PACKAGE=$(cat ${cfg.dataDir}/package)
if [[ $OLD_PACKAGE != "${package}" ]]; then
rm -r ${cfg.dataDir}/cache/*
fi
@@ -616,16 +617,21 @@ in
echo "${lib.boolToString cfg.enableOneMinutePolling}" > ${cfg.dataDir}/one_minute_enabled
fi
# migrate db
${artisanWrapper}/bin/librenms-artisan migrate --force --no-interaction
# regenerate cache after migrations after update
# migrate db if package version has changed
# not necessary for every package change
OLD_VERSION=$(cat ${cfg.dataDir}/version)
if [[ $OLD_VERSION != "${package.version}" ]]; then
${artisanWrapper}/bin/librenms-artisan migrate --force --no-interaction
echo "${package.version}" > ${cfg.dataDir}/version
fi
# regenerate cache if package has changed
if [[ $OLD_PACKAGE != "${package}" ]]; then
${artisanWrapper}/bin/librenms-artisan view:clear
${artisanWrapper}/bin/librenms-artisan optimize:clear
${artisanWrapper}/bin/librenms-artisan view:cache
${artisanWrapper}/bin/librenms-artisan optimize
echo "${package.version}" > ${cfg.dataDir}/version
echo "${package}" > ${cfg.dataDir}/package
fi
'';
};
@@ -693,6 +699,7 @@ in
"d ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -"
"f ${cfg.dataDir}/.env 0600 ${cfg.user} ${cfg.group} - -"
"f ${cfg.dataDir}/version 0600 ${cfg.user} ${cfg.group} - -"
"f ${cfg.dataDir}/package 0600 ${cfg.user} ${cfg.group} - -"
"f ${cfg.dataDir}/one_minute_enabled 0600 ${cfg.user} ${cfg.group} - -"
"f ${cfg.dataDir}/config.json 0600 ${cfg.user} ${cfg.group} - -"
"d ${cfg.dataDir}/storage 0700 ${cfg.user} ${cfg.group} - -"

View File

@@ -11,6 +11,7 @@ let
(builtins.toJSON cfg.settings);
limiterSettingsFile = (pkgs.formats.toml { }).generate "limiter.toml" cfg.limiterSettings;
faviconsSettingsFile = (pkgs.formats.toml { }).generate "favicons.toml" cfg.faviconsSettings;
generateConfig = ''
cd ${runDir}
@@ -143,6 +144,35 @@ in
'';
};
faviconsSettings = mkOption {
type = types.attrsOf settingType;
default = { };
example = literalExpression ''
{
favicons = {
cfg_schema = 1;
cache = {
db_url = "/run/searx/faviconcache.db";
HOLD_TIME = 5184000;
LIMIT_TOTAL_BYTES = 2147483648;
BLOB_MAX_BYTES = 40960;
MAINTENANCE_MODE = "auto";
MAINTENANCE_PERIOD = 600;
};
};
}
'';
description = ''
Favicons settings for SearXNG.
::: {.note}
For available settings, see the SearXNG
[schema file](https://github.com/searxng/searxng/blob/master/searx/favicons/favicons.toml).
:::
'';
};
package = mkPackageOption pkgs "searxng" { };
runInUwsgi = mkOption {
@@ -263,8 +293,13 @@ in
port = 0;
};
environment.etc."searxng/limiter.toml" = lib.mkIf (cfg.limiterSettings != { }) {
source = limiterSettingsFile;
environment.etc = {
"searxng/limiter.toml" = lib.mkIf (cfg.limiterSettings != { }) {
source = limiterSettingsFile;
};
"searxng/favicons.toml" = lib.mkIf (cfg.faviconsSettings != { }) {
source = faviconsSettingsFile;
};
};
};

View File

@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "tinymist";
publisher = "myriad-dreamin";
inherit (tinymist) version;
hash = "sha256-yFEj55nbvPmkaOxU/wcCQtTkUfXNeEZmTGOFblfMDfc=";
hash = "sha256-OB+e4lerPONs7QDqHJO3pqU1yQ3BvM2k+Tz998ibmHo=";
};
nativeBuildInputs = [

View File

@@ -2,10 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
qmake,
qtbase,
qttools,
wrapQtAppsHook,
qt6,
copyDesktopItems,
}:
@@ -14,7 +11,7 @@ let
in
stdenv.mkDerivation rec {
pname = "xaos";
version = "4.2.1";
version = "4.3.3";
outputs = [
"out"
"man"
@@ -22,20 +19,22 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "xaos-project";
repo = pname;
rev = "release-${version}";
hash = "sha256-JLF8Mz/OHZEEJG/aryKQuJ6B5R8hPJdvln7mbKoqXFU=";
repo = "XaoS";
tag = "release-${version}";
hash = "sha256-EUhh1j0OVpCggpKcUJTRJOMKKy3ZF5Fdrk9yuXc2uEY=";
};
nativeBuildInputs = [
qmake
qttools
wrapQtAppsHook
qt6.qmake
qt6.qttools
qt6.wrapQtAppsHook
copyDesktopItems
];
buildInputs = [ qtbase ];
buildInputs = [ qt6.qtbase ];
QMAKE_LRELEASE = "lrelease";
DEFINES = [
"USE_OPENGL"
"USE_FLOAT128"
@@ -43,7 +42,7 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace src/include/config.h \
--replace "/usr/share/XaoS" "${datapath}"
--replace-fail "/usr/share/XaoS" "${datapath}"
'';
desktopItems = [ "xdg/xaos.desktop" ];
@@ -56,9 +55,10 @@ stdenv.mkDerivation rec {
mkdir -p "${datapath}"
cp -r tutorial examples catalogs "${datapath}"
install -D "xdg/${pname}.png" "$out/share/icons/${pname}.png"
install -D "xdg/xaos.png" "$out/share/icons/xaos.png"
install -D doc/xaos.6 "$man/man6/xaos.6"
runHook postInstall
'';

View File

@@ -0,0 +1,52 @@
{
fetchFromGitHub,
lib,
rustPlatform,
autoPatchelfHook,
pkg-config,
libxkbcommon,
libGL,
pipewire,
libpulseaudio,
wayland,
}:
rustPlatform.buildRustPackage rec {
pname = "ashell";
version = "0.4.0";
src = fetchFromGitHub {
owner = "MalpenZibo";
repo = "ashell";
tag = version;
hash = "sha256-a0yvmAq/4TDe+W1FLeLPSLppX81G6fdAOhzDmDJg3II=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-Vh/+4iApi+03ZmMIDSXc9Mn408v3wC+WlNJsXNcva+Q=";
nativeBuildInputs = [
pkg-config
autoPatchelfHook
rustPlatform.bindgenHook
];
runtimeDependencies = [
wayland
libGL
];
buildInputs = [
libpulseaudio
libxkbcommon
pipewire
] ++ runtimeDependencies;
meta = {
description = "Ready to go Wayland status bar for Hyprland";
homepage = "https://github.com/MalpenZibo/ashell";
license = lib.licenses.mit;
mainProgram = "ashell";
maintainers = with lib.maintainers; [ justdeeevin ];
platforms = lib.platforms.linux;
};
}

View File

@@ -15,12 +15,12 @@
}:
python3Packages.buildPythonApplication rec {
pname = "borgmatic";
version = "1.9.13";
version = "1.9.14";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-owz6R9rhDNBFkvaNnX/UbRAjXmKutRlYd/sybg/Im/k=";
hash = "sha256-w503lwXlKWlTsguzECUGmsbhvdJzTF4XK+Ib2KuD2DE=";
};
passthru.updateScript = nix-update-script { };

View File

@@ -7,7 +7,7 @@
buildPackages,
}:
let
version = "0.32.0";
version = "0.33.0";
in
buildGoModule {
pname = "csvtk";
@@ -17,7 +17,7 @@ buildGoModule {
owner = "shenwei356";
repo = "csvtk";
tag = "v${version}";
hash = "sha256-t1juidSPCOEFsApvMWW8F/gF2F6JwK0Ds7O/GSZRg30=";
hash = "sha256-Zacs1hw4pryVNxnrkLIoBNWo0jcKjtYdx6kW2LTFEIs=";
};
vendorHash = "sha256-T9flXxly3i8SKQlhp4AF2FNCqgcnGAHxv5b7nqzM3DI=";

View File

@@ -0,0 +1,42 @@
{
fetchzip,
gitUpdater,
lib,
stdenv,
nix-update-script,
}:
let
version = "2.3.29";
in
stdenv.mkDerivation {
pname = "flashspace";
inherit version;
src = fetchzip {
url = "https://github.com/wojciech-kulik/FlashSpace/releases/download/v${version}/FlashSpace.app.zip";
hash = "sha256-aBqlxIPPhx5GwNowf172Ko10g8RXnN7nIJaD3Zh4TPg=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/Applications/FlashSpace.app $out/bin
mv Contents $out/Applications/FlashSpace.app
ln -s ../Applications/Flashspace.app/Contents/Resources/flashspace $out/bin/flashspace
runHook postInstall
'';
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
license = lib.licenses.mit;
homepage = "https://github.com/wojciech-kulik/FlashSpace";
changelog = "https://github.com/wojciech-kulik/FlashSpace/releases/tag/v${version}";
description = "Blazingly fast virtual workspace manager for macOS";
platforms = lib.platforms.darwin;
maintainers = [ lib.maintainers.marcusramberg ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
};
}

View File

@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "lint-staged";
version = "15.4.3";
version = "15.5.0";
src = fetchFromGitHub {
owner = "okonet";
repo = "lint-staged";
rev = "v${version}";
hash = "sha256-TBh0qqe2sHSisBMU86TlGhSVrBFY9rgYs5uGSmSTT4g=";
hash = "sha256-xZ4fKwryGHVD1AhSKJVvBGIDJin10YejKxDp1yMi8Pg=";
};
npmDepsHash = "sha256-p0+Feii4riQ4TtNAQtPZ1bH/yA8q1tjm15IKNi1Ksvk=";
npmDepsHash = "sha256-KIZgJaVGwPAsMtKMINqSnqSuD3iJIqRmoUDkU4iPh/s=";
dontNpmBuild = true;

View File

@@ -1,42 +0,0 @@
From e84ddb20ca6b99ec2bf84bb3c3cfc3cdbbfd5ff2 Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Wed, 6 Nov 2024 02:11:30 -0800
Subject: [PATCH] fix: remove flaky test
---
src/view/pages/manga.rs | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/src/view/pages/manga.rs b/src/view/pages/manga.rs
index 119d9ea..7179a22 100644
--- a/src/view/pages/manga.rs
+++ b/src/view/pages/manga.rs
@@ -1853,25 +1853,4 @@ mod test {
assert_eq!(manga_page.bookmark_state.phase, BookmarkPhase::SearchingFromApi);
assert_eq!(expected, result)
}
-
- #[tokio::test]
- async fn it_sends_event_chapter_bookmarked_failed_to_fetch() {
- let (tx, _) = unbounded_channel();
- let mut manga_page = MangaPage::new(Manga::default(), None).with_global_sender(tx);
-
- flush_events(&mut manga_page);
-
- let api_client = TestApiClient::with_failing_response();
-
- manga_page.fetch_chapter_bookmarked(ChapterBookmarked::default(), api_client);
-
- let expected = MangaPageEvents::FetchBookmarkFailed;
-
- let result = timeout(Duration::from_millis(250), manga_page.local_event_rx.recv())
- .await
- .unwrap()
- .unwrap();
-
- assert_eq!(expected, result);
- }
}
--
2.46.1

View File

@@ -5,13 +5,12 @@
pkg-config,
dbus,
openssl,
sqlite,
stdenv,
darwin,
perl,
cacert,
nix-update-script,
}:
let
version = "0.5.0";
version = "0.6.0";
in
rustPlatform.buildRustPackage {
pname = "manga-tui";
@@ -21,27 +20,23 @@ rustPlatform.buildRustPackage {
owner = "josueBarretogit";
repo = "manga-tui";
rev = "v${version}";
hash = "sha256-kmJrr1Gi1z9v2gkFmvcCAtBST+AkofVJSxyvAFnUZKQ=";
hash = "sha256-L5KZaBJDG0z6NUGPJfbOkKCp1xQEzqfJ9GREx189VqU=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-YtRNMjip/KSWQYQh6Ye14b56u+DcK8WKE1nFK2zSWtM=";
cargoHash = "sha256-gmG/gDozYizwjcm3SGs2m8oLiuWp6oxJPOB3FlHfW+4=";
nativeBuildInputs = [ pkg-config ];
buildInputs =
[
openssl
sqlite
dbus
]
++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
[
Security
SystemConfiguration
]
);
buildInputs = [
dbus
(lib.getDev openssl)
];
checkInputs = [
perl
cacert
];
meta = {
description = "Terminal-based manga reader and downloader with image support";

View File

@@ -9,6 +9,7 @@
buildNpmPackage rec {
pname = "math-preview";
version = "5.1.1";
inherit nodejs;
src = fetchFromGitLab {
owner = "matsievskiysv";

View File

@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "moosefs";
version = "4.56.6";
version = "4.57.5";
src = fetchFromGitHub {
owner = "moosefs";
repo = "moosefs";
rev = "v${version}";
sha256 = "sha256-/ZvOwPE8SIwAbGITggzYwGuU1nAFIv0zF1IYu6FHGN8=";
sha256 = "sha256-5sVnr+bUbmIc4qYC/h+d/s1ow3cxeL2Yo/JitCs6cbE=";
};
nativeBuildInputs = [

File diff suppressed because it is too large Load Diff

View File

@@ -7,7 +7,7 @@
protobuf,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage {
pname = "openvmm";
version = "0-unstable-2024-10-19";
@@ -33,15 +33,8 @@ rustPlatform.buildRustPackage rec {
openssl
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"bitvec-1.1.0" = "sha256-uXOTbrGCSnl/F6IJPZuViZKXg4BEMG4+lVcLxK5KIwc=";
"ms-tpm-20-ref-0.1.0" = "sha256-eB3MWRlOPtxG55sLH7HIWzSjVEY05IIBZOltTpsGpnE=";
"mshv-bindings-0.1.1" = "sha256-CZEhFb9qDR260OFA/mlTldEMFlF8bhawVAxXFWqPIcU=";
"pbjson-build-0.5.1" = "sha256-itmY3c35O7j0Otb1qyr2IDUw1MBWOCB3WwyU60ajBO4=";
};
};
cargoHash = "sha256-6ciIbLc/L54Rhhf/IOnv63vUlqoXPi087taw6MY80HA=";
useFetchCargoVendor = true;
meta = with lib; {
homepage = "https://github.com/microsoft/openvmm";

View File

@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage rec {
pname = "pimsync";
version = "0.2.0";
version = "0.3.0";
src = fetchFromSourcehut {
owner = "~whynothugo";
repo = "pimsync";
rev = "v${version}";
hash = "sha256-mNOKAnBpCo4LFn7l16UG7V3cCJkUhRxhB/0jwoPLttM=";
hash = "sha256-IY+5n4sWlOzD29ERQ7CEsES0BizV68qnZt5NwCjLlfY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-2Uj+dDtuykQx1tBSGN3AE3Bz904bHfkbhKN3VIeG40M=";
cargoHash = "sha256-QRbjv8k7JEktHjfwJGwVReu9lynB817edsyClOoAwoA=";
PIMSYNC_VERSION = version;

View File

@@ -0,0 +1,34 @@
{
lib,
php,
fetchFromGitHub,
testers,
}:
php.buildComposerProject2 (finalAttrs: {
pname = "pretty-php";
version = "0.4.92";
src = fetchFromGitHub {
owner = "lkrms";
repo = "pretty-php";
tag = "v${finalAttrs.version}";
hash = "sha256-rKL6ViBEJf+GGxWood0DXVF8U7wuz22Z26SEdgDAJww=";
};
vendorHash = "sha256-V1oqMnDJgWujQXJJqyc2cvEvBbFv+KdXjXfb+sxs8/8=";
passthru = {
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "HOME=$TMPDIR pretty-php --version";
};
};
meta = {
description = "The opinionated PHP code formatter";
homepage = "https://github.com/lkrms/pretty-php";
license = lib.licenses.mit;
mainProgram = "pretty-php";
maintainers = with lib.maintainers; [ piotrkwiecinski ];
};
})

522
pkgs/by-name/ro/rockstarlang/deps.json generated Normal file
View File

@@ -0,0 +1,522 @@
[
{
"pname": "coverlet.collector",
"version": "6.0.0",
"hash": "sha256-IEmweTMapcPhFHpmJsPXfmMhravYOrWupgjeOvMmQ4o="
},
{
"pname": "DiffEngine",
"version": "11.3.0",
"hash": "sha256-aZbLawtOytbKPrF2DQ3dZOwgxjuaGsXKC0LwmlAw6V0="
},
{
"pname": "EmptyFiles",
"version": "4.4.0",
"hash": "sha256-2ej6ZYSr/KSz/Mmh0RavjIMMyHzzTVtyjd9nbW17IwY="
},
{
"pname": "Microsoft.CodeCoverage",
"version": "17.6.0",
"hash": "sha256-sYk+9Gj1M1HI6yEB8ZJQ4fiqGjYos+orebV8blFDSQs="
},
{
"pname": "Microsoft.NET.Runtime.WebAssembly.Sdk",
"version": "8.0.0",
"hash": "sha256-TFzAyDelOEoyDyFeRYnIoC0/suBE+K/AXRt+TgeCU+A="
},
{
"pname": "Microsoft.NET.Sdk.WebAssembly.Pack",
"version": "9.0.0",
"hash": "sha256-/BcLXLTo3fPenHYYYwm5Zorss3/Y4z2xUyruD1lAoVs="
},
{
"pname": "Microsoft.NET.Test.Sdk",
"version": "17.6.0",
"hash": "sha256-pogseJyMGIikTZORsDXKwyAhRPTkxiOAAV+ceR6/3K4="
},
{
"pname": "Microsoft.NETCore.App.Runtime.Mono.browser-wasm",
"version": "9.0.0",
"hash": "sha256-yFcS4z9mGt2dsYJMW47mkkqCVSPAVU2XGV/4aWM/iWE="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
},
{
"pname": "Microsoft.NETCore.Targets",
"version": "1.1.0",
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
},
{
"pname": "Microsoft.TestPlatform.ObjectModel",
"version": "17.6.0",
"hash": "sha256-weQPisiWSuM5VEeZco4S0QHEXd2bZZwlbyHoaCET4uc="
},
{
"pname": "Microsoft.TestPlatform.TestHost",
"version": "17.6.0",
"hash": "sha256-Ee2SKz5/571l1aYP0b/Gfamsz+v6cjzyu2sKTC6Ld5s="
},
{
"pname": "Microsoft.Win32.Primitives",
"version": "4.3.0",
"hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
},
{
"pname": "NCrunch.Framework",
"version": "5.1.0",
"hash": "sha256-c0z83mH5tCdR1SRiNM7q0EvrYgR2sg7QDcWpdxGdSuc="
},
{
"pname": "NETStandard.Library",
"version": "1.6.1",
"hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
},
{
"pname": "Newtonsoft.Json",
"version": "13.0.1",
"hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
},
{
"pname": "NuGet.Frameworks",
"version": "5.11.0",
"hash": "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="
},
{
"pname": "Pegasus",
"version": "4.1.0",
"hash": "sha256-JZVIOBpFo6CMhcafu1vKTtayVxmh0U33FmvVx3s+y6c="
},
{
"pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
},
{
"pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
},
{
"pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
},
{
"pname": "runtime.native.System",
"version": "4.3.0",
"hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
},
{
"pname": "runtime.native.System.IO.Compression",
"version": "4.3.0",
"hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
},
{
"pname": "runtime.native.System.Net.Http",
"version": "4.3.0",
"hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
},
{
"pname": "runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.0",
"hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
},
{
"pname": "runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
},
{
"pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
},
{
"pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.0",
"hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
},
{
"pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
},
{
"pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
},
{
"pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
},
{
"pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
},
{
"pname": "Shouldly",
"version": "4.2.1",
"hash": "sha256-lmueSFGoJFZcRdoUx+zOi+ewC8mTf8OPB2bGd3GeYA8="
},
{
"pname": "System.AppContext",
"version": "4.3.0",
"hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
},
{
"pname": "System.Buffers",
"version": "4.3.0",
"hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
},
{
"pname": "System.CodeDom",
"version": "6.0.0",
"hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="
},
{
"pname": "System.Collections",
"version": "4.3.0",
"hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
},
{
"pname": "System.Collections.Concurrent",
"version": "4.3.0",
"hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
},
{
"pname": "System.Collections.NonGeneric",
"version": "4.3.0",
"hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="
},
{
"pname": "System.Console",
"version": "4.3.0",
"hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
},
{
"pname": "System.Diagnostics.Debug",
"version": "4.3.0",
"hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "4.3.0",
"hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
},
{
"pname": "System.Diagnostics.Tools",
"version": "4.3.0",
"hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
},
{
"pname": "System.Diagnostics.Tracing",
"version": "4.3.0",
"hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
},
{
"pname": "System.Globalization",
"version": "4.3.0",
"hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
},
{
"pname": "System.Globalization.Calendars",
"version": "4.3.0",
"hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
},
{
"pname": "System.Globalization.Extensions",
"version": "4.3.0",
"hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
},
{
"pname": "System.IO",
"version": "4.3.0",
"hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
},
{
"pname": "System.IO.Compression",
"version": "4.3.0",
"hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
},
{
"pname": "System.IO.Compression.ZipFile",
"version": "4.3.0",
"hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
},
{
"pname": "System.IO.FileSystem",
"version": "4.3.0",
"hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
},
{
"pname": "System.IO.FileSystem.Primitives",
"version": "4.3.0",
"hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
},
{
"pname": "System.Linq",
"version": "4.3.0",
"hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
},
{
"pname": "System.Linq.Expressions",
"version": "4.3.0",
"hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
},
{
"pname": "System.Management",
"version": "6.0.1",
"hash": "sha256-g7bjwQv6af0kWiYtpXE8qgr1YMdD6Rf97TbhK5TxQG0="
},
{
"pname": "System.Net.Http",
"version": "4.3.0",
"hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
},
{
"pname": "System.Net.Primitives",
"version": "4.3.0",
"hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
},
{
"pname": "System.Net.Sockets",
"version": "4.3.0",
"hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
},
{
"pname": "System.ObjectModel",
"version": "4.3.0",
"hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
},
{
"pname": "System.Reflection",
"version": "4.3.0",
"hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
},
{
"pname": "System.Reflection.Emit",
"version": "4.3.0",
"hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
},
{
"pname": "System.Reflection.Emit.ILGeneration",
"version": "4.3.0",
"hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
},
{
"pname": "System.Reflection.Emit.Lightweight",
"version": "4.3.0",
"hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
},
{
"pname": "System.Reflection.Extensions",
"version": "4.3.0",
"hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
},
{
"pname": "System.Reflection.Metadata",
"version": "1.6.0",
"hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
},
{
"pname": "System.Reflection.Primitives",
"version": "4.3.0",
"hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
},
{
"pname": "System.Reflection.TypeExtensions",
"version": "4.3.0",
"hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
},
{
"pname": "System.Resources.ResourceManager",
"version": "4.3.0",
"hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
},
{
"pname": "System.Runtime",
"version": "4.3.0",
"hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.3.0",
"hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
},
{
"pname": "System.Runtime.Handles",
"version": "4.3.0",
"hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
},
{
"pname": "System.Runtime.InteropServices",
"version": "4.3.0",
"hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
},
{
"pname": "System.Runtime.InteropServices.RuntimeInformation",
"version": "4.3.0",
"hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
},
{
"pname": "System.Runtime.Numerics",
"version": "4.3.0",
"hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
},
{
"pname": "System.Security.Cryptography.Algorithms",
"version": "4.3.0",
"hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
},
{
"pname": "System.Security.Cryptography.Cng",
"version": "4.3.0",
"hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
},
{
"pname": "System.Security.Cryptography.Csp",
"version": "4.3.0",
"hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
},
{
"pname": "System.Security.Cryptography.Encoding",
"version": "4.3.0",
"hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
},
{
"pname": "System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
},
{
"pname": "System.Security.Cryptography.Primitives",
"version": "4.3.0",
"hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
},
{
"pname": "System.Security.Cryptography.X509Certificates",
"version": "4.3.0",
"hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
},
{
"pname": "System.Text.Encoding",
"version": "4.3.0",
"hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
},
{
"pname": "System.Text.Encoding.Extensions",
"version": "4.3.0",
"hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
},
{
"pname": "System.Text.RegularExpressions",
"version": "4.3.0",
"hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
},
{
"pname": "System.Threading",
"version": "4.3.0",
"hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
},
{
"pname": "System.Threading.Tasks",
"version": "4.3.0",
"hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.3.0",
"hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
},
{
"pname": "System.Threading.Timer",
"version": "4.3.0",
"hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
},
{
"pname": "System.Xml.ReaderWriter",
"version": "4.3.0",
"hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
},
{
"pname": "System.Xml.XDocument",
"version": "4.3.0",
"hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
},
{
"pname": "Validation",
"version": "2.4.18",
"hash": "sha256-ByITVSjsqVglWPIRaZ3i1P3bHh8+OB6BWgDA8f8qTFI="
},
{
"pname": "xunit",
"version": "2.4.2",
"hash": "sha256-tePXTtlRgTAhfnUzc13Y9MwowU/cKttl1qlzHLqhWS0="
},
{
"pname": "xunit.abstractions",
"version": "2.0.3",
"hash": "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="
},
{
"pname": "xunit.analyzers",
"version": "1.0.0",
"hash": "sha256-hZEaTaJN0bWw9q8tha5RziGlZ/lkDrj2S+QLQxgRjlw="
},
{
"pname": "xunit.assert",
"version": "2.4.2",
"hash": "sha256-wMyRXZzDn9Se4c0Pzzn0U4YuKRiUtu6o4MoPjJPPzUU="
},
{
"pname": "xunit.core",
"version": "2.4.2",
"hash": "sha256-jRFoW8LSuqDINuJlno3xT3VfdkHFVEbDKctU/mISIMc="
},
{
"pname": "xunit.extensibility.core",
"version": "2.4.0",
"hash": "sha256-LbuXEcEJjGn3L6FCbC119+MY/QLvfLlGkCeAsCsZqGE="
},
{
"pname": "xunit.extensibility.core",
"version": "2.4.2",
"hash": "sha256-wlTMUOQg5NaAPEsWkNSr8QSPbbCNSicpFajp1rowCsA="
},
{
"pname": "xunit.extensibility.execution",
"version": "2.4.0",
"hash": "sha256-chRJEazwq93yhVONlbtTI1znqYy0gdAoQajPRnhM/i4="
},
{
"pname": "xunit.extensibility.execution",
"version": "2.4.2",
"hash": "sha256-l5Q60IBYWE5tYJCdFEEQnO5rIlXcNEM5S4Ut8vFnL2U="
},
{
"pname": "xunit.runner.visualstudio",
"version": "2.4.5",
"hash": "sha256-Gv7U1VPKfNb7IOWrwUGUKAeurKtE3AtQmegDFNkYHHk="
},
{
"pname": "Xunit.SkippableFact",
"version": "1.4.13",
"hash": "sha256-pLtx0/2oTKYO1Y1Vg3k/Eli2OWHT5uorGdBp2uXvFfw="
}
]

View File

@@ -0,0 +1,44 @@
{
buildDotnetModule,
dotnetCorePackages,
fetchFromGitHub,
lib,
}:
buildDotnetModule (finalAttrs: {
pname = "rockstarlang";
version = "2.0.30";
src = fetchFromGitHub {
owner = "RockstarLang";
repo = "rockstar";
rev = "v${finalAttrs.version}";
hash = "sha256-IqdObwJm+TiNnNkDg1cbvDI029RLn9i3hxP+wFW730g=";
};
projectFile = "Starship/Rockstar/Rockstar.csproj";
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.dotnet_9.sdk;
selfContainedBuild = true;
executables = "rockstar";
doInstallCheck = true;
installCheckPhase = ''
{
echo 'Shout "it seems to work"'
echo 'exit'
} | $out/bin/rockstar | grep '« "it seems to work"'
'';
meta = {
description = "Esoteric programming language whose syntax is inspired by the lyrics to 80s hard rock and heavy metal songs";
homepage = "https://codewithrockstar.com";
license = lib.licenses.agpl3Only;
sourceProvenance = [ lib.sourceTypes.fromSource ];
maintainers = [ lib.maintainers.pinage404 ];
mainProgram = "rockstar";
};
})

View File

@@ -14,18 +14,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rofi-games";
version = "1.10.2";
version = "1.10.9";
src = fetchFromGitHub {
owner = "Rolv-Apneseth";
repo = "rofi-games";
tag = "v${finalAttrs.version}";
hash = "sha256-4L3gk/RG9g5QnUW1AJkZIl0VkBiO/L0HUBC3pibN/qo=";
hash = "sha256-VkhavN1nte0JYRn8PRER9B6baGiRr4Qr/L/yZ0cXZmc=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-jTc4dAp7OogjYZWqtxVcjJc2sPozRLM5WcgMe7QS09s=";
hash = "sha256-Ld6lFljnfNUwhoDOb8XdFka87E0Y+KN1GFnubUza/LY=";
};
patches = [

View File

@@ -7,11 +7,11 @@
let
pname = "simplex-chat-desktop";
version = "6.2.5";
version = "6.3.0";
src = fetchurl {
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
hash = "sha256-7A/2FgB35SyBO1GZagChwNytFn2aSzPiAFBeHk316bw=";
hash = "sha256-p2NPBJyAfWkpM6Ws0Xm4Vyt3DIbfl+soYfYfqjV4cY0=";
};
appimageContents = appimageTools.extract {

View File

@@ -119,6 +119,12 @@ stdenv.mkDerivation rec {
-i '{}' ';'
'';
# FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009
preConfigure = ''
substituteInPlace build-aux/ltmain.sh \
--replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a'
'';
hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "stackprotector";
doCheck = true; # very basic checks, does not test any libraries

View File

@@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "tinymist";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.13.4";
version = "0.13.8";
src = fetchFromGitHub {
owner = "Myriad-Dreamin";
repo = "tinymist";
tag = "v${finalAttrs.version}";
hash = "sha256-vNkHaEKKixTCOxwCtg1ZWAGLqEoGZ8o4ElX0YXdGfsQ=";
hash = "sha256-dKLHZyFkTo6iCw/s73asJqXoNBpYx7UC/r2qVp5dLjs=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-P237gym5SG5wWW1EqUzOvuS20A2Z31oA+kJ8pC3Tsk8=";
cargoHash = "sha256-XbPqddmVv5zubnbT5IewAcvPJWQMIumWgGI+q/r1Ip4=";
nativeBuildInputs = [
installShellFiles
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "-V" ];
versionCheckProgramArg = "-V";
doInstallCheck = true;
passthru = {

View File

@@ -0,0 +1,42 @@
{
lib,
fetchFromGitHub,
rustPlatform,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "uutils-diffutils";
version = "0.4.2";
src = fetchFromGitHub {
owner = "uutils";
repo = "diffutils";
tag = "v${finalAttrs.version}";
hash = "sha256-IAgrCkhUC2Tkh+OM1lorpmD0GpsHUauLgU0KcmsvKb4=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-SiZIp0rJXl0ZqKaxLPtV1nypxSqKXW+NoFLxCVpW4OY=";
checkFlags = [
# called `Result::unwrap()` on an `Err` value: Os { code: 2, kind: NotFound, message: "No such file or directory" }
"--skip=ed_diff::tests::test_permutations"
"--skip=ed_diff::tests::test_permutations_reverse"
"--skip=ed_diff::tests::test_permutations_empty_lines"
];
passthru = {
updateScript = nix-update-script { };
};
meta = {
changelog = "https://github.com/uutils/diffutils/releases/tag/${finalAttrs.version}";
description = "Drop-in replacement of diffutils in Rust";
homepage = "https://github.com/uutils/diffutils";
license = lib.licenses.mit;
mainProgram = "diffutils";
maintainers = with lib.maintainers; [ drupol ];
platforms = lib.platforms.unix;
};
})

View File

@@ -0,0 +1,53 @@
{
lib,
fetchFromGitHub,
rustPlatform,
nix-update-script,
versionCheckHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "uutils-findutils";
version = "0.7.0";
src = fetchFromGitHub {
owner = "uutils";
repo = "findutils";
tag = finalAttrs.version;
hash = "sha256-EEyrXG9jybtYoBvjiXTCNg6/1WPchEGJcldB6Gqgmdc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-nZOa7O0S9ykFM9sH6aqlAPtv3hWKF/vAXZYNRnjcOj4=";
postInstall = ''
rm $out/bin/testing-commandline
'';
checkFlags = [
# assertion failed: deps.get_output_as_string().contains("./test_data/simple/subdir")
"--skip=find::tests::test_find_newer_xy_before_changed_time"
];
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/find";
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {
updateScript = nix-update-script { };
};
meta = {
changelog = "https://github.com/uutils/findutils/releases/tag/${finalAttrs.version}";
description = "Rust implementation of findutils";
homepage = "https://github.com/uutils/findutils";
license = lib.licenses.mit;
mainProgram = "find";
maintainers = with lib.maintainers; [
defelo
drupol
];
platforms = lib.platforms.unix;
};
})

View File

@@ -20,6 +20,7 @@ buildNpmPackage rec {
dontNpmBuild = true;
meta = {
broken = true; # Cannot find package 'slash'
description = "CLI tool for running Yeoman generators";
homepage = "https://github.com/yeoman/yo";
license = lib.licenses.bsd2;

View File

@@ -14,9 +14,11 @@ mkCoqDerivation rec {
defaultVersion =
with lib.versions;
lib.switch coq.version [
{ case = range "8.13" "9.0"; out = "5.2.0+20241009"; }
{ case = range "8.14" "9.0"; out = "5.2.1"; }
{ case = isEq "8.13"; out = "5.2.0+20241009"; }
{ case = range "8.10" "8.16"; out = "4.0.0"; }
] null;
release."5.2.1".sha256 = "sha256-3ExKHXIA8EnzAPzSbdB9FTN2OcLCVS5WtmrHOiN9UiQ=";
release."5.2.0+20241009".sha256 = "sha256-eg47YgnIonCq7XOUgh9uzoKsuFCvsOSTZhgFLNNcPD0=";
release."5.2.0+20241009".rev = "abd1c7d3935cf03f02bf90e028e6cd3d3dce7713";
release."5.2.0".sha256 = "sha256-rKLz7ekZf/9xcQefBRsAdULmk81olzQ1W28y61vCDsY=";

View File

@@ -13,12 +13,14 @@ mkCoqDerivation {
defaultVersion =
with lib.versions;
lib.switch coq.coq-version [
{ case = range "8.13" "9.0"; out = "4.2.2"; }
{ case = range "8.14" "9.0"; out = "4.2.3"; }
{ case = isEq "8.13"; out = "4.2.2"; }
{ case = range "8.12" "8.17"; out = "4.1.2"; }
{ case = range "8.9" "8.13"; out = "4.1.1"; }
{ case = range "8.6" "8.13"; out = "4.0.2"; }
{ case = isEq "8.5"; out = "1.2.8"; }
] null;
release."4.2.3".sha256 = "sha256-ldUjNd5daUu2B3v4tk20/iXFgyUuW4XHlbubTInpwcs=";
release."4.2.2".sha256 = "sha256-qr6o45Q90FK+kkBUJ+W7QhiA0YQRb1RUwwXUpTTFt8A=";
release."4.2.0".sha256 = "sha256-YHYtiz9hium96n3owL/C99AjJAFTlTCmmb2+ttevgMY=";
release."4.1.2".sha256 = "sha256:1l8mwakqp4wnppsldl8wp2j24h1jvadnvrsgf35xnvdyygypjp2v";

View File

@@ -96,6 +96,7 @@ mapAliases {
eask = pkgs.eask; # added 2023-08-17
inherit (pkgs.elmPackages) elm-test;
inherit (pkgs.elmPackages) elm-review;
escape-string-regexp = throw "escape-string-regexp was removed because it provides no executable"; # added 2025-03-12
inherit (pkgs) eslint; # Added 2024-08-28
inherit (pkgs) eslint_d; # Added 2023-05-26
inherit (pkgs) eas-cli; # added 2025-01-08
@@ -226,6 +227,7 @@ mapAliases {
inherit (pkgs) web-ext; # added 2023-08-20
inherit (pkgs) webpack-cli; # added 2024-12-03
webpack-dev-server = throw "webpack-dev-server has been removed. You should install it in your JS project instead."; # added 2024-12-05
webtorrent-cli = throw "webtorrent-cli has been removed because it was broken"; # added 2025-03-12
inherit (pkgs) wrangler; # added 2024-07-01
inherit (pkgs) write-good; # added 2023-08-20
inherit (pkgs) yalc; # added 2024-06-29

View File

@@ -44,5 +44,4 @@
purty = "purty";
pscid = "pscid";
vscode-json-languageserver = "vscode-json-languageserver";
webtorrent-cli = "webtorrent";
}

View File

@@ -79,7 +79,6 @@
, "elm-oracle"
, "emoj"
, "emojione"
, "escape-string-regexp"
, "esy"
, "fast-cli"
, "fauna-shell"
@@ -209,7 +208,6 @@
, "vscode-json-languageserver"
, "wavedrom-cli"
, "webpack"
, "webtorrent-cli"
, "wring"
, "@yaegassy/coc-nginx"
]

View File

@@ -55252,24 +55252,6 @@ in
bypassCache = true;
reconstructLock = true;
};
escape-string-regexp = nodeEnv.buildNodePackage {
name = "escape-string-regexp";
packageName = "escape-string-regexp";
version = "5.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz";
sha512 = "/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==";
};
buildInputs = globalBuildInputs;
meta = {
description = "Escape RegExp special characters";
homepage = "https://github.com/sindresorhus/escape-string-regexp#readme";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
esy = nodeEnv.buildNodePackage {
name = "esy";
packageName = "esy";
@@ -71420,445 +71402,6 @@ in
bypassCache = true;
reconstructLock = true;
};
webtorrent-cli = nodeEnv.buildNodePackage {
name = "webtorrent-cli";
packageName = "webtorrent-cli";
version = "5.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-5.1.3.tgz";
sha512 = "YAv7l6RLfPT97VNbwBaLJmrtZl8SOOl6waZT+Ud+glKsXvoyEknMtwivIXbgy41IXyp+sLTikTJqLuBEps8KjA==";
};
dependencies = [
(
sources."@silentbot1/nat-api-0.4.7"
// {
dependencies = [
sources."debug-4.4.0"
sources."ms-2.1.3"
sources."xml2js-0.6.2"
];
}
)
(
sources."@thaunknown/simple-peer-10.0.11"
// {
dependencies = [
sources."debug-4.4.0"
sources."ms-2.1.3"
];
}
)
(
sources."@thaunknown/simple-websocket-9.1.3"
// {
dependencies = [
sources."debug-4.4.0"
sources."ms-2.1.3"
];
}
)
sources."@thaunknown/thirty-two-1.0.5"
sources."@webtorrent/http-node-1.3.0"
sources."abort-controller-3.0.0"
sources."addr-to-ip-port-2.0.0"
sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0"
sources."b4a-1.6.7"
sources."bare-buffer-3.0.2"
sources."bare-events-2.5.4"
sources."bare-fs-4.0.1"
sources."bare-os-3.4.0"
sources."bare-path-3.0.0"
sources."bare-stream-2.6.5"
sources."base64-arraybuffer-1.0.2"
sources."base64-js-1.5.1"
sources."bencode-4.0.0"
sources."bep53-range-1.1.1"
sources."bitfield-4.2.0"
(
sources."bittorrent-dht-11.0.9"
// {
dependencies = [
sources."debug-4.4.0"
sources."ms-2.1.3"
];
}
)
(
sources."bittorrent-lsd-2.0.0"
// {
dependencies = [
sources."debug-4.4.0"
sources."ms-2.1.3"
];
}
)
sources."bittorrent-peerid-1.3.6"
(
sources."bittorrent-protocol-4.1.16"
// {
dependencies = [
sources."debug-4.4.0"
sources."ms-2.1.3"
];
}
)
(
sources."bittorrent-tracker-11.2.1"
// {
dependencies = [
sources."debug-4.4.0"
sources."ip-2.0.1"
sources."ms-2.1.3"
];
}
)
(
sources."bl-4.1.0"
// {
dependencies = [
sources."readable-stream-3.6.2"
];
}
)
sources."blob-to-buffer-1.2.9"
sources."block-iterator-1.1.1"
sources."buffer-5.7.1"
sources."buffer-from-1.1.2"
sources."bufferutil-4.0.9"
sources."cache-chunk-store-3.2.2"
sources."chalk-4.1.2"
sources."chardet-0.7.0"
sources."charset-1.0.1"
sources."chownr-1.1.4"
sources."chrome-dgram-3.0.6"
sources."chrome-dns-1.0.1"
sources."chrome-net-3.3.4"
sources."chunk-store-iterator-1.0.3"
sources."cli-cursor-3.1.0"
sources."cli-spinners-2.9.2"
sources."cli-width-3.0.0"
(
sources."cliui-8.0.1"
// {
dependencies = [
sources."wrap-ansi-7.0.0"
];
}
)
sources."clone-1.0.4"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."common-tags-1.8.2"
sources."compact2string-1.4.1"
sources."concat-stream-1.6.2"
sources."core-util-is-1.0.3"
sources."cpus-1.0.3"
sources."create-torrent-6.1.0"
sources."cross-fetch-ponyfill-1.0.3"
sources."cross-spawn-7.0.6"
sources."data-uri-to-buffer-4.0.1"
sources."debug-2.6.9"
sources."decompress-response-3.3.0"
sources."deep-extend-0.6.0"
sources."default-gateway-6.0.3"
sources."defaults-1.0.4"
sources."define-lazy-prop-2.0.0"
sources."detect-libc-2.0.3"
(
sources."dlnacasts-0.1.0"
// {
dependencies = [
sources."mime-1.6.0"
];
}
)
(
sources."ecstatic-4.1.4"
// {
dependencies = [
sources."mime-2.6.0"
];
}
)
sources."ee-first-1.1.1"
sources."elementtree-0.1.7"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."err-code-3.0.1"
sources."escalade-3.2.0"
sources."escape-html-1.0.3"
sources."escape-string-regexp-1.0.5"
sources."event-target-shim-5.0.1"
sources."execa-5.1.1"
sources."expand-template-2.0.3"
sources."external-editor-3.1.0"
sources."fast-fifo-1.3.2"
sources."fast-readable-async-iterator-2.0.0"
sources."fetch-blob-3.2.0"
sources."figures-3.2.0"
sources."filename-reserved-regex-3.0.0"
sources."formdata-polyfill-4.0.10"
sources."freelist-1.0.3"
(
sources."fs-chunk-store-4.1.0"
// {
dependencies = [
sources."thunky-1.1.0"
];
}
)
sources."fs-constants-1.0.0"
sources."fsa-chunk-store-1.3.0"
sources."get-caller-file-2.0.5"
sources."get-stdin-8.0.0"
sources."get-stream-6.0.1"
sources."github-from-package-0.0.0"
sources."has-flag-4.0.0"
sources."he-1.2.0"
sources."http-parser-js-0.4.13"
sources."human-signals-2.1.0"
sources."iconv-lite-0.4.24"
sources."ieee754-1.2.1"
sources."immediate-chunk-store-2.2.0"
sources."inherits-2.0.4"
sources."ini-1.3.8"
sources."inquirer-8.2.6"
sources."ip-1.1.9"
sources."ip-address-9.0.5"
(
sources."ip-set-2.2.0"
// {
dependencies = [
sources."ip-2.0.1"
];
}
)
sources."ipaddr.js-2.2.0"
sources."is-docker-2.2.1"
sources."is-file-1.0.0"
sources."is-fullwidth-code-point-3.0.0"
sources."is-interactive-1.0.0"
sources."is-stream-2.0.1"
sources."is-unicode-supported-0.1.0"
sources."is-wsl-2.2.0"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."join-async-iterator-1.1.1"
sources."jsbn-1.1.0"
sources."junk-4.0.1"
sources."k-bucket-5.1.0"
sources."k-rpc-5.1.0"
(
sources."k-rpc-socket-1.11.1"
// {
dependencies = [
sources."bencode-2.0.3"
];
}
)
sources."last-one-wins-1.0.4"
sources."limiter-1.1.5"
sources."load-ip-set-3.0.1"
sources."lodash-4.17.21"
sources."log-symbols-4.1.0"
sources."lru-3.1.0"
(
sources."lt_donthave-2.0.4"
// {
dependencies = [
sources."debug-4.4.0"
sources."ms-2.1.3"
];
}
)
sources."magnet-uri-6.2.0"
sources."memory-chunk-store-1.3.5"
sources."merge-stream-2.0.0"
sources."mime-3.0.0"
sources."mimic-fn-2.1.0"
sources."mimic-response-1.0.1"
sources."minimist-1.2.8"
sources."mkdirp-classic-0.5.3"
sources."moment-2.30.1"
sources."ms-2.0.0"
sources."mute-stream-0.0.8"
sources."napi-build-utils-2.0.0"
sources."netmask-2.0.2"
sources."network-address-1.1.2"
sources."node-abi-3.74.0"
(
sources."node-datachannel-0.12.0"
// {
dependencies = [
sources."node-domexception-2.0.1"
];
}
)
sources."node-domexception-1.0.0"
sources."node-fetch-3.3.2"
sources."node-gyp-build-4.8.4"
sources."node-ssdp-2.9.1"
sources."npm-run-path-4.0.1"
sources."on-finished-2.4.1"
sources."once-1.4.0"
sources."onetime-5.1.2"
sources."open-8.4.2"
sources."ora-5.4.1"
sources."os-tmpdir-1.0.2"
(
sources."parse-torrent-9.1.5"
// {
dependencies = [
sources."bencode-2.0.3"
sources."decompress-response-6.0.0"
sources."mimic-response-3.1.0"
sources."simple-get-4.0.1"
];
}
)
sources."path-key-3.1.1"
sources."piece-length-2.0.1"
(
sources."prebuild-install-7.1.3"
// {
dependencies = [
sources."decompress-response-6.0.0"
sources."mimic-response-3.1.0"
sources."simple-get-4.0.1"
];
}
)
sources."prettier-bytes-1.0.4"
sources."process-nextick-args-2.0.1"
sources."pump-3.0.2"
sources."queue-microtask-1.2.3"
sources."queue-tick-1.0.1"
sources."random-access-file-4.1.2"
sources."random-access-storage-3.0.2"
sources."random-iterate-1.0.1"
sources."randombytes-2.1.0"
sources."range-parser-1.2.1"
sources."rc-1.2.8"
sources."rc4-0.1.5"
sources."readable-stream-2.3.8"
sources."record-cache-1.2.0"
sources."require-directory-2.1.1"
sources."restore-cursor-3.1.0"
sources."run-async-2.4.1"
sources."run-parallel-1.2.0"
sources."run-parallel-limit-1.1.0"
sources."run-series-1.1.9"
sources."rusha-0.8.14"
sources."rxjs-7.8.2"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.1.4"
sources."semver-7.7.1"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."signal-exit-3.0.7"
sources."simple-concat-1.0.1"
sources."simple-get-2.8.2"
sources."simple-sha1-3.1.0"
sources."smart-buffer-4.2.0"
sources."socks-2.8.4"
sources."speed-limiter-1.0.2"
sources."split-1.0.1"
sources."sprintf-js-1.1.3"
sources."streamx-2.22.0"
sources."string-width-4.2.3"
sources."string2compact-2.0.1"
sources."string_decoder-1.1.1"
sources."strip-ansi-6.0.1"
sources."strip-final-newline-2.0.0"
sources."strip-json-comments-2.0.1"
sources."supports-color-7.2.0"
sources."tar-fs-2.1.2"
(
sources."tar-stream-2.2.0"
// {
dependencies = [
sources."readable-stream-3.6.2"
];
}
)
sources."text-decoder-1.2.3"
sources."thirty-two-1.0.2"
sources."through-2.3.8"
sources."throughput-1.0.1"
sources."thunky-0.1.0"
sources."tmp-0.0.33"
(
sources."torrent-discovery-11.0.15"
// {
dependencies = [
sources."debug-4.4.0"
sources."ms-2.1.3"
];
}
)
sources."torrent-piece-3.0.1"
sources."tslib-2.8.1"
sources."tunnel-agent-0.6.0"
sources."type-fest-0.21.3"
sources."typedarray-0.0.6"
sources."uint8-util-2.2.5"
sources."unordered-array-remove-1.0.2"
sources."upnp-device-client-1.0.2"
sources."upnp-mediarenderer-client-1.4.0"
sources."url-join-4.0.1"
(
sources."ut_metadata-4.0.3"
// {
dependencies = [
sources."debug-4.4.0"
sources."ms-2.1.3"
];
}
)
sources."ut_pex-4.0.4"
sources."utf-8-validate-6.0.5"
sources."util-deprecate-1.0.2"
sources."vlc-command-1.2.0"
sources."wcwidth-1.0.1"
sources."web-streams-polyfill-3.3.3"
sources."webrtc-polyfill-1.1.10"
(
sources."webtorrent-2.5.19"
// {
dependencies = [
sources."bep53-range-2.0.0"
sources."debug-4.4.0"
sources."get-stdin-9.0.0"
sources."magnet-uri-7.0.7"
sources."ms-2.1.3"
sources."parse-torrent-11.0.18"
];
}
)
sources."which-2.0.2"
sources."winreg-1.2.5"
sources."wrap-ansi-6.2.0"
sources."wrappy-1.0.2"
sources."ws-8.18.1"
sources."xml2js-0.4.23"
sources."xmlbuilder-11.0.1"
sources."y18n-5.0.8"
sources."yargs-17.7.2"
sources."yargs-parser-21.1.1"
];
buildInputs = globalBuildInputs;
meta = {
description = "WebTorrent, the streaming torrent client. For the command line.";
homepage = "https://webtorrent.io";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
wring = nodeEnv.buildNodePackage {
name = "wring";
packageName = "wring";

View File

@@ -335,8 +335,4 @@ final: prev: {
darwin.apple_sdk.frameworks.CoreText
];
};
webtorrent-cli = prev.webtorrent-cli.override {
buildInputs = [ final.node-gyp-build ];
};
}

View File

@@ -36,26 +36,36 @@
buildPythonPackage rec {
pname = "langchain-community";
version = "0.3.17";
version = "0.3.19";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-community==${version}";
hash = "sha256-+10Q8em74G5RU6VtDqhQJuDsjJ4/EjGM4a3xQzs3Qzo=";
hash = "sha256-U7L60GyxRQL9ze22Wy7g6ZdI/IFyAtUe1bRCconv6pg=";
};
sourceRoot = "${src.name}/libs/community";
build-system = [ pdm-backend ];
patches = [
# Remove dependency on blockbuster (not available in nixpkgs due to dependency on forbiddenfruit)
./rm-blockbuster.patch
];
pythonRelaxDeps = [
"langchain" # Can fail during updates where building sees the old langchain
"numpy"
"pydantic-settings"
"tenacity"
];
pythonRemoveDeps = [
"blockbuster"
];
dependencies = [
aiohttp
dataclasses-json
@@ -70,7 +80,6 @@ buildPythonPackage rec {
sqlalchemy
tenacity
];
pythonImportsCheck = [ "langchain_community" ];
nativeCheckInputs = [
@@ -111,6 +120,8 @@ buildPythonPackage rec {
"test_proper_inputs"
# pydantic.errors.PydanticUserError: `NatBotChain` is not fully defined; you should define `BaseCache`, then call `NatBotChain.model_rebuild()`.
"test_variable_key_naming"
# Fails due to the lack of blockbuster
"test_group_dependencies"
];
meta = {

View File

@@ -0,0 +1,37 @@
diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
index 63f3a83e0..61c2d6ce3 100644
--- a/tests/unit_tests/conftest.py
+++ b/tests/unit_tests/conftest.py
@@ -5,22 +5,22 @@ from importlib import util
from typing import Dict, Sequence
import pytest
-from blockbuster import blockbuster_ctx
+# from blockbuster import blockbuster_ctx
from pytest import Config, Function, Parser
-@pytest.fixture(autouse=True)
-def blockbuster() -> Iterator[None]:
- with blockbuster_ctx("langchain_community") as bb:
- (
- bb.functions["os.stat"]
- .can_block_in("langchain_community/utils/openai.py", "is_openai_v1")
- .can_block_in("httpx/_client.py", "_init_transport")
- )
- bb.functions["os.path.abspath"].can_block_in(
- "sqlalchemy/dialects/sqlite/pysqlite.py", "create_connect_args"
- )
- yield
+# @pytest.fixture(autouse=True)
+# def blockbuster() -> Iterator[None]:
+# with blockbuster_ctx("langchain_community") as bb:
+# (
+# bb.functions["os.stat"]
+# .can_block_in("langchain_community/utils/openai.py", "is_openai_v1")
+# .can_block_in("httpx/_client.py", "_init_transport")
+# )
+# bb.functions["os.path.abspath"].can_block_in(
+# "sqlalchemy/dialects/sqlite/pysqlite.py", "create_connect_args"
+# )
+# yield

View File

@@ -35,22 +35,31 @@
buildPythonPackage rec {
pname = "langchain-core";
version = "0.3.35";
version = "0.3.43";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-core==${version}";
hash = "sha256-bwNSeXQJsfbc4c8mSd0GtlVsQ/HRilNiyP6XLcEzL20=";
hash = "sha256-NrUh/7+O5m3SisxeWEnKUpar99tNcwTdEzHsZxQbLzc=";
};
sourceRoot = "${src.name}/libs/core";
patches = [
# Remove dependency on blockbuster (not available in nixpkgs due to dependency on forbiddenfruit)
./rm-blockbuster.patch
];
build-system = [ pdm-backend ];
pythonRelaxDeps = [ "tenacity" ];
pythonRemoveDependencies = [
"blockbuster"
];
dependencies = [
jsonpatch
langsmith
@@ -148,6 +157,8 @@ buildPythonPackage rec {
"test_rate_limit_astream"
];
disabledTestPaths = [ "tests/unit_tests/runnables/test_runnable_events_v2.py" ];
meta = {
description = "Building applications with LLMs through composability";
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core";

View File

@@ -0,0 +1,155 @@
diff --git a/pyproject.toml b/pyproject.toml
index a2cfc7adf..db37bd74a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -53,7 +53,7 @@ test = [
"responses<1.0.0,>=0.25.0",
"pytest-socket<1.0.0,>=0.7.0",
"pytest-xdist<4.0.0,>=3.6.1",
- "blockbuster~=1.5.18",
+ # "blockbuster~=1.5.18",
"numpy<2.0.0,>=1.24.0; python_version < \"3.12\"",
"numpy<3,>=1.26.0; python_version >= \"3.12\"",
"langchain-tests",
diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
index 6438c3037..aa301c337 100644
--- a/tests/unit_tests/conftest.py
+++ b/tests/unit_tests/conftest.py
@@ -5,35 +5,35 @@ from importlib import util
from uuid import UUID
import pytest
-from blockbuster import BlockBuster, blockbuster_ctx
+# from blockbuster import BlockBuster, blockbuster_ctx
from pytest import Config, Function, Parser
from pytest_mock import MockerFixture
-@pytest.fixture(autouse=True)
-def blockbuster() -> Iterator[BlockBuster]:
- with blockbuster_ctx("langchain_core") as bb:
- for func in ["os.stat", "os.path.abspath"]:
- (
- bb.functions[func]
- .can_block_in("langchain_core/_api/internal.py", "is_caller_internal")
- .can_block_in("langchain_core/runnables/base.py", "__repr__")
- .can_block_in(
- "langchain_core/beta/runnables/context.py", "aconfig_with_context"
- )
- )
-
- for func in ["os.stat", "io.TextIOWrapper.read"]:
- bb.functions[func].can_block_in(
- "langsmith/client.py", "_default_retry_config"
- )
-
- for bb_function in bb.functions.values():
- bb_function.can_block_in(
- "freezegun/api.py", "_get_cached_module_attributes"
- )
-
- yield bb
+# @pytest.fixture(autouse=True)
+# def blockbuster() -> Iterator[BlockBuster]:
+# with blockbuster_ctx("langchain_core") as bb:
+# for func in ["os.stat", "os.path.abspath"]:
+# (
+# bb.functions[func]
+# .can_block_in("langchain_core/_api/internal.py", "is_caller_internal")
+# .can_block_in("langchain_core/runnables/base.py", "__repr__")
+# .can_block_in(
+# "langchain_core/beta/runnables/context.py", "aconfig_with_context"
+# )
+# )
+
+# for func in ["os.stat", "io.TextIOWrapper.read"]:
+# bb.functions[func].can_block_in(
+# "langsmith/client.py", "_default_retry_config"
+# )
+
+# for bb_function in bb.functions.values():
+# bb_function.can_block_in(
+# "freezegun/api.py", "_get_cached_module_attributes"
+# )
+
+# yield bb
def pytest_addoption(parser: Parser) -> None:
diff --git a/tests/unit_tests/language_models/chat_models/test_rate_limiting.py b/tests/unit_tests/language_models/chat_models/test_rate_limiting.py
index ee6eefba9..4d39da58d 100644
--- a/tests/unit_tests/language_models/chat_models/test_rate_limiting.py
+++ b/tests/unit_tests/language_models/chat_models/test_rate_limiting.py
@@ -2,17 +2,17 @@ import time
from typing import Optional as Optional
import pytest
-from blockbuster import BlockBuster
+# from blockbuster import BlockBuster
from langchain_core.caches import InMemoryCache
from langchain_core.language_models import GenericFakeChatModel
from langchain_core.rate_limiters import InMemoryRateLimiter
-@pytest.fixture(autouse=True)
-def deactivate_blockbuster(blockbuster: BlockBuster) -> None:
- # Deactivate BlockBuster to not disturb the rate limiter timings
- blockbuster.deactivate()
+# @pytest.fixture(autouse=True)
+# def deactivate_blockbuster(blockbuster: BlockBuster) -> None:
+# # Deactivate BlockBuster to not disturb the rate limiter timings
+# blockbuster.deactivate()
def test_rate_limit_invoke() -> None:
diff --git a/tests/unit_tests/runnables/test_runnable_events_v2.py b/tests/unit_tests/runnables/test_runnable_events_v2.py
index e1e1f37b9..21d2f1600 100644
--- a/tests/unit_tests/runnables/test_runnable_events_v2.py
+++ b/tests/unit_tests/runnables/test_runnable_events_v2.py
@@ -15,7 +15,7 @@ from typing import (
)
import pytest
-from blockbuster import BlockBuster
+# from blockbuster import BlockBuster
from pydantic import BaseModel
from langchain_core.callbacks import CallbackManagerForRetrieverRun, Callbacks
@@ -2005,7 +2005,7 @@ EXPECTED_EVENTS = [
async def test_sync_in_async_stream_lambdas(blockbuster: BlockBuster) -> None:
"""Test invoking nested runnable lambda."""
- blockbuster.deactivate()
+ # blockbuster.deactivate()
def add_one(x: int) -> int:
return x + 1
diff --git a/tests/unit_tests/test_setup.py b/tests/unit_tests/test_setup.py
index 1df3c73a2..58e94de9a 100644
--- a/tests/unit_tests/test_setup.py
+++ b/tests/unit_tests/test_setup.py
@@ -1,15 +1,15 @@
import time
import pytest
-from blockbuster import BlockingError
+# from blockbuster import BlockingError
from langchain_core import sys_info
-async def test_blockbuster_setup() -> None:
- """Check if blockbuster is correctly setup."""
- # Blocking call outside of langchain_core is allowed.
- time.sleep(0.01) # noqa: ASYNC251
- with pytest.raises(BlockingError):
- # Blocking call from langchain_core raises BlockingError.
- sys_info.print_sys_info()
+# async def test_blockbuster_setup() -> None:
+# """Check if blockbuster is correctly setup."""
+# # Blocking call outside of langchain_core is allowed.
+# time.sleep(0.01) # noqa: ASYNC251
+# with pytest.raises(BlockingError):
+# # Blocking call from langchain_core raises BlockingError.
+# sys_info.print_sys_info()

View File

@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
poetry-core,
pdm-backend,
# dependencies
langchain-core,
@@ -17,19 +17,19 @@
buildPythonPackage rec {
pname = "langchain-groq";
version = "0.2.4";
version = "0.2.5";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-groq==${version}";
hash = "sha256-hXY0xmt0rvV/AhMZTR+UxMz0ba7pJjRzBRVn6XvX6cA=";
hash = "sha256-TXmAaEOK2qNglNAa02M027NXmocsxFaQi3tUFdmFQUQ=";
};
sourceRoot = "${src.name}/libs/partners/groq";
build-system = [ poetry-core ];
build-system = [ pdm-backend ];
pythonRelaxDeps = [ "langchain-core" ];

View File

@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "langchain-ollama";
version = "0.2.2";
version = "0.2.3";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-ollama==${version}";
hash = "sha256-Ex8GndMHPHwSSMKu1JxnfGpRj55fh3TR19b3E+KrLUs=";
hash = "sha256-G7faykRlpfmafSnSe/CdPW87uCtofBp7mLzbxZgBBhM=";
};
sourceRoot = "${src.name}/libs/partners/ollama";

View File

@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "langchain-openai";
version = "0.3.5";
version = "0.3.8";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-openai==${version}";
hash = "sha256-we9LPZeR/eIr+4uDXbBlTm43iapC+MCB0BrbH49Uknw=";
hash = "sha256-ooqIUHel/tAI0jNI/j7OXD9ytAH3pXQ3QN5YMhFt2ac=";
};
sourceRoot = "${src.name}/libs/partners/openai";

View File

@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
poetry-core,
pdm-backend,
# dependencies
httpx,
@@ -23,19 +23,19 @@
buildPythonPackage rec {
pname = "langchain-tests";
version = "0.3.8";
version = "0.3.13";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-tests==${version}";
hash = "sha256-IZJo4EZFVKinBQdacM5xQ8ip3qTB64eqwZ9n+Z5mzWY=";
hash = "sha256-N209wUGdlHkOZynhSSE+ZHylL7cK+8H3PfZIG/wvMd0=";
};
sourceRoot = "${src.name}/libs/standard-tests";
build-system = [ poetry-core ];
build-system = [ pdm-backend ];
dependencies = [
httpx

View File

@@ -40,18 +40,23 @@
buildPythonPackage rec {
pname = "langchain";
version = "0.3.18";
version = "0.3.20";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain==${version}";
hash = "sha256-oJ4lUbQqHNEqd9UdgLH0ZmTkdZpUbJ7UNsQyIrs8JvI=";
hash = "sha256-N209wUGdlHkOZynhSSE+ZHylL7cK+8H3PfZIG/wvMd0=";
};
sourceRoot = "${src.name}/libs/langchain";
patches = [
# blockbuster isn't supported in nixpkgs
./rm-blockbuster.patch
];
build-system = [ pdm-backend ];
buildInputs = [ bash ];
@@ -61,6 +66,10 @@ buildPythonPackage rec {
"tenacity"
];
pythonRemoveDeps = [
"blockbuster"
];
dependencies = [
aiohttp
langchain-core

View File

@@ -0,0 +1,68 @@
diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
index fed8dbec5..6144ad7b8 100644
--- a/tests/unit_tests/conftest.py
+++ b/tests/unit_tests/conftest.py
@@ -5,36 +5,36 @@ from importlib import util
from typing import Dict, Sequence
import pytest
-from blockbuster import blockbuster_ctx
+# from blockbuster import blockbuster_ctx
from pytest import Config, Function, Parser
-@pytest.fixture(autouse=True)
-def blockbuster() -> Iterator[None]:
- with blockbuster_ctx("langchain") as bb:
- bb.functions["io.TextIOWrapper.read"].can_block_in(
- "langchain/__init__.py", "<module>"
- )
-
- for func in ["os.stat", "os.path.abspath"]:
- (
- bb.functions[func]
- .can_block_in("langchain_core/runnables/base.py", "__repr__")
- .can_block_in(
- "langchain_core/beta/runnables/context.py", "aconfig_with_context"
- )
- )
-
- for func in ["os.stat", "io.TextIOWrapper.read"]:
- bb.functions[func].can_block_in(
- "langsmith/client.py", "_default_retry_config"
- )
-
- for bb_function in bb.functions.values():
- bb_function.can_block_in(
- "freezegun/api.py", "_get_cached_module_attributes"
- )
- yield
+# @pytest.fixture(autouse=True)
+# def blockbuster() -> Iterator[None]:
+# with blockbuster_ctx("langchain") as bb:
+# bb.functions["io.TextIOWrapper.read"].can_block_in(
+# "langchain/__init__.py", "<module>"
+# )
+
+# for func in ["os.stat", "os.path.abspath"]:
+# (
+# bb.functions[func]
+# .can_block_in("langchain_core/runnables/base.py", "__repr__")
+# .can_block_in(
+# "langchain_core/beta/runnables/context.py", "aconfig_with_context"
+# )
+# )
+
+# for func in ["os.stat", "io.TextIOWrapper.read"]:
+# bb.functions[func].can_block_in(
+# "langsmith/client.py", "_default_retry_config"
+# )
+
+# for bb_function in bb.functions.values():
+# bb_function.can_block_in(
+# "freezegun/api.py", "_get_cached_module_attributes"
+# )
+# yield
def pytest_addoption(parser: Parser) -> None:

View File

@@ -46,14 +46,14 @@
buildPythonPackage rec {
pname = "lm-eval";
version = "0.4.7";
version = "0.4.8";
pyproject = true;
src = fetchFromGitHub {
owner = "EleutherAI";
repo = "lm-evaluation-harness";
tag = "v${version}";
hash = "sha256-UEY0KrsgWoyj0fnKBca2yYjVTBFje6DdLfvnNFVYFHU=";
hash = "sha256-F8oy6XTovqiU7FQyuubRsiblSdvfZg9RPIyzRw2GH18=";
};
build-system = [
@@ -147,7 +147,7 @@ buildPythonPackage rec {
];
meta = {
changelog = "https://github.com/EleutherAI/lm-evaluation-harness/releases/tag/v${version}";
changelog = "https://github.com/EleutherAI/lm-evaluation-harness/releases/tag/${src.tag}";
description = "A framework for few-shot evaluation of language models";
homepage = "https://github.com/EleutherAI/lm-evaluation-harness";
license = [ lib.licenses.mit ];

View File

@@ -0,0 +1,22 @@
{
buildPythonPackage,
uv,
uv-build,
anyio,
pytestCheckHook,
}:
buildPythonPackage {
pname = "built-by-uv";
version = "0.1.0";
pyproject = true;
src = "${uv.src}/scripts/packages/built-by-uv";
build-system = [ uv-build ];
dependencies = [ anyio ];
pythonImportsCheck = [ "built_by_uv" ];
nativeCheckInputs = [ pytestCheckHook ];
}

View File

@@ -0,0 +1,43 @@
{
lib,
pkgs,
buildPythonPackage,
rustPlatform,
callPackage,
}:
buildPythonPackage {
pname = "uv-build";
pyproject = true;
inherit (pkgs.uv)
version
src
cargoDeps
cargoBuildFlags
;
nativeBuildInputs = [
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
];
buildAndTestSubdir = "crates/uv-build";
# $src/.github/workflows/build-binaries.yml#L139
maturinBuildFlags = [ "--profile=minimal-size" ];
pythonImportsCheck = [ "uv_build" ];
# The package has no tests
doCheck = false;
# Run the tests of a package built by `uv_build`.
passthru.tests.built-by-uv = callPackage ./built-by-uv.nix { inherit (pkgs) uv; };
meta = {
description = "A minimal build backend for uv";
inherit (pkgs.uv.meta) homepage changelog license;
maintainers = with lib.maintainers; [ bengsparks ];
};
}

View File

@@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec {
pname = "kubie";
version = "0.25.0";
version = "0.25.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "sbstp";
repo = "kubie";
sha256 = "sha256-/TwM9ba8h5U+PGAcpXb7rAyWZjsAV+EOTFmiAHRCxQU=";
sha256 = "sha256-aZM4rIYDEO1oezHeG2cL0O3hWrj7OJFzW/uFaX+cczw=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-qb3BtNGTOdxhSVYRvp/4LjlchjIPJnyXEzxMu06EBEM=";
cargoHash = "sha256-xRm1c7c7hZg419+2SgMpfX2w5HhLGYVA5HF+GnBZ+Yg=";
nativeBuildInputs = [ installShellFiles ];

View File

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
let
libnlPath = lib.getLib libnl;
in
''
lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace configure.ac \
--replace-fail /usr/include/libnl3 ${lib.getDev libnl}/include/libnl3
substituteInPlace linux/LibNl.c \

View File

@@ -15619,7 +15619,7 @@ with pkgs;
x32edit = callPackage ../applications/audio/midas/x32edit.nix { };
xaos = libsForQt5.callPackage ../applications/graphics/xaos { };
xaos = callPackage ../applications/graphics/xaos { };
xbindkeys-config = callPackage ../tools/X11/xbindkeys-config {
gtk = gtk2;
@@ -16860,6 +16860,10 @@ with pkgs;
cudaSupport = true;
};
math-preview = callPackage ../by-name/ma/math-preview/package.nix {
nodejs = nodejs_20;
};
or-tools = callPackage ../development/libraries/science/math/or-tools {
inherit (darwin) DarwinTools;
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;

View File

@@ -18143,6 +18143,8 @@ self: super: with self; {
uv = callPackage ../development/python-modules/uv { };
uv-build = callPackage ../development/python-modules/uv-build { };
uv-dynamic-versioning = callPackage ../development/python-modules/uv-dynamic-versioning { };
uvcclient = callPackage ../development/python-modules/uvcclient { };