Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-10-21 00:16:42 +00:00
committed by GitHub
126 changed files with 1333 additions and 1128 deletions
+11 -6
View File
@@ -2876,12 +2876,6 @@
githubId = 127523;
name = "Herman Fries";
};
BarinovMaxim = {
name = "Barinov Maxim";
email = "barinov274@gmail.com";
github = "barinov274";
githubId = 54442153;
};
BarrOff = {
name = "BarrOff";
github = "BarrOff";
@@ -17570,6 +17564,12 @@
name = "Sean Gilligan";
keys = [ { fingerprint = "3B66 ACFA D10F 02AA B1D5  2CB1 8DD0 D81D 7D1F C61A"; } ];
};
mshnwq = {
email = "mshnwq.com@gmail.com";
github = "mshnwq";
githubId = 68467027;
name = "Hayan Al-Machnouk";
};
msiedlarek = {
email = "mikolaj@siedlarek.pl";
github = "msiedlarek";
@@ -21846,6 +21846,11 @@
githubId = 32239737;
keys = [ { fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6"; } ];
};
rexies = {
name = "Rexiel Scarlet";
github = "Rexcrazy804";
githubId = 37258415;
};
rexxDigital = {
email = "joellarssonpriv@gmail.com";
github = "rexxDigital";
File diff suppressed because it is too large Load Diff
@@ -21,12 +21,12 @@
{
ada = buildGrammar {
language = "ada";
version = "0.0.0+rev=b23672d";
version = "0.0.0+rev=6c26c44";
src = fetchFromGitHub {
owner = "briot";
repo = "tree-sitter-ada";
rev = "b23672d313b4c994ab96fd54f1b7ff15eac68a55";
hash = "sha256-XkJmrMppr1+1uPQwqAHcf1XBccwGexL0euXZBUX7xlM=";
rev = "6c26c4413965dc7bacbccfa66503bf6b8228e254";
hash = "sha256-kxm6MVUktOzH6WVKZxgGO9kFFEUXk7NFk+twidsDNM0=";
};
meta.homepage = "https://github.com/briot/tree-sitter-ada";
};
@@ -330,12 +330,12 @@
};
cmake = buildGrammar {
language = "cmake";
version = "0.0.0+rev=cf97996";
version = "0.0.0+rev=c7b2a71";
src = fetchFromGitHub {
owner = "uyha";
repo = "tree-sitter-cmake";
rev = "cf9799600b2ba5e6620fdabddec3b2db8306bc46";
hash = "sha256-OxViW7H5fNc5BP072ob7GGgx1EYc6TiQEut0wHGrE1c=";
rev = "c7b2a71e7f8ecb167fad4c97227c838439280175";
hash = "sha256-+Lom3xjPmhhZr3G4aV054lbhLjvJsPaQalSqkKUijvU=";
};
meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
};
@@ -562,12 +562,12 @@
};
dot = buildGrammar {
language = "dot";
version = "0.0.0+rev=9ab8555";
version = "0.0.0+rev=71e2c52";
src = fetchFromGitHub {
owner = "rydesun";
repo = "tree-sitter-dot";
rev = "9ab85550c896d8b294d9b9ca1e30698736f08cea";
hash = "sha256-w4DInIT7mkTvQ6Hmi8yaAww6ktyNgRz0tPfBLGnOawQ=";
rev = "71e2c5241eef9de920a4efedfefd1d527dd9a118";
hash = "sha256-Z1XtNX1zV8xGlsaFbqh2VXPAx0fs4D7JxwqaEWSWcB0=";
};
meta.homepage = "https://github.com/rydesun/tree-sitter-dot";
};
@@ -1891,12 +1891,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=7eadef0";
version = "0.0.0+rev=47c3f2c";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "7eadef0de98de1170cdffb68c0931e375fc1b046";
hash = "sha256-/zOS9fvfnFotySPw2+DY9ob8s+PYJrRgb1ymx2l5JAc=";
rev = "47c3f2cf3b10016503f2577c2d99c15bb2053402";
hash = "sha256-1NmkSEGh6Y9BIGcdW4HrMNdqlKKfVHgcY1Amk4EKf8U=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2417,12 +2417,12 @@
};
qmljs = buildGrammar {
language = "qmljs";
version = "0.0.0+rev=0889da4";
version = "0.0.0+rev=0bec435";
src = fetchFromGitHub {
owner = "yuja";
repo = "tree-sitter-qmljs";
rev = "0889da4632bba3ec6f39ef4102625654890c15c1";
hash = "sha256-Twj2taG7xFTPXTvzDcWeIqxUAkuhsybwZvtwK/HiruE=";
rev = "0bec4359a7eb2f6c9220cd57372d87d236f66d59";
hash = "sha256-tV4lipey+OAQwygRFp9lQAzgCNiZzSu7p3Mr6CCBH1g=";
};
meta.homepage = "https://github.com/yuja/tree-sitter-qmljs";
};
@@ -2861,12 +2861,12 @@
};
sparql = buildGrammar {
language = "sparql";
version = "0.0.0+rev=d853661";
version = "0.0.0+rev=1ef52d3";
src = fetchFromGitHub {
owner = "GordianDziwis";
repo = "tree-sitter-sparql";
rev = "d853661ca680d8ff7f8d800182d5782b61d0dd58";
hash = "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU=";
rev = "1ef52d35a73a2a5f2e433ecfd1c751c1360a923b";
hash = "sha256-9DaV12dkcwF7/jWc4QaTQaHcKu5zO5evWlXGNZMdRqc=";
};
meta.homepage = "https://github.com/GordianDziwis/tree-sitter-sparql";
};
@@ -2883,12 +2883,12 @@
};
sql = buildGrammar {
language = "sql";
version = "0.0.0+rev=4afe285";
version = "0.0.0+rev=d71f2bd";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "4afe285bb142542cee0aa7b689fec00a71df4741";
hash = "sha256-Qzrun7sIjX+jyz0oh4MotfTSXAcEYSM/2+CAWJkXgVo=";
rev = "d71f2bd7f0e3dba84df7025fc9314738d180e71e";
hash = "sha256-udLPpb8ihPb9mXNicwZdml2bKeIDC0RD5i7SPshrN2g=";
};
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
};
@@ -2960,12 +2960,12 @@
};
superhtml = buildGrammar {
language = "superhtml";
version = "0.0.0+rev=aeaa0c7";
version = "0.0.0+rev=8b5bb27";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "superhtml";
rev = "aeaa0c7d9ef983453952a2ee4983476fef0168f3";
hash = "sha256-3mCdFn2ZsRFn/UI+frWD0MTx8qdiZldveYffpZ7nd98=";
rev = "8b5bb272b269afdd38cdf641c4a707dd92fbe902";
hash = "sha256-9RizfSi+ouCcLUL2+gPc8GljNo9KCX57VElLSlha05A=";
};
location = "tree-sitter-superhtml";
meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -3039,25 +3039,25 @@
};
systemverilog = buildGrammar {
language = "systemverilog";
version = "0.0.0+rev=e88937e";
version = "0.0.0+rev=7c4b01b";
src = fetchFromGitHub {
owner = "gmlarumbe";
repo = "tree-sitter-systemverilog";
rev = "e88937e66adc3ee7be0bfe40b7e937eafe4212bb";
hash = "sha256-wzsjHDn6ZdGfOlufARurxCTwT8HqMvyfsnIIpXzRUYs=";
rev = "7c4b01b7df2f6e7fa1f698c9d30ac8f93af18ed2";
hash = "sha256-u0a8yQfFwYbAhuT8VZjKPuTfBNwAaQ0e25CcIek0thc=";
};
meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
};
t32 = buildGrammar {
language = "t32";
version = "0.0.0+rev=d4e26ab";
src = fetchFromGitLab {
version = "0.0.0+rev=2f604ad";
src = fetchFromGitHub {
owner = "xasc";
repo = "tree-sitter-t32";
rev = "d4e26ab7a730cfbe0cf84dba6ea3647989064839";
hash = "sha256-awbgOZaIqpdjsskSr6by2AyojVRU+gkLgS70abhPryE=";
rev = "2f604ad17a15c09d99648199da7f173eed8250dc";
hash = "sha256-9J8wy/7qW4vWsIzpDI+lVWr/6158jrod0nSk3ihXUPI=";
};
meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32";
meta.homepage = "https://github.com/xasc/tree-sitter-t32";
};
tablegen = buildGrammar {
language = "tablegen";
@@ -3542,12 +3542,12 @@
};
xresources = buildGrammar {
language = "xresources";
version = "0.0.0+rev=fd546d4";
version = "0.0.0+rev=321231f";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-xresources";
rev = "fd546d43fe0a179b59dfdfb296082c584870e11b";
hash = "sha256-KbXPadsIADNqINBwjewDzkHHVoVhE6X0ltgWIPDGlrg=";
rev = "321231f99e3704f1555de14cda5dca93ee14a95b";
hash = "sha256-W7/eYAGC+usKoUdT4JgP+0d3/FykrK/lkBSvhy38qQE=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
};
@@ -1614,6 +1614,7 @@ assertNoAdditions {
"lazyvim.plugins.extras.editor.snacks_picker"
"lazyvim.plugins.extras.editor.telescope"
"lazyvim.plugins.extras.formatting.prettier"
"lazyvim.plugins.extras.lang.dotnet"
"lazyvim.plugins.extras.lang.markdown"
"lazyvim.plugins.extras.lang.omnisharp"
"lazyvim.plugins.extras.lang.python"
@@ -730,7 +730,7 @@ https://github.com/danymat/neogen/,HEAD,
https://github.com/NeogitOrg/neogit/,,
https://github.com/Shougo/neoinclude.vim/,,
https://github.com/neomake/neomake/,,
https://github.com/cdmill/neomodern.nvim/,HEAD,
https://github.com/casedami/neomodern.nvim/,HEAD,
https://github.com/Shougo/neomru.vim/,,
https://github.com/neomutt/neomutt.vim/,HEAD,
https://github.com/rafamadriz/neon/,,
@@ -262,8 +262,8 @@ let
mktplcRef = {
name = "ng-template";
publisher = "Angular";
version = "20.2.2";
hash = "sha256-2I5Pmd05zNGjM15tFo2yw6AGUKp3zxufVcoe4oSAO5U=";
version = "20.3.0";
hash = "sha256-o3e2qVKw/sfnFHbHHdRlB9UjEx1KLD1KVoaAsnlYjmY=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";
@@ -2283,8 +2283,8 @@ let
mktplcRef = {
name = "vscode-vibrancy-continued";
publisher = "illixion";
version = "1.1.60";
hash = "sha256-GHAyC9ScrBV/huVXXrgbubrBmKIzUhYmCL2+GqoOjqc=";
version = "1.1.61";
hash = "sha256-1LjAIMjk7JjLTf49QvDaLeGGDD5SUCLC3/41RfVVhEM=";
};
meta = {
downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "mednafen-psx" + lib.optionalString withHw "-hw";
version = "0-unstable-2025-10-03";
version = "0-unstable-2025-10-17";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-psx-libretro";
rev = "4968db4255bd8853137132c5d0809becd7638026";
hash = "sha256-MVcz+c5ExZZuda5ene4nhidd/zZNvXcAg+wCinQisME=";
rev = "6ac3c05aeddeb6dd5f28f448354d1f8e2e5d6810";
hash = "sha256-Y/ct+nDlbIZNRxRQJVsgaQs3mFODfuhToZdXairaesk=";
};
extraBuildInputs = lib.optionals withHw [
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
homepage = "https://benchmark.unigine.com/sanctuary";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.BarinovMaxim ];
maintainers = [ ];
platforms = [
"x86_64-linux"
"i686-linux"
@@ -143,7 +143,7 @@ buildFHSEnv {
homepage = "https://benchmark.unigine.com/superposition";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.BarinovMaxim ];
maintainers = [ ];
platforms = [ "x86_64-linux" ];
mainProgram = "unigine-superposition";
};
@@ -91,7 +91,7 @@ stdenv.mkDerivation {
homepage = "https://benchmark.unigine.com/tropics";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.BarinovMaxim ];
maintainers = [ ];
platforms = [
"x86_64-linux"
"i686-linux"
@@ -21,13 +21,13 @@
mkDerivation rec {
pname = "anilibria-winmaclinux";
version = "2.2.30";
version = "2.2.31";
src = fetchFromGitHub {
owner = "anilibria";
repo = "anilibria-winmaclinux";
rev = version;
hash = "sha256-iueodizzG0r50ZO2aowR5hR3AyLv8RsSJL1xnnCNMJc=";
hash = "sha256-czLEYPz+5vXHisXexzRXLhwN4onka31hn69F4MaSnCs=";
};
sourceRoot = "${src.name}/src";
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "caligula";
version = "0.4.9";
version = "0.4.10";
src = fetchFromGitHub {
owner = "ifd3f";
repo = "caligula";
rev = "v${version}";
hash = "sha256-eOhMT47QcuMpBxNT10KgXOCxmb36qhdvP0xQu0wVhbk=";
hash = "sha256-oaSt6wzMzaGHPyuJ5NVcAJLblHQcHJA5a7o2wkJgZkU=";
};
cargoHash = "sha256-p9ozKJsjUkNFxMaSPpO4iOg2/cfbSpSdzUFg3YnwEq0=";
cargoHash = "sha256-B09aKzNNhgXKg3PCYmlMz3/oOeeh1FQAL7+tywg/81Q=";
nativeBuildInputs = [
rustPlatform.bindgenHook
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.117";
version = "1.0.118";
src = fetchFromGitHub {
owner = "dtolnay";
repo = "cargo-expand";
tag = version;
hash = "sha256-IpqDab4JYZoWvtuEU4DkKimOhgZ/c5WsH58cVj4RzGU=";
hash = "sha256-+n4eiwcToXtWMPmvE41kOcZHzgugjekxQkodDagDjhI=";
};
cargoHash = "sha256-sAXRA+gStgMDi02yObN7lO2G4vQUeYqmUF09tC7k/Q0=";
cargoHash = "sha256-Di7Nnp8qYqpTkKmmUYoKxSkntepG80vVF2AkaN5yW+U=";
meta = {
description = "Cargo subcommand to show result of macro expansion";
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tarpaulin";
version = "0.33.0";
version = "0.34.0";
src = fetchFromGitHub {
owner = "xd009642";
repo = "tarpaulin";
tag = version;
hash = "sha256-yCuyeBL/7Dh9+V7fWvKkmj9OLGh88Jre7o0+TQXem9U=";
hash = "sha256-G7tzOprDzf+rC7PYPdjlX5VeJwADzpp3JOSK4t55zfA=";
};
cargoHash = "sha256-S3cIcw6ZDAn8DVbCM7T5t7R3t45iGuh5600KeKQNXS8=";
cargoHash = "sha256-RI+8QQSrxjXsfrqqoJ56UIG4rnhww0gqtjF59j43agU=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "check-jsonschema";
version = "0.34.0";
version = "0.34.1";
pyproject = true;
src = fetchFromGitHub {
owner = "python-jsonschema";
repo = "check-jsonschema";
tag = version;
hash = "sha256-NFP013ZG+Ltiqe+CLed4zeSQCS9E1r1L+b2AsYLMDW4=";
hash = "sha256-TI8NW8ULsig/YL6LC8L//YS0lSIUS2Ns9awFJ50ov2k=";
};
build-system = with python3Packages; [ setuptools ];
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.155.0";
version = "0.155.1";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = "cirrus-cli";
rev = "v${version}";
hash = "sha256-HMEd1G7CTK4P3fQ34wMOgd4GJ/7YALEL0UaqljB/44Y=";
hash = "sha256-ZjirC80wiW2iCflCWxCG4KpTxnZyLTeCXa6B/SJoiyI=";
};
vendorHash = "sha256-ag1HzNrSqGTJGXxhdspxHsJRBu7tuB5nDFiEWh1VOsU=";
@@ -10,11 +10,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "copilot-language-server";
version = "1.381.0";
version = "1.385.0";
src = fetchzip {
url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
hash = "sha256-EnctWGV+20onOTuaBW9E7LXct0PUpCn7WwuAy2X2KL8=";
hash = "sha256-AzMLicQHP3r8RZIkf/jqlU2n78bliLwam9t1DUgqvzw=";
stripRoot = false;
};
+4 -4
View File
@@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "discordo";
version = "0-unstable-2025-10-12";
version = "0-unstable-2025-10-16";
src = fetchFromGitHub {
owner = "ayn2op";
repo = "discordo";
rev = "eeeeb75c66ceeb4dfc2eef69f006a2665e1d66d8";
hash = "sha256-pct+C77K7ZBc4grfvJfDBoGaFed3UIrJRXXLlv6wUis=";
rev = "9a1bdac4fbb715374acc88f59e2ca614b72a5b2c";
hash = "sha256-pCY82Xzlq+QVOpr3aTthfcPXjTjuKfO63oqDD7Hl/sc=";
};
vendorHash = "sha256-+BBjVyyGR52ssp3pvODFOUmOcLa9PBXDhFlS9lsZF08=";
vendorHash = "sha256-lYlVr9sKceCaOFpv7owCeaP9PyZWh/U9lUrGjUh98hk=";
env.CGO_ENABLED = 0;
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "docuum";
version = "0.25.0";
version = "0.25.1";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = "docuum";
rev = "v${version}";
hash = "sha256-nWd6h39jU1eZWPFMxhxActsmrs9k0TDMlealuzTa+o0=";
hash = "sha256-fc+qEDYQGRxOSfFng3/K3xYWb8mKTuuKWanQS+/UIMo=";
};
cargoHash = "sha256-ce8mthEWvZ+U2+lU3gGrq1YBzbkiqUGJV5JUsZ+HhBg=";
cargoHash = "sha256-IryniHpSJDxjW6FRqTILKzp6XrTHxJ19BiYqRYIHnGo=";
checkFlags = [
# fails, no idea why
+3 -3
View File
@@ -8,7 +8,7 @@
let
themeName = "Dracula";
version = "4.0.0-unstable-2025-10-06";
version = "4.0.0-unstable-2025-10-15";
in
stdenvNoCC.mkDerivation {
pname = "dracula-theme";
@@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation {
src = fetchFromGitHub {
owner = "dracula";
repo = "gtk";
rev = "7fda0087e2f0781e6aa340b15851830fddcb708d";
hash = "sha256-1/gSV5hdWouW3yMgbtR2tDRA/bdPiYibMFtFhNyz8KQ=";
rev = "cd80d5ab1ab1904a367f34e33d7f672e44513bf8";
hash = "sha256-kAJicio2wONKVIK/whtoPe8uMErkbfbEoWWA85KMaBU=";
};
propagatedUserEnvPkgs = [
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "emcee";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "loopwork-ai";
repo = "emcee";
tag = "v${finalAttrs.version}";
hash = "sha256-k8W3kCVF1WuX5nYX75HvfMlxpEcVbuX2lZKlLOf1qGI=";
hash = "sha256-czOUhaPBxzuqZ72Y3TuzZ8r0Ab3OqGbDPZipkcak3Cw=";
};
vendorHash = "sha256-e8LPcKue7rhAh03uCRG0VTcwwyj3kDOBoeo3t7Hwvi0=";
@@ -0,0 +1,35 @@
{
lib,
stdenvNoCC,
fetchurl,
nix-update-script,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "everforest-cursors";
version = "3212590527";
src = fetchurl {
url = "https://github.com/talwat/everforest-cursors/releases/download/${finalAttrs.version}/everforest-cursors-variants.tar.bz2";
hash = "sha256-xXgtN9wbjbrGLUGYymMEGug9xEs9y44mq18yZVdbiuU=";
};
sourceRoot = ".";
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons
cp -r ./everforest-cursors* $out/share/icons
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Everforest cursor theme, based on phinger-cursors";
homepage = "https://github.com/talwat/everforest-cursors";
license = lib.licenses.cc-by-sa-40;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.stelcodes ];
};
})
+9 -1
View File
@@ -1,11 +1,11 @@
{
lib,
fetchpatch,
stdenv,
fetchFromGitHub,
cmake,
gitUpdater,
}:
stdenv.mkDerivation rec {
pname = "fatcat";
version = "1.1.1";
@@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
hash = "sha256-/iGNVP7Bz/UZAR+dFxAKMKM9jm07h0x0F3VGpdxlHdk=";
};
patches = [
# cmake: Set minimum required version to 3.5 for CMake 4+
(fetchpatch {
url = "https://github.com/Gregwar/fatcat/commit/2e3476a84cbe32598d36b5506c21025b3f94eb03.patch";
hash = "sha256-e5qGcpdHhbp2mZ7O3vBAJnSW5K2aXEfNVUfK/brx9a8=";
})
];
nativeBuildInputs = [
cmake
];
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "flitter";
version = "1.1.4";
version = "1.1.5";
src = fetchFromGitHub {
owner = "alexozer";
repo = "flitter";
tag = version;
hash = "sha256-2oK70WusLzLh2Pnb80S2rbpd7IFdApvIVvdYuhvkfBs=";
hash = "sha256-aXTQeUKhwa2uVipKIs8n0XBiWa5o7U6UMlAUlnzXyzE=";
};
cargoHash = "sha256-UiHy4k4yLgwLZrnR07It93gM3dShou9OD055yygWN24=";
cargoHash = "sha256-SOmq1txYMJGUVkkrE3kWmioaJzBX9raZ+ExFlPYGDM8=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -20,11 +20,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "foxglove-studio";
version = "2.37.0";
version = "2.38.0";
src = fetchurl {
url = "https://get.foxglove.dev/desktop/v${finalAttrs.version}/foxglove-studio-${finalAttrs.version}-linux-amd64.deb";
hash = "sha256-XY+RclsP8uQS5aKe1FopdItAjbQ9uWQ8uVD9pb9n42U=";
hash = "sha256-GXWxiKPpOTgoMGcI8y9Hbesmv/jOOJxKnCl4RvkYNqQ=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "goxlr-utility";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = "GoXLR-on-Linux";
repo = "goxlr-utility";
rev = "v${version}";
hash = "sha256-Z/VqQKmfzqd1htMlXU8sDkOSw2xczb3tG53LVC0MZhM=";
hash = "sha256-+hwNevUT9AwMXHUxmjYVrJ3AKaxICrOJZ642GPRq17Q=";
};
cargoHash = "sha256-tSlFMMZWsyZBXBeEW64s0eBt/qrAREfOpfxAgcTK4XQ=";
cargoHash = "sha256-NzqyBe/qeWtTcAWu2bE3fyhegtxKpQokEEvNxdu/zUo=";
buildInputs = [
libpulseaudio
@@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
stdenvNoCC.mkDerivation
{
inherit pname;
version = "0-unstable-2025-09-09";
version = "0-unstable-2025-10-14";
src = fetchFromGitHub {
owner = "Fausto-Korpsvart";
repo = "Gruvbox-GTK-Theme";
rev = "4a8a67574ef227efa9c129ce57d510c2634d53e5";
hash = "sha256-cass0sAc6/FzNF/R8HjjGU6mFigD6hjZR/R1Nj+tk38=";
rev = "99c0a8e13b6d9f9f72fa2541a1eb872b4aed27c5";
hash = "sha256-bxW1lJn8HuWttiQStLz1+7YCUKlvVYiJ8ra6NCf9gdY=";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "ha-mqtt-discoverable-cli";
version = "0.21.1";
version = "0.22.1";
pyproject = true;
src = fetchFromGitHub {
owner = "unixorn";
repo = "ha-mqtt-discoverable-cli";
tag = "v${version}";
hash = "sha256-nJS8JbitiMj9G2rfYeJpY1TOsDLspIWg2PvaEBPOW3Q=";
hash = "sha256-AUY7tIGYVH0wDywzkndRxFLQQfle816DGwMXkcvC/cs=";
};
pythonRelaxDeps = [ "ha-mqtt-discoverable" ];
+9 -4
View File
@@ -26,32 +26,37 @@ let
hash = "sha256-J7Sb4nv9wOl1JnR6Ky4XS9HZHABKtNKPB3uYfC/UGO4=";
};
});
textual-textarea = super.textual-textarea.overridePythonAttrs (old: {
pythonRelaxDeps = old.pythonRelaxDeps ++ [ "textual" ];
});
};
};
pythonPackages = python.pkgs;
in
pythonPackages.buildPythonApplication rec {
pname = "harlequin";
version = "2.1.2";
version = "2.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "tconbeer";
repo = "harlequin";
tag = "v${version}";
hash = "sha256-uHzhAI8ppp6aoveMPcLCQX2slhbor5Qy+IoTui+RP7M=";
hash = "sha256-uBHzoawvhEeRjcvm+R3nft37cEv+1sqx9crYUbC7pRo=";
};
pythonRelaxDeps = [
"numpy"
"pyarrow"
"questionary"
"rich-click"
"textual"
"tree-sitter"
"tree-sitter-sql"
"rich-click"
];
build-system = with pythonPackages; [ poetry-core ];
build-system = with pythonPackages; [ hatchling ];
nativeBuildInputs = [ glibcLocales ];
+2 -2
View File
@@ -5,10 +5,10 @@
}:
let
pname = "heptabase";
version = "1.75.3";
version = "1.75.7";
src = fetchurl {
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
hash = "sha256-PtRc5Rkytt53FnEfu48sRgamze4a4zNyeFfh6UB5qqs=";
hash = "sha256-XGbkfjmceb+IFl3sERpd8zqdTQQAkpiyTxZDoIyoFmY=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "hugo";
version = "0.151.0";
version = "0.151.2";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
tag = "v${finalAttrs.version}";
hash = "sha256-gDbKYL1jCqV6yjCklTucTxK0oQYvy1kfEqE+4k3viXw=";
hash = "sha256-jCHKXqIQBeSyhkusTbygaoyqifayc6jFXY9ot/oWmtM=";
};
vendorHash = "sha256-swxlm9APcwLQzFFoz9PDT7vdxWFayKAfQx3IADhwnEs=";
vendorHash = "sha256-KJCpZ7rX2v98n7EXbfwL2wf6pLMDMHX7Mnugyh+nx6k=";
checkFlags =
let
+2 -2
View File
@@ -7,13 +7,13 @@
}:
buildGoModule (finalAttrs: {
pname = "jjui";
version = "0.9.4";
version = "0.9.5";
src = fetchFromGitHub {
owner = "idursun";
repo = "jjui";
tag = "v${finalAttrs.version}";
hash = "sha256-gKJ03+H/UTmGCGV5mpthrcHw+oX4vubuiVKbvmYNk1I=";
hash = "sha256-QaAjxpn7VHUdL8PFQcDUsa7xA/7bMtGaGl1aTpKOs2M=";
};
vendorHash = "sha256-YBRHpHBb3uzgXhwxVu3493CtPyG9Vzm8IPc1VW6/CKU=";
+1
View File
@@ -0,0 +1 @@
{ python3Packages }: with python3Packages; toPythonApplication json-repair
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "jx";
version = "3.16.24";
version = "3.16.25";
src = fetchFromGitHub {
owner = "jenkins-x";
repo = "jx";
rev = "v${version}";
sha256 = "sha256-0BV8wV5kL7WP6cy881D0Rpw0RPIDcI4/LQckrwk/RiQ=";
sha256 = "sha256-K6cKomQczoqOAsIQqesMEfqYqB/15XzKwnOTU8vDoYQ=";
};
vendorHash = "sha256-YUFpTL4BXm1iZJAQcbJSXEUKT99IulxT6qz4mrbBDN0=";
@@ -33,21 +33,21 @@
let
pname = "legends-of-equestria";
version = "2025.04.001";
version = "2025.05.001";
description = "Free-to-play MMORPG";
srcOptions = {
x86_64-linux = {
url = "https://mega.nz/file/w7BQTCAD#zW1atRLzSd1-V8GV7s7yj_HVZwB4v8zuX3aWIjA0ztc";
outputHash = "YYPxS/qNl/DvNmiGZorRGoONbtAI3nJslqCRzctwoz8=";
url = "https://mega.nz/file/cjhDAZ5S#dsCHHfZ3rhmGBynu4FxooK5kf2w7oHYwgzf4E7vzerM";
outputHash = "WbJL/+T/BNrk4GllCM4C4K2OymHmjzf5BuFR4V1N5Ds=";
};
x86_64-darwin = {
url = "https://mega.nz/file/IqgBEJTD#aUd6LgigncoQ8o3owSkadYRp7GkfIOWl4B1Hwzti1qk";
outputHash = "XdcHM6zCDNFU5VJo3/QISuhtYnBKm1f6IEDfy6Fjnp8=";
url = "https://mega.nz/file/dqQyjaSC#Aazc0tyu3v5WZcGet8ouHWlBB4to6Eu1SADYa3iSmAw";
outputHash = "V8qGABS1uNnj/0CVLsFNXLjzBAjq/UXAT11gczVP298=";
};
aarch64-darwin = {
url = "https://mega.nz/file/QyZnkYYB#EtAZrVdHgqX10ag09M9nhJVEboG0J_5f_nVKxCHskYg";
outputHash = "GA0Zin+vlgYfBFC1ZbkkgX1eSn/NVBYuxuv8fayXMLU=";
url = "https://mega.nz/file/I6QCSZqL#by23SjXBl0EMtgxex9Fhv5FO4qkhFX4uWSr3l5N4f-M";
outputHash = "ISmtCw35kA4p6nWcDWIk4UucVT7fIGS9XC73rzwSigo=";
};
};
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libcpucycles";
version = "20240318";
version = "20250925";
src = fetchzip {
url = "https://cpucycles.cr.yp.to/libcpucycles-${finalAttrs.version}.tar.gz";
hash = "sha256-Fb73EOHGgEehZJwTCtCG12xwyiqtDXFs9eFDsHBQiDo=";
hash = "sha256-hYHNTuohYztLJJonm9wAkx/wlINWfgX8eL2m31xBuwM=";
};
patches = [ ./environment-variable-tools.patch ];
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "minio-warp";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "minio";
repo = "warp";
rev = "v${version}";
hash = "sha256-HBoep3GSjtjucqOEe0JbVLjmAA/1/l5IXEIv+xoyOew=";
hash = "sha256-bXThbMwT3T59nFCMEz8TnMMDYq26rDwKTOBamVGRsyM=";
};
vendorHash = "sha256-fo4LLRqqylx4oZOkLOgFzT436+vjap9dW+IpQ0IFa8Y=";
+2 -2
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mrtrix";
version = "3.0.7";
version = "3.0.8";
src = fetchFromGitHub {
owner = "MRtrix3";
repo = "mrtrix3";
rev = finalAttrs.version;
hash = "sha256-cPI6Ac1Yp5yb07zv9r5O7ZbsHpjrv5BkzbAW1qgj3gQ=";
hash = "sha256-X/slZuDyVzfsfq3F2uZ0tqOUmK+qEqSwGy8eAJ1bVbg=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -9,16 +9,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "msedit";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "microsoft";
repo = "edit";
tag = "v${finalAttrs.version}";
hash = "sha256-G5U5ervW1NAQY/fnwOWv1FNuKcP+HYcAW5w87XHqgA8=";
hash = "sha256-Sb73awgdajBKKW0QIpmKF6g9mIIS/1f0a6D/jQulnUM=";
};
cargoHash = "sha256-ceAaaR+N03Dq2MHYel4sHDbbYUOr/ZrtwqJwhaUbC2o=";
cargoHash = "sha256-U8U70nzTmpY6r8J661EJ4CGjx6vWrGovu5m25dvz5sY=";
# Requires nightly features
env.RUSTC_BOOTSTRAP = 1;
+2 -2
View File
@@ -6,7 +6,7 @@
}:
let
version = "0.33.1-19314669";
version = "1.0.1-20456269";
urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
in
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
src = fetchzip {
url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
hash = "sha256-K9FA4I8dooq1dC+Wnn24AACx49Jh/32sPp3f+IefYzM=";
hash = "sha256-1Du0r/R7wLqnWRkihW3Kwzo58HEmUt8NgNYWSyJwwdc=";
};
# removing packaged jre since we use our own
@@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
stdenvNoCC.mkDerivation
{
inherit pname;
version = "0-unstable-2025-09-09";
version = "0-unstable-2025-10-14";
src = fetchFromGitHub {
owner = "Fausto-Korpsvart";
repo = "Nightfox-GTK-Theme";
rev = "7672385bb28e39c65d1509f15efbe1a7c1bde631";
hash = "sha256-Rd8GkXeyrX3fYoYOO+1GN8MLg2+vW3BsXcbBraAL+Is=";
rev = "0ca46a44ec83bb44b3ae687aaa756dcd528349be";
hash = "sha256-j7hWzwgSdoCEdMFDp6sJ1O01bRX7peUmJXh3qoR5L1c=";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+3 -3
View File
@@ -8,16 +8,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nnd";
version = "0.51";
version = "0.53";
src = fetchFromGitHub {
owner = "al13n321";
repo = "nnd";
tag = "v${finalAttrs.version}";
hash = "sha256-OjD7UiwVF/Be8Mqf2CT06ScqDIikiL4jLVxGj5ejiqc=";
hash = "sha256-ZWiWxFMuzA7ikeLzLhDTKdKnoyIC48n/tf5fcnwEBq0=";
};
cargoHash = "sha256-rxq/5DqEpXzX/dXy1NKZSQw3Dy8NrvtOPNSskxEjEBM=";
cargoHash = "sha256-KTGCu0It2izalwfwdMqcpRdtX3zM/HIpy70JFuneXvQ=";
meta = {
description = "Debugger for Linux";
@@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square";
version = "25.01.31";
version = "25.10.14";
src = fetchFromGitHub {
owner = "numixproject";
repo = "numix-icon-theme-square";
rev = version;
sha256 = "sha256-ivYuY9qcJsMqIpYSVPeu067fYWE6iFGYamU9riQBF4A=";
sha256 = "sha256-z43vDGXnAHuoz2TTLJWCC8iy29/8Npm7MOKgw0OzJfM=";
};
nativeBuildInputs = [ gtk3 ];
-66
View File
@@ -1,66 +0,0 @@
{
lib,
SDL,
SDL_image,
SDL_mixer,
SDL_ttf,
fetchFromGitHub,
freetype,
libjpeg,
libogg,
libpng,
libvorbis,
pkg-config,
smpeg,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "onscripter-en";
version = "20110930";
# The website is not available now. Let's use a Museoa backup
src = fetchFromGitHub {
owner = "museoa";
repo = "onscripter-en";
rev = finalAttrs.version;
hash = "sha256-Lc5ZlH2C4ER02NmQ6icfiqpzVQdVUnOmdywGjjjSYSg=";
};
nativeBuildInputs = [
SDL
pkg-config
smpeg
];
buildInputs = [
SDL
SDL_image
SDL_mixer
SDL_ttf
freetype
libjpeg
libogg
libpng
libvorbis
smpeg
];
configureFlags = [ "--no-werror" ];
strictDeps = true;
preBuild = ''
sed -i 's/.dll//g' Makefile
'';
meta = {
homepage = "https://github.com/museoa/onscripter-en";
description = "Japanese visual novel scripting engine";
license = lib.licenses.gpl2Plus;
mainProgram = "onscripter-en";
maintainers = [ ];
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isDarwin;
};
})
@@ -0,0 +1,12 @@
diff --git a/Makefile.onscripter b/Makefile.onscripter
index 0522dd0..6eede0d 100644
--- a/Makefile.onscripter
+++ b/Makefile.onscripter
@@ -130,3 +130,7 @@ FontInfo$(OBJSUFFIX): FontInfo.h Encoding.h
DirtyRect$(OBJSUFFIX) : DirtyRect.h
AVIWrapper$(OBJSUFFIX): AVIWrapper.h
LUAHandler$(OBJSUFFIX): $(ONSCRIPTER_HEADER) LUAHandler.h
+
+.PHONY: install
+install:
+ install -Dm755 -t $(out)/bin $(TARGET)
@@ -0,0 +1,23 @@
diff --git a/Makefile.MacOSX b/Makefile.MacOSX
index 878ebf9..03f83c3 100644
--- a/Makefile.MacOSX
+++ b/Makefile.MacOSX
@@ -6,12 +6,17 @@
INCS = `sdl-config --cflags` `smpeg-config --cflags`
-LIBS = `sdl-config --libs` `smpeg-config --libs` `freetype-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -lm -ljpeg -framework QuickTime -framework CoreFoundation
+LIBS = `sdl-config --libs` `smpeg-config --libs` `freetype-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -lm -ljpeg
DEFS = -DMACOSX -DUSE_CDROM -DUTF8_CAPTION -DUTF8_FILESYSTEM
EXESUFFIX =
OBJSUFFIX = .o
+# optional: lua
+DEFS += -DUSE_LUA
+LIBS += -llua
+EXT_OBJS += LUAHandler$(OBJSUFFIX)
+
.SUFFIXES:
.SUFFIXES: $(OBJSUFFIX) .cpp .h
@@ -0,0 +1,23 @@
diff --git a/Makefile.Linux b/Makefile.Linux
index 2b551bd..efb1f68 100644
--- a/Makefile.Linux
+++ b/Makefile.Linux
@@ -41,17 +41,9 @@ LIBS += -logg -lvorbis -lvorbisfile
# optional: support CD audio
DEFS += -DUSE_CDROM
-# optional: avifile
-DEFS += -DUSE_AVIFILE
-INCS += `avifile-config --cflags`
-LIBS += `avifile-config --libs`
-TARGET += simple_aviplay$(EXESUFFIX)
-EXT_OBJS += AVIWrapper$(OBJSUFFIX)
-
# optional: lua
DEFS += -DUSE_LUA
-INCS += -I/usr/include/lua5.1
-LIBS += -llua5.1
+LIBS += -llua
EXT_OBJS += LUAHandler$(OBJSUFFIX)
# optional: force screen width for PDA
+97
View File
@@ -0,0 +1,97 @@
{
lib,
SDL,
SDL_image,
SDL_mixer,
SDL_ttf,
bzip2,
fetchFromGitHub,
fontconfig,
freetype,
libjpeg,
libogg,
libpng,
libvorbis,
lua5_1,
runCommand,
smpeg,
stdenv,
}:
let
inherit (stdenv.hostPlatform) isDarwin;
in
stdenv.mkDerivation (finalAttrs: {
pname = "onscripter";
version = "20230825";
src = fetchFromGitHub {
owner = "ogapee";
repo = "onscripter";
rev = finalAttrs.version;
hash = "sha256-XaZTtOkV+2dHmcgZ4GbyiMxRBYdwT5eHxx+r05eAmBw=";
};
patches = [
# Add "install" target to Makefile
./add-make-install.patch
# 1. Remove libavifile dependency, which is old and unmaintained
# 2. Replace -llua5.1 with -llua because the former didn't work even with Lua 5.1
./fix-linux-build.patch
# 1. Remove direct linker flags for macOS SDKs.
# 2. Build with Lua
#
# ONScripter appears to depend on macOS SDKs only indirectly through SDL, so flags provided by
# the sdl-config command should suffice. The existing flags also referenced the deprecated
# QuickTime framework, resulting in a build failure.
./fix-darwin-build.patch
];
nativeBuildInputs = [
# Take cross compilation into account
(
let
commands = [
"${lib.getDev SDL}/bin/sdl-config"
"${lib.getDev smpeg}/bin/smpeg-config"
]
++ lib.optionals isDarwin [
"${lib.getDev freetype}/bin/freetype-config"
];
in
runCommand "onscripter-host-deps" { } ''
mkdir -p $out/bin
ln -s ${lib.escapeShellArgs commands} $out/bin
''
)
];
buildInputs = [
SDL
SDL_image
SDL_mixer
SDL_ttf
bzip2
libjpeg
libogg
libpng
libvorbis
lua5_1
smpeg
]
++ (if isDarwin then [ freetype ] else [ fontconfig ]);
# The build script for BSDs also fall under Makefile.Linux
makefile = if isDarwin then "Makefile.MacOSX" else "Makefile.Linux";
strictDeps = true;
meta = {
homepage = "https://ogapee.github.io/www/onscripter_en.html";
description = "Japanese visual novel scripting engine";
license = lib.licenses.gpl2Plus;
mainProgram = "onscripter";
maintainers = with lib.maintainers; [ midchildan ];
platforms = lib.platforms.unix;
};
})
+7 -1
View File
@@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec {
pythonRelaxDeps = [
"websockets"
"typer"
];
build-system = with python3Packages; [
@@ -68,6 +69,7 @@ python3Packages.buildPythonApplication rec {
packaging
pathspec
pendulum
pluggy
prometheus-client
pydantic
pydantic-core
@@ -89,6 +91,7 @@ python3Packages.buildPythonApplication rec {
websockets
whenever
uv
semver
]
++ sqlalchemy.optional-dependencies.asyncio
++ httpx.optional-dependencies.http2
@@ -196,7 +199,10 @@ python3Packages.buildPythonApplication rec {
description = "Workflow orchestration framework for building resilient data pipelines in Python";
homepage = "https://github.com/PrefectHQ/prefect";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ happysalada ];
maintainers = with lib.maintainers; [
happysalada
mrmebelman
];
mainProgram = "prefect";
};
}
+7 -3
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
yarn,
dart-sass,
fetchYarnDeps,
fixup-yarn-lock,
nodejs,
@@ -15,18 +16,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "r2modman";
version = "3.2.3";
version = "3.2.9";
src = fetchFromGitHub {
owner = "ebkr";
repo = "r2modmanPlus";
rev = "v${finalAttrs.version}";
hash = "sha256-0LlZsyUSVuDakbNUzJ1ZUBe9KxWNd0ONKkPafwbCINY=";
hash = "sha256-rnW8itUsP2a09gQU3IXZI7kSVKIxxCgbt15NoH/g0a8=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-HLVHxjyymi0diurVamETrfwYM2mkUrIOHhbYCrqGkeg=";
hash = "sha256-V6N0RIjT3etoP6XdZhnQv4XViLRypp/JWxnb0sBc6Oo=";
};
patches = [
@@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
yarn
dart-sass
fixup-yarn-lock
nodejs
makeWrapper
@@ -53,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
fixup-yarn-lock yarn.lock
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules/
substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
--replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];'
runHook postConfigure
'';
+2 -2
View File
@@ -7,12 +7,12 @@
stdenv,
}:
let
version = "25.2.8";
version = "25.2.9";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "redpanda";
rev = "v${version}";
sha256 = "sha256-WSE5PIv58yMlMlzGJmCWOg6XHbY7NEvQVtm07IWmR4k=";
sha256 = "sha256-wjYYpFCuHd7r9d0s3rT7CTyRzVviO6g6t9i+R/5+aXQ=";
};
in
buildGoModule rec {
@@ -1,20 +1,9 @@
From 3bbc396c4ddc8a5e26f7776155bb366c8d47c440 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Thu, 9 Feb 2023 16:55:00 +0100
Subject: [PATCH 2/2] remove dependency on git
---
librubyfmt/build.rs | 35 +++--------------------------------
1 file changed, 3 insertions(+), 32 deletions(-)
diff --git a/librubyfmt/build.rs b/librubyfmt/build.rs
index ef94c09..4668785 100644
--- a/librubyfmt/build.rs
+++ b/librubyfmt/build.rs
@@ -26,27 +26,9 @@ fn main() -> Output {
let path = std::env::current_dir()?;
@@ -33,27 +33,9 @@
let path = env::current_dir()?;
let ruby_checkout_path = path.join("ruby_checkout");
- let old_checkout_sha = if ruby_checkout_path.join(ripper).exists() {
- Some(get_ruby_checkout_sha())
- } else {
@@ -22,7 +11,7 @@ index ef94c09..4668785 100644
- };
-
- let _ = Command::new("git")
- .args(&["submodule", "update", "--init"])
- .args(["submodule", "update", "--init"])
- .status();
-
- let new_checkout_sha = get_ruby_checkout_sha();
@@ -39,17 +28,18 @@ index ef94c09..4668785 100644
+ make_configure(&ruby_checkout_path)?;
+ run_configure(&ruby_checkout_path)?;
+ build_ruby(&ruby_checkout_path)?;
cc::Build::new()
.file("src/rubyfmt.c")
@@ -152,14 +134,3 @@ fn check_process_success(command: &str, code: ExitStatus) -> Output {
let arch = extract_ruby_arch(&ruby_checkout_path);
@@ -225,15 +207,3 @@
Err(format!("Command {} failed with: {}", command, code).into())
}
}
-
-fn get_ruby_checkout_sha() -> String {
- String::from_utf8(
- Command::new("git")
- .args(&["rev-parse", "HEAD"])
- .args(["rev-parse", "HEAD"])
- .current_dir("./ruby_checkout")
- .output()
- .expect("git rev-parse shouldn't fail")
@@ -57,6 +47,3 @@ index ef94c09..4668785 100644
- )
- .expect("output should be valid utf8")
-}
--
2.39.1
+9 -6
View File
@@ -14,17 +14,18 @@
libxcrypt,
libyaml,
rust-jemalloc-sys-unprefixed,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rubyfmt";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "fables-tales";
repo = "rubyfmt";
tag = "v${version}";
hash = "sha256-IIHPU6iwFwQ5cOAtOULpMSjexFtTelSd/LGLuazdmUo=";
tag = "v${finalAttrs.version}";
hash = "sha256-wGvfmBm2GNXASXc//K2JOrn/iUdlbA5dDReNJ+NqjDM=";
fetchSubmodules = true;
};
@@ -61,7 +62,7 @@ rustPlatform.buildRustPackage rec {
./0003-ignore-warnings.patch
];
cargoHash = "sha256-8LgAHznxU30bbK8ivNamVD3Yi2pljgpqJg2WC0nxftk=";
cargoHash = "sha256-jJa/6TKwTTN3xOBuUy+YdwKOJbtYVrmlHgMyqPCVqVs=";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec";
@@ -69,6 +70,8 @@ rustPlatform.buildRustPackage rec {
mv $out/bin/rubyfmt{-main,}
'';
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
meta = {
description = "Ruby autoformatter";
homepage = "https://github.com/fables-tales/rubyfmt";
@@ -77,4 +80,4 @@ rustPlatform.buildRustPackage rec {
broken = stdenv.hostPlatform.isDarwin;
mainProgram = "rubyfmt";
};
}
})
+2 -2
View File
@@ -11,7 +11,7 @@
smpeg,
stdenv,
# passthru.tests
onscripter-en,
onscripter,
# Boolean flags
enableNativeMidi ? false,
enableSdltest ? (!stdenv.hostPlatform.isDarwin),
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
passthru.tests = {
inherit onscripter-en;
inherit onscripter;
};
meta = {
@@ -56,6 +56,9 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace Constants.h \
--replace "UNKNOWN = -1" "// UNKNOWN removed since it doesn't fit in char"
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
'';
installPhase = ''
+3
View File
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
# Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72
find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \
-exec sed -i {} -e 's/const struct _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \;
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
'';
installPhase = ''
+2 -2
View File
@@ -6,12 +6,12 @@
python3Packages.buildPythonApplication rec {
pname = "sqlite-web";
version = "0.6.4";
version = "0.6.5";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-5Bdd1C9M3HjvfDKdVvGSQ+/I0Iimvf1MZwPonRiqwqU=";
hash = "sha256-/Asqu2XEVCS5sFW2GB/W/int1gCZIIgZq8yrevoQ7Yo=";
};
build-system = with python3Packages; [ setuptools ];
+2 -2
View File
@@ -12,13 +12,13 @@
buildGoModule rec {
pname = "stackit-cli";
version = "0.44.0";
version = "0.44.1";
src = fetchFromGitHub {
owner = "stackitcloud";
repo = "stackit-cli";
rev = "v${version}";
hash = "sha256-eIh65Xc4TnCX9iNi5tQkfLmnILKXLfmWl8JGASC0c4U=";
hash = "sha256-ppD7Jp04J5K99ND3BMGklyttg8SIH+zZBG1tEfHW990=";
};
vendorHash = "sha256-2dhc4RpT5ceEBeS/VkuNR9ll7lZ9N/QlkvCCOtVO5XM=";
+28 -23
View File
@@ -1,18 +1,19 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
fetchurl,
gfortran,
python3,
blas,
lapack,
gfortran,
suitesparse,
nix-update-script,
lapackSupport ? true,
kluSupport ? true,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "sundials";
version = "7.5.0";
@@ -21,9 +22,11 @@ stdenv.mkDerivation rec {
"examples"
];
src = fetchurl {
url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
hash = "sha256-CJrGWVB973OLemW1dP/jqQDThWnjMj2XCevtPkRa3sw=";
src = fetchFromGitHub {
owner = "LLNL";
repo = "sundials";
tag = "v${finalAttrs.version}";
hash = "sha256-ZyUTFaMEbfNtR9oGIy0fQ+qQwb3hQ7CxTv9IevkeidE=";
};
nativeBuildInputs = [
@@ -51,34 +54,36 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DEXAMPLES_INSTALL_PATH=${placeholder "examples"}/share/examples"
(lib.cmakeFeature "EXAMPLES_INSTALL_PATH" "${placeholder "examples"}/share/examples")
]
++ lib.optionals lapackSupport [
"-DENABLE_LAPACK=ON"
"-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
(lib.cmakeBool "ENABLE_LAPACK" true)
(lib.cmakeFeature "LAPACK_LIBRARIES" "${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}")
]
++ lib.optionals kluSupport [
"-DENABLE_KLU=ON"
"-DKLU_INCLUDE_DIR=${suitesparse.dev}/include"
"-DKLU_LIBRARY_DIR=${suitesparse}/lib"
(lib.cmakeBool "ENABLE_KLU" true)
(lib.cmakeFeature "KLU_INCLUDE_DIR" "${lib.getDev suitesparse}/include")
(lib.cmakeFeature "KLU_LIBRARY_DIR" "${suitesparse}/lib")
]
++ [
(
# Use the correct index type according to lapack and blas used. They are
# already supposed to be compatible but we check both for extra safety. 64
# should be the default but we prefer to be explicit, for extra safety.
if blas.isILP64 then "-DSUNDIALS_INDEX_SIZE=64" else "-DSUNDIALS_INDEX_SIZE=32"
)
# Use the correct index type according to lapack and blas used. They are
# already supposed to be compatible but we check both for extra safety. 64
# should be the default but we prefer to be explicit, for extra safety.
(lib.cmakeFeature "SUNDIALS_INDEX_SIZE" (toString (if blas.isILP64 then 64 else 32)))
];
doCheck = true;
checkTarget = "test";
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
description = "Suite of nonlinear differential/algebraic equation solvers";
homepage = "https://computing.llnl.gov/projects/sundials";
platforms = platforms.all;
maintainers = with maintainers; [ idontgetoutmuch ];
license = licenses.bsd3;
downloadPage = "https://github.com/LLNL/sundials";
changelog = "https://github.com/LLNL/sundials/releases/tag/v${finalAttrs.version}";
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ idontgetoutmuch ];
license = lib.licenses.bsd3;
};
}
})
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "tinfoil-cli";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "tinfoilsh";
repo = "tinfoil-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-prLp9IpBINFNfam23ErvcwlOrLZ4pFoZn8C7/w3kdZs=";
hash = "sha256-Aa+n1Yc3jzPT1Fbq1xhphBwq5mdxPwbCcGn4ikTABW8=";
};
vendorHash = "sha256-wZlpxAwWgFpuLhbG6EBhBbFMgyZ7yZxCaiBYz4utCto=";
vendorHash = "sha256-S+aiL1nY57gOXgaNwFXUk9xfUpFOok8XHYKBtQKHmOc=";
# The attestation test requires internet access
checkFlags = [ "-skip=TestAttestationVerifySEV" ];
+2 -2
View File
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
];
stdenv.mkDerivation (finalAttrs: {
pname = "trealla";
version = "2.83.17";
version = "2.83.18";
src = fetchFromGitHub {
owner = "trealla-prolog";
repo = "trealla";
rev = "v${finalAttrs.version}";
hash = "sha256-mJuafIfRfyhD8yMqAjM749qbLqX4n+Gq53YZKCibB7A=";
hash = "sha256-8JaX/4W8olwLb1pU2qzqmqXFI1BgFPl+hsbEBqk5SF4=";
};
postPatch = ''
+1 -1
View File
@@ -98,7 +98,7 @@ stdenv.mkDerivation {
homepage = "https://benchmark.unigine.com/heaven";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.BarinovMaxim ];
maintainers = [ ];
platforms = [
"x86_64-linux"
"i686-linux"
@@ -25,14 +25,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "unnamed-sdvx-clone";
version = "0.6.0";
version = "0.6.0-unstable-2025-07-31";
src = fetchFromGitHub {
owner = "Drewol";
repo = "unnamed-sdvx-clone";
tag = "v${finalAttrs.version}";
rev = "2472fcc5c8b6b8bc7323dc61ea80b3b1899dd45f";
fetchSubmodules = true;
hash = "sha256-wuf7xZztoxzNQJzlJOfH/Dc25/717NevBx7E0RDybho=";
hash = "sha256-Z0eU3xNzVmv2PwUvS2HoRe2TQzQ8seL0R/YAYCQWR28=";
};
nativeBuildInputs = [
@@ -9,12 +9,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20250916122507";
version = "20251020145026";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
hash = "sha256-8uRKXlPoO5lQoBdlpkTzEEBbnN1qeRiTbZO5pEX60uM=";
hash = "sha256-9S1R4f6F4IIuNOKT61k8paoKJpkAq3yuh5IpcdC+6vI=";
};
vendorHash = "sha256-HmIXpF7P3J+lPXpmWWoFpSYAu5zbBQSDrj6S88LgWSU=";
meta = with lib; {
+3 -3
View File
@@ -16,18 +16,18 @@
buildGoModule rec {
pname = "v2ray-core";
version = "5.40.0";
version = "5.41.0";
src = fetchFromGitHub {
owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
hash = "sha256-pb9kZEdGkT2B1MhNnneAi4oP3aqYkgY86dodInorSbA=";
hash = "sha256-SHmcjpxqTyTm/jHbAwm5hD2s9Kg/YdhmpQqa6iwpHCI=";
};
# `nix-update` doesn't support `vendorHash` yet.
# https://github.com/Mic92/nix-update/pull/95
vendorHash = "sha256-lphbRsPc8lSf8BzcfcFnh3Z+Wa9wJe98I3VE5ZoQHBE=";
vendorHash = "sha256-5YSVjZ14/vQA8MZA/imVkcHMAvaaMHbR6/+4Dzwejfo=";
ldflags = [
"-s"
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "weaviate";
version = "1.33.0";
version = "1.33.1";
src = fetchFromGitHub {
owner = "weaviate";
repo = "weaviate";
rev = "v${version}";
hash = "sha256-vFjP/GesZg2G57zyF3LLDla9W+4gQyeAI3vAvSw+wls=";
hash = "sha256-Y8oqZMBV7e24+uytiNCkUGC76vA3WW08TDS44eJb04E=";
};
vendorHash = "sha256-sMpYk2uXXt8oJ7HC3n9Gqa1cOvspxt0oof3E1fbRgco=";
vendorHash = "sha256-KiDU9fw/4vIhI0XbEzUfw+HhopJniVeGhFVJBbLkixU=";
subPackages = [ "cmd/weaviate-server" ];
+37
View File
@@ -0,0 +1,37 @@
{
lib,
buildGoModule,
winboat,
}:
buildGoModule {
inherit (winboat) version src;
modRoot = "guest_server";
pname = "winboat-guest-server";
vendorHash = "sha256-JglpTv1hkqxmcbD8xmG80Sukul5hzGyyANfe+GeKzQ4=";
env = {
GOOS = "windows";
GOARCH = "amd64";
PACKAGE = "winboat-server";
};
ldflags = [
"-s"
"-w"
"-X main.Version=${winboat.version}"
"-X main.CommitHash=${winboat.src.rev}"
];
meta = {
mainProgram = "winboat-server.exe";
description = "Guest server for winboat";
homepage = "https://github.com/TibixDev/winboat";
changelog = "https://github.com/TibixDev/winboat/releases/tag/v${winboat.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
rexies
ppom
];
platforms = [ "x86_64-windows" ];
};
}
+123
View File
@@ -0,0 +1,123 @@
{
lib,
electron,
zip,
nodejs_24,
makeWrapper,
udev,
usbutils,
freerdp,
docker-compose,
pkgsCross,
buildNpmPackage,
fetchFromGitHub,
makeDesktopItem,
copyDesktopItems,
nix-update-script,
}:
buildNpmPackage (final: {
pname = "winboat";
version = "0.8.7";
src = fetchFromGitHub {
owner = "TibixDev";
repo = "winboat";
tag = "v${final.version}";
hash = "sha256-30WzvdY8Zn4CAj76bbC0bevuTeOSfDo40FPWof/39Es=";
};
postPatch = ''
substituteInPlace package.json \
--replace-fail "main/main.js" "src/main/main.ts"
'';
nativeBuildInputs = [
zip
makeWrapper
copyDesktopItems
];
buildInputs = [ udev ];
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
npmDepsHash = "sha256-nW+cGX4Y0Ndn1ubo4U3n8ZrjM5NkxIt4epB0AghPrNQ=";
nodejs = nodejs_24;
makeCacheWritable = true;
guest-server = pkgsCross.mingwW64.callPackage ./guest-server.nix { };
passthru = {
guest-server = final.guest-server;
updateScript = nix-update-script {
extraArgs = [
"--subpackage"
"guest-server"
];
};
};
buildPhase = ''
node scripts/build.ts
npm exec electron-builder --linux -- \
--dir \
-c.electronDist=${electron.dist} \
-c.electronVersion=${electron.version} \
-c.npmRebuild=false
'';
installPhase = ''
runHook preInstall
# install built artifacts
mkdir -p $out/bin $out/share/winboat
cp -r dist/linux-unpacked/resources $out/share/winboat/resources
# install winboat icon
install -Dm444 icons/icon.png $out/share/icons/hicolor/256x256/apps/winboat.png
# copy the the winboat-guest-server executable and generate the zip
cp ${lib.getExe final.guest-server} $out/share/winboat/resources/guest_server/winboat_guest_server.exe
(cd $out/share/winboat/resources/guest_server/ && zip -r winboat_guest_server.zip .)
# symlink data/ and guest_server/ into parent folder
ln -sf $out/share/winboat/resources/data $out/share/winboat/data
ln -sf $out/share/winboat/resources/guest_server $out/share/winboat/guest_server
makeWrapper ${electron}/bin/electron $out/bin/winboat \
--add-flag "$out/share/winboat/resources/app.asar" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
--suffix PATH : ${
lib.makeBinPath [
usbutils
docker-compose
freerdp
]
}
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "winboat";
desktopName = "WinBoat";
type = "Application";
exec = "winboat %U";
terminal = false;
icon = "winboat";
categories = [ "Utility" ];
})
];
meta = {
mainProgram = "winboat";
description = "Run Windows apps on Linux with seamless integration";
homepage = "https://github.com/TibixDev/winboat";
changelog = "https://github.com/TibixDev/winboat/releases/tag/v${final.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
rexies
ppom
];
platforms = [ "x86_64-linux" ];
};
})
+7
View File
@@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
"-DCMAKE_CXX_STANDARD=14"
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
substituteInPlace javr/CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
'';
meta = with lib; {
description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG";
homepage = "https://xc3sprog.sourceforge.net/";
+3 -3
View File
@@ -15,16 +15,16 @@
buildGoModule rec {
pname = "xray";
version = "25.9.11";
version = "25.10.15";
src = fetchFromGitHub {
owner = "XTLS";
repo = "Xray-core";
rev = "v${version}";
hash = "sha256-498Kf+V2g2i0hpQy+vAEzf3hVoPUAWfUyWcJmP3Bgb4=";
hash = "sha256-E3Ozd2pFLuoV1xc3rPIoh6+ErAN9MYquxwzVTvETMlA=";
};
vendorHash = "sha256-xhd4KGHGA82gacugM6rgYAz8gVdGWu0LHEiLeRnx3xQ=";
vendorHash = "sha256-Dzml+y6KSCcRqgWk8rP3gGFE1UsGNhNpu2I5NkCBztw=";
nativeBuildInputs = [ makeWrapper ];
+5
View File
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
xxHash
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
'';
meta = {
maintainers = [ ];
description = "Tool for converting Xen images to raw and back";
@@ -0,0 +1,34 @@
{
lib,
fetchFromGitHub,
mkYaziPlugin,
jdupes,
bash,
}:
mkYaziPlugin {
pname = "dupes.yazi";
version = "0-unstable-2025-10-16";
src = fetchFromGitHub {
owner = "mshnwq";
repo = "dupes.yazi";
rev = "012a21e1864296503f7bb1e7297b71fe57af8994";
hash = "sha256-VUF7vmtnXuEsbyS0/pPTgwrDDrnMqt77eIkeQZFxoZk=";
};
postPatch = ''
substituteInPlace main.lua --replace-fail \
'set_state("cmdline", "jdupes")' \
'set_state("cmdline", "${lib.getExe jdupes}")'
substituteInPlace main.lua --replace-fail \
'set_state("shell", "bash")' \
'set_state("shell", "${lib.getExe bash}")'
'';
meta = {
description = "Duplicate files plugin for Yazi";
homepage = "https://github.com/Mshnwq/dupes.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ mshnwq ];
};
}
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "youtube-tui";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "Siriusmart";
repo = "youtube-tui";
tag = "v${version}";
hash = "sha256-TuXfgJTY+f+9GH6gsATsnV8WMAfqHUAglbbCvOgJ1NQ=";
hash = "sha256-a2Y0CATnKmZsYr3eUch3EUgHw41X1a2iOP0CjEJLXnc=";
};
cargoHash = "sha256-lJDIkOokhKo6BxrZAD4s2FtLXNhU2IysltjhiHQQUlU=";
cargoHash = "sha256-W3MBYcxb51cBjHUF7zXMOrRVzcxUX/TxiLyYGuOPFyI=";
nativeBuildInputs = [
pkg-config
+14 -9
View File
@@ -7,15 +7,15 @@
zeromq,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "zmqpp";
version = "4.2.0";
src = fetchFromGitHub {
owner = "zeromq";
repo = "zmqpp";
rev = version;
sha256 = "08v34q3sd8g1b95k73n7jwryb0xzwca8ib9dz8ngczqf26j8k72i";
tag = "${finalAttrs.version}";
hash = "sha256-UZyJpBEOf/Ys+i2tiBTjv4PlM5fHjjNLWuGhpgcmYyM=";
};
outputs = [
@@ -30,11 +30,16 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ zeromq ];
meta = with lib; {
inherit (src.meta) homepage;
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
'';
meta = {
homepage = "https://github.com/zeromq/zmqpp";
description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent";
license = licenses.lgpl3;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ chris-martin ];
license = lib.licenses.lgpl3Plus;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [ chris-martin ];
};
}
})
@@ -1,7 +1,7 @@
{ mkDerivation }:
mkDerivation {
version = "1.19.0";
sha256 = "sha256-d5ForVzRlj/OpusNNKIuTiNeiumqtruitxlVmvraah4=";
version = "1.19.1";
sha256 = "sha256-0rJx1BoJGDS0FsXyngBfQL3LhhNZvwh+TLQZjqOPFQw=";
# https://hexdocs.pm/elixir/1.19.0-rc.1/compatibility-and-deprecations.html#between-elixir-and-erlang-otp
minimumOTPVersion = "26";
maximumOTPVersion = "28";
+2 -2
View File
@@ -1,6 +1,6 @@
genericBuilder:
genericBuilder {
version = "28.1";
hash = "sha256-rR31Zj7c2eNf608HhLNlrGnVQN/Nymug6EcPfeNHfqk=";
version = "28.1.1";
hash = "sha256-2Yop9zpx3dY549NFsjBRghb5vw+SnUSEmv6VIA0m5yQ=";
}
@@ -814,15 +814,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "fzf-lua";
version = "0.0.2246-1";
version = "0.0.2277-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/fzf-lua-0.0.2246-1.rockspec";
sha256 = "0lppmjwb4q4czcyavg76awvgjak2xx8sczmgpg1ync936yh0fk60";
url = "mirror://luarocks/fzf-lua-0.0.2277-1.rockspec";
sha256 = "0nbr18w8wyksxr4rwaf62aw56pznlifb79gkirwqb5qn0a40fmi8";
}).outPath;
src = fetchzip {
url = "https://github.com/ibhagwan/fzf-lua/archive/7b730b69985e33c14bff3bdafd1a2c82fdfa1376.zip";
sha256 = "0fzjwfqk1204bad1rjj0dh0nb8amwmm1gvd0q4qxmjh6wsjqs8im";
url = "https://github.com/ibhagwan/fzf-lua/archive/c102a4eeb10a04ed7e69ce80918923c4175c19d8.zip";
sha256 = "0lc4gnpcm917s5w3bi62j57nm17kqzyp1py6jc39kr1f5by7ydbi";
};
disabled = luaOlder "5.1";
@@ -880,8 +880,8 @@ final: prev: {
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "23ae90a2a52fdc9b8c50dc61d6c30ebb18521343";
hash = "sha256-8VIW+tPttYTn2vqiYJCZ5ckqFEBGc38rkfla/puYPUQ=";
rev = "20ad4419564d6e22b189f6738116b38871082332";
hash = "sha256-eGpB7YYWbyCCGYXEYAM432srSp/lUo5C1b0J3OYjwnY=";
};
disabled = lua.luaversion != "5.1";
@@ -903,15 +903,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "grug-far.nvim";
version = "1.6.48-1";
version = "1.6.52-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/grug-far.nvim-1.6.48-1.rockspec";
sha256 = "02x3rzxz610942xy98zbzz3whcslvqwcpiyjzlw94km1h7m5a3kq";
url = "mirror://luarocks/grug-far.nvim-1.6.52-1.rockspec";
sha256 = "0drax65xyp8lhk1cahqjdlphb16kicajr4gb7ar4l2q1scl01b4k";
}).outPath;
src = fetchzip {
url = "https://github.com/MagicDuck/grug-far.nvim/archive/50d9ee2b5a19634670441948e7e4afaa042f1059.zip";
sha256 = "0pbwlp5i4aq1ffqbcnjf62ygb73b1svyh5ly4vyq6x7jnc0g416g";
url = "https://github.com/MagicDuck/grug-far.nvim/archive/3e72397465f774b01aa38e4fe8e6eecf23d766d9.zip";
sha256 = "16pbhmb2y8rpvdzib8m56jx54v44vkn452sj9jgwp5q7izqb4kds";
};
disabled = luaOlder "5.1";
@@ -2768,8 +2768,8 @@ final: prev: {
src = fetchFromGitHub {
owner = "nvim-lualine";
repo = "lualine.nvim";
rev = "b8c23159c0161f4b89196f74ee3a6d02cdc3a955";
hash = "sha256-lWt2kpW+hsTMWt8tar/+AISTDrIt4Jn27NmI9j+Xt4s=";
rev = "3946f0122255bc377d14a59b27b609fb3ab25768";
hash = "sha256-hdrAdG3hC2sAevQ6a9xizqPgEgnNKxuc5rBYn0pKM1c=";
};
disabled = luaOlder "5.1";
@@ -2822,15 +2822,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "luaossl";
version = "20220711-0";
version = "20250929-0";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/luaossl-20220711-0.rockspec";
sha256 = "0b68kvfz587ilmb5c1p7920kysg9q4m4fl4cz4d93jl3270mzh8y";
url = "mirror://luarocks/luaossl-20250929-0.rockspec";
sha256 = "11m823vd8cwc3s5420lv042ny1d7hrimzx05ldy8f6rlh6m2d9xl";
}).outPath;
src = fetchzip {
url = "https://github.com/wahern/luaossl/archive/rel-20220711.zip";
sha256 = "1a9pgmc6fbhgh1m9ksz9fq057yzz46npqgakcsy9vngg47xacfdb";
url = "https://github.com/wahern/luaossl/archive/rel-20250929.zip";
sha256 = "115a5r0n7qc9lnjxld551ag6l9rq1wawcbrfjqhz2l6krb3pbv3d";
};
meta = {
@@ -3980,15 +3980,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "neotest";
version = "5.11.1-1";
version = "5.13.0-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/neotest-5.11.1-1.rockspec";
sha256 = "18pj612zpzhl3yv6p5l8ix4j0xr44ff9vwals54szc1sx5784v7l";
url = "mirror://luarocks/neotest-5.13.0-1.rockspec";
sha256 = "05jajrfvlh6phn8dblwymb17j6zm3g8cmibdzyqgxfivqm748q03";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neotest/neotest/archive/2cf3544fb55cdd428a9a1b7154aea9c9823426e8.zip";
sha256 = "1zz376wb3vyw984zjszg8hda4rzskaq7q93ajwdy63ssx8sc9vy4";
url = "https://github.com/nvim-neotest/neotest/archive/7166dc36af2760a76479e021e0521e23f62165f1.zip";
sha256 = "1mfdlns4y4dxf1im7rwcq264jqwm3814dlnf37c41yq13pc7fd13";
};
disabled = luaOlder "5.1";
@@ -4081,8 +4081,8 @@ final: prev: {
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
rev = "b5311ab3ed9c846b585c0c15b7559be131ec4be9";
hash = "sha256-l5z+PT4S9b09d2M+J/tHVd9W9Ss3eQQk5Ykpz2Qjxxw=";
rev = "a7bcf1d88069fc67c9ace8a62ba480b8fe879025";
hash = "sha256-wkESSNUViVI5DE+3t4AVTaSLQ/hTB43vrm+PH6uA8H4=";
};
disabled = luaOlder "5.1" || luaAtLeast "5.4";
@@ -4229,15 +4229,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "papis.nvim";
version = "0.9.0-1";
version = "0.9.1-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/papis.nvim-0.9.0-1.rockspec";
sha256 = "1l5phfq26yc24ww1hyki9w9x3idzncmzxizda6v7rr1bdppbky7g";
url = "mirror://luarocks/papis.nvim-0.9.1-1.rockspec";
sha256 = "1ykcnzz2rpcn3v5aw4lhwc2vcc9gzrskkzir136i1szgnvrhhzg0";
}).outPath;
src = fetchzip {
url = "https://github.com/jghauser/papis.nvim/archive/v0.9.0.zip";
sha256 = "1na7nxacq6ii75qk1i5ylpnnr27272kp7nrn2xlfd8kwjspap3n7";
url = "https://github.com/jghauser/papis.nvim/archive/v0.9.1.zip";
sha256 = "1hicipx893p8y8sapn0kyqjinn8nhrrkc0a1cwl16z0mmh0jgk81";
};
disabled = luaOlder "5.1";
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "async-tkinter-loop";
version = "0.10.0";
version = "0.10.2";
format = "pyproject";
src = fetchPypi {
inherit version;
pname = "async_tkinter_loop";
hash = "sha256-+p8KJ8vPsSwpl+YsOIsWfZEeu7+FUiNVbmtMlOvYbHY=";
hash = "sha256-2EowLDV3lM8hXo5KufdJ3GoFMjEC9xdsotO1/qR9oPs=";
};
nativeBuildInputs = [
@@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "cohere";
version = "5.18.0";
version = "5.19.0";
pyproject = true;
src = fetchFromGitHub {
owner = "cohere-ai";
repo = "cohere-python";
tag = version;
hash = "sha256-p0EQZ7C5z9qi62L3KESF/oQf/yWKtnG1fzCAoSatuVU=";
hash = "sha256-AT3ZnIjs/xd0+cDR4s7uxui38liz4Iy+7EQ4Rw0vjqA=";
};
build-system = [ poetry-core ];
@@ -16,7 +16,6 @@
json5,
jsonref,
litellm,
onnxruntime,
openai,
opentelemetry-api,
opentelemetry-exporter-otlp-proto-http,
@@ -25,6 +24,7 @@
pdfplumber,
portalocker,
pydantic,
pydantic-settings,
pyjwt,
python-dotenv,
pyvis,
@@ -44,14 +44,14 @@
buildPythonPackage rec {
pname = "crewai";
version = "0.186.1";
version = "0.203.1";
pyproject = true;
src = fetchFromGitHub {
owner = "crewAIInc";
repo = "crewAI";
tag = version;
hash = "sha256-rSVIbRATMq0cfMdgR/+/tNjij0Sk/ErWipy0m8hKvr4=";
hash = "sha256-vy3JdJjuiFbi66IDNo+dQ7MZqlHqvHt/zUb6eblPT7A=";
};
build-system = [ hatchling ];
@@ -60,8 +60,8 @@ buildPythonPackage rec {
"chromadb"
"json-repair"
"litellm"
"onnxruntime"
"portalocker"
"pydantic"
"pyvis"
];
@@ -75,7 +75,6 @@ buildPythonPackage rec {
json5
jsonref
litellm
onnxruntime
openai
opentelemetry-api
opentelemetry-exporter-otlp-proto-http
@@ -84,6 +83,7 @@ buildPythonPackage rec {
pdfplumber
portalocker
pydantic
pydantic-settings
pyjwt
python-dotenv
pyvis
@@ -108,58 +108,66 @@ buildPythonPackage rec {
];
disabledTests = [
# AssertionError - json-repair behaves differently since 0.52.0
"test_safe_repair_json_unrepairable"
"test_valid_action_parsing_with_curly_braces"
# Tests parser
"test_valid_action_parsing_with_special_characters"
# Tests agent - require API keys (OpenAI, Anthropic, etc)
"test_agent_execution_with_tools"
"test_llm_call"
"test_agent_repeated_tool_usage"
"test_agent_execute_task_basic"
"test_agent_execution"
"test_ensure_first_task_allow_crewai_trigger_context_is_false_does_not_inject"
"test_agent_use_specific_tasks_output_as_context"
"test_task_allow_crewai_trigger_context"
"test_agent_with_only_crewai_knowledge"
"test_logging_tool_usage"
"test_agent_execute_task_with_context"
"test_agent_repeated_tool_usage_check_even_with_disabled_cache"
"test_agent_step_callback"
"test_handle_context_length_exceeds_limit_cli_no"
"test_task_without_allow_crewai_trigger_context"
"test_cache_hitting"
"test_agent_knowledege_with_crewai_knowledge"
"test_agent_execute_task_with_tool"
"test_agent_moved_on_after_max_iterations"
"test_agent_function_calling_llm"
"test_task_allow_crewai_trigger_context_no_payload"
"test_disabling_cache_for_agent"
"test_do_not_allow_crewai_trigger_context_for_first_task_hierarchical"
"test_tool_result_as_answer_is_the_final_answer_for_the_agent"
"test_agent_execute_task_with_ollama"
"test_agent_with_knowledge_sources"
"test_agent_respect_the_max_rpm_set"
"test_agent_execution_with_specific_tools"
"test_llm_call_with_ollama_llama3"
"test_first_task_auto_inject_trigger"
"test_agent_respect_the_max_rpm_set_over_crew_rpm"
"test_agent_powered_by_new_o_model_family_that_allows_skipping_tool"
"test_agent_with_knowledge_with_no_crewai_knowledge"
"test_tool_usage_information_is_appended_to_agent"
"test_agent_without_max_rpm_respects_crew_rpm"
"test_agent_powered_by_new_o_model_family_that_uses_tool"
"test_agent_error_on_parsing_tool"
"test_agent_custom_max_iterations"
"test_agent_remembers_output_format_after_using_tools_too_many_times"
"test_llm_call_with_all_attributes"
"test_agent_error_on_parsing_tool"
"test_agent_execute_task_basic"
"test_agent_execute_task_with_context"
"test_agent_execute_task_with_custom_llm"
"test_agent_with_ollama_llama3"
"test_custom_llm_with_langchain"
"test_custom_llm_temperature_preservation"
"test_agent_execute_task_with_ollama"
"test_agent_execute_task_with_tool"
"test_agent_execution"
"test_agent_execution_with_specific_tools"
"test_agent_execution_with_tools"
"test_agent_from_repository"
"test_agent_from_repository_override_attributes"
"test_agent_from_repository_with_invalid_tools"
"test_agent_function_calling_llm"
"test_agent_knowledege_with_crewai_knowledge"
"test_agent_moved_on_after_max_iterations"
"test_agent_powered_by_new_o_model_family_that_allows_skipping_tool"
"test_agent_powered_by_new_o_model_family_that_uses_tool"
"test_agent_remembers_output_format_after_using_tools_too_many_times"
"test_agent_repeated_tool_usage"
"test_agent_repeated_tool_usage_check_even_with_disabled_cache"
"test_agent_respect_the_max_rpm_set"
"test_agent_respect_the_max_rpm_set_over_crew_rpm"
"test_agent_step_callback"
"test_agent_use_specific_tasks_output_as_context"
"test_agent_with_knowledge_sources"
"test_agent_with_knowledge_with_no_crewai_knowledge"
"test_agent_with_ollama_llama3"
"test_agent_with_only_crewai_knowledge"
"test_agent_without_max_rpm_respects_crew_rpm"
"test_cache_hitting"
"test_custom_llm_temperature_preservation"
"test_custom_llm_with_langchain"
"test_disabling_cache_for_agent"
"test_do_not_allow_crewai_trigger_context_for_first_task_hierarchical"
"test_ensure_first_task_allow_crewai_trigger_context_is_false_does_not_inject"
"test_first_task_auto_inject_trigger"
"test_first_time_user_trace_collection_user_accepts"
"test_first_time_user_trace_collection_with_timeout"
"test_first_time_user_trace_consolidation_logic"
"test_get_knowledge_search_query"
"test_agent_from_repository"
"test_handle_context_length_exceeds_limit_cli_no"
"test_llm_call"
"test_llm_call_with_all_attributes"
"test_llm_call_with_ollama_llama3"
"test_logging_tool_usage"
"test_task_allow_crewai_trigger_context"
"test_task_allow_crewai_trigger_context_no_payload"
"test_task_without_allow_crewai_trigger_context"
"test_tool_result_as_answer_is_the_final_answer_for_the_agent"
"test_tool_usage_information_is_appended_to_agent"
"test_trace_batch_marked_as_failed_on_finalize_error"
# Tests lite agent - require API keys
"test_guardrail_is_called_using_callable"
@@ -4,30 +4,48 @@
fetchFromGitHub,
setuptools,
click,
primp,
lxml,
httpx,
h2,
versionCheckHook,
}:
buildPythonPackage rec {
pname = "ddgs";
version = "9.5.5";
version = "9.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "deedy5";
repo = "ddgs";
tag = "v${version}";
hash = "sha256-Pwl6fCEBj+eUXYEf4wCTw1fpKZh3j4IVC6SW0Vqcmf4=";
hash = "sha256-NaOwklHea3TUDa2M23X549IiX5zP87N9qWKkr5PObLY=";
};
patches = [
# We're removing the HTTP client primp below for security reasons,
# but can use the already included httpx instead.
# Note that while httpx is only used for HTTP/2 by upstream,
# it can handle HTTP/1.1 just fine as well.
./replace-primp.patch
];
pythonRemoveDeps = [
# primp requires a very outdated, potentially insecure version of boringssl
"primp"
];
build-system = [ setuptools ];
dependencies = [
click
primp
lxml
];
httpx
h2
]
++ httpx.optional-dependencies.http2
++ httpx.optional-dependencies.socks
++ httpx.optional-dependencies.brotli;
nativeCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "version";
@@ -0,0 +1,39 @@
diff --git a/ddgs/base.py b/ddgs/base.py
index e964511..34d1c4f 100644
--- a/ddgs/base.py
+++ b/ddgs/base.py
@@ -11,7 +11,7 @@ from typing import Any, Generic, Literal, TypeVar
from lxml import html
from lxml.etree import HTMLParser as LHTMLParser
-from .http_client import HttpClient
+from .http_client2 import HttpClient2 as HttpClient
from .results import BooksResult, ImagesResult, NewsResult, TextResult, VideosResult
logger = logging.getLogger(__name__)
diff --git a/ddgs/cli.py b/ddgs/cli.py
index d295f77..38adb71 100644
--- a/ddgs/cli.py
+++ b/ddgs/cli.py
@@ -12,11 +12,11 @@ from typing import Any
from urllib.parse import unquote
import click
-import primp
from . import __version__
from .ddgs import DDGS
from .utils import _expand_proxy_tb_alias, json_dumps
+from .http_client2 import HttpClient2
logger = logging.getLogger(__name__)
@@ -101,7 +101,7 @@ def _sanitize_query(query: str) -> str:
def _download_file(url: str, dir_path: str, filename: str, proxy: str | None, verify: bool) -> None:
try:
- resp = primp.Client(proxy=proxy, impersonate="random", impersonate_os="random", timeout=10, verify=verify).get(
+ resp = HttpClient2(proxy=proxy, timeout=10, verify=verify).get(
url
)
if resp.status_code == 200:
@@ -36,17 +36,14 @@
let
dm-haiku = buildPythonPackage rec {
pname = "dm-haiku";
version = "0.0.13";
version = "0.0.15";
pyproject = true;
# ImportError: `haiku.experimental.flax` features require `flax` to be installed.
disabled = pythonAtLeast "3.13";
src = fetchFromGitHub {
owner = "deepmind";
repo = "dm-haiku";
tag = "v${version}";
hash = "sha256-RJpQ9BzlbQ4X31XoJFnsZASiaC9fP2AdyuTAGINhMxs=";
hash = "sha256-phJ0f+effHQzuAVtPBR0bY3C0p//LBY7k1ci4mXBGfU=";
};
patches = [
@@ -58,17 +55,6 @@ let
})
];
# AttributeError: jax.core.Var was removed in JAX v0.6.0. Use jax.extend.core.Var instead, and
# see https://docs.jax.dev/en/latest/jax.extend.html for details.
# Already on master: https://github.com/google-deepmind/dm-haiku/commit/cfe8480d253a93100bf5e2d24c40435a95399c96
# TODO: remove at the next release
postPatch = ''
substituteInPlace haiku/_src/jaxpr_info.py \
--replace-fail "jax.core.JaxprEqn" "jax.extend.core.JaxprEqn" \
--replace-fail "jax.core.Var" "jax.extend.core.Var" \
--replace-fail "jax.core.Jaxpr" "jax.extend.core.Jaxpr"
'';
build-system = [ setuptools ];
dependencies = [
@@ -97,11 +83,12 @@ let
dm-env
dm-haiku
dm-tree
flax
jaxlib
optax
pytest-xdist
pytestCheckHook
rlax
# rlax (broken dependency tensorflow-probability)
tensorflow
];
@@ -120,11 +107,24 @@ let
# other tests to fail.
# https://jax.readthedocs.io/en/latest/notebooks/Common_Gotchas_in_JAX.html#double-64bit-precision
"test_doctest_haiku.experimental"
# AssertionError: 1 != 0 : 1 doctests failed
"test_doctest_haiku"
# ValueError: pmap wrapped function must be passed at least one argument containing an array,
# got empty *args=() and **kwargs={}
"test_equivalent_when_passing_transformed_fn2"
# AssertionError: ValueError not raised
"test_passing_function_to_transform_pmap_transform"
"test_passing_function_to_transform_pmap_transform_with_state"
];
disabledTestPaths = [
# Those tests requires a more recent version of tensorflow. The current one (2.13) is not enough.
"haiku/_src/integration/jax2tf_test.py"
# Require rlax which is unavailable as its dependency tensorflow-probability is broken
"examples/impala/actor_test.py"
"examples/impala/learner_test.py"
"examples/impala_lite_test.py"
];
doCheck = false;
@@ -143,6 +143,7 @@ let
meta = {
description = "Haiku is a simple neural network library for JAX developed by some of the authors of Sonnet";
homepage = "https://github.com/deepmind/dm-haiku";
changelog = "https://github.com/google-deepmind/dm-haiku/releases/tag/${src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ndl ];
};
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "doorbirdpy";
version = "3.0.9";
version = "3.0.10";
pyproject = true;
src = fetchFromGitLab {
owner = "klikini";
repo = "doorbirdpy";
tag = version;
hash = "sha256-aa7u4x0WAFvCKPPGKJiZA/DYKKCa+xqabHxDMPxEbgo=";
hash = "sha256-7mA4yyvNPKOGb6Ap7kjCLhR7G1E1CQqgWCtAhciCnR4=";
};
build-system = [ setuptools ];
@@ -1,43 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
click,
primp,
lxml,
}:
buildPythonPackage rec {
pname = "duckduckgo-search";
version = "9.5.5";
pyproject = true;
src = fetchFromGitHub {
owner = "deedy5";
repo = "ddgs";
tag = "v${version}";
hash = "sha256-Pwl6fCEBj+eUXYEf4wCTw1fpKZh3j4IVC6SW0Vqcmf4=";
};
build-system = [ setuptools ];
dependencies = [
click
primp
lxml
];
doCheck = false; # tests require network access
pythonImportsCheck = [ "ddgs" ];
meta = {
description = "Python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine";
mainProgram = "ddgs";
homepage = "https://github.com/deedy5/ddgs";
changelog = "https://github.com/deedy5/ddgs/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ drawbu ];
};
}
@@ -57,7 +57,11 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
disabledTests = [
# Failed: DID NOT WARN. No warnings of type (<class 'Warning'>,) were emitted.
"test_jax_transform_warn"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
"test_filter"
];
@@ -7,14 +7,11 @@
setuptools,
# dependencies
chex,
dotmap,
flax,
jax,
jaxlib,
matplotlib,
numpy,
pyyaml,
# tests
# brax, (unpackaged)
@@ -62,6 +59,11 @@ buildPythonPackage rec {
# Requires unpackaged gymnax
"test_env_ffw_rollout"
# TypeError: ShapedArray.__init__() got an unexpected keyword argument 'named_shape'
"test_base_api"
"test_run"
"test_run_scan"
# Tries to download a data set from the internet
"test_brax_problem_eval"
"test_brax_problem_init"
@@ -3,7 +3,6 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
# build-system
setuptools,
@@ -13,35 +12,21 @@
torch,
# tests
pythonOlder,
pythonAtLeast,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "finetuning-scheduler";
version = "2.5.3";
version = "2.9.0";
pyproject = true;
src = fetchFromGitHub {
owner = "speediedan";
repo = "finetuning-scheduler";
tag = "v${version}";
hash = "sha256-6WRKDYug7eVaTSY2R2jBcj9o/984mqKZZi36XRT7KyI=";
hash = "sha256-AfkrWuqpFS71Zrh5NsamzxMitKCsqPF50F9zTDdDhRg=";
};
patches = [
(fetchpatch {
url = "https://github.com/speediedan/finetuning-scheduler/commit/78e6e225f353d1ba95db05d7fc6ff541859ed6a2.patch";
hash = "sha256-7mbtsaHrnHph8lvuwhBGqxPQimbZcbGeyBYXzApFPn4=";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools<77.0.0" "setuptools"
'';
build-system = [ setuptools ];
pythonRelaxDeps = [
@@ -58,23 +43,14 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
enabledTestPaths = [ "tests" ];
disabledTests =
lib.optionals (pythonOlder "3.12") [
# torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised:
# LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler'
"test_fts_dynamo_enforce_p0"
"test_fts_dynamo_resume"
"test_fts_dynamo_intrafit"
]
++ lib.optionals (pythonAtLeast "3.13") [
# RuntimeError: Dynamo is not supported on Python 3.13+
"test_fts_dynamo_enforce_p0"
"test_fts_dynamo_resume"
]
++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
# slightly exceeds numerical tolerance on aarch64-linux:
"test_fts_frozen_bn_track_running_stats"
];
disabledTests = [
# AssertionError: assert 'lightning @ git+' in 'lightning>=2.5.0,<2.5.6'
"test_get_lightning_requirement"
]
++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
# slightly exceeds numerical tolerance on aarch64-linux:
"test_fts_frozen_bn_track_running_stats"
];
pythonImportsCheck = [ "finetuning_scheduler" ];
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
# build-system
setuptools,
@@ -48,6 +49,17 @@ buildPythonPackage rec {
hash = "sha256-ioMj8+TuOFX3t9p3oVaywaOQPFBgvNcy7b/2WX/yvXA=";
};
patches = [
# Fixes TypeError: shard_map() got an unexpected keyword argument 'auto'
# TODO: remove when updating to the next release
# https://github.com/google/flax/pull/5020
(fetchpatch {
name = "jax-0.8.0-compat";
url = "https://github.com/google/flax/commit/5bf9b35ff03130f440a93a812fd8b47ec6a49add.patch";
hash = "sha256-KYpa1wDQMt77XIDGQEg/VuU/OPPNp2enGSA986TZSLQ=";
})
];
build-system = [
setuptools
setuptools-scm
@@ -59,6 +59,6 @@ buildPythonPackage rec {
homepage = "https://github.com/googlefonts/fontmake";
changelog = "https://github.com/googlefonts/fontmake/releases/tag/${src.tag}";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.BarinovMaxim ];
maintainers = [ ];
};
}
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "glyphslib";
version = "6.11.6";
version = "6.12.0";
pyproject = true;
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "googlefonts";
repo = "glyphsLib";
tag = "v${version}";
hash = "sha256-ZHF+q6L2XcYk5HRuRz1pgvfRAwY2GxLqyjIDY1ocsEQ=";
hash = "sha256-5Ae6oj3tbAvcKsSkDdIHhGi2I63sGDEByt00reTBQGQ=";
};
build-system = [ setuptools-scm ];
@@ -55,6 +55,6 @@ buildPythonPackage rec {
description = "Bridge from Glyphs source files (.glyphs) to UFOs and Designspace files via defcon and designspaceLib";
homepage = "https://github.com/googlefonts/glyphsLib";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.BarinovMaxim ];
maintainers = [ ];
};
}
@@ -4,7 +4,6 @@
fetchFromGitHub,
pdm-pep517,
aiohttp,
async-timeout,
}:
buildPythonPackage rec {
@@ -21,9 +20,13 @@ buildPythonPackage rec {
build-system = [ pdm-pep517 ];
pythonRemoveDeps = [
# https://github.com/Imeon-Inverters-for-Home-Assistant/inverter-api/pull/1
"async-timeout"
];
dependencies = [
aiohttp
async-timeout
];
pythonImportsCheck = [ "imeon_inverter_api" ];
@@ -50,8 +50,8 @@ buildPythonPackage rec {
.${stdenv.hostPlatform.system};
hash =
{
x86_64-linux = "sha256-OXdyaiozKwvTSDG96ytWUzY0QvMBLCmW/IgICq9rO60=";
aarch64-linux = "sha256-2H1mbQxSP62q23GU58J03MWg5/j40dfig1NT7zK+8Bw=";
x86_64-linux = "sha256-npnD5Ub2vgD/xqTt0s9bdtTFmqNKjYOW2COauP2Ov9M=";
aarch64-linux = "sha256-UAu8W9mrvcyyOP4TgbkAzVdyZFANFHA1H2jl29tSNcI=";
}
.${stdenv.hostPlatform.system};
};
@@ -39,32 +39,32 @@ let
"3.11-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp311";
hash = "sha256-rckk68ekXI00AOoBGNxwpwgrKobjVxFzjUA904FdCb8=";
hash = "sha256-cL6wFZM7RyEDSBonUh1NtBz1kgCHBfRBLL86HsrzXC4=";
};
"3.11-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp311";
hash = "sha256-KnJ6ia5prCHB9Qk9jVrviaDmkuZrA0/JNMiszHLkApA=";
hash = "sha256-x+pdt1IZS4o/v0xWS7e7wk8k4HEJu1nmWf1LETFLunY=";
};
"3.12-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp312";
hash = "sha256-goTnz39USQZgTxEXAqbwARqW338BE4eLOBvsCQUXJTY=";
hash = "sha256-VVbj9Iy+HfYI2dDTQAMIZJ3eyqjQ4kOUkMb4i0GAMcs=";
};
"3.12-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp312";
hash = "sha256-mKl1ZVOChY2HTWRxzpcZQxBgnQoqfEKDxuB+N5M7d2g=";
hash = "sha256-SdBMFULqpAi3utAXASC82oMqAvuUT8iT3OiCbublpJM=";
};
"3.13-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp313";
hash = "sha256-chLBLXW33FEnXycYJ99KbTeEMMBvZQ5sMcFi/pV5/xI=";
hash = "sha256-Rw6W5+pNsPN1jabn0VxF6BAmYpJP46hHIV7mXKySxo0=";
};
"3.13-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp313";
hash = "sha256-Xj4qpNch+wLdECgmKq6uwpWORbylxNNRKykVG1cMtCU=";
hash = "sha256-IGmVNdeaLM+X8SEGC2BAUzhvQRzLMMElxmtqWgJsiSE=";
};
};
in
@@ -40,7 +40,7 @@ let
in
buildPythonPackage rec {
pname = "jax";
version = "0.7.2";
version = "0.8.0";
pyproject = true;
src = fetchFromGitHub {
@@ -48,7 +48,7 @@ buildPythonPackage rec {
repo = "jax";
# google/jax contains tags for jax and jaxlib. Only use jax tags!
tag = "jax-v${version}";
hash = "sha256-GBpHFjvF7SvxJafu7aVlTp0jxSo4jAi9oPeMg2B/P24=";
hash = "sha256-Ilcp4WW65SyqrqDGBRdnB25m7OCbrsfdtxWvl0uTjNw=";
};
build-system = [ setuptools ];
+10 -10
View File
@@ -18,7 +18,7 @@
}:
let
version = "0.7.2";
version = "0.8.0";
inherit (python) pythonVersion;
# As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the
@@ -49,49 +49,49 @@ let
"3.11-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp311";
hash = "sha256-Q4IAYjXM7VnS95WsyYPBvtz7yk/qj5RhMR1hxqeTrmY=";
hash = "sha256-/1Pouvl49rfEB2IVr3jwupacrENO0vclZdh+OMI/AOc=";
};
"3.11-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp311";
hash = "sha256-jKcAM1H76Mz6L6Wkk+wt+/LfkkQTBs9cO5cFCO7bkqs=";
hash = "sha256-Qa693vZ6VVpt4XQnpOZs5gpSioFYR+Ldltq85Xn3rPg=";
};
"3.11-aarch64-darwin" = getSrcFromPypi {
platform = "macosx_11_0_arm64";
dist = "cp311";
hash = "sha256-n7+Qr84w4066LqkppQb1kHvdQGI1gSLeSZzp5nGguh8=";
hash = "sha256-u2AqjCTGFMuMpu7tPnCnM9k5nGoviJAKAlJiPNZydrU=";
};
"3.12-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp312";
hash = "sha256-EfMjGeZizP9mhZ6zk3VwUNiXG9iAvE3XDexkNNiQ+1k=";
hash = "sha256-LIZ1v4bjka/k+NhjCAvhoCTXNN/T3RN/eqjn8iCRrc0=";
};
"3.12-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp312";
hash = "sha256-m1oNNXSXYRoRPSB/ssGZfwGrehdYcHAIEiIPC8qjGCI=";
hash = "sha256-2D/4zxsHApljnNpPhCdwf2kFHchCHln7tzMFUjk3Vw0=";
};
"3.12-aarch64-darwin" = getSrcFromPypi {
platform = "macosx_11_0_arm64";
dist = "cp312";
hash = "sha256-vW0cU71HXg52ilSvmLFkL7SdcwTPBVzuux0B6J04ocs=";
hash = "sha256-9gqsD2Tp5wpc7zQf4pJoRRhpVRTHGtAANndLvtX3MS4=";
};
"3.13-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp313";
hash = "sha256-SdmWIEhu/9qHQAAkcjpFIwZWaZbj3nGe5jPwUiDR7nc=";
hash = "sha256-Zsb1dvVKY+0FL1xGm+9NtyP18FC4OewMQpVzARNBvVg=";
};
"3.13-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp313";
hash = "sha256-l8eT6Xvl3cc7PoXmzorTcJ6AVPdeohnMDLTwgFplrwY=";
hash = "sha256-s+rFA7kP/sxo8R+hIhM+7yxixTbbKOgB5DbX56m2e/g=";
};
"3.13-aarch64-darwin" = getSrcFromPypi {
platform = "macosx_11_0_arm64";
dist = "cp313";
hash = "sha256-4bPf6ZFYJfzgBuoJW4U/V2gYRcW/qAl13MN4iTY3H7A=";
hash = "sha256-X88zpWOfjxZKRzqceKH6Cy4VrD/L7NbZaqD4i/Jeprs=";
};
};
in
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "json-repair";
version = "0.51.0";
version = "0.52.0";
pyproject = true;
src = fetchFromGitHub {
owner = "mangiucugna";
repo = "json_repair";
tag = "v${version}";
hash = "sha256-XXbJwzvt2gQox1+vQsJ3ajVoFlJVG/z2eUECQkWOi64=";
hash = "sha256-RK5VycwcI6EhFkejbSwr96iF12O22nIGQzbOIlo/Mhk=";
};
build-system = [ setuptools ];
@@ -23,16 +23,18 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
disabledTestPaths = [
# Disable benchmark tests
"tests/test_performance.py"
];
pythonImportsCheck = [ "json_repair" ];
meta = with lib; {
meta = {
description = "Module to repair invalid JSON, commonly used to parse the output of LLMs";
homepage = "https://github.com/mangiucugna/json_repair/";
changelog = "https://github.com/mangiucugna/json_repair/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ greg ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ greg ];
mainProgram = "json_repair";
};
}
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "langfuse";
version = "3.6.2";
version = "3.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langfuse";
repo = "langfuse-python";
tag = "v${version}";
hash = "sha256-8aDldPVzTx2A65S8lTqInx2DYj2sTEJE1iNeh7HST3E=";
hash = "sha256-eq6uOb4C3Kbdi+I6Fcl0qWgey57BmrATqzvtDLjDMnw=";
};
build-system = [ poetry-core ];
@@ -113,6 +113,7 @@ buildPythonPackage rec {
"test_backward_compatibility"
"test_dataset_initialization"
"test_factory"
"test_from_pretrained_nonexistent_path"
"test_policy_defaults"
"test_save_and_load_pretrained"
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "llm-anthropic";
version = "0.19";
version = "0.20";
pyproject = true;
src = fetchFromGitHub {
owner = "simonw";
repo = "llm-anthropic";
tag = version;
hash = "sha256-2RGjcbT5Q9kuc89l/hyofg9EkYJUDXQGYbMx1xE/qn4=";
hash = "sha256-tZCFbrsACJl1hC5tSbxJzBBLY8mdcCNjshZilSCAslM=";
};
build-system = [

Some files were not shown because too many files have changed in this diff Show More