Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -304,8 +304,8 @@ in
|
||||
options = {
|
||||
|
||||
services.rspamd = {
|
||||
|
||||
enable = mkEnableOption "rspamd, the Rapid spam filtering system";
|
||||
package = lib.mkPackageOption pkgs "rspamd" { };
|
||||
|
||||
debug = mkOption {
|
||||
type = types.bool;
|
||||
@@ -458,7 +458,7 @@ in
|
||||
};
|
||||
|
||||
# Allow users to run 'rspamc' and 'rspamadm'.
|
||||
environment.systemPackages = [ pkgs.rspamd ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
users.users.${cfg.user} = {
|
||||
description = "rspamd daemon";
|
||||
@@ -480,7 +480,7 @@ in
|
||||
restartTriggers = [ rspamdDir ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} -c /etc/rspamd/rspamd.conf -f";
|
||||
ExecStart = "${cfg.package}/bin/rspamd ${optionalString cfg.debug "-d"} -c /etc/rspamd/rspamd.conf -f";
|
||||
Restart = "always";
|
||||
|
||||
User = "${cfg.user}";
|
||||
|
||||
@@ -75,6 +75,7 @@ mapAliases (
|
||||
feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09
|
||||
fugitive = vim-fugitive;
|
||||
floating-nvim = throw "floating.nvim has been removed: abandoned by upstream. Use popup-nvim or nui-nvim"; # Added 2024-11-26
|
||||
fzfWrapper = fzf-wrapper;
|
||||
ghc-mod-vim = ghcmod-vim;
|
||||
ghcmod = ghcmod-vim;
|
||||
gleam-vim = throw "gleam.vim has been removed: its code was merged into vim."; # Added 2025-06-10
|
||||
@@ -94,6 +95,7 @@ mapAliases (
|
||||
ipython = vim-ipython;
|
||||
latex-live-preview = vim-latex-live-preview;
|
||||
maktaba = vim-maktaba;
|
||||
minsnip-nvim = throw "the upstream repository got deleted"; # added 2025-08-30
|
||||
multiple-cursors = vim-multiple-cursors;
|
||||
necoGhc = neco-ghc; # backwards compat, added 2014-10-18
|
||||
neocomplete = neocomplete-vim;
|
||||
|
||||
@@ -55,7 +55,6 @@ let
|
||||
# If additional modifications to the build process are required,
|
||||
# add to ./overrides.nix.
|
||||
overrides = callPackage ./overrides.nix {
|
||||
inherit buildVimPlugin;
|
||||
inherit llvmPackages;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
vimUtils,
|
||||
ethersync,
|
||||
}:
|
||||
vimUtils.buildVimPlugin rec {
|
||||
inherit (ethersync)
|
||||
pname
|
||||
version
|
||||
src
|
||||
meta
|
||||
;
|
||||
|
||||
sourceRoot = "${src.name}/nvim-plugin";
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
vimUtils,
|
||||
fzf,
|
||||
}:
|
||||
# Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim
|
||||
# plugin, since part of the fzf vim plugin is included in the main fzf
|
||||
# program.
|
||||
vimUtils.buildVimPlugin {
|
||||
inherit (fzf) src version;
|
||||
pname = "fzf";
|
||||
postInstall = ''
|
||||
ln -s ${fzf}/bin/fzf $target/bin/fzf
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
vimUtils,
|
||||
hurl,
|
||||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "hurl";
|
||||
inherit (hurl) version;
|
||||
|
||||
# https://hurl.dev/
|
||||
src = "${hurl.src}/contrib/vim";
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
vimUtils,
|
||||
meson,
|
||||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
inherit (meson) pname version src;
|
||||
preInstall = "cd data/syntax-highlighting/vim";
|
||||
meta.maintainers = with lib.maintainers; [ vcunat ];
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
vimUtils,
|
||||
phpactor,
|
||||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
inherit (phpactor)
|
||||
pname
|
||||
src
|
||||
meta
|
||||
version
|
||||
;
|
||||
postPatch = ''
|
||||
substituteInPlace plugin/phpactor.vim \
|
||||
--replace-fail "g:phpactorpath = expand('<sfile>:p:h') . '/..'" "g:phpactorpath = '${phpactor}'"
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
vimUtils,
|
||||
skim,
|
||||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "skim";
|
||||
inherit (skim) version;
|
||||
src = skim.vim;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
vimUtils,
|
||||
statix,
|
||||
}:
|
||||
vimUtils.buildVimPlugin rec {
|
||||
inherit (statix) pname src meta;
|
||||
version = "0.1.0";
|
||||
postPatch = ''
|
||||
# check that version is up to date
|
||||
grep 'pname = "statix-vim"' -A 1 flake.nix \
|
||||
| grep -F 'version = "${version}"'
|
||||
|
||||
cd vim-plugin
|
||||
substituteInPlace ftplugin/nix.vim --replace-fail statix ${statix}/bin/statix
|
||||
substituteInPlace plugin/statix.vim --replace-fail statix ${statix}/bin/statix
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
vimUtils,
|
||||
taskwarrior2,
|
||||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
inherit (taskwarrior2) version pname;
|
||||
src = "${taskwarrior2.src}/scripts/vim";
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
vimUtils,
|
||||
taskwarrior3,
|
||||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
inherit (taskwarrior3) version pname;
|
||||
src = "${taskwarrior3.src}/scripts/vim";
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
vimUtils,
|
||||
tup,
|
||||
}:
|
||||
let
|
||||
# Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim
|
||||
ftdetect = builtins.toFile "tup.vim" ''
|
||||
au BufNewFile,BufRead Tupfile,*.tup setf tup
|
||||
'';
|
||||
in
|
||||
vimUtils.buildVimPlugin {
|
||||
inherit (tup) pname version src;
|
||||
preInstall = ''
|
||||
mkdir -p vim-plugin/syntax vim-plugin/ftdetect
|
||||
cp contrib/syntax/tup.vim vim-plugin/syntax/tup.vim
|
||||
cp "${ftdetect}" vim-plugin/ftdetect/tup.vim
|
||||
cd vim-plugin
|
||||
'';
|
||||
meta.maintainers = with lib.maintainers; [ enderger ];
|
||||
}
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
# nixpkgs functions
|
||||
buildGoModule,
|
||||
buildVimPlugin,
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
@@ -33,7 +32,6 @@
|
||||
languagetool,
|
||||
libgit2,
|
||||
llvmPackages,
|
||||
meson,
|
||||
neovim-unwrapped,
|
||||
nim1,
|
||||
nodejs,
|
||||
@@ -41,19 +39,13 @@
|
||||
openscad,
|
||||
openssh,
|
||||
parinfer-rust,
|
||||
phpactor,
|
||||
ranger,
|
||||
ripgrep,
|
||||
skim,
|
||||
sqlite,
|
||||
sshfs,
|
||||
statix,
|
||||
stylish-haskell,
|
||||
tabnine,
|
||||
taskwarrior2,
|
||||
taskwarrior3,
|
||||
tmux,
|
||||
tup,
|
||||
typescript,
|
||||
typescript-language-server,
|
||||
vim,
|
||||
@@ -134,12 +126,15 @@
|
||||
# search-and-replace.nvim dependencies
|
||||
fd,
|
||||
sad,
|
||||
# ethersync vim plugin
|
||||
ethersync,
|
||||
}:
|
||||
self: super:
|
||||
let
|
||||
luaPackages = neovim-unwrapped.lua.pkgs;
|
||||
|
||||
# Ensure the vim plugin builders are not used in this file.
|
||||
# If they are used, these stubs will throw.
|
||||
buildVimPlugin = throw "New plugin definitions should be done outside `overrides.nix`";
|
||||
buildNeoVimPlugin = throw "New plugin definitions should be done outside `overrides.nix`";
|
||||
in
|
||||
{
|
||||
corePlugins = symlinkJoin {
|
||||
@@ -277,18 +272,18 @@ in
|
||||
nvimSkipModules = [ "bufferline.utils" ];
|
||||
};
|
||||
|
||||
barbecue-nvim = super.barbecue-nvim.overrideAttrs {
|
||||
barbecue-nvim = super.barbecue-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [
|
||||
nvim-lspconfig
|
||||
nvim-navic
|
||||
];
|
||||
meta = {
|
||||
meta = old.meta // {
|
||||
description = "VS Code like winbar for Neovim";
|
||||
homepage = "https://github.com/utilyre/barbecue.nvim";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ lightquantum ];
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
base46 = super.base46.overrideAttrs {
|
||||
dependencies = [ self.nvchad-ui ];
|
||||
@@ -335,13 +330,13 @@ in
|
||||
dependencies = [ self.blink-cmp ];
|
||||
};
|
||||
|
||||
blink-cmp-words = super.blink-cmp-words.overrideAttrs {
|
||||
blink-cmp-words = super.blink-cmp-words.overrideAttrs (old: {
|
||||
dependencies = [ self.blink-cmp ];
|
||||
meta = {
|
||||
meta = old.meta // {
|
||||
description = "Offline word and synonym completion provider for Neovim";
|
||||
maintainers = with lib.maintainers; [ m3l6h ];
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
bluloco-nvim = super.bluloco-nvim.overrideAttrs {
|
||||
dependencies = [ self.lush-nvim ];
|
||||
@@ -352,9 +347,11 @@ in
|
||||
nvimSkipModules = [ "bufferline.commands" ];
|
||||
};
|
||||
|
||||
bufresize-nvim = super.bufresize-nvim.overrideAttrs {
|
||||
meta.license = lib.licenses.mit;
|
||||
};
|
||||
bufresize-nvim = super.bufresize-nvim.overrideAttrs (old: {
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
});
|
||||
|
||||
catppuccin-nvim = super.catppuccin-nvim.overrideAttrs {
|
||||
nvimSkipModules = [
|
||||
@@ -1012,17 +1009,17 @@ in
|
||||
dependencies = [ self.nvim-yarp ];
|
||||
};
|
||||
|
||||
demicolon-nvim = super.demicolon-nvim.overrideAttrs {
|
||||
demicolon-nvim = super.demicolon-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [
|
||||
nvim-treesitter
|
||||
nvim-treesitter-textobjects
|
||||
];
|
||||
meta = {
|
||||
meta = old.meta // {
|
||||
description = "Overloaded ; and , keys in Neovim";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ m3l6h ];
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
denops-vim = super.denops-vim.overrideAttrs {
|
||||
postPatch = ''
|
||||
@@ -1048,16 +1045,16 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
deoplete-khard = super.deoplete-khard.overrideAttrs {
|
||||
deoplete-khard = super.deoplete-khard.overrideAttrs (old: {
|
||||
dependencies = [ self.deoplete-nvim ];
|
||||
passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ];
|
||||
meta = {
|
||||
meta = old.meta // {
|
||||
description = "Address-completion for khard via deoplete";
|
||||
homepage = "https://github.com/nicoe/deoplete-khard";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ jorsn ];
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
devdocs-nvim = super.devdocs-nvim.overrideAttrs {
|
||||
nvimSkipModules = [
|
||||
@@ -1158,17 +1155,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
ethersync = buildVimPlugin rec {
|
||||
inherit (ethersync)
|
||||
pname
|
||||
version
|
||||
src
|
||||
meta
|
||||
;
|
||||
|
||||
sourceRoot = "${src.name}/nvim-plugin";
|
||||
};
|
||||
|
||||
executor-nvim = super.executor-nvim.overrideAttrs {
|
||||
dependencies = [ self.nui-nvim ];
|
||||
};
|
||||
@@ -1184,13 +1170,13 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
fcitx-vim = super.fcitx-vim.overrideAttrs {
|
||||
fcitx-vim = super.fcitx-vim.overrideAttrs (old: {
|
||||
passthru.python3Dependencies = ps: with ps; [ dbus-python ];
|
||||
meta = {
|
||||
meta = old.meta // {
|
||||
description = "Keep and restore fcitx state when leaving/re-entering insert mode or search mode";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
flash-nvim = super.flash-nvim.overrideAttrs {
|
||||
# Docs require lazyvim
|
||||
@@ -1332,18 +1318,7 @@ in
|
||||
};
|
||||
|
||||
fzf-vim = super.fzf-vim.overrideAttrs {
|
||||
dependencies = [ self.fzfWrapper ];
|
||||
};
|
||||
|
||||
# Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim
|
||||
# plugin, since part of the fzf vim plugin is included in the main fzf
|
||||
# program.
|
||||
fzfWrapper = buildVimPlugin {
|
||||
inherit (fzf) src version;
|
||||
pname = "fzf";
|
||||
postInstall = ''
|
||||
ln -s ${fzf}/bin/fzf $target/bin/fzf
|
||||
'';
|
||||
dependencies = [ self.fzf-wrapper ];
|
||||
};
|
||||
|
||||
gen-nvim = super.gen-nvim.overrideAttrs {
|
||||
@@ -1497,15 +1472,6 @@ in
|
||||
dependencies = [ self.nui-nvim ];
|
||||
};
|
||||
|
||||
# https://hurl.dev/
|
||||
hurl = buildVimPlugin {
|
||||
pname = "hurl";
|
||||
version = hurl.version;
|
||||
# dontUnpack = true;
|
||||
|
||||
src = "${hurl.src}/contrib/vim";
|
||||
};
|
||||
|
||||
hurl-nvim = super.hurl-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
nui-nvim
|
||||
@@ -1563,14 +1529,14 @@ in
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
jedi-vim = super.jedi-vim.overrideAttrs {
|
||||
jedi-vim = super.jedi-vim.overrideAttrs (old: {
|
||||
# checking for python3 support in vim would be neat, too, but nobody else seems to care
|
||||
buildInputs = [ python3.pkgs.jedi ];
|
||||
meta = {
|
||||
meta = old.meta // {
|
||||
description = "code-completion for python using python-jedi";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
jellybeans-nvim = super.jellybeans-nvim.overrideAttrs {
|
||||
dependencies = [ self.lush-nvim ];
|
||||
@@ -1795,7 +1761,7 @@ in
|
||||
dependencies = [ self.litee-nvim ];
|
||||
};
|
||||
|
||||
live-preview-nvim = super.live-preview-nvim.overrideAttrs {
|
||||
live-preview-nvim = super.live-preview-nvim.overrideAttrs (old: {
|
||||
checkInputs = with self; [
|
||||
fzf-lua
|
||||
mini-pick
|
||||
@@ -1808,16 +1774,20 @@ in
|
||||
# This file runs tests on require which unfortunately fails as it attempts to require the base plugin. See https://github.com/brianhuster/live-preview.nvim/blob/5890c4f7cb81a432fd5f3b960167757f1b4d4702/lua/livepreview/_spec.lua#L25
|
||||
"livepreview._spec"
|
||||
];
|
||||
meta.license = lib.licenses.gpl3Only;
|
||||
};
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.gpl3Only;
|
||||
};
|
||||
});
|
||||
|
||||
lspcontainers-nvim = super.lspcontainers-nvim.overrideAttrs {
|
||||
dependencies = [ self.nvim-lspconfig ];
|
||||
};
|
||||
|
||||
lspecho-nvim = super.lspecho-nvim.overrideAttrs {
|
||||
meta.license = lib.licenses.mit;
|
||||
};
|
||||
lspecho-nvim = super.lspecho-nvim.overrideAttrs (old: {
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
});
|
||||
|
||||
lspsaga-nvim = super.lspsaga-nvim.overrideAttrs {
|
||||
# Other modules require setup call first
|
||||
@@ -1943,12 +1913,6 @@ in
|
||||
checkInputs = [ self.lualine-nvim ];
|
||||
};
|
||||
|
||||
meson = buildVimPlugin {
|
||||
inherit (meson) pname version src;
|
||||
preInstall = "cd data/syntax-highlighting/vim";
|
||||
meta.maintainers = with lib.maintainers; [ vcunat ];
|
||||
};
|
||||
|
||||
mind-nvim = super.mind-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
@@ -1972,18 +1936,6 @@ in
|
||||
vimCommandCheck = "MinimapToggle";
|
||||
};
|
||||
|
||||
minsnip-nvim = buildVimPlugin {
|
||||
pname = "minsnip.nvim";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "minsnip.nvim";
|
||||
rev = "6ae2f3247b3a2acde540ccef2e843fdfcdfebcee";
|
||||
sha256 = "1db5az5civ2bnqg7v3g937mn150ys52258c3glpvdvyyasxb4iih";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";
|
||||
};
|
||||
|
||||
minuet-ai-nvim = super.minuet-ai-nvim.overrideAttrs {
|
||||
checkInputs = [
|
||||
# optional cmp integration
|
||||
@@ -2878,11 +2830,13 @@ in
|
||||
configurePhase = "cd vim";
|
||||
};
|
||||
|
||||
one-nvim = super.one-nvim.overrideAttrs {
|
||||
one-nvim = super.one-nvim.overrideAttrs (old: {
|
||||
# E5108: /lua/one-nvim.lua:14: Unknown option 't_Co'
|
||||
# https://github.com/Th3Whit3Wolf/one-nvim/issues/23
|
||||
meta.broken = true;
|
||||
};
|
||||
meta = old.meta // {
|
||||
broken = true;
|
||||
};
|
||||
});
|
||||
|
||||
# The plugin depends on either skim-vim or fzf-vim, but we don't want to force the user so we
|
||||
# avoid choosing one of them and leave it to the user
|
||||
@@ -2991,7 +2945,10 @@ in
|
||||
|
||||
perfanno-nvim = super.perfanno-nvim.overrideAttrs (old: {
|
||||
dependencies = [ gperf ];
|
||||
meta.maintainers = with lib.maintainers; [ fredeb ];
|
||||
|
||||
meta = old.meta // {
|
||||
maintainers = with lib.maintainers; [ fredeb ];
|
||||
};
|
||||
});
|
||||
|
||||
persisted-nvim = super.persisted-nvim.overrideAttrs {
|
||||
@@ -3010,19 +2967,6 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
phpactor = buildVimPlugin {
|
||||
inherit (phpactor)
|
||||
pname
|
||||
src
|
||||
meta
|
||||
version
|
||||
;
|
||||
postPatch = ''
|
||||
substituteInPlace plugin/phpactor.vim \
|
||||
--replace-fail "g:phpactorpath = expand('<sfile>:p:h') . '/..'" "g:phpactorpath = '${phpactor}'"
|
||||
'';
|
||||
};
|
||||
|
||||
plantuml-nvim = super.plantuml-nvim.overrideAttrs {
|
||||
dependencies = [ self.LibDeflate-nvim ];
|
||||
};
|
||||
@@ -3200,12 +3144,6 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
skim = buildVimPlugin {
|
||||
pname = "skim";
|
||||
inherit (skim) version;
|
||||
src = skim.vim;
|
||||
};
|
||||
|
||||
skim-vim = super.skim-vim.overrideAttrs {
|
||||
dependencies = [ self.skim ];
|
||||
};
|
||||
@@ -3322,20 +3260,6 @@ in
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
statix = buildVimPlugin rec {
|
||||
inherit (statix) pname src meta;
|
||||
version = "0.1.0";
|
||||
postPatch = ''
|
||||
# check that version is up to date
|
||||
grep 'pname = "statix-vim"' -A 1 flake.nix \
|
||||
| grep -F 'version = "${version}"'
|
||||
|
||||
cd vim-plugin
|
||||
substituteInPlace ftplugin/nix.vim --replace-fail statix ${statix}/bin/statix
|
||||
substituteInPlace plugin/statix.vim --replace-fail statix ${statix}/bin/statix
|
||||
'';
|
||||
};
|
||||
|
||||
stylish-nvim = super.stylish-nvim.overrideAttrs {
|
||||
postPatch = ''
|
||||
substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace-fail xdotool ${xdotool}/bin/xdotool
|
||||
@@ -3384,37 +3308,31 @@ in
|
||||
os.execv("${svedbackend}/bin/evinceSync.py", sys.argv)
|
||||
'';
|
||||
in
|
||||
super.sved.overrideAttrs {
|
||||
super.sved.overrideAttrs (old: {
|
||||
preferLocalBuild = true;
|
||||
postPatch = ''
|
||||
rm ftplugin/evinceSync.py
|
||||
install -m 544 ${pythonWrapper} ftplugin/evinceSync.py
|
||||
'';
|
||||
meta = {
|
||||
meta = old.meta // {
|
||||
description = "synctex support between vim/neovim and evince";
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs {
|
||||
syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs (old: {
|
||||
dependencies = [ self.nvim-treesitter ];
|
||||
meta.maintainers = with lib.maintainers; [ callumio ];
|
||||
};
|
||||
|
||||
tardis-nvim = super.tardis-nvim.overrideAttrs {
|
||||
meta = old.meta // {
|
||||
maintainers = with lib.maintainers; [ callumio ];
|
||||
};
|
||||
});
|
||||
|
||||
tardis-nvim = super.tardis-nvim.overrideAttrs (old: {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
meta.maintainers = with lib.maintainers; [ fredeb ];
|
||||
};
|
||||
|
||||
taskwarrior2 = buildVimPlugin {
|
||||
inherit (taskwarrior2) version pname;
|
||||
src = "${taskwarrior2.src}/scripts/vim";
|
||||
};
|
||||
|
||||
taskwarrior3 = buildVimPlugin {
|
||||
inherit (taskwarrior3) version pname;
|
||||
src = "${taskwarrior3.src}/scripts/vim";
|
||||
};
|
||||
|
||||
meta = old.meta // {
|
||||
maintainers = with lib.maintainers; [ fredeb ];
|
||||
};
|
||||
});
|
||||
telekasten-nvim = super.telekasten-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
plenary-nvim
|
||||
@@ -3466,11 +3384,13 @@ in
|
||||
nvimSkipModules = "frecency.types";
|
||||
};
|
||||
|
||||
telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs {
|
||||
telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: {
|
||||
dependencies = [ self.telescope-nvim ];
|
||||
buildPhase = "make";
|
||||
meta.platforms = lib.platforms.all;
|
||||
};
|
||||
meta = old.meta // {
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
});
|
||||
|
||||
telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
@@ -3500,7 +3420,9 @@ in
|
||||
ln -s ${fzy-lua-native}/static $target/${fzy-lua-native-path}/static
|
||||
ln -s ${fzy-lua-native}/lua $target/${fzy-lua-native-path}/lua
|
||||
'';
|
||||
meta.platforms = lib.platforms.all;
|
||||
meta = old.meta // {
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
});
|
||||
|
||||
telescope-git-conflicts-nvim = super.telescope-git-conflicts-nvim.overrideAttrs {
|
||||
@@ -3668,24 +3590,6 @@ in
|
||||
dependencies = [ self.nvim-treesitter ];
|
||||
};
|
||||
|
||||
tup =
|
||||
let
|
||||
# Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim
|
||||
ftdetect = builtins.toFile "tup.vim" ''
|
||||
au BufNewFile,BufRead Tupfile,*.tup setf tup
|
||||
'';
|
||||
in
|
||||
buildVimPlugin {
|
||||
inherit (tup) pname version src;
|
||||
preInstall = ''
|
||||
mkdir -p vim-plugin/syntax vim-plugin/ftdetect
|
||||
cp contrib/syntax/tup.vim vim-plugin/syntax/tup.vim
|
||||
cp "${ftdetect}" vim-plugin/ftdetect/tup.vim
|
||||
cd vim-plugin
|
||||
'';
|
||||
meta.maintainers = with lib.maintainers; [ enderger ];
|
||||
};
|
||||
|
||||
typescript-nvim = super.typescript-nvim.overrideAttrs {
|
||||
checkInputs = [
|
||||
# Optional null-ls integration
|
||||
@@ -3748,16 +3652,16 @@ in
|
||||
runtimeDeps = [ uv ];
|
||||
};
|
||||
|
||||
vCoolor-vim = super.vCoolor-vim.overrideAttrs {
|
||||
vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: {
|
||||
# on linux can use either Zenity or Yad.
|
||||
propagatedBuildInputs = [ zenity ];
|
||||
meta = {
|
||||
meta = old.meta // {
|
||||
description = "Simple color selector/picker plugin";
|
||||
license = lib.licenses.publicDomain;
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
vimacs = super.vimacs.overrideAttrs {
|
||||
vimacs = super.vimacs.overrideAttrs (old: {
|
||||
buildPhase = ''
|
||||
substituteInPlace bin/vim \
|
||||
--replace-fail '/usr/bin/vim' 'vim' \
|
||||
@@ -3765,13 +3669,13 @@ in
|
||||
# remove unnecessary duplicated bin wrapper script
|
||||
rm -r plugin/vimacs
|
||||
'';
|
||||
meta = with lib; {
|
||||
meta = old.meta // {
|
||||
description = "Vim-Improved eMACS: Emacs emulation plugin for Vim";
|
||||
homepage = "http://algorithm.com.au/code/vimacs";
|
||||
license = licenses.gpl2Plus;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ millerjason ];
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
vimade = super.vimade.overrideAttrs {
|
||||
checkInputs = with self; [
|
||||
@@ -3782,13 +3686,13 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
vimsence = super.vimsence.overrideAttrs {
|
||||
meta = with lib; {
|
||||
vimsence = super.vimsence.overrideAttrs (old: {
|
||||
meta = old.meta // {
|
||||
description = "Discord rich presence for Vim";
|
||||
homepage = "https://github.com/hugolgst/vimsence";
|
||||
maintainers = with lib.maintainers; [ hugolgst ];
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
vimproc-vim = super.vimproc-vim.overrideAttrs {
|
||||
buildInputs = [ which ];
|
||||
@@ -4009,7 +3913,9 @@ in
|
||||
ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase
|
||||
'';
|
||||
|
||||
meta.platforms = lib.platforms.all;
|
||||
meta = old.meta // {
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
});
|
||||
|
||||
vim-hier = super.vim-hier.overrideAttrs {
|
||||
@@ -4078,10 +3984,12 @@ in
|
||||
vim-tabby = super.vim-tabby.overrideAttrs {
|
||||
};
|
||||
|
||||
vim-textobj-entire = super.vim-textobj-entire.overrideAttrs {
|
||||
vim-textobj-entire = super.vim-textobj-entire.overrideAttrs (old: {
|
||||
dependencies = [ self.vim-textobj-user ];
|
||||
meta.maintainers = with lib.maintainers; [ workflow ];
|
||||
};
|
||||
meta = old.meta // {
|
||||
maintainers = with lib.maintainers; [ workflow ];
|
||||
};
|
||||
});
|
||||
|
||||
vim-tpipeline = super.vim-tpipeline.overrideAttrs {
|
||||
# Requires global variable
|
||||
@@ -4218,7 +4126,7 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
YouCompleteMe = super.YouCompleteMe.overrideAttrs {
|
||||
YouCompleteMe = super.YouCompleteMe.overrideAttrs (old: {
|
||||
buildPhase = ''
|
||||
substituteInPlace plugin/youcompleteme.vim \
|
||||
--replace-fail "'ycm_path_to_python_interpreter', '''" \
|
||||
@@ -4228,18 +4136,18 @@ in
|
||||
ln -s ${ycmd}/lib/ycmd third_party
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = old.meta // {
|
||||
description = "Code-completion engine for Vim";
|
||||
homepage = "https://github.com/Valloric/YouCompleteMe";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
marcweber
|
||||
jagajaga
|
||||
mel
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
zenbones-nvim = super.zenbones-nvim.overrideAttrs {
|
||||
nvimSkipModules = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "ppsspp";
|
||||
version = "0-unstable-2025-08-19";
|
||||
version = "0-unstable-2025-08-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "e526986da2b491763e2d715741f1babeef68f1a6";
|
||||
hash = "sha256-aPYsgb/nO9RzSGL+evMiCoYz3+08HC83An3rMoCWWMw=";
|
||||
rev = "b9a3e939711e007cce6af5930603122c0df91f20";
|
||||
hash = "sha256-eEJeH7tfuIVrlkqGwsoe6RkY7tOEIyUbHSM8xGyZL4o=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -194,8 +194,8 @@ rec {
|
||||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.13.0";
|
||||
hash = "sha256-ZZFwzGCB6IS/SJQJoApC7blDhTqT9aZkeMmPimdcj7Q=";
|
||||
version = "1.13.1";
|
||||
hash = "sha256-PuC2wOEEMFaiR9eyF3yI6PLSkqnT/MWdy6RZo6B9zWM=";
|
||||
vendorHash = "sha256-UcsB5cTae55meJ945fvgowch4EBdaTET2+t5KWvpPQ8=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
|
||||
+4
-4
@@ -6,13 +6,13 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@anthropic-ai/claude-code": "^1.0.96"
|
||||
"@anthropic-ai/claude-code": "^1.0.98"
|
||||
}
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-code": {
|
||||
"version": "1.0.96",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.96.tgz",
|
||||
"integrity": "sha512-xnxhYzuh6PYlMcw56REMQiGMW20WaLLOvG8L8TObq70zhNKs3dro7nhYwHRe1c2ubTr20oIJK0aSkyD2BpO8nA==",
|
||||
"version": "1.0.98",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.98.tgz",
|
||||
"integrity": "sha512-IV193Eh8STdRcN3VkNcojPIlLnQPch+doBVrDSEV1rPPePISy7pzHFZL0Eg7zIPj9gHkHV1D2s0RMMwzVXJThA==",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "claude-code";
|
||||
version = "1.0.96";
|
||||
version = "1.0.98";
|
||||
|
||||
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
|
||||
hash = "sha256-w3KT+dZbrcrwnOl9ByZ43nuSN9ON078kCqxF7fIZ7AA=";
|
||||
hash = "sha256-Dkaj97FuRp6LmZgsmzKRX9PKp7bzvUj7rUD3b/5CxtU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-qjg3gUmqlPfngnWRfADZlAK89aOoKtCkQkCXKjVPNFk=";
|
||||
npmDepsHash = "sha256-rcULDhcHZm16LKzceIu6gRH/Q1HBCpIJFfZRMVkhiiQ=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dotter";
|
||||
version = "0.13.3";
|
||||
version = "0.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SuperCuber";
|
||||
repo = "dotter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7YExvmuliTL9oagXNUtZ7ZOPyELcS+igK1tXdhG0kQk=";
|
||||
hash = "sha256-cxabaCxbwP2YbnG2XfmVJWFTw9LGO0D1dlLy6fuux+M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UBZZu8D1fbNOn2obviP+/Qw+E/OoNKRA4NXzqCqghGs=";
|
||||
cargoHash = "sha256-KLU+4CYqTKEH8wuvinVS0Zs+nFgOer2ho8LXnLDNVKY=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
which
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fake-gcs-server";
|
||||
version = "1.52.2";
|
||||
version = "1.52.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fsouza";
|
||||
repo = "fake-gcs-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sidMCbJAK3bRGJyyFIUn7e5y0z4O72JWCICHf4JL4yo=";
|
||||
hash = "sha256-XoHG0dm565RRke3me/WDy1TRLrSlecy4b3xuYPvOcoo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oTJ4DCsDazo58ozsAKI0BG7rxfF8oeiIl6vQpRng+LM=";
|
||||
vendorHash = "sha256-FMDpQSwLrLaiy5HzdragOmgvLBDax5VDN0DZLzQyhts=";
|
||||
|
||||
# Unit tests fail to start the emulator server in some environments (e.g. Hydra) for some reason.
|
||||
#
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gefyra";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/gefyrahq/gefyra/releases/download/${finalAttrs.version}/gefyra-${finalAttrs.version}-linux-amd64.zip";
|
||||
hash = "sha256-piF/h2g9NeLbSVC5YjfcN1Hq+LWXe+Ib3LolA/vOZdw=";
|
||||
hash = "sha256-p75lJMg5U/cuoOMK+Vf76XhSu1oCKXTPokPCJphuwUw=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "helmsman";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Praqma";
|
||||
owner = "mkubaczyk";
|
||||
repo = "helmsman";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-As0YjqMdPCgIzYWB1Wf3R11mwj6CglWZdvCRzlHDvkw=";
|
||||
};
|
||||
|
||||
@@ -31,4 +31,4 @@ buildGoModule rec {
|
||||
sarcasticadmin
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -30,6 +30,9 @@ rustPlatform.buildRustPackage {
|
||||
|
||||
cargoHash = "sha256-GZkHPoDKiqTVwRAWXXbELXC1I/KRO+9sshY8/rGbA4A=";
|
||||
|
||||
# Prevent building and installing xtask, as it's a developer utility not intended for the end user
|
||||
cargoBuildFlags = [ "-p humility-cli" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Debugger for Hubris";
|
||||
mainProgram = "humility";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "jjui";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idursun";
|
||||
repo = "jjui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8jLQ9KLMMz4y7pXA9wlHbGN4cxRAYVPy6oRKLHCU4SM=";
|
||||
hash = "sha256-UkgQ3uxWPwLQiNhcZReFifLPD8h+xmH798ckTtia/+4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2rlfR5HLFJyLVSRiUGTCwQDFWRBt4jmL6sdZcq7blaE=";
|
||||
vendorHash = "sha256-VfzvGzh/ZYHI5LDuhwOwb4nEOVesBu0kxRF6Q/ISPww=";
|
||||
|
||||
ldflags = [ "-X main.Version=${finalAttrs.version}" ];
|
||||
|
||||
|
||||
@@ -33,13 +33,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ladybird";
|
||||
version = "0-unstable-2025-08-19";
|
||||
version = "0-unstable-2025-08-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LadybirdWebBrowser";
|
||||
repo = "ladybird";
|
||||
rev = "658477620afe4c14b936227d1c8307b2dea56267";
|
||||
hash = "sha256-WkEgZP5Ci0mlNDGq++93v4coz36dhp+kXtlKQu1xnVM=";
|
||||
rev = "c3aa8f0c8d3ee28b100260b376c45f2583b49c0d";
|
||||
hash = "sha256-pckHeaGhpFemCIhTL8FeNWVea8itvy3SFYT9oWVPmu4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "metacubexd";
|
||||
version = "1.190.1";
|
||||
version = "1.192.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MetaCubeX";
|
||||
repo = "metacubexd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-oXyPT47rq1hadaUmQPqtvOwemMOE0z19zjWQbfxIyLw=";
|
||||
hash = "sha256-OZLwKckwiw0FPJYOLgj9bXEm6xq9SmDrDZNQhM0r7dc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-Ufm0I5ZjSHzmMRGpX7Y8VYspSszCR7AjdWc1c9fjdPQ=";
|
||||
hash = "sha256-v+wuYGK0WEgrPNBLuLnoO/uDEk6AqJTlNJZHTpEb4mc=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "postfix-tlspol";
|
||||
version = "1.8.14";
|
||||
version = "1.8.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zuplu";
|
||||
repo = "postfix-tlspol";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lfezkGMmdYlstchUWGoofCfJLIHOStaDwR/A5j1EOGc=";
|
||||
hash = "sha256-DqFBXU9b6TOujG464Ww4iAA04NA5j0z9N00F7mbV92Q=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
pandoc,
|
||||
@@ -21,6 +22,9 @@ python3Packages.buildPythonApplication rec {
|
||||
poetry-core
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"lxml"
|
||||
];
|
||||
dependencies = with python3Packages; [
|
||||
lxml
|
||||
pygls
|
||||
@@ -33,6 +37,11 @@ python3Packages.buildPythonApplication rec {
|
||||
python3Packages.pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# TimeoutError
|
||||
"test_hover"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -56,7 +56,12 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^v(\\d+\\.\\d+\\.\\d+)$"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal";
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
bzip2,
|
||||
cmake,
|
||||
expat,
|
||||
freetype,
|
||||
irrlicht,
|
||||
libICE,
|
||||
libGL,
|
||||
libGLU,
|
||||
libSM,
|
||||
libX11,
|
||||
libXext,
|
||||
libXxf86vm,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libvorbis,
|
||||
openal,
|
||||
pkg-config,
|
||||
sqlite,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "voxelands";
|
||||
version = "1704.00";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "voxelands";
|
||||
repo = "voxelands";
|
||||
rev = version;
|
||||
sha256 = "0yj9z9nygpn0z63y739v72l3kg81wd71xgix5k045vfzhqsam5m0";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
|
||||
"-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG"
|
||||
"-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
# has to go before others to override transitive libpng-1.6
|
||||
libpng
|
||||
|
||||
bzip2
|
||||
expat
|
||||
freetype
|
||||
irrlicht
|
||||
libICE
|
||||
libGL
|
||||
libGLU
|
||||
libSM
|
||||
libX11
|
||||
libXext
|
||||
libXxf86vm
|
||||
libjpeg
|
||||
libvorbis
|
||||
openal
|
||||
sqlite
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://voxelands.net/";
|
||||
description = "Infinite-world block sandbox game based on Minetest";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
broken = stdenv.hostPlatform.isAarch64; # build fails with "libIrrlicht.so: undefined reference to `png_init_filter_functions_neon'"
|
||||
};
|
||||
}
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncinotify";
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "absperf";
|
||||
repo = "asyncinotify";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RHzjUoVhDxI7kYD5HWkb0f8X6BjjTTCAvSvASPy6FGk=";
|
||||
hash = "sha256-X7R35LyrJaGJ70Houenpag0IMbqdsh+Sg9wMdzZmGfk=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -75,10 +75,12 @@ buildPythonPackage rec {
|
||||
"test_nuts__without_device"
|
||||
"test_nuts__without_jit"
|
||||
"test_smc_waste_free__with_jit"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
|
||||
# Numerical test (AssertionError)
|
||||
# First report, when the failure was only happening on aarch64-linux:
|
||||
# https://github.com/blackjax-devs/blackjax/issues/668
|
||||
# Second report, when the test started happening on x86_64-linux too after Jax was updated to 0.7.0
|
||||
# https://github.com/blackjax-devs/blackjax/issues/795
|
||||
"test_chees_adaptation"
|
||||
];
|
||||
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
cloudpickle,
|
||||
dm-tree,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "disposable-email-domains";
|
||||
version = "0.0.131";
|
||||
version = "0.0.132";
|
||||
pyproject = true;
|
||||
|
||||
# No tags on GitHub
|
||||
src = fetchPypi {
|
||||
pname = "disposable_email_domains";
|
||||
inherit version;
|
||||
hash = "sha256-9TlGamU5x3MhZhm4xdCO5a342duXodIu0J2LDH5uOrY=";
|
||||
hash = "sha256-otXbxrFu4Xf0O8OFif/JKsx5wPPtQ6PfwJ/AxtR2SJA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fetchpatch2,
|
||||
chex,
|
||||
jaxlib,
|
||||
numpy,
|
||||
@@ -26,13 +26,28 @@ buildPythonPackage rec {
|
||||
|
||||
patches = [
|
||||
# TODO: remove at the next release (already on master)
|
||||
(fetchpatch {
|
||||
(fetchpatch2 {
|
||||
name = "fix-jax-0.6.0-compat";
|
||||
url = "https://github.com/google-deepmind/distrax/commit/c02708ac46518fac00ab2945311e0f2ee32c672c.patch";
|
||||
hash = "sha256-hFNXKoA1b5I6dzhwTRXp/SnkHv89GI6tYwlnBBHwG78=";
|
||||
})
|
||||
# https://github.com/google-deepmind/distrax/pull/289
|
||||
(fetchpatch2 {
|
||||
name = "fix-jax-0.7.0-compat";
|
||||
url = "https://github.com/google-deepmind/distrax/commit/7fc5bd7efff4a7144d175199159f115c3e68a3cf.patch";
|
||||
hash = "sha256-TiD72YIb6ajpaCO1yOGl/+JCuaikQ879Zcpaf2wzMq4=";
|
||||
})
|
||||
];
|
||||
|
||||
# TODO: remove at the next release (already on master)
|
||||
# https://github.com/google-deepmind/distrax/pull/293
|
||||
postPatch = ''
|
||||
substituteInPlace distrax/_src/utils/transformations.py \
|
||||
--replace-fail \
|
||||
"jax.experimental.pjit.pjit_p" \
|
||||
"jex.core.primitives.jit_p"
|
||||
'';
|
||||
|
||||
dependencies = [
|
||||
chex
|
||||
jaxlib
|
||||
|
||||
@@ -5,18 +5,21 @@
|
||||
hatchling,
|
||||
django,
|
||||
django-js-asset,
|
||||
model-bakery,
|
||||
pytestCheckHook,
|
||||
pytest-django,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-mptt";
|
||||
version = "0.17";
|
||||
version = "0.18";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django-mptt";
|
||||
repo = "django-mptt";
|
||||
rev = version;
|
||||
hash = "sha256-fsVGwqlSZcBGXisbxTNGSwiuDOJ3DFV6MnB4h6OxkMA=";
|
||||
hash = "sha256-UJQwjOde0DkG/Pa/pd2htnp4KEn5KwYAo8GP5A7/h+I=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -28,8 +31,16 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "mptt" ];
|
||||
|
||||
# No pytest checks, since they depend on model_mommy, which is deprecated
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [
|
||||
model-bakery
|
||||
pytestCheckHook
|
||||
pytest-django
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export DJANGO_SETTINGS_MODULE=tests.settings
|
||||
export PYTHONPATH=$(pwd)/tests:$PYTHONPATH
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utilities for implementing a modified pre-order traversal tree in Django";
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
@@ -32,12 +33,31 @@ buildPythonPackage rec {
|
||||
hash = "sha256-zXgAuFGWKHShKodi9swnWIry4VU9s4pBhBRoK5KzaL0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# The following two patches have been merged upstream and should be removed when updating to the next release
|
||||
# They fix the incompatibilities with jax>=0.7.0
|
||||
|
||||
# https://github.com/patrick-kidger/equinox/pull/1086
|
||||
(fetchpatch2 {
|
||||
name = "remove-deprecated-batching-NotMapped";
|
||||
url = "https://github.com/patrick-kidger/equinox/commit/6a6a441ced2fe64191a087752f1c2e71a6ce39f1.patch";
|
||||
hash = "sha256-tzHFjMI3gAIh5MPkdbmzsky/oFjDEbOIkPGQMQ+gcQQ=";
|
||||
})
|
||||
|
||||
# https://github.com/patrick-kidger/equinox/pull/1082
|
||||
(fetchpatch2 {
|
||||
name = "allow-creating-weak-references-to-flatten";
|
||||
url = "https://github.com/patrick-kidger/equinox/commit/62b3c94ad56bdb63524702b320e977d2d93dbe72.patch";
|
||||
hash = "sha256-c1FKCnC3/okuP2VJV4h7sPRYQeYJZSdzEG5ETL2M35k=";
|
||||
})
|
||||
];
|
||||
|
||||
# Relax speed constraints on tests that can fail on busy builders
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_while_loop.py \
|
||||
--replace-fail "speed < 0.1" "speed < 0.5" \
|
||||
--replace-fail "speed < 0.5" "speed < 1" \
|
||||
--replace-fail "speed < 1" "speed < 4" \
|
||||
--replace-fail "speed < 1" "speed < 20"
|
||||
'';
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "feedgenerator";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-KXb2zMWYmpZyAto0PqFFwhrtq74ANccIjWS6CqlyWmA=";
|
||||
hash = "sha256-DqqVXx8Ly1uHrBla90Dwb/n/9KQO0wuKfGu+uyZNTdE=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-genai";
|
||||
version = "1.31.0";
|
||||
version = "1.32.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "python-genai";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-pzW0SYLlj7XjJSEqCY3uSYZI8asn451LANpcpr/lxI4=";
|
||||
hash = "sha256-vUYv5nsiG6/bNUQvzPfn+dWaeyelQvgd12d/DdkdqKs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -44,14 +44,14 @@ buildPythonPackage rec {
|
||||
dist = "py3";
|
||||
platform =
|
||||
{
|
||||
x86_64-linux = "manylinux2014_x86_64";
|
||||
x86_64-linux = "manylinux_2_27_x86_64";
|
||||
aarch64-linux = "manylinux2014_aarch64";
|
||||
}
|
||||
.${stdenv.hostPlatform.system};
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-jNnq15SOosd4pQj+9dEVnot6v0/MxwN8P+Hb/NlQEtw=";
|
||||
aarch64-linux = "sha256-IvrwINLo98oeKRVjMkH333Z4tzxwePXwsvETJIM3994=";
|
||||
x86_64-linux = "sha256-quPn80WASloSKaxxSMvRNEUMgWGYu7/4WnYiGC7H9ko=";
|
||||
aarch64-linux = "sha256-f8QFBJYN5W4jL5MmMKJ1fs8/hzZlsTmDF9Jfa3RF1WA=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
@@ -36,45 +36,35 @@ let
|
||||
|
||||
# upstream does not distribute jax-cuda12-plugin 0.4.38 binaries for aarch64-linux
|
||||
srcs = {
|
||||
"3.10-x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_x86_64";
|
||||
dist = "cp310";
|
||||
hash = "sha256-F1H4iYkmmzzbDf5PewcqZEIUmBjJvJjDo5XIrK+RCnk=";
|
||||
};
|
||||
"3.10-aarch64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_aarch64";
|
||||
dist = "cp310";
|
||||
hash = "sha256-vFw6ddBVGbTTJuRmnQ960P4PCs+HX5MT2RN0jMylqeo=";
|
||||
};
|
||||
"3.11-x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_x86_64";
|
||||
platform = "manylinux_2_27_x86_64";
|
||||
dist = "cp311";
|
||||
hash = "sha256-CJbLswjZUpHiBc2J0lQCne46HfQ9ZumDEzGpr9LSeHA=";
|
||||
hash = "sha256-Yw9aGxuorpSsC0K8N1IeGXBcmlRURWV5+NKY5FC2/tw=";
|
||||
};
|
||||
"3.11-aarch64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_aarch64";
|
||||
dist = "cp311";
|
||||
hash = "sha256-LNjieaWaOLoMl4qDHhOt627p5Fcvujh8eXW6OtU13Tg=";
|
||||
hash = "sha256-iAQd0J4Bm4JnTZ9xZ7eWtIy1so3pVHLBosA2OxZtS/Y=";
|
||||
};
|
||||
"3.12-x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_x86_64";
|
||||
platform = "manylinux_2_27_x86_64";
|
||||
dist = "cp312";
|
||||
hash = "sha256-/r0Jn5cNNQ64+losmi+0sOp7PWqJ3xSWZj7fp6/lkOU=";
|
||||
hash = "sha256-LPPm/mNDtbV2TTWJPON16z5qhZBIty3I9wCv7CFai6Y=";
|
||||
};
|
||||
"3.12-aarch64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_aarch64";
|
||||
dist = "cp312";
|
||||
hash = "sha256-bJsALROx/LlANxPu3Th2oietH/vfs4EbH5+Jr0wlpfc=";
|
||||
hash = "sha256-M9ZGYPYVg1pg4M+Z656KMuz/1dIGYTV/RZEqHYFkMPE=";
|
||||
};
|
||||
"3.13-x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_x86_64";
|
||||
platform = "manylinux_2_27_x86_64";
|
||||
dist = "cp313";
|
||||
hash = "sha256-20xhA8kS2M0a35TDTTE7tHYMp/AciXynzWLmXyeZQZk=";
|
||||
hash = "sha256-dDC8RnptxbvBhvgcq5L0GhJy9aodFkbBu/rqkleD2oU=";
|
||||
};
|
||||
"3.13-aarch64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_aarch64";
|
||||
dist = "cp313";
|
||||
hash = "sha256-dz76i1WoN0BsVh8O8CFE3akBkYEZN2DsVBnuyd0rmqw=";
|
||||
hash = "sha256-w8IAegYZmwlYMZdsamZcEvylWs1+yEq0SI4a5Y7stJQ=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -40,7 +40,7 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "jax";
|
||||
version = "0.6.2";
|
||||
version = "0.7.1";
|
||||
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-MTgpwpJWxULCiZhDG+MFpOp8ZHoj1ZDmOD05OaGfXhM=";
|
||||
hash = "sha256-k3yuWs+SOxrDXysVWCFR3wliATtro+aDdDXfFVtOTBo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -103,6 +103,14 @@ buildPythonPackage rec {
|
||||
"tests/pjit_test.py::PJitErrorTest::testAxisResourcesMismatch"
|
||||
"tests/shape_poly_test.py::ShapePolyTest"
|
||||
"tests/tree_util_test.py::TreeTest"
|
||||
|
||||
# Mostly AssertionError on numerical tests failing since 0.7.0
|
||||
# https://github.com/jax-ml/jax/issues/31428
|
||||
"tests/export_back_compat_test.py"
|
||||
"tests/lax_numpy_test.py"
|
||||
"tests/lax_scipy_test.py"
|
||||
"tests/lax_test.py"
|
||||
"tests/linalg_test.py"
|
||||
];
|
||||
|
||||
# Prevents `tests/export_back_compat_test.py::CompatTest::test_*` tests from failing on darwin with
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.6.2";
|
||||
version = "0.7.1";
|
||||
inherit (python) pythonVersion;
|
||||
|
||||
# As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the
|
||||
@@ -46,68 +46,52 @@ let
|
||||
};
|
||||
in
|
||||
{
|
||||
"3.10-x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_x86_64";
|
||||
dist = "cp310";
|
||||
hash = "sha256-wIeg62+39vj1TVb0cwMo395QQN07Xd+oEOfCjqcQK0I=";
|
||||
};
|
||||
"3.10-aarch64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_aarch64";
|
||||
dist = "cp310";
|
||||
hash = "sha256-QgXQmM6O+19/4v5QmLrmA2CU3I2IKfXg4NepsVUyYzY=";
|
||||
};
|
||||
"3.10-aarch64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_11_0_arm64";
|
||||
dist = "cp310";
|
||||
hash = "sha256-2kYBsrXcjCPWr7KT6s+5rsTh0YccsvKcWhUdED5zsPg=";
|
||||
};
|
||||
|
||||
"3.11-x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_x86_64";
|
||||
platform = "manylinux_2_27_x86_64";
|
||||
dist = "cp311";
|
||||
hash = "sha256-M11+NRXOeLUqQQE29Gqkp+oU0OfWQPNOHhN0CVVK0Kw=";
|
||||
hash = "sha256-6vX2j1O/TcuTtlElOFR2Z2JViOTzzK7vBIeI/RjYwNU=";
|
||||
};
|
||||
"3.11-aarch64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_aarch64";
|
||||
dist = "cp311";
|
||||
hash = "sha256-Eern4FvFp5h12jYySvue3dS66u8qA4bK9tTzcgua7yg=";
|
||||
hash = "sha256-n7GJw7OUcMQ5T/yxi3HkfP/Fv4Xo/LHjNpJoaww+BN0=";
|
||||
};
|
||||
"3.11-aarch64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_11_0_arm64";
|
||||
dist = "cp311";
|
||||
hash = "sha256-ogj/YcWBKNMGu05a0IWL0rCWDywcEK1CxUj3SmDAAg4=";
|
||||
hash = "sha256-PzLD5MFntzJ8NC6C09+EB5cU6gtDcYvocdA5mZZws8k=";
|
||||
};
|
||||
|
||||
"3.12-x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_x86_64";
|
||||
platform = "manylinux_2_27_x86_64";
|
||||
dist = "cp312";
|
||||
hash = "sha256-8d0JtIGpPB1MdQAT9Gf3QZRJO6e9KfzU0c7BbjohT2U=";
|
||||
hash = "sha256-dKvTE1eX+CRA3TcRo1y6FsQw0bumVHS4W7cOQXM6Uuk=";
|
||||
};
|
||||
"3.12-aarch64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_aarch64";
|
||||
dist = "cp312";
|
||||
hash = "sha256-h+wtycPtmrk27shTUWDF+9LISZSFWfHF2qdfY/q+WUI=";
|
||||
hash = "sha256-8PH1KVa4wlGKsACk09jCG+d34dR/kmugNkDjkQYaQe4=";
|
||||
};
|
||||
"3.12-aarch64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_11_0_arm64";
|
||||
dist = "cp312";
|
||||
hash = "sha256-NNimhKi+lJ3YfdSsyXEBtBBqDcmtFR7IkdoHIxmle5k=";
|
||||
hash = "sha256-EnwHxydwPl1Z+E9lUWm+yEn0Qi5S+FRjSc7MMKihPh0=";
|
||||
};
|
||||
|
||||
"3.13-x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_x86_64";
|
||||
platform = "manylinux_2_27_x86_64";
|
||||
dist = "cp313";
|
||||
hash = "sha256-+UFj8UyP07qTrhS2Maus8UywMbugtZE4hpmEtNEDdfg=";
|
||||
hash = "sha256-s1D1Gahu/1pLHuAUx/qjZYX0fz1jeH0fPpvf/pzEGmY=";
|
||||
};
|
||||
"3.13-aarch64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_aarch64";
|
||||
dist = "cp313";
|
||||
hash = "sha256-cEmIN8r1OL1Fj/aFjIv9QE24IBWrqPZjZwGX+pkA/wI=";
|
||||
hash = "sha256-zmobpgGXZIcMJ1B6yhjlJpmK061L6i3WHhnQSZw7iwQ=";
|
||||
};
|
||||
"3.13-aarch64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_11_0_arm64";
|
||||
dist = "cp313";
|
||||
hash = "sha256-v/Z7GIEzzh8BEcexY6wyH9ZGtZ7SIepIkGPi4PhcuWc=";
|
||||
hash = "sha256-Kic3nl7Sl2WYDvMtTXf1fdDh3ZZYA6xnRVQESsI80+w=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -10,7 +10,7 @@ prefetch() {
|
||||
echo
|
||||
}
|
||||
|
||||
for py in "310" "311" "312" "313"; do
|
||||
for py in "311" "312" "313"; do
|
||||
prefetch "$py" "x86_64-linux" "jaxlib-bin"
|
||||
prefetch "$py" "aarch64-linux" "jaxlib-bin"
|
||||
prefetch "$py" "aarch64-darwin" "jaxlib-bin"
|
||||
|
||||
@@ -93,6 +93,84 @@ buildPythonPackage rec {
|
||||
|
||||
# TypeError: this __dict__ descriptor does not support '_DictWrapper' objects
|
||||
"test_reloading_default_saved_model"
|
||||
|
||||
# E AssertionError:
|
||||
# E - float32
|
||||
# E + float64
|
||||
"test_angle_bool"
|
||||
"test_angle_int16"
|
||||
"test_angle_int32"
|
||||
"test_angle_int8"
|
||||
"test_angle_uint16"
|
||||
"test_angle_uint32"
|
||||
"test_angle_uint8"
|
||||
"test_bartlett_bfloat16"
|
||||
"test_bartlett_bool"
|
||||
"test_bartlett_float16"
|
||||
"test_bartlett_float32"
|
||||
"test_bartlett_float64"
|
||||
"test_bartlett_int16"
|
||||
"test_bartlett_int32"
|
||||
"test_bartlett_int64"
|
||||
"test_bartlett_int8"
|
||||
"test_bartlett_none"
|
||||
"test_bartlett_uint16"
|
||||
"test_bartlett_uint32"
|
||||
"test_bartlett_uint8"
|
||||
"test_blackman_bfloat16"
|
||||
"test_blackman_bool"
|
||||
"test_blackman_float16"
|
||||
"test_blackman_float32"
|
||||
"test_blackman_float64"
|
||||
"test_blackman_int16"
|
||||
"test_blackman_int32"
|
||||
"test_blackman_int64"
|
||||
"test_blackman_int8"
|
||||
"test_blackman_none"
|
||||
"test_blackman_uint16"
|
||||
"test_blackman_uint32"
|
||||
"test_blackman_uint8"
|
||||
"test_eye_none"
|
||||
"test_hamming_bfloat16"
|
||||
"test_hamming_bool"
|
||||
"test_hamming_float16"
|
||||
"test_hamming_float32"
|
||||
"test_hamming_float64"
|
||||
"test_hamming_int16"
|
||||
"test_hamming_int32"
|
||||
"test_hamming_int64"
|
||||
"test_hamming_int8"
|
||||
"test_hamming_none"
|
||||
"test_hamming_uint16"
|
||||
"test_hamming_uint32"
|
||||
"test_hamming_uint8"
|
||||
"test_hanning_bfloat16"
|
||||
"test_hanning_bool"
|
||||
"test_hanning_float16"
|
||||
"test_hanning_float32"
|
||||
"test_hanning_float64"
|
||||
"test_hanning_int16"
|
||||
"test_hanning_int32"
|
||||
"test_hanning_int64"
|
||||
"test_hanning_int8"
|
||||
"test_hanning_none"
|
||||
"test_hanning_uint16"
|
||||
"test_hanning_uint32"
|
||||
"test_hanning_uint8"
|
||||
"test_identity_none"
|
||||
"test_kaiser_bfloat16"
|
||||
"test_kaiser_bool"
|
||||
"test_kaiser_float16"
|
||||
"test_kaiser_float32"
|
||||
"test_kaiser_float64"
|
||||
"test_kaiser_int16"
|
||||
"test_kaiser_int32"
|
||||
"test_kaiser_int64"
|
||||
"test_kaiser_int8"
|
||||
"test_kaiser_none"
|
||||
"test_kaiser_uint16"
|
||||
"test_kaiser_uint32"
|
||||
"test_kaiser_uint8"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# Hangs forever
|
||||
|
||||
@@ -29,14 +29,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-google-genai";
|
||||
version = "2.1.9";
|
||||
version = "2.1.10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain-google";
|
||||
tag = "libs/genai/v${version}";
|
||||
hash = "sha256-9jXiX4WDx5YY39MytuzAWGuDzLkGmtq95ShAIW3zH0U=";
|
||||
hash = "sha256-kqII8RG1ep+n5CqKLY1v7Mc+zJh6kl1rAjMmkomfeqM=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/genai";
|
||||
|
||||
@@ -59,6 +59,12 @@ buildPythonPackage rec {
|
||||
"-Wignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# assert Array(False, dtype=bool)
|
||||
# + where Array(False, dtype=bool) = tree_allclose(Array(0.12993518, dtype=float64), Array(0., dtype=float64, weak_type=True), atol=0.0001, rtol=0.0001)
|
||||
"test_least_squares"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox";
|
||||
homepage = "https://github.com/patrick-kidger/optimistix";
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchpatch2,
|
||||
|
||||
# bazel wheel
|
||||
buildBazelPackage,
|
||||
@@ -52,6 +53,18 @@ let
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LXQfGFgnM7WYUQjJ2Y3jskdeJ/dEKz+Afg+UOQjv5kc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# AttributeError: jax.interpreters.xla.pytype_aval_mappings was deprecated in JAX v0.5.0 and
|
||||
# removed in JAX v0.7.0. jax.core.pytype_aval_mappings can be used as a replacement in most cases.
|
||||
# TODO: remove when updating to the next release
|
||||
(fetchpatch2 {
|
||||
name = "future-proof-reference-to-deprecated-pytype_aval_mappings";
|
||||
url = "https://github.com/tensorflow/probability/commit/135080b6b1ac5724fc1731b0a9ca6f2010b1aea5.patch";
|
||||
hash = "sha256-27yWIw5pI86KcUz0TsYwRFyLDoeiqmxgsRMBXaauzVw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
absl-py
|
||||
# needed to create the output wheel in installPhase
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
postgresqlBuildExtension (finalAttrs: {
|
||||
pname = "pg_net";
|
||||
version = "0.19.5";
|
||||
version = "0.19.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "pg_net";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Cpi2iASi1QJoED0Qs1dANqg/BNZTsz5S+pw8iYyW03Y=";
|
||||
hash = "sha256-HQiFD8vhox7SmjJIDyVnnwt8DCENKABIZTMfTjGElwU=";
|
||||
};
|
||||
|
||||
buildInputs = [ curl ];
|
||||
|
||||
@@ -2426,6 +2426,7 @@ mapAliases {
|
||||
vocal = throw "'vocal' has been archived upstream. Consider using 'gnome-podcasts' or 'kasts' instead."; # Added 2025-04-12
|
||||
void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
|
||||
volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
|
||||
voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30
|
||||
vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18
|
||||
vtk_9_egl = lib.warnOnInstantiate "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18
|
||||
vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt5' instead." vtkWithQt5; # Added 2025-07-18
|
||||
|
||||
@@ -8520,6 +8520,7 @@ with pkgs;
|
||||
msoffcrypto-tool = with python3.pkgs; toPythonApplication msoffcrypto-tool;
|
||||
|
||||
mpich = callPackage ../development/libraries/mpich {
|
||||
automake = automake116x;
|
||||
ch4backend = libfabric;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user