Merge master into staging-next

Changed files
+3198 -783
maintainers
nixos
modules
services
pkgs
applications
video
by-name
al
alist
bi
br
ch
choparp
ci
circom
circt
es
eslint_d
go
google-chrome
goxlr-utility
gq
gqlgenc
gu
guymager
im
in
li
libguytools
ma
macmon
me
mi
mp
ob
obsidian
oc
ocrfeeder
oi
oils-for-unix
on
onioncircuits
pf
pflask
ph
re
redlib
ri
sc
screenly-cli
sk
skypeforlinux
sy
syshud
tr
trimage
trinity
ty
typos
un
unyaffs
yu
yutto
zi
development
python-modules
ailment
angr
archinfo
bids-validator
bidsschematools
biliass
claripy
cle
dulwich
jsonargparse
lacuscore
meep
miasm
mypy-boto3
nlpo3
playwrightcapture
pybids
pyvex
templateflow
websockets
tools
analysis
checkov
build-managers
bazel
bazel_7
games
mindustry
os-specific
linux
hpuefi-mod
zfs
servers
invidious
monitoring
grafana
tools
inputmethods
top-level
+31 -6
maintainers/maintainer-list.nix
···
githubId = 69784758;
matrix = "@clot27:matrix.org";
};
+
cloudripper = {
+
email = "other.wing8806@fastmail.com";
+
github = "cloudripper";
+
githubId = 70971768;
+
name = "cloudripper";
+
};
clr-cera = {
email = "clrcera05@gmail.com";
github = "clr-cera";
···
email = "declan.fraser.rixon@gmail.com";
github = "DeclanRixon";
githubId = 57464835;
+
};
+
deeengan = {
+
github = "deeengan";
+
githubId = 87693324;
+
name = "Dee Engan";
+
keys = [ { fingerprint = "9C24 79F5 F0CE 48F4 00EE 4A5B B8ED 46EB 468B F72D"; } ];
};
deejayem = {
email = "nixpkgs.bu5hq@simplelogin.com";
···
github = "krzaczek";
githubId = 5773701;
+
KSJ2000 = {
+
email = "katsho123@outlook.com";
+
name = "KSJ2000";
+
github = "KSJ2000";
+
githubId = 184105270;
+
};
ktf = {
email = "giulio.eulisse@cern.ch";
github = "ktf";
···
githubId = 5378535;
name = "Milo Gertjejansen";
-
milran = {
-
email = "milranmike@protonmail.com";
-
github = "wattmto";
-
githubId = 93639059;
-
name = "Milran Mike";
-
};
mimame = {
email = "miguel.madrid.mencia@gmail.com";
github = "mimame";
···
githubId = 5104601;
name = "schnusch";
+
schrobingus = {
+
email = "brent.monning.jr@gmail.com";
+
name = "Brent Monning";
+
github = "schrobingus";
+
githubId = 72168352;
+
matrix = "@schrobingus:matrix.org";
+
};
Schweber = {
github = "Schweber";
githubId = 64630479;
···
name = "Varun Narravula";
github = "water-sucks";
githubId = 68445574;
+
};
+
wattmto = {
+
email = "dev@wattmto.dev";
+
github = "wattmto";
+
githubId = 93639059;
+
name = "wattmto";
waynr = {
name = "Wayne Warren";
+1 -1
nixos/modules/services/mail/protonmail-bridge.nix
···
type = lib.types.listOf lib.types.path;
default = [ ];
example = lib.literalExpression "with pkgs; [ pass gnome-keyring ]";
-
description = "List of derivations to put in protonmail-bride's path.";
+
description = "List of derivations to put in protonmail-bridge's path.";
};
logLevel = lib.mkOption {
+14 -12
pkgs/applications/graphics/trimage/default.nix pkgs/by-name/tr/trimage/package.nix
···
-
{ lib
-
, stdenv
-
, fetchFromGitHub
+
{
+
lib,
+
stdenv,
+
fetchFromGitHub,
-
, python3
-
, installShellFiles
-
, makeWrapper
-
, wrapQtAppsHook
+
python3,
+
installShellFiles,
+
makeWrapper,
+
qt5,
-
, advancecomp
-
, jpegoptim
-
, optipng
-
, pngcrush
+
advancecomp,
+
jpegoptim,
+
optipng,
+
pngcrush,
}:
let
pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]);
+
binPath = lib.makeBinPath [
advancecomp
jpegoptim
···
nativeBuildInputs = [
installShellFiles
makeWrapper
-
wrapQtAppsHook
+
qt5.wrapQtAppsHook
];
dontWrapQtApps = true;
+1 -3
pkgs/applications/video/gpac/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, Carbon, zlib }:
+
{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, zlib }:
stdenv.mkDerivation rec {
pname = "gpac";
···
buildInputs = [
zlib
-
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-
Carbon
];
enableParallelBuilding = true;
+109
pkgs/by-name/al/alist/package.nix
···
+
{
+
lib,
+
buildGoModule,
+
fetchFromGitHub,
+
fetchurl,
+
fuse,
+
stdenv,
+
installShellFiles,
+
versionCheckHook,
+
}:
+
buildGoModule rec {
+
pname = "alist";
+
version = "3.38.0";
+
+
src = fetchFromGitHub {
+
owner = "AlistGo";
+
repo = "alist";
+
rev = "refs/tags/v${version}";
+
hash = "sha256-HF5T/TZXiyT186qZyzz+m0K9ajF1wk8YAZljcq5ccWM=";
+
# 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;
+
postFetch = ''
+
cd "$out"
+
git rev-parse HEAD > $out/COMMIT
+
# '0000-00-00T00:00:00Z'
+
date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH
+
find "$out" -name .git -print0 | xargs -0 rm -rf
+
'';
+
};
+
web = fetchurl {
+
url = "https://github.com/AlistGo/alist-web/releases/download/${version}/dist.tar.gz";
+
hash = "sha256-jHbWhjvHfgtdocuuELbOwrMzL8tOQfBVdH9MxasEwGo=";
+
};
+
+
proxyVendor = true;
+
vendorHash = "sha256-Q5E86bNedXOqMKS3WrXicWg27vnjyGao0nE34Ws2l9E=";
+
+
buildInputs = [ fuse ];
+
+
tags = [ "jsoniter" ];
+
+
ldflags = [
+
"-s"
+
"-w"
+
"-X \"github.com/alist-org/alist/v3/internal/conf.GitAuthor=Xhofe <i@nn.ci>\""
+
"-X github.com/alist-org/alist/v3/internal/conf.Version=${version}"
+
"-X github.com/alist-org/alist/v3/internal/conf.WebVersion=${version}"
+
];
+
+
preConfigure = ''
+
# use matched web files
+
rm -rf public/dist
+
tar -xzf ${web}
+
mv -f dist public
+
'';
+
+
preBuild = ''
+
ldflags+=" -X \"github.com/alist-org/alist/v3/internal/conf.GoVersion=$(go version | sed 's/go version //')\""
+
ldflags+=" -X \"github.com/alist-org/alist/v3/internal/conf.BuiltAt=$(cat SOURCE_DATE_EPOCH)\""
+
ldflags+=" -X github.com/alist-org/alist/v3/internal/conf.GitCommit=$(cat COMMIT)"
+
'';
+
+
checkFlags =
+
let
+
# Skip tests that require network access
+
skippedTests = [
+
"TestHTTPAll"
+
"TestWebsocketAll"
+
"TestWebsocketCaller"
+
];
+
in
+
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+
nativeBuildInputs = [ installShellFiles ];
+
+
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+
installShellCompletion --cmd alist \
+
--bash <($out/bin/alist completion bash) \
+
--fish <($out/bin/alist completion fish) \
+
--zsh <($out/bin/alist completion zsh)
+
'';
+
+
doInstallCheck = true;
+
+
versionCheckProgramArg = "version";
+
+
nativeInstallCheckInputs = [
+
versionCheckHook
+
];
+
+
meta = {
+
description = "File list/WebDAV program that supports multiple storages";
+
homepage = "https://github.com/alist-org/alist";
+
changelog = "https://github.com/alist-org/alist/releases/tag/v${version}";
+
license = with lib.licenses; [
+
agpl3Only
+
# alist-web
+
mit
+
];
+
maintainers = with lib.maintainers; [ moraxyc ];
+
sourceProvenance = with lib.sourceTypes; [
+
fromSource
+
# alist-web
+
binaryBytecode
+
];
+
mainProgram = "alist";
+
};
+
}
+13
pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch
···
+
diff --git a/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts b/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts
+
index e2428d9d12..de4e9e1e62 100644
+
--- a/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts
+
+++ b/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts
+
@@ -109,7 +109,7 @@ export default class BiometricUnixMain implements OsBiometricService {
+
// The user needs to manually set up the polkit policy outside of the sandbox
+
// since we allow access to polkit via dbus for the sandboxed clients, the authentication works from
+
// the sandbox, once the policy is set up outside of the sandbox.
+
- return isLinux() && !isSnapStore() && !isFlatpak();
+
+ return false;
+
}
+
+
async osBiometricsSetup(): Promise<void> {
+11
pkgs/by-name/bi/bitwarden-desktop/package.nix
···
patches = [
./electron-builder-package-lock.patch
+
./dont-auto-setup-biometrics.patch
+
./set-exe-path.patch # ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron
];
postPatch = ''
# remove code under unfree license
rm -r bitwarden_license
+
+
substituteInPlace apps/desktop/src/main.ts --replace-fail '%%exePath%%' "$out/bin/bitwarden"
'';
nodejs = nodejs_20;
···
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--set-default ELECTRON_IS_DEV 0 \
--inherit-argv0
+
+
# Extract the polkit policy file from the multiline string in the source code.
+
# This may break in the future but its better than copy-pasting it manually.
+
mkdir -p $out/share/polkit-1/actions/
+
pushd apps/desktop/src/platform/main/biometric
+
awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' biometric.unix.main.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy
+
popd
pushd apps/desktop/resources/icons
for icon in *.png; do
+13
pkgs/by-name/bi/bitwarden-desktop/set-exe-path.patch
···
+
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
+
index 86d07440a7..be9fa6b4ab 100644
+
--- a/apps/desktop/src/main.ts
+
+++ b/apps/desktop/src/main.ts
+
@@ -80,6 +80,8 @@ export class Main {
+
appDataPath = path.join(process.env.SNAP_USER_DATA, "appdata");
+
}
+
+
+ app.setPath("exe", "%%exePath%%");
+
+
+
app.on("ready", () => {
+
// on ready stuff...
+
});
+74 -47
pkgs/by-name/br/brave/make-brave.nix
···
xorg,
zlib,
+
# Darwin dependencies
+
unzip,
+
makeWrapper,
+
# command line arguments which are always set e.g "--disable-gpu"
commandLineArgs ? "",
···
version,
hash,
url,
-
platform,
}:
let
···
dontConfigure = true;
dontBuild = true;
dontPatchELF = true;
-
doInstallCheck = true;
+
doInstallCheck = stdenv.hostPlatform.isLinux;
-
nativeBuildInputs = [
-
dpkg
-
# override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
-
# Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
-
(buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
-
];
+
nativeBuildInputs =
+
lib.optionals stdenv.hostPlatform.isLinux [
+
dpkg
+
# override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
+
# Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
+
(buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
+
]
+
++ lib.optionals stdenv.hostPlatform.isDarwin [
+
unzip
+
makeWrapper
+
];
-
buildInputs = [
+
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
# needed for GSETTINGS_SCHEMAS_PATH
glib
gsettings-desktop-schemas
···
adwaita-icon-theme
];
-
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
+
unpackPhase =
+
if stdenv.hostPlatform.isLinux then
+
"dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"
+
else
+
"unzip $src";
-
installPhase = ''
-
runHook preInstall
+
installPhase =
+
lib.optionalString stdenv.hostPlatform.isLinux ''
+
runHook preInstall
+
+
mkdir -p $out $out/bin
-
mkdir -p $out $out/bin
+
cp -R usr/share $out
+
cp -R opt/ $out/opt
-
cp -R usr/share $out
-
cp -R opt/ $out/opt
+
export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser
-
export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser
+
# Fix path to bash in $BINARYWRAPPER
+
substituteInPlace $BINARYWRAPPER \
+
--replace /bin/bash ${stdenv.shell}
+
+
ln -sf $BINARYWRAPPER $out/bin/brave
+
+
for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do
+
patchelf \
+
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+
--set-rpath "${rpath}" $exe
+
done
+
+
# Fix paths
+
substituteInPlace $out/share/applications/brave-browser.desktop \
+
--replace /usr/bin/brave-browser-stable $out/bin/brave
+
substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \
+
--replace /opt/brave.com $out/opt/brave.com
+
substituteInPlace $out/share/menu/brave-browser.menu \
+
--replace /opt/brave.com $out/opt/brave.com
+
substituteInPlace $out/opt/brave.com/brave/default-app-block \
+
--replace /opt/brave.com $out/opt/brave.com
-
# Fix path to bash in $BINARYWRAPPER
-
substituteInPlace $BINARYWRAPPER \
-
--replace /bin/bash ${stdenv.shell}
+
# Correct icons location
+
icon_sizes=("16" "24" "32" "48" "64" "128" "256")
-
ln -sf $BINARYWRAPPER $out/bin/brave
+
for icon in ''${icon_sizes[*]}
+
do
+
mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps
+
ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png
+
done
-
for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do
-
patchelf \
-
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-
--set-rpath "${rpath}" $exe
-
done
+
# Replace xdg-settings and xdg-mime
+
ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
+
ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
-
# Fix paths
-
substituteInPlace $out/share/applications/brave-browser.desktop \
-
--replace /usr/bin/brave-browser-stable $out/bin/brave
-
substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \
-
--replace /opt/brave.com $out/opt/brave.com
-
substituteInPlace $out/share/menu/brave-browser.menu \
-
--replace /opt/brave.com $out/opt/brave.com
-
substituteInPlace $out/opt/brave.com/brave/default-app-block \
-
--replace /opt/brave.com $out/opt/brave.com
+
runHook postInstall
+
''
+
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
+
runHook preInstall
-
# Correct icons location
-
icon_sizes=("16" "24" "32" "48" "64" "128" "256")
+
mkdir -p $out/{Applications,bin}
-
for icon in ''${icon_sizes[*]}
-
do
-
mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps
-
ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png
-
done
+
cp -r "Brave Browser.app" $out/Applications/
-
# Replace xdg-settings and xdg-mime
-
ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
-
ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
+
makeWrapper "$out/Applications/Brave Browser.app/Contents/MacOS/Brave Browser" $out/bin/brave
-
runHook postInstall
-
'';
+
runHook postInstall
+
'';
-
preFixup = ''
+
preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
# Add command line args to wrapGApp.
gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : ${rpath}
···
jefflabonte
nasirhm
buckley310
+
matteopacini
];
platforms = [
"aarch64-linux"
"x86_64-linux"
+
"aarch64-darwin"
+
"x86_64-darwin"
];
mainProgram = "brave";
};
+8 -1
pkgs/by-name/br/brave/package.nix
···
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-fJczTAra+j8+veicz4lIyKSNJyxJK4q9gpZoAyQwkxQ=";
};
+
aarch64-darwin = {
+
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
+
hash = "sha256-kDiZ6NKQ+v1jBEUexItKTCKFsbnOtSzPmGEVWI5JoXI=";
+
};
+
x86_64-darwin = {
+
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
+
hash = "sha256-/yl4k/XvmL7oBW1XU4wVNHfa07Z+XMHYTkkufhDCXUc=";
+
};
};
archive =
···
archive
// {
inherit pname version;
-
platform = stdenv.system;
}
)
+12 -9
pkgs/by-name/br/brave/update.sh
···
latestVersion="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/brave/brave-browser/releases/latest" | jq -r '.tag_name' | sed 's/^v//')"
-
hashAarch64="$(nix hash to-sri --type sha256 \
-
$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \
-
| sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1)
-
)"
-
-
hashAmd64="$(nix hash to-sri --type sha256 \
-
$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \
-
| sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1)
-
)"
+
hashAarch64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_arm64.deb")")"
+
hashAmd64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_amd64.deb")")"
+
hashAarch64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-arm64.zip")")"
+
hashAmd64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-x64.zip")")"
cat > $SCRIPT_DIR/package.nix << EOF
# Expression generated by update.sh; do not edit it by hand!
···
x86_64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb";
hash = "${hashAmd64}";
+
};
+
aarch64-darwin = {
+
url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-arm64.zip";
+
hash = "${hashAarch64Darwin}";
+
};
+
x86_64-darwin = {
+
url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-x64.zip";
+
hash = "${hashAmd64Darwin}";
};
};
+45
pkgs/by-name/ch/choparp/package.nix
···
+
{
+
stdenv,
+
lib,
+
fetchFromGitHub,
+
unstableGitUpdater,
+
libpcap,
+
installShellFiles,
+
}:
+
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "choparp";
+
version = "0-unstable-2021-04-23";
+
+
src = fetchFromGitHub {
+
owner = "quinot";
+
repo = "choparp";
+
rev = "e9f0b81135d81cb0416504a7e695e158f4a5285e";
+
hash = "sha256-0VZj7Hkn/aiRddWdBzDAXdOdxJZvwd+KaN9ddrrBjm8=";
+
};
+
+
nativeBuildInputs = [
+
installShellFiles
+
];
+
+
buildPhase = ''
+
runHook preBuild
+
+
mkdir -p $out/bin
+
$CC -o $out/bin/choparp src/choparp.c -lpcap -L${lib.getLib libpcap}/lib -I${lib.getDev libpcap}/include
+
installManPage src/choparp.8
+
+
runHook postBuild
+
'';
+
+
passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
+
+
meta = {
+
homepage = "https://github.com/quinot/choparp";
+
description = "Proxy ARP daemon";
+
maintainers = with lib.maintainers; [ bot-wxt1221 ];
+
platforms = lib.platforms.unix;
+
license = lib.licenses.bsd3;
+
mainProgram = "choparp";
+
};
+
})
+1 -1
pkgs/by-name/ci/circom/package.nix
···
owner = "iden3";
repo = "circom";
rev = "v${version}";
-
hash = "sha256-OxfqbsxSIy0tLDMfDmdCZeMb2LCSG7I+Vm9RHb7tXFc=";
+
hash = "sha256-jaBtBFvGRTRImXQNM+FXr23XQqC5V7hRa9SZAgB/K4c=";
};
cargoHash = "sha256-KmUTlzRRmtD9vKJmh0MSUQxN8gz4qnp9fLs5Z0Lmypw=";
+8 -6
pkgs/by-name/ci/circt/package.nix
···
# Disable some tests on x86_64-darwin
++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
# These test seem to pass on hydra (rosetta) but not on x86_64-darwin machines
-
"CIRCT :: Target/ExportSMTLIB/attributes.mlir"
-
"CIRCT :: Target/ExportSMTLIB/basic.mlir"
-
"CIRCT :: circt-bmc/comb-errors.mlir"
-
"CIRCT :: circt-bmc/seq-errors.mlir"
-
# This test was having issues with rosetta
-
"CIRCT :: Dialect/SMT/basic.mlir"
+
"CIRCT :: Target/ExportSMTLIB/.*\.mlir"
+
"CIRCT :: circt-bmc/.*\.mlir"
+
# These tests were having issues on rosetta
+
"CIRCT :: Dialect/.*/Reduction/.*\.mlir"
+
"CIRCT :: Dialect/SMT/.*\.mlir"
+
"CIRCT :: circt-as-dis/.*\.mlir"
+
"CIRCT :: circt-reduce/.*\.mlir"
+
"CIRCT :: circt-test/basic.mlir"
];
in
if lit-filters != [ ] then lib.strings.concatStringsSep "|" lit-filters else null;
+3 -3
pkgs/by-name/es/eslint_d/package.nix
···
buildNpmPackage rec {
pname = "eslint_d";
-
version = "14.1.1";
+
version = "14.2.2";
src = fetchFromGitHub {
owner = "mantoni";
repo = "eslint_d.js";
rev = "v${version}";
-
hash = "sha256-r+AQFFzB3PhvER6oVHpqQiFuaHuT+2O8gL2zu8aCTbs=";
+
hash = "sha256-7VsbGudZlfrjU+x3a9OWxu9qDCiDUq8xez85qNj08xY=";
};
-
npmDepsHash = "sha256-XOFRzGPrisXE8GyqVO5xms+o9OwA9w0y+uJkcdyX+z0=";
+
npmDepsHash = "sha256-u8kmHQ7UfCR446d+HbkGlK76Aki+KrOtBO6/a/VXoTg=";
dontNpmBuild = true;
+5 -5
pkgs/by-name/go/google-chrome/package.nix
···
linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru;
-
version = "130.0.6723.91";
+
version = "131.0.6778.69";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-
hash = "sha256-30RwtLlU4GhqDhbHTZMqrih77d2yOFeIBiOG3CugvLo=";
+
hash = "sha256-7aE6RZE5kB3DaJFUDdc2Ter8SsZZM0JzYmKn1hF1BUs=";
};
# With strictDeps on, some shebangs were not being patched correctly
···
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
-
version = "130.0.6723.92";
+
version = "131.0.6778.70";
src = fetchurl {
-
url = "http://dl.google.com/release2/chrome/adlhlvvxwq7oxwh4d3ghghzdnhaq_130.0.6723.92/GoogleChrome-130.0.6723.92.dmg";
-
hash = "sha256-R1YCj0Ou+pyGUCxh6ATTTPIb5qUTnGROZypuAh8SlAg=";
+
url = "http://dl.google.com/release2/chrome/acwi7l3xj4g6lag6mccophfiv2aa_131.0.6778.70/GoogleChrome-131.0.6778.70.dmg";
+
hash = "sha256-Gikqdh9g3FAnWBLrxMtbomKceIaMsz/GnguiEUpKJW0=";
};
dontPatch = true;
+18 -17
pkgs/by-name/go/goxlr-utility/Cargo.lock
···
dependencies = [
"async-task",
"concurrent-queue",
-
"fastrand 2.1.0",
+
"fastrand 2.1.1",
"futures-lite 2.3.0",
"slab",
]
···
[[package]]
name = "fastrand"
-
version = "2.1.0"
+
version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fdeflate"
···
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
dependencies = [
-
"fastrand 2.1.0",
+
"fastrand 2.1.1",
"futures-core",
"futures-io",
"parking",
···
[[package]]
name = "goxlr-audio"
-
version = "1.1.1"
+
version = "1.1.4"
dependencies = [
"anyhow",
"cpal",
···
[[package]]
name = "goxlr-client"
-
version = "1.1.1"
+
version = "1.1.4"
dependencies = [
"anyhow",
"clap 4.5.11",
···
[[package]]
name = "goxlr-daemon"
-
version = "1.1.1"
+
version = "1.1.4"
dependencies = [
"actix",
"actix-cors",
···
[[package]]
name = "goxlr-defaults"
-
version = "1.1.1"
+
version = "1.1.4"
dependencies = [
"clap 4.5.11",
"include_dir",
···
[[package]]
name = "goxlr-initialiser"
-
version = "1.1.1"
+
version = "1.1.4"
dependencies = [
"anyhow",
"block",
···
[[package]]
name = "goxlr-ipc"
-
version = "1.1.1"
+
version = "1.1.4"
dependencies = [
"anyhow",
"async-trait",
···
[[package]]
name = "goxlr-launcher"
-
version = "1.1.1"
+
version = "1.1.4"
dependencies = [
"anyhow",
"goxlr-ipc",
···
[[package]]
name = "goxlr-profile-loader"
-
version = "1.1.1"
+
version = "1.1.4"
dependencies = [
"anyhow",
"byteorder",
"enum-map",
"enum-map-derive",
+
"fastrand 2.1.1",
"log",
"quick-xml",
"ritelinked",
···
[[package]]
name = "goxlr-scribbles"
-
version = "1.1.1"
+
version = "1.1.4"
dependencies = [
"ab_glyph",
"anyhow",
···
[[package]]
name = "goxlr-types"
-
version = "1.1.1"
+
version = "1.1.4"
dependencies = [
"clap 4.5.11",
"derivative",
···
[[package]]
name = "goxlr-usb"
-
version = "1.1.1"
+
version = "1.1.4"
dependencies = [
"anyhow",
"byteorder",
···
checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
dependencies = [
"atomic-waker",
-
"fastrand 2.1.0",
+
"fastrand 2.1.1",
"futures-io",
···
checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
dependencies = [
"cfg-if",
-
"fastrand 2.1.0",
+
"fastrand 2.1.1",
"rustix 0.38.34",
"windows-sys 0.52.0",
+13 -13
pkgs/by-name/go/goxlr-utility/package.nix
···
-
{ lib
-
, fetchFromGitHub
-
, rustPlatform
-
, installShellFiles
-
, pkg-config
-
, libpulseaudio
-
, dbus
-
, openssl
-
, speechd-minimal
+
{
+
lib,
+
fetchFromGitHub,
+
rustPlatform,
+
installShellFiles,
+
pkg-config,
+
libpulseaudio,
+
dbus,
+
openssl,
+
speechd-minimal,
}:
rustPlatform.buildRustPackage rec {
pname = "goxlr-utility";
-
version = "1.1.1-unstable-2024-08-06";
+
version = "1.1.4";
src = fetchFromGitHub {
owner = "GoXLR-on-Linux";
repo = "goxlr-utility";
-
rev = "dcd4454a2634f5a2af10f00c1cbcb016241ce2cb";
-
hash = "sha256-kWfCFsk0GhqX+pYOTeJd7XHlcWOX4D6fmIU/4nylU3Y=";
+
rev = "v${version}";
+
hash = "sha256-aThIu+3eNHCKS6lsio7cLZeIMg0509qkE0YQ6M6vPAI=";
};
cargoLock = {
···
maintainers = with maintainers; [ errnoh ];
};
}
-
+1 -1
pkgs/by-name/gq/gqlgenc/package.nix
···
mainProgram = "gqlgenc";
homepage = "https://github.com/Yamashou/gqlgenc";
license = licenses.mit;
-
maintainers = with maintainers; [ milran ];
+
maintainers = with maintainers; [ wattmto ];
};
}
+79
pkgs/by-name/gu/guymager/package.nix
···
+
{
+
lib,
+
stdenv,
+
fetchurl,
+
libsForQt5,
+
dpkg,
+
parted,
+
udev,
+
libewf-legacy,
+
libbfio,
+
libguytools,
+
}:
+
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "guymager";
+
version = "0.8.13";
+
+
src = fetchurl {
+
url = "mirror://sourceforge/project/guymager/guymager/LatestSource/guymager-${finalAttrs.version}.tar.gz";
+
hash = "sha256-xDsQ/d6fyfLOr4uXpdoqMljfFrVgQTUu0t2e5opcaRg=";
+
};
+
+
enableParallelBuilding = true;
+
+
nativeBuildInputs = [
+
dpkg
+
libsForQt5.qmake
+
libsForQt5.qttools
+
libsForQt5.wrapQtAppsHook
+
];
+
buildInputs = [
+
libsForQt5.qtbase
+
libewf-legacy
+
libbfio
+
libguytools
+
parted
+
udev
+
];
+
+
postPatch = ''
+
patchShebangs compileinfo.sh
+
substituteInPlace manuals/guymager_body.1 config.cpp \
+
--replace-fail "/etc/guymager/guymager.cfg" "$out/share/guymager/guymager.cfg"
+
substituteInPlace compileinfo.sh \
+
--replace-fail " debian/changelog" "" \
+
--replace-fail "dpkg-parsechangelog" "dpkg-parsechangelog -l changelog"
+
substituteInPlace threadscan.cpp \
+
--replace-fail '/lib,/usr/lib,/usr/lib64,/usr/local/lib' '${
+
builtins.replaceStrings [ ":" ] [ "," ] (
+
lib.makeLibraryPath [
+
udev
+
parted
+
]
+
)
+
}'
+
substituteInPlace org.freedesktop.guymager.policy guymager.pro main.cpp guymager.cfg \
+
--replace-fail /usr $out
+
'';
+
+
installPhase = ''
+
runHook preInstall
+
mkdir -p $out/{bin,share}
+
make clean
+
rm -rf *.cpp *.h *.pro
+
cp -aR . "$out/share/guymager/"
+
makeWrapper $out/share/guymager/guymager $out/bin/guymager
+
runHook postInstall
+
'';
+
+
meta = {
+
description = "Forensic imager for media acquisition";
+
mainProgram = "guymager";
+
homepage = "https://guymager.sourceforge.io";
+
maintainers = with lib.maintainers; [ d3vil0p3r ];
+
platforms = lib.platforms.linux;
+
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+
license = lib.licenses.gpl2Only;
+
};
+
})
+13 -7
pkgs/by-name/im/immersed/darwin.nix
···
-
{ stdenv
-
, pname
-
, version
-
, src
-
, meta
-
, undmg
+
{
+
stdenv,
+
pname,
+
version,
+
src,
+
meta,
+
undmg,
}:
stdenv.mkDerivation {
-
inherit pname version src meta;
+
inherit
+
pname
+
version
+
src
+
meta
+
;
nativeBuildInputs = [ undmg ];
+25 -23
pkgs/by-name/im/immersed/linux.nix
···
-
{ pname
-
, version
-
, src
-
, meta
-
, appimageTools
-
, libgpg-error
+
{
+
pname,
+
version,
+
src,
+
meta,
+
appimageTools,
+
libgpg-error,
}:
let
···
inherit pname version meta;
src = src';
-
extraPkgs = pkgs: with pkgs; [
-
libgpg-error
-
fontconfig
-
libGL
-
mesa
-
wayland
-
pipewire
-
fribidi
-
harfbuzz
-
freetype
-
libthai
-
e2fsprogs
-
zlib
-
libp11
-
xorg.libX11
-
xorg.libSM
-
];
+
extraPkgs =
+
pkgs: with pkgs; [
+
libgpg-error
+
fontconfig
+
libGL
+
mesa
+
wayland
+
pipewire
+
fribidi
+
harfbuzz
+
freetype
+
libthai
+
e2fsprogs
+
zlib
+
libp11
+
xorg.libX11
+
xorg.libSM
+
];
multiArch = true;
}
+29 -9
pkgs/by-name/im/immersed/package.nix
···
-
{ lib
-
, appimageTools
-
, callPackage
-
, fetchurl
-
, stdenv
+
{
+
lib,
+
appimageTools,
+
callPackage,
+
fetchurl,
+
stdenv,
}:
let
pname = "immersed";
···
description = "VR coworking platform";
homepage = "https://immersed.com";
license = licenses.unfree;
-
maintainers = with maintainers; [ haruki7049 pandapip1 ];
+
maintainers = with maintainers; [
+
haruki7049
+
pandapip1
+
];
platforms = builtins.attrNames sources;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
-
in if stdenv.hostPlatform.isDarwin
-
then callPackage ./darwin.nix { inherit pname version src meta; }
-
else callPackage ./linux.nix { inherit pname version src meta; }
+
in
+
if stdenv.hostPlatform.isDarwin then
+
callPackage ./darwin.nix {
+
inherit
+
pname
+
version
+
src
+
meta
+
;
+
}
+
else
+
callPackage ./linux.nix {
+
inherit
+
pname
+
version
+
src
+
meta
+
;
+
}
+34
pkgs/by-name/in/intentrace/package.nix
···
+
{
+
fetchFromGitHub,
+
lib,
+
rustPlatform,
+
}:
+
+
let
+
version = "0.2.4";
+
in
+
rustPlatform.buildRustPackage {
+
inherit version;
+
pname = "intentrace";
+
+
src = fetchFromGitHub {
+
owner = "sectordistrict";
+
repo = "intentrace";
+
rev = "refs/tags/v${version}";
+
hash = "sha256-Bsis8tL2xahJT/qAFVbbd/CZ7n8KJYLPTIl1a1WHR4c=";
+
};
+
+
cargoHash = "sha256-pyGcQy7p0+Vqv3Khy1hLgahcOpqnbKKmRLZcKwkvVWw=";
+
+
meta = {
+
description = "Prettified Linux syscall tracing tool (like strace)";
+
homepage = "https://github.com/sectordistrict/intentrace";
+
license = lib.licenses.mit;
+
platforms = [ "x86_64-linux" ];
+
mainProgram = "intentrace";
+
maintainers = with lib.maintainers; [
+
cloudripper
+
jk
+
];
+
};
+
}
+71
pkgs/by-name/in/invidious/update.sh
···
+
#!/usr/bin/env nix-shell
+
#!nix-shell -i bash -p curl crystal crystal2nix jq git moreutils nix nix-prefetch pkg-config pcre gnugrep
+
git_url='https://github.com/iv-org/invidious.git'
+
git_branch='master'
+
git_dir='/var/tmp/invidious.git'
+
pkg='invidious'
+
+
set -euo pipefail
+
+
cd "$(dirname "${BASH_SOURCE[0]}")"
+
+
info() {
+
if [ -t 2 ]; then
+
set -- '\033[32m%s\033[39m\n' "$@"
+
else
+
set -- '%s\n' "$@"
+
fi
+
printf "$@" >&2
+
}
+
+
json_get() {
+
jq -r "$1" < 'versions.json'
+
}
+
+
json_set() {
+
jq --arg x "$2" "$1 = \$x" < 'versions.json' | sponge 'versions.json'
+
}
+
+
old_version=$(json_get '.invidious.version')
+
today=$(LANG=C date -u +'%Y-%m-%d')
+
+
info "fetching $git_url..."
+
if [ ! -d "$git_dir" ]; then
+
git init --initial-branch="$git_branch" "$git_dir"
+
git -C "$git_dir" remote add origin "$git_url"
+
fi
+
git -C "$git_dir" fetch origin --tags "$git_branch"
+
+
new_tag="$(git -C "$git_dir" ls-remote --tags --sort=-committerdate origin | tail -n1 | grep -Po '(?<=refs/tags/).*')"
+
new_version="${new_tag#v}"
+
+
if [ "$new_version" = "$old_version" ]; then
+
info "$pkg is up-to-date."
+
exit
+
fi
+
+
info "updating to $new_tag"
+
commit="$(git -C "$git_dir" rev-list "$new_tag" --max-count=1 --abbrev-commit)"
+
date="$(git -C "$git_dir" log -1 --format=%cd --date=format:%Y.%m.%d "$commit")"
+
json_set '.invidious.date' "$date"
+
json_set '.invidious.commit' "$commit"
+
json_set '.invidious.version' "$new_version"
+
+
new_hash=$(nix-prefetch -I 'nixpkgs=../../../..' "$pkg")
+
json_set '.invidious.hash' "$new_hash"
+
+
# fetch video.js dependencies
+
info "Running scripts/fetch-player-dependencies.cr..."
+
git -C "$git_dir" reset --hard "$new_tag"
+
(cd "$git_dir" && crystal run scripts/fetch-player-dependencies.cr -- --minified)
+
rm -f "$git_dir/assets/videojs/.gitignore"
+
videojs_new_hash=$(nix-hash --type sha256 --sri "$git_dir/assets/videojs")
+
json_set '.videojs.hash' "$videojs_new_hash"
+
+
if git -C "$git_dir" diff-tree --quiet "v${old_version}..${new_tag}" -- 'shard.lock'; then
+
info "shard.lock did not change since v$old_version."
+
else
+
info "Updating shards.nix..."
+
(cd "$git_dir" && crystal2nix)
+
mv "$git_dir/shards.nix" .
+
fi
+56
pkgs/by-name/li/libguytools/package.nix
···
+
{
+
lib,
+
stdenv,
+
fetchurl,
+
libsForQt5,
+
}:
+
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "libguytools";
+
version = "2.1.0";
+
+
src = fetchurl {
+
url = "mirror://sourceforge/project/libguytools/libguytools/LatestSource/tools-${finalAttrs.version}.tar.gz";
+
hash = "sha256-eVYvjo2wKW2g9/9hL9nbQa1FRWDMMqMHok0V/adPHVY=";
+
};
+
+
qmakeFlags = [
+
"trunk.pro"
+
"toolsstatic.pro"
+
];
+
+
enableParallelBuilding = true;
+
+
nativeBuildInputs = [
+
libsForQt5.qmake
+
libsForQt5.wrapQtAppsHook
+
];
+
dontWrapQtApps = true;
+
buildInputs = [ libsForQt5.qtbase ];
+
+
postPatch = ''
+
sed -i "/dpkg-buildflags/d" tools.pro
+
patchShebangs create_version_file.sh
+
'';
+
+
preConfigure = ''
+
./create_version_file.sh
+
'';
+
+
installPhase = ''
+
runHook preInstall
+
mkdir -p $out
+
cp -r lib $out/
+
cp -r include $out/
+
runHook postInstall
+
'';
+
+
meta = {
+
description = "Small programming toolbox";
+
mainProgram = "libguytools";
+
homepage = "https://libguytools.sourceforge.io";
+
maintainers = with lib.maintainers; [ d3vil0p3r ];
+
platforms = lib.platforms.linux;
+
license = lib.licenses.gpl2Plus;
+
};
+
})
+27
pkgs/by-name/ma/macmon/package.nix
···
+
{
+
lib,
+
rustPlatform,
+
fetchFromGitHub,
+
}:
+
+
rustPlatform.buildRustPackage rec {
+
pname = "macmon";
+
version = "0.3.3";
+
+
src = fetchFromGitHub {
+
owner = "vladkens";
+
repo = "macmon";
+
rev = "v${version}";
+
hash = "sha256-COpEjK1LUwGzhSgD09D4gx+MtS2hT0qt06rTPT8JQiQ=";
+
};
+
+
cargoHash = "sha256-DTkpFGl8kTWttFGKTCpny2L0IRrCgpnnXaKIFoxWrW4=";
+
+
meta = {
+
homepage = "https://github.com/vladkens/macmon";
+
description = "Sudoless performance monitoring for Apple Silicon processors";
+
platforms = [ "aarch64-darwin" ];
+
license = lib.licenses.mit;
+
maintainers = with lib.maintainers; [ schrobingus ];
+
};
+
}
+1588
pkgs/by-name/me/mergiraf/Cargo.lock
···
+
# This file is automatically @generated by Cargo.
+
# It is not intended for manual editing.
+
version = 3
+
+
[[package]]
+
name = "adler2"
+
version = "2.0.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+
[[package]]
+
name = "aho-corasick"
+
version = "1.1.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+
dependencies = [
+
"memchr",
+
]
+
+
[[package]]
+
name = "android-tzdata"
+
version = "0.1.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+
[[package]]
+
name = "android_system_properties"
+
version = "0.1.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+
dependencies = [
+
"libc",
+
]
+
+
[[package]]
+
name = "anstream"
+
version = "0.6.17"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
+
dependencies = [
+
"anstyle",
+
"anstyle-parse",
+
"anstyle-query",
+
"anstyle-wincon",
+
"colorchoice",
+
"is_terminal_polyfill",
+
"utf8parse",
+
]
+
+
[[package]]
+
name = "anstyle"
+
version = "1.0.9"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56"
+
+
[[package]]
+
name = "anstyle-parse"
+
version = "0.2.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+
dependencies = [
+
"utf8parse",
+
]
+
+
[[package]]
+
name = "anstyle-query"
+
version = "1.1.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+
dependencies = [
+
"windows-sys 0.59.0",
+
]
+
+
[[package]]
+
name = "anstyle-wincon"
+
version = "3.0.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+
dependencies = [
+
"anstyle",
+
"windows-sys 0.59.0",
+
]
+
+
[[package]]
+
name = "arbitrary"
+
version = "1.3.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+
dependencies = [
+
"derive_arbitrary",
+
]
+
+
[[package]]
+
name = "arrayvec"
+
version = "0.7.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+
[[package]]
+
name = "autocfg"
+
version = "1.4.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+
[[package]]
+
name = "bitflags"
+
version = "2.6.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+
[[package]]
+
name = "block-buffer"
+
version = "0.10.4"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+
dependencies = [
+
"generic-array",
+
]
+
+
[[package]]
+
name = "bumpalo"
+
version = "3.16.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+
[[package]]
+
name = "byteorder"
+
version = "1.5.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+
[[package]]
+
name = "cc"
+
version = "1.1.31"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
+
dependencies = [
+
"shlex",
+
]
+
+
[[package]]
+
name = "cfg-if"
+
version = "1.0.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+
[[package]]
+
name = "chrono"
+
version = "0.4.38"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+
dependencies = [
+
"android-tzdata",
+
"iana-time-zone",
+
"js-sys",
+
"num-traits",
+
"wasm-bindgen",
+
"windows-targets 0.52.6",
+
]
+
+
[[package]]
+
name = "clap"
+
version = "4.5.20"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+
dependencies = [
+
"clap_builder",
+
"clap_derive",
+
]
+
+
[[package]]
+
name = "clap_builder"
+
version = "4.5.20"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+
dependencies = [
+
"anstream",
+
"anstyle",
+
"clap_lex",
+
"strsim",
+
]
+
+
[[package]]
+
name = "clap_derive"
+
version = "4.5.18"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+
dependencies = [
+
"heck",
+
"proc-macro2",
+
"quote",
+
"syn 2.0.85",
+
]
+
+
[[package]]
+
name = "clap_lex"
+
version = "0.7.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+
+
[[package]]
+
name = "colorchoice"
+
version = "1.0.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
+
[[package]]
+
name = "core-foundation-sys"
+
version = "0.8.7"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+
[[package]]
+
name = "cpufeatures"
+
version = "0.2.14"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+
dependencies = [
+
"libc",
+
]
+
+
[[package]]
+
name = "crc32fast"
+
version = "1.4.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+
dependencies = [
+
"cfg-if",
+
]
+
+
[[package]]
+
name = "crossbeam-utils"
+
version = "0.8.20"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+
[[package]]
+
name = "crypto-common"
+
version = "0.1.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+
dependencies = [
+
"generic-array",
+
"typenum",
+
]
+
+
[[package]]
+
name = "derive_arbitrary"
+
version = "1.3.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"syn 2.0.85",
+
]
+
+
[[package]]
+
name = "derive_more"
+
version = "0.99.18"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"syn 2.0.85",
+
]
+
+
[[package]]
+
name = "diffy"
+
version = "0.4.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "5d3041965b7a63e70447ec818a46b1e5297f7fcae3058356d226c02750c4e6cb"
+
dependencies = [
+
"nu-ansi-term",
+
]
+
+
[[package]]
+
name = "digest"
+
version = "0.10.7"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+
dependencies = [
+
"block-buffer",
+
"crypto-common",
+
]
+
+
[[package]]
+
name = "displaydoc"
+
version = "0.2.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"syn 2.0.85",
+
]
+
+
[[package]]
+
name = "dot-generator"
+
version = "0.2.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "0aaac7ada45f71873ebce336491d1c1bc4a7c8042c7cea978168ad59e805b871"
+
dependencies = [
+
"dot-structures",
+
]
+
+
[[package]]
+
name = "dot-structures"
+
version = "0.1.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "675e35c02a51bb4d4618cb4885b3839ce6d1787c97b664474d9208d074742e20"
+
+
[[package]]
+
name = "either"
+
version = "1.13.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+
[[package]]
+
name = "equivalent"
+
version = "1.0.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+
[[package]]
+
name = "errno"
+
version = "0.3.9"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+
dependencies = [
+
"libc",
+
"windows-sys 0.52.0",
+
]
+
+
[[package]]
+
name = "etcetera"
+
version = "0.8.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
+
dependencies = [
+
"cfg-if",
+
"home",
+
"windows-sys 0.48.0",
+
]
+
+
[[package]]
+
name = "fastrand"
+
version = "2.1.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+
[[package]]
+
name = "fixedbitset"
+
version = "0.4.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
+
[[package]]
+
name = "flate2"
+
version = "1.0.34"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+
dependencies = [
+
"crc32fast",
+
"miniz_oxide",
+
]
+
+
[[package]]
+
name = "futures"
+
version = "0.3.31"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+
dependencies = [
+
"futures-channel",
+
"futures-core",
+
"futures-executor",
+
"futures-io",
+
"futures-sink",
+
"futures-task",
+
"futures-util",
+
]
+
+
[[package]]
+
name = "futures-channel"
+
version = "0.3.31"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+
dependencies = [
+
"futures-core",
+
"futures-sink",
+
]
+
+
[[package]]
+
name = "futures-core"
+
version = "0.3.31"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+
[[package]]
+
name = "futures-executor"
+
version = "0.3.31"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+
dependencies = [
+
"futures-core",
+
"futures-task",
+
"futures-util",
+
]
+
+
[[package]]
+
name = "futures-io"
+
version = "0.3.31"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+
[[package]]
+
name = "futures-macro"
+
version = "0.3.31"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"syn 2.0.85",
+
]
+
+
[[package]]
+
name = "futures-sink"
+
version = "0.3.31"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+
[[package]]
+
name = "futures-task"
+
version = "0.3.31"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+
[[package]]
+
name = "futures-timer"
+
version = "3.0.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+
+
[[package]]
+
name = "futures-util"
+
version = "0.3.31"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+
dependencies = [
+
"futures-channel",
+
"futures-core",
+
"futures-io",
+
"futures-macro",
+
"futures-sink",
+
"futures-task",
+
"memchr",
+
"pin-project-lite",
+
"pin-utils",
+
"slab",
+
]
+
+
[[package]]
+
name = "generic-array"
+
version = "0.14.7"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+
dependencies = [
+
"typenum",
+
"version_check",
+
]
+
+
[[package]]
+
name = "getrandom"
+
version = "0.2.15"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+
dependencies = [
+
"cfg-if",
+
"libc",
+
"wasi",
+
]
+
+
[[package]]
+
name = "glob"
+
version = "0.3.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+
[[package]]
+
name = "graphviz-rust"
+
version = "0.9.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8f7892a4538fc9aa3658ae6962774428487c16e11663c58c594357975377c901"
+
dependencies = [
+
"dot-generator",
+
"dot-structures",
+
"into-attr",
+
"into-attr-derive",
+
"pest",
+
"pest_derive",
+
"rand",
+
"tempfile",
+
]
+
+
[[package]]
+
name = "hashbrown"
+
version = "0.12.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+
[[package]]
+
name = "hashbrown"
+
version = "0.15.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
+
[[package]]
+
name = "heck"
+
version = "0.5.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+
[[package]]
+
name = "hermit-abi"
+
version = "0.4.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
+
[[package]]
+
name = "home"
+
version = "0.5.9"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+
dependencies = [
+
"windows-sys 0.52.0",
+
]
+
+
[[package]]
+
name = "iana-time-zone"
+
version = "0.1.61"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+
dependencies = [
+
"android_system_properties",
+
"core-foundation-sys",
+
"iana-time-zone-haiku",
+
"js-sys",
+
"wasm-bindgen",
+
"windows-core",
+
]
+
+
[[package]]
+
name = "iana-time-zone-haiku"
+
version = "0.1.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+
dependencies = [
+
"cc",
+
]
+
+
[[package]]
+
name = "indexmap"
+
version = "1.9.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+
dependencies = [
+
"autocfg",
+
"hashbrown 0.12.3",
+
]
+
+
[[package]]
+
name = "indexmap"
+
version = "2.6.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+
dependencies = [
+
"equivalent",
+
"hashbrown 0.15.0",
+
]
+
+
[[package]]
+
name = "integer-sqrt"
+
version = "0.1.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770"
+
dependencies = [
+
"num-traits",
+
]
+
+
[[package]]
+
name = "into-attr"
+
version = "0.1.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "18b48c537e49a709e678caec3753a7dba6854661a1eaa27675024283b3f8b376"
+
dependencies = [
+
"dot-structures",
+
]
+
+
[[package]]
+
name = "into-attr-derive"
+
version = "0.2.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "ecac7c1ae6cd2c6a3a64d1061a8bdc7f52ff62c26a831a2301e54c1b5d70d5b1"
+
dependencies = [
+
"dot-generator",
+
"dot-structures",
+
"into-attr",
+
"quote",
+
"syn 1.0.109",
+
]
+
+
[[package]]
+
name = "is-terminal"
+
version = "0.4.13"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
+
dependencies = [
+
"hermit-abi",
+
"libc",
+
"windows-sys 0.52.0",
+
]
+
+
[[package]]
+
name = "is_terminal_polyfill"
+
version = "1.70.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+
[[package]]
+
name = "itertools"
+
version = "0.10.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+
dependencies = [
+
"either",
+
]
+
+
[[package]]
+
name = "itertools"
+
version = "0.13.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+
dependencies = [
+
"either",
+
]
+
+
[[package]]
+
name = "js-sys"
+
version = "0.3.72"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+
dependencies = [
+
"wasm-bindgen",
+
]
+
+
[[package]]
+
name = "libc"
+
version = "0.2.161"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+
+
[[package]]
+
name = "linux-raw-sys"
+
version = "0.4.14"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+
[[package]]
+
name = "lockfree-object-pool"
+
version = "0.1.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
+
[[package]]
+
name = "log"
+
version = "0.4.22"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+
[[package]]
+
name = "memchr"
+
version = "2.7.4"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+
[[package]]
+
name = "mergiraf"
+
version = "0.1.1"
+
dependencies = [
+
"cc",
+
"clap",
+
"diffy",
+
"etcetera",
+
"graphviz-rust",
+
"itertools 0.13.0",
+
"log",
+
"rand",
+
"regex",
+
"rstest",
+
"stderrlog",
+
"tempfile",
+
"tree-edit-distance",
+
"tree-sitter",
+
"tree-sitter-c-sharp",
+
"tree-sitter-cpp",
+
"tree-sitter-go",
+
"tree-sitter-html",
+
"tree-sitter-java",
+
"tree-sitter-javascript",
+
"tree-sitter-json",
+
"tree-sitter-rust",
+
"tree-sitter-xml",
+
"tree-sitter-yaml",
+
"typed-arena",
+
"zip",
+
]
+
+
[[package]]
+
name = "miniz_oxide"
+
version = "0.8.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+
dependencies = [
+
"adler2",
+
]
+
+
[[package]]
+
name = "nu-ansi-term"
+
version = "0.50.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+
dependencies = [
+
"windows-sys 0.52.0",
+
]
+
+
[[package]]
+
name = "num-traits"
+
version = "0.2.19"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+
dependencies = [
+
"autocfg",
+
]
+
+
[[package]]
+
name = "once_cell"
+
version = "1.20.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+
[[package]]
+
name = "pathfinding"
+
version = "3.0.14"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "cb45190a18e771c500291c549959777a3be38d30113a860930bc1f2119f0cc13"
+
dependencies = [
+
"fixedbitset",
+
"indexmap 1.9.3",
+
"integer-sqrt",
+
"itertools 0.10.5",
+
"num-traits",
+
"rustc-hash",
+
"thiserror",
+
]
+
+
[[package]]
+
name = "pest"
+
version = "2.7.14"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
+
dependencies = [
+
"memchr",
+
"thiserror",
+
"ucd-trie",
+
]
+
+
[[package]]
+
name = "pest_derive"
+
version = "2.7.14"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd"
+
dependencies = [
+
"pest",
+
"pest_generator",
+
]
+
+
[[package]]
+
name = "pest_generator"
+
version = "2.7.14"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e"
+
dependencies = [
+
"pest",
+
"pest_meta",
+
"proc-macro2",
+
"quote",
+
"syn 2.0.85",
+
]
+
+
[[package]]
+
name = "pest_meta"
+
version = "2.7.14"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d"
+
dependencies = [
+
"once_cell",
+
"pest",
+
"sha2",
+
]
+
+
[[package]]
+
name = "pin-project-lite"
+
version = "0.2.15"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+
+
[[package]]
+
name = "pin-utils"
+
version = "0.1.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+
[[package]]
+
name = "ppv-lite86"
+
version = "0.2.20"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+
dependencies = [
+
"zerocopy",
+
]
+
+
[[package]]
+
name = "proc-macro-crate"
+
version = "3.2.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+
dependencies = [
+
"toml_edit",
+
]
+
+
[[package]]
+
name = "proc-macro2"
+
version = "1.0.89"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+
dependencies = [
+
"unicode-ident",
+
]
+
+
[[package]]
+
name = "quote"
+
version = "1.0.37"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+
dependencies = [
+
"proc-macro2",
+
]
+
+
[[package]]
+
name = "rand"
+
version = "0.8.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+
dependencies = [
+
"libc",
+
"rand_chacha",
+
"rand_core",
+
]
+
+
[[package]]
+
name = "rand_chacha"
+
version = "0.3.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+
dependencies = [
+
"ppv-lite86",
+
"rand_core",
+
]
+
+
[[package]]
+
name = "rand_core"
+
version = "0.6.4"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+
dependencies = [
+
"getrandom",
+
]
+
+
[[package]]
+
name = "regex"
+
version = "1.11.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+
dependencies = [
+
"aho-corasick",
+
"memchr",
+
"regex-automata",
+
"regex-syntax",
+
]
+
+
[[package]]
+
name = "regex-automata"
+
version = "0.4.8"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+
dependencies = [
+
"aho-corasick",
+
"memchr",
+
"regex-syntax",
+
]
+
+
[[package]]
+
name = "regex-syntax"
+
version = "0.8.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+
[[package]]
+
name = "relative-path"
+
version = "1.9.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
+
+
[[package]]
+
name = "rstest"
+
version = "0.21.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682"
+
dependencies = [
+
"futures",
+
"futures-timer",
+
"rstest_macros",
+
"rustc_version",
+
]
+
+
[[package]]
+
name = "rstest_macros"
+
version = "0.21.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d"
+
dependencies = [
+
"cfg-if",
+
"glob",
+
"proc-macro-crate",
+
"proc-macro2",
+
"quote",
+
"regex",
+
"relative-path",
+
"rustc_version",
+
"syn 2.0.85",
+
"unicode-ident",
+
]
+
+
[[package]]
+
name = "rustc-hash"
+
version = "1.1.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+
[[package]]
+
name = "rustc_version"
+
version = "0.4.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+
dependencies = [
+
"semver",
+
]
+
+
[[package]]
+
name = "rustix"
+
version = "0.38.38"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
+
dependencies = [
+
"bitflags",
+
"errno",
+
"libc",
+
"linux-raw-sys",
+
"windows-sys 0.52.0",
+
]
+
+
[[package]]
+
name = "semver"
+
version = "1.0.23"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+
+
[[package]]
+
name = "sha2"
+
version = "0.10.8"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+
dependencies = [
+
"cfg-if",
+
"cpufeatures",
+
"digest",
+
]
+
+
[[package]]
+
name = "shlex"
+
version = "1.3.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+
[[package]]
+
name = "simd-adler32"
+
version = "0.3.7"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+
[[package]]
+
name = "slab"
+
version = "0.4.9"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+
dependencies = [
+
"autocfg",
+
]
+
+
[[package]]
+
name = "stderrlog"
+
version = "0.6.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "61c910772f992ab17d32d6760e167d2353f4130ed50e796752689556af07dc6b"
+
dependencies = [
+
"chrono",
+
"is-terminal",
+
"log",
+
"termcolor",
+
"thread_local",
+
]
+
+
[[package]]
+
name = "streaming-iterator"
+
version = "0.1.9"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
+
+
[[package]]
+
name = "strsim"
+
version = "0.11.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+
[[package]]
+
name = "syn"
+
version = "1.0.109"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"unicode-ident",
+
]
+
+
[[package]]
+
name = "syn"
+
version = "2.0.85"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"unicode-ident",
+
]
+
+
[[package]]
+
name = "tempfile"
+
version = "3.13.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+
dependencies = [
+
"cfg-if",
+
"fastrand",
+
"once_cell",
+
"rustix",
+
"windows-sys 0.59.0",
+
]
+
+
[[package]]
+
name = "termcolor"
+
version = "1.1.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+
dependencies = [
+
"winapi-util",
+
]
+
+
[[package]]
+
name = "thiserror"
+
version = "1.0.65"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
+
dependencies = [
+
"thiserror-impl",
+
]
+
+
[[package]]
+
name = "thiserror-impl"
+
version = "1.0.65"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"syn 2.0.85",
+
]
+
+
[[package]]
+
name = "thread_local"
+
version = "1.1.8"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+
dependencies = [
+
"cfg-if",
+
"once_cell",
+
]
+
+
[[package]]
+
name = "toml_datetime"
+
version = "0.6.8"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+
+
[[package]]
+
name = "toml_edit"
+
version = "0.22.22"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+
dependencies = [
+
"indexmap 2.6.0",
+
"toml_datetime",
+
"winnow",
+
]
+
+
[[package]]
+
name = "tree-edit-distance"
+
version = "0.4.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "c71cf959f76103341744494caf1ace7f105244b980b1a3b848d5b1a070c42c16"
+
dependencies = [
+
"arrayvec",
+
"derive_more",
+
"itertools 0.10.5",
+
"pathfinding",
+
]
+
+
[[package]]
+
name = "tree-sitter"
+
version = "0.24.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f9871f16d6cf5c4757dcf30d5d2172a2df6987c510c017bbb7abfb7f9aa24d06"
+
dependencies = [
+
"cc",
+
"regex",
+
"regex-syntax",
+
"streaming-iterator",
+
"tree-sitter-language",
+
]
+
+
[[package]]
+
name = "tree-sitter-c-sharp"
+
version = "0.23.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "04c0f6d2209a3cd6d0bb9d2934715da15a15710d3c09c7c1ecd4c9804c3ecd10"
+
dependencies = [
+
"cc",
+
"tree-sitter-language",
+
]
+
+
[[package]]
+
name = "tree-sitter-cpp"
+
version = "0.23.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1d67e862242878d6ee50e1e5814f267ee3eea0168aea2cdbd700ccfb4c74b6d3"
+
dependencies = [
+
"cc",
+
"tree-sitter-language",
+
]
+
+
[[package]]
+
name = "tree-sitter-go"
+
version = "0.23.1"
+
source = "git+https://github.com/tree-sitter/tree-sitter-go.git?rev=ecc20866d1bd4d80f3aef06456ed3014d4d598e6#ecc20866d1bd4d80f3aef06456ed3014d4d598e6"
+
dependencies = [
+
"cc",
+
"tree-sitter-language",
+
]
+
+
[[package]]
+
name = "tree-sitter-html"
+
version = "0.23.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "7d52d710a3723360ebade986d3f0ae2aa2c3bcfb87bb1cdf60988ec51c81c40d"
+
dependencies = [
+
"cc",
+
"tree-sitter-language",
+
]
+
+
[[package]]
+
name = "tree-sitter-java"
+
version = "0.23.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b38b26736e6e97421760201f7a91c859f3b0d44382d48ac18aa963828f784ebf"
+
dependencies = [
+
"cc",
+
"tree-sitter-language",
+
]
+
+
[[package]]
+
name = "tree-sitter-javascript"
+
version = "0.23.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "59e1f62f8babb640b909f30675d1addeb1f17802f2a4d2af287569753b243977"
+
dependencies = [
+
"cc",
+
"tree-sitter-language",
+
]
+
+
[[package]]
+
name = "tree-sitter-json"
+
version = "0.23.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "86a5d6b3ea17e06e7a34aabeadd68f5866c0d0f9359155d432095f8b751865e4"
+
dependencies = [
+
"cc",
+
"tree-sitter-language",
+
]
+
+
[[package]]
+
name = "tree-sitter-language"
+
version = "0.1.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600"
+
+
[[package]]
+
name = "tree-sitter-rust"
+
version = "0.23.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "cffbbcb780348fbae8395742ae5b34c1fd794e4085d43aac9f259387f9a84dc8"
+
dependencies = [
+
"cc",
+
"tree-sitter-language",
+
]
+
+
[[package]]
+
name = "tree-sitter-xml"
+
version = "0.7.0"
+
source = "git+https://github.com/tree-sitter-grammars/tree-sitter-xml.git?rev=cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c#cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"
+
dependencies = [
+
"cc",
+
"tree-sitter-language",
+
]
+
+
[[package]]
+
name = "tree-sitter-yaml"
+
version = "0.6.1"
+
source = "git+https://github.com/wetneb/tree-sitter-yaml.git?rev=7b5199133abceb03d6d1d8f1672f49b4f2a71442#7b5199133abceb03d6d1d8f1672f49b4f2a71442"
+
dependencies = [
+
"cc",
+
"tree-sitter-language",
+
]
+
+
[[package]]
+
name = "typed-arena"
+
version = "2.0.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
+
+
[[package]]
+
name = "typenum"
+
version = "1.17.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+
[[package]]
+
name = "ucd-trie"
+
version = "0.1.7"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+
+
[[package]]
+
name = "unicode-ident"
+
version = "1.0.13"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+
[[package]]
+
name = "utf8parse"
+
version = "0.2.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+
[[package]]
+
name = "version_check"
+
version = "0.9.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+
[[package]]
+
name = "wasi"
+
version = "0.11.0+wasi-snapshot-preview1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+
[[package]]
+
name = "wasm-bindgen"
+
version = "0.2.95"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+
dependencies = [
+
"cfg-if",
+
"once_cell",
+
"wasm-bindgen-macro",
+
]
+
+
[[package]]
+
name = "wasm-bindgen-backend"
+
version = "0.2.95"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+
dependencies = [
+
"bumpalo",
+
"log",
+
"once_cell",
+
"proc-macro2",
+
"quote",
+
"syn 2.0.85",
+
"wasm-bindgen-shared",
+
]
+
+
[[package]]
+
name = "wasm-bindgen-macro"
+
version = "0.2.95"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+
dependencies = [
+
"quote",
+
"wasm-bindgen-macro-support",
+
]
+
+
[[package]]
+
name = "wasm-bindgen-macro-support"
+
version = "0.2.95"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"syn 2.0.85",
+
"wasm-bindgen-backend",
+
"wasm-bindgen-shared",
+
]
+
+
[[package]]
+
name = "wasm-bindgen-shared"
+
version = "0.2.95"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+
+
[[package]]
+
name = "winapi-util"
+
version = "0.1.9"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+
dependencies = [
+
"windows-sys 0.59.0",
+
]
+
+
[[package]]
+
name = "windows-core"
+
version = "0.52.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+
dependencies = [
+
"windows-targets 0.52.6",
+
]
+
+
[[package]]
+
name = "windows-sys"
+
version = "0.48.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+
dependencies = [
+
"windows-targets 0.48.5",
+
]
+
+
[[package]]
+
name = "windows-sys"
+
version = "0.52.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+
dependencies = [
+
"windows-targets 0.52.6",
+
]
+
+
[[package]]
+
name = "windows-sys"
+
version = "0.59.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+
dependencies = [
+
"windows-targets 0.52.6",
+
]
+
+
[[package]]
+
name = "windows-targets"
+
version = "0.48.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+
dependencies = [
+
"windows_aarch64_gnullvm 0.48.5",
+
"windows_aarch64_msvc 0.48.5",
+
"windows_i686_gnu 0.48.5",
+
"windows_i686_msvc 0.48.5",
+
"windows_x86_64_gnu 0.48.5",
+
"windows_x86_64_gnullvm 0.48.5",
+
"windows_x86_64_msvc 0.48.5",
+
]
+
+
[[package]]
+
name = "windows-targets"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+
dependencies = [
+
"windows_aarch64_gnullvm 0.52.6",
+
"windows_aarch64_msvc 0.52.6",
+
"windows_i686_gnu 0.52.6",
+
"windows_i686_gnullvm",
+
"windows_i686_msvc 0.52.6",
+
"windows_x86_64_gnu 0.52.6",
+
"windows_x86_64_gnullvm 0.52.6",
+
"windows_x86_64_msvc 0.52.6",
+
]
+
+
[[package]]
+
name = "windows_aarch64_gnullvm"
+
version = "0.48.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+
[[package]]
+
name = "windows_aarch64_gnullvm"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+
[[package]]
+
name = "windows_aarch64_msvc"
+
version = "0.48.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+
[[package]]
+
name = "windows_aarch64_msvc"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+
[[package]]
+
name = "windows_i686_gnu"
+
version = "0.48.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+
[[package]]
+
name = "windows_i686_gnu"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+
[[package]]
+
name = "windows_i686_gnullvm"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+
[[package]]
+
name = "windows_i686_msvc"
+
version = "0.48.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+
[[package]]
+
name = "windows_i686_msvc"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+
[[package]]
+
name = "windows_x86_64_gnu"
+
version = "0.48.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+
[[package]]
+
name = "windows_x86_64_gnu"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+
[[package]]
+
name = "windows_x86_64_gnullvm"
+
version = "0.48.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+
[[package]]
+
name = "windows_x86_64_gnullvm"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+
[[package]]
+
name = "windows_x86_64_msvc"
+
version = "0.48.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+
[[package]]
+
name = "windows_x86_64_msvc"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+
[[package]]
+
name = "winnow"
+
version = "0.6.20"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+
dependencies = [
+
"memchr",
+
]
+
+
[[package]]
+
name = "zerocopy"
+
version = "0.7.35"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+
dependencies = [
+
"byteorder",
+
"zerocopy-derive",
+
]
+
+
[[package]]
+
name = "zerocopy-derive"
+
version = "0.7.35"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"syn 2.0.85",
+
]
+
+
[[package]]
+
name = "zip"
+
version = "2.2.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
+
dependencies = [
+
"arbitrary",
+
"crc32fast",
+
"crossbeam-utils",
+
"displaydoc",
+
"flate2",
+
"indexmap 2.6.0",
+
"memchr",
+
"thiserror",
+
"zopfli",
+
]
+
+
[[package]]
+
name = "zopfli"
+
version = "0.8.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+
dependencies = [
+
"bumpalo",
+
"crc32fast",
+
"lockfree-object-pool",
+
"log",
+
"once_cell",
+
"simd-adler32",
+
]
+41
pkgs/by-name/me/mergiraf/package.nix
···
+
{
+
stdenv,
+
lib,
+
fetchFromGitea,
+
rustPlatform,
+
+
# native check inputs
+
git,
+
}:
+
+
rustPlatform.buildRustPackage rec {
+
pname = "mergiraf";
+
version = "0.2.0";
+
+
src = fetchFromGitea {
+
domain = "codeberg.org";
+
owner = "mergiraf";
+
repo = "mergiraf";
+
rev = "refs/tags/v${version}";
+
hash = "sha256-egtX2daCbPXi5rX2OxbEZA/VI9R4HMj5LRKbUEBFo+E=";
+
};
+
+
cargoLock = {
+
lockFile = ./Cargo.lock;
+
outputHashes = {
+
"tree-sitter-go-0.23.1" = "sha256-elPqkvVYs0vADOuN/umDteWP5hqcXhQAoSkqYDtTxaU=";
+
"tree-sitter-xml-0.7.0" = "sha256-RTWvOUAs3Uql9DKsP1jf9FZZHaZORE40GXd+6g6RQZw=";
+
"tree-sitter-yaml-0.6.1" = "sha256-gS+SjOnGl/86U9VV/y1ca7naYIe7DAOvOv++jCRLTKo=";
+
};
+
};
+
+
nativeCheckInputs = [ git ];
+
+
meta = {
+
description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats";
+
mainProgram = "mergiraf";
+
homepage = "https://mergiraf.org/";
+
license = lib.licenses.gpl3Only;
+
maintainers = with lib.maintainers; [ zimbatm ];
+
};
+
}
+286
pkgs/by-name/mi/mindustry/package.nix
···
+
{
+
lib,
+
stdenv,
+
fetchpatch,
+
makeWrapper,
+
makeDesktopItem,
+
copyDesktopItems,
+
fetchFromGitHub,
+
gradle,
+
jdk17,
+
zenity,
+
+
# for arc
+
SDL2,
+
pkg-config,
+
ant,
+
curl,
+
wget,
+
alsa-lib,
+
alsa-plugins,
+
glew,
+
+
# for soloud
+
libpulseaudio ? null,
+
libjack2 ? null,
+
+
nixosTests,
+
+
# Make the build version easily overridable.
+
# Server and client build versions must match, and an empty build version means
+
# any build is allowed, so this parameter acts as a simple whitelist.
+
# Takes the package version and returns the build version.
+
makeBuildVersion ? (v: v),
+
enableClient ? true,
+
enableServer ? true,
+
+
enableWayland ? false,
+
}:
+
+
let
+
pname = "mindustry";
+
version = "146";
+
buildVersion = makeBuildVersion version;
+
+
jdk = jdk17;
+
+
Mindustry = fetchFromGitHub {
+
owner = "Anuken";
+
repo = "Mindustry";
+
rev = "v${version}";
+
hash = "sha256-pJAJjb8rgDL5q2hfuXH2Cyb1Szu4GixeXoLMdnIAlno=";
+
};
+
Arc = fetchFromGitHub {
+
owner = "Anuken";
+
repo = "Arc";
+
rev = "v${version}";
+
hash = "sha256-L+5fshI1oo1lVdTMTBuPzqtEeR2dq1NORP84rZ83rT0=";
+
};
+
soloud = fetchFromGitHub {
+
owner = "Anuken";
+
repo = "soloud";
+
# This is pinned in Arc's arc-core/build.gradle
+
rev = "v0.9";
+
hash = "sha256-6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc=";
+
};
+
+
desktopItem = makeDesktopItem {
+
name = "Mindustry";
+
desktopName = "Mindustry";
+
exec = "mindustry";
+
icon = "mindustry";
+
categories = [ "Game" ];
+
};
+
+
in
+
assert lib.assertMsg (
+
enableClient || enableServer
+
) "mindustry: at least one of 'enableClient' and 'enableServer' must be true";
+
stdenv.mkDerivation {
+
inherit pname version;
+
+
unpackPhase = ''
+
runHook preUnpack
+
+
cp -r ${Mindustry} Mindustry
+
cp -r ${Arc} Arc
+
chmod -R u+w -- Mindustry Arc
+
cp -r ${soloud} Arc/arc-core/csrc/soloud
+
chmod -R u+w -- Arc/arc-core/csrc/soloud
+
+
runHook postUnpack
+
'';
+
+
patches = [
+
./0001-fix-include-path-for-SDL2-on-linux.patch
+
# Fix build with gradle 8.8, remove on next Arc release
+
(fetchpatch {
+
url = "https://github.com/Anuken/Arc/commit/2a91c51bf45d700091e397fd0b62384763901ae6.patch";
+
hash = "sha256-sSD78GmF14vBvNe+ajUJ4uIc4p857shTP/UkAK6Pyyg=";
+
extraPrefix = "Arc/";
+
stripLen = 1;
+
})
+
(fetchpatch {
+
url = "https://github.com/Anuken/Arc/commit/d7f8ea858c425410dbd43374271a703d4443b432.patch";
+
hash = "sha256-5LPgBOV0r/dUtpyxitTu3/9tMIqjeIKfGVJi3MEr7fQ=";
+
extraPrefix = "Arc/";
+
stripLen = 1;
+
})
+
(fetchpatch {
+
url = "https://github.com/Anuken/Mindustry/commit/695dad201fb4c2b4252f2ee5abde32e968169ba5.patch";
+
hash = "sha256-bbTjyfUl+XFG/dgD1XPddVKD/ImOP5ARAP3q0FPnt58=";
+
name = "always-use-local-arc-1.patch";
+
stripLen = 1;
+
extraPrefix = "Mindustry/";
+
})
+
(fetchpatch {
+
url = "https://github.com/Anuken/Mindustry/commit/f6082225e859c759c8d9c944250b6ecd490151ed.patch";
+
hash = "sha256-xFHdAUTS1EiHNQqw6qfzYk2LMr/DjeHoEzQfcfOUcFs=";
+
name = "always-use-local-arc-2.patch";
+
stripLen = 1;
+
extraPrefix = "Mindustry/";
+
})
+
(fetchpatch {
+
url = "https://github.com/Anuken/Mindustry/commit/e4eadbbb7f35db3093a0a3d13272bdfbedfaead3.patch";
+
hash = "sha256-L/XQAxh6UgKsTVTgQKDXNRIAdtVtaY4ameT/Yb/+1p8=";
+
name = "always-use-local-arc-3.patch";
+
stripLen = 1;
+
extraPrefix = "Mindustry/";
+
})
+
];
+
+
postPatch =
+
''
+
# Ensure the prebuilt shared objects don't accidentally get shipped
+
rm -r Arc/natives/natives-*/libs/*
+
rm -r Arc/backends/backend-*/libs/*
+
+
cd Mindustry
+
+
# Remove unbuildable iOS stuff
+
sed -i '/^project(":ios"){/,/^}/d' build.gradle
+
sed -i '/robo(vm|VM)/d' build.gradle
+
rm ios/build.gradle
+
''
+
+ lib.optionalString (!stdenv.hostPlatform.isx86) ''
+
substituteInPlace ../Arc/arc-core/build.gradle \
+
--replace-fail "-msse" ""
+
substituteInPlace ../Arc/backends/backend-sdl/build.gradle \
+
--replace-fail "-m64" ""
+
'';
+
+
mitmCache = gradle.fetchDeps {
+
inherit pname;
+
data = ./deps.json;
+
};
+
+
__darwinAllowLocalNetworking = true;
+
+
buildInputs = lib.optionals enableClient [
+
SDL2
+
alsa-lib
+
glew
+
];
+
nativeBuildInputs =
+
[
+
pkg-config
+
gradle
+
makeWrapper
+
jdk
+
]
+
++ lib.optionals enableClient [
+
ant
+
copyDesktopItems
+
curl
+
wget
+
];
+
+
desktopItems = lib.optional enableClient desktopItem;
+
+
gradleFlags = [
+
"-Pbuildversion=${buildVersion}"
+
"-Dorg.gradle.java.home=${jdk}"
+
];
+
+
buildPhase =
+
''
+
runHook preBuild
+
''
+
+ lib.optionalString enableServer ''
+
gradle server:dist
+
''
+
+ lib.optionalString enableClient ''
+
pushd ../Arc
+
gradle jnigenBuild
+
gradle jnigenJarNativesDesktop
+
glewlib=${lib.getLib glew}/lib/libGLEW.so
+
sdllib=${lib.getLib SDL2}/lib/libSDL2.so
+
patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \
+
--add-needed $glewlib \
+
--add-needed $sdllib
+
# Put the freshly-built libraries where the pre-built libraries used to be:
+
cp arc-core/libs/*/* natives/natives-desktop/libs/
+
cp extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/
+
popd
+
+
gradle desktop:dist
+
''
+
+ ''
+
runHook postBuild
+
'';
+
+
installPhase =
+
let
+
installClient = ''
+
install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar
+
mkdir -p $out/bin
+
makeWrapper ${jdk}/bin/java $out/bin/mindustry \
+
--add-flags "-jar $out/share/mindustry.jar" \
+
${lib.optionalString stdenv.hostPlatform.isLinux "--suffix PATH : ${lib.makeBinPath [ zenity ]}"} \
+
--suffix LD_LIBRARY_PATH : ${
+
lib.makeLibraryPath [
+
libpulseaudio
+
alsa-lib
+
libjack2
+
]
+
} \
+
--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/ ${lib.optionalString enableWayland ''
+
--set SDL_VIDEODRIVER wayland \
+
--set SDL_VIDEO_WAYLAND_WMCLASS Mindustry
+
''}
+
+
# Retain runtime depends to prevent them from being cleaned up.
+
# Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there,
+
# and will assume that it's not actually needed.
+
# This can cause issues.
+
# See https://github.com/NixOS/nixpkgs/issues/109798.
+
echo "# Retained runtime dependencies: " >> $out/bin/mindustry
+
for dep in ${SDL2.out} ${alsa-lib.out} ${glew.out}; do
+
echo "# $dep" >> $out/bin/mindustry
+
done
+
+
install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png
+
'';
+
installServer = ''
+
install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar
+
mkdir -p $out/bin
+
makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \
+
--add-flags "-jar $out/share/mindustry-server.jar"
+
'';
+
in
+
''
+
runHook preInstall
+
''
+
+ lib.optionalString enableClient installClient
+
+ lib.optionalString enableServer installServer
+
+ ''
+
runHook postInstall
+
'';
+
+
postGradleUpdate = ''
+
# this fetches non-gradle dependencies
+
cd ../Arc
+
gradle preJni
+
'';
+
+
passthru.tests.nixosTest = nixosTests.mindustry;
+
+
meta = {
+
homepage = "https://mindustrygame.github.io/";
+
downloadPage = "https://github.com/Anuken/Mindustry/releases";
+
description = "Sandbox tower defense game";
+
sourceProvenance = with lib.sourceTypes; [
+
fromSource
+
binaryBytecode # deps
+
];
+
license = lib.licenses.gpl3Plus;
+
maintainers = with lib.maintainers; [
+
chkno
+
fgaz
+
thekostins
+
];
+
platforms = lib.platforms.all;
+
# TODO alsa-lib is linux-only, figure out what dependencies are required on Darwin
+
broken = enableClient && stdenv.hostPlatform.isDarwin;
+
};
+
}
+67
pkgs/by-name/mp/mpb/package.nix
···
+
{
+
stdenv,
+
lib,
+
fetchFromGitHub,
+
autoreconfHook,
+
gfortran,
+
pkg-config,
+
blas,
+
lapack,
+
fftw,
+
hdf5,
+
libctl,
+
guile,
+
perl,
+
}:
+
+
assert !blas.isILP64;
+
assert !lapack.isILP64;
+
+
stdenv.mkDerivation rec {
+
pname = "mpb";
+
version = "1.11.1";
+
+
src = fetchFromGitHub {
+
owner = "NanoComp";
+
repo = pname;
+
rev = "refs/tags/v${version}";
+
hash = "sha256-+2cMjZSGdfngtGoAeZRPRPBDvflTEIOWO8Se0W6jv9k=";
+
};
+
+
nativeBuildInputs = [
+
autoreconfHook
+
gfortran
+
pkg-config
+
];
+
+
buildInputs = [
+
blas
+
lapack
+
fftw
+
hdf5
+
libctl
+
guile
+
perl
+
];
+
+
enableParallelBuilding = true;
+
+
configureFlags = [
+
"--with-libctl=yes"
+
"--with-libctl=${libctl}"
+
"--enable-maintainer-mode"
+
"--disable-dependency-tracking"
+
] ++ lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared";
+
+
doCheck = true;
+
+
meta = {
+
description = "MIT Photonic-Bands: computation of photonic band structures in periodic media";
+
homepage = "https://mpb.readthedocs.io/en/latest/";
+
license = lib.licenses.gpl2Only;
+
platforms = lib.platforms.linux;
+
maintainers = with lib.maintainers; [
+
sheepforce
+
];
+
};
+
}
+2 -2
pkgs/by-name/ob/obsidian/package.nix
···
}:
let
pname = "obsidian";
-
version = "1.7.5";
+
version = "1.7.6";
appname = "Obsidian";
meta = with lib; {
description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files";
···
filename = if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
-
hash = if stdenv.hostPlatform.isDarwin then "sha256-2gUXA0a7gcVFtTl5qiJFTAu6A9W79DiP0hd8j1Mwv3I=" else "sha256-T177UqPnPLM/2dGUdwhK21AByYrJu9wgEKOWrrGBQkA=";
+
hash = if stdenv.hostPlatform.isDarwin then "sha256-K7NLFbsTVNNH2VEXLiBM1KaG3fEWwaUkvxYh3vtKGvc=" else "sha256-5xkhm87eN36NmwG+t7SYnn20zT+ZELC7g2x+6/UGrHE=";
};
icon = fetchurl {
+45 -31
pkgs/by-name/oc/ocrfeeder/package.nix
···
-
{ lib, stdenv
-
, fetchurl
-
, pkg-config
-
, wrapGAppsHook3
-
, intltool
-
, itstool
-
, libxml2
-
, gobject-introspection
-
, gtk3
-
, goocanvas2
-
, gtkspell3
-
, isocodes
-
, python3
-
, tesseract4
-
, extraOcrEngines ? [] # other supported engines are: ocrad gocr cuneiform
+
{
+
lib,
+
stdenv,
+
fetchurl,
+
pkg-config,
+
wrapGAppsHook3,
+
intltool,
+
itstool,
+
libxml2,
+
gobject-introspection,
+
gtk3,
+
goocanvas2,
+
gtkspell3,
+
isocodes,
+
python3,
+
tesseract4,
+
extraOcrEngines ? [ ], # other supported engines are: ocrad gocr cuneiform
}:
stdenv.mkDerivation (finalAttrs: {
···
src = fetchurl {
url = "mirror://gnome/sources/ocrfeeder/${lib.versions.majorMinor finalAttrs.version}/ocrfeeder-${finalAttrs.version}.tar.xz";
-
sha256 = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0=";
+
hash = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0=";
};
nativeBuildInputs = [
···
gobject-introspection
];
+
postPatch = ''
+
substituteInPlace configure \
+
--replace-fail "import imp" "import importlib.util" \
+
--replace-fail "imp.find_module" "importlib.util.find_spec" \
+
--replace-fail "distutils" "setuptools._distutils"
+
'';
+
buildInputs = [
gtk3
goocanvas2
gtkspell3
isocodes
-
(python3.withPackages(ps: with ps; [
-
pyenchant
-
sane
-
pillow
-
reportlab
-
odfpy
-
pygobject3
-
]))
+
(python3.withPackages (
+
ps: with ps; [
+
pyenchant
+
sane
+
pillow
+
reportlab
+
odfpy
+
pygobject3
+
]
+
))
];
patches = [
# Compiles, but doesn't launch without this, see:
···
./fix-launch.diff
];
-
enginesPath = lib.makeBinPath ([
-
tesseract4
-
] ++ extraOcrEngines);
+
enginesPath = lib.makeBinPath (
+
[
+
tesseract4
+
]
+
++ extraOcrEngines
+
);
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${finalAttrs.enginesPath}")
gappsWrapperArgs+=(--set ISO_CODES_DIR "${isocodes}/share/xml/iso-codes")
'';
-
meta = with lib; {
+
meta = {
homepage = "https://gitlab.gnome.org/GNOME/ocrfeeder";
description = "Complete Optical Character Recognition and Document Analysis and Recognition program";
-
maintainers = with maintainers; [ doronbehar ];
-
license = licenses.gpl3Plus;
-
platforms = platforms.linux;
+
maintainers = with lib.maintainers; [ doronbehar ];
+
license = lib.licenses.gpl3Plus;
+
platforms = lib.platforms.linux;
};
})
+2 -2
pkgs/by-name/oi/oils-for-unix/package.nix
···
in
stdenv.mkDerivation rec {
pname = "oils-for-unix";
-
version = "0.23.0";
+
version = "0.24.0";
src = fetchurl {
url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz";
-
hash = "sha256-ydNcp4tKCO6vrIvGQ54rtAvM0zcNsiJkh/rtY0ihdSE=";
+
hash = "sha256-30r+2U1TswOngs4DgMOT1g9tIZIe8qJZIrQAgordmPM=";
};
postPatch = ''
+1 -1
pkgs/by-name/on/onioncircuits/package.nix
···
description = "GTK application to display Tor circuits and streams";
mainProgram = "onioncircuits";
license = licenses.gpl3;
-
maintainers = with maintainers; [ milran ];
+
maintainers = with maintainers; [ wattmto ];
};
}
+28 -6
pkgs/by-name/pf/pflask/package.nix
···
-
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, wafHook }:
+
{
+
lib,
+
stdenv,
+
fetchFromGitHub,
+
fetchpatch,
+
python3,
+
wafHook,
+
waf,
+
}:
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "pflask";
version = "unstable-2018-01-23";
src = fetchFromGitHub {
owner = "ghedo";
-
repo = pname;
+
repo = "pflask";
rev = "9ac31ffe2ed29453218aac89ae992abbd6e7cc69";
hash = "sha256-bAKPUj/EipZ98kHbZiFZZI3hLVMoQpCrYKMmznpSDhg=";
};
···
})
];
-
nativeBuildInputs = [ python3 wafHook ];
+
waf-version = "2.0.27";
+
+
nativeBuildInputs = [
+
python3
+
(wafHook.override {
+
waf = waf.overrideAttrs (old: {
+
version = finalAttrs.waf-version;
+
src = fetchFromGitHub {
+
inherit (old.src) owner repo;
+
rev = "waf-${finalAttrs.waf-version}";
+
hash = "sha256-GeEoD5CHubwR4ndGk7J7czEf0hWtPQr88TqJDPqeK0s=";
+
};
+
});
+
})
+
];
postInstall = ''
mkdir -p $out/bin
···
homepage = "https://ghedo.github.io/pflask/";
license = lib.licenses.bsd2;
platforms = lib.platforms.linux;
-
maintainers = [ ];
+
maintainers = with lib.maintainers; [ bot-wxt1221 ];
};
-
}
+
})
+40
pkgs/by-name/ph/phash/0001-proper-pthread-return-value.patch
···
+
From 6ac2f207e8d8e1d16ee73198abccc64d20c5f608 Mon Sep 17 00:00:00 2001
+
From: benaryorg <binary@benary.org>
+
Date: Thu, 7 Nov 2024 03:27:52 +0000
+
Subject: [PATCH 1/2] proper pthread return value
+
+
*pthread_create(3)* states that the ways for a pthread to exit includes:
+
+
> It returns from start_routine(). This is equivalent to calling pthread_exit(3) with the value supplied in the return statement.
+
+
This "retval" is a void pointer which can be anything.
+
In this case, since all threads are always joined with a parameter of NULL for the `void**` to store the retval this isn't really relevant for providing a meaningful return value.
+
However a `void*` function must return a `void*`, otherwise compilers will complain:
+
+
> pHash.cpp:416:1: warning: no return statement in function returning non-void [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wreturn-type-Wreturn-type8;;]
+
+
Therefore returning NULL seems reasonable.
+
As for the choice of NULL vs. nullptr or any other value, NULL is already widely used in the file.
+
+
Long story short: this fixes a compiler warning/error.
+
+
Signed-off-by: benaryorg <binary@benary.org>
+
---
+
src/pHash.cpp | 1 +
+
1 file changed, 1 insertion(+)
+
+
diff --git a/src/pHash.cpp b/src/pHash.cpp
+
index 07b03ad..23bbbf3 100644
+
--- a/src/pHash.cpp
+
+++ b/src/pHash.cpp
+
@@ -417,6 +417,7 @@ void *ph_image_thread(void *p)
+
memcpy(dp->hash, &hash, sizeof(hash));
+
dp->hash_length = 1;
+
}
+
+ return NULL;
+
}
+
+
DP** ph_dct_image_hashes(char *files[], int count, int threads)
+
--
+
2.44.1
+
+8 -1
pkgs/by-name/ph/phash/package.nix
···
-
{ lib, stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }:
+
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, cimg, imagemagick }:
stdenv.mkDerivation rec {
pname = "pHash";
···
rev = version;
sha256 = "sha256-frISiZ89ei7XfI5F2nJJehfQZsk0Mlb4n91q/AiZ2vA=";
};
+
+
NIX_LDFLAGS = "-lfftw3_threads";
+
+
patches = [
+
# proper pthread return value (https://github.com/clearscene/pHash/pull/20)
+
./0001-proper-pthread-return-value.patch
+
];
meta = with lib; {
description = "Compute the perceptual hash of an image";
+8 -4
pkgs/by-name/re/redlib/package.nix
···
}:
rustPlatform.buildRustPackage rec {
pname = "redlib";
-
version = "0.35.1-unstable-2024-09-22";
+
version = "0.35.1-unstable-2024-11-01";
src = fetchFromGitHub {
owner = "redlib-org";
repo = "redlib";
-
rev = "d5f137ce47de39e2c8c4ed09d13ba1f809bee560";
-
hash = "sha256-12XKeBCKciKummI43oTbKGkkY0mghA82ir2C3LhnwSs=";
+
rev = "f03bdcf472d32d51a1093528071dc329b348379d";
+
hash = "sha256-fbk0m20NpaUCWvH/l9hfmx+VKw4U3pkTkXdAeHL7bHs=";
};
-
cargoHash = "sha256-XSmeJAK18J9WxrG5orFbAB9hWVLQQ50oB223oHT3OOk=";
+
cargoHash = "sha256-PNqecQSx0Q+K3bBfbOJYWPdl7JdUTDQ4f95RUuW0vPw=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
···
"--skip=test_obfuscated_share_link"
"--skip=test_share_link_strip_json"
"--skip=test_localization_popular"
+
"--skip=test_private_sub"
+
"--skip=test_banned_sub"
+
"--skip=test_gated_sub"
# subreddit.rs
"--skip=test_fetching_subreddit"
···
"--skip=test_oauth_client"
"--skip=test_oauth_client_refresh"
"--skip=test_oauth_token_exists"
+
"--skip=test_oauth_headers_len"
];
env = {
+10
pkgs/by-name/ri/rip2/package.nix
···
rustPlatform,
fetchFromGitHub,
versionCheckHook,
+
installShellFiles,
+
stdenv,
}:
rustPlatform.buildRustPackage rec {
···
cargoHash = "sha256-l6rbeiyIsr1csBcp+428TpQYSs9RvfJutGoL/wtSGR8=";
+
nativeBuildInputs = [ installShellFiles ];
+
# TODO: Unsure why this test fails, but not a major issue so
# skipping for now.
checkFlags = [ "--skip=test_filetypes::file_type_3___fifo__" ];
···
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/rip";
+
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+
installShellCompletion --cmd rip \
+
--bash <($out/bin/rip completions bash) \
+
--fish <($out/bin/rip completions fish) \
+
--zsh <($out/bin/rip completions zsh)
+
'';
meta = {
description = "Safe and ergonomic alternative to rm";
+3 -3
pkgs/by-name/sc/screenly-cli/package.nix
···
rustPlatform.buildRustPackage rec {
pname = "screenly-cli";
-
version = "1.0.1";
+
version = "1.0.2";
src = fetchFromGitHub {
owner = "screenly";
repo = "cli";
rev = "refs/tags/v${version}";
-
hash = "sha256-7Y9n6qo5kqaV8xHYn4BFbPBF/7mCV9DJJTSz4dqrgPc=";
+
hash = "sha256-iEz6LFPzOZCOvUMx3s6entcwyEsAKirY8CiIoId/Ie0=";
};
-
cargoHash = "sha256-4fPC/BW2irA1iTKkxBhPOsxzS4uSfM3vOXhrx/7qRxg=";
+
cargoHash = "sha256-YurXcmjL44TBrLQocbCKtOEpG7d49aKU9Q/3vPoPvHg=";
nativeBuildInputs = [
pkg-config
+3 -3
pkgs/by-name/sk/skypeforlinux/package.nix
···
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
-
version = "8.131.0.202";
-
revision = "370";
+
version = "8.132.0.201";
+
revision = "373";
rpath =
lib.makeLibraryPath [
···
fetchurl {
name = "skypeforlinux-${version}-${revision}.snap";
url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap";
-
hash = "sha512-POCDkJe58ie78PIze6qADPIbjfFxNhLJt5z7ooHNIna6IrJoeqpFYIrRo9uosHkUURu83MfueeyYd6z0j+P/RQ==";
+
hash = "sha512-Hrb/MlCYTvQ/4kicsnBfdKtnUPP8nFi1TKQ4zl3dtvwUWl9QGXX//sNQoBOj6b9KkgpCi6pI04wIWp/zdRMl6Q==";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
+8 -4
pkgs/by-name/sy/syshud/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "syshud";
-
version = "0-unstable-2024-09-26";
+
version = "0-unstable-2024-11-04";
src = fetchFromGitHub {
owner = "System64fumo";
repo = "syshud";
-
rev = "0b6e4958d8ea66b54bc67f0b5aa005fa3eaa4f6f";
-
hash = "sha256-cyE7ZxesAmnepW7kI6b9Gp7R/v+yG2//EQAj4/X6c+c=";
+
rev = "157b725a3f29d67f16c25fb3062b62ad6fec4e15";
+
hash = "sha256-q04xYOdnnyUyiFc72Gzk65fWzQgYSOACPUXIk7kvIP8=";
};
postPatch = ''
substituteInPlace Makefile \
-
--replace-fail 'pkg-config' ''${PKG_CONFIG}
+
--replace-fail pkg-config ''${PKG_CONFIG}
+
substituteInPlace src/main.cpp \
+
--replace-fail /usr/share/sys64/hud/config.conf $out/share/sys64/hud/config.conf
+
substituteInPlace src/window.cpp \
+
--replace-fail /usr/share/sys64/hud/style.css $out/share/sys64/hud/style.css
'';
nativeBuildInputs = [
+17 -10
pkgs/by-name/tr/trinity/package.nix
···
-
{ lib, stdenv, fetchFromGitHub }:
+
{
+
lib,
+
stdenv,
+
fetchFromGitHub,
+
unstableGitUpdater,
+
}:
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "trinity";
-
version = "1.9-unstable-2023-07-10";
+
version = "1.9-unstable-2024-09-19";
src = fetchFromGitHub {
owner = "kernelslacker";
repo = "trinity";
-
rev = "e71872454d26baf37ae1d12e9b04a73d64179555";
-
hash = "sha256-Zy+4L1CuB2Ul5iF+AokDkAW1wheDzoCTNkvRZFGRNps=";
+
rev = "ba2360ed84a8c521d9c34af9c909315ea7c62aad";
+
hash = "sha256-lj27EtMzj+ULrAJh27rjiuL3/SzW/NRMG65l8sBi8k4=";
};
postPatch = ''
···
installFlags = [ "DESTDIR=$(out)" ];
-
meta = with lib; {
+
passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
+
+
meta = {
description = "Linux System call fuzz tester";
mainProgram = "trinity";
homepage = "https://github.com/kernelslacker/trinity";
-
license = licenses.gpl2Only;
-
maintainers = [ maintainers.dezgeg ];
-
platforms = platforms.linux;
+
license = lib.licenses.gpl2Only;
+
maintainers = [ lib.maintainers.dezgeg ];
+
platforms = lib.platforms.linux;
};
-
}
+
})
+9
pkgs/by-name/ty/typos/package.nix
···
lib,
rustPlatform,
fetchFromGitHub,
+
testers,
+
nix-update-script,
+
typos,
}:
rustPlatform.buildRustPackage rec {
···
};
cargoHash = "sha256-cn1jy8kQ6R+JU6w/sqcNP+uzSKKg3V4H97qnJAIESd0=";
+
+
passthru = {
+
tests.version = testers.testVersion { package = typos; };
+
+
updateScript = nix-update-script { };
+
};
meta = with lib; {
description = "Source code spell checker";
+45
pkgs/by-name/un/unyaffs/package.nix
···
+
{
+
fetchFromGitHub,
+
lib,
+
stdenv,
+
versionCheckHook,
+
}:
+
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "unyaffs";
+
version = "0.9";
+
+
src = fetchFromGitHub {
+
owner = "whataday";
+
repo = "unyaffs";
+
rev = "${finalAttrs.version}";
+
hash = "sha256-FcuPaxq74gVJ6UlOhFPSMtuwUAJVV/sAxAQojhmVXCs=";
+
};
+
+
preBuild = ''
+
sed -i '54i #if defined(__linux__)' unyaffs.c
+
sed -i '55i #include <sys/sysmacros.h>' unyaffs.c
+
sed -i '56i #endif' unyaffs.c
+
'';
+
+
installPhase = ''
+
runHook preInstall
+
+
install -Dm755 unyaffs -t $out/bin
+
+
runHook postInstall
+
'';
+
+
nativeInstallCheckInputs = [ versionCheckHook ];
+
doInstallCheck = true;
+
versionCheckProgramArg = "-V";
+
+
meta = {
+
description = "Tool to extract files from a YAFFS2 file system image";
+
homepage = "https://github.com/whataday/unyaffs";
+
license = lib.licenses.gpl2Only;
+
platforms = lib.platforms.unix;
+
maintainers = with lib.maintainers; [ KSJ2000 ];
+
mainProgram = "unyaffs";
+
};
+
})
+2 -2
pkgs/by-name/yu/yutto/package.nix
···
python3Packages.buildPythonApplication rec {
pname = "yutto";
-
version = "2.0.0-rc.4";
+
version = "2.0.0-rc.5";
pyproject = true;
disabled = python3Packages.pythonOlder "3.9";
···
owner = "yutto-dev";
repo = "yutto";
rev = "refs/tags/v${version}";
-
hash = "sha256-QP3sbZANsyYeZmLZSwQz6E1eysCVojRYHu/z9Szdb6U=";
+
hash = "sha256-QaApCkZtHjvGB6FOfic9wEH7rUlukwmxnrDaHkbvyJo=";
};
build-system = with python3Packages; [ hatchling ];
+31 -28
pkgs/by-name/zi/zitadel/console.nix
···
-
{ generateProtobufCode
-
, version
-
, zitadelRepo
+
{
+
generateProtobufCode,
+
version,
+
zitadelRepo,
}:
-
{ mkYarnPackage
-
, fetchYarnDeps
-
, grpc-gateway
-
, protoc-gen-grpc-web
-
, protoc-gen-js
+
{
+
lib,
+
stdenv,
+
fetchYarnDeps,
+
yarnConfigHook,
+
yarnBuildHook,
+
nodejs,
+
+
grpc-gateway,
+
protoc-gen-grpc-web,
+
protoc-gen-js,
}:
let
···
hash = "sha256-n6BJ1gSSm66yOGdHcSea/nQbjiHZX2YX2zbFT4o75/4=";
};
in
-
mkYarnPackage rec {
-
name = "zitadel-console";
+
stdenv.mkDerivation {
+
pname = "zitadel-console";
inherit version;
-
src = "${zitadelRepo}/console";
+
src = zitadelRepo;
+
+
sourceRoot = "${zitadelRepo.name}/console";
-
packageJSON = ./package.json;
offlineCache = fetchYarnDeps {
-
yarnLock = "${src}/yarn.lock";
+
yarnLock = "${zitadelRepo}/console/yarn.lock";
hash = "sha256-MWATjfhIbo3cqpzOdXP52f/0Td60n99OTU1Qk6oWmXU=";
};
-
postPatch = ''
-
substituteInPlace src/styles.scss \
-
--replace-fail "/node_modules/flag-icons" "flag-icons"
+
nativeBuildInputs = [
+
yarnConfigHook
+
yarnBuildHook
+
nodejs
+
];
-
substituteInPlace angular.json \
-
--replace-fail "./node_modules/tinycolor2" "../../node_modules/tinycolor2"
-
'';
-
-
buildPhase = ''
-
ln -s "${zitadelRepo}/docs" deps/docs
-
mkdir deps/console/src/app/proto
-
cp -r ${protobufGenerated}/* deps/console/src/app/proto/
-
yarn --offline build
+
preBuild = ''
+
cp -r ${protobufGenerated} src/app/proto
'';
installPhase = ''
-
cp -r deps/console/dist/console $out
+
runHook preInstall
+
cp -r dist/console "$out"
+
runHook postInstall
'';
-
-
doDist = false;
}
-92
pkgs/by-name/zi/zitadel/package.json
···
-
{
-
"name": "console",
-
"version": "0.0.0",
-
"scripts": {
-
"ng": "ng",
-
"start": "node prebuild.development.js && ng serve",
-
"build": "ng build --configuration production --base-href=/ui/console/",
-
"prelint": "npm run generate",
-
"lint": "ng lint && prettier --check src",
-
"lint:fix": "prettier --write src",
-
"generate": "buf generate ../proto --include-imports --include-wkt"
-
},
-
"private": true,
-
"dependencies": {
-
"@angular/animations": "^16.2.5",
-
"@angular/cdk": "^16.2.4",
-
"@angular/common": "^16.2.5",
-
"@angular/compiler": "^16.2.5",
-
"@angular/core": "^16.2.5",
-
"@angular/forms": "^16.2.5",
-
"@angular/material": "^16.2.4",
-
"@angular/material-moment-adapter": "^16.2.4",
-
"@angular/platform-browser": "^16.2.5",
-
"@angular/platform-browser-dynamic": "^16.2.5",
-
"@angular/router": "^16.2.5",
-
"@angular/service-worker": "^16.2.5",
-
"@ctrl/ngx-codemirror": "^6.1.0",
-
"@fortawesome/angular-fontawesome": "^0.13.0",
-
"@fortawesome/fontawesome-svg-core": "^6.4.2",
-
"@fortawesome/free-brands-svg-icons": "^6.4.2",
-
"@grpc/grpc-js": "^1.9.3",
-
"@netlify/framework-info": "^9.8.10",
-
"@ngx-translate/core": "^15.0.0",
-
"angular-oauth2-oidc": "^15.0.1",
-
"angularx-qrcode": "^16.0.0",
-
"buffer": "^6.0.3",
-
"codemirror": "^5.65.8",
-
"cors": "^2.8.5",
-
"file-saver": "^2.0.5",
-
"flag-icons": "^7.1.0",
-
"google-proto-files": "^4.0.0",
-
"google-protobuf": "^3.21.2",
-
"grpc-web": "^1.4.1",
-
"i18n-iso-countries": "^7.7.0",
-
"libphonenumber-js": "^1.10.49",
-
"material-design-icons-iconfont": "^6.1.1",
-
"moment": "^2.29.4",
-
"ngx-color": "^9.0.0",
-
"opentype.js": "^1.3.4",
-
"rxjs": "~7.8.0",
-
"tinycolor2": "^1.6.0",
-
"tslib": "^2.6.2",
-
"uuid": "^9.0.1",
-
"zone.js": "~0.13.3"
-
},
-
"devDependencies": {
-
"@angular-devkit/build-angular": "^16.2.2",
-
"@angular-eslint/builder": "16.2.0",
-
"@angular-eslint/eslint-plugin": "16.2.0",
-
"@angular-eslint/eslint-plugin-template": "16.2.0",
-
"@angular-eslint/schematics": "16.2.0",
-
"@angular-eslint/template-parser": "16.2.0",
-
"@angular/cli": "^16.2.2",
-
"@angular/compiler-cli": "^16.2.5",
-
"@angular/language-service": "^16.2.5",
-
"@bufbuild/buf": "^1.23.1",
-
"@types/file-saver": "^2.0.7",
-
"@types/google-protobuf": "^3.15.3",
-
"@types/jasmine": "~5.1.4",
-
"@types/jasminewd2": "~2.0.13",
-
"@types/jsonwebtoken": "^9.0.5",
-
"@types/node": "^20.7.0",
-
"@types/opentype.js": "^1.3.8",
-
"@types/qrcode": "^1.5.2",
-
"@types/uuid": "^9.0.7",
-
"@typescript-eslint/eslint-plugin": "^5.59.11",
-
"@typescript-eslint/parser": "^5.60.1",
-
"codelyzer": "^6.0.2",
-
"eslint": "^8.50.0",
-
"jasmine-core": "~4.6.0",
-
"jasmine-spec-reporter": "~7.0.0",
-
"karma": "^6.4.2",
-
"karma-chrome-launcher": "^3.2.0",
-
"karma-coverage-istanbul-reporter": "^3.0.3",
-
"karma-jasmine": "^5.1.0",
-
"karma-jasmine-html-reporter": "^2.1.0",
-
"prettier": "^3.1.1",
-
"prettier-plugin-organize-imports": "^3.2.4",
-
"protractor": "~7.0.0",
-
"typescript": "^5.1.6"
-
}
-
}
+2 -2
pkgs/development/python-modules/ailment/default.nix
···
buildPythonPackage rec {
pname = "ailment";
-
version = "9.2.127";
+
version = "9.2.128";
pyproject = true;
disabled = pythonOlder "3.11";
···
owner = "angr";
repo = "ailment";
rev = "refs/tags/v${version}";
-
hash = "sha256-yd4O4REUjTRYZ3lODlsxmbbPHY7Z2X217wQWSn3Uv3U=";
+
hash = "sha256-08cIIFuo0Kf3jLtH6STPRAJVo+0ywFCcOo5rpXHXnwA=";
};
build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/angr/default.nix
···
buildPythonPackage rec {
pname = "angr";
-
version = "9.2.127";
+
version = "9.2.128";
pyproject = true;
disabled = pythonOlder "3.11";
···
owner = "angr";
repo = "angr";
rev = "refs/tags/v${version}";
-
hash = "sha256-hGKxLgXOL+PhhYxxJJQIMcEmFjG4WC9PQE4yP+/QuBg=";
+
hash = "sha256-OAdPBmJAGqQEiQCXKZMtEoyDMS/A9pUYeTXJQ0qQYVs=";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/archinfo/default.nix
···
buildPythonPackage rec {
pname = "archinfo";
-
version = "9.2.127";
+
version = "9.2.128";
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "angr";
repo = "archinfo";
rev = "refs/tags/v${version}";
-
hash = "sha256-hIjL0pa4/TNnyFq61R0ND8o2mEjeRwUJ/S1wP1VglYg=";
+
hash = "sha256-uNzT3doBHbbRLjxTtndQx+03M9zCdOI+FuTmVea1C1M=";
};
build-system = [ setuptools ];
+11 -7
pkgs/development/python-modules/bids-validator/default.nix
···
# build-system
setuptools,
versioneer,
+
+
# dependencies
+
bidsschematools,
}:
buildPythonPackage rec {
···
version = "1.14.7.post0";
pyproject = true;
-
disabled = pythonOlder "3.7";
+
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "bids_validator";
···
hash = "sha256-5gBaUAt1+KlhWT+2fUYIUQfa2xFvWaXDtSSqBpeUW2Y=";
};
-
nativeBuildInputs = [
+
build-system = [
setuptools
versioneer
];
-
# needs packages which are not available in nixpkgs
-
doCheck = false;
+
dependencies = [
+
bidsschematools
+
];
pythonImportsCheck = [ "bids_validator" ];
-
meta = with lib; {
+
meta = {
description = "Validator for the Brain Imaging Data Structure";
homepage = "https://github.com/bids-standard/bids-validator";
changelog = "https://github.com/bids-standard/bids-validator/releases/tag/v${version}";
-
license = licenses.mit;
-
maintainers = [ ];
+
license = lib.licenses.mit;
+
maintainers = with lib.maintainers; [ wegank ];
};
}
+45
pkgs/development/python-modules/bidsschematools/default.nix
···
+
{
+
lib,
+
buildPythonPackage,
+
pythonOlder,
+
fetchPypi,
+
setuptools,
+
click,
+
pyyaml,
+
jsonschema,
+
}:
+
+
buildPythonPackage rec {
+
pname = "bidsschematools";
+
version = "0.11.3";
+
pyproject = true;
+
+
disabled = pythonOlder "3.9";
+
+
src = fetchPypi {
+
pname = "bidsschematools";
+
inherit version;
+
hash = "sha256-GvR3pOXXmdpjH2xdL+trhLW6ZdsTpEWUdNUlVQ4gFXo=";
+
};
+
+
build-system = [
+
setuptools
+
];
+
+
dependencies = [
+
click
+
pyyaml
+
jsonschema
+
];
+
+
pythonImportsCheck = [
+
"bidsschematools"
+
];
+
+
meta = {
+
description = "Python tools for working with the BIDS schema";
+
homepage = "https://github.com/bids-standard/bids-specification/tree/master/tools/schemacode";
+
license = lib.licenses.mit;
+
maintainers = with lib.maintainers; [ wegank ];
+
};
+
}
+3 -3
pkgs/development/python-modules/biliass/default.nix
···
buildPythonPackage rec {
pname = "biliass";
-
version = "2.1.0";
+
version = "2.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "yutto-dev";
repo = "yutto";
rev = "refs/tags/biliass@${version}";
-
hash = "sha256-PlZD+988KdJqYC1I1K7i+YAH1Tzr6zfXcJFR/M4mQRA=";
+
hash = "sha256-Pn6z4iDxNcLVoY4xk7v0zc8hmajWEaOYFDEw5HEYxl4=";
};
sourceRoot = "source/packages/biliass";
···
src
;
sourceRoot = "${sourceRoot}/${cargoRoot}";
-
hash = "sha256-DMKUbJSVME5siSPybdO5bOluPn3obVq1/6822uoSsDQ=";
+
hash = "sha256-7jv/Q98qyn2xnv4rNK9ifGhxo9n3X90iF9CTyqc6sHU=";
};
nativeBuildInputs = with rustPlatform; [
+2 -2
pkgs/development/python-modules/claripy/default.nix
···
buildPythonPackage rec {
pname = "claripy";
-
version = "9.2.127";
+
version = "9.2.128";
pyproject = true;
disabled = pythonOlder "3.11";
···
owner = "angr";
repo = "claripy";
rev = "refs/tags/v${version}";
-
hash = "sha256-uiB67+5zfLig1TgAzniWaRhibJKmdOPMDAfDVVfMs/0=";
+
hash = "sha256-YP2Cphf57iyZXrdseZhUkzrkop0+jCRu98ckurxS1UU=";
};
# z3 does not provide a dist-info, so python-runtime-deps-check will fail
+4 -12
pkgs/development/python-modules/cle/default.nix
···
cart,
cffi,
fetchFromGitHub,
-
minidump,
pefile,
pyelftools,
pytestCheckHook,
pythonOlder,
pyvex,
-
pyxbe,
setuptools,
sortedcontainers,
}:
let
# The binaries are following the argr projects release cycle
-
version = "9.2.127";
+
version = "9.2.128";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
owner = "angr";
repo = "binaries";
rev = "refs/tags/v${version}";
-
hash = "sha256-EgkYynllp/UGMRJmshQRpnMdwhdOkYHgoMlTiqdtZO1=";
+
hash = "sha256-wROuTg+RMp2tkjPsjHTK7aJs4SWTuIw4SsuIKIUZvkw=";
};
in
buildPythonPackage rec {
···
owner = "angr";
repo = "cle";
rev = "refs/tags/v${version}";
-
hash = "sha256-DcfFOzP7Ylms1/kAX5CIhujzj6Vpma8sb0Qyq6tSJq0=";
+
hash = "sha256-C3lp9Dhg0XZXTxnYbRMfanxVn8qJhL1VEVDrMCpkMe4=";
};
build-system = [ setuptools ];
-
pythonRelaxDeps = [ "pyvex" ];
-
dependencies = [
archinfo
cart
cffi
-
minidump
pefile
pyelftools
pyvex
-
pyxbe
sortedcontainers
];
-
nativeCheckInputs = [
-
pytestCheckHook
-
];
+
nativeCheckInputs = [ pytestCheckHook ];
# Place test binaries in the right location (location is hard-coded in the tests)
preCheck = ''
+2 -10
pkgs/development/python-modules/dulwich/default.nix
···
}:
buildPythonPackage rec {
-
version = "0.22.1";
+
version = "0.22.5";
pname = "dulwich";
format = "setuptools";
···
owner = "jelmer";
repo = "dulwich";
rev = "refs/tags/dulwich-${version}";
-
hash = "sha256-bf3ZUMX4afpdTBpFnx0HMyzCNG6V/p4eOl36djxGbtk=";
+
hash = "sha256-/YqC7y8PU+H2qjPqqzdw6iSSSElK709izLTcs9qbt1I=";
};
-
-
patches = [
-
(fetchpatch2 {
-
name = "dulwich-geventhttpclient-api-breakage.patch";
-
url = "https://github.com/jelmer/dulwich/commit/5f0497de9c37ac4f4e8f27bed8decce13765d3df.patch";
-
hash = "sha256-0GgDgmYuLCsMc9nRRLNL2W6WYrkZ/1ZnZBQusEAzLKI=";
-
})
-
];
build-system = [
setuptools
+2 -2
pkgs/development/python-modules/jsonargparse/default.nix
···
buildPythonPackage rec {
pname = "jsonargparse";
-
version = "4.33.2";
+
version = "4.34.0";
pyproject = true;
disabled = pythonOlder "3.11";
···
owner = "omni-us";
repo = "jsonargparse";
rev = "refs/tags/v${version}";
-
hash = "sha256-yY/j4UwAoe/qQjBQXgFSrv2BX7DB5EyGCdVYoioyKr8=";
+
hash = "sha256-dj2539vTmzsGNvHqjsCzqo2sqOh2ink8Ut4Mi0qCDzI=";
};
build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/lacuscore/default.nix
···
buildPythonPackage rec {
pname = "lacuscore";
-
version = "1.12.0";
+
version = "1.12.3";
pyproject = true;
disabled = pythonOlder "3.9";
···
owner = "ail-project";
repo = "LacusCore";
rev = "refs/tags/v${version}";
-
hash = "sha256-83OD/oGzjLsW0FRFyW6Yh9pwh/lcCfZDIe6uahhTRVc=";
+
hash = "sha256-cKAHNOZZtIdys0z36F0ORf6xXL/JkAgwZouvYYu/OTU=";
};
pythonRelaxDeps = [
+9 -4
pkgs/development/python-modules/meep/default.nix
···
libctl,
libGDSII,
guile,
+
mpb,
python,
numpy,
scipy,
···
libGDSII
guile
gsl
+
mpb
];
propagatedBuildInputs =
···
nativeCheckInputs = [
mpiCheckPhaseHook
];
+
pythonImportCheck = [
+
"meep.mpb"
+
];
checkPhase = ''
runHook preCheck
···
runHook postCheck
'';
-
meta = with lib; {
+
meta = {
description = "Free finite-difference time-domain (FDTD) software for electromagnetic simulations";
homepage = "https://meep.readthedocs.io/en/latest/";
-
license = licenses.gpl2Only;
-
platforms = platforms.linux;
-
maintainers = with maintainers; [
+
license = lib.licenses.gpl2Only;
+
platforms = lib.platforms.linux;
+
maintainers = with lib.maintainers; [
sheepforce
markuskowa
];
+4 -4
pkgs/development/python-modules/miasm/default.nix
···
setuptools,
}:
let
-
commit = "90dc1671b59077ee27c3d44d9d536d6659eb3bbe";
+
commit = "cbc722eed8dc807955bd46f84886ae74d161dd0c";
in
-
buildPythonPackage rec {
+
buildPythonPackage {
pname = "miasm";
-
version = "0.1.5-unstable-2024-04-28";
+
version = "0.1.5-unstable-2024-08-20";
pyproject = true;
build-system = [ setuptools ];
···
owner = "cea-sec";
repo = "miasm";
rev = commit;
-
hash = "sha256-nkRcirJLmTwSL7lwd+Yk6mteU3YPnm5ekJ4eFF5FmYo=";
+
hash = "sha256-Ot11QuMtaJ8OQDAUgV3zVxTNp0kKc0Y9EXRZD96Caow=";
};
patches = [
+22 -22
pkgs/development/python-modules/mypy-boto3/default.nix
···
"sha256-ElaYUwcYs2/Z5CoTzclkAoMERA2AknrfLh389eN2g54=";
mypy-boto3-cloudfront =
-
buildMypyBoto3Package "cloudfront" "1.35.0"
-
"sha256-ewZmBuNAs3YS2tG5WDbNBRr1y1BmmOTxvXrSASNhAp4=";
+
buildMypyBoto3Package "cloudfront" "1.35.58"
+
"sha256-s71YfOrIIPFeAci2Ca+q5QyV4+JjQ5xdQ5sU8SZE29c=";
mypy-boto3-cloudhsm =
buildMypyBoto3Package "cloudhsm" "1.35.0"
···
"sha256-wCjyRnd7RlnLRQrADd2Xmh74IsQxBfUgLIJuaZW7kjw=";
mypy-boto3-codebuild =
-
buildMypyBoto3Package "codebuild" "1.35.55"
-
"sha256-qZ0POshM6WseOoeinzEkGiZP4UxkRvyf2Y83Vv6UYas=";
+
buildMypyBoto3Package "codebuild" "1.35.59"
+
"sha256-O/ZxlUd9+dMpYfhaLQEP1XjHx1bpeebQn2aVuh7A0is=";
mypy-boto3-codecatalyst =
buildMypyBoto3Package "codecatalyst" "1.35.0"
···
"sha256-rYvtpy8Uac5YO4x/WSvUHz0aY8vYVf30gW1aLyYDbRM=";
mypy-boto3-controltower =
-
buildMypyBoto3Package "controltower" "1.35.0"
-
"sha256-Hc9S/t+sTaMHIk93/pIWowMm0qXyyKf2Jth0j/JdtyA=";
+
buildMypyBoto3Package "controltower" "1.35.59"
+
"sha256-fLh9uKE/8iAb/dOIgxe3wKJizZkXjlfBmO2hEr4/L1U=";
mypy-boto3-cur =
buildMypyBoto3Package "cur" "1.35.0"
···
"sha256-QsLASn6dGIQs/nedmPXwzHeZRPIEqWjPqfDKMbaFOmM=";
mypy-boto3-fis =
-
buildMypyBoto3Package "fis" "1.35.12"
-
"sha256-rm0PB0oie7q+8pl+efohmHe8StLZVvSWYgLIajxd3Fo=";
+
buildMypyBoto3Package "fis" "1.35.59"
+
"sha256-Wha+Y0/PXM87u4t2fXD36pe+SrEomr7V9TaxyED6jyA=";
mypy-boto3-fms =
buildMypyBoto3Package "fms" "1.35.45"
···
"sha256-rPVWNk0+Xt9kMAl8xD0xM/EIbiYPSUL8Yc8b+2RcD4o=";
mypy-boto3-gamelift =
-
buildMypyBoto3Package "gamelift" "1.35.13"
-
"sha256-Xd0jrg/w4CPn5mDgHTaahyRAu5RZxdMcpci0cx7/1sQ=";
+
buildMypyBoto3Package "gamelift" "1.35.59"
+
"sha256-OyORzgahpj8UmmKkbdl0FrYaRWtrS07/LSYIkYgcwOY=";
mypy-boto3-glacier =
buildMypyBoto3Package "glacier" "1.35.0"
···
"sha256-4QXRWahJ0y9Svi/WRIiRFfo36tkKM25bXCTMrZjE41g=";
mypy-boto3-inspector2 =
-
buildMypyBoto3Package "inspector2" "1.35.4"
-
"sha256-NslpiIBwxTvcEe/Lh8wM2PJE31JNmu4qyCZMbB+9noE=";
+
buildMypyBoto3Package "inspector2" "1.35.58"
+
"sha256-jHZg5Y9hX7KinsiwNfwAs8bg8uO71JLIKFl6xDAQJwQ=";
mypy-boto3-internetmonitor =
buildMypyBoto3Package "internetmonitor" "1.35.8"
···
"sha256-QuVCDfj8bAtFhEnrsGqDYHFbl6awqAjLDjeJn5Rq0IM=";
mypy-boto3-lambda =
-
buildMypyBoto3Package "lambda" "1.35.57"
-
"sha256-m6zdSyQbRTiCuoWH7GX7CQnZe0A2SMPb8gglgzzldYc=";
+
buildMypyBoto3Package "lambda" "1.35.58"
+
"sha256-xoBzY+4YV5s9bf98CQ9ktGKh8kO+Rv5oRzM2JOMeu/w=";
mypy-boto3-lex-models =
buildMypyBoto3Package "lex-models" "1.35.0"
···
"sha256-CwD0stU2217XD+SXTp+WRyf/qH3EOA5PuBSdTWcXOGU=";
mypy-boto3-opensearch =
-
buildMypyBoto3Package "opensearch" "1.35.52"
-
"sha256-6a9zygN6Al1yEaOwUvO2Hq/swESKrLW315diz/sgH6c=";
+
buildMypyBoto3Package "opensearch" "1.35.58"
+
"sha256-8D48c4NG00r6zpgcoK8FjQqCpOBB4DNE653lwn/K36k=";
mypy-boto3-opensearchserverless =
buildMypyBoto3Package "opensearchserverless" "1.35.52"
···
"sha256-PdOH3KaQn9d455qCR565qFlyCb8t7R8x8wXBebHgtt8=";
mypy-boto3-outposts =
-
buildMypyBoto3Package "outposts" "1.35.38"
-
"sha256-Adb8A8DVn3T00xuEtXXT+LHxwM4jh0IG3JLUiAi02ds=";
+
buildMypyBoto3Package "outposts" "1.35.58"
+
"sha256-L1Kge8GPBYFN7HkTimCTvBOEf1ge1s7FWa4nMM6gypU=";
mypy-boto3-panorama =
buildMypyBoto3Package "panorama" "1.35.0"
"sha256-HFjrSRkc3cEqImMkqC4V/lfk/ArD9/2swrK7xo9Hut4=";
mypy-boto3-payment-cryptography =
-
buildMypyBoto3Package "payment-cryptography" "1.35.0"
-
"sha256-b9gTTuQxsXE4CjZgRgbZn4xGSC7N/4v3eF4fF9fFSow=";
+
buildMypyBoto3Package "payment-cryptography" "1.35.59"
+
"sha256-WrQdJntSi1l0jLTGdx0icfUn6VLOn543GDz8WxX7h9k=";
mypy-boto3-payment-cryptography-data =
buildMypyBoto3Package "payment-cryptography-data" "1.35.45"
···
"sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo=";
mypy-boto3-rds =
-
buildMypyBoto3Package "rds" "1.35.50"
-
"sha256-doZ8u+pU5akzuLCa1T+qns/fxOakvsJR5Fj4TsrraBs=";
+
buildMypyBoto3Package "rds" "1.35.59"
+
"sha256-287lEFwBHJEvRK1b+heJrpOC6WouOoYyk1Sc1ogMVbo=";
mypy-boto3-rds-data =
buildMypyBoto3Package "rds-data" "1.35.28"
+74
pkgs/development/python-modules/nlpo3/default.nix
···
+
{
+
lib,
+
stdenv,
+
buildPythonPackage,
+
pythonAtLeast,
+
unittestCheckHook,
+
rustPlatform,
+
fetchFromGitHub,
+
rustc,
+
cargo,
+
libiconv,
+
setuptools,
+
setuptools-rust,
+
}:
+
+
buildPythonPackage rec {
+
pname = "nlpo3";
+
version = "1.4.0-unstable-2024-11-11";
+
pyproject = true;
+
+
src = fetchFromGitHub {
+
owner = "PyThaiNLP";
+
repo = "nlpo3";
+
rev = "280c47b7f98e88319c1a4ac2c7a2e5f273c00621";
+
hash = "sha256-bEN2SaINfqvTIPSROXApR3zoLdjZY0h6bdAzbMHrJdM=";
+
};
+
+
postPatch = ''
+
substituteInPlace tests/test_tokenize.py \
+
--replace-fail "data/test_dict.txt" "$src/nlpo3-python/tests/data/test_dict.txt"
+
'';
+
+
sourceRoot = "${src.name}/nlpo3-python";
+
+
cargoDeps = rustPlatform.fetchCargoTarball {
+
inherit src sourceRoot;
+
hash = "sha256-PDDlG5nLedgA+HFZzkrxtfUjTwwioQhpsk5qlbAe3ws=";
+
};
+
+
preCheck = ''
+
rm -r nlpo3
+
'';
+
+
nativeBuildInputs = [
+
rustPlatform.cargoSetupHook
+
rustc
+
cargo
+
];
+
+
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+
+
build-system = [
+
setuptools
+
setuptools-rust
+
];
+
+
nativeCheckInputs = [ unittestCheckHook ];
+
+
unittestFlagsArray = [
+
"-s"
+
"tests"
+
"-v"
+
];
+
+
pythonImportsCheck = [ "nlpo3" ];
+
+
meta = {
+
description = "Thai Natural Language Processing library in Rust, with Python and Node bindings";
+
homepage = "https://github.com/PyThaiNLP/nlpo3";
+
changelog = "https://github.com/PyThaiNLP/nlpo3/releases/tag/nlpo3-python-v${version}";
+
license = lib.licenses.asl20;
+
maintainers = with lib.maintainers; [ vizid ];
+
};
+
}
+2 -2
pkgs/development/python-modules/playwrightcapture/default.nix
···
buildPythonPackage rec {
pname = "playwrightcapture";
-
version = "1.27.0";
+
version = "1.27.1";
pyproject = true;
disabled = pythonOlder "3.9";
···
owner = "Lookyloo";
repo = "PlaywrightCapture";
rev = "refs/tags/v${version}";
-
hash = "sha256-cfgNeUZh492SkgfSJZyaDDeqxC3vHopdIe5UcKHFVck=";
+
hash = "sha256-2QF59YzveW4OJmueEs9v4qk+sONVQ/XgXhsT8nswNyo=";
};
pythonRelaxDeps = [
+7 -5
pkgs/development/python-modules/pybids/default.nix
···
nibabel,
bids-validator,
sqlalchemy,
+
universal-pathlib,
pytestCheckHook,
versioneer,
}:
···
"sqlalchemy"
];
-
nativeBuildInputs = [
+
build-system = [
setuptools
versioneer
] ++ versioneer.optional-dependencies.toml;
-
propagatedBuildInputs = [
+
dependencies = [
bids-validator
click
formulaic
···
pandas
scipy
sqlalchemy
+
universal-pathlib
];
pythonImportsCheck = [ "bids" ];
···
"test_to_df"
];
-
meta = with lib; {
+
meta = {
description = "Python tools for querying and manipulating BIDS datasets";
homepage = "https://github.com/bids-standard/pybids";
changelog = "https://github.com/bids-standard/pybids/blob/${version}/CHANGELOG.rst";
-
license = licenses.mit;
-
maintainers = [ ];
+
license = lib.licenses.mit;
+
maintainers = with lib.maintainers; [ wegank ];
mainProgram = "pybids";
};
}
+2 -2
pkgs/development/python-modules/pyvex/default.nix
···
buildPythonPackage rec {
pname = "pyvex";
-
version = "9.2.127";
+
version = "9.2.128";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-pBbbYtI2ITky6xw09/MSMvCk7HZUCJaMP86GSFkSa1o=";
+
hash = "sha256-ASo1hqxLsX4UkdhXLOArKBQdxws/maUjGb/HotAoxzw=";
};
build-system = [ setuptools ];
+15 -3
pkgs/development/python-modules/templateflow/default.nix
···
fetchFromGitHub,
pythonOlder,
setuptools-scm,
+
hatchling,
+
hatch-vcs,
nipreps-versions,
pybids,
requests,
···
hash = "sha256-COS767n2aC65m6AJihZb4NhJ4ZK9YkTAZR7Hcnc/LMs=";
};
-
nativeBuildInputs = [ setuptools-scm ];
-
propagatedBuildInputs = [
+
build-system = [
+
setuptools-scm
+
hatchling
+
hatch-vcs
+
];
+
+
dependencies = [
nipreps-versions
pybids
requests
···
];
doCheck = false; # most tests try to download data
-
#pythonImportsCheck = [ "templateflow" ]; # touches $HOME/.cache, hence needs https://github.com/NixOS/nixpkgs/pull/120300
+
+
postFixup = ''
+
export HOME=$(mktemp -d)
+
'';
+
+
pythonImportsCheck = [ "templateflow" ];
meta = with lib; {
homepage = "https://templateflow.org/python-client";
+1
pkgs/development/python-modules/websockets/default.nix
···
+ lib.optionalString (pythonOlder "3.11") ''
# Our Python 3.10 and older raise SSLError instead of SSLCertVerificationError
sed -i "s/def test_reject_invalid_server_certificate(/def skip_test_reject_invalid_server_certificate(/" tests/sync/test_client.py
+
sed -i "s/def test_reject_invalid_server_certificate(/def skip_test_reject_invalid_server_certificate(/" tests/asyncio/test_client.py
'';
nativeCheckInputs = [ unittestCheckHook ];
+2 -2
pkgs/development/tools/analysis/checkov/default.nix
···
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
-
version = "3.2.286";
+
version = "3.2.291";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
-
hash = "sha256-HW1maTuRqieOzvdpMAxs4h5SpTZ3FyKGmmDof0UItOE=";
+
hash = "sha256-CpLJD76FK2kX4p8M41S/GmGAwfTX1ugyyl10MEG4WNY=";
};
patches = [ ./flake8-compat-5.x.patch ];
+10 -10
pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
···
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
enableNixHacks ? false,
-
version ? "7.3.1",
+
version ? "7.4.0",
}:
let
···
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-
hash = "sha256-8FAfkMn8dM1pM9vcWeF7jWJy1sCfi448QomFxYlxR8c=";
+
hash = "sha256-GY1wu3O5O7K2MMJv6wjE+DLnUgwjkHdmcqhT1o9G9Cg=";
};
defaultShellUtils =
···
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64";
-
hash = "sha256-05fHtz47OilpOVYawB17VRVEDpycfYTIHBmwYCOyPjI=";
+
hash = "sha256-0glQLNAU0aT7+3Hzv0+IzgvJlfs7y8wflEwFssIvnkk=";
}
else if stdenv.hostPlatform.system == "aarch64-linux" then
fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-arm64";
-
hash = "sha256-olrlIia/oXWleXp12E+LGXv+F1m4/S4jj/t7p2/xGdM=";
+
hash = "sha256-736PrTFckHyChRh0Uv8zNtCppQYhfZWECl9+44cs6Qo=";
}
else if stdenv.hostPlatform.system == "x86_64-darwin" then
fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-x86_64";
-
hash = "sha256-LraN6MSVJQ3NzkyeLl5LvGxf+VNDJiVo/dVJIkyF1jU=";
+
hash = "sha256-FX7ZKKG7uoteEvx0fBqpsoB3Gj0aJNaC2IXgJ2ffgz4=";
}
else
fetchurl {
# stdenv.hostPlatform.system == "aarch64-darwin"
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64";
-
hash = "sha256-mB+CpHC60TSTIrb1HJxv+gqikdqxAU+sQRVDwS5mHf8=";
+
hash = "sha256-+EP+HssT4aISUZwLKkSuuXjGQm9lheNJDr7WZw1v0pU=";
};
nativeBuildInputs = defaultShellUtils;
···
outputHashMode = "recursive";
outputHash =
if stdenv.hostPlatform.system == "x86_64-linux" then
-
"sha256-II5R2YjaIejcO4Topdcz1H268eplYsYrW2oLJHKEkYw="
+
"sha256-yKy6IBIkjvN413kFMgkWCH3jAgF5AdpxrVnQyhgfWPA="
else if stdenv.hostPlatform.system == "aarch64-linux" then
-
"sha256-n8RMKf8OxJsEkcxLe7xZgMu9RyeU58NESFF9F0nLNC4="
+
"sha256-NW/JMVC7k2jBW+d8syMl9L5tDB7SQENJtlMFjAKascI="
else if stdenv.hostPlatform.system == "aarch64-darwin" then
-
"sha256-E6j31Sl+aGs6+Xdx+c0Xi6ryfYZ/ms5/HzIyc3QpMHY="
+
"sha256-QVk0Qr86U350oLJ5P50SE6CUYqn5XEqgGCXVf+89wVY="
else
# x86_64-darwin
-
"sha256-VVuNGY4+SFDhcv9iEo8JToYPzqk9NQCrYlLhhae89MM=";
+
"sha256-VDrqS9YByYxboF6AcjAR0BRZa5ioGgX1pjx09zPfWTE=";
outputHashAlgo = "sha256";
};
pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch pkgs/by-name/mi/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch
-245
pkgs/games/mindustry/default.nix
···
-
{ lib
-
, stdenv
-
, fetchpatch
-
, makeWrapper
-
, makeDesktopItem
-
, copyDesktopItems
-
, fetchFromGitHub
-
, gradle
-
, jdk17
-
, zenity
-
-
# for arc
-
, SDL2
-
, pkg-config
-
, ant
-
, curl
-
, wget
-
, alsa-lib
-
, alsa-plugins
-
, glew
-
-
# for soloud
-
, libpulseaudio ? null
-
, libjack2 ? null
-
-
, nixosTests
-
-
-
# Make the build version easily overridable.
-
# Server and client build versions must match, and an empty build version means
-
# any build is allowed, so this parameter acts as a simple whitelist.
-
# Takes the package version and returns the build version.
-
, makeBuildVersion ? (v: v)
-
, enableClient ? true
-
, enableServer ? true
-
-
, enableWayland ? false
-
}:
-
-
let
-
pname = "mindustry";
-
version = "146";
-
buildVersion = makeBuildVersion version;
-
-
jdk = jdk17;
-
-
Mindustry = fetchFromGitHub {
-
owner = "Anuken";
-
repo = "Mindustry";
-
rev = "v${version}";
-
hash = "sha256-pJAJjb8rgDL5q2hfuXH2Cyb1Szu4GixeXoLMdnIAlno=";
-
};
-
Arc = fetchFromGitHub {
-
owner = "Anuken";
-
repo = "Arc";
-
rev = "v${version}";
-
hash = "sha256-L+5fshI1oo1lVdTMTBuPzqtEeR2dq1NORP84rZ83rT0=";
-
};
-
soloud = fetchFromGitHub {
-
owner = "Anuken";
-
repo = "soloud";
-
# This is pinned in Arc's arc-core/build.gradle
-
rev = "v0.9";
-
hash = "sha256-6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc=";
-
};
-
-
desktopItem = makeDesktopItem {
-
name = "Mindustry";
-
desktopName = "Mindustry";
-
exec = "mindustry";
-
icon = "mindustry";
-
categories = [ "Game" ];
-
};
-
-
in
-
assert lib.assertMsg (enableClient || enableServer)
-
"mindustry: at least one of 'enableClient' and 'enableServer' must be true";
-
stdenv.mkDerivation {
-
inherit pname version;
-
-
unpackPhase = ''
-
cp -r ${Mindustry} Mindustry
-
cp -r ${Arc} Arc
-
chmod -R u+w -- Mindustry Arc
-
cp -r ${soloud} Arc/arc-core/csrc/soloud
-
chmod -R u+w -- Arc/arc-core/csrc/soloud
-
'';
-
-
patches = [
-
./0001-fix-include-path-for-SDL2-on-linux.patch
-
# Fix build with gradle 8.8, remove on next Arc release
-
(fetchpatch {
-
url = "https://github.com/Anuken/Arc/commit/2a91c51bf45d700091e397fd0b62384763901ae6.patch";
-
hash = "sha256-sSD78GmF14vBvNe+ajUJ4uIc4p857shTP/UkAK6Pyyg=";
-
extraPrefix = "Arc/";
-
stripLen = 1;
-
})
-
(fetchpatch {
-
url = "https://github.com/Anuken/Arc/commit/d7f8ea858c425410dbd43374271a703d4443b432.patch";
-
hash = "sha256-5LPgBOV0r/dUtpyxitTu3/9tMIqjeIKfGVJi3MEr7fQ=";
-
extraPrefix = "Arc/";
-
stripLen = 1;
-
})
-
(fetchpatch {
-
url = "https://github.com/Anuken/Mindustry/commit/695dad201fb4c2b4252f2ee5abde32e968169ba5.patch";
-
hash = "sha256-bbTjyfUl+XFG/dgD1XPddVKD/ImOP5ARAP3q0FPnt58=";
-
name = "always-use-local-arc-1.patch";
-
stripLen = 1; extraPrefix = "Mindustry/";
-
})
-
(fetchpatch {
-
url = "https://github.com/Anuken/Mindustry/commit/f6082225e859c759c8d9c944250b6ecd490151ed.patch";
-
hash = "sha256-xFHdAUTS1EiHNQqw6qfzYk2LMr/DjeHoEzQfcfOUcFs=";
-
name = "always-use-local-arc-2.patch";
-
stripLen = 1; extraPrefix = "Mindustry/";
-
})
-
(fetchpatch {
-
url = "https://github.com/Anuken/Mindustry/commit/e4eadbbb7f35db3093a0a3d13272bdfbedfaead3.patch";
-
hash = "sha256-L/XQAxh6UgKsTVTgQKDXNRIAdtVtaY4ameT/Yb/+1p8=";
-
name = "always-use-local-arc-3.patch";
-
stripLen = 1; extraPrefix = "Mindustry/";
-
})
-
];
-
-
postPatch = ''
-
# Ensure the prebuilt shared objects don't accidentally get shipped
-
rm -r Arc/natives/natives-*/libs/*
-
rm -r Arc/backends/backend-*/libs/*
-
-
cd Mindustry
-
-
# Remove unbuildable iOS stuff
-
sed -i '/^project(":ios"){/,/^}/d' build.gradle
-
sed -i '/robo(vm|VM)/d' build.gradle
-
rm ios/build.gradle
-
'';
-
-
mitmCache = gradle.fetchDeps {
-
inherit pname;
-
data = ./deps.json;
-
};
-
-
__darwinAllowLocalNetworking = true;
-
-
buildInputs = lib.optionals enableClient [
-
SDL2
-
alsa-lib
-
glew
-
];
-
nativeBuildInputs = [
-
pkg-config
-
gradle
-
makeWrapper
-
jdk
-
] ++ lib.optionals enableClient [
-
ant
-
copyDesktopItems
-
curl
-
wget
-
];
-
-
desktopItems = lib.optional enableClient desktopItem;
-
-
gradleFlags = [ "-Pbuildversion=${buildVersion}" "-Dorg.gradle.java.home=${jdk}" ];
-
-
buildPhase = lib.optionalString enableServer ''
-
gradle server:dist
-
'' + lib.optionalString enableClient ''
-
pushd ../Arc
-
gradle jnigenBuild
-
gradle jnigenJarNativesDesktop
-
glewlib=${lib.getLib glew}/lib/libGLEW.so
-
sdllib=${lib.getLib SDL2}/lib/libSDL2.so
-
patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \
-
--add-needed $glewlib \
-
--add-needed $sdllib
-
# Put the freshly-built libraries where the pre-built libraries used to be:
-
cp arc-core/libs/*/* natives/natives-desktop/libs/
-
cp extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/
-
popd
-
-
gradle desktop:dist
-
'';
-
-
installPhase = let
-
installClient = ''
-
install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar
-
mkdir -p $out/bin
-
makeWrapper ${jdk}/bin/java $out/bin/mindustry \
-
--add-flags "-jar $out/share/mindustry.jar" \
-
${lib.optionalString stdenv.hostPlatform.isLinux "--suffix PATH : ${lib.makeBinPath [zenity]}"} \
-
--suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libpulseaudio alsa-lib libjack2]} \
-
--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/ ${lib.optionalString enableWayland ''
-
--set SDL_VIDEODRIVER wayland \
-
--set SDL_VIDEO_WAYLAND_WMCLASS Mindustry
-
''}
-
-
# Retain runtime depends to prevent them from being cleaned up.
-
# Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there,
-
# and will assume that it's not actually needed.
-
# This can cause issues.
-
# See https://github.com/NixOS/nixpkgs/issues/109798.
-
echo "# Retained runtime dependencies: " >> $out/bin/mindustry
-
for dep in ${SDL2.out} ${alsa-lib.out} ${glew.out}; do
-
echo "# $dep" >> $out/bin/mindustry
-
done
-
-
install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png
-
'';
-
installServer = ''
-
install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar
-
mkdir -p $out/bin
-
makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \
-
--add-flags "-jar $out/share/mindustry-server.jar"
-
'';
-
in ''
-
runHook preInstall
-
'' + lib.optionalString enableClient installClient
-
+ lib.optionalString enableServer installServer
-
+ ''
-
runHook postInstall
-
'';
-
-
postGradleUpdate = ''
-
# this fetches non-gradle dependencies
-
cd ../Arc
-
gradle preJni
-
'';
-
-
passthru.tests.nixosTest = nixosTests.mindustry;
-
-
meta = {
-
homepage = "https://mindustrygame.github.io/";
-
downloadPage = "https://github.com/Anuken/Mindustry/releases";
-
description = "Sandbox tower defense game";
-
sourceProvenance = with lib.sourceTypes; [
-
fromSource
-
binaryBytecode # deps
-
];
-
license = lib.licenses.gpl3Plus;
-
maintainers = with lib.maintainers; [ chkno fgaz thekostins ];
-
platforms = lib.platforms.all;
-
# TODO alsa-lib is linux-only, figure out what dependencies are required on Darwin
-
broken = enableClient && stdenv.hostPlatform.isDarwin;
-
};
-
}
pkgs/games/mindustry/deps.json pkgs/by-name/mi/mindustry/deps.json
+1 -1
pkgs/os-specific/linux/hpuefi-mod/default.nix
···
homepage = "https://ftp.hp.com/pub/caps-softpaq/cmit/linuxtools/HP_LinuxTools.html";
description = "Kernel module for managing BIOS settings and updating BIOS firmware on supported HP computers";
license = lib.licenses.gpl2Only; # See "License" section in ./non-rpms/hpuefi-mod-*.tgz/README
-
platforms = lib.platforms.linux;
+
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ tomodachi94 ];
};
})
+2 -2
pkgs/os-specific/linux/zfs/unstable.nix
···
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
-
version = "2.3.0-rc2";
+
version = "2.3.0-rc3";
# rev = "";
tests = {
inherit (nixosTests.zfs) unstable;
};
-
hash = "sha256-/INlfiPpRm5JprcORzJJKyjpGIMY1LceY3yZ811uf2A=";
+
hash = "sha256-9s8Sb5+vksFsFI2Ra432QXexmbX3R17dzYzzLZviel0=";
extraLongDescription = ''
This is "unstable" ZFS, and will usually be a pre-release version of ZFS.
pkgs/servers/invidious/default.nix pkgs/by-name/in/invidious/package.nix
pkgs/servers/invidious/shards.nix pkgs/by-name/in/invidious/shards.nix
-71
pkgs/servers/invidious/update.sh
···
-
#!/usr/bin/env nix-shell
-
#!nix-shell -i bash -p curl crystal crystal2nix jq git moreutils nix nix-prefetch pkg-config pcre gnugrep
-
git_url='https://github.com/iv-org/invidious.git'
-
git_branch='master'
-
git_dir='/var/tmp/invidious.git'
-
pkg='invidious'
-
-
set -euo pipefail
-
-
cd "$(dirname "${BASH_SOURCE[0]}")"
-
-
info() {
-
if [ -t 2 ]; then
-
set -- '\033[32m%s\033[39m\n' "$@"
-
else
-
set -- '%s\n' "$@"
-
fi
-
printf "$@" >&2
-
}
-
-
json_get() {
-
jq -r "$1" < 'versions.json'
-
}
-
-
json_set() {
-
jq --arg x "$2" "$1 = \$x" < 'versions.json' | sponge 'versions.json'
-
}
-
-
old_version=$(json_get '.invidious.version')
-
today=$(LANG=C date -u +'%Y-%m-%d')
-
-
info "fetching $git_url..."
-
if [ ! -d "$git_dir" ]; then
-
git init --initial-branch="$git_branch" "$git_dir"
-
git -C "$git_dir" remote add origin "$git_url"
-
fi
-
git -C "$git_dir" fetch origin --tags "$git_branch"
-
-
new_tag="$(git -C "$git_dir" ls-remote --tags --sort=-committerdate origin | tail -n1 | grep -Po '(?<=refs/tags/).*')"
-
new_version="${new_tag#v}"
-
-
if [ "$new_version" = "$old_version" ]; then
-
info "$pkg is up-to-date."
-
exit
-
fi
-
-
info "updating to $new_tag"
-
commit="$(git -C "$git_dir" rev-list "$new_tag" --max-count=1 --abbrev-commit)"
-
date="$(git -C "$git_dir" log -1 --format=%cd --date=format:%Y.%m.%d "$commit")"
-
json_set '.invidious.date' "$date"
-
json_set '.invidious.commit' "$commit"
-
json_set '.invidious.version' "$new_version"
-
-
new_hash=$(nix-prefetch -I 'nixpkgs=../../..' "$pkg")
-
json_set '.invidious.hash' "$new_hash"
-
-
# fetch video.js dependencies
-
info "Running scripts/fetch-player-dependencies.cr..."
-
git -C "$git_dir" reset --hard "$new_tag"
-
(cd "$git_dir" && crystal run scripts/fetch-player-dependencies.cr -- --minified)
-
rm -f "$git_dir/assets/videojs/.gitignore"
-
videojs_new_hash=$(nix-hash --type sha256 --sri "$git_dir/assets/videojs")
-
json_set '.videojs.hash' "$videojs_new_hash"
-
-
if git -C "$git_dir" diff-tree --quiet "v${old_version}..${new_tag}" -- 'shard.lock'; then
-
info "shard.lock did not change since v$old_version."
-
else
-
info "Updating shards.nix..."
-
(cd "$git_dir" && crystal2nix)
-
mv "$git_dir/shards.nix" .
-
fi
pkgs/servers/invidious/versions.json pkgs/by-name/in/invidious/versions.json
pkgs/servers/invidious/videojs.nix pkgs/by-name/in/invidious/videojs.nix
pkgs/servers/invidious/videojs.sh pkgs/by-name/in/invidious/videojs.sh
+2 -2
pkgs/servers/monitoring/grafana/default.nix
···
buildGoModule rec {
pname = "grafana";
-
version = "11.3.0";
+
version = "11.3.0+security-01";
subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ];
···
owner = "grafana";
repo = "grafana";
rev = "v${version}";
-
hash = "sha256-tPPhRCZ8auVaX68YhGzpkykxqln8zzqdAZiedpmYqlk=";
+
hash = "sha256-t8D5JHhWJdsnY+SR+eiHy+jHkasAg8b5+uQ38OEFyR4=";
};
# borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
+1 -1
pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
···
description = "Input method engine for Fcitx5, which uses libskk as its backend";
homepage = "https://github.com/fcitx/fcitx5-skk";
license = licenses.gpl3Plus;
-
maintainers = with maintainers; [ milran ];
+
maintainers = with maintainers; [ wattmto ];
platforms = platforms.linux;
};
}
+3 -10
pkgs/top-level/all-packages.nix
···
inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security;
};
-
trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; };
-
ufolint = with python3Packages; toPythonApplication ufolint;
valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };
···
input-remapper = python3Packages.callPackage ../tools/inputmethods/input-remapper { };
internetarchive = with python3Packages; toPythonApplication internetarchive;
-
-
invidious = callPackage ../servers/invidious { };
iocextract = with python3Packages; toPythonApplication iocextract;
···
autoconf = buildPackages.autoconf269;
};
-
gpac = callPackage ../applications/video/gpac {
-
inherit (darwin.apple_sdk.frameworks) Carbon;
-
};
+
gpac = callPackage ../applications/video/gpac { };
gpgme = callPackage ../development/libraries/gpgme { };
···
manaplus = callPackage ../games/manaplus { stdenv = gcc11Stdenv; };
-
mindustry = callPackage ../games/mindustry { };
-
mindustry-wayland = callPackage ../games/mindustry {
+
mindustry-wayland = callPackage ../by-name/mi/mindustry/package.nix {
enableWayland = true;
-
mindustry-server = callPackage ../games/mindustry {
+
mindustry-server = callPackage ../by-name/mi/mindustry/package.nix {
enableClient = false;
enableServer = true;
+4
pkgs/top-level/python-packages.nix
···
bids-validator = callPackage ../development/python-modules/bids-validator { };
+
bidsschematools = callPackage ../development/python-modules/bidsschematools { };
+
biliass = callPackage ../development/python-modules/biliass { };
bilibili-api-python = callPackage ../development/python-modules/bilibili-api-python { };
···
nkdfu = callPackage ../development/python-modules/nkdfu { };
nlpcloud = callPackage ../development/python-modules/nlpcloud { };
+
+
nlpo3 = callPackage ../development/python-modules/nlpo3 { };
nltk = callPackage ../development/python-modules/nltk { };
+1
pkgs/top-level/release.nix
···
"ghc94"
"ghc96"
"ghc98"
+
"ghc910"
] (compilerName: {
inherit (packagePlatforms pkgs.haskell.packages.${compilerName})
haskell-language-server;