Merge b536f7a97c into haskell-updates

This commit is contained in:
nixpkgs-ci[bot]
2025-08-31 00:23:03 +00:00
committed by GitHub
291 changed files with 4174 additions and 3618 deletions
@@ -0,0 +1,36 @@
name: "Request: Nix Package"
description: "Package requests are no longer accepted. Please open a Pull Request with your desired package instead."
title: "Package Request"
labels: ["0.kind: packaging request", "4.workflow: auto-close"]
body:
- type: "markdown"
attributes:
value: |
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
</picture>
</a>
</p>
Thank you for your interest in packaging new software in Nixpkgs. Unfortunately, to mitigate the unsustainable growth of unmaintained packages, **Nixpkgs is no longer accepting package requests** via Issues.
As a [volunteer community][community], we are always open to new contributors. If you wish to see this package in Nixpkgs, **we encourage you to [contribute] it yourself**, via a Pull Request. Anyone can [become a package maintainer][maintainers]! You can find language-specific packaging information in the [Nixpkgs Manual][nixpkgs]. Should you need any help, please reach out to the community on [Matrix] or [Discourse].
[community]: https://nixos.org/community
[contribute]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#quick-start-to-adding-a-package
[maintainers]: https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md
[nixpkgs]: https://nixos.org/manual/nixpkgs/unstable/
[Matrix]: https://matrix.to/#/#dev:nixos.org
[Discourse]: https://discourse.nixos.org/c/dev/14
---
- type: "checkboxes"
id: "ignored"
attributes:
label: "Issues for new package requests are not accepted. Please open a Pull Request instead."
options:
- label: "I didn't read any of that."
+47
View File
@@ -171,6 +171,47 @@ module.exports = async ({ github, context, core, dry }) => {
return prLabels
}
// Returns true if the issue was closed. In this case, the labeling does not need to
// continue for this issue. Returns false if no action was taken.
async function handleAutoClose(item) {
const issue_number = item.number
if (item.labels.some(({ name }) => name === '0.kind: packaging request')) {
const body = [
'Thank you for your interest in packaging new software in Nixpkgs. Unfortunately, to mitigate the unsustainable growth of unmaintained packages, **Nixpkgs is no longer accepting package requests** via Issues.',
'',
'As a [volunteer community][community], we are always open to new contributors. If you wish to see this package in Nixpkgs, **we encourage you to [contribute] it yourself**, via a Pull Request. Anyone can [become a package maintainer][maintainers]! You can find language-specific packaging information in the [Nixpkgs Manual][nixpkgs]. Should you need any help, please reach out to the community on [Matrix] or [Discourse].',
'',
'[community]: https://nixos.org/community',
'[contribute]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#quick-start-to-adding-a-package',
'[maintainers]: https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md',
'[nixpkgs]: https://nixos.org/manual/nixpkgs/unstable/',
'[Matrix]: https://matrix.to/#/#dev:nixos.org',
'[Discourse]: https://discourse.nixos.org/c/dev/14',
].join('\n')
core.info(`Issue #${item.number}: auto-closed`)
if (!dry) {
await github.rest.issues.createComment({
...context.repo,
issue_number,
body,
})
await github.rest.issues.update({
...context.repo,
issue_number,
state: 'closed',
state_reason: 'not_planned',
})
}
return true
}
return false
}
async function handle({ item, stats }) {
try {
const log = (k, v, skip) => {
@@ -190,6 +231,12 @@ module.exports = async ({ github, context, core, dry }) => {
Object.assign(itemLabels, await handlePullRequest({ item, stats }))
} else {
stats.issues++
if (item.labels.some(({ name }) => name === '4.workflow: auto-close')) {
// If this returns true, the issue was closed. In this case we return, to not
// label the issue anymore. Most importantly this avoids unlabeling stale issues
// which are closed via auto-close.
if (await handleAutoClose(item)) return
}
}
const latest_event_at = new Date(
+17
View File
@@ -18588,6 +18588,14 @@
githubId = 30374463;
name = "Michal S.";
};
Notarin = {
name = "Notarin Steele";
email = "424c414e4b@gmail.com";
github = "Notarin";
githubId = 25104390;
keys = [ { fingerprint = "4E15 9433 48D9 7BA7 E8B8 B0FF C38F D346 AE36 36FB"; } ];
matrix = "@notarin:matrix.org";
};
NotAShelf = {
name = "NotAShelf";
email = "raf@notashelf.dev";
@@ -21517,6 +21525,15 @@
githubId = 337811;
name = "Rehno Lindeque";
};
rein = {
email = "rein@rein.icu";
github = "re1n0";
githubId = 227051429;
name = "rein";
keys = [
{ fingerprint = "66A8 1706 2227 9BD9 586A CEDD 5B29 A881 3F47 65C4"; }
];
};
relrod = {
email = "ricky@elrod.me";
github = "relrod";
@@ -504,13 +504,14 @@ class Editor:
)
_prefetch = functools.partial(prefetch, cache=cache)
to_update_for_filter = [x.replace(".", "-") for x in to_update]
plugins_to_update = (
current_plugin_specs
if len(to_update) == 0
else [
description
for description in current_plugin_specs
if self.filter_plugins_to_update(description, to_update)
if self.filter_plugins_to_update(description, to_update_for_filter)
]
)
@@ -124,7 +124,19 @@ in
type = lib.types.separatedString " ";
default = "-C";
description = ''
Command line options for pg_dump or pg_dumpall.
Command line options for pg_dump. This options is not used if
`config.services.postgresqlBackup.backupAll` is enabled. Note that
config.services.postgresqlBackup.backupAll is also active, when no
databases where specified.
'';
};
pgdumpAllOptions = lib.mkOption {
type = lib.types.separatedString " ";
default = "";
description = ''
Command line options for pg_dumpall. This options is not used if
`config.services.postgresqlBackup.backupAll` is disabled.
'';
};
@@ -175,7 +187,7 @@ in
}
(lib.mkIf cfg.backupAll {
systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpOptions}";
systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpAllOptions}";
})
(lib.mkIf (!cfg.backupAll) {
+3 -3
View File
@@ -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}";
+2 -1
View File
@@ -105,7 +105,8 @@ in
config = mkIf cfg.enable {
systemd.services.gatus = {
description = "Automated developer-oriented status page";
after = [ "network.target" ];
after = [ "network-online.target" ];
requires = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
+8 -6
View File
@@ -42,12 +42,14 @@ let
instanceSettings = name: {
freeformType =
with lib.types;
nullOr (oneOf [
int
str
path
package
]);
attrsOf (
nullOr (oneOf [
int
str
path
package
])
);
# override defaults:
# inject instance name into paths,
# also avoid conflicts between user names and special dirs
+11
View File
@@ -231,6 +231,17 @@ in
};
};
ffmpeg = {
path = mkOption {
type = coercedTo package toString str;
default = pkgs.ffmpeg-headless;
example = literalExpression "pkgs.ffmpeg-full";
description = ''
Package providing the ffmpeg and ffprobe executables below the bin/ directory.
'';
};
};
mqtt = {
enabled = mkEnableOption "MQTT support";
+102 -88
View File
@@ -17,6 +17,13 @@ let
cfg = config.boot.plymouth;
opt = options.boot.plymouth;
nixosBreezePlymouth = pkgs.kdePackages.breeze-plymouth.override {
logoFile = cfg.logo;
logoName = "nixos";
osName = config.system.nixos.distroName;
osVersion = config.system.nixos.release;
};
plymouthLogos = pkgs.runCommand "plymouth-logos" { inherit (cfg) logo; } ''
mkdir -p $out
@@ -60,6 +67,14 @@ let
${cfg.extraConfig}
'';
checkIfThemeExists = ''
# Check if the actual requested theme is here
if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then
echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages"
echo "The following themes exist: $(ls ${themesEnv}/share/plymouth/themes/)"
exit 1
fi
'';
in
{
@@ -80,7 +95,12 @@ in
};
themePackages = mkOption {
default = [ ];
default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth;
defaultText = literalMD ''
A NixOS branded variant of the breeze theme when
`config.${opt.theme} == "breeze"`, otherwise
`[ ]`.
'';
type = types.listOf types.package;
description = ''
Extra theme packages for plymouth.
@@ -176,48 +196,42 @@ in
"/etc/plymouth/logo.png".source = cfg.logo;
"/etc/plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults";
# Directories
"/etc/plymouth/plugins".source = pkgs.runCommand "plymouth-initrd-plugins" { } ''
# Check if the actual requested theme is here
if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then
echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages"
exit 1
fi
"/etc/plymouth/plugins".source = pkgs.runCommand "plymouth-initrd-plugins" { } (
checkIfThemeExists
+ ''
moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)"
moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)"
mkdir -p $out/renderers
# module might come from a theme
cp ${themesEnv}/lib/plymouth/*.so $out
cp ${plymouth}/lib/plymouth/renderers/*.so $out/renderers
# useless in the initrd, and adds several megabytes to the closure
rm $out/renderers/x11.so
'';
"/etc/plymouth/themes".source = pkgs.runCommand "plymouth-initrd-themes" { } ''
# Check if the actual requested theme is here
if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then
echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages"
exit 1
fi
mkdir -p $out/${cfg.theme}
cp -r ${themesEnv}/share/plymouth/themes/${cfg.theme}/* $out/${cfg.theme}
# Copy more themes if the theme depends on others
for theme in $(grep -hRo '/share/plymouth/themes/.*$' $out | xargs -n1 basename); do
if [[ -d "${themesEnv}/share/plymouth/themes/$theme" ]]; then
if [[ ! -d "$out/$theme" ]]; then
echo "Adding dependent theme: $theme"
mkdir -p "$out/$theme"
cp -r "${themesEnv}/share/plymouth/themes/$theme"/* "$out/$theme"
fi
else
echo "Missing theme dependency: $theme"
fi
done
# Fixup references
for theme in $out/*/*.plymouth; do
sed -i "s,${builtins.storeDir}/.*/share/plymouth/themes,$out," "$theme"
done
'';
mkdir -p $out/renderers
# module might come from a theme
cp ${themesEnv}/lib/plymouth/*.so $out
cp ${plymouth}/lib/plymouth/renderers/*.so $out/renderers
# useless in the initrd, and adds several megabytes to the closure
rm $out/renderers/x11.so
''
);
"/etc/plymouth/themes".source = pkgs.runCommand "plymouth-initrd-themes" { } (
checkIfThemeExists
+ ''
mkdir -p $out/${cfg.theme}
cp -r ${themesEnv}/share/plymouth/themes/${cfg.theme}/* $out/${cfg.theme}
# Copy more themes if the theme depends on others
for theme in $(grep -hRo '/share/plymouth/themes/.*$' $out | xargs -n1 basename); do
if [[ -d "${themesEnv}/share/plymouth/themes/$theme" ]]; then
if [[ ! -d "$out/$theme" ]]; then
echo "Adding dependent theme: $theme"
mkdir -p "$out/$theme"
cp -r "${themesEnv}/share/plymouth/themes/$theme"/* "$out/$theme"
fi
else
echo "Missing theme dependency: $theme"
fi
done
# Fixup references
for theme in $out/*/*.plymouth; do
sed -i "s,${builtins.storeDir}/.*/share/plymouth/themes,$out," "$theme"
done
''
);
# Fonts
"/etc/plymouth/fonts".source = pkgs.runCommand "plymouth-initrd-fonts" { } ''
@@ -271,62 +285,62 @@ in
'')
];
boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
copy_bin_and_libs ${plymouth}/bin/plymouth
copy_bin_and_libs ${plymouth}/bin/plymouthd
boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (
''
copy_bin_and_libs ${plymouth}/bin/plymouth
copy_bin_and_libs ${plymouth}/bin/plymouthd
# Check if the actual requested theme is here
if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then
echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages"
exit 1
fi
''
+ checkIfThemeExists
+ ''
moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)"
moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)"
mkdir -p $out/lib/plymouth/renderers
# module might come from a theme
cp ${themesEnv}/lib/plymouth/*.so $out/lib/plymouth
cp ${plymouth}/lib/plymouth/renderers/*.so $out/lib/plymouth/renderers
# useless in the initrd, and adds several megabytes to the closure
rm $out/lib/plymouth/renderers/x11.so
mkdir -p $out/lib/plymouth/renderers
# module might come from a theme
cp ${themesEnv}/lib/plymouth/*.so $out/lib/plymouth
cp ${plymouth}/lib/plymouth/renderers/*.so $out/lib/plymouth/renderers
# useless in the initrd, and adds several megabytes to the closure
rm $out/lib/plymouth/renderers/x11.so
mkdir -p $out/share/plymouth/themes
cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth
mkdir -p $out/share/plymouth/themes
cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth
# Copy themes into working directory for patching
mkdir themes
# Copy themes into working directory for patching
mkdir themes
# Use -L to copy the directories proper, not the symlinks to them.
# Copy all themes because they're not large assets, and bgrt depends on the ImageDir of
# the spinner theme.
cp -r -L ${themesEnv}/share/plymouth/themes/* themes
# Use -L to copy the directories proper, not the symlinks to them.
# Copy all themes because they're not large assets, and bgrt depends on the ImageDir of
# the spinner theme.
cp -r -L ${themesEnv}/share/plymouth/themes/* themes
# Patch out any attempted references to the theme or plymouth's themes directory
chmod -R +w themes
find themes -type f | while read file
do
sed -i "s,${builtins.storeDir}/.*/share/plymouth/themes,$out/share/plymouth/themes,g" $file
done
# Patch out any attempted references to the theme or plymouth's themes directory
chmod -R +w themes
find themes -type f | while read file
do
sed -i "s,${builtins.storeDir}/.*/share/plymouth/themes,$out/share/plymouth/themes,g" $file
done
# Install themes
cp -r themes/* $out/share/plymouth/themes
# Install themes
cp -r themes/* $out/share/plymouth/themes
# Install logo
mkdir -p $out/etc/plymouth
cp -r -L ${themesEnv}/etc/plymouth $out/etc
# Install logo
mkdir -p $out/etc/plymouth
cp -r -L ${themesEnv}/etc/plymouth $out/etc
# Setup font
mkdir -p $out/share/fonts
cp ${cfg.font} $out/share/fonts
mkdir -p $out/etc/fonts
cat > $out/etc/fonts/fonts.conf <<EOF
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<dir>$out/share/fonts</dir>
</fontconfig>
EOF
'';
# Setup font
mkdir -p $out/share/fonts
cp ${cfg.font} $out/share/fonts
mkdir -p $out/etc/fonts
cat > $out/etc/fonts/fonts.conf <<EOF
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<dir>$out/share/fonts</dir>
</fontconfig>
EOF
''
);
boot.initrd.extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable) ''
$out/bin/plymouthd --help >/dev/null
@@ -1,7 +1,6 @@
{
config,
lib,
pkgs,
...
}:
@@ -55,11 +54,8 @@ in
boot.extraModulePackages = [ prl-tools ];
boot.kernelModules = [
"prl_fs"
"prl_fs_freeze"
"prl_tg"
]
++ optional (pkgs.stdenv.hostPlatform.system == "aarch64-linux") "prl_notifier";
];
services.timesyncd.enable = false;
@@ -114,15 +110,6 @@ in
WorkingDirectory = "${prl-tools}/bin";
};
};
prlsga = {
description = "Parallels Shared Guest Applications Tool";
wantedBy = [ "graphical-session.target" ];
path = [ prl-tools ];
serviceConfig = {
ExecStart = "${prl-tools}/bin/prlsga";
WorkingDirectory = "${prl-tools}/bin";
};
};
prlshprof = {
description = "Parallels Shared Profile Tool";
wantedBy = [ "graphical-session.target" ];
@@ -133,6 +120,5 @@ in
};
};
};
};
}
+1 -1
View File
@@ -29,6 +29,6 @@
testScript = ''
machine.wait_for_unit("gatus.service")
machine.succeed("curl -s http://localhost:8080/metrics | grep go_info")
machine.wait_until_succeeds("curl -s http://localhost:8080/metrics | grep go_info", timeout=60)
'';
}
+1
View File
@@ -66,6 +66,7 @@ let
enable = true;
databases = lib.optional (!backupAll) "postgres";
pgdumpOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ";
pgdumpAllOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ";
};
};
@@ -24,8 +24,8 @@ let
sha256Hash = "sha256-3LkcpvuoUhY/kRpoqYnwfx1cdPvvdBMEFXtRLYmqTk4=";
};
latestVersion = {
version = "2025.1.4.1"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 Canary 1"
sha256Hash = "sha256-OGnBf0LrfbN7WpO9skT8+ltAeKejyqHobxFvrzLp3EY=";
version = "2025.1.4.3"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 Canary 3"
sha256Hash = "sha256-YYacdZ7YdmmrTSsKtCfmSSrrZV+/GGPK34KnlO0+aKQ=";
};
in
{
@@ -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;
};
File diff suppressed because it is too large Load Diff
@@ -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 ];
}
@@ -66,12 +66,12 @@
};
arduino = buildGrammar {
language = "arduino";
version = "0.0.0+rev=3b5ddcd";
version = "0.0.0+rev=2f0c122";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-arduino";
rev = "3b5ddcdbcac43c6084358d3d14a30e10e2d36b88";
hash = "sha256-qoVN/84BbuvhTb+WuwmTtNGqf9mKelViHMIVjMqyvG4=";
rev = "2f0c1223c50aa4b754136db544204c6fc99ffc77";
hash = "sha256-t0EtibjsMJpiTbwhkgZGv9lUdpI6gg2VoSEUDXswEMA=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino";
};
@@ -652,12 +652,12 @@
};
elixir = buildGrammar {
language = "elixir";
version = "0.0.0+rev=b848e63";
version = "0.0.0+rev=d24cece";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "tree-sitter-elixir";
rev = "b848e63e9f2a68accff0332392f07582c046295a";
hash = "sha256-kMsGDHFGBclpyk9n01JJsoqInEWLEcyIUSgcWJ2Jpzk=";
rev = "d24cecee673c4c770f797bac6f87ae4b6d7ddec5";
hash = "sha256-nSXXMPneL/sTdkpcsxUz73DiXVuNxVHnf8b2LTbAUs8=";
};
meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
};
@@ -1413,12 +1413,12 @@
};
inko = buildGrammar {
language = "inko";
version = "0.0.0+rev=f58a87a";
version = "0.0.0+rev=74cbd0f";
src = fetchFromGitHub {
owner = "inko-lang";
repo = "tree-sitter-inko";
rev = "f58a87ac4dc6a7955c64c9e4408fbd693e804686";
hash = "sha256-hZdbF9lw7fR5K8UfUaESS7/c4v9u7vEcSylEEbc6//4=";
rev = "74cbd0f69053b4a9ad4fed8831dee983ec7e4990";
hash = "sha256-nrhouUE2vjHiTlLquCJf2IUF3vy9vlBL6LuAmeKcB8M=";
};
meta.homepage = "https://github.com/inko-lang/tree-sitter-inko";
};
@@ -1457,12 +1457,12 @@
};
javadoc = buildGrammar {
language = "javadoc";
version = "0.0.0+rev=77afe93";
version = "0.0.0+rev=384952d";
src = fetchFromGitHub {
owner = "rmuir";
repo = "tree-sitter-javadoc";
rev = "77afe93bc6fc10f2cf4935857b8e055b2a47bb94";
hash = "sha256-HkhVHPYe+IgVkRlJu72Y+3eNZnPPpDqs6UJ0ej0PZrI=";
rev = "384952d91ebc176fcf8f1933dff93b9c32430911";
hash = "sha256-IH1LUPO+18vDC83jcrC0DihTYt6aXV1w/u0iTm5jgK4=";
};
meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
};
@@ -1735,12 +1735,12 @@
};
llvm = buildGrammar {
language = "llvm";
version = "0.0.0+rev=470886d";
version = "0.0.0+rev=2914786";
src = fetchFromGitHub {
owner = "benwilliamgraham";
repo = "tree-sitter-llvm";
rev = "470886ddd635e0ee48a4cb169e33d0c6d9bff32e";
hash = "sha256-1Fv1r644UfHXC4x4mbMetC0ThroYHwYDtKTSX3Nd4fo=";
rev = "2914786ae6774d4c4e25a230f4afe16aa68fe1c1";
hash = "sha256-jBSotMFsBUcgQrWH5p8EiywG00+v9QqePcUTI6ZqAkw=";
};
meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm";
};
@@ -1880,12 +1880,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=b209a18";
version = "0.0.0+rev=09666ce";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "b209a18d1a0f440acd3a85b6d633dac2660114e1";
hash = "sha256-aAfrn3my/qfEy9uK/WPCxSefBOsekJ+rT04K9UmDVvs=";
rev = "09666cead2c001cbbfc82b395007f6d8158113a5";
hash = "sha256-toH/pG8CKI4UFdBQqkgIer5tfpIWkWoCP+fU0OByxQg=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2104,12 +2104,12 @@
};
perl = buildGrammar {
language = "perl";
version = "0.0.0+rev=e95676f";
version = "0.0.0+rev=0c24d00";
src = fetchFromGitHub {
owner = "tree-sitter-perl";
repo = "tree-sitter-perl";
rev = "e95676fa54559c71f15ad73e871c1e44db8a9b05";
hash = "sha256-VABlYn+OwgR+aD6dFI1bxa/JhwHV0KigsAcug3gze1c=";
rev = "0c24d001dd1921e418fb933d208a7bd7dd3f923a";
hash = "sha256-rKu3CGHckXlQnI/bvrQDq40jRO4PAueWKNZJADjmv5A=";
};
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
};
@@ -2927,12 +2927,12 @@
};
superhtml = buildGrammar {
language = "superhtml";
version = "0.0.0+rev=0daae52";
version = "0.0.0+rev=8cb16ba";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "superhtml";
rev = "0daae5239bd9366dda0c28c7540d7503b0c104d4";
hash = "sha256-dfH7/i/xnjQRMAhzNPkDMhre+lR+pJ/s8aDxXhPqyic=";
rev = "8cb16babb0c66b6512d6aeb4cbc37ed90641d980";
hash = "sha256-lLZqyqVEUCn9z++9lPnrK8R2uDvht5v+5Y8KOZDgPs0=";
};
location = "tree-sitter-superhtml";
meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -3365,12 +3365,12 @@
};
vhdl = buildGrammar {
language = "vhdl";
version = "0.0.0+rev=73ff9d3";
version = "0.0.0+rev=02523d7";
src = fetchFromGitHub {
owner = "jpt13653903";
repo = "tree-sitter-vhdl";
rev = "73ff9d3e7bc42b8cc123bf5f0b2db12a900ee9b7";
hash = "sha256-8Fp/x3TC+bq4nJdbeVdBrnz7QnBSD1sc5CC0TRh0mGc=";
rev = "02523d7fb0321344c19c1f3f4ec6b83424c7d6c8";
hash = "sha256-TI1R2L8/9QwpKuTz18ayOeGXqRhYgbd0X6Rpj8kgsfw=";
};
meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
};
@@ -3498,12 +3498,12 @@
};
xresources = buildGrammar {
language = "xresources";
version = "0.0.0+rev=6113943";
version = "0.0.0+rev=f40778f";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-xresources";
rev = "6113943ab0847a307f3f3c38ff91d9cdfce9d0d9";
hash = "sha256-ZqJvLw475e/5KBcJzx0w+aPbGCIAFfdig9cpZ5oaat8=";
rev = "f40778ff42f2119aebacd46d4b6d785a4181a9ba";
hash = "sha256-9vqVBsErlbFXzTd7QmMItd5GW2F9kE04HQFjq/vtrTc=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
};
@@ -3564,12 +3564,12 @@
};
ziggy = buildGrammar {
language = "ziggy";
version = "0.0.0+rev=e95c85c";
version = "0.0.0+rev=4353b20";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "ziggy";
rev = "e95c85cb58773c43e9d94c0b9422ae84697e68a1";
hash = "sha256-6vqUPY/fpGuM1K4HfgpL/dRy7Na6fJ/t+Pe/12b1wqE=";
rev = "4353b20ef2ac750e35c6d68e4eb2a07c2d7cf901";
hash = "sha256-7XZNKUrOkpPMge6nDSiEBlUAf7dZLDcVcJ7fHT8fPh4=";
};
location = "tree-sitter-ziggy";
meta.homepage = "https://github.com/kristoff-it/ziggy";
@@ -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 {
@@ -190,6 +185,7 @@ in
checkInputs = with self; [
lualine-nvim
telescope-nvim
fzf-lua
];
};
@@ -276,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 ];
@@ -334,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 ];
@@ -351,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 = [
@@ -1011,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 = ''
@@ -1047,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 = [
@@ -1157,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 ];
};
@@ -1183,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
@@ -1331,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 {
@@ -1496,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
@@ -1562,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 ];
@@ -1794,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
@@ -1807,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
@@ -1942,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 ];
};
@@ -1971,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
@@ -2877,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
@@ -2902,7 +2857,6 @@ in
(replaceVars ./patches/openscad.nvim/program_paths.patch {
htop = lib.getExe htop;
openscad = lib.getExe openscad;
zathura = lib.getExe zathura;
})
];
};
@@ -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 = [
@@ -2,18 +2,9 @@ diff --git a/autoload/health/openscad_nvim.vim b/autoload/health/openscad_nvim.v
index d6d4b4c..9853877 100644
--- a/autoload/health/openscad_nvim.vim
+++ b/autoload/health/openscad_nvim.vim
@@ -7,7 +7,7 @@ function! s:check_nvim_version_minimum() abort
endfunction
function! s:check_zathura_installed() abort
- if !executable('zathura')
+ if !executable('@zathura@')
call v:lua.vim.health.error('has(zathura)','install zathura')
else
call v:lua.vim.health.ok("zathura is installed")
@@ -15,7 +15,7 @@ function! s:check_zathura_installed() abort
endfunction
function! s:check_htop_installed() abort
- if !executable('htop')
+ if !executable('@htop@')
@@ -24,15 +15,6 @@ diff --git a/lua/openscad.lua b/lua/openscad.lua
index 0a26d08..1264989 100644
--- a/lua/openscad.lua
+++ b/lua/openscad.lua
@@ -101,7 +101,7 @@ end
function M.manual()
local path = U.openscad_nvim_root_dir .. U.path_sep .. "help_source" .. U.path_sep .. "openscad-manual.pdf"
- api.nvim_command('silent !zathura --fork ' .. path)
+ api.nvim_command('silent !@zathura@ --fork ' .. path)
end
function M.help()
@@ -126,7 +126,7 @@ function M.exec_openscad()
jobCommand = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD ' .. filename
else
@@ -40,5 +22,5 @@ index 0a26d08..1264989 100644
- jobCommand = 'openscad ' .. filename
+ jobCommand = '@openscad@ ' .. filename
end
vim.fn.jobstart(jobCommand)
@@ -626,49 +626,49 @@ https://github.com/lsig/messenger.nvim/,HEAD,
https://github.com/xero/miasma.nvim/,,
https://github.com/dasupradyumna/midnight.nvim/,,
https://github.com/hadronized/mind.nvim/,HEAD,
https://github.com/echasnovski/mini-git/,HEAD,
https://github.com/echasnovski/mini.ai/,HEAD,
https://github.com/echasnovski/mini.align/,HEAD,
https://github.com/echasnovski/mini.animate/,HEAD,
https://github.com/echasnovski/mini.base16/,HEAD,
https://github.com/echasnovski/mini.basics/,HEAD,
https://github.com/echasnovski/mini.bracketed/,HEAD,
https://github.com/echasnovski/mini.bufremove/,HEAD,
https://github.com/echasnovski/mini.clue/,HEAD,
https://github.com/echasnovski/mini.colors/,HEAD,
https://github.com/echasnovski/mini.comment/,HEAD,
https://github.com/echasnovski/mini.completion/,HEAD,
https://github.com/echasnovski/mini.cursorword/,HEAD,
https://github.com/echasnovski/mini.deps/,HEAD,
https://github.com/echasnovski/mini.diff/,HEAD,
https://github.com/echasnovski/mini.doc/,HEAD,
https://github.com/echasnovski/mini.extra/,HEAD,
https://github.com/echasnovski/mini.files/,HEAD,
https://github.com/echasnovski/mini.fuzzy/,HEAD,
https://github.com/echasnovski/mini.hipatterns/,HEAD,
https://github.com/echasnovski/mini.hues/,HEAD,
https://github.com/echasnovski/mini.icons/,HEAD,
https://github.com/echasnovski/mini.indentscope/,HEAD,
https://github.com/echasnovski/mini.jump/,HEAD,
https://github.com/echasnovski/mini.jump2d/,HEAD,
https://github.com/echasnovski/mini.keymap/,HEAD,
https://github.com/echasnovski/mini.map/,HEAD,
https://github.com/echasnovski/mini.misc/,HEAD,
https://github.com/echasnovski/mini.move/,HEAD,
https://github.com/echasnovski/mini.notify/,HEAD,
https://github.com/echasnovski/mini.nvim/,,
https://github.com/echasnovski/mini.operators/,HEAD,
https://github.com/echasnovski/mini.pairs/,HEAD,
https://github.com/echasnovski/mini.pick/,HEAD,
https://github.com/echasnovski/mini.sessions/,HEAD,
https://github.com/echasnovski/mini.snippets/,HEAD,
https://github.com/echasnovski/mini.splitjoin/,HEAD,
https://github.com/echasnovski/mini.starter/,HEAD,
https://github.com/echasnovski/mini.statusline/,HEAD,
https://github.com/echasnovski/mini.surround/,HEAD,
https://github.com/echasnovski/mini.tabline/,HEAD,
https://github.com/echasnovski/mini.trailspace/,HEAD,
https://github.com/echasnovski/mini.visits/,HEAD,
https://github.com/nvim-mini/mini-git/,HEAD,
https://github.com/nvim-mini/mini.ai/,HEAD,
https://github.com/nvim-mini/mini.align/,HEAD,
https://github.com/nvim-mini/mini.animate/,HEAD,
https://github.com/nvim-mini/mini.base16/,HEAD,
https://github.com/nvim-mini/mini.basics/,HEAD,
https://github.com/nvim-mini/mini.bracketed/,HEAD,
https://github.com/nvim-mini/mini.bufremove/,HEAD,
https://github.com/nvim-mini/mini.clue/,HEAD,
https://github.com/nvim-mini/mini.colors/,HEAD,
https://github.com/nvim-mini/mini.comment/,HEAD,
https://github.com/nvim-mini/mini.completion/,HEAD,
https://github.com/nvim-mini/mini.cursorword/,HEAD,
https://github.com/nvim-mini/mini.deps/,HEAD,
https://github.com/nvim-mini/mini.diff/,HEAD,
https://github.com/nvim-mini/mini.doc/,HEAD,
https://github.com/nvim-mini/mini.extra/,HEAD,
https://github.com/nvim-mini/mini.files/,HEAD,
https://github.com/nvim-mini/mini.fuzzy/,HEAD,
https://github.com/nvim-mini/mini.hipatterns/,HEAD,
https://github.com/nvim-mini/mini.hues/,HEAD,
https://github.com/nvim-mini/mini.icons/,HEAD,
https://github.com/nvim-mini/mini.indentscope/,HEAD,
https://github.com/nvim-mini/mini.jump/,HEAD,
https://github.com/nvim-mini/mini.jump2d/,HEAD,
https://github.com/nvim-mini/mini.keymap/,HEAD,
https://github.com/nvim-mini/mini.map/,HEAD,
https://github.com/nvim-mini/mini.misc/,HEAD,
https://github.com/nvim-mini/mini.move/,HEAD,
https://github.com/nvim-mini/mini.notify/,HEAD,
https://github.com/nvim-mini/mini.nvim/,,
https://github.com/nvim-mini/mini.operators/,HEAD,
https://github.com/nvim-mini/mini.pairs/,HEAD,
https://github.com/nvim-mini/mini.pick/,HEAD,
https://github.com/nvim-mini/mini.sessions/,HEAD,
https://github.com/nvim-mini/mini.snippets/,HEAD,
https://github.com/nvim-mini/mini.splitjoin/,HEAD,
https://github.com/nvim-mini/mini.starter/,HEAD,
https://github.com/nvim-mini/mini.statusline/,HEAD,
https://github.com/nvim-mini/mini.surround/,HEAD,
https://github.com/nvim-mini/mini.tabline/,HEAD,
https://github.com/nvim-mini/mini.trailspace/,HEAD,
https://github.com/nvim-mini/mini.visits/,HEAD,
https://github.com/wfxr/minimap.vim/,,
https://github.com/milanglacier/minuet-ai.nvim/,HEAD,
https://github.com/jghauser/mkdir.nvim/,main,
@@ -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;
};
@@ -1,11 +1,11 @@
{
"packageVersion": "142.0-1",
"packageVersion": "142.0.1-1",
"source": {
"rev": "142.0-1",
"hash": "sha256-/bn9xeDxnJCQol/E8rhS8RVhpUj7UN+QScSIzLFnZ/o="
"rev": "142.0.1-1",
"hash": "sha256-frAMrNEGv36+SshorhjnOimT3bKe9uLaDjxbuqSp39c="
},
"firefox": {
"version": "142.0",
"hash": "sha512-sMHHZgg6MKkrd9zxalhNn7NBzYEdIcOjTaTNDXFP1q3HO2CAktZgWGl7xFYvqsxEhZFT5J/9624U4Fnlny6iRg=="
"version": "142.0.1",
"hash": "sha512-/KG5xnoLLyFvHxH9XjoIkgmYkh49YetjPx3ef+actAzbtjpBod/E8QIlCdpkPjeRRn2I5i5+owspPr9p2Hu1hQ=="
}
}
@@ -54,11 +54,11 @@
"vendorHash": "sha256-WT4sjem80445Qwlr3i/OuQMujrxEKqhws1GLpvbqKaU="
},
"alicloud": {
"hash": "sha256-pZhEc70Y0WYOP0wOZwpy+pLG5wXCzcmrHPQDqHNTCRQ=",
"hash": "sha256-pCGmH70Ro4QSpcHBhUpoQtQBTos3QluJxfPJkJP3+ng=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
"rev": "v1.257.0",
"rev": "v1.258.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-+Hc2NCCnJ0fB86fvgE4Kak8fwlsXIiv8avIhE/RoWeM="
},
@@ -198,13 +198,13 @@
"vendorHash": "sha256-ok73U0WWFGXp5TJ7sp7U9umq7DlChCw7fSyFmbifwKE="
},
"bitwarden": {
"hash": "sha256-yq45SlP8x/jMSuhgrIIAM+hWa4tcp2d871uoLy+iIZM=",
"hash": "sha256-dYWiz5DjkMQliUpvapKANj45vUyiPaE6GeP/HOBrKt8=",
"homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden",
"owner": "maxlaverse",
"repo": "terraform-provider-bitwarden",
"rev": "v0.15.0",
"rev": "v0.16.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-oQ7rOrWS2cJtAOwO+tQ9aB27DyHMhf5FYpDvJVsLe/k="
"vendorHash": "sha256-I8yMdS+yOk5doWGU9VPdl5ITGNrPhs5tGwluwXSrnI0="
},
"brightbox": {
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
@@ -372,11 +372,11 @@
"vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
},
"digitalocean": {
"hash": "sha256-kqJVwh3Myu8pfNfO2uVQFO/aU/7trDKktRdXdFQvnOg=",
"hash": "sha256-mFwmq/uYQ9i6s7vWfDExl7AC5i/lA4596VH3iCdjC3Q=",
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
"owner": "digitalocean",
"repo": "terraform-provider-digitalocean",
"rev": "v2.65.0",
"rev": "v2.66.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -444,11 +444,11 @@
"vendorHash": "sha256-65gJeUzeWB4BA76Mbw4eBScByyYyUqOl2/jwRVMJOVM="
},
"exoscale": {
"hash": "sha256-TA8mMMeelnkvGcvRy9+QLiRegQYf8xo6vRZ+kb+DY5A=",
"hash": "sha256-tTFGYzDwx7VXzS287eNUUjsAuwY/Rh2zuOsGwLT6BRU=",
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
"owner": "exoscale",
"repo": "terraform-provider-exoscale",
"rev": "v0.65.0",
"rev": "v0.65.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -525,22 +525,22 @@
"vendorHash": "sha256-eE9AY/79xQSbRl5kA0rwS8Oz8I9jaxT/KlVd0v0GAa8="
},
"google": {
"hash": "sha256-enfKikX5raeLzZCnslaiAJ6hF/7+AXpKlDbNDm2v1qE=",
"hash": "sha256-TInKyk82gwn3bGEPM6l9pGDmfMPskrMSSWNL0hDpnws=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"repo": "terraform-provider-google",
"rev": "v6.48.0",
"rev": "v6.49.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-IwUmrRZC2KXNzbKajKisaqKbv0RMIH8tgiKsOOlduIo="
"vendorHash": "sha256-KWXHXLIt0fI9k3XRhch8VLLnVXwkSH2uUS5APfCcNdI="
},
"google-beta": {
"hash": "sha256-288cK94lKkgSKTs0YuHvoyp/Z3rPr4qDo7AZE6ndJZo=",
"hash": "sha256-lmn6hHVJ65Q65bATLV8XeyGOh9lsMcOprJt7vbGBCeE=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"repo": "terraform-provider-google-beta",
"rev": "v6.48.0",
"rev": "v7.0.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-etnuDVoCrGySDh6cSCO24GCqRVD2UiK4Zcrbf+y12vQ="
"vendorHash": "sha256-l5UkyXzoy3lY5bAus6pHnYKa6QniebN6nmQ5gANxr/Y="
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@@ -570,11 +570,11 @@
"vendorHash": null
},
"harbor": {
"hash": "sha256-RZkXUB4Msmsm+1mQij+577d7KUrDpk50oPc2rcFevi4=",
"hash": "sha256-IxtPbdgjRpqN2ZRSLjtrl6sHrVAiQI+TkZboHsD/6qU=",
"homepage": "https://registry.terraform.io/providers/goharbor/harbor",
"owner": "goharbor",
"repo": "terraform-provider-harbor",
"rev": "v3.10.23",
"rev": "v3.11.0",
"spdx": "MIT",
"vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U="
},
@@ -849,13 +849,13 @@
"vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
},
"mongodbatlas": {
"hash": "sha256-Lv0LwvQZTtZ2ZaNDJSQFVRDFtM23mnihV4XOBIxL5Bc=",
"hash": "sha256-IWawVQ+m1NeGqMTrtSE4bH/220tdP2Figqb6yviVEUo=",
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
"owner": "mongodb",
"repo": "terraform-provider-mongodbatlas",
"rev": "v1.39.0",
"rev": "v1.40.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-6ZxrQGYX15TpCTQ/Oxe4NL/XlgdqmWBm53JEuMv8KQg="
"vendorHash": "sha256-XhsoMZc/7zh5AoJtpETVHVvmxSkfMYtJGho+Cy06VMs="
},
"namecheap": {
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
@@ -1273,11 +1273,11 @@
"vendorHash": "sha256-D8VG9CWP4wo+cxb/ewP+b6qAeaBCu6lNwH2leoiBMAc="
},
"spotinst": {
"hash": "sha256-uLIm4j7rCPvA8xVZwdd7xHrL8KNLbZypGLVNzUuhVjw=",
"hash": "sha256-SGlNS6E96uXExu60D0WjRXB2YnsJoz4xfxfHe1/pYn8=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.225.0",
"rev": "v1.225.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-tfANShbNhWcMZvnJUIbErukbGZyPABVS4l0VKWcLqZA="
},
@@ -1345,20 +1345,20 @@
"vendorHash": "sha256-V0dK5G3zheyyqexBud+9Hg9ExYI/9X1wuYx+lEn6pVg="
},
"temporalcloud": {
"hash": "sha256-dsOBLWHDWMO2/VKQOvJP5WgdAS3Zo9mkqRbfEDvzQRk=",
"hash": "sha256-tXNnDoUskOcmOKPpgBIcLcup0jMqRVWkhwSU3GKjAFI=",
"homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud",
"owner": "temporalio",
"repo": "terraform-provider-temporalcloud",
"rev": "v0.9.2",
"rev": "v1.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-PVN3oPT3cxsnWH03twbPSIIERGHCp3XAmcqrQAOULZ4="
"vendorHash": "sha256-M3wnvRxMyU0Yo733E9e8Q++xVTuSXD0W3fB2C14RDNU="
},
"tencentcloud": {
"hash": "sha256-vHw2GcBZqWYwXo6jVEUtf6onINuk6duxWofmNffTbqk=",
"hash": "sha256-dhhQxSIsFngZ/bcZ9a1ECo98A8lu+egSi9znVRUVkBQ=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.82.17",
"rev": "v1.82.18",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1535,12 +1535,12 @@
"vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg="
},
"yandex": {
"hash": "sha256-Lo6OSvS1MfXNHevSfSjmLmuiRKVMW4Me2e8r6/7VWwI=",
"hash": "sha256-42LhewtXX8TTRB6Xfz0iQaa1ldKm+YRmLm0s+LKvdic=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
"rev": "v0.150.0",
"rev": "v0.152.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-qwrb6qYjUtMpeX1Mnrvu3zEgtsELvAdr/p4loWxdFaU="
"vendorHash": "sha256-LovDyADJeMQpIW3YqrdoNChmRf4XDBZK3DG/oOmtxOI="
}
}
@@ -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 = {
@@ -9,7 +9,7 @@ let
versions =
if stdenv.hostPlatform.isLinux then
{
stable = "0.0.104";
stable = "0.0.107";
ptb = "0.0.156";
canary = "0.0.745";
development = "0.0.84";
@@ -26,7 +26,7 @@ let
x86_64-linux = {
stable = fetchurl {
url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
hash = "sha256-4w8C9YHRNTgkUBzqkW1IywKtRHvtlkihjo3/shAgPac=";
hash = "sha256-uL923Fc8Io0GUnQjaAl7sRahL6CO/qzNzkqk/oKkZCo=";
};
ptb = fetchurl {
url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
File diff suppressed because it is too large Load Diff
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
hash = "sha256-C1a47pWtjb38bnwmZ2Zq7/LlW3+BF5BGNMRFi97/ngU=";
};
patches = [
./gettext-0.25.patch
];
strictDeps = true;
nativeBuildInputs = [
@@ -40,16 +44,16 @@ stdenv.mkDerivation rec {
++ [ libxml2 ];
prePatch = ''
substituteInPlace ocaml-dep.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}'
substituteInPlace ocaml-link.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}'
substituteInPlace ocaml-dep.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}'
substituteInPlace ocaml-link.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}'
'';
meta = with lib; {
meta = {
description = "Top-like utility for showing stats of virtualized domains";
homepage = "https://people.redhat.com/~rjones/virt-top/";
license = licenses.gpl2Only;
license = lib.licenses.gpl2Only;
maintainers = [ ];
platforms = platforms.linux;
platforms = lib.platforms.linux;
mainProgram = "virt-top";
};
}
@@ -0,0 +1,10 @@
--- a/configure.ac.orig 2025-08-23 01:41:53
+++ b/configure.ac 2025-08-23 01:42:14
@@ -123,6 +123,7 @@
dnl Check for gettext.
AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.25])
dnl Write gettext modules for the programs.
dnl http://www.le-gall.net/sylvain+violaine/documentation/ocaml-gettext/html/reference-manual/ch03s04.html
+2 -6
View File
@@ -146,12 +146,8 @@ stdenv.mkDerivation {
makeShellWrapper $out/share/1password/1password $out/bin/1password \
"''${gappsWrapperArgs[@]}" \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
# Currently half broken on wayland (e.g. no copy functionality)
# See: https://github.com/NixOS/nixpkgs/pull/232718#issuecomment-1582123406
# Remove this comment when upstream fixes:
# https://1password.community/discussion/comment/624011/#Comment_624011
#--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} \
--add-flags "\''${NIXOS_OZONE_WL:+--ozone-platform-hint=auto}"
'';
passthru.updateScript = ./update.sh;
@@ -0,0 +1,42 @@
{
lib,
fetchFromGitHub,
rustPlatform,
pcsclite,
pkg-config,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "age-plugin-openpgp-card";
version = "0.1.1";
src = fetchFromGitHub {
owner = "wiktor-k";
repo = "age-plugin-openpgp-card";
rev = "v${finalAttrs.version}";
hash = "sha256-uJmYtc+GxJZtCjLQla/h9vpTzPcsL+zbM2uvAQsfwIY=";
};
cargoHash = "sha256-YZGrEO6SOS0Kir+1d8shf54420cYjvcfKYS+T2NlEug=";
buildInputs = [ pcsclite ];
nativeBuildInputs = [ pkg-config ];
meta = {
description = "Age plugin for using ed25519 on OpenPGP Card devices (Yubikeys, Nitrokeys)";
homepage = "https://github.com/wiktor-k/age-plugin-openpgp-card";
license = with lib.licenses; [
asl20
mit
];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
mainProgram = "age-plugin-openpgp-card";
maintainers = with lib.maintainers; [ nukdokplex ];
};
})
@@ -7,13 +7,13 @@
buildGoModule {
pname = "ldk-node-go";
version = "0-unstable-2025-06-30";
version = "0-unstable-2025-08-22";
src = fetchFromGitHub {
owner = "getAlby";
repo = "ldk-node-go";
rev = "fc4853954f5259762ec91e6627f371a7a1241b08";
hash = "sha256-M96Yx4jEIKa83gKx4ofWh19QZFUxSdwH2J8h1aIrbys=";
rev = "93af4d511ff81466ce547b42d0c7ea6adb724ad3";
hash = "sha256-hDRjYUkV4dVT+iuO+hUpXrFZLZ9eLU50gBLEKVdXPLE=";
};
vendorHash = null;
+4 -4
View File
@@ -8,18 +8,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ldk-node";
version = "0-unstable-2025-06-30";
version = "0-unstable-2025-08-21";
src = fetchFromGitHub {
owner = "getAlby";
repo = "ldk-node";
rev = "b00326e36445312a55f9fb583a8b54cc5763b6bf";
hash = "sha256-SDuHM7aawLXGSUxsKMlU0iH5+xs35VULX4vDGkS6xMA=";
rev = "078a26fb3a79f1ef66443b773018a1cf917cb5da";
hash = "sha256-ZmeohMnIbJzJbo9U+t0AWKFqLSIzDL/G42cBSBCtj3Q=";
};
buildFeatures = [ "uniffi" ];
cargoHash = "sha256-ONlN5xMU4A7ZTF4+XRbs5qAv8xQVYuMsU0bnD8Eh2gE=";
cargoHash = "sha256-VLQohnbuEdnu2E+BXe2mDKFUnDVlSY09rIIvHMIQ+Hg=";
# Skip tests because they download bitcoin-core and electrs zip files, and then fail
doCheck = false;
+5 -4
View File
@@ -23,16 +23,16 @@ in
buildGoModule (finalAttrs: {
pname = "albyhub";
version = "1.18.5";
version = "1.19.2";
src = fetchFromGitHub {
owner = "getAlby";
repo = "hub";
tag = "v${finalAttrs.version}";
hash = "sha256-j918jzhQs3dnPQaG4UMmoit8UvC8/3Z5+IiAZqO3OSA=";
hash = "sha256-11mHu067/SLh83UT2AZaLfYGwbB/b+vsQSN2AxuI/p4=";
};
vendorHash = "sha256-iMxxJQZLQOLl7v1SimtXSYH7wXFOdZcSJAaUAKDqvBY=";
vendorHash = "sha256-h1I0PwddDzOFlJphKfej+dXgDXgkBOjrKigGwqfXbTU=";
proxyVendor = true; # needed for secp256k1-zkp CGO bindings
nativeBuildInputs = [
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
frontendYarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/frontend/yarn.lock";
hash = "sha256-ttLhICDAsg8Cvqy2AJKgS2IJZgay1tMi3Qd8RccD1jI=";
hash = "sha256-ukLg+vK3yquRlWu8z3HtAaVFqtzWPR63oiK8e7b6Gg0=";
};
preBuild = ''
@@ -96,3 +96,4 @@ buildGoModule (finalAttrs: {
mainProgram = "albyhub";
};
})
# nixpkgs-update: no auto update
+3 -3
View File
@@ -8,17 +8,17 @@
buildGoModule rec {
pname = "aliyun-cli";
version = "3.0.296";
version = "3.0.299";
src = fetchFromGitHub {
owner = "aliyun";
repo = "aliyun-cli";
tag = "v${version}";
hash = "sha256-7LQUxUE31bFve3IyK9G+1XM6Fom888JQ2WZy2mpW9Fs=";
hash = "sha256-9312AWM6yzF8asL7+ziU3C4VtsFV6vrPZS4so09P4vw=";
fetchSubmodules = true;
};
vendorHash = "sha256-Vp7cvIlswhRf1ntZESd7Oabg+xZ4UOFJGD2usRcnnhY=";
vendorHash = "sha256-7OI9YDehiKP5+VvCc0jUtCfyCPP5puWjyWXFE7Tjv5Q=";
subPackages = [ "main" ];
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule (finalAttrs: {
pname = "apko";
version = "0.30.5";
version = "0.30.6";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = "apko";
tag = "v${finalAttrs.version}";
hash = "sha256-FYbk61+gVFmTynn2wywtiDIsTfMKWWO+WrZVPgV8KaU=";
hash = "sha256-xzXx+pe1WUe0Bxlig04fwgXF/ewKaehezQk4npJ/zic=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "asn";
version = "0.78.6";
version = "0.79.0";
src = fetchFromGitHub {
owner = "nitefood";
repo = "asn";
tag = "v${version}";
hash = "sha256-IcAXcsmzxzDUPJp2ieouxfkpdwpOZP6IBTPdm3C5/k4=";
hash = "sha256-bQX5Kk48ydimQj/Ewo+7HmTBQBDo0LOi1KqX/syRAfQ=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -27,16 +27,16 @@ in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "bacon";
version = "3.17.0";
version = "3.18.0";
src = fetchFromGitHub {
owner = "Canop";
repo = "bacon";
tag = "v${finalAttrs.version}";
hash = "sha256-pXdwcihl3fXv9vn6YiU+Da/LL3ImDiDPDnghM/NA1mc=";
hash = "sha256-YdlNJWsKGkXvpcA8un3eNfLVBlU6nalVyO/dhDAQF9k=";
};
cargoHash = "sha256-GHJqgVa7yym1B1s6rZ2/0FbJ0ZJck76FFHqzcgWhFt0=";
cargoHash = "sha256-vGrWs8OkoqPO/oEiGZXrMxIKVA3u4gsaXgF1QUQT3kw=";
buildFeatures = lib.optionals withSound [
"sound"
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "baidupcs-go";
version = "3.9.7";
version = "3.9.8";
src = fetchFromGitHub {
owner = "qjfoidnh";
repo = "BaiduPCS-Go";
rev = "v${version}";
hash = "sha256-C88q2tNNuX+tIvYKHbRE76xfPe81UHqfezyRXzrxzlc=";
hash = "sha256-iQ28wDrkd0mralgsBgCZ+MCkPR7x42tFVqFGNm/m1d0=";
};
vendorHash = "sha256-msTlXtidxLTe3xjxTOWCqx/epFT0XPdwGPantDJUGpc=";
vendorHash = "sha256-hW+IrzS5+DublQUIIcecL08xoauTjba9qnAtpzNeDXw=";
doCheck = false;
+3 -3
View File
@@ -1,6 +1,6 @@
# Generated by ./update.sh - do not update manually!
{
version = "1.17.1-1";
arm64-hash = "sha256-RCANNd8oT9UikiXYXtrO6ctvAxGbQ6TflFh/hVwC7TA=";
x86_64-hash = "sha256-rV+0f6qkaQWOZAO1RTzHxiocuhblHejXEcBcdz3OG0M=";
version = "1.17.1-2";
arm64-hash = "sha256-oSqNQbzj1l60/BvVJ3OBmIfkqTM/Ll9U5IIQ55nBQAc=";
x86_64-hash = "sha256-nD5ET8CFBFlvcldyt6QnewfXm60Ec1yFyDHoOBcOY9g=";
}
+2 -2
View File
@@ -14,14 +14,14 @@
python3Packages.buildPythonPackage rec {
pname = "boxflat";
version = "1.34.2-1";
version = "1.34.4";
pyproject = true;
src = fetchFromGitHub {
owner = "Lawstorant";
repo = "boxflat";
tag = "v${version}";
hash = "sha256-A18YhQp4USFQ4xoyR1Zc0o0fs5mVFVrvfbdPWvo1NXw=";
hash = "sha256-QuBGEOAMVR70JDpD1VVASuCJJdwbWDzK8qmo/BOOua0=";
};
build-system = [ python3Packages.setuptools ];
+3 -3
View File
@@ -6,14 +6,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tally";
version = "1.0.68";
version = "1.0.69";
src = fetchCrate {
inherit pname version;
hash = "sha256-OJI0GDQqf15dFC9ckQDg43QQzowI5R6iMEMwfadzRZU=";
hash = "sha256-ZAayOuuCncjQ3+RGega/aQW/s14QB9541EFB7f6CWxE=";
};
cargoHash = "sha256-UrMdyFcvBXsRJfIuDOKVIIkoOnwjJZPbAptusG8Tgwo=";
cargoHash = "sha256-XLnmx84OP3bwhuRfezczKMJsyc95ClK4yC/RqPe9AB8=";
meta = {
description = "Graph the number of crates that depend on your crate over time";
+4 -4
View File
@@ -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"
+3 -3
View File
@@ -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
+14
View File
@@ -0,0 +1,14 @@
diff --git a/crates/server/src/notification/dummy.rs b/crates/server/src/notification/dummy.rs
index f85dda0..7489f22 100644
--- a/crates/server/src/notification/dummy.rs
+++ b/crates/server/src/notification/dummy.rs
@@ -1,6 +1,9 @@
+#[cfg(test)]
use crate::notification::traits;
+#[cfg(test)]
#[derive(Clone, Copy, Debug, Default)]
pub struct Notification {}
+#[cfg(test)]
impl traits::Notification for Notification {}
+12
View File
@@ -5,6 +5,7 @@
rustPlatform,
protobuf,
installShellFiles,
writableTmpDirAsHomeHook,
}:
rustPlatform.buildRustPackage rec {
@@ -20,9 +21,20 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-UA+NTtZ2qffUPUmvCidnTHwFzD3WOPTlxHR2e2vKwPQ=";
patches = [
# Fix compilation errors caused by stricter restrictions on unused code in Rust 1.89.
# TODO: remove this patch after upstream fix it.
./dummy.patch
];
nativeBuildInputs = [
protobuf
installShellFiles
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# fix following error on darwin:
# objc/notify.h:1:9: fatal error: could not build module 'Cocoa'
writableTmpDirAsHomeHook
];
checkFlags = [
+9 -56
View File
@@ -3,7 +3,6 @@
stdenv,
rustPlatform,
fetchFromGitHub,
gitMinimal,
installShellFiles,
nix-update-script,
pkg-config,
@@ -13,13 +12,13 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
version = "0.25.0";
version = "0.27.0";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
hash = "sha256-a/cUg8yLW4vGPiTtqhyUdkV79JbOB40N4V7Asney7sk=";
hash = "sha256-vsZmHkph2rrb0K+ZRymweRculh+SIASCJCRP3V09hKU=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
@@ -33,59 +32,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildInputs = [ openssl ];
nativeCheckInputs = [ gitMinimal ];
__darwinAllowLocalNetworking = true;
preCheck = ''
# Disables sandbox tests which want to access /usr/bin/touch
export CODEX_SANDBOX=seatbelt
# Skips tests that require networking
export CODEX_SANDBOX_NETWORK_DISABLED=1
# Required by ui_snapshot_add_details and ui_snapshot_update_details_with_rename
export TERM=dumb
# Required by azure_overrides_assign_properties_used_for_responses_url and env_var_overrides_loaded_auth
export USER=test
'';
checkFlags = [
# Wants to access unix sockets
"--skip=allow_unix_socketpair_recvfrom"
# Needs access to python3. However, adding python3 to nativeCheckInputs doesn't resolve the issue
"--skip=exec_command::session_manager::tests::session_manager_streams_and_truncates_from_now"
"--skip=python_multiprocessing_lock_works_under_sandbox"
# Version 0.0.0 hardcoded
"--skip=test_conversation_create_and_send_message_ok"
"--skip=test_send_message_session_not_found"
"--skip=test_send_message_success"
"--skip=suite::auth::get_auth_status_no_auth"
"--skip=suite::auth::get_auth_status_with_api_key"
"--skip=suite::auth::get_auth_status_with_api_key_no_include_token"
"--skip=suite::login::login_and_cancel_chatgpt"
"--skip=suite::login::logout_chatgpt_removes_auth"
# Tests fail
"--skip=diff_render::tests::ui_snapshot_add_details"
"--skip=diff_render::tests::ui_snapshot_update_details_with_rename"
"--skip=diff_render::tests::ui_snapshot_blank_context_line"
"--skip=diff_render::tests::ui_snapshot_single_line_replacement_counts"
"--skip=diff_render::tests::ui_snapshot_vertical_ellipsis_between_hunks"
# Needs acces to sleep. However, adding coreutils to nativeCheckInputs doesn't resolve the issue
"--skip=suite::exec_stream_events::test_aggregated_output_interleaves_in_order"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Wants to access /bin/zsh
"--skip=shell::tests::test_run_with_profile_escaping_and_execution"
# Requires access to the Apple system configuration
"--skip=azure_overrides_assign_properties_used_for_responses_url"
"--skip=env_var_overrides_loaded_auth"
"--skip=includes_base_instructions_override_in_request"
"--skip=includes_user_instructions_message_in_request"
"--skip=originator_config_override_is_used"
"--skip=per_turn_overrides_keep_cached_prefix_and_key_constant"
"--skip=overrides_turn_context_but_keeps_cached_prefix_and_key_constant"
"--skip=prefixes_context_and_instructions_once_and_consistently_across_requests"
"--skip=test_apply_patch_tool"
"--skip=suite::prompt_caching::codex_mini_latest_tools"
"--skip=suite::prompt_caching::prompt_tools_are_consistent_across_requests"
];
# NOTE: part of the test suite requires access to networking, local shells,
# apple system configuration, etc. since this is a very fast moving target
# (for now), with releases happening every other day, constantly figuring out
# which tests need to be skipped, or finding workarounds, was too burdensome,
# and in practice not adding any real value. this decision may be reversed in
# the future once this software stabilizes.
doCheck = false;
postInstall = lib.optionalString installShellCompletions ''
installShellCompletion --cmd codex \
+11
View File
@@ -33,6 +33,12 @@ let
# Tests require langchain-openai which is incompatible with pydantic_1
doCheck = false;
});
versioningit = super.versioningit.overridePythonAttrs (old: {
# Tests fail with pydantic_1
# AttributeError: type object 'CaseDetails' has no attribute 'model_validate_...
doCheck = false;
});
};
};
in
@@ -129,8 +135,13 @@ python.pkgs.buildPythonApplication rec {
# Fails because of dbfs CLI wrong call
"test_dbfs_unknown_user"
"test_dbfs_no_root"
# Requires pylint, prospector, pydocstyle
"test_python_basic_sanity_check"
# FileNotFoundError: [Errno 2] No such file or directory: '/build/tmph3veuluv...
"test_load_file"
"test_storage_serde"
];
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -30,14 +30,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "debian-devscripts";
version = "2.25.18";
version = "2.25.15+deb13u1";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "debian";
repo = "devscripts";
tag = "v${finalAttrs.version}";
hash = "sha256-POmUwNYKfdWda80T44S6x2Dg2TpezMirXuiI95Z077Q=";
hash = "sha256-szyVLpeIQozPXwBgL4nIYog4znUzweIt8q7nczo5q+g=";
};
patches = [
+5 -5
View File
@@ -1,24 +1,24 @@
{
lib,
buildGoModule,
buildGo125Module,
fetchFromGitHub,
installShellFiles,
testers,
dnscontrol,
}:
buildGoModule rec {
buildGo125Module rec {
pname = "dnscontrol";
version = "4.23.0";
version = "4.24.0";
src = fetchFromGitHub {
owner = "StackExchange";
repo = "dnscontrol";
tag = "v${version}";
hash = "sha256-Jaa+geO2836kQHTRhaQru367iQvqac6sgnpL9244dkw=";
hash = "sha256-DAH6XpRZz6KnkUYcQVWqLc3GP//dgojYH5AUvJ/X7v8=";
};
vendorHash = "sha256-PbOqi9vfz46lwoP3aUPl/JKDJtYYF7IwnN9lppZ8KYA=";
vendorHash = "sha256-lY4E0ediBPsOXL/1KKu0QeYC0llswzYYV4JvtxMQ+PE=";
nativeBuildInputs = [ installShellFiles ];
+3 -3
View File
@@ -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 -1
View File
@@ -24,7 +24,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
hash = "sha256-Lt6CzSzppu5ULhzYN5FTCWtWK3AA4/8jRzXgQkU4Tco=";
};
cargoHash = "sha256-1opQaR3vbm/DpDY5oQ1VgA4nf0nCBknxfgOSPZQbtV4=";
cargoPatches = [
# Upgrade wasmer to 6.1.0-rc.3 to fix build failure with Rust ≥ 1.89.0
# https://github.com/dprint/dprint/pull/1021
./upgrade-wasmer.patch
];
cargoHash = "sha256-RUWyR1Yr9G2xBMigDa9+LQyaU5on85xkRQYTLH9JOPg=";
nativeBuildInputs = [ installShellFiles ];
+161
View File
@@ -0,0 +1,161 @@
From 379cf407bfc07380dad24aefb2db40f6852f32ed Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 25 Aug 2025 18:01:57 -0700
Subject: [PATCH] Upgrade wasmer to 6.1.0-rc.3
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
Cargo.lock | 41 ++++++++++++++++++++--------------------
crates/dprint/Cargo.toml | 4 ++--
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 9a1bc870..bff2c81b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -455,9 +455,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "corosensei"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad067b451c08956709f8762dba86e049c124ea52858e3ab8d076ba2892caa437"
+checksum = "5d1ea1c2a2f898d2a6ff149587b8a04f41ee708d248c723f01ac2f0f01edc0b3"
dependencies = [
"autocfg",
"cfg-if",
@@ -776,18 +776,18 @@ dependencies = [
[[package]]
name = "derive_more"
-version = "1.0.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
dependencies = [
"derive_more-impl",
]
[[package]]
name = "derive_more-impl"
-version = "1.0.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
dependencies = [
"proc-macro2",
"quote",
@@ -3256,16 +3256,15 @@ dependencies = [
[[package]]
name = "wasmer"
-version = "6.0.1"
+version = "6.1.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25dccc6251837449135914ee1978731c2c3df9fc727088eb7e098736c0f15d1"
+checksum = "1e588d83a5ac7eb5e6af54ac4d34183442e4dd2a7358d2a11793b17c03b7df0b"
dependencies = [
"bindgen",
"bytes",
"cfg-if",
"cmake",
- "derive_more 1.0.0",
- "idna_adapter",
+ "derive_more 2.0.1",
"indexmap",
"js-sys",
"more-asserts",
@@ -3278,7 +3277,6 @@ dependencies = [
"target-lexicon",
"thiserror 1.0.61",
"tracing",
- "ureq",
"wasm-bindgen",
"wasmer-compiler",
"wasmer-compiler-cranelift",
@@ -3292,9 +3290,9 @@ dependencies = [
[[package]]
name = "wasmer-compiler"
-version = "6.0.1"
+version = "6.1.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f35baeb0d5b20710b5b9c59477dbf813b1ac53da33ee46cb22f8c4190e3986e"
+checksum = "c9542eb21b9a0f7811101e26e40e360a9ac02d093e3089c8fa62dfa102478edb"
dependencies = [
"backtrace",
"bytes",
@@ -3323,9 +3321,9 @@ dependencies = [
[[package]]
name = "wasmer-compiler-cranelift"
-version = "6.0.1"
+version = "6.1.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d657a96003ce3f54a3cbbf681fcd782b983f9362c97cfbbe243cbf66790e004"
+checksum = "a69f548bcccd4791b2647e0d748eb8ddd4d0856233778867c8b0db3781a82ca1"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -3343,9 +3341,9 @@ dependencies = [
[[package]]
name = "wasmer-derive"
-version = "6.0.1"
+version = "6.1.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b57be80a67de03c2a02d697bfd763e097546b11f0020cf9930ebaa4f8cf965"
+checksum = "8db532c73814748214276f878b8382a8885769fdd86d0bee2792c438b0d28c62"
dependencies = [
"proc-macro-error2",
"proc-macro2",
@@ -3355,9 +3353,9 @@ dependencies = [
[[package]]
name = "wasmer-types"
-version = "6.0.1"
+version = "6.1.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8424d15f5c19a8df972fc9367d75ba3b87af63b279208d50a32e9a298d944b"
+checksum = "81b900743ecb272e8e8a760a42e069f19d158d9fd03c6ac256026407bdc91833"
dependencies = [
"bytecheck 0.6.11",
"enum-iterator",
@@ -3375,9 +3373,9 @@ dependencies = [
[[package]]
name = "wasmer-vm"
-version = "6.0.1"
+version = "6.1.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faabfffefc6fc350bb5b07301f05ba604a18c3d2d97c6354183f15792577056d"
+checksum = "40956bcf167d5bed1a940649f638e2d610e5a066863b4ab6c1ab1341fef97a9a"
dependencies = [
"backtrace",
"cc",
@@ -3394,6 +3392,7 @@ dependencies = [
"memoffset",
"more-asserts",
"region",
+ "rustversion",
"scopeguard",
"thiserror 1.0.61",
"wasmer-types",
diff --git a/crates/dprint/Cargo.toml b/crates/dprint/Cargo.toml
index 44d107d4..af733e83 100644
--- a/crates/dprint/Cargo.toml
+++ b/crates/dprint/Cargo.toml
@@ -58,8 +58,8 @@ webpki-roots = "=0.26.7"
# patch version increases of rkyv may cause panics when deserializing
# data serialized with older versions
rkyv = "=0.8.10"
-wasmer = "=6.0.1"
-wasmer-compiler = "=6.0.1"
+wasmer = "=6.1.0-rc.3"
+wasmer-compiler = "=6.1.0-rc.3"
[target.'cfg(windows)'.dependencies]
winreg = "=0.55.0"
+2 -2
View File
@@ -16,11 +16,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "duply";
version = "2.5.5";
version = "2.5.6";
src = fetchurl {
url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.5.x/duply_${finalAttrs.version}.tgz";
hash = "sha256-ABryuV5jJNoxcJLsSjODLOHuLKrSEhY3buzy1cQh+AU=";
hash = "sha256-DSSnjfbcgWIuWaA+4h7d/0HqpDoXqkJOyGapYX4rtP0=";
};
nativeBuildInputs = [ makeWrapper ];
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "dysk";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "Canop";
repo = "dysk";
rev = "v${version}";
hash = "sha256-aQbvuLcgZX+bLegGhwrlO2unOFXi2MIGHjSvdhzxhYM=";
hash = "sha256-2YqKKgNOx5+DLzIEkJTYqTAuxmKMhpCb79w7qLabvOk=";
};
cargoHash = "sha256-6/nIktM0E5MHo3Badrt0nMq5EFcK/LUS9k81Cjq7NSU=";
cargoHash = "sha256-2raAjpHh49ifZQfG2/WK94gR0lQzF/5cgmUzd69Kh3o=";
nativeBuildInputs = [
installShellFiles
+2 -2
View File
@@ -34,14 +34,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2025.8.1";
version = "2025.8.2";
pyproject = true;
src = fetchFromGitHub {
owner = "esphome";
repo = "esphome";
tag = version;
hash = "sha256-aXbsMqAq1VD3sG4M+zhFw5LyHpQTFFxKpRFRIRuJ/aU=";
hash = "sha256-UcYzGUz+H5N/jql3KgSNa24mygasAL4sOXLt9PdLYT8=";
};
patches = [
+3 -3
View File
@@ -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.
#
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "fastnetmon-advanced";
version = "2.0.371";
version = "2.0.372";
src = fetchurl {
url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb";
hash = "sha256-/qCUeo/2AYIT9Yl6QjoTBPfmg8Lk2efDU5Axv4JU+t8=";
hash = "sha256-FwYAbTBkk+AciDVxTIimswsB0M3gbzKX+03PD0fLMsY=";
};
nativeBuildInputs = [
+21 -13
View File
@@ -1,30 +1,39 @@
diff --git a/frigate/config/camera/ffmpeg.py b/frigate/config/camera/ffmpeg.py
index 04bbfac7..4390a571 100644
index 04bbfac7..396bcc4b 100644
--- a/frigate/config/camera/ffmpeg.py
+++ b/frigate/config/camera/ffmpeg.py
@@ -70,18 +70,14 @@ class FfmpegConfig(FrigateBaseModel):
@@ -1,4 +1,5 @@
from enum import Enum
+from os.path import join
from typing import Union
from pydantic import Field, field_validator
@@ -69,21 +70,11 @@ class FfmpegConfig(FrigateBaseModel):
@property
def ffmpeg_path(self) -> str:
if self.path == "default":
- if self.path == "default":
- return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg"
- elif self.path in INCLUDED_FFMPEG_VERSIONS:
- return f"/usr/lib/ffmpeg/{self.path}/bin/ffmpeg"
+ return "@ffmpeg@"
else:
return f"{self.path}/bin/ffmpeg"
- else:
- return f"{self.path}/bin/ffmpeg"
+ return join(self.path, "bin/ffmpeg")
@property
def ffprobe_path(self) -> str:
if self.path == "default":
- if self.path == "default":
- return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffprobe"
- elif self.path in INCLUDED_FFMPEG_VERSIONS:
- return f"/usr/lib/ffmpeg/{self.path}/bin/ffprobe"
+ return "@ffprobe@"
else:
return f"{self.path}/bin/ffprobe"
- else:
- return f"{self.path}/bin/ffprobe"
+ return join(self.path, "bin/ffprobe")
class CameraRoleEnum(str, Enum):
diff --git a/frigate/record/export.py b/frigate/record/export.py
index 0d3f96da..09cadbcd 100644
index 0d3f96da..463bcff4 100644
--- a/frigate/record/export.py
+++ b/frigate/record/export.py
@@ -126,7 +126,7 @@ class RecordingExporter(threading.Thread):
@@ -32,8 +41,7 @@ index 0d3f96da..09cadbcd 100644
seconds = int(diff % 60)
ffmpeg_cmd = [
- "/usr/lib/ffmpeg/7.0/bin/ffmpeg", # hardcode path for exports thumbnail due to missing libwebp support
+ "@ffmpeg@", # hardcode path for exports thumbnail due to missing libwebp support
+ FfmpegConfig.ffmpeg_path, # hardcode path for exports thumbnail due to missing libwebp support
"-hide_banner",
"-loglevel",
"warning",
~
+20 -11
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
callPackage,
replaceVars,
python312Packages,
fetchFromGitHub,
fetchurl,
@@ -27,7 +26,20 @@ let
inherit version src;
};
python = python312Packages.python;
python = python312Packages.python.override {
packageOverrides = self: super: {
joserfc = super.joserfc.overridePythonAttrs (oldAttrs: {
version = "1.1.0";
src = fetchFromGitHub {
owner = "authlib";
repo = "joserfc";
tag = version;
hash = "sha256-95xtUzzIxxvDtpHX/5uCHnTQTB8Fc08DZGUOR/SdKLs=";
};
});
};
};
python3Packages = python.pkgs;
# Tensorflow audio model
# https://github.com/blakeblackshear/frigate/blob/v0.15.0/docker/main/Dockerfile#L125
@@ -56,7 +68,7 @@ let
hash = "sha256-5Cj2vEiWR8Z9d2xBmVoLZuNRv4UOuxHSGZQWTJorXUQ=";
};
in
python312Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "frigate";
inherit version;
format = "other";
@@ -65,11 +77,7 @@ python312Packages.buildPythonApplication rec {
patches = [
./constants.patch
(replaceVars ./ffmpeg.patch {
ffmpeg = lib.getExe ffmpeg-headless;
ffprobe = lib.getExe' ffmpeg-headless "ffprobe";
})
./ffmpeg.patch
];
postPatch = ''
@@ -109,7 +117,7 @@ python312Packages.buildPythonApplication rec {
dontBuild = true;
dependencies = with python312Packages; [
dependencies = with python3Packages; [
# docker/main/requirements.txt
scikit-build
# docker/main/requirements-wheel.txt
@@ -191,7 +199,8 @@ python312Packages.buildPythonApplication rec {
runHook postInstall
'';
nativeCheckInputs = with python312Packages; [
nativeCheckInputs = with python3Packages; [
ffmpeg-headless
pytestCheckHook
];
@@ -213,7 +222,7 @@ python312Packages.buildPythonApplication rec {
passthru = {
web = frigate-web;
inherit python;
pythonPath = (python312Packages.makePythonPath dependencies) + ":${frigate}/${python.sitePackages}";
pythonPath = (python3Packages.makePythonPath dependencies) + ":${frigate}/${python.sitePackages}";
tests = {
inherit (nixosTests) frigate;
};
+5 -3
View File
@@ -15,16 +15,18 @@
buildGoModule rec {
pname = "fyne";
version = "1.26.1";
# This is the current latest version
# version "1.26.1" was a typo of "1.6.2" - maybe, don't "upgrade" to it
version = "1.6.2";
src = fetchFromGitHub {
owner = "fyne-io";
repo = "tools";
rev = "v${version}";
hash = "sha256-eBwbXyhI1s4se7krzTemoSehgSXN7mht70q8mk+yGoM=";
hash = "sha256-N5v1oytSwRHE631KQDHTulUAqs/Jlr8YJqE8wy+Ygdk=";
};
vendorHash = "sha256-7B0PCKMfLULmqzIlNFeXhOUThnWSe9+gRhpswbiwLP4=";
vendorHash = "sha256-LU3UkWHsf0Qt6w5tNIz11ubI+OIWkbtqqSlcoYJVFZU=";
nativeBuildInputs = [ pkg-config ];
+2 -2
View File
@@ -49,14 +49,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gamescope";
version = "3.16.14.2";
version = "3.16.15";
src = fetchFromGitHub {
owner = "ValveSoftware";
repo = "gamescope";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-l8SK8LQmFK0KeWxag7CX2lnME+HOvGpn4s3FqUNsK1Q=";
hash = "sha256-/JMk1ZzcVDdgvTYC+HQL09CiFDmQYWcu6/uDNgYDfdM=";
};
patches = [
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gatekeeper";
version = "3.20.0";
version = "3.20.1";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "gatekeeper";
tag = "v${version}";
hash = "sha256-7DJWqm51eRGYTES2x05D2JSJwaaHiXgH4uq31nOIXIs=";
hash = "sha256-vChpVCw2La4cgNMDFnC7thU4jSmJ4LlOLVVeURNQ1+0=";
};
vendorHash = null;
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gatus";
version = "5.19.0";
version = "5.23.2";
src = fetchFromGitHub {
owner = "TwiN";
repo = "gatus";
rev = "v${version}";
hash = "sha256-Jw7OdFGSZgxy52fICURc313ONsmI9Qlsf75aS0LUB9s=";
hash = "sha256-b/UQwwyspOKrW9mRoq0zJZ41lNLM+XvGFlpxz+9ZMco=";
};
vendorHash = "sha256-CofmAYsRp0bya+q/eFJkWV9tGfhg37UxDFR9vpCKYls=";
vendorHash = "sha256-jMNsd7AiWG8vhUW9cLs5Ha2wmdw9SHjSDXIypvCKYqk=";
subPackages = [ "." ];
+2 -2
View File
@@ -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;
};
+3 -3
View File
@@ -7,13 +7,13 @@
buildNpmPackage (finalAttrs: {
pname = "gemini-cli";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "google-gemini";
repo = "gemini-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-TcXCGI27qJOVbR8XaJzE9dYV/3uDM9HATU1OkziRib8=";
hash = "sha256-ykNgtHtH+PPCycRn9j1lc8UIEHqYj54l0MTeVz6OhsQ=";
};
patches = [
@@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: {
./restore-missing-dependencies-fields.patch
];
npmDepsHash = "sha256-0j6kXlnWg7N23cnmMialZVqyZTAzgPn0VGAqSeYIVZM=";
npmDepsHash = "sha256-gpNt581BHDA12s+3nm95UOYHjoa7Nfe46vgPwFr7ZOU=";
preConfigure = ''
mkdir -p packages/generated
@@ -1,18 +1,36 @@
From c1aef417d559237bf4d147c584449b74d6fbc1f8 Mon Sep 17 00:00:00 2001
From: ljxfstorm <ljxf.storm@live.cn>
Date: Fri, 1 Aug 2025 10:23:11 +0800
Subject: [PATCH] build(deps): restore missing `resolved` and `integrity` of
some dependencies
---
package-lock.json | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/package-lock.json b/package-lock.json
index 3938c5e32b..99590b8a9b 100644
index 74cfbfef..4131aa2b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11738,6 +11738,8 @@
@@ -58,8 +58,7 @@
"@lydell/node-pty-darwin-x64": "1.1.0",
"@lydell/node-pty-linux-x64": "1.1.0",
"@lydell/node-pty-win32-arm64": "1.1.0",
- "@lydell/node-pty-win32-x64": "1.1.0",
- "node-pty": "^1.0.0"
+ "@lydell/node-pty-win32-x64": "1.1.0"
}
},
"node_modules/@alcalzone/ansi-tokenize": {
@@ -8604,17 +8603,6 @@
"url": "https://opencollective.com/node-fetch"
}
},
- "node_modules/node-pty": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.0.0.tgz",
- "integrity": "sha512-wtBMWWS7dFZm/VgqElrTvtfMq4GzJ6+edFI0Y0zyzygUSZMgZdraDUMUhCIvkjhJjme15qWmbyJbtAx4ot4uZA==",
- "hasInstallScript": true,
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "nan": "^2.17.0"
- }
- },
"node_modules/normalize-package-data": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
@@ -12535,6 +12523,8 @@
},
"packages/cli/node_modules/@testing-library/dom": {
"version": "10.4.0",
@@ -21,7 +39,7 @@ index 3938c5e32b..99590b8a9b 100644
"dev": true,
"license": "MIT",
"peer": true,
@@ -11773,6 +11775,8 @@
@@ -12570,6 +12560,8 @@
},
"packages/cli/node_modules/@testing-library/react": {
"version": "16.3.0",
@@ -30,7 +48,7 @@ index 3938c5e32b..99590b8a9b 100644
"dev": true,
"license": "MIT",
"dependencies": {
@@ -11824,6 +11828,8 @@
@@ -12621,6 +12613,8 @@
},
"packages/cli/node_modules/aria-query": {
"version": "5.3.0",
@@ -39,7 +57,7 @@ index 3938c5e32b..99590b8a9b 100644
"dev": true,
"license": "Apache-2.0",
"peer": true,
@@ -11833,6 +11839,8 @@
@@ -12630,6 +12624,8 @@
},
"packages/cli/node_modules/emoji-regex": {
"version": "10.4.0",
@@ -48,7 +66,7 @@ index 3938c5e32b..99590b8a9b 100644
"license": "MIT"
},
"packages/cli/node_modules/react-is": {
@@ -11845,6 +11853,8 @@
@@ -12642,6 +12638,8 @@
},
"packages/cli/node_modules/string-width": {
"version": "7.2.0",
@@ -57,7 +75,17 @@ index 3938c5e32b..99590b8a9b 100644
"license": "MIT",
"dependencies": {
"emoji-regex": "^10.3.0",
@@ -11942,6 +11952,8 @@
@@ -12715,8 +12713,7 @@
"@lydell/node-pty-darwin-x64": "1.1.0",
"@lydell/node-pty-linux-x64": "1.1.0",
"@lydell/node-pty-win32-arm64": "1.1.0",
- "@lydell/node-pty-win32-x64": "1.1.0",
- "node-pty": "^1.0.0"
+ "@lydell/node-pty-win32-x64": "1.1.0"
}
},
"packages/core/node_modules/ajv": {
@@ -12751,6 +12748,8 @@
},
"packages/core/node_modules/ignore": {
"version": "7.0.5",
@@ -66,4 +94,16 @@ index 3938c5e32b..99590b8a9b 100644
"license": "MIT",
"engines": {
"node": ">= 4"
diff --git a/package.json b/package.json
index aba2aa98..57c79274 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,6 @@
"@lydell/node-pty-darwin-x64": "1.1.0",
"@lydell/node-pty-linux-x64": "1.1.0",
"@lydell/node-pty-win32-arm64": "1.1.0",
- "@lydell/node-pty-win32-x64": "1.1.0",
- "node-pty": "^1.0.0"
+ "@lydell/node-pty-win32-x64": "1.1.0"
}
}
+3 -3
View File
@@ -9,16 +9,16 @@
}:
buildGoModule (finalAttrs: {
pname = "gh-classroom";
version = "0.1.14";
version = "0.1.15";
src = fetchFromGitHub {
owner = "github";
repo = "gh-classroom";
tag = "v${finalAttrs.version}";
hash = "sha256-h9j8B/MGZ4JJOJRj41IIQ9trQJZ4oqvT6ee9lc0P4oo=";
hash = "sha256-s7S7rk5I0mdXZh4pz1aF0btntuse3mpSZe/JiS/KlkU=";
};
vendorHash = "sha256-UFV3KiRnefrdOwRsHQeo8mx8Z+sI1Rk5yu3jdZxUHxo=";
vendorHash = "sha256-7P1TTv6EW351EbLT+oruztE5Zs9I01uRnel+OGUdV6M=";
ldflags = [
"-s"
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "ghorg";
version = "1.11.3";
version = "1.11.4";
src = fetchFromGitHub {
owner = "gabrie30";
repo = "ghorg";
rev = "v${version}";
sha256 = "sha256-SddkIZCnV6qPFFuFvV8I9P00C6oSKV32Xs6beAYvgs8=";
sha256 = "sha256-uhcQT/IgQZ36FMXtLWiSmXJj0BvN8NbpYhO+JslVf6Y=";
};
doCheck = false;
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "git-lfs";
version = "3.6.1";
version = "3.7.0";
src = fetchFromGitHub {
owner = "git-lfs";
repo = "git-lfs";
tag = "v${version}";
hash = "sha256-zZ9VYWVV+8G3gojj1m74syvsYM1mX0YT4hKnpkdMAQk=";
hash = "sha256-EFuuyD83aYe6XMKbRfAykVMfGFOQ4I6ORvMRm0Q8vfM=";
};
vendorHash = "sha256-JT0r/hs7ZRtsYh4aXy+v8BjwiLvRJ10e4yRirqmWVW0=";
vendorHash = "sha256-6H0KpLin+DqwEg5bdzaxj2CoNSneZ/ET43MTrrdF3h8=";
nativeBuildInputs = [
asciidoctor
+2 -2
View File
@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "git-toolbelt";
version = "1.9.3";
version = "1.9.4";
src = fetchFromGitHub {
owner = "nvie";
repo = "git-toolbelt";
rev = "v${finalAttrs.version}";
hash = "sha256-ANqv/iIDUyy2G4pKSw+2sutMEA0WhPN3OKfPTm5lwDU=";
hash = "sha256-6ubxMGDi5ocSh8q8rDujxpViT1OmVi7JzH+R6V/88UQ=";
};
nativeBuildInputs = [ makeWrapper ];
+4 -3
View File
@@ -13,13 +13,13 @@
buildGoModule (finalAttrs: {
pname = "glab";
version = "1.65.0";
version = "1.67.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-LqcUrF1CkNshsZBl9PdYByQKzMr5lWw5+BwCXs+yml0=";
hash = "sha256-d0pElHlfElqnlXbbAaIGzLtWpuAdIOVfdmTD6+2nNX4=";
leaveDotGit = true;
postFetch = ''
cd "$out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
'';
};
vendorHash = "sha256-2lC55LaMOrDy8F+IOqB4aujYlKKgpJmhZw6kl2yN/GM=";
vendorHash = "sha256-/nFdlC1gg08vEGuiq9qoUar8EGuYddxvTvFuGxQKnYA=";
ldflags = [
"-s"
@@ -85,6 +85,7 @@ buildGoModule (finalAttrs: {
maintainers = with lib.maintainers; [
freezeboy
luftmensch-luftmensch
anthonyroussel
];
mainProgram = "glab";
};
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "go-mockery";
version = "3.5.3";
version = "3.5.4";
src = fetchFromGitHub {
owner = "vektra";
repo = "mockery";
tag = "v${finalAttrs.version}";
hash = "sha256-SKENyw4kZ+qZ3GV+BdDhwtb8AUs4Mc2ix1YWIgV6ZIg=";
hash = "sha256-G2ROYZlIsl8sVpA41EYUxbNImxxC5vxj5SQZJB9BF/E=";
};
proxyVendor = true;
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
description = "Spritely Goblins for Guile";
homepage = "https://spritely.institute/goblins/";
license = licenses.asl20;
maintainers = with maintainers; [ offsetcyan ];
maintainers = with maintainers; [ ];
platforms = guile.meta.platforms;
};
}
+5 -2
View File
@@ -70,6 +70,9 @@ python3Packages.buildPythonApplication rec {
substituteInPlace src/hhd/plugins/plugin.py \
--replace-fail '"id"' '"${lib.getExe' coreutils "id"}"'
substituteInPlace usr/lib/udev/rules.d/83-hhd.rules \
--replace-fail '/bin/chmod' '${lib.getExe' coreutils "chmod"}'
'';
build-system = with python3Packages; [
@@ -89,8 +92,8 @@ python3Packages.buildPythonApplication rec {
doCheck = false;
postInstall = ''
install -Dm644 $src/usr/lib/udev/rules.d/83-hhd.rules -t $out/lib/udev/rules.d/
install -Dm644 $src/usr/lib/udev/hwdb.d/83-hhd.hwdb -t $out/lib/udev/hwdb.d/
install -Dm644 usr/lib/udev/rules.d/83-hhd.rules -t $out/lib/udev/rules.d/
install -Dm644 usr/lib/udev/hwdb.d/83-hhd.hwdb -t $out/lib/udev/hwdb.d/
'';
meta = {
+6 -6
View File
@@ -7,14 +7,14 @@
vulkan-loader,
}:
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hayabusa";
version = "unstable-2023-11-29";
version = "0.3.9";
src = fetchFromGitHub {
owner = "notarin";
repo = "hayabusa";
rev = "1d6b8cfd301d60ff9f6946970b51818c036083b0";
tag = "v${finalAttrs.version}";
hash = "sha256-w9vXC7L7IP4QLPFS1IgPOKSm7fT7W0R+NsHTdAfIupg=";
};
@@ -43,9 +43,9 @@ rustPlatform.buildRustPackage {
meta = {
description = "Swift rust fetch program";
homepage = "https://github.com/notarin/hayabusa";
license = lib.licenses.cc-by-nc-nd-40;
maintainers = with lib.maintainers; [ ];
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ Notarin ];
mainProgram = "hayabusa";
platforms = lib.platforms.linux;
};
}
})
+4 -4
View File
@@ -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
];
};
}
})
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hermit";
version = "0.44.12";
version = "0.45.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "cashapp";
repo = "hermit";
hash = "sha256-duIIZsLTeHqL0ipK8lFYgK+2talXMaazMWIWrl6I1WQ=";
hash = "sha256-Dk+m/23d5CMwjOXoD3mDs5fB7KgWfmX6BjrS3h/HB7w=";
};
vendorHash = "sha256-DT7Jv5VkqHPqJgi1n4wEa3z59il1mdp8JKjFs26fC2A=";
vendorHash = "sha256-bko9N3dbxe4K98BdG78lYYipAgAtGntrEAgoLeOY1NM=";
subPackages = [ "cmd/hermit" ];
+3
View File
@@ -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";
+3 -3
View File
@@ -1,7 +1,7 @@
import ./generic.nix {
hash = "sha256-HhgAZ/MDNX6v1tBLv4sMHfFQMPoYkTaaWM8aLkl31Mg=";
version = "6.15.0";
vendorHash = "sha256-pCpOHFWyacJ3K1EyK2Pkezv0Ooj+sFQ3ZmtBmhZJYNE=";
hash = "sha256-Nnig3i21AurzstrIcx+Jca8fMZtNAGbSrB4E8JhatVE=";
version = "6.16.0";
vendorHash = "sha256-l8cu+Q6Tpco48iuooVDegk7Fkw9yW1SNfyWQXhcFo4c=";
patches = [ ];
nixUpdateExtraArgs = [
"--override-filename=pkgs/by-name/in/incus/package.nix"
+3 -3
View File
@@ -48,7 +48,7 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "ipxe";
version = "1.21.1-unstable-2025-08-13";
version = "1.21.1-unstable-2025-08-29";
nativeBuildInputs = [
mtools
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ipxe";
repo = "ipxe";
rev = "a53ec449327788e2015642bff21443d3a399c05b";
hash = "sha256-rcRWkuOgtHs6ZzcECbsVXCN+HS5cG/HlrVPP5+ZF+EM=";
rev = "969ce2c559a6841a949a1b73a3967b1889e0c999";
hash = "sha256-a9Nmo9ZAzbsePwS/LFh3qMMfsezu0194WV98BXhiT0Y=";
};
# Calling syslinux on a FAT image isn't going to work on Aarch64.
+3 -3
View File
@@ -17,16 +17,16 @@
rustPlatform.buildRustPackage rec {
pname = "jay";
version = "1.11.0";
version = "1.11.1";
src = fetchFromGitHub {
owner = "mahkoh";
repo = "jay";
rev = "v${version}";
sha256 = "sha256-lVdNilNMeVN27VaDufWiNVme0apnX+w0x9JeHkDzFH4=";
sha256 = "sha256-mm2bXxl9TaKwmeCwFz3IKznqjsfY8RKEVU/RK4zd63U=";
};
cargoHash = "sha256-5j4ECjBCMSCmGfFUQ72nwER/vTvCiDl6f2CyNF3n1ek=";
cargoHash = "sha256-T7053eAH3IqkAxNZpYHdC6Z7JZtArrOqGMjoIccjemI=";
SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib";
+3 -3
View File
@@ -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}" ];
+2 -2
View File
@@ -41,13 +41,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "koboldcpp";
version = "1.98";
version = "1.98.1";
src = fetchFromGitHub {
owner = "LostRuins";
repo = "koboldcpp";
tag = "v${finalAttrs.version}";
hash = "sha256-5VP7NfHc00TdTqr5wel1vrtOnJWDGZT44tKDEm/f2iw=";
hash = "sha256-CJM97DRSIq2d3X6aR096+9QwBeI4kQNzxufdSoEydco=";
};
enableParallelBuilding = true;
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "controller-tools";
version = "0.18.0";
version = "0.19.0";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "controller-tools";
tag = "v${version}";
sha256 = "sha256-zrh6GWFivs1fqkvaN6MSiYoCuPbiTQ6mJz4d69Wb7lo=";
sha256 = "sha256-NPyX89Hr1MAUdMafEEvcf/geQD1PxkDFSRPCFZBh29g=";
};
vendorHash = "sha256-criu2UyNkGaVQnIxrjzIU4D389DbCcjG/kn3kfoD5yE=";
vendorHash = "sha256-97FtwBaN8rMTsz9XbTEB1PSC454N2SLSWyOzXSWld9Y=";
ldflags = [
"-s"
+3 -3
View File
@@ -9,18 +9,18 @@
buildGoModule rec {
pname = "kubescape";
version = "3.0.38";
version = "3.0.39";
src = fetchFromGitHub {
owner = "kubescape";
repo = "kubescape";
tag = "v${version}";
hash = "sha256-G6oz72/q7EAjkBeUzeoHTMcKqRjLtTy+ZUnVFCXGjRE=";
hash = "sha256-yKbOzwvg8VtSVLZTJC7AUzUVRDbj7c+sjCt+C3x8VSI=";
fetchSubmodules = true;
};
proxyVendor = true;
vendorHash = "sha256-cvYjkf2TOi327MjcUvjyME5JRTJzxF4J0HssfiH9P7E=";
vendorHash = "sha256-oFY31Cd0fXkmDpRwF8NI2VZVmWRDZ53uwsT2aUfGyjM=";
subPackages = [ "." ];
+3 -3
View File
@@ -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 = ''
+11 -18
View File
@@ -1,8 +1,10 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
fetchpatch,
autoreconfHook,
gtk-doc,
glib,
intltool,
menu-cache,
@@ -21,25 +23,21 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = if extraOnly then "libfm-extra" else "libfm";
version = "1.3.2";
version = "1.4.0";
src = fetchurl {
url = "mirror://sourceforge/pcmanfm/libfm-${finalAttrs.version}.tar.xz";
sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU=";
src = fetchFromGitHub {
owner = "lxde";
repo = "libfm";
tag = finalAttrs.version;
hash = "sha256-dmu5ygPuZe2YWAzIVPx5zskQeB51hXcLbMczxWgCr78=";
};
patches = [
# Add casts to fix -Werror=incompatible-pointer-types
(fetchpatch {
url = "https://github.com/lxde/libfm/commit/fbcd183335729fa3e8dd6a837c13a23ff3271000.patch";
hash = "sha256-RbX8jkP/5ao6NWEnv8Pgy4zwZaiDsslGlRRWdoV3enA=";
})
];
nativeBuildInputs = [
autoreconfHook
vala
pkg-config
intltool
gtk-doc
];
buildInputs = [
glib
@@ -56,11 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];
postPatch = ''
# Ensure the files are re-generated from Vala sources.
rm src/actions/*.c
'';
# libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm
postInstall = optionalString (!extraOnly) ''
rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc
+8 -7
View File
@@ -3,22 +3,20 @@
lib,
fetchgit,
cmake,
pkg-config,
}:
stdenv.mkDerivation {
pname = "libnl-tiny";
version = "unstable-2023-12-05";
version = "0-unstable-2025-03-19";
src = fetchgit {
url = "https://git.openwrt.org/project/libnl-tiny.git";
rev = "965c4bf49658342ced0bd6e7cb069571b4a1ddff";
hash = "sha256-kegTV7FXMERW7vjRZo/Xp4cbSBZmynBgge2lK71Fx94=";
rev = "c0df580adbd4d555ecc1962dbe88e91d75b67a4e";
hash = "sha256-j5oIEbWqVWd7rNpCMm9+WZwud43uTGeHG81lmzQOoeY=";
};
nativeBuildInputs = [
cmake
pkg-config
];
preConfigure = ''
@@ -30,8 +28,11 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Tiny OpenWrt fork of libnl";
homepage = "https://git.openwrt.org/?p=project/libnl-tiny.git;a=summary";
license = licenses.isc;
maintainers = with maintainers; [ mkg20001 ];
license = licenses.gpl2Only;
maintainers = with maintainers; [
mkg20001
dvn0
];
platforms = platforms.linux;
};
}
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "libretro-shaders-slang";
version = "0-unstable-2025-08-14";
version = "0-unstable-2025-08-26";
src = fetchFromGitHub {
owner = "libretro";
repo = "slang-shaders";
rev = "69e3dbb8947e749156ff1f70e32c88f3c37e6793";
hash = "sha256-C+qO/B3Lb8vtQUV3u6ZqiVZlg2prytR+9IbTnvyQGMg=";
rev = "c9303dcc4d11fe5d37db9ef9a24c8eab4087c0c3";
hash = "sha256-k/th5Ze/x48mTFZxEsSWCE4STnMSFXl3I0uMVmdMSxc=";
};
dontConfigure = true;

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