mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
da140d2dca
134 changed files with 1424 additions and 841 deletions
|
|
@ -93,6 +93,8 @@
|
|||
This update introduces several breaking changes: the Python plugin interface is now v5.0, the `PATH` plugin has been renamed to `Commandline`, and the QStylesheets-based widgets box model frontend has been removed.
|
||||
For more information read the [changelog for 34.0.0](https://albertlauncher.github.io/2026/01/19/albert-v34.0.0-released/).
|
||||
|
||||
- `asciinema_3` is now renamed to `asciinema` and the old `asciinema` version 2.x.x written in python was removed.
|
||||
|
||||
- `sing-box` has been updated to 1.13.0, which has removed some deprecated options. See [upstream documentation](https://sing-box.sagernet.org/configuration/) for details and migration options.
|
||||
|
||||
- `cargo-codspeed` has been updated from `3.0.5` to `4.2.0`. Version `4.0.0` includes breaking changes. For more information read the [changelog for 4.0.0](https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/v4.0.0).
|
||||
|
|
|
|||
|
|
@ -23589,6 +23589,13 @@
|
|||
githubId = 53882428;
|
||||
name = "Erik Rodriguez";
|
||||
};
|
||||
roehrijn = {
|
||||
email = "jan.roehrich@loft.sh";
|
||||
github = "roehrijn";
|
||||
githubId = 2474078;
|
||||
name = "Jan Roehrich";
|
||||
keys = [ { fingerprint = "21C1 F506 455E 95B4 EB39 D566 BAE1 2FF6 0C8A 97F2"; } ];
|
||||
};
|
||||
rogarb = {
|
||||
email = "rogarb@rgarbage.fr";
|
||||
github = "rogarb";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,10 @@
|
|||
|
||||
isoImage.edition = lib.mkDefault "plasma6";
|
||||
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
services.desktopManager.plasma6 = {
|
||||
enable = true;
|
||||
enableQt5Integration = false;
|
||||
};
|
||||
|
||||
# Automatically login as nixos.
|
||||
services.displayManager = {
|
||||
|
|
|
|||
|
|
@ -3898,8 +3898,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "redhat";
|
||||
name = "vscode-yaml";
|
||||
version = "1.22.0";
|
||||
hash = "sha256-Xsy2350zAxSEhJgCl5/bVwWEwaXgmnN0Y/orDjwNuw4=";
|
||||
version = "1.23.0";
|
||||
hash = "sha256-GC7AIQIUw+F5rBscTe+ulKt/97s7p636TLRvmcT9b9c=";
|
||||
};
|
||||
meta = {
|
||||
description = "YAML Language Support by Red Hat, with built-in Kubernetes syntax support";
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "latex-workshop";
|
||||
publisher = "James-Yu";
|
||||
version = "10.14.1";
|
||||
hash = "sha256-lsbiKzZTlkq/9K7ptLg0kHAd4i5OyNh2pLGGYUOJS9A=";
|
||||
version = "10.15.2";
|
||||
hash = "sha256-H/WJdkwfiNIFBc4dW6XqB6QopKZYjYN/zDVUpoY3erk=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.81.0";
|
||||
hash = "sha256-gVQmKuyUH+bXpr7X2Z23U2oKFnAV2mxhckjef2uL8KQ=";
|
||||
version = "3.82.0";
|
||||
hash = "sha256-+CtWfRGumMTFckmU9Z8TAwrn35WiUrri1x6XL9khOnM=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -29,6 +29,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# K&R-style declarations in vendored mimetex break under gcc 15's C23 default.
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace app/app.pro \
|
||||
--replace /usr/local/bin $out/bin \
|
||||
|
|
|
|||
|
|
@ -222,9 +222,14 @@ let
|
|||
ro_mounts+=(--ro-bind /etc /.host-etc)
|
||||
fi
|
||||
|
||||
declare -A etc_ignored_set
|
||||
for ign in "''${etc_ignored[@]}"; do
|
||||
etc_ignored_set[$ign]=1
|
||||
done
|
||||
|
||||
# link selected etc entries from the actual root
|
||||
for i in ${escapeShellArgs etcBindEntries}; do
|
||||
if [[ "''${etc_ignored[@]}" =~ "$i" ]]; then
|
||||
if [[ -n "''${etc_ignored_set[$i]:-}" ]]; then
|
||||
continue
|
||||
fi
|
||||
if [[ -e $i ]]; then
|
||||
|
|
@ -232,11 +237,21 @@ let
|
|||
fi
|
||||
done
|
||||
|
||||
declare -A ignored_set
|
||||
for ign in "''${ignored[@]}"; do
|
||||
ignored_set[$ign]=1
|
||||
done
|
||||
|
||||
declare -a auto_mounts
|
||||
# loop through all directories in the root
|
||||
for dir in /*; do
|
||||
# if it is a directory and it is not ignored
|
||||
if [[ -d "$dir" ]] && [[ ! "''${ignored[@]}" =~ "$dir" ]]; then
|
||||
# if it is a directory and not already provided by the FHS env or
|
||||
# explicitly ignored, bind-mount it into the chroot. Use exact match
|
||||
# via associative array because regex substring matching incorrectly
|
||||
# skips prefixes (e.g. /sb would match /sbin and never get mounted,
|
||||
# breaking --chdir when CWD is on a custom mount like /sb/project).
|
||||
# https://github.com/NixOS/nixpkgs/issues/241151
|
||||
if [[ -d "$dir" ]] && [[ -z "''${ignored_set[$dir]:-}" ]]; then
|
||||
# add it to the mount list
|
||||
auto_mounts+=(--bind "$dir" "$dir")
|
||||
fi
|
||||
|
|
|
|||
140
pkgs/by-name/am/amnezia-vpn-bin/package.nix
Normal file
140
pkgs/by-name/am/amnezia-vpn-bin/package.nix
Normal file
|
|
@ -0,0 +1,140 @@
|
|||
{
|
||||
stdenv,
|
||||
fetchzip,
|
||||
lib,
|
||||
libarchive,
|
||||
makeWrapper,
|
||||
autoPatchelfHook,
|
||||
libxkbcommon,
|
||||
libxcb-cursor,
|
||||
libxcb-wm,
|
||||
libxcb-util,
|
||||
libxcb-image,
|
||||
libxcb-keysyms,
|
||||
libxcb-render-util,
|
||||
krb5,
|
||||
brotli,
|
||||
fontconfig,
|
||||
freetype,
|
||||
gtk3,
|
||||
pango,
|
||||
at-spi2-atk,
|
||||
unixodbc,
|
||||
firebird,
|
||||
libdrm,
|
||||
openldap,
|
||||
bash,
|
||||
kdePackages,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amnezia-vpn-bin";
|
||||
version = "4.8.15.4";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/amnezia-vpn/amnezia-client/releases/download/${finalAttrs.version}/AmneziaVPN_${finalAttrs.version}_linux_x64.tar";
|
||||
hash = "sha256-Dr8zuzgwMAPXOTh69URFvA7EzGMnfBFO6kPhjhtjr6A=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
libarchive
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.cc
|
||||
bash
|
||||
libxkbcommon
|
||||
libxcb-cursor
|
||||
libxcb-wm
|
||||
libxcb-util
|
||||
libxcb-image
|
||||
libxcb-keysyms
|
||||
libxcb-render-util
|
||||
krb5.lib
|
||||
brotli.lib
|
||||
fontconfig.lib
|
||||
freetype
|
||||
gtk3
|
||||
pango
|
||||
at-spi2-atk
|
||||
unixodbc
|
||||
firebird
|
||||
libdrm
|
||||
openldap
|
||||
kdePackages.wayland
|
||||
];
|
||||
|
||||
# These libraries are not available in nixpkgs. They are Oracle Instant Client
|
||||
# (libclntsh.so.23.1) and UCanAccess/Mimer SQL (libmimerapi.so) drivers that
|
||||
# are bundled with Qt's SQlite database plugins (libqsqlora, libqsqlmimer).
|
||||
# The Amnezia VPN binary ships pre-linked against these Qt database drivers
|
||||
# even though it does not use them. Without ignoring these missing deps,
|
||||
# autoPatchelfHook would fail the build.
|
||||
autoPatchelfIgnoreMissingDeps = [
|
||||
"libclntsh.so.23.1"
|
||||
"libmimerapi.so"
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/amnezia-vpn $out/bin $out/share/applications $out/lib/systemd/system $out/share/icons/hicolor/512x512/apps
|
||||
|
||||
bsdtar -xf AmneziaVPN_Linux_Installer.bin -C $out/share/amnezia-vpn
|
||||
|
||||
makeWrapper "$out/share/amnezia-vpn/client/bin/AmneziaVPN" "$out/bin/AmneziaVPN" \
|
||||
--prefix LD_LIBRARY_PATH : "$out/share/amnezia-vpn/client/lib" \
|
||||
--set QML_IMPORT_PATH "$out/share/amnezia-vpn/client/qml" \
|
||||
--set QML2_IMPORT_PATH "$out/share/amnezia-vpn/client/qml" \
|
||||
--set QT_PLUGIN_PATH "$out/share/amnezia-vpn/client/plugins" \
|
||||
--set QT_QPA_PLATFORM_PLUGIN_PATH "$out/share/amnezia-vpn/client/plugins/platforms" \
|
||||
--set QTDIR "$out/share/amnezia-vpn/client" \
|
||||
--set CQT_PKG_ROOT "$out/share/amnezia-vpn/client"
|
||||
|
||||
makeWrapper "$out/share/amnezia-vpn/service/bin/AmneziaVPN-service" "$out/bin/AmneziaVPN-service" \
|
||||
--prefix LD_LIBRARY_PATH : "$out/share/amnezia-vpn/client/lib" \
|
||||
--prefix LD_LIBRARY_PATH : "$out/share/amnezia-vpn/service/lib" \
|
||||
--set QML_IMPORT_PATH "$out/share/amnezia-vpn/service/qml" \
|
||||
--set QML2_IMPORT_PATH "$out/share/amnezia-vpn/service/qml" \
|
||||
--set QT_PLUGIN_PATH "$out/share/amnezia-vpn/service/plugins" \
|
||||
--set QT_QPA_PLATFORM_PLUGIN_PATH "$out/share/amnezia-vpn/service/plugins/platforms" \
|
||||
--set QTDIR "$out/share/amnezia-vpn/service" \
|
||||
--set CQT_PKG_ROOT "$out/share/amnezia-vpn/service"
|
||||
|
||||
substituteInPlace $out/share/amnezia-vpn/AmneziaVPN.service \
|
||||
--replace-fail "ExecStart=/opt/AmneziaVPN/service/AmneziaVPN-service.sh" "AmneziaVPN-service" \
|
||||
--replace-fail "Environment=LD_LIBRARY_PATH=/opt/AmneziaVPN/client/lib" ""
|
||||
ln -s $out/share/amnezia-vpn/AmneziaVPN.service $out/lib/systemd/system/AmneziaVPN.service
|
||||
|
||||
substituteInPlace $out/share/amnezia-vpn/AmneziaVPN.desktop \
|
||||
--replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "AmneziaVPN"
|
||||
ln -s $out/share/amnezia-vpn/AmneziaVPN.desktop $out/share/applications/AmneziaVPN.desktop
|
||||
|
||||
ln -s $out/share/amnezia-vpn/AmneziaVPN.png $out/share/icons/hicolor/512x512/apps/AmneziaVPN.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Amnezia VPN Client (binary release)";
|
||||
downloadPage = "https://amnezia.org/en/downloads";
|
||||
homepage = "https://github.com/amnezia-vpn/amnezia-client";
|
||||
license = lib.licenses.gpl3;
|
||||
mainProgram = "AmneziaVPN";
|
||||
maintainers = with lib.maintainers; [ sund3RRR ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "andcli";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
subPackages = [ "cmd/andcli" ];
|
||||
|
||||
|
|
@ -17,10 +17,10 @@ buildGoModule (finalAttrs: {
|
|||
owner = "tjblackheart";
|
||||
repo = "andcli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iNquGZfnXIo/UcTcRYdw+reV5TEPymHsX3kZdT66IPw=";
|
||||
hash = "sha256-EtfsSLyZs5hADJRE5xvn2mu6A04Sz9e21Y4+VkopCY0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZfU8Sf9M2dz9aIhwiK58zGIrcpmaw8wMAdcpxxvkUsQ=";
|
||||
vendorHash = "sha256-CHWypAA2BpHop5LGkjZVTBL4dGzWfrwDJcFrtGTBAb4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
asciinema,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "asciinema-automation";
|
||||
version = "0.2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PierreMarchand20";
|
||||
repo = "asciinema_automation";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VfIr7w/5hQwr6XYuC3f8h71uScr0lBdx6PyO1hpiZhA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.setuptools
|
||||
python3.pkgs.wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
asciinema
|
||||
pexpect
|
||||
];
|
||||
|
||||
optional-dependencies = with python3.pkgs; {
|
||||
dev = [
|
||||
mypy
|
||||
pytest
|
||||
ruff
|
||||
types-pexpect
|
||||
];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "asciinema_automation" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/PierreMarchand20/asciinema_automation/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
description = "CLI utility to automate asciinema recordings";
|
||||
homepage = "https://github.com/PierreMarchand20/asciinema_automation";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "asciinema-automation";
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
|
@ -1,36 +1,62 @@
|
|||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
python3,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "asciinema";
|
||||
version = "2.4.0";
|
||||
pyproject = true;
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asciinema";
|
||||
repo = "asciinema";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-UegLwpJ+uc9cW3ozLQJsQBjIGD7+vzzwzQFRV5gmDmI=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-03olFWB/6O7V/B9gz6QACMxugrIx560fpp81IGVWv58=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
cargoHash = "sha256-B6s3uUPGL8m076dl3P26j+frHWLi+wzED41BQ/rQAM8=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/pty_test.py \
|
||||
--replace-fail "python3" "${python3Packages.python.interpreter}"
|
||||
env.ASCIINEMA_GEN_DIR = "gendir";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeCheckInputs = [ python3 ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage gendir/man/*
|
||||
installShellCompletion --cmd asciinema \
|
||||
--bash gendir/completion/asciinema.bash \
|
||||
--fish gendir/completion/asciinema.fish \
|
||||
--zsh gendir/completion/_asciinema
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ python3Packages.pytestCheckHook ];
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Terminal session recorder and the best companion of asciinema.org";
|
||||
homepage = "https://asciinema.org/";
|
||||
description = "Terminal session recorder and the best companion of asciinema.org";
|
||||
longDescription = ''
|
||||
asciinema is a suite of tools for recording, replaying, and sharing
|
||||
terminal sessions. It is free and open-source software (FOSS), created
|
||||
by Marcin Kulik.
|
||||
|
||||
Its typical use cases include creating tutorials, demonstrating
|
||||
command-line tools, and sharing reproducible bug reports. It focuses on
|
||||
simplicity and interoperability, which makes it a popular choice among
|
||||
computer users working with the command-line, such as developers or
|
||||
system administrators.
|
||||
'';
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "asciinema";
|
||||
maintainers = with lib.maintainers; [
|
||||
jiriks74
|
||||
llakala
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
python3,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "asciinema";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asciinema";
|
||||
repo = "asciinema";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-03olFWB/6O7V/B9gz6QACMxugrIx560fpp81IGVWv58=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-B6s3uUPGL8m076dl3P26j+frHWLi+wzED41BQ/rQAM8=";
|
||||
|
||||
env.ASCIINEMA_GEN_DIR = "gendir";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeCheckInputs = [ python3 ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage gendir/man/*
|
||||
installShellCompletion --cmd asciinema \
|
||||
--bash gendir/completion/asciinema.bash \
|
||||
--fish gendir/completion/asciinema.fish \
|
||||
--zsh gendir/completion/_asciinema
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://asciinema.org/";
|
||||
description = "Terminal session recorder and the best companion of asciinema.org";
|
||||
longDescription = ''
|
||||
asciinema is a suite of tools for recording, replaying, and sharing
|
||||
terminal sessions. It is free and open-source software (FOSS), created
|
||||
by Marcin Kulik.
|
||||
|
||||
Its typical use cases include creating tutorials, demonstrating
|
||||
command-line tools, and sharing reproducible bug reports. It focuses on
|
||||
simplicity and interoperability, which makes it a popular choice among
|
||||
computer users working with the command-line, such as developers or
|
||||
system administrators.
|
||||
'';
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
mainProgram = "asciinema";
|
||||
maintainers = with lib.maintainers; [
|
||||
jiriks74
|
||||
llakala
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
@ -18,13 +18,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "attyx";
|
||||
version = "0.3.15";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "semos-labs";
|
||||
repo = "attyx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-w71MyTlnuJBdC9HtXm9hdYNv+ONnh8Ii3i2BhmmcXz4=";
|
||||
hash = "sha256-9OTvpkkIo6pb9G2mvlNeZrwyOwIhAM7f9zy1LJzxJG0=";
|
||||
};
|
||||
|
||||
deps = callPackage ./build.zig.zon.nix { };
|
||||
|
|
|
|||
|
|
@ -17,18 +17,18 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aws-cdk-cli";
|
||||
version = "2.1104.0";
|
||||
version = "2.1116.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cdk-cli";
|
||||
tag = "cdk@v${finalAttrs.version}";
|
||||
hash = "sha256-bIrTc87gk14ckVhcoZKa1aOo0wpWZCceafpxzKLcDEY=";
|
||||
hash = "sha256-mRr5G42RrO87AdJOTLaM+EPprTFCI7eVxzUhafrGOxA=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-JuklEESNm/eadB5iBvomfY87NRaPywEnwL2GtPUTQ2Y=";
|
||||
hash = "sha256-cjJBaq65sNWOFMFB1HAgGScxJlBZKnwkGipDd4aXhDE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bcu";
|
||||
version = "1.1.119";
|
||||
version = "1.1.128";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nxp-imx";
|
||||
repo = "bcu";
|
||||
tag = "bcu_${finalAttrs.version}";
|
||||
hash = "sha256-GVnUkIoqHED/9c3Tr4M29DB+t6Q8OPDcxVWKNn/lU/8=";
|
||||
hash = "sha256-8q9xJYEZfyC8ETNi3q8YQOtBGMmI4EQLp7LKxPaU65Q=";
|
||||
};
|
||||
|
||||
patches = [ ./darwin-install.patch ];
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bella";
|
||||
version = "0.1.8";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "josephmawa";
|
||||
repo = "Bella";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IjRjo5zKoXFK+4F7OtSYuk62Pif7HDAi0E/3+t9rjv4=";
|
||||
hash = "sha256-gIz6Vjs4L7dSVyXTE//vmjIqisu5vBTUoE6cET52G4c=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@ let
|
|||
{ modRoot, vendorHash }:
|
||||
buildGoModule rec {
|
||||
pname = "bird-lg-${modRoot}";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xddxdd";
|
||||
repo = "bird-lg-go";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-60QyqilUI0yNCTZrCyUZhQYFio0gP/Z5Lcb3btlQRaE=";
|
||||
hash = "sha256-xKDpaGnMv8e2OKV3547d7Jsq3VFNwayhCL2dGKVYSZM=";
|
||||
};
|
||||
|
||||
doDist = false;
|
||||
|
|
|
|||
|
|
@ -38,12 +38,12 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bitwig-studio6";
|
||||
version = "6.0";
|
||||
version = "6.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
name = "bitwig-studio-${finalAttrs.version}.deb";
|
||||
url = "https://www.bitwig.com/dl/Bitwig%20Studio/${finalAttrs.version}/installer_linux";
|
||||
hash = "sha256-jrCTgaxfeWhfKwLeKLmqTQWS7RVbVnHqJ0InCipmm8k=";
|
||||
hash = "sha256-tczgtA4v3a5Qjxaa6ZvaiFDWD6dhRw19vj8IMxkyCNI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -71,6 +71,8 @@ let
|
|||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/caido.desktop \
|
||||
-t $out/share/applications
|
||||
substituteInPlace $out/share/applications/caido.desktop \
|
||||
--replace-fail "Exec=AppRun --no-sandbox %U" "Exec=caido-desktop %U"
|
||||
install -m 444 -D ${appimageContents}/caido.png \
|
||||
$out/share/icons/hicolor/512x512/apps/caido.png
|
||||
wrapProgram $out/bin/${pname} \
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-binstall";
|
||||
version = "1.18.1";
|
||||
version = "1.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-bins";
|
||||
repo = "cargo-binstall";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SOiwme6MIOzro5/85rgEP90odXUUqeTDzn1ZsKDS4Z4=";
|
||||
hash = "sha256-b4S8oPK1U84Oy3hhJSxJxToaFF5l4V2Tea0kGn3hW0A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UW960ls3O+0CiQHoFvkhieL+t0dG9RJ3zi/Pu37kvbY=";
|
||||
cargoHash = "sha256-E+exhtfJiOTQIZm44WyA0yptUn7wymXFRlDyAsshcKA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
fetchFromGitHub,
|
||||
cmake,
|
||||
cctools,
|
||||
libiconv,
|
||||
llvmPackages,
|
||||
ninja,
|
||||
openssl,
|
||||
|
|
@ -19,23 +18,25 @@
|
|||
}:
|
||||
let
|
||||
stdenv = if cudaSupport then cudaPackages.backendStdenv else llvmPackages.stdenv;
|
||||
buildPythonBindingsEnv = python3Packages.python.withPackages (
|
||||
ps: with ps; [
|
||||
cython
|
||||
numpy
|
||||
]
|
||||
);
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "catboost";
|
||||
version = "1.2.7";
|
||||
version = "1.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catboost";
|
||||
repo = "catboost";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-I3geFdVQ1Pm61eRXi+ueaxel3QRb8EJV9f4zV2Q7kk4=";
|
||||
hash = "sha256-z68vflYgO3cWeOkb417Gyco1Fqb98ulyRgI+OS+B4is=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./remove-conan.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmake/common.cmake \
|
||||
--replace-fail "\''${RAGEL_BIN}" "${ragel}/bin/ragel" \
|
||||
|
|
@ -43,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
shopt -s globstar
|
||||
for cmakelists in **/CMakeLists.*; do
|
||||
sed -i "s/OpenSSL::OpenSSL/OpenSSL::SSL/g" $cmakelists
|
||||
sed -i "s/openssl::openssl/OpenSSL::SSL/g" $cmakelists
|
||||
done
|
||||
'';
|
||||
|
||||
|
|
@ -53,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
buildPythonBindingsEnv
|
||||
cmake
|
||||
llvmPackages.bintools
|
||||
ninja
|
||||
(python3Packages.python.withPackages (ps: with ps; [ six ]))
|
||||
ragel
|
||||
yasm
|
||||
]
|
||||
|
|
@ -71,9 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
openssl
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_cudart
|
||||
cudaPackages.cuda_cccl
|
||||
|
|
@ -101,7 +99,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
(lib.cmakeBool "CMAKE_POSITION_INDEPENDENT_CODE" true)
|
||||
(lib.cmakeFeature "CATBOOST_COMPONENTS" "app;libs${lib.optionalString pythonSupport ";python-package"}")
|
||||
(lib.cmakeBool "HAVE_CUDA" cudaSupport)
|
||||
];
|
||||
]
|
||||
++ lib.optional pythonSupport (
|
||||
lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}"
|
||||
);
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 24ffd1225a..700adcc246 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -39,7 +39,6 @@ include(cmake/global_flags.cmake)
|
||||
include(cmake/global_vars.cmake)
|
||||
include(cmake/archive.cmake)
|
||||
include(cmake/common.cmake)
|
||||
-include(cmake/conan1_deprecated.cmake)
|
||||
include(cmake/cuda.cmake)
|
||||
include(cmake/cython.cmake)
|
||||
include(cmake/fbs.cmake)
|
||||
@@ -48,21 +47,6 @@ include(cmake/recursive_library.cmake)
|
||||
include(cmake/shared_libs.cmake)
|
||||
include(cmake/swig.cmake)
|
||||
|
||||
-if (CMAKE_CROSSCOMPILING)
|
||||
- include(${PROJECT_BINARY_DIR}/conan_paths.cmake)
|
||||
-else()
|
||||
- conan_cmake_autodetect(settings)
|
||||
- conan_cmake_install(
|
||||
- PATH_OR_REFERENCE ${PROJECT_SOURCE_DIR}
|
||||
- INSTALL_FOLDER ${PROJECT_BINARY_DIR}
|
||||
- BUILD missing
|
||||
- REMOTE conancenter
|
||||
- SETTINGS ${settings}
|
||||
- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}"
|
||||
- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}"
|
||||
- )
|
||||
-endif()
|
||||
-
|
||||
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
|
||||
include(CMakeLists.linux-x86_64.txt)
|
||||
@@ -93,4 +77,3 @@ elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86")
|
||||
elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86_64")
|
||||
include(CMakeLists.android-x86_64.txt)
|
||||
endif()
|
||||
-
|
||||
|
|
@ -35,14 +35,14 @@ let
|
|||
in
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "checkov";
|
||||
version = "3.2.526";
|
||||
version = "3.2.527";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-AWr95ZU7B3N6KZpJvPM3w41qv0ejoDtlRIEdDSH50w0=";
|
||||
hash = "sha256-PKG4WzXtocfE9rwg3E77BkWREs7RhAzmdv9mz5VsbLA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "chezmoi";
|
||||
version = "2.70.2";
|
||||
version = "2.70.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-47tc3L3iUVt+i13qyZMxRYb59Y/id/+EMQfbZGsMJzQ=";
|
||||
hash = "sha256-1O2KXDOs9U079A12oJ5reIO5HXyrn4+hfKfQiadFEM4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uTbU8lrMTfyiljJ6flo88k3xJrhZJCzPuyu/hFrRTGo=";
|
||||
vendorHash = "sha256-vejh1aeniksXJ7xda8fEYiqe4FEsYzJpGMtr59uHByY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "circleci-cli";
|
||||
version = "0.1.35800";
|
||||
version = "0.1.36202";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CircleCI-Public";
|
||||
repo = "circleci-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Mxeyij1S0mrVTBNFDgnlIFCHYik47sHtrgbc1cjObbM=";
|
||||
sha256 = "sha256-79B1zQ6n066onSf08vYRXNxoq+pvBRyHAXPiTkhqMm8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vTYepN/srd5qb2o1O5KwcGBwvKmV1DLG3/4OdtKJpVk=";
|
||||
|
|
|
|||
|
|
@ -3,22 +3,23 @@
|
|||
stdenvNoCC,
|
||||
buildGraalvmNativeImage,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
writeScript,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildGraalvmNativeImage (finalAttrs: {
|
||||
pname = "clojure-lsp";
|
||||
version = "2025.11.28-12.47.43";
|
||||
version = "2026.02.20-16.08.58";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${finalAttrs.version}/clojure-lsp-standalone.jar";
|
||||
hash = "sha256-An7sTudpP2Ct32sYShNhgRsHgJJIN9H+sR5MlQ8i+7o=";
|
||||
hash = "sha256-sSE/BIRT5CNc2ZS3LwSMLvQDVKLMlM1BIhKq6joX3c8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
# These build args mirror the build.clj upstream
|
||||
# ref: https://github.com/clojure-lsp/clojure-lsp/blob/2024.08.05-18.16.00/cli/build.clj#L141-L144
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildNpmPackage {
|
||||
pname = "coc-markdownlint";
|
||||
version = "0-unstable-2026-04-01";
|
||||
version = "0-unstable-2026-05-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-markdownlint";
|
||||
rev = "9a92eef6adbd6ba7b1afe50bd9a3c82b94902c51";
|
||||
hash = "sha256-5pfsaZFA1OYwREB3FqyUQY4D47dKH22pQV8dBgPiipo=";
|
||||
rev = "91345f973c7fde3e72f95bc7648043c35e23e007";
|
||||
hash = "sha256-Uj+PKaihRaWybWvt82Aenmt1/seTsJwgb4LSF+gIAc0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-J6gYA3eP2PWK3kesJDL5tqHOY/j2PoC+uhVxpeYVnsk=";
|
||||
npmDepsHash = "sha256-J5LHaKrtQeYiIU06rargZrQX5P4ABP0cP0wuPHIRzjw=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildNpmPackage {
|
||||
pname = "coc-rust-analyzer";
|
||||
version = "0-unstable-2026-04-14";
|
||||
version = "0-unstable-2026-05-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-rust-analyzer";
|
||||
rev = "3a82969c169b9d71b51e74fe8841d1f04326725d";
|
||||
hash = "sha256-8/wgdlM4US5R6xOYFD4uP6gEeRfJsjDwwCz3BIUpoFI=";
|
||||
rev = "9bfd30f3ab029c31f1c012b12156bdac9a0d0351";
|
||||
hash = "sha256-JrR7nf6xQxzGHrOp1dof6GLOcH6BSiAd79RcgsUUU24=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-+3eXdiM0Nll7V6EnDXq88rBjRkPN6GLFASdJ3fMXbq4=";
|
||||
npmDepsHash = "sha256-1+U4XG3zciSnVh8Syff/hZgSPBdwDfgf9KQFURJAddQ=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "contact";
|
||||
version = "1.5.7";
|
||||
version = "1.5.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdxlocations";
|
||||
repo = "contact";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-nuhlxKE6o2kNMz5VRV0SIY4Hee5thBbV71Ex6mM1AXo=";
|
||||
hash = "sha256-YNDw/lAPuJIyK6abRnl5WOyv8+t/PTtmBvFWu7NTVwY=";
|
||||
};
|
||||
|
||||
dependencies = [ python3Packages.meshtastic ];
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cpuinfo";
|
||||
version = "0-unstable-2026-04-28";
|
||||
version = "0-unstable-2026-04-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "cpuinfo";
|
||||
rev = "e829e80faba35db623b5e272c867ad72146adcda";
|
||||
hash = "sha256-0xLxkGiUVWY+8X8ahQC5hvAKjkEQ5Blv8kNqJHPwezg=";
|
||||
rev = "3681f0ce1446167d01dfe125d6db96ba2ac31c3c";
|
||||
hash = "sha256-PhWbzQgZSUb3eVyx+JTSnxVOAC2WzL2Dw1I9/6LEIsw=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mainProgram = "cpu-info";
|
||||
maintainers = with lib.maintainers; [ pawelchcki ];
|
||||
pkgConfigModules = [ "libcpuinfo" ];
|
||||
# https://github.com/pytorch/cpuinfo/blob/e829e80faba35db623b5e272c867ad72146adcda/CMakeLists.txt#L98
|
||||
# https://github.com/pytorch/cpuinfo/blob/3681f0ce1446167d01dfe125d6db96ba2ac31c3c/CMakeLists.txt#L98
|
||||
platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ appimageTools.wrapType2 rec {
|
|||
wrapProgram $out/bin/cubelify \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
install -Dm444 ${contents}/cubelify-overlay.desktop -t $out/share/applications/
|
||||
install -Dm444 ${contents}/cubelify-overlay.png -t $out/share/pixmaps/
|
||||
install -Dm444 ${contents}/cubelify-overlay.png -t $out/share/icons
|
||||
substituteInPlace $out/share/applications/cubelify-overlay.desktop \
|
||||
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=cubelify'
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
stdenv,
|
||||
installShellFiles,
|
||||
testers,
|
||||
tests,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
|
|
@ -38,17 +39,27 @@ buildGoModule (finalAttrs: {
|
|||
--zsh <($out/bin/cue completion zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
writeCueValidator = callPackage ./validator.nix { };
|
||||
tests = {
|
||||
test-001-all-good = callPackage ./tests/001-all-good.nix { };
|
||||
version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "cue version";
|
||||
version = "v${finalAttrs.version}";
|
||||
passthru =
|
||||
let
|
||||
cue = finalAttrs.finalPackage;
|
||||
writeCueValidator = callPackage ./validator.nix { inherit cue; };
|
||||
in
|
||||
{
|
||||
inherit writeCueValidator;
|
||||
|
||||
tests = {
|
||||
validation = tests.cue-validation.override {
|
||||
callPackage = (path: attrs: callPackage path (attrs // { inherit writeCueValidator; }));
|
||||
};
|
||||
|
||||
test-001-all-good = callPackage ./tests/001-all-good.nix { inherit cue; };
|
||||
version = testers.testVersion {
|
||||
package = cue;
|
||||
command = "cue version";
|
||||
version = "v${finalAttrs.version}";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Data constraint language which aims to simplify tasks involving defining and using data";
|
||||
|
|
|
|||
|
|
@ -17,15 +17,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dioxus-cli";
|
||||
version = "0.7.7";
|
||||
version = "0.7.9";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "dioxus-cli";
|
||||
version = finalAttrs.version;
|
||||
hash = "sha256-jMy2i19qyoMuIh/BJ1iJU78WNY+kWQC9xKTovLJvL2A=";
|
||||
hash = "sha256-tLMtUlohSJt3okdJh+ARweQNGmzj/vYiNl8iZhDbSAc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qPxW3VzHUw+GBmHn9r77BcDw50AkCfAOa7JblpgYgls=";
|
||||
cargoHash = "sha256-h5wkxHP8ehZLHqcUsro08/dpqSPnPuBbZuUGG8i4nBc=";
|
||||
buildFeatures = [
|
||||
"no-downloads"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-credential-helpers";
|
||||
version = "0.9.6";
|
||||
version = "0.9.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "docker-credential-helpers";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OM5NU0I3272KaCHv8ZtkbkB86d6mo/Ym1QXMGmCisVc=";
|
||||
sha256 = "sha256-HgioRk6qz9H9KD0JWcYg2bIpqHZxnPHYc3idxMUKuD8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -3,21 +3,28 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
ncurses,
|
||||
libx11,
|
||||
bzip2,
|
||||
zlib,
|
||||
brotli,
|
||||
zstd,
|
||||
xz,
|
||||
openssl,
|
||||
autoreconfHook,
|
||||
meson,
|
||||
ninja,
|
||||
gettext,
|
||||
python3,
|
||||
pkg-config,
|
||||
libev,
|
||||
xmlto,
|
||||
docbook_xml_dtd_42,
|
||||
gpm,
|
||||
libidn,
|
||||
libidn2,
|
||||
tre,
|
||||
expat,
|
||||
lua,
|
||||
curl,
|
||||
libcss,
|
||||
libdom,
|
||||
nix-update-script,
|
||||
# Incompatible licenses, LGPLv3 - GPLv2
|
||||
enableGuile ? false,
|
||||
guile ? null,
|
||||
|
|
@ -42,55 +49,95 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-aQ+q2I6uTVv5kpKBaGJ1xiE/9vv9T7JI05VX/ROkAqA=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
"doc"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
libx11
|
||||
bzip2
|
||||
zlib
|
||||
brotli
|
||||
zstd
|
||||
xz
|
||||
openssl
|
||||
libidn
|
||||
libidn2
|
||||
tre
|
||||
expat
|
||||
libev
|
||||
lua
|
||||
curl
|
||||
libcss
|
||||
libdom
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isLinux gpm
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin gettext
|
||||
++ lib.optional enableGuile guile
|
||||
++ lib.optional enablePython python
|
||||
++ lib.optional enablePerl perl;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
meson
|
||||
ninja
|
||||
gettext
|
||||
perl
|
||||
python3
|
||||
pkg-config
|
||||
xmlto
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-finger"
|
||||
"--enable-html-highlight"
|
||||
"--enable-gopher"
|
||||
"--enable-gemini"
|
||||
"--enable-cgi"
|
||||
"--enable-bittorrent"
|
||||
"--enable-nntp"
|
||||
"--enable-256-colors"
|
||||
"--enable-true-color"
|
||||
"--with-brotli"
|
||||
"--with-lzma"
|
||||
"--with-libev"
|
||||
"--with-terminfo"
|
||||
]
|
||||
++ lib.optional enableGuile "--with-guile"
|
||||
++ lib.optional enablePython "--with-python"
|
||||
++ lib.optional enablePerl "--with-perl";
|
||||
env =
|
||||
lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
C_INCLUDE_PATH = "${lib.getInclude gpm}/include";
|
||||
LIBRARY_PATH = "${lib.getLib gpm}/lib";
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
LDFLAGS = "-liconv";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
mesonFlags =
|
||||
(map (f: lib.mesonBool f true) [
|
||||
"finger"
|
||||
"html-highlight"
|
||||
"gopher"
|
||||
"gemini"
|
||||
"cgi"
|
||||
"nntp"
|
||||
"256-colors"
|
||||
"true-color"
|
||||
"brotli"
|
||||
"lzma"
|
||||
"terminfo"
|
||||
"reproducible"
|
||||
])
|
||||
++ [
|
||||
(lib.mesonOption "luapkg" "lua")
|
||||
(lib.mesonBool "gpm" stdenv.hostPlatform.isLinux)
|
||||
(lib.mesonBool "guile" enableGuile)
|
||||
(lib.mesonBool "python" enablePython)
|
||||
(lib.mesonBool "perl" enablePerl)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs doc/tools
|
||||
substituteInPlace doc/tools/asciidoc/docbook.conf \
|
||||
--replace-fail "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
mesonFlags+=("-Dsource-date-epoch=$SOURCE_DATE_EPOCH")
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
|
||||
|
||||
meta = {
|
||||
description = "Full-featured text-mode web browser";
|
||||
mainProgram = "elinks";
|
||||
homepage = "https://github.com/rkd77/elinks";
|
||||
license = lib.licenses.gpl2;
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
maintainers = with lib.maintainers; [
|
||||
iblech
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ stdenvNoCC.mkDerivation {
|
|||
|
||||
outputHash =
|
||||
{
|
||||
x86_64-linux = "sha256-pJp4l0QJAg42gj/R4bq4P1iVtMehkvNs7hv9/3RmNsI=";
|
||||
aarch64-linux = "sha256-POIXQZ3ZruzfwF/6Kg6zRXdSrKtm56cBCMAvB5JTuJM=";
|
||||
x86_64-linux = "sha256-p8jx9HDYG2q2nhBiBK8XDTYm9O0ptTqv8L+PrQ8oiy8=";
|
||||
aarch64-linux = "sha256-UsccQFaSSjhmv1+oF2FZcRG8xtWBCcPD+tizbdQ7SSI=";
|
||||
}
|
||||
.${stdenvNoCC.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
makeWrapper,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
electron_40,
|
||||
electron_41,
|
||||
python3Packages,
|
||||
pipewire,
|
||||
libpulseaudio,
|
||||
|
|
@ -18,17 +18,17 @@
|
|||
withMiddleClickScroll ? false,
|
||||
}:
|
||||
let
|
||||
electron = electron_40;
|
||||
electron = electron_41;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "equibop";
|
||||
version = "3.1.9";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Equicord";
|
||||
repo = "Equibop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4v0NKGmdbEdHyjz35l+QUnXvnVfLzIe1vLxOSmdgbYQ=";
|
||||
hash = "sha256-CPRn1F15N4Rjry91Gu+ZXWpKVTOEnHI3TmZn8502QB4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -38,6 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# disable auto updates
|
||||
substituteInPlace src/main/updater.ts \
|
||||
--replace-fail 'const isOutdated = autoUpdater.checkForUpdates().then(res => Boolean(res?.isUpdateAvailable));' 'const isOutdated = false;'
|
||||
|
||||
# disable auto update for bun
|
||||
substituteInPlace scripts/build/compileArrpc.mts \
|
||||
--replace-fail -baseline ""
|
||||
'';
|
||||
|
||||
node-modules = callPackage ./node-modules.nix { };
|
||||
|
|
@ -177,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
maintainers = with lib.maintainers; [
|
||||
NotAShelf
|
||||
rexies
|
||||
PerchunPak
|
||||
];
|
||||
mainProgram = "equibop";
|
||||
# I am not confident in my ability to support Darwin, please PR if this is important to you
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "exploitdb";
|
||||
version = "2026-05-01";
|
||||
version = "2026-05-08";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = "exploitdb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BZ1X9SpXf+HSY/4xz9imnCwK3si7c130Havg/ATI/LQ=";
|
||||
hash = "sha256-fTO/85TOpDeyJG8qaaM6YTBYel7Jpycphrs7hs8S7Hs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -20,12 +20,11 @@ appimageTools.wrapType2 {
|
|||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications $out/share/pixmaps
|
||||
cp ${appimageContents}/desktop.desktop $out/share/applications/firefly-desktop.desktop
|
||||
install -D ${appimageContents}/desktop.desktop $out/share/applications/firefly-desktop.desktop
|
||||
substituteInPlace $out/share/applications/firefly-desktop.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=firefly-desktop' \
|
||||
--replace 'Icon=desktop' 'Icon=firefly-desktop'
|
||||
cp ${appimageContents}/desktop.png $out/share/pixmaps/firefly-desktop.png
|
||||
--replace-fail 'Exec=AppRun' 'Exec=firefly-desktop' \
|
||||
--replace-fail 'Icon=desktop' 'Icon=firefly-desktop'
|
||||
install -D ${appimageContents}/desktop.png $out/share/icons/firefly-desktop.png
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
stdenvNoCC,
|
||||
nodejs-slim,
|
||||
fetchNpmDeps,
|
||||
|
|
@ -10,13 +11,20 @@
|
|||
nix-update-script,
|
||||
dataDir ? "/var/lib/firefly-iii",
|
||||
}:
|
||||
|
||||
let
|
||||
php = php85;
|
||||
version = "6.6.2";
|
||||
|
||||
# Release tarball contains translations downloaded from crowdin
|
||||
releaseTarball = fetchzip {
|
||||
url = "https://github.com/firefly-iii/firefly-iii/releases/download/v${version}/FireflyIII-v${version}.tar.gz";
|
||||
stripRoot = false;
|
||||
hash = "sha256-vPuLCjU8MzV5odoDl9QQXj4kKnT6QBSAPwvekMxJtEM=";
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "firefly-iii";
|
||||
version = "6.6.2";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firefly-iii";
|
||||
|
|
@ -55,6 +63,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
passthru = {
|
||||
inherit releaseTarball;
|
||||
phpPackage = php;
|
||||
tests = nixosTests.firefly-iii;
|
||||
updateScript = nix-update-script {
|
||||
|
|
@ -68,6 +77,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
postInstall = ''
|
||||
chmod -R u+w $out/share
|
||||
mv $out/share/php/firefly-iii/* $out/
|
||||
|
||||
# Copy language files from release tarball (contains all translations)
|
||||
cp -r ${finalAttrs.passthru.releaseTarball}/resources/lang/* $out/resources/lang/
|
||||
|
||||
rm -R $out/share $out/storage $out/bootstrap/cache $out/node_modules
|
||||
ln -s ${dataDir}/storage $out/storage
|
||||
ln -s ${dataDir}/cache $out/bootstrap/cache
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.4.42";
|
||||
version = "0.4.49";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
|
|
@ -22,11 +22,11 @@ buildGoModule rec {
|
|||
cd "$out"
|
||||
git rev-parse HEAD > COMMIT
|
||||
'';
|
||||
hash = "sha256-yAzd7bytBKxOBGs8ja48QPVdmJSvRfIzi8K2DoC0O+Y=";
|
||||
hash = "sha256-WOk4zIWZbf3s4jPzeHANxHAOZvnnm3ENdGluSuM90WM=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-TUlOdRfexuxC2Of6ZHPYChCr3i1IGapLZz1/lAhnUxk=";
|
||||
vendorHash = "sha256-395vcBQYvc3LUQSPGtJ1x6RIhUmkR6Y/wGFCD3vrMcE=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "newt";
|
||||
version = "1.12.3";
|
||||
version = "1.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "newt";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Maw0qELlnh0m+NsQGdDC3wGYK8zi8Lbt7zwJqieR4hg=";
|
||||
hash = "sha256-wYLnuKIU+wcCxF57cdfepTVm52btfdrveQ8Y+R9flMo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+zMSzNbqmWm/DXL2xMUd5uPP5tSIybsRokwJ2zd0pf0=";
|
||||
vendorHash = "sha256-WfIK+Q8WQ372NzLw6DRapv1nYPduShi4KnVJBPk0Oz0=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
|
@ -30,8 +30,6 @@ buildGoModule (finalAttrs: {
|
|||
|
||||
doInstallCheck = true;
|
||||
|
||||
versionCheckProgramArg = [ "-version" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -16,24 +16,24 @@
|
|||
let
|
||||
|
||||
pname = "freelens-bin";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-amd64.AppImage";
|
||||
hash = "sha256-Goe/eAmefL+4itHrGmQjBGVWalk559kGg/OgA1yKKdk=";
|
||||
hash = "sha256-aM3sS87kpb9UhVMdG7cPeCp4j9KBW71H+MJR+oN4908=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-arm64.AppImage";
|
||||
hash = "sha256-Mcvjiv7tQU56uaVvtoK5mn6jpQsRnP1F2UeG8OHhywQ=";
|
||||
hash = "sha256-/DUMuGAhVV0Ro4UbAF6lwjgB4/Wi1AY2UKn9ZuN7fDc=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-amd64.dmg";
|
||||
hash = "sha256-4b4xzr4shEBYhqQ+NZaew4ZSq3J5den5KPJ7X8UpTJ8=";
|
||||
hash = "sha256-xKH/RBR2if37WiquCC+ZSxGyoFF32iIPvYdGNfDbDFw=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-arm64.dmg";
|
||||
hash = "sha256-jCR/ypqGTp8swi1b9hgm4iWjGoKA2pW0mqxF8QJzYVk=";
|
||||
hash = "sha256-dp/kD6NHmK/CNZEF2BKh6NAChBTMgjZLY7eIwhyWgWk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpupad";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "houmain";
|
||||
repo = "gpupad";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7WdEdVe2lkCDHKkZpN3QTdQtsVWXdcQ3tdKd8vd1xAc=";
|
||||
hash = "sha256-8kDJRZPDzZA6ofaXWQ55VZfuXdOHvTCssoe64qgNrbU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "grafana-kiosk";
|
||||
version = "1.0.11";
|
||||
version = "1.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafana-kiosk";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-+LoUJiMqE/OO0J7zIy+8uvQUq1wFpGvNvxzhb4pj+r8=";
|
||||
hash = "sha256-NfLS7N1J71HnDx3oTfWf3lsWp3XNx18Jk7qwNPMfOZA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+tslKo5onMgnEtitYi9uwO4m5MUGzctJ7Vt4C7hJ7Fc=";
|
||||
vendorHash = "sha256-Czxxuy4ptsUx9cqog6wsHkUzS+j7WGj8PGsa4MDRJEE=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -123,15 +123,15 @@ perlPackages.buildPerlPackage rec {
|
|||
]);
|
||||
|
||||
checkPhase = ''
|
||||
# Temporarily disable a test failing because of a behavioural change in ImageMagick7
|
||||
# t/04_Page.t ................................... 1/12
|
||||
# Failed test 'undefined'
|
||||
# at t/04_Page.t line 114.
|
||||
# got: '72'
|
||||
# expected: '300'
|
||||
# Looks like you failed 1 test of 12.
|
||||
# Skip a failing test, due to a change in ImageMagick:
|
||||
# https://sourceforge.net/p/gscan2pdf/bugs/439/
|
||||
rm t/04_Page.t
|
||||
|
||||
# Skip a failing test, due to a breaking change in ImageMagick:
|
||||
# https://sourceforge.net/p/gscan2pdf/bugs/442/
|
||||
# https://github.com/ImageMagick/ImageMagick/issues/8714
|
||||
rm t/113_save_pdf_with_downsample.t
|
||||
|
||||
export XDG_CACHE_HOME="$(mktemp -d)"
|
||||
xvfb-run -s '-screen 0 800x600x24' \
|
||||
make test
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ else
|
|||
''
|
||||
# Install XDG Desktop file and its icon
|
||||
install -Dm444 ${appimageContents}/insomnia.desktop -t $out/share/applications
|
||||
install -Dm444 ${appimageContents}/insomnia.png -t $out/share/pixmaps
|
||||
install -Dm444 ${appimageContents}/insomnia.png -t $out/share/icons/
|
||||
# Replace wrong exec statement in XDG Desktop file
|
||||
substituteInPlace $out/share/applications/insomnia.desktop \
|
||||
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=insomnia'
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
fetchFromCodeberg,
|
||||
}:
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "joystickwake";
|
||||
version = "0.4.2";
|
||||
version = "0.5.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foresto";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "forestix";
|
||||
repo = "joystickwake";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-vSvIpbcDIbRyitVjx3wNSxt5vTIZ9/NPWokOJt0p6oQ=";
|
||||
hash = "sha256-qIXXlwZec4CQk93gmY5O3mdGdlNCeXWTr/DDw4vwRUM=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
|
|
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
|||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
dbus-next
|
||||
dbus-fast
|
||||
pyudev
|
||||
xlib
|
||||
];
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "kbdd";
|
||||
version = "unstable-2021-04-26";
|
||||
version = "unstable-2025-08-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qnikst";
|
||||
repo = "kbdd";
|
||||
rev = "3145099e1fbbe65b27678be72465aaa5b5872874";
|
||||
sha256 = "1gzcjnflgdqnjgphiqpzwbcx60hm0h2cprncm7i8xca3ln5q6ba1";
|
||||
rev = "b87e44afd5859157245eee22b11827605bfa09b9";
|
||||
hash = "sha256-cbMcB6jgssfMUjemBOiE06zJK2TbzOWt1Rvt41V33Mo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -37,10 +37,10 @@
|
|||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "krita-unwrapped";
|
||||
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/krita/${finalAttrs.version}/krita-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-kytodhJvfGKeQn7j0BIwDIKGsFoYQnc1S0FK9kGg8e0=";
|
||||
hash = "sha256-COddFMgFJh/IIovsFt70cF9unPsBkecb0EzEwOGChIo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubeshark";
|
||||
version = "52.10.3";
|
||||
version = "53.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubeshark";
|
||||
repo = "kubeshark";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-n7AYUms6fn25UinLd5xFG2DfcpJU0/pR4JF3i1VY1hM=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ey40GmwM7UdMNZIYLF1AFeJAwnT2f2xqHB6lG/uM+ds=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4s1gxJo2w5BibZ9CJP7Jl9Z8Zzo8WpBokBnRN+zp8b4=";
|
||||
|
|
@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
|||
[
|
||||
"-s"
|
||||
"-w"
|
||||
"-X ${t}/misc.GitCommitHash=${finalAttrs.src.rev}"
|
||||
"-X ${t}/misc.GitCommitHash=${finalAttrs.src.tag}"
|
||||
"-X ${t}/misc.Branch=master"
|
||||
"-X ${t}/misc.BuildTimestamp=0"
|
||||
"-X ${t}/misc.Platform=unknown"
|
||||
|
|
@ -43,6 +43,9 @@ buildGoModule (finalAttrs: {
|
|||
'';
|
||||
doCheck = true;
|
||||
|
||||
# Tests bind loopback sockets via httptest.
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd kubeshark \
|
||||
--bash <($out/bin/kubeshark completion bash) \
|
||||
|
|
@ -72,6 +75,7 @@ buildGoModule (finalAttrs: {
|
|||
'';
|
||||
maintainers = with lib.maintainers; [
|
||||
qjoly
|
||||
miniharinn
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -9,16 +9,18 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lazytrivy";
|
||||
version = "1.2.0";
|
||||
version = "1.3.3";
|
||||
|
||||
env.GOEXPERIMENT = "jsonv2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "owenrumney";
|
||||
repo = "lazytrivy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fhHy54pIbYdj+mWCIx7Wla6x+J/w2f8+J+WSbt+WNwA=";
|
||||
hash = "sha256-M7qhkHuyI6cpmRzvn8AJun3tyzTbU8QtUlK7Qo0xxU4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dIe6zjWc8DVU9YQbYfmNUcfSh6MsdZZ8/A/EYLmPNkE=";
|
||||
vendorHash = "sha256-vzdGWlyk4Eqhh+r4RH4eVVA4YPnADCGYnh0tmeD8S8M=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
autoreconfHook,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
lib,
|
||||
stdenv,
|
||||
}:
|
||||
|
|
@ -20,6 +21,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-PuNE/lKsNNd4KDEcSsaz+IfP2hgT5M5VgLY1kVy1KCc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/lely_industries/lely-core/-/commit/6ed995fa86d828957b636a11470f150830d877ec.patch";
|
||||
hash = "sha256-Q4Sza0hs0EE4EZ0nbYAs+/qO2uWKGveZ0+Tgx8xvmEs=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
|
|
|
|||
|
|
@ -41,6 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildInputs = [
|
||||
perl
|
||||
netsurf-buildsystem
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libparserutils
|
||||
libwapcaplet
|
||||
];
|
||||
|
|
|
|||
|
|
@ -35,8 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildInputs = [
|
||||
expat
|
||||
netsurf-buildsystem
|
||||
libhubbub
|
||||
libparserutils
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libhubbub
|
||||
libwapcaplet
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "150.0.1-1",
|
||||
"packageVersion": "150.0.2-1",
|
||||
"source": {
|
||||
"rev": "150.0.1-1",
|
||||
"hash": "sha256-9+NiNv6uAxdj3zFurH3dBDWk4SJxdgJaHAm67aOmJAk="
|
||||
"rev": "150.0.2-1",
|
||||
"hash": "sha256-eEdLG9hBTRH8UIoclGJaJ4rNcTDrXbeUWZPM+Y6WXTw="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "150.0.1",
|
||||
"hash": "sha512-s3EOGzUAIxK/JI6CJoEDm3XsEZb40BTIiwN3ybBvNHgEaRUqmK2WdEClGkoMpFQYumI5Q4+GmuVkzILAI2RReQ=="
|
||||
"version": "150.0.2",
|
||||
"hash": "sha512-4i/Gb3+uub70A20KkK9MJ9q8RaPcWccpBTa/5Gx2JNcziNKbNqiZnjZAZfoxpfoWdZZjIimwr5vBuvQTX6KaTQ=="
|
||||
}
|
||||
}
|
||||
|
|
|
|||
6
pkgs/by-name/li/linuxwave/deps.nix
generated
6
pkgs/by-name/li/linuxwave/deps.nix
generated
|
|
@ -4,10 +4,10 @@
|
|||
|
||||
linkFarm "zig-packages" [
|
||||
{
|
||||
name = "clap-0.10.0-oBajB434AQBDh-Ei3YtoKIRxZacVPF1iSwp3IX_ZB8f0";
|
||||
name = "clap-0.12.0-oBajB7foAQDqlSwaSG5g0yq7xGbQARUsBk5T64gAOqP5";
|
||||
path = fetchzip {
|
||||
url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.10.0.tar.gz";
|
||||
hash = "sha256-leXnA97ITdvmBhD2YESLBZAKjBg+G4R/+PPPRslz/ec=";
|
||||
url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.12.0.tar.gz";
|
||||
hash = "sha256-HveL7aJBC+/8PNlGYxtNZBrk3ytkM8zuXENO9JpygC0=";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -3,28 +3,28 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
zig_0_14,
|
||||
zig_0_16,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
let
|
||||
zig = zig_0_14;
|
||||
zig = zig_0_16;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "linuxwave";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "linuxwave";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-OuD5U/T3GuCQrzdhx01NXPSXD7pUAvLnNsznttJogz8=";
|
||||
hash = "sha256-5LcAExNFCsQIeRqLHMCLO+MnK7p2q2qOA1SdMCR4nCw=";
|
||||
};
|
||||
|
||||
postConfigure = ''
|
||||
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
|
||||
'';
|
||||
zigBuildFlags = [
|
||||
"--system"
|
||||
(callPackage ./deps.nix { })
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ python313Packages.buildPythonApplication (finalAttrs: {
|
|||
version = "1.0.0b1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Hog185";
|
||||
owner = "Hogjects";
|
||||
repo = "Lufus";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-3i0CnhGvLTXutz8CQoH5q4PwZ23lAwnUo8H5TRJx+KE=";
|
||||
|
|
@ -65,7 +65,7 @@ python313Packages.buildPythonApplication (finalAttrs: {
|
|||
|
||||
meta = {
|
||||
description = "A rufus clone written in py and designed to work with linux";
|
||||
homepage = "https://github.com/Hog185/Lufus";
|
||||
homepage = "https://github.com/Hogjects/Lufus";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ Simon-Weij ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ appimageTools.wrapType2 rec {
|
|||
wrapProgram $out/bin/lunarclient \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
install -Dm444 ${contents}/lunarclient.desktop -t $out/share/applications/
|
||||
install -Dm444 ${contents}/lunarclient.png -t $out/share/pixmaps/
|
||||
install -Dm444 ${contents}/lunarclient.png -t $out/share/icons
|
||||
substituteInPlace $out/share/applications/lunarclient.desktop \
|
||||
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lunarclient'
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -38,17 +38,17 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matrix-continuwuity";
|
||||
version = "0.5.8";
|
||||
version = "0.5.9";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "forgejo.ellis.link";
|
||||
owner = "continuwuation";
|
||||
repo = "continuwuity";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-o7bZMSsdSt6VOrsuSMrS7fU9u/LrdD/579IMvsZH+ss=";
|
||||
hash = "sha256-4zs26kTqwkJV7x+Sm12LnR02bbyH0f6Itbz7bDKUyts=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QM4K5TmWWRTcrovAvvEbXEraI4C0vMSJ68Z/6kHhOr8=";
|
||||
cargoHash = "sha256-T11ESuNg3BS54LtNJfhOoIgiyVL7VsdP4OeDI2nVBIk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -64,6 +64,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
nativeCheckInputs = [
|
||||
cacert
|
||||
cmake
|
||||
# gix spawns git-upload-pack by name in file:// clone tests.
|
||||
git
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
{
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mpage";
|
||||
version = "2.5.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mesa.nl/pub/mpage/mpage-${finalAttrs.version}.tgz";
|
||||
sha256 = "sha256-I1HpHSV5SzWN9mGPF6cBOijTUOwgQI/gb4Ej3EZz/pM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "Makefile" -e "s|^ *PREFIX *=.*$|PREFIX = $out|g"
|
||||
substituteInPlace Makefile --replace 'gcc' '${stdenv.cc.targetPrefix}cc'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Many-to-one page printing utility";
|
||||
mainProgram = "mpage";
|
||||
|
||||
longDescription = ''
|
||||
Mpage reads plain text files or PostScript documents and prints
|
||||
them on a PostScript printer with the text reduced in size so
|
||||
that several pages appear on one sheet of paper. This is useful
|
||||
for viewing large printouts on a small amount of paper. It uses
|
||||
ISO 8859.1 to print 8-bit characters.
|
||||
'';
|
||||
|
||||
license = lib.licenses.gpl2Plus;
|
||||
homepage = "http://www.mesa.nl/pub/mpage/";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "myks";
|
||||
version = "5.12.2";
|
||||
version = "5.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mykso";
|
||||
repo = "myks";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CQCxsuZhqRo5PMahc1UBy5T2SvwDs50JWHmhm4qU3FI=";
|
||||
hash = "sha256-t2Q7nQVwPyxDxH/KvA9ys6uLJt8+kYaCvkTXrzdwlt4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BFuJBaOGzttc8Q1ZxMIx0SWnBWmHg7TwU5VG8Wgydb0=";
|
||||
vendorHash = "sha256-PwqglEyo63QRHrmY/Yw64U9HkCBQK+DfM3R3WTgT2cQ=";
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "narsil";
|
||||
version = "1.4.0-116-gab32c9f80";
|
||||
version = "1.4.0-140-g962201f6f";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NickMcConnell";
|
||||
repo = "NarSil";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Nw8NZyFQzTwcJhKB86LC0mqjLOmivSm7o9BSRsvQVP4=";
|
||||
hash = "sha256-6vAVdogjun8Ali/Y71w0jlBU7mEXA0wy2yYCSXPSY3E=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "nb";
|
||||
version = "7.25.3";
|
||||
version = "7.25.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xwmx";
|
||||
repo = "nb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-liDNmc7pueIk0nFUkPjP8llXzV6dTpHMVkRSc0stEVk=";
|
||||
hash = "sha256-zcNL1WI3UoYV5nXzU0yYh0GwTsUzkeclMcEjQlneSzw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
diff --git a/src/core/generation.cpp b/src/core/generation.cpp
|
||||
index c68af71..4967562 100644
|
||||
--- a/src/core/generation.cpp
|
||||
+++ b/src/core/generation.cpp
|
||||
@@ -172,12 +172,18 @@ void EngineGeneration::setWatchingFiles(bool watching) {
|
||||
if (this->watcher == nullptr) {
|
||||
this->watcher = new QFileSystemWatcher();
|
||||
|
||||
+ // note: not using canonicalFilePath() here on purpose,
|
||||
+ // since the path could be a link to the nix store
|
||||
+ // and the link might change
|
||||
+
|
||||
for (auto& file: this->scanner.scannedFiles) {
|
||||
+ if (file.startsWith("/nix/store/")) continue;
|
||||
this->watcher->addPath(file);
|
||||
this->watcher->addPath(QFileInfo(file).dir().absolutePath());
|
||||
}
|
||||
|
||||
for (auto& file: this->extraWatchedFiles) {
|
||||
+ if (file.startsWith("/nix/store/")) continue;
|
||||
this->watcher->addPath(file);
|
||||
this->watcher->addPath(QFileInfo(file).dir().absolutePath());
|
||||
}
|
||||
|
|
@ -26,19 +26,15 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "noctalia-qs";
|
||||
version = "0.0.10";
|
||||
version = "0.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noctalia-dev";
|
||||
repo = "noctalia-qs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tscUYNjBfi52Uwu40epdAhoFztsmroKBEBvr22oCnv4=";
|
||||
hash = "sha256-79JP2QTdvp1jg7HGxAW+xzhzhLnlKUi8yGXq9nDCeH0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-fix-unneccessary-reloads.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
|
|
@ -74,11 +70,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
(lib.cmakeBool "DISTRIBUTOR_DEBUGINFO_AVAILABLE" true)
|
||||
(lib.cmakeFeature "INSTALL_QML_PREFIX" qt6.qtbase.qtQmlPrefix)
|
||||
(lib.cmakeFeature "GIT_REVISION" "tag-v${finalAttrs.version}")
|
||||
(lib.cmakeBool "NIX_STORE_DIR_SKIP_WATCH" true)
|
||||
(lib.cmakeFeature "NIX_STORE_DIR" builtins.storeDir)
|
||||
];
|
||||
|
||||
cmakeBuildType = "RelWithDebInfo";
|
||||
separateDebugInfo = true;
|
||||
dontStrip = false;
|
||||
cmakeBuildType = "Release";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/utils/novnc_proxy b/utils/novnc_proxy
|
||||
index 0900f7e..a931763 100755
|
||||
index e1efb9f..1540698 100755
|
||||
--- a/utils/novnc_proxy
|
||||
+++ b/utils/novnc_proxy
|
||||
@@ -22,7 +22,7 @@ usage() {
|
||||
|
|
@ -10,8 +10,8 @@ index 0900f7e..a931763 100755
|
|||
+ echo " Default: @out@/share/webapps/novnc"
|
||||
echo " --ssl-only Disable non-https connections."
|
||||
echo " "
|
||||
echo " --record FILE Record traffic to FILE.session.js"
|
||||
@@ -44,7 +44,7 @@ PORT="6080"
|
||||
echo " --file-only Disable directory listing in web server."
|
||||
@@ -53,7 +53,7 @@ LISTEN="$PORT"
|
||||
VNC_DEST="localhost:5900"
|
||||
CERT=""
|
||||
KEY=""
|
||||
|
|
@ -19,4 +19,5 @@ index 0900f7e..a931763 100755
|
|||
+WEB="@out@/share/webapps/novnc"
|
||||
proxy_pid=""
|
||||
SSLONLY=""
|
||||
RECORD_ARG=""
|
||||
RECORD=""
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "novnc";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "novnc";
|
||||
repo = "noVNC";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-VYG0p70ZvRzK9IeA+5J95FqF+zWgj/8EcxnVOk+YL9o=";
|
||||
sha256 = "sha256-vObaEjP8ZgA4a4bEYbSBsSTl6CfYa/B7qmghM+iVDnQ=";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
install -Dm755 utils/novnc_proxy "$out/bin/novnc"
|
||||
install -dm755 "$out/share/webapps/novnc/"
|
||||
cp -a app core po vendor vnc.html karma.conf.js package.json vnc_lite.html "$out/share/webapps/novnc/"
|
||||
cp -a app core po vendor vnc.html karma.conf.cjs package.json vnc_lite.html "$out/share/webapps/novnc/"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
diff --git a/utils/novnc_proxy b/utils/novnc_proxy
|
||||
index 0365c1e..7eba2db 100755
|
||||
index e1efb9f..6d79999 100755
|
||||
--- a/utils/novnc_proxy
|
||||
+++ b/utils/novnc_proxy
|
||||
@@ -167,7 +167,7 @@ if [[ -d ${HERE}/websockify ]]; then
|
||||
@@ -181,7 +181,7 @@ if [[ -d ${HERE}/websockify ]]; then
|
||||
|
||||
echo "Using local websockify at $WEBSOCKIFY"
|
||||
else
|
||||
- WEBSOCKIFY_FROMSYSTEM=$(which websockify 2>/dev/null)
|
||||
- WEBSOCKIFY_FROMSYSTEM=$(type -P websockify 2>/dev/null)
|
||||
+ WEBSOCKIFY_FROMSYSTEM="@websockify@/bin/websockify"
|
||||
WEBSOCKIFY_FROMSNAP=${HERE}/../usr/bin/python2-websockify
|
||||
[ -f $WEBSOCKIFY_FROMSYSTEM ] && WEBSOCKIFY=$WEBSOCKIFY_FROMSYSTEM
|
||||
[ -f $WEBSOCKIFY_FROMSNAP ] && WEBSOCKIFY=$WEBSOCKIFY_FROMSNAP
|
||||
|
||||
if [ ! -f "$WEBSOCKIFY" ]; then
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,11 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
dpdk,
|
||||
intel-ipsec-mb,
|
||||
libbpf,
|
||||
libconfig,
|
||||
libpcap,
|
||||
|
|
@ -31,6 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
patches = [
|
||||
./odp-dpdk_25.03.patch
|
||||
# Fix gcc 15 -Wunterminated-string-initialization errors in test code.
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/OpenDataPlane/odp-dpdk/commit/56c6bdbe8fe9db4c0441162ec269ef4e1ebd1a6a.patch";
|
||||
hash = "sha256-aj4HuGb0BUxsKtFS3X3gXqBoRVRnKEBNxa/4heWhBlE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -44,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
./dpdk_25.03.patch
|
||||
];
|
||||
})
|
||||
intel-ipsec-mb
|
||||
libconfig
|
||||
libpcap
|
||||
numactl
|
||||
|
|
|
|||
|
|
@ -24,14 +24,18 @@
|
|||
gtk3,
|
||||
libnotify,
|
||||
libpulseaudio,
|
||||
writeShellApplication,
|
||||
curl,
|
||||
yq,
|
||||
common-updater-scripts,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmium";
|
||||
version = "0.0.19";
|
||||
version = "0.0.19-alpha";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updater.osmium.chat/Osmium-${version}-alpha-x64.tar.gz";
|
||||
url = "https://updater.osmium.chat/Osmium-${version}-x64.tar.gz";
|
||||
hash = "sha256-Qwh6K2QlJJapqR0BkaA0LvwLEsqktnLzOnyJg+7sMFo=";
|
||||
};
|
||||
|
||||
|
|
@ -98,6 +102,21 @@ stdenv.mkDerivation rec {
|
|||
startupWMClass = "Osmium";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = lib.getExe (writeShellApplication {
|
||||
name = "update-osmium";
|
||||
runtimeInputs = [
|
||||
curl
|
||||
yq
|
||||
common-updater-scripts
|
||||
];
|
||||
text = ''
|
||||
version="$(curl -s https://updater.osmium.chat/alpha-linux.yml | yq .version)"
|
||||
update-source-version osmium "${version}"
|
||||
'';
|
||||
});
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Globally distributed community messaging and voice/video platform";
|
||||
homepage = "https://osmium.chat/";
|
||||
|
|
|
|||
104
pkgs/by-name/ow/ownserver/bump-metrics.patch
Normal file
104
pkgs/by-name/ow/ownserver/bump-metrics.patch
Normal file
|
|
@ -0,0 +1,104 @@
|
|||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -18,18 +18,6 @@
|
||||
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
|
||||
|
||||
[[package]]
|
||||
-name = "ahash"
|
||||
-version = "0.8.11"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
|
||||
-dependencies = [
|
||||
- "cfg-if",
|
||||
- "once_cell",
|
||||
- "version_check",
|
||||
- "zerocopy 0.7.35",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "1.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
@@ -1584,12 +1572,12 @@
|
||||
|
||||
[[package]]
|
||||
name = "metrics"
|
||||
-version = "0.24.1"
|
||||
+version = "0.24.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7a7deb012b3b2767169ff203fadb4c6b0b82b947512e5eb9e0b78c2e186ad9e3"
|
||||
+checksum = "ff56c2e7dce6bd462e3b8919986a617027481b1dcc703175b58cf9dd98a2f071"
|
||||
dependencies = [
|
||||
- "ahash",
|
||||
"portable-atomic",
|
||||
+ "rapidhash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2126,7 +2114,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
|
||||
dependencies = [
|
||||
- "zerocopy 0.8.24",
|
||||
+ "zerocopy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2327,7 +2315,7 @@
|
||||
dependencies = [
|
||||
"rand_chacha 0.9.0",
|
||||
"rand_core 0.9.3",
|
||||
- "zerocopy 0.8.24",
|
||||
+ "zerocopy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2378,6 +2366,15 @@
|
||||
]
|
||||
|
||||
[[package]]
|
||||
+name = "rapidhash"
|
||||
+version = "4.4.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "b5e48930979c155e2f33aa36ab3119b5ee81332beb6482199a8ecd6029b80b59"
|
||||
+dependencies = [
|
||||
+ "rustversion",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
name = "raw-cpuid"
|
||||
version = "11.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
@@ -4242,31 +4239,11 @@
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy"
|
||||
-version = "0.7.35"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
|
||||
-dependencies = [
|
||||
- "zerocopy-derive 0.7.35",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "zerocopy"
|
||||
version = "0.8.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
|
||||
dependencies = [
|
||||
- "zerocopy-derive 0.8.24",
|
||||
-]
|
||||
-
|
||||
-[[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.100",
|
||||
+ "zerocopy-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -18,7 +18,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
hash = "sha256-bseDssSMerBlzlCvL3rD3X6ku5qDRYvI1wxq2W7As5k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-SJm66CDrg6ZpIeKx27AnZAVs/Z25E/KmHYuZ9G4UwHQ=";
|
||||
# Bump vendored `metrics` past 0.24.2 which fixes a borrow-checker error
|
||||
# under newer rustc (https://github.com/rust-lang/rust/issues/141402).
|
||||
cargoPatches = [ ./bump-metrics.patch ];
|
||||
|
||||
cargoHash = "sha256-EzuG3ev/6EqTGi0J0wppZz+cZJiH12WbBQLKOrTxTzs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -29,6 +33,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
openssl
|
||||
];
|
||||
|
||||
# `proxy_client::fetch_token_test` spins up a warp server during `cargo test`.
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/src/borg/process.rs b/src/borg/process.rs
|
||||
index 9af8da7..85bcbf8 100644
|
||||
--- a/src/borg/process.rs
|
||||
+++ b/src/borg/process.rs
|
||||
@@ -278,7 +278,7 @@ impl BorgCall {
|
||||
diff --git a/pika-backup-common/src/borg/process.rs b/pika-backup-common/src/borg/process.rs
|
||||
index eb97eef9..5e8fad65 100644
|
||||
--- a/pika-backup-common/src/borg/process.rs
|
||||
+++ b/pika-backup-common/src/borg/process.rs
|
||||
@@ -284,7 +284,7 @@ impl BorgCall {
|
||||
}
|
||||
|
||||
pub(super) fn command(&self) -> Result<(async_process::Command, UnixStream)> {
|
||||
|
|
|
|||
|
|
@ -18,24 +18,25 @@
|
|||
gtk4,
|
||||
libadwaita,
|
||||
libsecret,
|
||||
openssl,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pika-backup";
|
||||
version = "0.7.6";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "pika-backup";
|
||||
tag = version;
|
||||
hash = "sha256-tWTINRYCAhPV2srZWIYJeH4NAQIv/ED0bBdeKKgkC78=";
|
||||
hash = "sha256-02ChjIXjTos3jm6UR37tFWhRlUvyh/1r6zLsd6fQsyc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-Ut7dFhm67tcpELZzQPwyIs9/3YNHofi2VF9RxQCD7qo=";
|
||||
hash = "sha256-e6hep/aTpC5HDI/UoSJONGZRP3rjA2eVh9G4DE3HJpE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -66,6 +67,7 @@ stdenv.mkDerivation rec {
|
|||
gtk4
|
||||
libadwaita
|
||||
libsecret
|
||||
openssl
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ let
|
|||
mapAttrsToList
|
||||
;
|
||||
|
||||
version = "0.32.6";
|
||||
version = "0.32.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pomerium";
|
||||
repo = "pomerium";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VwmjuXlYsh2dGKf7ux8DyLZec7xMISuQ7SSb9+LwzfU=";
|
||||
hash = "sha256-JPRyLQzQmC3EiIp+rOMx24JVneFUN7ovC2eYrKxf3ik=";
|
||||
};
|
||||
vendorHash = "sha256-b4H7gAMG7DXEbvkZFsoEZrKpuvPW0vkfv1qqBPBaGAM=";
|
||||
vendorHash = "sha256-ST33a/YNJiE70ORWNxS9gFNfHcNGGiQhOpUwqgbEJiQ=";
|
||||
|
||||
getEnvoy = buildGoModule {
|
||||
pname = "pomerium-get-envoy";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pyenv";
|
||||
version = "2.6.28";
|
||||
version = "2.6.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyenv";
|
||||
repo = "pyenv";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1jbpelEVcm+HqjsT8yaQPTaoOhEBCSq64LzTzr0X93I=";
|
||||
hash = "sha256-RS/aqQWXqM2ByK4PZY8qN2I7KSsbzsGkkyqtnRUWfmE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -84,10 +84,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Featureful free software BitTorrent client";
|
||||
homepage = "https://www.qbittorrent.org";
|
||||
changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${finalAttrs.version}/Changelog";
|
||||
license = with lib.licenses; [
|
||||
gpl2Only
|
||||
gpl3Only
|
||||
];
|
||||
license =
|
||||
with lib.licenses;
|
||||
AND [
|
||||
gpl2Plus # code
|
||||
gpl3Plus # assets
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
Anton-Latukha
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
taglib,
|
||||
vulkan-headers,
|
||||
vulkan-tools,
|
||||
rubberband,
|
||||
# Configurable options
|
||||
qtVersion ? "6", # Can be 5 or 6
|
||||
}:
|
||||
|
|
@ -75,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
vulkan-tools
|
||||
]
|
||||
++ lib.optionals (qtVersion == "6") [
|
||||
rubberband
|
||||
qt6.qt5compat
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "ranger";
|
||||
version = "1.9.4-unstable-2026-04-14";
|
||||
version = "1.9.4-unstable-2026-04-26";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ranger";
|
||||
repo = "ranger";
|
||||
rev = "9f671c6a577d19520ee3afd6e1a93bb35c10582c";
|
||||
hash = "sha256-lZqVi8NakD7a0xCXLNWrbU3Rt1sR6EsWULsBvFM5Klc=";
|
||||
rev = "51e19b8c7f30c241bb7266deb86e05c5984d6ea9";
|
||||
hash = "sha256-qWI/7F2zOUm7QuH4RtfFOXlB1OZ6NrGfWLt5FlW+gqA=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
|
||||
postInstall = ''
|
||||
install -Dm644 misc/rare.desktop -t $out/share/applications/
|
||||
install -Dm644 $out/${python3Packages.python.sitePackages}/rare/resources/images/Rare.png $out/share/pixmaps/rare.png
|
||||
install -Dm644 $out/${python3Packages.python.sitePackages}/rare/resources/images/Rare.png $out/share/icons/rare.png
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
|||
|
|
@ -1,80 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchzip,
|
||||
SDL_compat,
|
||||
SDL_mixer,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
unzip,
|
||||
buildShareware ? false,
|
||||
withSharewareData ? buildShareware,
|
||||
}:
|
||||
assert withSharewareData -> buildShareware;
|
||||
|
||||
let
|
||||
datadir = "share/data/rott-shareware/";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rott";
|
||||
version = "1.1.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://icculus.org/rott/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ECUW6MMS9rC79sYj4fAcv7vDFKzorf4fIB1HsVvZJ/8=";
|
||||
})
|
||||
]
|
||||
++ lib.optional withSharewareData (fetchzip {
|
||||
url = "http://icculus.org/rott/share/1rott13.zip";
|
||||
hash = "sha256-l0pP+mNPAabGh7LZrwcB6KOhPRSycrZpAlPVTyDXc6Y=";
|
||||
stripRoot = false;
|
||||
});
|
||||
|
||||
sourceRoot = "rott-${finalAttrs.version}/rott";
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ] ++ lib.optional withSharewareData unzip;
|
||||
|
||||
buildInputs = [
|
||||
SDL_compat
|
||||
SDL_mixer
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = [
|
||||
"SHAREWARE=${if buildShareware then "1" else "0"}"
|
||||
''EXTRACFLAGS=-DDATADIR=\"${if withSharewareData then "${placeholder "out"}/${datadir}" else ""}\"''
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
${lib.optionalString withSharewareData ''
|
||||
mkdir -p "$out/${datadir}"
|
||||
unzip -d "$out/${datadir}" ../../source/ROTTSW13.SHR
|
||||
''}
|
||||
install -Dm755 -t $out/bin rott
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "rott";
|
||||
exec = "rott";
|
||||
desktopName = "Rise of the Triad: ${if buildShareware then "The HUNT Begins" else "Dark War"}";
|
||||
categories = [ "Game" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "SDL port of Rise of the Triad";
|
||||
mainProgram = "rott";
|
||||
homepage = "https://icculus.org/rott/";
|
||||
license = with lib.licenses; [ gpl2Plus ] ++ lib.optional withSharewareData unfreeRedistributable;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
548
pkgs/by-name/ru/rumqttd/bump-metrics.patch
Normal file
548
pkgs/by-name/ru/rumqttd/bump-metrics.patch
Normal file
|
|
@ -0,0 +1,548 @@
|
|||
--- a/rumqttd/Cargo.toml
|
||||
+++ b/rumqttd/Cargo.toml
|
||||
@@ -32,8 +32,8 @@
|
||||
config = "0.14"
|
||||
tracing = { version="0.1", features=["log"] }
|
||||
tracing-subscriber = { version="0.3.18", features=["env-filter"] }
|
||||
-metrics = "0.22.1"
|
||||
-metrics-exporter-prometheus = { version = "0.13.1", default-features = false, features = ["http-listener"] }
|
||||
+metrics = "0.24.5"
|
||||
+metrics-exporter-prometheus = { version = "0.16", default-features = false, features = ["http-listener"] }
|
||||
clap = { version = "4.4", features = ["derive"] }
|
||||
axum = "0.7.4"
|
||||
rand = "0.8.5"
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -24,7 +24,7 @@
|
||||
checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
- "getrandom",
|
||||
+ "getrandom 0.2.12",
|
||||
"once_cell",
|
||||
"version_check",
|
||||
"zerocopy",
|
||||
@@ -256,10 +256,10 @@
|
||||
"axum-core",
|
||||
"bytes",
|
||||
"futures-util",
|
||||
- "http 1.0.0",
|
||||
- "http-body 1.0.0",
|
||||
+ "http",
|
||||
+ "http-body",
|
||||
"http-body-util",
|
||||
- "hyper 1.2.0",
|
||||
+ "hyper",
|
||||
"hyper-util",
|
||||
"itoa",
|
||||
"matchit",
|
||||
@@ -289,8 +289,8 @@
|
||||
"async-trait",
|
||||
"bytes",
|
||||
"futures-util",
|
||||
- "http 1.0.0",
|
||||
- "http-body 1.0.0",
|
||||
+ "http",
|
||||
+ "http-body",
|
||||
"http-body-util",
|
||||
"mime",
|
||||
"pin-project-lite",
|
||||
@@ -329,6 +329,12 @@
|
||||
checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
|
||||
|
||||
[[package]]
|
||||
+name = "base64"
|
||||
+version = "0.22.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
|
||||
+
|
||||
+[[package]]
|
||||
name = "benchmarks"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
@@ -564,7 +570,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
|
||||
dependencies = [
|
||||
- "getrandom",
|
||||
+ "getrandom 0.2.12",
|
||||
"once_cell",
|
||||
"tiny-keccak",
|
||||
]
|
||||
@@ -836,6 +842,12 @@
|
||||
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
||||
|
||||
[[package]]
|
||||
+name = "foldhash"
|
||||
+version = "0.1.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
|
||||
+
|
||||
+[[package]]
|
||||
name = "foreign-types"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
@@ -983,6 +995,18 @@
|
||||
]
|
||||
|
||||
[[package]]
|
||||
+name = "getrandom"
|
||||
+version = "0.3.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "libc",
|
||||
+ "r-efi",
|
||||
+ "wasip2",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
name = "gimli"
|
||||
version = "0.28.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
@@ -1005,7 +1029,7 @@
|
||||
"futures-core",
|
||||
"futures-sink",
|
||||
"futures-util",
|
||||
- "http 1.0.0",
|
||||
+ "http",
|
||||
"indexmap",
|
||||
"slab",
|
||||
"tokio",
|
||||
@@ -1021,14 +1045,20 @@
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
-version = "0.14.3"
|
||||
+version = "0.15.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
|
||||
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
|
||||
dependencies = [
|
||||
- "ahash",
|
||||
+ "foldhash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
+name = "hashbrown"
|
||||
+version = "0.17.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
|
||||
+
|
||||
+[[package]]
|
||||
name = "heck"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
@@ -1051,17 +1081,6 @@
|
||||
|
||||
[[package]]
|
||||
name = "http"
|
||||
-version = "0.2.11"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
|
||||
-dependencies = [
|
||||
- "bytes",
|
||||
- "fnv",
|
||||
- "itoa",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "http"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
|
||||
@@ -1073,23 +1092,12 @@
|
||||
|
||||
[[package]]
|
||||
name = "http-body"
|
||||
-version = "0.4.6"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
|
||||
-dependencies = [
|
||||
- "bytes",
|
||||
- "http 0.2.11",
|
||||
- "pin-project-lite",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "http-body"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
- "http 1.0.0",
|
||||
+ "http",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1100,8 +1108,8 @@
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"futures-util",
|
||||
- "http 1.0.0",
|
||||
- "http-body 1.0.0",
|
||||
+ "http",
|
||||
+ "http-body",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
@@ -1125,29 +1133,6 @@
|
||||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
-version = "0.14.28"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
|
||||
-dependencies = [
|
||||
- "bytes",
|
||||
- "futures-channel",
|
||||
- "futures-core",
|
||||
- "futures-util",
|
||||
- "http 0.2.11",
|
||||
- "http-body 0.4.6",
|
||||
- "httparse",
|
||||
- "httpdate",
|
||||
- "itoa",
|
||||
- "pin-project-lite",
|
||||
- "socket2",
|
||||
- "tokio",
|
||||
- "tower-service",
|
||||
- "tracing",
|
||||
- "want",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "hyper"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
|
||||
@@ -1156,14 +1141,15 @@
|
||||
"futures-channel",
|
||||
"futures-util",
|
||||
"h2",
|
||||
- "http 1.0.0",
|
||||
- "http-body 1.0.0",
|
||||
+ "http",
|
||||
+ "http-body",
|
||||
"httparse",
|
||||
"httpdate",
|
||||
"itoa",
|
||||
"pin-project-lite",
|
||||
"smallvec",
|
||||
"tokio",
|
||||
+ "want",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1173,13 +1159,17 @@
|
||||
checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
+ "futures-channel",
|
||||
"futures-util",
|
||||
- "http 1.0.0",
|
||||
- "http-body 1.0.0",
|
||||
- "hyper 1.2.0",
|
||||
+ "http",
|
||||
+ "http-body",
|
||||
+ "hyper",
|
||||
"pin-project-lite",
|
||||
"socket2",
|
||||
"tokio",
|
||||
+ "tower",
|
||||
+ "tower-service",
|
||||
+ "tracing",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1194,12 +1184,12 @@
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
-version = "2.2.3"
|
||||
+version = "2.14.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
|
||||
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
- "hashbrown 0.14.3",
|
||||
+ "hashbrown 0.17.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1295,9 +1285,9 @@
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
-version = "0.2.153"
|
||||
+version = "0.2.186"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
||||
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
@@ -1375,22 +1365,24 @@
|
||||
|
||||
[[package]]
|
||||
name = "metrics"
|
||||
-version = "0.22.1"
|
||||
+version = "0.24.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "cd71d9db2e4287c3407fa04378b8c2ee570aebe0854431562cdd89ca091854f4"
|
||||
+checksum = "ff56c2e7dce6bd462e3b8919986a617027481b1dcc703175b58cf9dd98a2f071"
|
||||
dependencies = [
|
||||
- "ahash",
|
||||
"portable-atomic",
|
||||
+ "rapidhash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "metrics-exporter-prometheus"
|
||||
-version = "0.13.1"
|
||||
+version = "0.16.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21"
|
||||
+checksum = "dd7399781913e5393588a8d8c6a2867bf85fb38eaf2502fdce465aad2dc6f034"
|
||||
dependencies = [
|
||||
- "base64 0.21.7",
|
||||
- "hyper 0.14.28",
|
||||
+ "base64 0.22.1",
|
||||
+ "http-body-util",
|
||||
+ "hyper",
|
||||
+ "hyper-util",
|
||||
"indexmap",
|
||||
"ipnet",
|
||||
"metrics",
|
||||
@@ -1398,20 +1390,22 @@
|
||||
"quanta",
|
||||
"thiserror 1.0.57",
|
||||
"tokio",
|
||||
+ "tracing",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "metrics-util"
|
||||
-version = "0.16.2"
|
||||
+version = "0.19.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "ece71ab046dcf45604e573329966ec1db5ff4b81cfa170a924ff4c959ab5451a"
|
||||
+checksum = "b8496cc523d1f94c1385dd8f0f0c2c480b2b8aeccb5b7e4485ad6365523ae376"
|
||||
dependencies = [
|
||||
"crossbeam-epoch",
|
||||
"crossbeam-utils",
|
||||
- "hashbrown 0.14.3",
|
||||
+ "hashbrown 0.15.5",
|
||||
"metrics",
|
||||
- "num_cpus",
|
||||
"quanta",
|
||||
+ "rand 0.9.4",
|
||||
+ "rand_xoshiro",
|
||||
"sketches-ddsketch",
|
||||
]
|
||||
|
||||
@@ -1961,14 +1955,30 @@
|
||||
]
|
||||
|
||||
[[package]]
|
||||
+name = "r-efi"
|
||||
+version = "5.3.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
|
||||
+
|
||||
+[[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",
|
||||
+ "rand_chacha 0.3.1",
|
||||
+ "rand_core 0.6.4",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand"
|
||||
+version = "0.9.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
|
||||
+dependencies = [
|
||||
+ "rand_chacha 0.9.0",
|
||||
+ "rand_core 0.9.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1978,7 +1988,17 @@
|
||||
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
- "rand_core",
|
||||
+ "rand_core 0.6.4",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand_chacha"
|
||||
+version = "0.9.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
|
||||
+dependencies = [
|
||||
+ "ppv-lite86",
|
||||
+ "rand_core 0.9.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1987,7 +2007,34 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
||||
dependencies = [
|
||||
- "getrandom",
|
||||
+ "getrandom 0.2.12",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand_core"
|
||||
+version = "0.9.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
|
||||
+dependencies = [
|
||||
+ "getrandom 0.3.4",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand_xoshiro"
|
||||
+version = "0.7.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41"
|
||||
+dependencies = [
|
||||
+ "rand_core 0.9.5",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rapidhash"
|
||||
+version = "4.4.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "b5e48930979c155e2f33aa36ab3119b5ee81332beb6482199a8ecd6029b80b59"
|
||||
+dependencies = [
|
||||
+ "rustversion",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2069,7 +2116,7 @@
|
||||
dependencies = [
|
||||
"cc",
|
||||
"cfg-if",
|
||||
- "getrandom",
|
||||
+ "getrandom 0.2.12",
|
||||
"libc",
|
||||
"spin",
|
||||
"untrusted",
|
||||
@@ -2100,7 +2147,7 @@
|
||||
"fixedbitset 0.5.7",
|
||||
"flume",
|
||||
"futures-util",
|
||||
- "http 1.0.0",
|
||||
+ "http",
|
||||
"log",
|
||||
"matches",
|
||||
"native-tls",
|
||||
@@ -2122,7 +2169,7 @@
|
||||
|
||||
[[package]]
|
||||
name = "rumqttd"
|
||||
-version = "0.19.0"
|
||||
+version = "0.20.0"
|
||||
dependencies = [
|
||||
"async-tungstenite 0.25.0",
|
||||
"axum",
|
||||
@@ -2136,7 +2183,7 @@
|
||||
"parking_lot",
|
||||
"pretty_assertions",
|
||||
"pretty_env_logger",
|
||||
- "rand",
|
||||
+ "rand 0.8.5",
|
||||
"rustls-pemfile",
|
||||
"rustls-webpki",
|
||||
"serde",
|
||||
@@ -2466,9 +2513,9 @@
|
||||
|
||||
[[package]]
|
||||
name = "sketches-ddsketch"
|
||||
-version = "0.2.2"
|
||||
+version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
|
||||
+checksum = "0c6f73aeb92d671e0cc4dca167e59b2deb6387c375391bc99ee743f326994a2b"
|
||||
|
||||
[[package]]
|
||||
name = "slab"
|
||||
@@ -2943,10 +2990,10 @@
|
||||
"byteorder",
|
||||
"bytes",
|
||||
"data-encoding",
|
||||
- "http 1.0.0",
|
||||
+ "http",
|
||||
"httparse",
|
||||
"log",
|
||||
- "rand",
|
||||
+ "rand 0.8.5",
|
||||
"sha1",
|
||||
"thiserror 1.0.57",
|
||||
"url",
|
||||
@@ -2962,10 +3009,10 @@
|
||||
"byteorder",
|
||||
"bytes",
|
||||
"data-encoding",
|
||||
- "http 1.0.0",
|
||||
+ "http",
|
||||
"httparse",
|
||||
"log",
|
||||
- "rand",
|
||||
+ "rand 0.8.5",
|
||||
"rustls 0.23.17",
|
||||
"rustls-pki-types",
|
||||
"sha1",
|
||||
@@ -3053,8 +3100,8 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
|
||||
dependencies = [
|
||||
- "getrandom",
|
||||
- "rand",
|
||||
+ "getrandom 0.2.12",
|
||||
+ "rand 0.8.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3091,6 +3138,15 @@
|
||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
+name = "wasip2"
|
||||
+version = "1.0.3+wasi-0.2.9"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
|
||||
+dependencies = [
|
||||
+ "wit-bindgen",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.91"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
@@ -3339,6 +3395,12 @@
|
||||
]
|
||||
|
||||
[[package]]
|
||||
+name = "wit-bindgen"
|
||||
+version = "0.57.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
|
||||
+
|
||||
+[[package]]
|
||||
name = "ws_stream_tungstenite"
|
||||
version = "0.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
|
@ -15,7 +15,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
tag = "rumqttd-${finalAttrs.version}";
|
||||
hash = "sha256-WFhVSFAp5ZIqranLpU86L7keQaReEUXxxGhvikF+TBw=";
|
||||
};
|
||||
cargoHash = "sha256-UP1uhG+Ow/jN/B8i//vujP7vpoQ5PjYGCrXs0b1bym4=";
|
||||
|
||||
# Bump vendored `metrics` past 0.24.2 which fixes a borrow-checker error
|
||||
# under newer rustc (https://github.com/rust-lang/rust/issues/141402).
|
||||
cargoPatches = [ ./bump-metrics.patch ];
|
||||
|
||||
cargoHash = "sha256-rVJBYOleIHFNwWNrz0JU8rwiMv9E1QfPjDvtrfXvWlQ=";
|
||||
|
||||
buildAndTestSubdir = "rumqttd";
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
cctools,
|
||||
darwin,
|
||||
dotnetCorePackages,
|
||||
fetchFromGitLab,
|
||||
fetchFromForgejo,
|
||||
libx11,
|
||||
libgdiplus,
|
||||
moltenvk,
|
||||
|
|
@ -34,10 +34,10 @@ buildDotnetModule rec {
|
|||
pname = "ryubing";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
src = fetchFromForgejo {
|
||||
domain = "git.ryujinx.app";
|
||||
owner = "Ryubing";
|
||||
repo = "Ryujinx";
|
||||
owner = "projects";
|
||||
repo = "Ryubing";
|
||||
tag = version;
|
||||
hash = "sha256-LhQaXxmj5HIgfmrsDN8GhhVXlXHpDO2Q8JtNLaCq0mk=";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
|
|||
|
||||
# If NEW_VERSION or COMMIT are not set, fetch the latest version
|
||||
if [ -z ${NEW_VERSION+x} ] && [ -z ${COMMIT+x} ]; then
|
||||
RELEASE_DATA=$(curl -s "https://git.ryujinx.app/api/v4/projects/1/repository/tags?order_by=updated&sort=desc")
|
||||
RELEASE_DATA=$(curl -s "https://git.ryujinx.app/api/v1/repos/projects/Ryubing/tags")
|
||||
if [ -z "$RELEASE_DATA" ] || [[ $RELEASE_DATA =~ "imposed ratelimits" ]]; then
|
||||
echo "failed to get release job data" >&2
|
||||
exit 1
|
||||
|
|
@ -27,7 +27,7 @@ fi
|
|||
cd ../../../..
|
||||
|
||||
if [[ "${1-default}" != "--deps-only" ]]; then
|
||||
SHA="$(nix-prefetch-git https://git.ryujinx.app/ryubing/ryujinx --rev "$NEW_VERSION" --quiet | jq -r '.sha256')"
|
||||
SHA="$(nix-prefetch-git https://git.ryujinx.app/projects/Ryubing --rev "$NEW_VERSION" --quiet | jq -r '.sha256')"
|
||||
SRI=$(nix --experimental-features nix-command hash to-sri "sha256:$SHA")
|
||||
update-source-version ryubing "$NEW_VERSION" "$SRI"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -12,16 +12,18 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sops";
|
||||
version = "3.12.2";
|
||||
version = "3.13.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsops";
|
||||
repo = finalAttrs.pname;
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1VGaS0uhacxjNOP/USmFHlrewkGzRzrV6xamDXY8hgc=";
|
||||
hash = "sha256-sJAK7iCVmjGAjQ0CBVsJI7L/GwHB9bvm354Cq3WQI1M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HgfJMTTWzQ4+59nuy/et3KxQaZEcfrjcWSr/iOOdpb0=";
|
||||
vendorHash = "sha256-aBHZPh5ib2BOxoHQH6q8GD/EJOb2x1OBBePicwoI6Gc=";
|
||||
|
||||
subPackages = [ "cmd/sops" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -49,6 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"-DZLIB_STATIC=off"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./ssw-stdbool.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix missing pthread dependency for the main binary.
|
||||
substituteInPlace src/sortmerna/CMakeLists.txt \
|
||||
|
|
|
|||
13
pkgs/by-name/so/sortmerna/ssw-stdbool.patch
Normal file
13
pkgs/by-name/so/sortmerna/ssw-stdbool.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/include/ssw.h b/include/ssw.h
|
||||
index 5259c95..32bb146 100644
|
||||
--- a/include/ssw.h
|
||||
+++ b/include/ssw.h
|
||||
@@ -35,7 +35,7 @@ struct _profile;
|
||||
typedef struct _profile s_profile;
|
||||
|
||||
#ifndef __cplusplus
|
||||
-typedef unsigned char bool;
|
||||
+#include <stdbool.h>
|
||||
static const bool False = 0;
|
||||
static const bool True = 1;
|
||||
#endif
|
||||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ssh-vault";
|
||||
version = "1.2.7";
|
||||
version = "1.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ssh-vault";
|
||||
repo = "ssh-vault";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BC10Nir/MUxhD6QSF8p7cDdlrscC72Eoot/u8RAwM8g=";
|
||||
hash = "sha256-kJscLetdP4D6DzzERfohezdsJqGcm/dmYTC+ZxjvRvo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NRFmCeL8ZhJ1Y29VPWK3Yqg6losB/9+QE/8GqpUeJTs=";
|
||||
cargoHash = "sha256-XFKqEwWDg8FUeObhI6oOIXNh8c7gsWgSWy3YThExuU4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
12
pkgs/by-name/st/strobealign/include-cstdint.patch
Normal file
12
pkgs/by-name/st/strobealign/include-cstdint.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/ext/robin_hood.h b/ext/robin_hood.h
|
||||
index a8f3a78..1c1b1d8 100644
|
||||
--- a/ext/robin_hood.h
|
||||
+++ b/ext/robin_hood.h
|
||||
@@ -41,6 +41,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdlib>
|
||||
+#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <functional>
|
||||
#include <memory> // only to support hash of smart pointers
|
||||
|
|
@ -18,6 +18,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-ah21ptyfZbgdJrtCCftYhGh1hfcJ9JpXNsXUp8pZDJw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./include-cstdint.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "swagger-cli";
|
||||
version = "4.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "APIDevTools";
|
||||
repo = "swagger-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WgzfSd57vRwa1HrSgNxD0F5ckczBkOaVmrEZ9tMAcRA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-go9eYGCZmbwRArHVTVa6mxL+kjvBcrLxKw2iVv0a5hY=";
|
||||
|
||||
buildPhase = ''
|
||||
npm run bump
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
find $out/lib/node_modules -xtype l -delete
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Swagger 2.0 and OpenAPI 3.0 command-line tool";
|
||||
homepage = "https://apitools.dev/swagger-cli/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dit7ya ];
|
||||
mainProgram = "swagger-cli";
|
||||
};
|
||||
}
|
||||
|
|
@ -5,16 +5,22 @@
|
|||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tdl";
|
||||
version = "0.19.0";
|
||||
version = "0.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iyear";
|
||||
repo = "tdl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-EYS4EK0NmNHnvjMkf5AHrYpZeGw+n2ovFDLanbqpF4Y=";
|
||||
hash = "sha256-xDCvZ6a7xW5kJ+3nsCQGASypzrosjihI0hlSobBWwj0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GpqgH23eK0h2BYxjN5TNUWEOT72smYdUoD1Iy6L2jL4=";
|
||||
vendorHash = "sha256-dMuDmW3WtXU1Awuw7KKSCk1o/GKpBfsrqfvb3wVNGWw=";
|
||||
|
||||
postPatch = ''
|
||||
rm go.work go.work.sum
|
||||
go mod edit -replace github.com/iyear/tdl/core=./core
|
||||
go mod edit -replace github.com/iyear/tdl/extension=./extension
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
@ -22,6 +28,10 @@ buildGoModule (finalAttrs: {
|
|||
"-X=github.com/iyear/tdl/pkg/consts.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
env.GOGC = "50";
|
||||
|
||||
buildFlags = [ "-p=1" ];
|
||||
|
||||
# Filter out the main executable
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -19,18 +19,18 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ticktick";
|
||||
version = "8.0.0";
|
||||
version = "8.0.10";
|
||||
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "${baseUrl}/linux/linux_deb_x64/ticktick-${finalAttrs.version}-amd64.deb";
|
||||
hash = "sha256-s8mE66Tv3TyL4rMvok6cM5VM6pzWxPkiviS30KWcN1o=";
|
||||
hash = "sha256-5zIhLpoqZM8+RC4YBhdDyMq2aEg31O8U6Q5gD8Bo9es=";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "aarch64-linux" then
|
||||
fetchurl {
|
||||
url = "${baseUrl}/linux/linux_deb_arm64/ticktick-${finalAttrs.version}-arm64.deb";
|
||||
hash = "sha256-Lgfa4+VZH1XIAMZr7+RiwxZ1smswQOisOhmFSg2pyTE=";
|
||||
hash = "sha256-R9dMGUiSXX/CRfVXoW3w2Gk1UfknfmNWoIqkhL/FRJs=";
|
||||
}
|
||||
else
|
||||
throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildGo125Module,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "tidb";
|
||||
version = "8.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pingcap";
|
||||
repo = "tidb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sQ5hialileLC/ZpXoy5zfSnLZAL1I4aiiQf+y5LPIK8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YJ47tC1pp+hDMIiKyzROypk+zX76r+c5O9qD2OkVmgw=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${finalAttrs.version}"
|
||||
"-X github.com/pingcap/tidb/pkg/util/versioninfo.TiDBEdition=Community"
|
||||
];
|
||||
|
||||
subPackages = [ "cmd/tidb-server" ];
|
||||
|
||||
meta = {
|
||||
description = "Open-source, cloud-native, distributed, MySQL-Compatible database for elastic scale and real-time analytics";
|
||||
homepage = "https://pingcap.com";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ Makuru ];
|
||||
mainProgram = "tidb-server";
|
||||
};
|
||||
})
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "timescaledb-tune";
|
||||
version = "0.18.1";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timescale";
|
||||
repo = "timescaledb-tune";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-SC91yO3P2Q2QachSfAAzz7ldcnZedZfcnVXHcFXNrIk=";
|
||||
sha256 = "sha256-3jsRI/ZuFNxjDfRzWQWclUiuC2qrxtUxJ0gcmXXQLUw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7u3eceVDnzjhGguijJXbm40qyCPO/Q101Zr5vEcGEqs=";
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue