Merge remote-tracking branch 'origin/staging-next' into staging

This commit is contained in:
K900
2026-04-15 00:33:28 +03:00
222 changed files with 4995 additions and 1785 deletions
+10 -5
View File
@@ -1121,11 +1121,16 @@ let
let
# Add in the default value for this option, if any.
defs' =
(optional (opt ? default) {
file = head opt.declarations;
value = mkOptionDefault opt.default;
})
++ defs;
if opt ? default then
[
{
file = head opt.declarations;
value = mkOptionDefault opt.default;
}
]
++ defs
else
defs;
# Handle properties, check types, and merge everything together.
res =
+8
View File
@@ -3030,6 +3030,14 @@
githubId = 75235;
name = "Michael Walker";
};
bartoostveen = {
name = "Bart Oostveen";
github = "bartoostveen";
githubId = 50515369;
email = "bart@bartoostveen.nl";
matrix = "@bart:bartoostveen.nl";
keys = [ { fingerprint = "81FF AB19 BAA5 6FFD 6571 890B 992D 94B5 7AC4 3430"; } ];
};
bartuka = {
email = "wand@hey.com";
github = "wandersoncferreira";
@@ -168,6 +168,7 @@ toml-edit,,,,,5.1,mrcjkb
tree-sitter-cli,,,,,,
tree-sitter-http,,,,0.0.33-1,,
tree-sitter-norg,,,,,5.1,mrcjkb
tree-sitter-norg-meta,,,,,,
tree-sitter-orgmode,,,,,5.1,
utf8,,,,,,
tree-sitter-teal,,,,,,
1 name rockspec ref server version luaversion maintainers
168 tree-sitter-cli
169 tree-sitter-http 0.0.33-1
170 tree-sitter-norg 5.1 mrcjkb
171 tree-sitter-norg-meta
172 tree-sitter-orgmode 5.1
173 utf8
174 tree-sitter-teal
@@ -110,6 +110,8 @@
- [turborepo-remote-cache](https://ducktors.github.io/turborepo-remote-cache/), an open-source implementation of the [Turborepo custom remote cache server](https://turbo.build/repo/docs/core-concepts/remote-caching#self-hosting). Available as [services.turborepo-remote-cache](options.html#opt-services.turborepo-remote-cache).
- [RSSHub](https://github.com/DIYgod/RSSHub), a service to convert many sources into rss. Available as `services.rsshub`.
- [Komodo Periphery](https://github.com/moghtech/komodo), a multi-server Docker and Git deployment agent by Komodo. Available as [services.komodo-periphery](#opt-services.komodo-periphery.enable).
- [Shoko](https://shokoanime.com), an anime management system. Available as [services.shoko](#opt-services.shoko.enable).
@@ -350,6 +352,7 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
- `systemd.sleep.extraConfig` was replaced by [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md)-compliant `systemd.sleep.settings.Sleep`, which is used to generate the `sleep.conf` configuration file. See {manpage}`sleep.conf.d(5)` for available options.
- Support for Bluetooth audio based on `bluez-alsa` has been added to the `hardware.alsa` module. It can be enabled with the new [enableBluetooth](#opt-hardware.alsa.enableBluetooth) option.
- `services.atuin` now has an `environmentFile` option to safely allow configuring secrets, such as an `ATUIN_DB_URI` containing a Postgres password.
- `systemd.network.*` has been updated to support all configuration options from upstream `networkd` version 259.
+5
View File
@@ -185,6 +185,11 @@ in
"nxp-pn5xx"
];
# libnfc-nci calls sched_setscheduler via pthread_setschedparam, which would be blocked by upstream SystemCallFilter=~@resources
systemd.services.pcscd.serviceConfig.SystemCallFilter = lib.mkIf cfg.enableIFD [
"sched_setscheduler"
];
services.pcscd.readerConfigs = lib.mkIf cfg.enableIFD [
''
FRIENDLYNAME "NFC NCI"
+1
View File
@@ -1760,6 +1760,7 @@
./services/web-apps/reposilite.nix
./services/web-apps/rimgo.nix
./services/web-apps/rss-bridge.nix
./services/web-apps/rsshub.nix
./services/web-apps/rutorrent.nix
./services/web-apps/screego.nix
./services/web-apps/selfoss.nix
@@ -82,7 +82,8 @@ in
allowedTCPPorts =
lib.optional cfg.enable 8097 # Music Assistant stream port
++ lib.optional (lib.elem "airplay" cfg.providers) 7000
++ lib.optional (lib.elem "sendspin" cfg.providers) 8927;
++ lib.optional (lib.elem "sendspin" cfg.providers) 8927
++ lib.optional (lib.elem "snapcast" cfg.providers) 1780;
# The information published by Apple 1 seem to not apply to libraop.
# The closest we could find that represents the port range being used as observed by tcpdump is the ephemeral port range.
# 1: https://support.apple.com/en-us/103229#:~:text=49152%E2%80%93-,65535,-TCP%2C%20UDP
@@ -97,6 +98,7 @@ in
services.avahi = lib.mkIf (lib.elem "airplay_receiver" cfg.providers) {
enable = true;
openFirewall = lib.mkIf cfg.openFirewall true;
publish = {
enable = true;
userServices = true;
@@ -129,7 +131,7 @@ in
++ lib.optionals (lib.elem "airplay_receiver" cfg.providers) [
shairport-sync
]
++ lib.optionals (lib.elem "spotify" cfg.providers) [
++ lib.optionals (lib.elem "spotify" cfg.providers || lib.elem "spotify_connect" cfg.providers) [
librespot-ma
]
++ lib.optionals (lib.elem "snapcast" cfg.providers) [
+10
View File
@@ -68,6 +68,15 @@ in
'';
};
};
environmentFile = lib.mkOption {
type = lib.types.nullOr lib.types.externalPath;
default = null;
description = ''
Environment file, used to set any secret ATUIN_* environment variables, such as ATUIN_DB_URI containing a password.
See https://docs.atuin.sh/cli/self-hosting/server-setup/#configuration for available environment variables.
'';
};
};
};
@@ -105,6 +114,7 @@ in
serviceConfig = {
ExecStart = "${lib.getExe' cfg.package "atuin-server"} start";
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
RuntimeDirectory = "atuin";
RuntimeDirectoryMode = "0700";
DynamicUser = true;
@@ -735,8 +735,6 @@ in
'';
};
programs.mtr.enable = true;
services.logrotate = {
enable = true;
settings."${cfg.logDir}/librenms.log" = {
@@ -62,6 +62,7 @@ let
"domain"
"dovecot"
"ebpf"
"fail2ban"
"fastly"
"flow"
"fritz"
@@ -337,6 +338,31 @@ let
services.udev.extraRules = mkIf (name == "smartctl") ''
ACTION=="add", SUBSYSTEM=="nvme", KERNEL=="nvme[0-9]*", RUN+="${pkgs.acl}/bin/setfacl -m g:smartctl-exporter-access:rw /dev/$kernel"
'';
systemd.services.prometheus-fail2ban-exporter-setup =
mkIf (config.services.fail2ban.enable && name == "fail2ban")
{
description = "Set fail2ban socket ACLs";
after = [ "fail2ban.service" ];
requires = [ "fail2ban.service" ];
before = [ "prometheus-fail2ban-exporter.service" ];
wantedBy = [ "prometheus-fail2ban-exporter.service" ];
path = [
pkgs.acl
pkgs.coreutils
];
script = ''
while [ ! -S ${conf.fail2banSocket} ]; do
sleep 0.1
done
setfacl -m u:${conf.user}:x $(dirname ${conf.fail2banSocket})
setfacl -m u:${conf.user}:rwx ${conf.fail2banSocket}
'';
serviceConfig = {
Type = "oneshot";
User = "root";
};
};
networking.firewall.extraCommands = mkIf (conf.openFirewall && !nftables) (concatStrings [
"ip46tables -A nixos-fw ${conf.firewallFilter} "
"-m comment --comment ${name}-exporter -j nixos-fw-accept"
@@ -0,0 +1,82 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.prometheus.exporters.fail2ban;
inherit (lib)
mkOption
types
getExe
optionalString
mkIf
;
in
{
port = 9191;
extraOpts = {
host = mkOption {
description = "The host that the fail2ban exporter should listen on";
type = types.str;
default = "127.0.0.1";
example = "0.0.0.0";
};
fail2banSocket = mkOption {
description = "Path to the fail2ban server socket. Permissions will be set automatically if fail2ban runs on this system.";
type = types.str;
default = config.services.fail2ban.daemonSettings.Definition.socket;
defaultText = "config.services.fail2ban.daemonSettings.Definition.socket";
};
exitOnError = mkOption {
description = "When set to true the exporter will immediately exit on a fail2ban socket connection error";
type = types.bool;
default = true;
example = false;
};
username = mkOption {
description = "Username to protect endpoints with HTTP basic authentication";
type = types.nullOr types.str;
default = null;
example = "admin";
};
passwordFile = mkOption {
description = "File that contains the password to protect endpoints with HTTP basic authentication";
type = types.nullOr types.path;
default = null;
example = "/run/secrets/prometheus-fail2ban-exporter-password.txt";
};
};
assertions = [
{
assertion = (cfg.username != null) -> (cfg.passwordFile != null);
message = "Setting an http basic auth username requires the password to be non-null";
}
];
serviceOpts = {
requires = mkIf config.services.fail2ban.enable [ "prometheus-fail2ban-exporter-setup.service" ];
serviceConfig = {
DynamicUser = false;
ExecStart = ''
${getExe pkgs.prometheus-fail2ban-exporter} \
${optionalString cfg.exitOnError ''--collector.f2b.exit-on-socket-connection-error \''}
${optionalString (cfg.username != null) ''
--web.basic-auth.username="${cfg.username}" \
--web.basic-auth.password="$(cat ${cfg.passwordFile})" \
''}
--web.listen-address="${cfg.host}:${toString cfg.port}" \
--collector.f2b.socket=${cfg.fail2banSocket}
'';
RestrictAddressFamilies = [
"AF_INET"
"AF_INET6"
"AF_UNIX"
];
};
};
}
+138
View File
@@ -0,0 +1,138 @@
{
lib,
config,
pkgs,
...
}:
let
cfg = config.services.rsshub;
in
{
options.services.rsshub = {
enable = lib.mkEnableOption "RSSHub service";
package = lib.mkPackageOption pkgs "rsshub" { };
openFirewall = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Whether to open the firewall for the specified port.";
};
settings = lib.mkOption {
type = lib.types.submodule {
freeformType = lib.types.attrsOf lib.types.str;
options = {
LISTEN_INADDR_ANY = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Listen to any address";
apply = x: if x then "1" else "0";
};
PORT = lib.mkOption {
type = lib.types.port;
default = 1200;
description = "Listen on port.";
apply = toString;
};
NO_LOGFILES = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Print logs into stderr.";
apply = x: if x then "1" else "0";
};
};
};
default = { };
example = lib.literalExpression ''
{
REQUEST_TIMEOUT = "3000";
REQUEST_RETRY = "10";
PUPPETEER_EXECUTABLE_PATH = lib.getExe pkgs.chromium";
}
'';
description = ''
Environment variables for RSSHub.
See <https://docs.rsshub.app/deploy/config> for available options.
'';
};
secretFiles = lib.mkOption {
type = lib.types.listOf lib.types.path;
default = [ ];
example = lib.literalExpression ''
[ config.sops.secrets.rsshub.path ]
'';
description = ''
Environment variables stored in files for secrets.
See <https://docs.rsshub.app/deploy/config> for available options.
'';
};
redis = {
enable = lib.mkEnableOption "Redis for RSSHub";
createLocally = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Create and use a local Redis instance. Sets `services.redis.servers.rsshub`.";
};
host = lib.mkOption {
type = lib.types.str;
default = "localhost";
description = "The Redis host.";
};
port = lib.mkOption {
type = lib.types.port;
default = 6379;
description = "The Redis port.";
};
};
};
config = lib.mkIf cfg.enable {
services.redis.servers.rsshub = lib.mkIf (cfg.redis.enable && cfg.redis.createLocally) {
enable = true;
port = cfg.redis.port;
};
services.rsshub.settings = lib.mkIf cfg.redis.enable {
CACHE_TYPE = "redis";
REDIS_URL = "redis://${cfg.redis.host}:${toString cfg.redis.port}";
};
systemd.services.rsshub = {
description = "RSSHub - Everything is RSSible";
wantedBy = [ "multi-user.target" ];
after = lib.optional (cfg.redis.enable && cfg.redis.createLocally) "redis-rsshub.service";
requires = lib.optional (cfg.redis.enable && cfg.redis.createLocally) "redis-rsshub.service";
environment = cfg.settings;
serviceConfig = {
Type = "simple";
User = "rsshub";
Group = "rsshub";
DynamicUser = true;
StateDirectory = "rsshub";
EnvironmentFile = cfg.secretFiles;
ExecStart = lib.getExe cfg.package;
Restart = "on-failure";
RestartSec = "10s";
# Hardening
NoNewPrivileges = true;
PrivateTmp = true;
ProtectSystem = "strict";
ProtectHome = true;
ProtectKernelTunables = true;
ProtectKernelModules = true;
ProtectControlGroups = true;
};
};
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ (lib.toInt cfg.settings.PORT) ];
};
meta.maintainers = with lib.maintainers; [ vonfry ];
}
+1
View File
@@ -1432,6 +1432,7 @@ in
rspamd-trainer = runTest ./rspamd-trainer.nix;
rss-bridge = handleTest ./web-apps/rss-bridge { };
rss2email = handleTest ./rss2email.nix { };
rsshub = runTest ./web-apps/rsshub.nix;
rstp = runTest ./rstp.nix;
rstudio-server = runTest ./rstudio-server.nix;
rsync = runTest ./rsync.nix;
+18
View File
@@ -436,6 +436,24 @@ let
'';
};
fail2ban =
{ ... }:
{
exporterConfig = {
enable = true;
exitOnError = true;
};
metricProvider = {
services.fail2ban.enable = true;
};
exporterTest = ''
wait_for_unit("fail2ban.service")
wait_for_unit("prometheus-fail2ban-exporter.service")
wait_for_open_port(9191)
succeed("curl -sSf http://localhost:9191/metrics | grep 'f2b_errors'")
'';
};
fastly =
{ pkgs, ... }:
{
+46
View File
@@ -0,0 +1,46 @@
{ lib, ... }:
{
name = "rsshub";
meta.maintainers = with lib.maintainers; [ vonfry ];
nodes = {
basic = {
services.rsshub.enable = true;
};
redis = {
services.rsshub = {
enable = true;
redis = {
enable = true;
createLocally = true;
};
};
};
};
testScript =
{ nodes, ... }:
let
port = nodes.basic.services.rsshub.settings.PORT;
in
''
def assert_http_200(machine, url):
code = machine.succeed(f"curl -s -o /dev/null -w '%{{http_code}}' {url}").strip()
assert code == "200", f"Expected HTTP 200 from {url}, got {code}"
def test_node(node):
node.wait_for_unit("rsshub.service")
node.wait_for_open_port(${port})
assert_http_200(node, "http://localhost:${port}/healthz")
with subtest("RSSHub works"):
test_node(basic)
with subtest("RSSHub works with local Redis"):
test_node(redis)
'';
}
@@ -4341,8 +4341,8 @@ let
mktplcRef = {
publisher = "sonarsource";
name = "sonarlint-vscode";
version = "5.0.0";
hash = "sha256-K8EZF7h86ErbIHW05LQSpReXSKa8FTMH6uOD+IczoR4=";
version = "5.1.0";
hash = "sha256-eGAXjN4Vp6ZlUgUxlE8gfo5OYtL/IO/8ACu3PBwePLQ=";
};
meta.license = lib.licenses.lgpl3Only;
};
@@ -12,26 +12,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-XeNdr1nWK4aYTBEgAu3hXotmrDJ31ocg+w4870TuEGA=";
hash = "sha256-IoBA0fuy9XxZgswN1j9DfwDI218h2huapl1Bfs2AscI=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
hash = "sha256-yC8fBgj8lHR3y7OWUshWYNpn6fgp2SeKLv9WXxhVP0A=";
hash = "sha256-EfoRRJFTNr+0JAkqWJ2pXwhBtmAXs9cANLzXb4obOMs=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-O/SoqC0pNnbNdXylAj0rlKyr7qaJNivw6xhecKFk7JU=";
hash = "sha256-p2AjXFqoptxAwOdsievcjD/WLm0J03Rx/sT4ejUd6xM=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-pwdTllSB4IXDoyFuo2XxZjkS8lnIjp7AwgggBkjv3Y0=";
hash = "sha256-C1nbQxL5YDWenLQ82tABuEWKWl/LoEizTWo/YnBQJFw=";
};
};
in
{
publisher = "kilocode";
name = "Kilo-Code";
version = "7.1.22";
version = "7.2.0";
}
// sources.${stdenv.hostPlatform.system}
or (throw "Unsupported system ${stdenv.hostPlatform.system}");
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "bluemsx";
version = "0-unstable-2026-03-31";
version = "0-unstable-2026-04-11";
src = fetchFromGitHub {
owner = "libretro";
repo = "bluemsx-libretro";
rev = "8af516705652d240ef5bc69dea8276d0fdd16323";
hash = "sha256-QkJicDAfr+hFAlsqSLlonmGJEf/G9XFQ7oe/X4mvAhw=";
rev = "0b23b79f6b8c19f300d2d86958e89fbe2f6d30bc";
hash = "sha256-/rILuViKZBKZFZkCjuFuuuOE3AvDiHQqHtWq4Q8XSMA=";
};
meta = {
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fbneo";
version = "0-unstable-2026-04-06";
version = "0-unstable-2026-04-14";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbneo";
rev = "f659af2c3bec122d3e628e1e1634e746e67005e4";
hash = "sha256-cK2c611fBEDcRK1I7VMLL+Ih76FMWlEGhmhg53KampU=";
rev = "e869c6a2033b135e7fcbea4a50695e97755feae1";
hash = "sha256-YIva50UWylsDmAaJZI85LCphrgjh7jDYQZkpAlQr1HM=";
};
makefile = "Makefile";
@@ -9,13 +9,13 @@
}:
mkLibretroCore {
core = "mame";
version = "0-unstable-2026-04-06";
version = "0-unstable-2026-04-08";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame";
rev = "4162ead798f816b4f08b1af9eafefe3d022331bf";
hash = "sha256-doujon1GCXrmgYRWf3aGIpOFyOtj2U1DoaClGpaS1L0=";
rev = "a891bc3b98c5a9f00848c953c8768007c6d339cb";
hash = "sha256-u8vmZY9097h66bsZ71qoq+D+sZDkkgLukEayYVK7UI4=";
fetchSubmodules = true;
};
@@ -54,6 +54,9 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ jlesquembre ];
maintainers = with lib.maintainers; [
jlesquembre
mithicspirit
];
};
})
@@ -109,6 +109,6 @@ stdenv.mkDerivation (finalAttrs: {
description = "Core component for zathura PDF viewer";
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = [ ];
maintainers = with lib.maintainers; [ mithicspirit ];
};
})
@@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = [ ];
maintainers = with lib.maintainers; [ mithicspirit ];
};
})
@@ -75,6 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = [ ];
maintainers = with lib.maintainers; [ mithicspirit ];
};
})
@@ -53,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = [ ];
maintainers = with lib.maintainers; [ mithicspirit ];
};
})
@@ -55,6 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = [ ];
maintainers = with lib.maintainers; [ mithicspirit ];
};
})
@@ -68,6 +68,7 @@ symlinkJoin {
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
TethysSvensson
mithicspirit
];
mainProgram = "zathura";
};
@@ -1,23 +1,38 @@
{
lib,
stdenv,
fetchurl,
autoreconfHook,
fetchFromGitHub,
versionCheckHook,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "iprange";
version = "1.0.4";
version = "2.0.0";
src = fetchurl {
url = "https://github.com/firehol/iprange/releases/download/v${version}/iprange-${version}.tar.xz";
sha256 = "0rymw4ydn09dng34q4g5111706fyppzs2gd5br76frgvfj4x2f71";
src = fetchFromGitHub {
owner = "firehol";
repo = "iprange";
tag = "v${finalAttrs.version}";
hash = "sha256-/rNM/5SmqpNX/yM/9EZdRYsXxgbPLp7+SL/RDtKo3+0=";
};
nativeBuildInputs = [ autoreconfHook ];
configureFlags = [ "--disable-man" ];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
meta = {
description = "Manage IP ranges";
mainProgram = "iprange";
homepage = "https://github.com/firehol/iprange";
license = lib.licenses.gpl2;
changelog = "https://github.com/firehol/iprange/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl2Plus;
maintainers = [ ];
mainProgram = "iprange";
};
}
})
@@ -111,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
;
nativeBuildInputs = [
alsa-lib
autoPatchelfHook
cups
libdrm
@@ -122,14 +121,21 @@ stdenv.mkDerivation (finalAttrs: {
libxtst
libxcb
libxshmfence
libgbm
nss
wrapGAppsHook3
makeShellWrapper
];
dontWrapGApps = true;
buildInputs = [
alsa-lib
libgbm
nspr
nss
];
strictDeps = true;
libPath = lib.makeLibraryPath (
[
libcxx
@@ -1,24 +1,27 @@
{
stdenv,
lib,
billiard,
buildPythonApplication,
fetchFromGitHub,
fetchpatch,
gnureadline,
lxml,
matplotlib,
numpy,
opencv-python,
pymavlink,
pynmeagps,
pyserial,
setuptools,
versionCheckHook,
wxpython,
billiard,
gnureadline,
}:
buildPythonApplication rec {
pname = "MAVProxy";
version = "1.8.74";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "ArduPilot";
@@ -27,14 +30,25 @@ buildPythonApplication rec {
hash = "sha256-1/bp3vlCXt4Hg36zwMKSzPSxW7xlxpfx2o+2uQixdos=";
};
propagatedBuildInputs = [
patches = [
# Remove python 2 future imports
(fetchpatch {
url = "https://github.com/ArduPilot/MAVProxy/commit/db52f3f5d1991942026c00b51a3ce1ce85998cbd.patch";
hash = "sha256-mNhOfXJMiUihsso3fjzlbeXW/3ENvrdkFSLo23dMCY4=";
})
];
build-system = [ setuptools ];
dependencies = [
lxml
matplotlib
numpy
opencv-python
pymavlink
pynmeagps
pyserial
setuptools
setuptools # Imports `pkg_resources` at runtime
wxpython
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -42,12 +56,16 @@ buildPythonApplication rec {
gnureadline
];
# No tests
doCheck = false;
pythonImportsCheck = [ "MAVProxy" ];
# No tests, but we can check the version
nativeInstallCheckInputs = [ versionCheckHook ];
meta = {
description = "MAVLink proxy and command line ground station";
mainProgram = "mavproxy.py";
homepage = "https://github.com/ArduPilot/MAVProxy";
changelog = "https://github.com/ArduPilot/MAVProxy/releases/tag/${src.tag}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ lopsided98 ];
};
+1 -1
View File
@@ -592,7 +592,7 @@ rec {
in
runCommand "${baseNameOf name}.tar${compress.ext}" {
inherit (stream) imageName;
passthru = {
passthru = stream.passthru // {
inherit (stream) imageTag;
inherit stream;
};
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "3proxy";
version = "0.9.5";
version = "0.9.6";
src = fetchFromGitHub {
owner = "3proxy";
repo = "3proxy";
tag = finalAttrs.version;
sha256 = "sha256-uy6flZ1a7o02pr5O0pgl9zCjh8mE9W5JxotJeBMB16A=";
sha256 = "sha256-0rCXz/vKFF5rvBXyvtt9DH0Jz+1i7rIylh07FqKBrZM=";
};
# They use 'install -s', that calls the native strip instead of the cross.
+9 -9
View File
@@ -1,21 +1,21 @@
{
"version": "1.3.17-stable",
"version": "1.3.18-stable",
"sources": {
"aarch64-darwin": {
"url": "https://acli.atlassian.com/darwin/1.3.17-stable/acli_1.3.17-stable_darwin_arm64.tar.gz",
"sha256": "db630d0ce82777d47c5cb647a622cd30f38fedefa6b8e1e6f62c1ca3c0974d1f"
"url": "https://acli.atlassian.com/darwin/1.3.18-stable/acli_1.3.18-stable_darwin_arm64.tar.gz",
"sha256": "9e4890e441e2762adbb6bd94451fdea554177806a6044469ece7b14e603d2040"
},
"aarch64-linux": {
"url": "https://acli.atlassian.com/linux/1.3.17-stable/acli_1.3.17-stable_linux_arm64.tar.gz",
"sha256": "59dc9405f6de0a70f8f82e328fdd6db3fc564d28aef38d14c08431a8b130ba36"
"url": "https://acli.atlassian.com/linux/1.3.18-stable/acli_1.3.18-stable_linux_arm64.tar.gz",
"sha256": "ac71711da43649854689ad0f74e44f18b0da3fd0ee776ceb4307ae7eb1e5da85"
},
"x86_64-darwin": {
"url": "https://acli.atlassian.com/darwin/1.3.17-stable/acli_1.3.17-stable_darwin_amd64.tar.gz",
"sha256": "043e3b80f08cf4fc09dd52f0432500f5de28902d8c85d848128c5931f766af45"
"url": "https://acli.atlassian.com/darwin/1.3.18-stable/acli_1.3.18-stable_darwin_amd64.tar.gz",
"sha256": "4078846601b2e222ecbbc6b314a1c58ca6c41c18d1b118833814c942be00befe"
},
"x86_64-linux": {
"url": "https://acli.atlassian.com/linux/1.3.17-stable/acli_1.3.17-stable_linux_amd64.tar.gz",
"sha256": "6177dd5950b0a27f14e8b2daf41e93cf30a306c2e2ee61b13a22f572cbf2f4ff"
"url": "https://acli.atlassian.com/linux/1.3.18-stable/acli_1.3.18-stable_linux_amd64.tar.gz",
"sha256": "4ad4badc481ac1eff452f531c405a20422eb57513cc898d2a1f8ea945d6c24f6"
}
}
}
+2 -2
View File
@@ -5,7 +5,7 @@
}:
let
version = "6.2.1";
version = "6.2.4";
in
stdenvNoCC.mkDerivation {
pname = "activemq";
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation {
src = fetchurl {
url = "mirror://apache/activemq/${version}/apache-activemq-${version}-bin.tar.gz";
hash = "sha256-vBbQMLxTykJAZRxl7BPfonLHN8kPx+NFSa3gwLZwdw0=";
hash = "sha256-/jvyO8cDQ666i8J53SXPS5WyBmN5GZwK6TVaDxXxJhM=";
};
installPhase = ''
+2 -2
View File
@@ -6,14 +6,14 @@
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "actool";
version = "1.5.1";
version = "1.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "viraptor";
repo = "actool";
tag = finalAttrs.version;
hash = "sha256-HWi+MM0jMfg+nPiNFa3dG3sRuSEnS84+h3s6YRcxcAs=";
hash = "sha256-OJJwEZEz+nNq3W1SDXt76Vx9qvEFUUL4dyem/oc2RA4=";
};
build-system = with python3Packages; [
+82 -7
View File
@@ -1,25 +1,92 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchPnpmDeps,
rustPlatform,
nodejs,
pnpm,
pnpmConfigHook,
geist-font,
nix-update-script,
writableTmpDirAsHomeHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "agent-browser";
version = "0.23.3";
let
version = "0.25.4";
src = fetchFromGitHub {
owner = "vercel-labs";
repo = "agent-browser";
tag = "v${finalAttrs.version}";
hash = "sha256-Q02sJr14zRrVrRJ0M30AD0EG7DGkYtafCH6/kI15/xk=";
tag = "v${version}";
hash = "sha256-2Dv+ZY9cvcz6EIpI+gkV9w5eqQzpAD2N+yf4dJrmdwg=";
};
# The Rust CLI embeds the dashboard UI via RustEmbed at compile time.
# Build the Next.js static export so it can be placed at the expected path.
dashboard = stdenv.mkDerivation {
pname = "agent-browser-dashboard";
inherit version src;
nativeBuildInputs = [
nodejs
pnpm
pnpmConfigHook
];
__darwinAllowLocalNetworking = true;
pnpmDeps = fetchPnpmDeps {
pname = "agent-browser-dashboard";
inherit version src;
pnpmWorkspaces = [ "dashboard" ];
fetcherVersion = 3;
hash = "sha256-ldxmXpejqVN/xuWcdLYMwNPc1VZ1rdNwRrumy8Is3N4=";
};
pnpmWorkspaces = [ "dashboard" ];
# Replace Google Fonts fetch with a local font from nixpkgs since
# the nix sandbox has no network access.
postPatch = ''
substituteInPlace packages/dashboard/src/app/layout.tsx --replace-fail \
'{ Geist } from "next/font/google"' \
'localFont from "next/font/local"'
substituteInPlace packages/dashboard/src/app/layout.tsx --replace-fail \
'Geist({ subsets: ["latin"], variable: "--font-sans" })' \
'localFont({ src: "./Geist-Regular.otf", variable: "--font-sans" })'
cp "${geist-font}/share/fonts/opentype/Geist-Regular.otf" \
packages/dashboard/src/app/Geist-Regular.otf
'';
buildPhase = ''
runHook preBuild
pnpm --filter dashboard build
runHook postBuild
'';
installPhase = ''
runHook preInstall
cp -r packages/dashboard/out $out
runHook postInstall
'';
};
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "agent-browser";
inherit version src;
sourceRoot = "${finalAttrs.src.name}/cli";
cargoHash = "sha256-smJ+ODr88moz+16G9fXSz/NNiGngWeoTuQtBn21qu1s=";
cargoHash = "sha256-3vzVVHFo13ZLsbbXw7n9BE/YXBJwoxzhvfjuqOQwdfg=";
# Place the pre-built dashboard where RustEmbed expects it
postUnpack = ''
chmod u+w source/packages/dashboard
cp -r ${dashboard} source/packages/dashboard/out
'';
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
@@ -31,7 +98,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
cp -r ../skills $out/share/agent-browser/
'';
passthru.updateScript = nix-update-script { };
passthru = {
inherit dashboard;
updateScript = nix-update-script {
extraArgs = [
"--subpackage"
"dashboard"
];
};
};
meta = {
description = "Headless browser automation CLI for AI agents";
+2 -2
View File
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "alcove";
version = "1.5.1";
version = "1.7.2";
src = fetchurl {
url = "https://github.com/henrikruscon/alcove-releases/releases/download/${finalAttrs.version}/Alcove.zip";
hash = "sha256-MhwtQDuDKP4vLPvOxSe9pY2W//dHplHlu6YvxfswNOg=";
hash = "sha256-gzV/BdLt0cl490cPHPK5Q6S4HRaHI/e4zcOdnM+MVYg=";
};
sourceRoot = ".";
+2 -2
View File
@@ -8,11 +8,11 @@
let
pname = "alt-ergo";
version = "2.6.2";
version = "2.6.3";
src = fetchurl {
url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz";
hash = "sha256-OeLJEop9HonzMuMaJxbzWfO54akl/oHxH6SnSbXSTYI=";
hash = "sha256-SsK12K5sVKEaDMNJ7HahU6qVcnv1fvnLMwmnBqf7G/o=";
};
in
+3 -3
View File
@@ -5,15 +5,15 @@
}:
let
pname = "ankama-launcher";
version = "3.13.37";
version = "3.14.8";
# The original URL for the launcher is:
# https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage
# As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL.
# To update the client, head to web.archive.org and create a new snapshot of the download page.
src = fetchurl {
url = "https://web.archive.org/web/20260205070121/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage";
hash = "sha256-6BGx4eS9H2CmvcncVufRrhruVHk78eBfB5PtVFfK0eg=";
url = "https://web.archive.org/web/20260413125512/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage";
hash = "sha256-wHLzF30ZeTgBG1TFlkSt0Tsm82cNb/C/eTUZjjYsgVE=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
+55
View File
@@ -0,0 +1,55 @@
{
lib,
python3Packages,
fetchFromGitHub,
nix-update-script,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "aqtinstall";
version = "3.3.0";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "miurahr";
repo = "aqtinstall";
tag = "v${finalAttrs.version}";
hash = "sha256-CXG8GH1MSS2HhDA/SnqQP7mQG+/OfZ5P6JRG8ZIVlLs=";
};
build-system = with python3Packages; [
setuptools
setuptools-scm
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail '"bs4"' '"beautifulsoup4"'
'';
dependencies = with python3Packages; [
beautifulsoup4
defusedxml
humanize
patch-ng
py7zr
requests
semantic-version
texttable
];
# Tests require network access
doCheck = false;
passthru.updateScript = nix-update-script { };
meta = {
description = "Unofficial Qt installer";
homepage = "https://github.com/miurahr/aqtinstall";
changelog = "https://github.com/miurahr/aqtinstall/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ BatteredBunny ];
mainProgram = "aqt";
};
})
+4 -2
View File
@@ -8,16 +8,17 @@
qt6,
pcsclite,
gitUpdater,
llhttp,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ausweisapp";
version = "2.4.1";
version = "2.5.1";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = finalAttrs.version;
hash = "sha256-cLKF5QYDPngvN6+3p7B8YO/MYvDfD1fbnyEMZPmjj8w=";
hash = "sha256-R+2swDzIHlgE0kVonoYQih8r8p38RN7bqkbb+WB1hCc=";
};
postPatch = ''
@@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
buildInputs = [
llhttp
pcsclite
qt6.qtscxml
qt6.qtsvg
+1
View File
@@ -28,6 +28,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
dkimpy
patatt
git-filter-repo
textual
];
meta = {
+3 -3
View File
@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
pname = "bpftop";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "Netflix";
repo = "bpftop";
tag = "v${finalAttrs.version}";
hash = "sha256-8vb32+wHOnADpIIfO9mMlGu7GdlA0hS9ij0zSLcrO7A=";
hash = "sha256-2W00L4JudB7D3IBpY9But+I5erU5+Hf/M2h3jERYObc=";
};
cargoHash = "sha256-euiI4R4nCgnwiBA22kzn0c91hjOr0IOOAyFkW5ZadIk=";
cargoHash = "sha256-5VzItvqcBzXGAMEY6ZgvJSDkA+fF7ega4NSEaskhL5w=";
buildInputs = [
elfutils
+3 -3
View File
@@ -8,16 +8,16 @@
}:
buildGoModule (finalAttrs: {
pname = "bsky-cli";
version = "0.0.78";
version = "0.0.79";
src = fetchFromGitHub {
owner = "mattn";
repo = "bsky";
tag = "v${finalAttrs.version}";
hash = "sha256-+LZCVF1slJ7Nypi8MogbqXH5GSfcsKJDGKNm4EfLpFY=";
hash = "sha256-id7+g9NMCSicPbDoDSqnc7OwEMIVXbXw3O8TkeQjfmg=";
};
vendorHash = "sha256-WFGViuC+8Ba6NCU//Z+MTcwNPJbYzpXeCbf4M9mBFPM=";
vendorHash = "sha256-m4kth6r13++53fbceWjKYu4D297meAwnkaSsCiu5zS8=";
buildInputs = [
libpcap
+3 -3
View File
@@ -9,14 +9,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-audit";
version = "0.22.0";
version = "0.22.1";
src = fetchCrate {
inherit (finalAttrs) pname version;
hash = "sha256-Ha2yVyu9331NaqiW91NEwCTIeW+3XPiqZzmatN5KOws=";
hash = "sha256-/K84iYr3mRNH8lbqHHa7Tsh7M3ykQ2hs6T1k/qrSsnA=";
};
cargoHash = "sha256-f8nrW1l7UA8sixwqXBD1jCJi9qyKC5tNl/dWwCt41Lk=";
cargoHash = "sha256-Hr3CliJeb9ljHylx8mjkGyf4ybX79Fmt6CaFb6FMRts=";
nativeBuildInputs = [
pkg-config
+1
View File
@@ -37,5 +37,6 @@ appimageTools.wrapType2 rec {
mainProgram = "cider";
maintainers = [ lib.maintainers.cigrainger ];
platforms = [ "x86_64-linux" ];
broken = true;
};
}
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "civo";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "civo";
repo = "cli";
rev = "v${finalAttrs.version}";
hash = "sha256-6wDF39w82hBdOWQpOXZEVZMlU0nw8vl/h00DPImVTCA=";
hash = "sha256-M9Y7EUa/xlHpMzQSEGOnAlk17Wv2WhMTk8pnfB4hW4Q=";
};
vendorHash = "sha256-b12Bmx2SQLDPgyUGNf9lChp+tA9RGY8Y5W09FraMpTU=";
vendorHash = "sha256-g8JU6mLm1L6zS03QrmQf5u77ekSX/x/U/NXCTXnTuh8=";
nativeBuildInputs = [ installShellFiles ];
+3 -12
View File
@@ -4,7 +4,6 @@
bison,
curl,
fetchFromGitHub,
fetchpatch,
ffmpeg-headless,
flex,
gperf,
@@ -26,26 +25,18 @@
stdenv.mkDerivation {
pname = "cliairplay";
# see the beginning of configure.ac for the upstream version number
version = "0.2-unstable-2025-12-30";
version = "1.1-unstable-2026-03-16";
src = fetchFromGitHub {
owner = "music-assistant";
repo = "cliairplay";
# we try to closely match the commit used in the last music-assistant release from
# https://github.com/music-assistant/server/tree/stable/music_assistant/providers/airplay/bin
rev = "4660d886585d6bf8f32e889feec2a0e8975c51dc";
rev = "991c65acc2afa17ffe32e279dbc585b0b7f530f8";
fetchSubmodules = true;
hash = "sha256-oDStn9LdLYWKhZNm7Qfdibs4qsct8gE3RZbTKooQeOM=";
hash = "sha256-m1O4l6gFEGNAyskYcRHcA15cubZnNgkaYjdVThRRX7w=";
};
patches = [
# Support gettext 0.25
(fetchpatch {
url = "https://github.com/music-assistant/cliairplay/commit/92a2445d64c476d740feba1f31c7e5bc768701b7.patch";
hash = "sha256-/YnopvAGHHnQhfr2X1OenLMoF4ZlUq9x8tQZha/XfbQ=";
})
];
nativeBuildInputs = [
autoreconfHook
bison
+2 -2
View File
@@ -13,11 +13,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "copybara";
version = "20260330";
version = "20260413";
src = fetchurl {
url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar";
hash = "sha256-O/H5eeais4xKAWshC8nZfLqeIYdjVxLVZ5d1sUFnF1w=";
hash = "sha256-8FmXPfxlORbIA0cAcRPGMQ7n1tI/VjJ3uI7PHQHuaZU=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation {
pname = "darkplaces";
version = "unstable-2022-05-10";
version = "20140513-unstable-2026-01-22";
src = fetchFromGitHub {
owner = "DarkPlacesEngine";
repo = "darkplaces";
rev = "f16954a9d40168253ac5d9890dabcf7dbd266cd9";
hash = "sha256-5KsUcgHbuzFUE6LcclqI8VPSFbXZzBnxzOBB9Kf8krI=";
rev = "d93f9c4292039354a2b8d40d11bc386891e55fe5";
hash = "sha256-/xbQhQZveRCSnotZz3Wbw+9VwNC+kqoEJ7GuNZTpkLA=";
};
buildInputs = [
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "ddns-go";
version = "6.16.4";
version = "6.16.6";
src = fetchFromGitHub {
owner = "jeessy2";
repo = "ddns-go";
rev = "v${finalAttrs.version}";
hash = "sha256-0Fcm1KC6hFjjXGdoiFMm19M8Uc7et0F3LeD7pxFQM4s=";
hash = "sha256-t6sxGucolqjDGSkzJUqO0NDeK4oRqq7oG+WD/brh4NA=";
};
vendorHash = "sha256-phMBGjXARuY6qreNy5o06unouyew1Rbj4zo3nK4Xvnw=";
vendorHash = "sha256-MbITJ2MxyTNE6LS9rQZ10IVgQuXpmbPf5HQgoy2OuOc=";
ldflags = [
"-X main.version=${finalAttrs.version}"
+3 -3
View File
@@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "deck";
version = "1.57.0";
version = "1.57.3";
src = fetchFromGitHub {
owner = "Kong";
repo = "deck";
tag = "v${finalAttrs.version}";
hash = "sha256-0j3/cFRKclyO4mpm+r5lBqM3uTnzUatfLqH2aUMDbUA=";
hash = "sha256-z9piGj46smPRMLOhQNC4zlYj7CeVl9/6VXL0y9/fQwA=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
];
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-/Cde+eGOqUsL3Q5jDtZaTzOTMnE72ncgBMQzcIeNVls=";
vendorHash = "sha256-z28b4gg3EgY0OUS/9KZ0Y69nNC2wXRrNQEOYrST9uiY=";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd deck \
+50
View File
@@ -0,0 +1,50 @@
{
buildGoModule,
fetchFromGitHub,
installShellFiles,
lib,
stdenv,
}:
buildGoModule (finalAttrs: {
pname = "dexter";
version = "0.5.3";
src = fetchFromGitHub {
owner = "remoteoss";
repo = "dexter";
tag = "v${finalAttrs.version}";
hash = "sha256-8JjxR7Q+4OgBSIgODxIEU/0mC+bPp9Nz7uCAjfn4HiY=";
};
vendorHash = "sha256-1mJ4HdDCsZl/g8F+L+NrW2ACuiHe2aSheJO/1XfKAb4=";
proxyVendor = true;
ldflags = [
"-s"
"-w"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
mv $out/bin/cmd $out/bin/dexter
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd dexter \
--bash <($out/bin/dexter completion bash) \
--fish <($out/bin/dexter completion fish) \
--zsh <($out/bin/dexter completion zsh)
'';
__structuredAttrs = true;
meta = {
description = "A fast, full-featured Elixir LSP optimized for large codebases";
homepage = "https://github.com/remoteoss/dexter";
changelog = "https://github.com/remoteoss/dexter/blob/${finalAttrs.src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ adamcstephens ];
mainProgram = "dexter";
};
})
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "dnsproxy";
version = "0.81.0";
version = "0.81.1";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = "dnsproxy";
tag = "v${finalAttrs.version}";
hash = "sha256-O3ZwH//NpYEg3BS5Yk4MpkIb6PrsIzINs/Kyt5uKspg=";
hash = "sha256-eY4nmaW3jjDb4RcGWcy2l1RScxZwtBGGYQpC1zh5hVE=";
};
vendorHash = "sha256-NS7MsK7QXg8tcAytYd9FGvaYZcReYkO5ESPpLbzL0IQ=";
vendorHash = "sha256-liX+AMxVBkxJSv1Ltt924Hjf10fho4G6tyt82tkzWZA=";
ldflags = [
"-s"
+3
View File
@@ -7,6 +7,7 @@
yarnBuildHook,
nodejs,
jq,
makeWrapper,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "eas-cli";
@@ -29,6 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
yarnBuildHook
nodejs
jq
makeWrapper
];
postPatch = ''
@@ -52,6 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
postFixup = ''
mkdir -p $out/bin
ln -sf $out/lib/node_modules/eas-cli-root/packages/eas-cli/bin/run $out/bin/eas
wrapProgram $out/bin/eas --suffix PATH : ${lib.makeBinPath [ nodejs ]}
'';
meta = {
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,35 @@
diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java
index e6d0e84d..aeaa32af 100644
--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java
+++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java
@@ -408,7 +408,7 @@ public class EDDNService {
private static void send(final Object message, final Event event, final String schemaName, final int delaySecondsAllowed) {
final boolean isLive = ApplicationState.getInstance().getGameVersion().equals(GameVersion.LIVE);
final boolean isNew = isNew(event, delaySecondsAllowed);
- final Boolean isEnabled = PreferencesService.getPreference(PreferenceConstants.EDDN_ENABLED, Boolean.FALSE);
+ final Boolean isEnabled = false;
if (isLive && isNew && isEnabled) {
final Runnable run = () -> {
try {
diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java
index f39a7a17..0dd77370 100644
--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java
+++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java
@@ -43,16 +43,13 @@ public class SettingsTab extends MainTab implements DestroyableTemplate {
new HorizonsWishlist(),
new HorizonsShips(),
new HorizonsColonisation(),
- new Notifications(),
- new FrontierAPI()
+ new Notifications()
)
.buildVBox();
//AR
if (OsCheck.isWindows()) {
settings.getNodes().add(new AugmentedReality());
}
- //Tracking
- settings.getNodes().add(new Tracking());
ScrollPane scrollPane = register(ScrollPaneBuilder.builder()
.withStyleClass("settings-tab-content")
@@ -0,0 +1,13 @@
diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java
index 260ecd78..7b5c5649 100644
--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java
+++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java
@@ -61,7 +61,7 @@ public class StartDialog extends DestroyableVBox implements DestroyableTemplate
.withStyleClass("buttons")
.withNodes(createButtons())
.buildHBox();
- this.getNodes().addAll(whatsNewTitle, whatsNewContent, policyTitle, policyContent, eulaTitle, eulaContent, buttonsBox);
+ this.getNodes().addAll(whatsNewTitle, whatsNewContent, policyTitle, policyContent, buttonsBox);
if(!VersionService.isDev()){
PreferencesService.setPreference(PreferenceConstants.WHATS_NEW_VERSION, VersionService.getBuildVersion());
}
@@ -15,19 +15,20 @@
copyDesktopItems,
makeDesktopItem,
writeScript,
writeText,
}:
let
gradle = gradle_9;
in
stdenv.mkDerivation rec {
pname = "ed-odyssey-materials-helper";
version = "3.1.12";
version = "3.6.6";
src = fetchFromGitHub {
owner = "jixxed";
repo = "ed-odyssey-materials-helper";
tag = version;
hash = "sha256-QqwLM2fiPmtFehB83M3yvLp8M1DKywlCxQcG4mclBkk=";
hash = "sha256-ljCN2tW7iH+kTiSXwUt+OsAhjYKlAy0W5x/JDmQeR6M=";
};
nativeBuildInputs = [
@@ -41,6 +42,9 @@ stdenv.mkDerivation rec {
# so this removes 1) the popup about it when you first start the program, 2) the option in the settings
# and makes the program always know that it is set up
./remove-urlscheme-settings.patch
./eula.patch # EULA doesn't apply to nixpkgs build, only the upstream build, don't show it
./disable-broken-features.patch # some features require things not included in the source code, we'll disable/hide those
];
postPatch = ''
# oslib doesn't seem to do releases and hasn't had a change since 2021, so always use commit d6ee6549bb
@@ -50,14 +54,15 @@ stdenv.mkDerivation rec {
substituteInPlace application/src/main/java/module-info.java \
--replace-fail 'requires oslib.master.SNAPSHOT;' 'requires oslib.d6ee6549bb;'
# remove "new version available" popup
# remove "new version available" (not needed) and eddn question (eddn doesn't work in this build) popups
substituteInPlace application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java \
--replace-fail 'versionPopup();' ""
--replace-fail 'versionPopup();' "" \
--replace-fail 'eddnPopup();' ""
for f in build.gradle */build.gradle; do
substituteInPlace $f \
--replace-fail 'vendor = JvmVendorSpec.AZUL' ""
done
substituteInPlace build.gradle bootstrap/build.gradle application/build.gradle \
--replace-fail 'vendor = JvmVendorSpec.AZUL' ""
echo "This nixpkgs-packaged version of Elite Dangerous Odyssey Materials Helper doesn't upload any data." > application/src/main/resources/text/privacy.txt
'';
mitmCache = gradle.fetchDeps {
@@ -70,14 +75,12 @@ stdenv.mkDerivation rec {
"--stacktrace"
];
gradleInitScript = writeText "empty-init-script.gradle" ""; # fixes build by making it possibly not reproducible, though it still seems to be
gradleBuildTask = "application:jpackage";
env = {
EDDN_SOFTWARE_NAME = "EDO Materials Helper";
};
preBuild = ''
# required to make EDDN_SOFTWARE_NAME work and for the program to know its own version
# required for the program to know its own version
gradle $gradleFlags application:generateSecrets
'';
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "eiquadprog";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "stack-of-tasks";
repo = "eiquadprog";
rev = "v${finalAttrs.version}";
hash = "sha256-FV6A3cMaY7+eDip9YjuX0cYz0X6tdpDRV57eXOb9bKQ=";
hash = "sha256-ukYIc5ZCIDunXMyC44Dd1qac4Ku4pNv9p4ik+xyI0i0=";
};
outputs = [
+33 -63
View File
@@ -1,25 +1,7 @@
{
enableArchLinuxPkgs ? false,
enableDnfPackages ? false,
enable1password ? false,
enableBitwarden ? true,
enableBluetooth ? true,
enableBookmarks ? true,
enableCalc ? true,
enableClipboard ? true,
enableDesktopApplications ? true,
enableFiles ? true,
enableMenus ? true,
enableNiriActions ? true,
enableNiriSessions ? true,
enableProviderList ? true,
enableRunner ? true,
enableSnippets ? true,
enableSymbols ? true,
enableTodo ? true,
enableUnicode ? true,
enableWebsearch ? true,
enableWindows ? true,
# list of providers to enable, all are enabled by default
# e.g. enabledProviders = ["files"] will only install the files provider
enabledProviders ? null,
bluez,
buildGoModule,
@@ -35,38 +17,13 @@
wl-clipboard,
}:
let
providerMap = {
"1password" = enable1password;
"archlinuxpkgs" = enableArchLinuxPkgs;
"bitwarden" = enableBitwarden;
"bluetooth" = enableBluetooth;
"bookmarks" = enableBookmarks;
"calc" = enableCalc;
"clipboard" = enableClipboard;
"desktopapplications" = enableDesktopApplications;
"dnfpackages" = enableDnfPackages;
"files" = enableFiles;
"menus" = enableMenus;
"niriactions" = enableNiriActions;
"nirisessions" = enableNiriSessions;
"providerlist" = enableProviderList;
"runner" = enableRunner;
"snippets" = enableSnippets;
"symbols" = enableSymbols;
"todo" = enableTodo;
"unicode" = enableUnicode;
"websearch" = enableWebsearch;
"windows" = enableWindows;
};
enabledProviders = lib.filterAttrs (_: enabled: enabled) providerMap;
enabledProvidersList = lib.concatStringsSep " " (lib.attrNames enabledProviders);
providerEnabled = provider: (enabledProviders == null) || lib.elem provider enabledProviders;
runtimeDeps =
lib.optionals enableFiles [ fd ]
++ lib.optionals enableBluetooth [ bluez ]
++ lib.optionals enableCalc [ libqalculate ]
++ lib.optionals enableClipboard [
lib.optionals (providerEnabled "files") [ fd ]
++ lib.optionals (providerEnabled "bluetooth") [ bluez ]
++ lib.optionals (providerEnabled "calc") [ libqalculate ]
++ lib.optionals (providerEnabled "clipboard") [
wl-clipboard
imagemagick
];
@@ -93,18 +50,31 @@ buildGoModule (finalAttrs: {
subPackages = [ "cmd/elephant" ];
postBuild = ''
echo "Building providers: ${enabledProvidersList}"
mkdir -p $out/lib/elephant/providers
for provider in ${enabledProvidersList}; do
[ -z "$provider" ] && continue
if [ -d "internal/providers/$provider" ]; then
echo "Building provider: $provider"
go build -buildmode=plugin -o "$out/lib/elephant/providers/$provider.so" ./internal/providers/"$provider" || exit 1
fi
done
'';
postBuild =
(
if enabledProviders == null then
''
PROVIDERS=()
for x in internal/providers/*/; do
PROVIDERS+=("$(basename "$x")")
done
''
else
''
PROVIDERS=(${lib.escapeShellArgs enabledProviders})
''
)
+ ''
echo "Installing providers"
mkdir -p $out/lib/elephant/providers
for provider in "''${PROVIDERS[@]}"; do
[ -z "$provider" ] && continue
if [ -d "internal/providers/$provider" ]; then
echo "Building provider: $provider"
go build -buildmode=plugin -o "$out/lib/elephant/providers/$provider.so" ./internal/providers/"$provider" || exit 1
fi
done
'';
postInstall = ''
wrapProgram $out/bin/elephant \
+2 -2
View File
@@ -50,8 +50,8 @@ stdenvNoCC.mkDerivation {
outputHash =
{
x86_64-linux = "sha256-os/+0Xb3N1NMtTMP/G9bhELoQF3kDfqzuKUP5RcelJI=";
aarch64-linux = "sha256-EvHJQGtW62AOyMnWAEK0HsrwU875JrbMeqD+ctBEI3k=";
x86_64-linux = "sha256-pJp4l0QJAg42gj/R4bq4P1iVtMehkvNs7hv9/3RmNsI=";
aarch64-linux = "sha256-POIXQZ3ZruzfwF/6Kg6zRXdSrKtm56cBCMAvB5JTuJM=";
}
.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
+2 -2
View File
@@ -18,13 +18,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "equibop";
version = "3.1.8";
version = "3.1.9";
src = fetchFromGitHub {
owner = "Equicord";
repo = "Equibop";
tag = "v${finalAttrs.version}";
hash = "sha256-OcD4xcD/A48oJcsKuhYBc/UigK+1NfTEuJivL+qdfeA=";
hash = "sha256-4v0NKGmdbEdHyjz35l+QUnXvnVfLzIe1vLxOSmdgbYQ=";
};
postPatch = ''
+2
View File
@@ -27,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
"-Wno-error=implicit-function-declaration"
"-Wno-error=implicit-int"
"-Wno-error=return-mismatch"
# gcc15
"-std=gnu17"
];
makeFlags = [ "all" ]; # need "all" to be explicitely set
@@ -0,0 +1,120 @@
diff --git a/fdtools-2024.12.07/src/check_exit_exec.c b/fdtools-2024.12.07/src/check_exit_exec.c
index 6bb6860..87f26b4 100644
--- a/fdtools-2024.12.07/src/check_exit_exec.c
+++ b/fdtools-2024.12.07/src/check_exit_exec.c
@@ -3,6 +3,7 @@
#include <errno.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "check_exit_exec.h"
diff --git a/fdtools-2024.12.07/src/grabconsole.c b/fdtools-2024.12.07/src/grabconsole.c
index 8da1233..316ea95 100644
--- a/fdtools-2024.12.07/src/grabconsole.c
+++ b/fdtools-2024.12.07/src/grabconsole.c
@@ -4,6 +4,7 @@
#include <errno.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
diff --git a/fdtools-2024.12.07/src/pipecycle.c b/fdtools-2024.12.07/src/pipecycle.c
index 5042a52..652dd69 100644
--- a/fdtools-2024.12.07/src/pipecycle.c
+++ b/fdtools-2024.12.07/src/pipecycle.c
@@ -5,6 +5,7 @@
#include <signal.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
#include "prjlibs-c/vec.h"
diff --git a/fdtools-2024.12.07/src/recvfd.c b/fdtools-2024.12.07/src/recvfd.c
index e2de372..197e40e 100644
--- a/fdtools-2024.12.07/src/recvfd.c
+++ b/fdtools-2024.12.07/src/recvfd.c
@@ -7,6 +7,7 @@
#include <limits.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
#include "fdtools.h"
diff --git a/fdtools-2024.12.07/src/sendfd.c b/fdtools-2024.12.07/src/sendfd.c
index e5b7236..fc54371 100644
--- a/fdtools-2024.12.07/src/sendfd.c
+++ b/fdtools-2024.12.07/src/sendfd.c
@@ -7,6 +7,7 @@
#include <limits.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
#include "fdtools.h"
diff --git a/fdtools-2024.12.07/src/setstate.c b/fdtools-2024.12.07/src/setstate.c
index 723d40f..f6ddcbc 100644
--- a/fdtools-2024.12.07/src/setstate.c
+++ b/fdtools-2024.12.07/src/setstate.c
@@ -8,6 +8,7 @@
#include <errno.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/intattr.h"
#include "prjlibs-c/diewarn.h"
diff --git a/fdtools-2024.12.07/src/statfile.c b/fdtools-2024.12.07/src/statfile.c
index be66988..41131ee 100644
--- a/fdtools-2024.12.07/src/statfile.c
+++ b/fdtools-2024.12.07/src/statfile.c
@@ -6,6 +6,7 @@
#include <errno.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/warn.h"
diff --git a/fdtools-2024.12.07/src/vc-get-linux.c b/fdtools-2024.12.07/src/vc-get-linux.c
index 5263344..52c29ff 100644
--- a/fdtools-2024.12.07/src/vc-get-linux.c
+++ b/fdtools-2024.12.07/src/vc-get-linux.c
@@ -10,6 +10,7 @@
#include <sys/sysmacros.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
diff --git a/fdtools-2024.12.07/src/vc-lock-linux.c b/fdtools-2024.12.07/src/vc-lock-linux.c
index 0d6cee1..e2112e5 100644
--- a/fdtools-2024.12.07/src/vc-lock-linux.c
+++ b/fdtools-2024.12.07/src/vc-lock-linux.c
@@ -9,6 +9,7 @@
#include <sys/vt.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
diff --git a/fdtools-2024.12.07/src/vc-switch-linux.c b/fdtools-2024.12.07/src/vc-switch-linux.c
index 6bab00f..59ece24 100644
--- a/fdtools-2024.12.07/src/vc-switch-linux.c
+++ b/fdtools-2024.12.07/src/vc-switch-linux.c
@@ -10,6 +10,7 @@
#include <sys/sysmacros.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
-223
View File
@@ -1,223 +0,0 @@
diff -Naur misc/fdtools-2020.05.04/src/check_exit_exec.c misc-new/fdtools-2020.05.04/src/check_exit_exec.c
--- misc/fdtools-2020.05.04/src/check_exit_exec.c 2015-03-16 04:55:56.000000000 +0100
+++ misc-new/fdtools-2020.05.04/src/check_exit_exec.c 2021-01-22 10:50:25.529955213 +0100
@@ -2,6 +2,7 @@
#include <unistd.h>
#include <errno.h>
+#include <skalibs/exec.h>
#include <skalibs/stddjb.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
@@ -14,7 +15,7 @@
if (str_equal(arg, ":")) {
++argv;
- pathexec0((char const**)argv);
+ mexec0((char const**)argv);
DIE1(exec, argv[0]);
}
}
diff -Naur misc/fdtools-2020.05.04/src/grabconsole.c misc-new/fdtools-2020.05.04/src/grabconsole.c
--- misc/fdtools-2020.05.04/src/grabconsole.c 2020-04-24 06:01:22.000000000 +0200
+++ misc-new/fdtools-2020.05.04/src/grabconsole.c 2021-01-22 10:43:27.887754936 +0100
@@ -4,6 +4,7 @@
#include <errno.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
@@ -26,6 +27,6 @@
if (fd_grabconsole(fd)!=0) DIE0(tioccons);
argv+=2;
- pathexec0((char const**)argv);
+ mexec0((char const**)argv);
DIE1(exec, argv[0]);
}
diff -Naur misc/fdtools-2020.05.04/src/pipecycle.c misc-new/fdtools-2020.05.04/src/pipecycle.c
--- misc/fdtools-2020.05.04/src/pipecycle.c 2015-03-16 04:55:56.000000000 +0100
+++ misc-new/fdtools-2020.05.04/src/pipecycle.c 2021-01-22 10:47:58.033220790 +0100
@@ -4,6 +4,7 @@
#include <unistd.h>
#include <signal.h>
+#include <skalibs/exec.h>
#include <skalibs/stddjb.h>
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
@@ -56,7 +57,7 @@
if (fd_shuffle(2, current, wanted)!=0) DIE0(dup);
}
read(start[0], &j, 1);
- pathexec(args);
+ mexec(args);
DIE1(exec, args[0]);
}
diff -Naur misc/fdtools-2020.05.04/src/recvfd.c misc-new/fdtools-2020.05.04/src/recvfd.c
--- misc/fdtools-2020.05.04/src/recvfd.c 2020-04-28 09:35:05.000000000 +0200
+++ misc-new/fdtools-2020.05.04/src/recvfd.c 2021-01-22 10:47:14.180994779 +0100
@@ -7,6 +7,7 @@
#include <limits.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
#include "fdtools.h"
@@ -69,9 +70,9 @@
named_fd=duped;
}
buf[int_fmt(buf, named_fd)]='\0';
- if (pathexec_env(argv[i]+1, buf)==0) DIE0(alloc);
+ if (env_mexec(argv[i]+1, buf)==0) DIE0(alloc);
}
argv+=nfds+1;
- pathexec0((char const**)argv);
+ mexec0((char const**)argv);
DIE1(exec, argv[0]);
}
diff -Naur misc/fdtools-2020.05.04/src/sendfd.c misc-new/fdtools-2020.05.04/src/sendfd.c
--- misc/fdtools-2020.05.04/src/sendfd.c 2015-03-16 06:48:39.000000000 +0100
+++ misc-new/fdtools-2020.05.04/src/sendfd.c 2021-01-22 10:43:07.207634214 +0100
@@ -7,6 +7,7 @@
#include <limits.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
#include "fdtools.h"
@@ -40,6 +41,6 @@
argv+=nfds;
if (*argv==NULL) _exit(0);
++argv;
- pathexec0((char const**)argv);
+ mexec0((char const**)argv);
DIE1(exec, argv[0]);
}
diff -Naur misc/fdtools-2020.05.04/src/setstate.c misc-new/fdtools-2020.05.04/src/setstate.c
--- misc/fdtools-2020.05.04/src/setstate.c 2020-05-04 10:04:21.000000000 +0200
+++ misc-new/fdtools-2020.05.04/src/setstate.c 2021-01-22 10:45:05.084304318 +0100
@@ -8,6 +8,7 @@
#include <errno.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/intattr.h"
#include "prjlibs-c/diewarn.h"
@@ -167,6 +168,6 @@
}
argv+=2;
- pathexec_run(argv[0], (char const**)argv, (char const**)environ);
+ mexec_ae(argv[0], (char const**)argv, (char const**)environ);
DIE1(exec, argv[0]);
}
diff -Naur misc/fdtools-2020.05.04/src/statfile.c misc-new/fdtools-2020.05.04/src/statfile.c
--- misc/fdtools-2020.05.04/src/statfile.c 2015-03-22 00:33:44.000000000 +0100
+++ misc-new/fdtools-2020.05.04/src/statfile.c 2021-01-22 10:48:23.673351183 +0100
@@ -6,6 +6,7 @@
#include <errno.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/warn.h"
@@ -15,7 +16,7 @@
char const* PROG="statfile";
static void set(char const* const var, char const* const val) {
- if (pathexec_env(var, val)==0) DIE0(alloc);
+ if (env_mexec(var, val)==0) DIE0(alloc);
}
static void set64n(char const* const var, time_t t, unsigned int nsec) {
@@ -178,6 +179,6 @@
}
argv+=3;
- pathexec((char const**)argv);
+ mexec((char const**)argv);
DIE1(exec, argv[0]);
}
diff -Naur misc/fdtools-2020.05.04/src/vc-get-linux.c misc-new/fdtools-2020.05.04/src/vc-get-linux.c
--- misc/fdtools-2020.05.04/src/vc-get-linux.c 2020-04-28 07:04:49.000000000 +0200
+++ misc-new/fdtools-2020.05.04/src/vc-get-linux.c 2021-01-22 10:47:34.649100757 +0100
@@ -10,6 +10,7 @@
#include <sys/sysmacros.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
@@ -38,7 +39,7 @@
errno=0;
if (ioctl(fd, VT_OPENQRY, &vtnum)<0 || vtnum==-1) DIE0(vt_qry);
bufnum[ulong_fmt(bufnum, vtnum)]='\0';
- if (pathexec_env("TTY", buf)==0) DIE0(alloc);
+ if (env_mexec("TTY", buf)==0) DIE0(alloc);
}
fd_close(fd);
@@ -50,12 +51,12 @@
if (fstat(fd, &statbuf)!=0) DIE1(stat, buf);
buf[ulong_fmt(buf, minor(statbuf.st_rdev))]='\0';
}
- if (pathexec_env("VCNUM", buf)==0) DIE0(alloc);
+ if (env_mexec("VCNUM", buf)==0) DIE0(alloc);
buf[ulong_fmt(buf, fd)]='\0';
- if (pathexec_env("VCFD", buf)==0) DIE0(alloc);
+ if (env_mexec("VCFD", buf)==0) DIE0(alloc);
}
- pathexec((char const**)argv+2);
+ mexec((char const**)argv+2);
DIE1(exec, argv[2]);
}
diff -Naur misc/fdtools-2020.05.04/src/vc-lock-linux.c misc-new/fdtools-2020.05.04/src/vc-lock-linux.c
--- misc/fdtools-2020.05.04/src/vc-lock-linux.c 2015-03-20 05:59:42.000000000 +0100
+++ misc-new/fdtools-2020.05.04/src/vc-lock-linux.c 2021-01-22 10:48:36.857417751 +0100
@@ -8,6 +8,7 @@
#include <sys/ioctl.h>
#include <sys/vt.h>
+#include <skalibs/exec.h>
#include <skalibs/stddjb.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
@@ -79,7 +80,7 @@
WARN0(fork);
} else if (pid==0) {
sigprocmask(SIG_SETMASK, &old_set, NULLP);
- pathexec((char const**)argv);
+ mexec((char const**)argv);
DIE1(exec, *argv);
} else {
int status;
diff -Naur misc/fdtools-2020.05.04/src/vc-switch-linux.c misc-new/fdtools-2020.05.04/src/vc-switch-linux.c
--- misc/fdtools-2020.05.04/src/vc-switch-linux.c 2020-04-28 07:14:04.000000000 +0200
+++ misc-new/fdtools-2020.05.04/src/vc-switch-linux.c 2021-01-22 10:42:41.259480648 +0100
@@ -10,6 +10,7 @@
#include <sys/sysmacros.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
@@ -36,6 +37,6 @@
if (ioctl(fd, VT_ACTIVATE, ttyno)<0) DIE0(vt_act);
if (!scan) fd_close(fd);
- pathexec0((char const**)argv+3);
+ mexec0((char const**)argv+3);
DIE1(exec, argv[3]);
}
+24 -25
View File
@@ -5,53 +5,48 @@
skawarePackages,
}:
let
stdenv.mkDerivation (finalAttrs: {
pname = "fdtools";
# When you update, check whether we can drop the skalibs pin.
version = "2020.05.04";
sha256 = "0lnafcp4yipi0dl8gh33zjs8wlpz0mim8mwmiz9s49id0b0fmlla";
skalibs = skawarePackages.skalibs_2_10;
in
stdenv.mkDerivation {
inherit pname version;
version = "2024.12.07";
src = fetchurl {
url = "https://code.dogmap.org/fdtools/releases/fdtools-${version}.tar.bz2";
inherit sha256;
url = "https://code.dogmap.org/fdtools/releases/fdtools-${finalAttrs.version}.tar.bz2";
hash = "sha256-URK5FBpCbhcp2haug0lWtc9wOvwJHPTWZe4u8HDeaYc=";
};
patches = [ ./new-skalibs.patch ];
patches = [
./add-skalibs-include.patch
];
outputs = [
"bin"
"lib"
"dev"
"man"
"doc"
"out"
];
buildInputs = [
# temporary, until fdtools catches up to skalibs
skalibs
skawarePackages.skalibs
];
configurePhase = ''
cd fdtools-${version}
sed -e 's|gcc|$CC|' \
conf-compile/defaults/host_link.sh \
> conf-compile/host_link.sh
sed -e 's|gcc|$CC|' \
conf-compile/defaults/host_compile.sh \
> conf-compile/host_compile.sh
echo "${skalibs.lib}/lib/skalibs/sysdeps" \
> conf-compile/depend_skalibs_sysdeps
cd fdtools-${finalAttrs.version}
substituteInPlace conf-compile/defaults/host_compile.sh \
--replace-fail "gcc" "$CC"
substituteInPlace conf-compile/defaults/host_link.sh \
--replace-fail "gcc" "$CC"
echo "${skawarePackages.skalibs.lib}/lib/skalibs/sysdeps" > conf-compile/defaults/depend_skalibs_sysdeps
'';
buildPhase = ''
bash package/build
'';
# gcc15
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
installPhase = ''
mkdir -p $bin/bin
tools=( grabconsole multitee pipecycle recvfd seek0 sendfd setblock setstate statfile vc-get vc-lock vc-switch )
@@ -62,11 +57,15 @@ stdenv.mkDerivation {
mkdir -p $lib/lib
mkdir -p $dev/include
mkdir -p $man/share/man/man1
mkdir -p $man/share/man/man8
docdir=$doc/share/doc/fdtools
mkdir -p $docdir
mv library/fdtools.a $lib/lib/fdtools.a
mv include/fdtools.h $dev/include/fdtools.h
mv man/man1/* $man/share/man/man1/
mv man/man8/* $man/share/man/man8/
${
skawarePackages.cleanPackaging.commonFileActions {
@@ -98,4 +97,4 @@ stdenv.mkDerivation {
platforms = lib.platforms.linux;
maintainers = [ ];
};
}
})
+2 -2
View File
@@ -99,13 +99,13 @@ let
in
llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "fex";
version = "2603";
version = "2604";
src = fetchFromGitHub {
owner = "FEX-Emu";
repo = "FEX";
tag = "FEX-${finalAttrs.version}";
hash = "sha256-rQOqziJ7IizJV3VmAWGo5s2xn2/xnp0sx3VfBtH1JK4=";
hash = "sha256-VPlw15vM3wowgba9Z95F/vRYJLaevtt8lJEgw4hYS8w=";
leaveDotGit = true;
postFetch = ''
+3 -3
View File
@@ -10,7 +10,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ffizer";
version = "2.13.8";
version = "2.13.9";
buildFeatures = [ "cli" ];
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "ffizer";
repo = "ffizer";
rev = finalAttrs.version;
hash = "sha256-TV1+bupdJFmq72F4MbqyyvE/p9PufdeOUo24mPYvuAc=";
hash = "sha256-7nTtyCtppUZ3vEtiDfDMCvDztZRVDFH43bl5fgZtfFM=";
};
cargoHash = "sha256-iEdNyzY4fzfQkayXIKthv4ofl11+U2KfV63VvXrR6HQ=";
cargoHash = "sha256-/BdODBhF+ikre/U1TzB+/DqSs7LYn7NhPKgMJT80TUM=";
nativeBuildInputs = [
pkg-config
+3 -3
View File
@@ -11,17 +11,17 @@
buildNpmPackage rec {
pname = "firebase-tools";
version = "15.13.0";
version = "15.14.0";
nodejs = nodejs_22;
src = fetchFromGitHub {
owner = "firebase";
repo = "firebase-tools";
tag = "v${version}";
hash = "sha256-5uamK+vP4bdkm7uwtVc6MoKR6XJ5vDk3jj3Q4dy5TdM=";
hash = "sha256-0jkeO8S47kxxnBLwaaeoc5QJobZpZjTR85kgkCZyIiQ=";
};
npmDepsHash = "sha256-PdV62ktNB8Tz88ea2rQZ8+y+akmw33zhWMe0L0lHo88=";
npmDepsHash = "sha256-T2tB+kOYYdt048Y6ONrRDWUd4OLJGdOd59LdNIhVLMQ=";
# No more package-lock.json in upstream src
postPatch = ''
+2 -2
View File
@@ -22,13 +22,13 @@ in
flutter.buildFlutterApplication (finalAttrs: {
pname = "fladder";
version = "0.10.2";
version = "0.10.3";
src = fetchFromGitHub {
owner = "DonutWare";
repo = "Fladder";
tag = "v${finalAttrs.version}";
hash = "sha256-D2FFIBRWi66TRB4LkUWZu/jc+edVXo70FZDzGFh11Wk=";
hash = "sha256-0eFHylRi2UVaKRG7K3tDZVscgoiL5xFrtFhZiJxj4Mk=";
};
inherit targetFlutterPlatform;
+20
View File
@@ -90,6 +90,16 @@
"source": "hosted",
"version": "0.18.18"
},
"audio_service_mpris": {
"dependency": "direct main",
"description": {
"name": "audio_service_mpris",
"sha256": "fdab1ae1f659c6db36d5cc396e46e4ee9663caefa6153f8453fcd01d57567c08",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"audio_service_platform_interface": {
"dependency": "transitive",
"description": {
@@ -2968,6 +2978,16 @@
"source": "hosted",
"version": "15.0.2"
},
"volume_controller": {
"dependency": "direct main",
"description": {
"name": "volume_controller",
"sha256": "5c1a13d2ea99d2f6753e7c660d0d3fab541f36da3999cafeb17b66fe49759ad7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.1"
},
"wakelock_plus": {
"dependency": "direct main",
"description": {
@@ -1,21 +1,21 @@
{
"version": "12.12.0",
"version": "12.12.1",
"sources": {
"aarch64-linux": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.0/floorp-linux-aarch64.tar.xz",
"sha256": "0ca2c2e80ee569a8d2bcbcac64e28e33e6aa5ece91faf8b9755189c34a71af9a"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-linux-aarch64.tar.xz",
"sha256": "07679b57ccb91b00c5de863e7170f89c9f929190b1b10f6a9c449c3d634fed22"
},
"x86_64-linux": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.0/floorp-linux-x86_64.tar.xz",
"sha256": "a6f61ad904e8229ca4e709a30d38f2a0e6926dc3f82ddbe24efb8e0c1ba51910"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-linux-x86_64.tar.xz",
"sha256": "7f50d5d805e3acd401b933aa039d01712237d975c5d8306d46006ae2363d3080"
},
"aarch64-darwin": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.0/floorp-macOS-universal.dmg",
"sha256": "d5fc6ea7c98514e304cdfe192d8df6c253b8d6b248b39cb41486f6e67a8b566e"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-macOS-universal.dmg",
"sha256": "5a62aedda78804344ddde080747c9853023f13472db501f6de8b9078734f62dd"
},
"x86_64-darwin": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.0/floorp-macOS-universal.dmg",
"sha256": "d5fc6ea7c98514e304cdfe192d8df6c253b8d6b248b39cb41486f6e67a8b566e"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-macOS-universal.dmg",
"sha256": "5a62aedda78804344ddde080747c9853023f13472db501f6de8b9078734f62dd"
}
}
}
+9 -1
View File
@@ -12,6 +12,7 @@
bash,
brotli,
buildGoModule,
fetchpatch,
forgejo,
git,
gzip,
@@ -82,8 +83,15 @@ buildGoModule rec {
patches = [
./static-root-path.patch
]
++ lib.optionals (lib.versionAtLeast version "14") [
# Backport fix for flaky TestBleveDeleteIssue test from v15.
# https://codeberg.org/forgejo/forgejo/pulls/11686
(fetchpatch {
url = "https://codeberg.org/forgejo/forgejo/commit/a32b0da87c10bb628a9d2203b700f0683e1ae966.patch";
hash = "sha256-mY1b35aKsiLNU56Ut/qiLrYj+IR8M2W8dZQiDqkDNxg=";
})
];
postPatch = ''
substituteInPlace modules/setting/server.go --subst-var data
'';
+705
View File
@@ -0,0 +1,705 @@
{
"!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
"!version": 1,
"https://plugins.gradle.org/m2": {
"com/dorongold/task-tree#com.dorongold.task-tree.gradle.plugin/1.5": {
"pom": "sha256-4xyBsV9WhgwF/U9gbLUN2LS/dAKMjFnNxpm2zDkf6P8="
},
"com/install4j/gradle#com.install4j.gradle.gradle.plugin/10.0.4": {
"pom": "sha256-5t8tFC+QyevrTTAyLxxvqw5sS1jMf8pEOt7reTZdjlM="
},
"de/undercouch#gradle-download-task/4.1.1": {
"jar": "sha256-6wi1cOQI1GRnBecKlJYU1DnqKxFFXxZSqwMw3olU2rk=",
"pom": "sha256-EQnx9xpUJU1ZAzfYudRD+d/AhyjJwdgzVlXMHcyIwLk="
},
"de/undercouch/download#de.undercouch.download.gradle.plugin/4.1.1": {
"pom": "sha256-ZL5TPFcSdn44nrLPbMK7AEWaIYKe0GgABNB6m/ZnZxk="
},
"gradle/plugin/com/dorongold/plugins#task-tree/1.5": {
"jar": "sha256-2OkT94ZPnHnepZi0Y+jUC8NBGcMfqKDOhn+1ImbgXbE=",
"pom": "sha256-UEdWODez5k6Xo92EIPC1ACNCh5e5ncC3VDwWmRQKuOE="
},
"gradle/plugin/install4j/install4j/buildtools#gradle_publish/10.0.4": {
"jar": "sha256-C5ZW/6DU1Ifu90gbn9EjcR8h2a4916qAIhWRqKIBmIs=",
"pom": "sha256-thQQBx7ICgYZ4KaXE1xNHBaooGaNdFbqLd/bdAf5caE="
},
"org/apache#apache/16": {
"pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
},
"org/apache/commons#commons-lang3/3.4": {
"jar": "sha256-c0yDVkIMyOMMeV1k/R/NXUTqnZA0KizDJixRWPvG2Ys=",
"pom": "sha256-aG51tWGhPBAx1Dp2R6Nk4u0+RWRnBQ6sRSe5SwbXP9E="
},
"org/apache/commons#commons-parent/37": {
"pom": "sha256-7nBaTdaNjc2cyNEknVeQhh6xRc57DG1sBVW6lEidAUs="
}
},
"https://repo.maven.apache.org/maven2": {
"com/badlogicgames/ashley#ashley/1.7.4": {
"jar": "sha256-rWYs2Phggwg9JTFUz2s8iqbVwyZqAdtzC7wVPzgd7AY=",
"pom": "sha256-CFY3K/mrzzG5nEJyvdKVSk/VNREmZoEjU2BXypnIbrk="
},
"com/badlogicgames/gdx#gdx-backend-headless/1.14.0": {
"jar": "sha256-SGB+tPWO6Qv71k7R7pVEFdSjpBgeztGBJ8hvzEctReA=",
"module": "sha256-SEk2JSR0I+p4QeM8k+ErfA431tSNtp2IakKWtV4CoRU=",
"pom": "sha256-yr3W7B8wZORINnp0/fSnHeBlEUxXYZjPYNJyPU9adZY="
},
"com/badlogicgames/gdx#gdx-backend-lwjgl/1.14.0": {
"jar": "sha256-/nw64TfZPXE/wc8ANpufAr6L8UUDZsA5o72xRGHIhw0=",
"module": "sha256-xo30ns0TsOBARrW6qDU7PVUpn4Fplr7ibZzYIs4Levc=",
"pom": "sha256-SW7lWkTcwyR/IN2al9JrUj1R2OukznTGmD4TYc26qcs="
},
"com/badlogicgames/gdx#gdx-backend-lwjgl3/1.14.0": {
"jar": "sha256-3pV68nyhyv+3eO2hqNMbmDXcc/AEcB0WduyjOWMHICA=",
"module": "sha256-GJYW7PSrxbXLJMt1Xwc+IsogkUv4ojCdFdJ/fnpoyOU=",
"pom": "sha256-S+xaAWtXxkg0Rruzr4XV0V9f4gedhSpnTcVLMOWd9pY="
},
"com/badlogicgames/gdx#gdx-freetype/1.14.0": {
"jar": "sha256-Pr/nUymeEYNLyIzzxMDCzIucJDWsA+VgsKh2QlZYK7Q=",
"module": "sha256-fUf8X7lgc5I5ddUqrgMuACcJ144JKU/wOK6K3R7W44A=",
"pom": "sha256-Rtq9qlQ6ZRDgUGOMNmphRdkGkbIaBiEf+rSbICMyQiw="
},
"com/badlogicgames/gdx#gdx-jnigen-loader/2.5.2": {
"jar": "sha256-34HyPP1nhcUtNeEI7qo5MPVZ1NJ3CmEC51ynv6b58no=",
"module": "sha256-jwtii5G9Ez24XxUuFZMprPf0tmeDvR32AcNZfcJRIiQ=",
"pom": "sha256-i0dgu2bbPz+ZuEBj7z6ZDWOhzZx81XSlatf07kvRdoc="
},
"com/badlogicgames/gdx#gdx-platform/1.14.0": {
"pom": "sha256-2Ps74A82eRr6thqFkeVCr7qkkQEHoFdUnMlwBu2NoRs="
},
"com/badlogicgames/gdx#gdx-platform/1.14.0/natives-desktop": {
"jar": "sha256-qKjJzM9endUYJWs8315raJpdaWoU4EYK9bDLxR218vE="
},
"com/badlogicgames/gdx#gdx-tools/1.14.0": {
"jar": "sha256-mFojYX283g1etx+inPrqxhIyKNuO3d7a1dtbrj7zCdk=",
"module": "sha256-WaTmiYUVjiaNYnc1UGg1uUHGArjMjss2qOsTAh3D+kI=",
"pom": "sha256-ekR09L0ek+WK/Dm4QDs8ZptSItbq3E88ZrD1Q8TmG8Q="
},
"com/badlogicgames/gdx#gdx/1.14.0": {
"jar": "sha256-owWJXpFfxfWUg95dOZokoMpi/hFQFf/oIQw249ZPgSY=",
"module": "sha256-xJCoyufsdrraEiLaEyJl5fqyyyzc3q51IXrIhkmUWyU=",
"pom": "sha256-CiUFNinRwfRgZMN7orOC0MRmQstKTssVF3jbNXEKmgw="
},
"com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.3": {
"jar": "sha256-mONKsUmJoPsqyIG6IaxNEqbOTeQoPzmypPFlumEqOlA=",
"pom": "sha256-UFwJ02ifZMr31qLz/PeKizwEFLIuRH4BlTHJDBCqmGU="
},
"com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.3": {
"jar": "sha256-UkirjqKl+0SixFdVEQLsNAP/JYm6hKImCti8cv6X6oM=",
"pom": "sha256-yc9KDEo6Bu+vBLORaza3fL3F71YdCpy6GhdiPxH8Tt8="
},
"com/badlogicgames/jamepad#jamepad/2.0.20.0": {
"jar": "sha256-6fFqB9SpRCSs0DiOw6P+TsZLfhiWxlgUwv9rRisTs2Y=",
"module": "sha256-vXFX36GUJsdj2VgYbnHR3+lKnBRgBeEI9pwUameDrmY=",
"pom": "sha256-+gwaoDndosNqw/VslH3vLEOptLnkbCPhrqddHQaZ3eQ="
},
"com/badlogicgames/jlayer#jlayer/1.0.1-gdx": {
"jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=",
"pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k="
},
"com/fasterxml#oss-parent/58": {
"pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
},
"com/fasterxml#oss-parent/70": {
"pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk="
},
"com/fasterxml/jackson#jackson-base/2.20.2": {
"pom": "sha256-2h3M8cF7Sx/XPEiKaRH93ekBcrRvgbbdbUchrAgzDfQ="
},
"com/fasterxml/jackson#jackson-bom/2.17.2": {
"pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
},
"com/fasterxml/jackson#jackson-bom/2.20.2": {
"pom": "sha256-izQ6yh3LT3KLlMxzgxmYMOPTorDQdzQ3h+7iIAkYtB4="
},
"com/fasterxml/jackson#jackson-parent/2.17": {
"pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
},
"com/fasterxml/jackson#jackson-parent/2.20": {
"pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U="
},
"com/fasterxml/jackson/core#jackson-annotations/2.20": {
"jar": "sha256-lZov+y1ZFDb1Hxg8alIfyJNHkS9xG/DK4AjN8EXZUxk=",
"module": "sha256-wHDxTsg1jQlcAurootZcsAzLoOXFqnOwASlDM/5GiXE=",
"pom": "sha256-TXQMRHjdCNCJ7NxtBjIopVoRp+jkl9pDOPhy+BFXlKQ="
},
"com/fasterxml/jackson/core#jackson-core/2.20.2": {
"jar": "sha256-YbhaQbvDM+bbO3ck1an/UBHsX56xzuQeYiQgvG4OQTE=",
"module": "sha256-sYxSWUiGF4L+YKs7Z7fAYj8BCGZdSHPoXKCVwZBMRC4=",
"pom": "sha256-Hvbw4LWflUdfUMcGuUPw9AKZM8KUd1bfV2MVIIJ8n0k="
},
"com/fasterxml/jackson/core#jackson-databind/2.20.2": {
"jar": "sha256-EZVz/GzrJbJrsDK7WIjn/YpOkzmHloo4glOgF9rLXlQ=",
"module": "sha256-AZgSiK3esDDuVzZeueuGxmW3QCStl/EhvgaSFV7s6Fw=",
"pom": "sha256-lENiw258gC/9Y7MgVi3skwEMhobnqzRddIGgxBJDdb4="
},
"com/fasterxml/jackson/core/jackson-databind/maven-metadata": {
"xml": {
"groupId": "com.fasterxml.jackson.core",
"lastUpdated": "20260320165217",
"release": "2.21.2"
}
},
"com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.20.2": {
"jar": "sha256-pitcqgneC5fkMtAMdZuLJBeRJEvqDoLWSxRra0kPd58=",
"module": "sha256-ms2p4hxHgeHIYpjkEpfZvxX7kjJ1qQ+CPux4pcThxzI=",
"pom": "sha256-Sd0bFAMmAn3uHCRqWwjwGZEdaxPCPQC9H/H8cQP6XYI="
},
"com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.20.2": {
"pom": "sha256-uJ9hJjw2ipUFbIeWVWuZAbupKiZ/fZ2WhL5nJOo4GUI="
},
"com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/maven-metadata": {
"xml": {
"groupId": "com.fasterxml.jackson.dataformat",
"lastUpdated": "20260320170529",
"release": "2.21.2"
}
},
"com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.20.2": {
"jar": "sha256-/1laPPAJolZwyS0vaTnj/+1M2zfLoNBPYZ5+1Dzouhs=",
"module": "sha256-xE++kmmtbMtw3gmf9fq2d6Te/LtiW7zhQCgFnRS0CHY=",
"pom": "sha256-eW8zaKlRawvRBQ6CiZm3JzhD0FrBOEmATFxDSGlYMEg="
},
"com/fasterxml/jackson/datatype/jackson-datatype-jsr310/maven-metadata": {
"xml": {
"groupId": "com.fasterxml.jackson.datatype",
"lastUpdated": "20260320172128",
"release": "2.21.2"
}
},
"com/fasterxml/jackson/module#jackson-modules-java8/2.20.2": {
"pom": "sha256-0TLemnPo0XcwvbbLj1DBJAs4781JX+REDBN6TUmLWPY="
},
"com/github/oshi#oshi-core-java11/6.9.3": {
"jar": "sha256-r10YyzErc2Xle85d40vIn/WDv6wZwwdDlZI2Ey+zMUM=",
"pom": "sha256-0U+6Legj2vhW+Fbkl79eYyDdcL10V7+Eiu/wA1fWiZ4="
},
"com/github/oshi#oshi-parent/6.9.3": {
"pom": "sha256-LpfRn458Dn6eh5Pe1pPrNQ2OKKdiZ03rRmKTw2B0EA4="
},
"com/github/oshi/oshi-core-java11/maven-metadata": {
"xml": {
"groupId": "com.github.oshi",
"lastUpdated": "20260222224520",
"release": "6.10.0"
}
},
"com/sparkjava#spark-core/2.9.4": {
"jar": "sha256-mfRxdpUYTims4kc1vFOadJd3VFKzgbgIAzWtrjqYXDo=",
"pom": "sha256-AsTWio2fjTTxGyyXUABlkZWfUiKIf8vmxw3PK7S3Yhk="
},
"com/sparkjava/spark-core/maven-metadata": {
"xml": {
"groupId": "com.sparkjava",
"lastUpdated": "20220710072313",
"release": "2.9.4"
}
},
"commons-io#commons-io/2.21.0": {
"jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=",
"pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas="
},
"commons-io/commons-io/maven-metadata": {
"xml": {
"groupId": "commons-io",
"lastUpdated": "20251112172346",
"release": "2.21.0"
}
},
"javax/servlet#javax.servlet-api/3.1.0": {
"jar": "sha256-r0VrLdQcToLPVPPnQ7xniXPZ/jW9TTBx+gXH5TM7hII=",
"pom": "sha256-sxEJ4i6j8t8a15VUMucYo13vUK5sGWmANK+ooM+ekGk="
},
"junit#junit/4.13.2": {
"jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
"pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
},
"junit/junit/maven-metadata": {
"xml": {
"groupId": "junit",
"lastUpdated": "20210213164433",
"release": "4.13.2"
}
},
"net/jafama#jafama/2.3.2": {
"jar": "sha256-9VULupxuFHMcRUICQYC0xDCyb48vtwyt9wmk3m8HaZE=",
"pom": "sha256-9MYWz/x0UCwfklUFrjvApInTBlApiWGaRbGqyXzqtAU="
},
"net/jafama/jafama/maven-metadata": {
"xml": {
"groupId": "net.jafama",
"lastUpdated": "20200818215213",
"release": "2.3.2"
}
},
"net/java#jvnet-parent/3": {
"pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
},
"net/java/dev/jna#jna-jpms/5.18.1": {
"jar": "sha256-RKxmAoCCMvPelQp9Dum4xrmec3M7aUYeZDV2YHvnTbY=",
"pom": "sha256-WT8axHM+AsCT6K6oru0pgZBPOYzWqJrk7nWd7JgcQHM="
},
"net/java/dev/jna#jna-platform-jpms/5.18.1": {
"jar": "sha256-uCN2ZbQ/4Dmq3tgc46+rc+k6xqEz+qYNZ5a8hl0fPVc=",
"pom": "sha256-WIXRZhANaXGGBOmbIVjmUW5gjfnVyuU+pFNGn+G2VQI="
},
"net/java/jinput#jinput/2.0.5": {
"jar": "sha256-ebWk9YKeGkmkFXEff7jrW5rSLe+nKSn9otqW7DDT8Bg=",
"pom": "sha256-MZnVR8EnXoBuDHvhnpDcsA2VYew7MfsueA4S19h4WBA="
},
"net/java/jutils#jutils/1.0.0": {
"jar": "sha256-wzNP85zwqztUklYZEBBUyQCYt8czseeDTHt15MQehKU=",
"pom": "sha256-rwnq1OskFHPn7E0VKpGnIuoJpxeiAuIOSzherDIXt9Y="
},
"net/sf/py4j#py4j/0.10.9.9": {
"jar": "sha256-vExLHnMasYSWzG6rMec1NwGzL8XDBHdkoGVqz1NEpUs=",
"pom": "sha256-31SUmVHkWbGH94AlisBunpPkQExDTOcqKcuBcxcl2YY="
},
"net/sf/py4j/py4j/maven-metadata": {
"xml": {
"groupId": "net.sf.py4j",
"lastUpdated": "20250115035634",
"release": "0.10.9.9"
}
},
"org/apache#apache/3": {
"pom": "sha256-OTxQr7S3qm61flN3pVoaBhCxn3W1Ls4BMI2wShGHog4="
},
"org/apache#apache/35": {
"pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg="
},
"org/apache/commons#commons-parent/91": {
"pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI="
},
"org/apache/xmlrpc#xmlrpc/3.0": {
"pom": "sha256-3wCwRZNDpADXSXtc0zlwDrMpm5Ct90iXLOex7mgPxeo="
},
"org/eclipse/jetty#jetty-client/9.4.48.v20220622": {
"jar": "sha256-f4n+CQDTaylidZmZkqatdtUjvjVIfWE9j7VkNMNNHRU=",
"pom": "sha256-OSA2kd2VgRwPG+hmGM/WTFAo1p65J9k3J8edC+oxSL4="
},
"org/eclipse/jetty#jetty-http/10.0.24": {
"jar": "sha256-mrW9iKZURpoX92j+Yo1j1cZgQJ25y4KhErPzBDzycGM=",
"pom": "sha256-UsL1pGnrzU6zp2+W2y4/E3yY+a7mMi09a4G2gu7PVX0="
},
"org/eclipse/jetty#jetty-io/10.0.24": {
"jar": "sha256-KOq4v0K06pwl10uB4QHLDTOThW+v3nKSsP6T5ViDnWk=",
"pom": "sha256-FB5YNJUhWlKd0BhdB4624pBKsX4w2bVZtEL8QJfnTMA="
},
"org/eclipse/jetty#jetty-project/10.0.24": {
"pom": "sha256-4tzZrkzDC1n8yU6Se5b4VITwELkgP0csL8ckW/qtpsU="
},
"org/eclipse/jetty#jetty-project/9.4.48.v20220622": {
"pom": "sha256-FbdNVsPlVmSwLSTTgVjn0fv3mNByUikGForINWu1MxQ="
},
"org/eclipse/jetty#jetty-security/9.4.48.v20220622": {
"jar": "sha256-QwObD1ihVqfxubd1Ctgvf83V26gXF7lww4HLG4YY/3M=",
"pom": "sha256-7uGWWTNHz+4hyRK0miahPdh9XSe9zCXeK5qB4dXTOVw="
},
"org/eclipse/jetty#jetty-server/10.0.24": {
"jar": "sha256-Lcda0K0yWtVHcgn1RLCqYSbOPB9dW6ySujN5RiswToo=",
"pom": "sha256-3uTI8hjp1nlA+lUOtr1tZF52xezpL+JYFQWHiZyxjhg="
},
"org/eclipse/jetty#jetty-servlet/9.4.48.v20220622": {
"jar": "sha256-6rw29D+0CAt9AuH7ytC0N+A1063Hv9eomzzesiJH5oI=",
"pom": "sha256-X1g2Z8jQ4oFGStAgKC/LKZLwAQYzJ2wjgDdTxv1KB2s="
},
"org/eclipse/jetty#jetty-util-ajax/9.4.48.v20220622": {
"jar": "sha256-tdS0C+PPn0iz1fjlkYBmckpiDLkBaEk5yfHdfsG5MMs=",
"pom": "sha256-cAr7YtOLSreYETt8qT95en5/CIdI0TUcxyqWHZjzscc="
},
"org/eclipse/jetty#jetty-util/10.0.24": {
"jar": "sha256-DU/TEicDD+RJM7CQUlV7rUHiRzD+MdEe5sVwDPthV8c=",
"pom": "sha256-d1/yq9Nmph9Sy0op6xKSmSNykgJzPtfUoeea2ukIxIU="
},
"org/eclipse/jetty#jetty-webapp/9.4.48.v20220622": {
"jar": "sha256-vbM91+mjDqQo8wEBDQjH9ps37HXdo0C3mobpUUn+wLI=",
"pom": "sha256-J80ozVISLXqgXAGJ8NE4T2pD+0a1eNIEFuaA7dpXN6o="
},
"org/eclipse/jetty#jetty-xml/10.0.24": {
"jar": "sha256-rJpv6i8HyYA7JQhpYU0hhDBBH8NsuNFst0joR7MGPkw=",
"pom": "sha256-lN23TmF++OX3DARC2xX+9vBF6vVrlhZk3g++yScVTfk="
},
"org/eclipse/jetty/toolchain#jetty-servlet-api/4.0.6": {
"jar": "sha256-2Qvx+KnSuon0UQu1HhUW3PlO9twDTgDyM2VKvdePIhA=",
"pom": "sha256-KKIk7vRpg8fQbJBi8LZPd4mS8Pv2vdQWo/mDFi/oe1c="
},
"org/eclipse/jetty/toolchain#jetty-toolchain/1.7": {
"pom": "sha256-fBUyYiRwoMyrB+BsbFgpD/GyWDas8txeepGo1th6WO4="
},
"org/eclipse/jetty/websocket#websocket-api/9.4.48.v20220622": {
"jar": "sha256-h/sFIyTWxeIvWPtykWmRO7MY2XkhEVZAw9ykU8frGeE=",
"pom": "sha256-2C+ObiJ6QUvCYIhINrcjRoK+ib9ndtRvcgDQq/M/KBY="
},
"org/eclipse/jetty/websocket#websocket-client/9.4.48.v20220622": {
"jar": "sha256-Qy2dhXNL6Ky9vDZWIA0rHVQFdMm+vgtPdaP4u+QCovE=",
"pom": "sha256-V6FtOFDeWfQ8EsA/Zowtt25xtklqSSFQoVjXv/3Q4/c="
},
"org/eclipse/jetty/websocket#websocket-common/9.4.48.v20220622": {
"jar": "sha256-H2MDOefn9t5df0f5SWSV12ia1B/BFWWq8Rzp4i/2zNo=",
"pom": "sha256-btH5KPia+fgIplY37EKf8KAVH5/SnXYlnR+hs971fqc="
},
"org/eclipse/jetty/websocket#websocket-parent/9.4.48.v20220622": {
"pom": "sha256-fvaqA3kZ6pMHcvRo4Tw/P8ZzQ97XnuK33UadWJz2tQ0="
},
"org/eclipse/jetty/websocket#websocket-server/9.4.48.v20220622": {
"jar": "sha256-Mq0Ys8YQpQNsM9LmvfdutGdZ+44GdIPXqW+U45CaQoU=",
"pom": "sha256-JvEr9q38ZYrvTOYu0uPoJ500TYQY/+t9W6EF3q3rLQc="
},
"org/eclipse/jetty/websocket#websocket-servlet/9.4.48.v20220622": {
"jar": "sha256-KK7qmsM6P20i4x7SpgeavDXOPsHVyA4cwThZ9TZoCyU=",
"pom": "sha256-khaOUN5lPNstvGkW4FRZSuty0KKwuU0NULPga1bV9Lc="
},
"org/hamcrest#hamcrest-core/1.3": {
"jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
"pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
},
"org/hamcrest#hamcrest-parent/1.3": {
"pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
},
"org/infinispan#infinispan-bom/11.0.15.Final": {
"pom": "sha256-Bzhu5iyEZGGHcNIJ+MBg2o5R9W52MU0bKcrsnDAhMOk="
},
"org/infinispan#infinispan-bom/11.0.19.Final": {
"pom": "sha256-OmBv0rX3f991rPM15brdRnxCQFsR8mjnPBfrkkM+WhE="
},
"org/infinispan#infinispan-build-configuration-parent/11.0.15.Final": {
"pom": "sha256-svgt1nDnDzeKeA7+oQU/DmYKgl27/oxsqMqZbf3jqqA="
},
"org/infinispan#infinispan-build-configuration-parent/11.0.19.Final": {
"pom": "sha256-EghgxWpNd7zBIjy650Dusm8vk1XUmhfV8WWADuCvqno="
},
"org/jboss#jboss-parent/36": {
"pom": "sha256-AA3WFimK69IanVcxh03wg9cphCS5HgN7c8vdB+vIPg4="
},
"org/jcommander#jcommander/2.0": {
"jar": "sha256-Yvwe3ArESwM9cGmEQ3UONv/rhzhssdeylLDqNDhOEiw=",
"module": "sha256-cnpzaYXHVZ6A3O6EQqd4SWAuzdb/9wGD5/7jIhaljIA=",
"pom": "sha256-pUoNL5BnLA3bVhrlKYANm1BjcqDNcoWwgm5jwxbC4aA="
},
"org/jcommander/jcommander/maven-metadata": {
"xml": {
"groupId": "org.jcommander",
"lastUpdated": "20251005133523",
"release": "3.0"
}
},
"org/jcraft#jorbis/0.0.17": {
"jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=",
"pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ="
},
"org/json#json/20231013": {
"jar": "sha256-DxgZLfKJEU4XqhoNCn+DcsyfXH5Pfjmtz4kG/nFPp9M=",
"pom": "sha256-xQBAI9OfVGNbNbvrQOIaKtVR/KDy41Cxzje9DnyypGY="
},
"org/junit#junit-bom/5.10.3": {
"module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
"pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
},
"org/junit#junit-bom/5.13.4": {
"module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
"pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
},
"org/junit#junit-bom/5.14.3": {
"module": "sha256-8lxAv6Usi3tCXVdqiPMQ9kMmFtYrpYkyA/on37yfAl4=",
"pom": "sha256-CKAoVuSHyTV/mynjh0X4roBYSBEectFarQNSM48WMuE="
},
"org/junit#junit-bom/5.8.2": {
"module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=",
"pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI="
},
"org/junit/platform#junit-platform-commons/1.14.3": {
"jar": "sha256-nrUkMrrvx96X2931GTlFa5wnLGvcuPtTXgQFxnD5aug=",
"module": "sha256-jSmgMoScAVIwjhniozdHwT2rXzEv/y+IqUI+tHfOPew=",
"pom": "sha256-OwPQael9K60RG+KcAMxakxM1TbZEnSSV6IftDGCay7Q="
},
"org/junit/platform#junit-platform-engine/1.14.3": {
"jar": "sha256-Fru/f1wvUxuXxIscbzUdc4pB2ICcc7ETZFfq132lEBk=",
"module": "sha256-fB2knsr3aLbtt3Hpdwz2BuZrYH0laWAIsC/qZNvHmw0=",
"pom": "sha256-DILRT45B5FV9HoyD4xIZv/Q9RPgqYWH92CiyjyGXt6w="
},
"org/junit/platform#junit-platform-launcher/1.14.3": {
"jar": "sha256-mysktqj5wR1cuWdoQ9o4JCccjhfIVXtcWHBA5ZiYlxk=",
"module": "sha256-HmYSmOheYI5fnH1m5x7u2vZVBgvOtjmgV/Blo+Bb8ko=",
"pom": "sha256-nEiAqHeA2ru2Bb/JXCdJSgq0UPHVo2wdkKDrI2gRQy0="
},
"org/junit/platform/junit-platform-launcher/maven-metadata": {
"xml": {
"groupId": "org.junit.platform",
"lastUpdated": "20260215134929",
"release": "6.1.0-M1"
}
},
"org/kamranzafar#jtar/2.3": {
"jar": "sha256-Tl1CaBOkQm5ayodKsGzQHF3lOQTgFH84aYtzatUZ3aI=",
"pom": "sha256-OQpqECEhz9A+sxssJUuPFsFLmXxAetrmLGDZ6c82Fx0="
},
"org/kamranzafar/jtar/maven-metadata": {
"xml": {
"groupId": "org.kamranzafar",
"lastUpdated": "20150913184343",
"release": "2.3"
}
},
"org/lwjgl#lwjgl-glfw/3.3.3": {
"jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=",
"pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM="
},
"org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": {
"jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg="
},
"org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": {
"jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg="
},
"org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": {
"jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s="
},
"org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": {
"jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew="
},
"org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": {
"jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk="
},
"org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": {
"jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0="
},
"org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": {
"jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ="
},
"org/lwjgl#lwjgl-jemalloc/3.3.3": {
"jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=",
"pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k="
},
"org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": {
"jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM="
},
"org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": {
"jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8="
},
"org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": {
"jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU="
},
"org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": {
"jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw="
},
"org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": {
"jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw="
},
"org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": {
"jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs="
},
"org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": {
"jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo="
},
"org/lwjgl#lwjgl-openal/3.3.3": {
"jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=",
"pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8="
},
"org/lwjgl#lwjgl-openal/3.3.3/natives-linux": {
"jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo="
},
"org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": {
"jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc="
},
"org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": {
"jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE="
},
"org/lwjgl#lwjgl-openal/3.3.3/natives-macos": {
"jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0="
},
"org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": {
"jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo="
},
"org/lwjgl#lwjgl-openal/3.3.3/natives-windows": {
"jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg="
},
"org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": {
"jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE="
},
"org/lwjgl#lwjgl-opengl/3.3.3": {
"jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=",
"pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0="
},
"org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": {
"jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA="
},
"org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": {
"jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc="
},
"org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": {
"jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w="
},
"org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": {
"jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4="
},
"org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": {
"jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4="
},
"org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": {
"jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc="
},
"org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": {
"jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw="
},
"org/lwjgl#lwjgl-openxr/3.3.3": {
"jar": "sha256-E+969MnOTjdYsM5ByI4VLhTEh0vl4tGsppYavczRg9E=",
"pom": "sha256-SkwDiJ3wZ82m8tTNsH4q1iNQjXZWOa1t11anDgjVO5U="
},
"org/lwjgl#lwjgl-openxr/3.3.3/natives-linux": {
"jar": "sha256-rDXKthXnXV6cUIK//LePHUkRJSgbZcRgSW37MPPOTQE="
},
"org/lwjgl#lwjgl-openxr/3.3.3/natives-windows": {
"jar": "sha256-IiK8TfaQIYjIF/p32/cKve/ILmmhaAryKSiuc+vDJGs="
},
"org/lwjgl#lwjgl-stb/3.3.3": {
"jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=",
"pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0="
},
"org/lwjgl#lwjgl-stb/3.3.3/natives-linux": {
"jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE="
},
"org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": {
"jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw="
},
"org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": {
"jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds="
},
"org/lwjgl#lwjgl-stb/3.3.3/natives-macos": {
"jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc="
},
"org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": {
"jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI="
},
"org/lwjgl#lwjgl-stb/3.3.3/natives-windows": {
"jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI="
},
"org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": {
"jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4="
},
"org/lwjgl#lwjgl/3.3.3": {
"jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=",
"pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ="
},
"org/lwjgl#lwjgl/3.3.3/natives-linux": {
"jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk="
},
"org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": {
"jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE="
},
"org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": {
"jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg="
},
"org/lwjgl#lwjgl/3.3.3/natives-macos": {
"jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM="
},
"org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": {
"jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg="
},
"org/lwjgl#lwjgl/3.3.3/natives-windows": {
"jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk="
},
"org/lwjgl#lwjgl/3.3.3/natives-windows-x86": {
"jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k="
},
"org/lwjgl/lwjgl#lwjgl-platform/2.9.3": {
"pom": "sha256-nDHMj8YNGCqTE3mllKRBsr3Y3it+I3dVgGO6CRfSH0Q="
},
"org/lwjgl/lwjgl#lwjgl-platform/2.9.3/natives-linux": {
"jar": "sha256-veHBUSXWaPShor6ZbI5MwbKZdIgD/o/pzTZ9TfpMBSo="
},
"org/lwjgl/lwjgl#lwjgl-platform/2.9.3/natives-osx": {
"jar": "sha256-p+BylNo+tvZ0fC7dTMQ/iTagqhuMa+VlLovsYgRWGew="
},
"org/lwjgl/lwjgl#lwjgl-platform/2.9.3/natives-windows": {
"jar": "sha256-fU3ZW+4GTZHhEQkYsKf2OlKU4v2aSIM6E9N9aMnAbSM="
},
"org/lwjgl/lwjgl#lwjgl/2.9.3": {
"jar": "sha256-Un1Qn2ATLlsmU8f8D4zymdb2mPSoATNCvvR3BdxX7T8=",
"pom": "sha256-G70Iq2gdmAEhkgaxeLk5UyJCObMH0Jmfzmjp6TuEHCc="
},
"org/lwjgl/lwjgl#parent/2.9.3": {
"pom": "sha256-VIRNsV5A2qGAOCwqidyi0STfAizIZ+Lkxax4fqfaVFA="
},
"org/opentest4j#opentest4j/1.3.0": {
"jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
"module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
"pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
},
"org/ow2#ow2/1.5.1": {
"pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
},
"org/ow2/asm#asm-bom/9.7": {
"pom": "sha256-jIZR874EOzV43SihXAFhhhsV6wObf1JHZ5wMwNvwd4c="
},
"org/slf4j#slf4j-api/2.0.17": {
"jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=",
"pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8="
},
"org/slf4j#slf4j-bom/2.0.17": {
"pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek="
},
"org/slf4j#slf4j-nop/2.0.17": {
"jar": "sha256-Nxb4NknsZhYaLt79T0nfNNHdHFHNz5QZlsaYcmDwqCk=",
"pom": "sha256-5eVI3OjByXkTin6WyjVFEPoM4QPwpt9TofWyXpKYubI="
},
"org/slf4j#slf4j-parent/2.0.17": {
"pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
},
"org/slf4j/slf4j-nop/maven-metadata": {
"xml": {
"groupId": "org.slf4j",
"lastUpdated": "20250225165034",
"release": "2.1.0-alpha1"
}
},
"org/sonatype/oss#oss-parent/5": {
"pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
},
"org/sonatype/oss#oss-parent/7": {
"pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
},
"org/sonatype/oss#oss-parent/9": {
"pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
},
"org/testcontainers#testcontainers-bom/1.16.1": {
"pom": "sha256-UGG6hMmFNuWmtM4oD7zssA4zXzsExdSEYpFi/LRiR3g="
},
"org/testcontainers#testcontainers-bom/1.20.1": {
"pom": "sha256-CKrS6R3QXKeycG0t/Ap66AxLXFBHAweZyLzbcyfLL0A="
},
"org/yaml#snakeyaml/1.25": {
"pom": "sha256-ZrVNtostx64vTFsyMbNP0BSa9PCoh6nerZ1L66CxsJw="
},
"org/yaml#snakeyaml/2.4": {
"jar": "sha256-73ea9dKand6MxwzgNB9cb3c14j7f+Whc6qnTU1m3u38=",
"pom": "sha256-4VSjIxzWzeaKq/J0/RiWTUmpwaX16e079HHprnvfCOY="
},
"uk/ac/starlink#jarrow/1.0": {
"jar": "sha256-uK2kGx3xwjn1kgcOWfHO7xcRmSkur/TgKsXp5zSllXo=",
"pom": "sha256-QUyAoANpW317oC3+r6NnpjELHVSLRXJEhzIEXObhl0c="
},
"uk/ac/starlink#jcdf/1.2.4": {
"jar": "sha256-gQs8iDWThaHUOVE1aCPv72PtLFLN2nV7+CD9zDepgw8=",
"pom": "sha256-fceMCivtxQ1qI3694PQkdOWCEmndpNQEvBIwTcdQTlc="
},
"uk/ac/starlink#jsamp/1.3.9": {
"jar": "sha256-oL31nk4lNITfym1Sc3iv9UYM9/bTdat2LFr7MrbBKg4=",
"pom": "sha256-8N2YWLooyeB2eq5Yx661TQ0DZaabm+W47EMxYOgh/i8="
},
"uk/ac/starlink#stil/4.3": {
"jar": "sha256-CSYHlmlWwltvQcKpw/05Clip/drfWocJQiY2dANYBwk=",
"pom": "sha256-wAk/CTtOkih7cpoLZAkNN6q18q1vU39cPPVbpxXsK7U="
},
"uk/ac/starlink/jsamp/maven-metadata": {
"xml": {
"groupId": "uk.ac.starlink",
"lastUpdated": "20240806101229",
"release": "1.3.9"
}
},
"xmlrpc#xmlrpc/1.2-b1": {
"jar": "sha256-aKWGIF8iLRU67+DP2HzJm73+L/BYGdvunbin+bEnxgA=",
"pom": "sha256-RdN/QFl5sxRMj3R3X+4TUucZVhRP5jCSWOZYDdjAmJc="
}
}
}
+129
View File
@@ -0,0 +1,129 @@
{
lib,
stdenv,
fetchFromCodeberg,
gradle_9,
makeBinaryWrapper,
jdk25,
jre25_minimal,
libGL,
nix-update-script,
help2man,
}:
let
jre = jre25_minimal.override {
# List of dependencies can be obtained using jdeps
modules = [
"java.base"
"java.desktop"
"java.instrument"
"java.naming"
"java.net.http"
"java.prefs"
"java.security.jgss"
"java.sql"
"jdk.management"
"jdk.unsupported"
];
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "gaiasky";
version = "3.7.1";
src = fetchFromCodeberg {
owner = "gaiasky";
repo = "gaiasky";
tag = finalAttrs.version;
hash = "sha256-UAVuivkeF234hoUyfCv7depspr3dyoyzYJDD0mKGAr4=";
};
nativeBuildInputs = [
gradle_9
makeBinaryWrapper
help2man
jdk25
];
buildInputs = [
jre
libGL
];
__darwinAllowLocalNetworking = true;
gradleBuildTask = "core:dist";
# Gaiasky binary has to be executed to generate manpage.
# However, since since /usr/bin/env bash is hardcoded in the binary
# it errors out. It is generated in postBuild phase instead.
gradleFlags = [
"-x :core:generateManPage"
"-x :core:gzipManPage"
];
mitmCache = gradle_9.fetchDeps {
inherit (finalAttrs) pname;
data = ./deps.json;
};
# The build output is stored in releases/gaiasky-version-version instead of releases/gaiasky-.
postPatch = ''
substituteInPlace build.gradle \
--replace-fail "def cmd = \"git describe --abbrev=0 --tags HEAD\"" "def cmd = \"echo ${finalAttrs.version}\"" \
--replace-fail "cmd = \"git rev-parse --short HEAD\"" "cmd = \"echo ${finalAttrs.version}\""
'';
postBuild = ''
patchShebangs --build "releases/gaiasky-${finalAttrs.version}.${finalAttrs.version}"/gaiasky
# Exclude copyExecutable so that it doesn't overwrite the patched files.
gradleFlags="" gradle :core:generateManPage -x :core:copyExecutables
patchShebangs "releases/gaiasky-${finalAttrs.version}.${finalAttrs.version}"/gaiasky
'';
installPhase = ''
runHook preInstall
install -m755 -d $out/bin $out/share/applications $out/share/metainfo $out/share/gaiasky $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/256x256/apps $out/share/man/man6
cp -r "releases/gaiasky-${finalAttrs.version}.${finalAttrs.version}"/* $out/share/gaiasky/
ln -s $out/share/gaiasky/gs_icon.svg $out/share/icons/hicolor/scalable/apps/gaiasky.svg
ln -s $out/share/gaiasky/gs_round_256.png $out/share/icons/hicolor/256x256/apps/gaiasky.png
ln -s $out/share/gaiasky/space.gaiasky.GaiaSky.metainfo.xml $out/share/metainfo/
ln -s $out/share/gaiasky/gaiasky.6 $out/share/man/man6/
substitute $out/share/gaiasky/gaiasky.desktop $out/share/applications/gaiasky.desktop \
--replace-fail "Icon=/opt/gaiasky/gs_icon.svg" "Icon=gaiasky"
makeWrapper $out/share/gaiasky/gaiasky \
$out/bin/gaiasky \
--set JAVA_HOME ${jre} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Open source 3D universe visualization software for desktop and VR with support for more than a billion objects";
homepage = "https://gaiasky.space";
changelog = "https://codeberg.org/gaiasky/gaiasky/releases/tag/${finalAttrs.version}";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ reputable2772 ];
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryBytecode # MITM Cache
binaryNativeCode # LWJGL natives are pulled in.
];
platforms = [
# No aarch64-linux, since upstream does not officially support it.
"x86_64-linux"
# Disable darwin due to daemon networking errors
# "x86_64-darwin"
# "aarch64-darwin"
];
mainProgram = "gaiasky";
};
})
+51
View File
@@ -0,0 +1,51 @@
{
lib,
stdenv,
fetchFromBitbucket,
pkg-config,
glib,
gtk3,
SDL2_mixer,
SDL2_image,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gdash";
version = "0-unstable-2023-06-24";
src = fetchFromBitbucket {
owner = "czirkoszoltan";
repo = "gdash";
rev = "f980da7f4318f5296424720416911876bdb8d6bf";
hash = "sha256-tYUaWT9cHKgCeu7y0pjHaZ+z4jSr43lAq/jAVE3DSDg=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
glib
gtk3
SDL2_mixer
SDL2_image
];
env.NIX_CFLAGS_COMPILE = " -I${SDL2_image}/include/SDL2";
doCheck = true;
checkTarget = "check";
meta = {
description = "Maze-based puzzle video game, a clone of the original Boulder Dash";
homepage = "https://bitbucket.org/czirkoszoltan/gdash";
changelog = "https://bitbucket.org/czirkoszoltan/gdash/src/master/ChangeLog";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.kupac ];
mainProgram = "gdash";
platforms = lib.platforms.all;
# Fails on darwin with:
# ld: symbol(s) not found for architecture x86_64
# clang++: error: linker command failed with exit code 1
broken = stdenv.hostPlatform.isDarwin;
};
})
+2 -2
View File
@@ -17,13 +17,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gforth";
version = "0.7.9_20260224";
version = "0.7.9_20260410";
src = fetchFromGitHub {
owner = "forthy42";
repo = "gforth";
rev = finalAttrs.version;
hash = "sha256-8qHfoqhzDn3FmKqTCo/72xtjWFUo9+crFFcGvbHxI0E=";
hash = "sha256-Nb5CB2k7gfG3sT+zfHGmj9G/CGccIvSIKcOuP7Altn0=";
};
patches = [ ./use-nproc-instead-of-fhs.patch ];
+44
View File
@@ -0,0 +1,44 @@
{
lib,
fetchFromGitHub,
buildGoModule,
versionCheckHook,
nix-update-script,
}:
buildGoModule (finalAttrs: {
pname = "gh-stack";
version = "0.0.1";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "github";
repo = "gh-stack";
tag = "v${finalAttrs.version}";
hash = "sha256-om7ekHez08X1YjP0W+3p0PxmjU/za6+/gHX5GPakKAw=";
};
vendorHash = "sha256-s85Lz6yfY1TiIFPolU1qESDyw8XoBORyuOMdiHj6Grc=";
ldflags = [
"-s"
"-w"
"-X=github.com/github/gh-stack/cmd.Version=${finalAttrs.version}"
];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "GitHub CLI extension to use stacked PRs";
homepage = "https://github.github.com/gh-stack/";
downloadPage = "https://github.com/github/gh-stack/";
changelog = "https://github.com/github/gh-stack/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ethancedwards8 ];
mainProgram = "gh-stack";
};
})
+3 -3
View File
@@ -8,15 +8,15 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gitlab-ci-ls";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "alesbrelih";
repo = "gitlab-ci-ls";
rev = "${finalAttrs.version}";
hash = "sha256-AXiP5v8aquyIdsZcTjTlAZETwTo3LfhvdLA2180uk1E=";
hash = "sha256-ZZjx6VdBZuVuHl42n0iXZkvvUku2CN7x4JCZxZTMOMk=";
};
cargoHash = "sha256-AO45OvyG3eBOaeYEqJT7GM/sqej/k+rNDtXN/+K16/8=";
cargoHash = "sha256-OB44JaekEl1dJB6LGTLWXgcwYac2GA3I9Ab8xt/+rkI=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "gitlab-runner";
version = "18.9.0";
version = "18.10.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-runner";
tag = "v${finalAttrs.version}";
hash = "sha256-U13SouwEfCVy5M8fv6rkCX0F+ecVYdsocvAdt3yxPJA=";
hash = "sha256-qwEzcZuyPqjuGDxNKCHc6AfBgS+Pp/PV1tK/qfofwtA=";
};
vendorHash = "sha256-Ak1Q8FnTD8LKcN9xRc1gpcnUiambGC3CJP84cwQqTtM=";
vendorHash = "sha256-iO5xZAdQPmUpgUGe5CjMHOfzWVXT+eukJ/zLw5BE0NE=";
# For patchShebangs
buildInputs = [ bash ];
@@ -1,8 +1,8 @@
diff --git a/shells/bash_test.go b/shells/bash_test.go
index bbbe949f4..955992d3f 100644
index ff4734ede..dd68bb7f0 100644
--- a/shells/bash_test.go
+++ b/shells/bash_test.go
@@ -4,11 +4,9 @@ package shells
@@ -4,7 +4,6 @@ package shells
import (
"path"
@@ -10,11 +10,7 @@ index bbbe949f4..955992d3f 100644
"testing"
"github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-runner/common"
"gitlab.com/gitlab-org/gitlab-runner/common/spec"
@@ -78,65 +76,6 @@ func TestBash_CheckForErrors(t *testing.T) {
@@ -78,65 +77,6 @@ func TestBash_CheckForErrors(t *testing.T) {
}
}
@@ -15,13 +15,13 @@ in
buildGoModule (finalAttrs: {
pname = "go-containerregistry";
version = "0.21.4";
version = "0.21.5";
src = fetchFromGitHub {
owner = "google";
repo = "go-containerregistry";
rev = "v${finalAttrs.version}";
sha256 = "sha256-TODosgMYXR1StkRC/h5rn84I2R+e0dHnGJxmCisYDNk=";
sha256 = "sha256-2cC2fZe22K8mPIXa8YI1MgUlEn6p1z7RBEQhFjYNsxA=";
};
vendorHash = null;
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "goaccess";
version = "1.9.4";
version = "1.10.2";
src = fetchFromGitHub {
owner = "allinurl";
repo = "goaccess";
tag = "v${finalAttrs.version}";
hash = "sha256-KevxuZuIrMybNlPZgVDLO0zQe4LfAKxfVBbHnyTUC/o=";
hash = "sha256-n0+Z3kkjMCjPN0Cb0R1QGSzzXH3S9kjDchy9ay6109s=";
};
nativeBuildInputs = [ autoreconfHook ];
+16 -9
View File
@@ -3,27 +3,28 @@
buildGoLatestModule,
fetchFromGitHub,
replaceVars,
versionCheckHook,
}:
buildGoLatestModule rec {
buildGoLatestModule (finalAttrs: {
pname = "govulncheck";
version = "1.1.4";
version = "1.2.0";
src = fetchFromGitHub {
owner = "golang";
repo = "vuln";
tag = "v${version}";
hash = "sha256-d1JWh/K+65p0TP5vAQbSyoatjN4L5nm3VEA+qBSrkAA=";
tag = "v${finalAttrs.version}";
hash = "sha256-15DTxzlK7mkUt7KCwsV5+E5dPopCwFylI0fmVB0LDEo=";
};
patches = [
# patch in version information
(replaceVars ./version.patch {
inherit version;
inherit (finalAttrs) version;
})
];
vendorHash = "sha256-MSTKDeWVxD2Fa6fNoku4EwFwC90XZ5acnM67crcgXDg=";
vendorHash = "sha256-+hJtGG9GGDb3D9Cgm7hreySjOlXXsc7HxHcoS2Cxfbs=";
subPackages = [
"cmd/govulncheck"
@@ -37,10 +38,16 @@ buildGoLatestModule rec {
"-w"
];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
meta = {
homepage = "https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck";
downloadPage = "https://github.com/golang/vuln";
changelog = "https://github.com/golang/vuln/releases/tag/v${version}";
changelog = "https://github.com/golang/vuln/releases/tag/${finalAttrs.src.tag}";
description = "Database client and tools for the Go vulnerability database, also known as vuln";
mainProgram = "govulncheck";
longDescription = ''
@@ -64,10 +71,10 @@ buildGoLatestModule rec {
example, a dependency with a Windows-specific vulnerability will not be
reported for a Linux build.
'';
license = with lib.licenses; [ bsd3 ];
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
jk
SuperSandro2000
];
};
}
})
+2 -2
View File
@@ -26,13 +26,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gvm-libs";
version = "22.40.0";
version = "22.41.0";
src = fetchFromGitHub {
owner = "greenbone";
repo = "gvm-libs";
tag = "v${finalAttrs.version}";
hash = "sha256-oAU4yZeVw1rkOhce2bxulfzXux5e0EBh1hKApF7GOHo=";
hash = "sha256-6GYy+51Nw1zlppsMIYv4cH/yEMhxJ1lsLPgpsC4YRG4=";
};
postPatch = ''
+6 -6
View File
@@ -10,7 +10,7 @@
libjpeg_turbo,
libuv,
libvorbis,
mbedtls_2,
mbedtls,
openal,
pcre,
SDL2,
@@ -28,12 +28,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-nVr+fDdna8EEHvIiXsccWFRTYzXfb4GG1zrfL+O6zLA=";
};
# incompatible pointer type error: const char ** -> const void **
# backport of https://github.com/HaxeFoundation/hashlink/pull/767
postPatch = ''
substituteInPlace libs/sqlite/sqlite.c \
substituteInPlace CMakeLists.txt \
--replace-warn \
"sqlite3_prepare16_v2(db->db, sql, -1, &r->r, &tl)" \
"sqlite3_prepare16_v2(db->db, sql, -1, &r->r, (const void**)&tl)"
"cmake_minimum_required(VERSION 3.1)" \
"cmake_minimum_required(VERSION 3.13)"
'';
buildInputs = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
libpng
libuv
libvorbis
mbedtls_2
mbedtls
openal
pcre
SDL2
+4 -4
View File
@@ -8,22 +8,22 @@
let
pname = "hoppscotch";
version = "26.3.0-0";
version = "26.3.1-0";
src =
fetchurl
{
aarch64-darwin = {
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg";
hash = "sha256-nfXk6N4cVp9NCE/kKZsVeEIQ+zYssw8XlBQgcKMHJ2A=";
hash = "sha256-9Ahc/Gi4MRgloWND82lZQhWG2oR85Fytsz2BYi+fVpc=";
};
x86_64-darwin = {
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg";
hash = "sha256-emnwjmBPL/eKAVPmgnpDK/N9hiwTenCCa123fJfXLE4=";
hash = "sha256-YXvLzdm493xAvCRuRg0WwBTJ4VXKO50wzr2TfWN3J84=";
};
x86_64-linux = {
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage";
hash = "sha256-V7CI0j1C3UZuhyY6KeL1CAILfpc8N0cJxyI4M5lnRPg=";
hash = "sha256-6dFCCYkof0N4AqWZko741LN6NW2K4F5gpwzzK4U5QCM=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+2 -2
View File
@@ -88,13 +88,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.2-18";
version = "7.1.2-19";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
tag = finalAttrs.version;
hash = "sha256-bt8PlCeEWaRsdMe/FP4HSgmzi1OATjH2Kx233OgleyI=";
hash = "sha256-4uASM+GRTe0ES6FdshUMMkVof4IlLV+CMm2l+v5qZN0=";
};
outputs = [
+2 -2
View File
@@ -115,13 +115,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "immich";
version = "2.7.4";
version = "2.7.5";
src = fetchFromGitHub {
owner = "immich-app";
repo = "immich";
tag = "v${finalAttrs.version}";
hash = "sha256-cN5MM8lk2UY2gCG4RMryJc4SwbJNYm8IbTcqEmdaNF4=";
hash = "sha256-EC1IXM7KObAWfwG5KEao5VDp79d8WGNEI7E89lLOJ44=";
};
pnpmDeps = fetchPnpmDeps {
@@ -0,0 +1,15 @@
diff --git a/pkg/runner/internal/test_deps.go b/pkg/runner/internal/test_deps.go
index f7728f3..90dbca5 100644
--- a/pkg/runner/internal/test_deps.go
+++ b/pkg/runner/internal/test_deps.go
@@ -41,6 +41,10 @@ func (*TestDeps) ImportPath() string {
return ""
}
+func (*TestDeps) ModulePath() string {
+ return ""
+}
+
func (*TestDeps) StartTestLog(w io.Writer) {}
func (*TestDeps) StopTestLog() error {
+4 -3
View File
@@ -2,7 +2,6 @@
buildGoModule,
fetchFromGitHub,
installShellFiles,
kyverno-chainsaw,
lib,
nix-update-script,
stdenv,
@@ -16,10 +15,12 @@ buildGoModule (finalAttrs: {
src = fetchFromGitHub {
owner = "kyverno";
repo = "chainsaw";
rev = "v${finalAttrs.version}";
tag = "v${finalAttrs.version}";
hash = "sha256-wHwjcpcum3ByBGYUxJ38Qi0RliQUmAIBYmE7t3gEonI=";
};
patches = [ ./go-1.26-testdeps-modulepath.patch ];
vendorHash = "sha256-lG+odKD1TGQ7GTh/y9ogREtY59T8fvN/6FyKsdgsU0M=";
subPackages = [ "." ];
@@ -42,7 +43,7 @@ buildGoModule (finalAttrs: {
'';
passthru.tests.version = testers.testVersion {
package = kyverno-chainsaw;
package = finalAttrs.finalPackage;
command = "chainsaw version";
version = "v${finalAttrs.version}";
};
+52 -52
View File
@@ -167,7 +167,7 @@
},
{
"name": "illuminate/collections",
"version": "v13.3.0",
"version": "v13.4.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/collections.git",
@@ -226,7 +226,7 @@
},
{
"name": "illuminate/conditionable",
"version": "v13.3.0",
"version": "v13.4.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/conditionable.git",
@@ -272,7 +272,7 @@
},
{
"name": "illuminate/contracts",
"version": "v13.3.0",
"version": "v13.4.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
@@ -320,16 +320,16 @@
},
{
"name": "illuminate/filesystem",
"version": "v13.3.0",
"version": "v13.4.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/filesystem.git",
"reference": "fabba6165de958c169eed909a3ec6a6574b33f6b"
"reference": "fb24eafcac8b560ab6aed11acade6b828f06c577"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/fabba6165de958c169eed909a3ec6a6574b33f6b",
"reference": "fabba6165de958c169eed909a3ec6a6574b33f6b",
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/fb24eafcac8b560ab6aed11acade6b828f06c577",
"reference": "fb24eafcac8b560ab6aed11acade6b828f06c577",
"shasum": ""
},
"require": {
@@ -383,11 +383,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2026-03-21T01:00:51+00:00"
"time": "2026-04-01T15:20:15+00:00"
},
{
"name": "illuminate/macroable",
"version": "v13.3.0",
"version": "v13.4.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/macroable.git",
@@ -433,7 +433,7 @@
},
{
"name": "illuminate/reflection",
"version": "v13.3.0",
"version": "v13.4.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/reflection.git",
@@ -484,16 +484,16 @@
},
{
"name": "illuminate/support",
"version": "v13.3.0",
"version": "v13.4.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "f31e168e236a90d96d7894cd1f107b1ba095de69"
"reference": "e7ce0496cae80c3e1aa72e37f09335a6454846dc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/f31e168e236a90d96d7894cd1f107b1ba095de69",
"reference": "f31e168e236a90d96d7894cd1f107b1ba095de69",
"url": "https://api.github.com/repos/illuminate/support/zipball/e7ce0496cae80c3e1aa72e37f09335a6454846dc",
"reference": "e7ce0496cae80c3e1aa72e37f09335a6454846dc",
"shasum": ""
},
"require": {
@@ -559,7 +559,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2026-03-30T13:32:27+00:00"
"time": "2026-04-07T13:34:38+00:00"
},
{
"name": "laravel/prompts",
@@ -622,16 +622,16 @@
},
{
"name": "nesbot/carbon",
"version": "3.11.3",
"version": "3.11.4",
"source": {
"type": "git",
"url": "https://github.com/CarbonPHP/carbon.git",
"reference": "6a7e652845bb018c668220c2a545aded8594fbbf"
"reference": "e890471a3494740f7d9326d72ce6a8c559ffee60"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/6a7e652845bb018c668220c2a545aded8594fbbf",
"reference": "6a7e652845bb018c668220c2a545aded8594fbbf",
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/e890471a3494740f7d9326d72ce6a8c559ffee60",
"reference": "e890471a3494740f7d9326d72ce6a8c559ffee60",
"shasum": ""
},
"require": {
@@ -723,7 +723,7 @@
"type": "tidelift"
}
],
"time": "2026-03-11T17:23:39+00:00"
"time": "2026-04-07T09:57:54+00:00"
},
{
"name": "psr/clock",
@@ -1189,16 +1189,16 @@
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.33.0",
"version": "v1.34.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
"reference": "141046a8f9477948ff284fa65be2095baafb94f2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
"reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/141046a8f9477948ff284fa65be2095baafb94f2",
"reference": "141046a8f9477948ff284fa65be2095baafb94f2",
"shasum": ""
},
"require": {
@@ -1248,7 +1248,7 @@
"portable"
],
"support": {
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.34.0"
},
"funding": [
{
@@ -1268,20 +1268,20 @@
"type": "tidelift"
}
],
"time": "2024-09-09T11:45:10+00:00"
"time": "2026-04-10T16:19:22+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
"version": "v1.33.0",
"version": "v1.34.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
"reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
"reference": "ad1b7b9092976d6c948b8a187cec9faaea9ec1df"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
"reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/ad1b7b9092976d6c948b8a187cec9faaea9ec1df",
"reference": "ad1b7b9092976d6c948b8a187cec9faaea9ec1df",
"shasum": ""
},
"require": {
@@ -1330,7 +1330,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.34.0"
},
"funding": [
{
@@ -1350,11 +1350,11 @@
"type": "tidelift"
}
],
"time": "2025-06-27T09:58:17+00:00"
"time": "2026-04-10T16:19:22+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
"version": "v1.33.0",
"version": "v1.34.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -1415,7 +1415,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.34.0"
},
"funding": [
{
@@ -1439,16 +1439,16 @@
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.33.0",
"version": "v1.34.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
"reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
"reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6a21eb99c6973357967f6ce3708cd55a6bec6315",
"reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315",
"shasum": ""
},
"require": {
@@ -1500,7 +1500,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.34.0"
},
"funding": [
{
@@ -1520,20 +1520,20 @@
"type": "tidelift"
}
],
"time": "2024-12-23T08:48:59+00:00"
"time": "2026-04-10T17:25:58+00:00"
},
{
"name": "symfony/polyfill-php84",
"version": "v1.33.0",
"version": "v1.34.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php84.git",
"reference": "d8ced4d875142b6a7426000426b8abc631d6b191"
"reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191",
"reference": "d8ced4d875142b6a7426000426b8abc631d6b191",
"url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/88486db2c389b290bf87ff1de7ebc1e13e42bb06",
"reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06",
"shasum": ""
},
"require": {
@@ -1580,7 +1580,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0"
"source": "https://github.com/symfony/polyfill-php84/tree/v1.34.0"
},
"funding": [
{
@@ -1600,20 +1600,20 @@
"type": "tidelift"
}
],
"time": "2025-06-24T13:30:11+00:00"
"time": "2026-04-10T18:47:49+00:00"
},
{
"name": "symfony/polyfill-php85",
"version": "v1.33.0",
"version": "v1.34.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php85.git",
"reference": "d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91"
"reference": "2c408a6bb0313e6001a83628dc5506100474254e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91",
"reference": "d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91",
"url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/2c408a6bb0313e6001a83628dc5506100474254e",
"reference": "2c408a6bb0313e6001a83628dc5506100474254e",
"shasum": ""
},
"require": {
@@ -1660,7 +1660,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php85/tree/v1.33.0"
"source": "https://github.com/symfony/polyfill-php85/tree/v1.34.0"
},
"funding": [
{
@@ -1680,7 +1680,7 @@
"type": "tidelift"
}
],
"time": "2025-06-23T16:12:55+00:00"
"time": "2026-04-10T16:50:15+00:00"
},
{
"name": "symfony/process",
+3 -3
View File
@@ -7,19 +7,19 @@
}:
php.buildComposerProject2 (finalAttrs: {
pname = "laravel";
version = "5.25.2";
version = "5.25.3";
src = fetchFromGitHub {
owner = "laravel";
repo = "installer";
tag = "v${finalAttrs.version}";
hash = "sha256-tQBJ156KYcCVwf+xNzCL+4rh/ru1imTiD4Uu8vD16sw=";
hash = "sha256-WpBpKCXvfcMXb7Zxvz7fdxVMaaseH0kxr+Fh/vYVb+Y=";
};
nativeBuildInputs = [ makeWrapper ];
composerLock = ./composer.lock;
vendorHash = "sha256-nasF4IHxGvOQHVJ6S6+a8DA5iSvDvyH3Oxw8Zw4MdAY=";
vendorHash = "sha256-zm2Xh15l/i7jDL3OasIqLUAWOLM71sQvA4LuszDP4EY=";
# Adding npm (nodejs) and php composer to path
postInstall = ''
+3 -3
View File
@@ -16,16 +16,16 @@ let
in
stdenv.mkDerivation {
pname = "libraop";
version = "0-unstable-2026-02-09";
version = "0-unstable-2026-02-20";
src = fetchFromGitHub {
owner = "music-assistant";
repo = "libraop";
# we try to closely match the commit used in the last music-assistant release from
# https://github.com/music-assistant/server/tree/stable/music_assistant/providers/airplay/bin
rev = "f49284282ea4ea740d07fabc230b4182f8c69a74";
rev = "df3c055674c147eeaa9307b7d554b9d46ed6418a";
fetchSubmodules = true;
hash = "sha256-m1ll5vRZx4d/5IWCG24yY/SWEIIz2k/iU84vQKHlCdo=";
hash = "sha256-zD1DggBQjbiD7B/u0hmogXj8NhrzYgVXMyzvHkaM4Hg=";
};
patches = [
+8 -13
View File
@@ -11,13 +11,10 @@
ipmitool,
libvirt,
monitoring-plugins,
mtr,
net-snmp,
nfdump,
nmap,
rrdtool,
system-sendmail,
whois,
dataDir ? "/var/lib/librenms",
logDir ? "/var/log/librenms",
}:
@@ -27,16 +24,16 @@ let
in
phpPackage.buildComposerProject2 rec {
pname = "librenms";
version = "26.2.0";
version = "26.3.1";
src = fetchFromGitHub {
owner = "librenms";
repo = "librenms";
tag = version;
hash = "sha256-cFFAUgUq+AxOdmHI92WYY6h9jSubXRUL4Jp8q+mDdHg=";
hash = "sha256-wLmZHE7W1ulBvUBpwVatdR8etFVhdG/zpggUpNIb65s=";
};
vendorHash = "sha256-73E3fH1JUHxjphF6aPrmNJu3P1DZd28blmBxSiyuCTc=";
vendorHash = "sha256-uJ7DBJGQ4D1UnZXSUnrO3Fy3xEFz6ZxcMQ12E2jKKSM=";
php = phpPackage;
@@ -45,14 +42,11 @@ phpPackage.buildComposerProject2 rec {
ipmitool
libvirt
monitoring-plugins
mtr
net-snmp
nfdump
nmap
rrdtool
system-sendmail
unixtools.whereis
whois
(python3.withPackages (
ps: with ps; [
pymysql
@@ -78,25 +72,26 @@ phpPackage.buildComposerProject2 rec {
substituteInPlace \
$out/resources/definitions/config_definitions.json \
--replace-fail '"default": "/bin/ping",' '"default": "/run/wrappers/bin/ping",' \
--replace-fail '"default": "fping",' '"default": "/run/wrappers/bin/fping",' \
--replace-fail '"default": "fping6",' '"default": "/run/wrappers/bin/fping6",' \
--replace-fail '"default": "rrdtool",' '"default": "${rrdtool}/bin/rrdtool",' \
--replace-fail '"default": "snmpgetnext",' '"default": "${net-snmp}/bin/snmpgetnext",' \
--replace-fail '"default": "traceroute",' '"default": "/run/wrappers/bin/traceroute",' \
--replace-fail '"default": "/usr/bin/ipmitool",' '"default": "${ipmitool}/bin/ipmitool",' \
--replace-fail '"default": "/usr/bin/mtr",' '"default": "${mtr}/bin/mtr",' \
--replace-fail '"default": "/usr/bin/nfdump",' '"default": "${nfdump}/bin/nfdump",' \
--replace-fail '"default": "/usr/bin/nmap",' '"default": "${nmap}/bin/nmap",' \
--replace-fail '"default": "/usr/bin/snmpbulkwalk",' '"default": "${net-snmp}/bin/snmpbulkwalk",' \
--replace-fail '"default": "/usr/bin/snmpget",' '"default": "${net-snmp}/bin/snmpget",' \
--replace-fail '"default": "/usr/bin/snmptranslate",' '"default": "${net-snmp}/bin/snmptranslate",' \
--replace-fail '"default": "/usr/bin/snmpwalk",' '"default": "${net-snmp}/bin/snmpwalk",' \
--replace-fail '"default": "/usr/bin/virsh",' '"default": "${libvirt}/bin/virsh",' \
--replace-fail '"default": "/usr/bin/whois",' '"default": "${whois}/bin/whois",' \
--replace-fail '"default": "/usr/lib/nagios/plugins",' '"default": "${monitoring-plugins}/bin",' \
--replace-fail '"default": "/usr/sbin/sendmail",' '"default": "${system-sendmail}/bin/sendmail",'
if grep -q /usr/bin $out/resources/definitions/config_definitions.json; then
echo "Please patch the extra /usr/bin paths found above!"
exit 1
fi
substituteInPlace $out/LibreNMS/wrapper.py --replace-fail '/usr/bin/env php' '${phpPackage}/bin/php'
substituteInPlace $out/LibreNMS/__init__.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"'
substituteInPlace $out/snmp-scan.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"'
@@ -0,0 +1,70 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchurl,
cmake,
pkg-config,
cimg,
libjpeg,
libpng,
nlohmann_json,
}:
let
excludelist = fetchurl {
url = "https://raw.githubusercontent.com/probonopd/AppImages/15a64c20dc23a0154622ba25829364323903b6b5/excludelist";
sha256 = "sha256-UNsPiU80sWnEely8DBfbq2Hp7evKW8gmmh5qwb9L2tk=";
};
in
stdenv.mkDerivation {
pname = "linuxdeploy-plugin-qt";
version = "0-unstable-2026-03-07";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "linuxdeploy";
repo = "linuxdeploy-plugin-qt";
rev = "511d51d066f632dfdfbcf0bf7284ec38090812d2";
hash = "sha256-q/LL7XVtqCGyMxSFtHK7LinKF/TetYRtAfMpxZzPs6M=";
fetchSubmodules = true;
};
patches = [
# Deploy wayland-graphics-integration-client alongside wayland platform plugin
# Without this, wayland EGL rendering fails
# https://github.com/linuxdeploy/linuxdeploy-plugin-qt/issues/160
./wayland-fix.patch
];
postPatch = ''
substituteInPlace lib/linuxdeploy/src/core/generate-excludelist.sh \
--replace-fail "wget --quiet \"\$url\" -O - " "cat ${excludelist}"
'';
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
cimg
libjpeg
libpng
nlohmann_json
];
cmakeFlags = [
"-DBUILD_TESTING=OFF"
];
meta = {
description = "Qt plugin for linuxdeploy to bundle Qt applications into AppImage format";
homepage = "https://github.com/linuxdeploy/linuxdeploy-plugin-qt";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ BatteredBunny ];
mainProgram = "linuxdeploy-plugin-qt";
platforms = lib.platforms.linux;
};
}
@@ -0,0 +1,11 @@
--- a/src/deployers/PlatformPluginsDeployer.cpp
+++ b/src/deployers/PlatformPluginsDeployer.cpp
@@ -30,7 +30,7 @@ bool PlatformPluginsDeployer::doDeploy() {
using namespace linuxdeploy::util::misc;
if (stringStartsWith(platformToDeploy, "libqwayland")) {
- if (!deployStandardQtPlugins({"wayland-decoration-client", "wayland-shell-integration"})) {
+ if (!deployStandardQtPlugins({"wayland-decoration-client", "wayland-graphics-integration-client", "wayland-shell-integration"})) {
return false;
}
}
+57
View File
@@ -0,0 +1,57 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchurl,
cmake,
pkg-config,
cimg,
libjpeg,
libpng,
}:
let
excludelist = fetchurl {
url = "https://raw.githubusercontent.com/probonopd/AppImages/15a64c20dc23a0154622ba25829364323903b6b5/excludelist";
sha256 = "sha256-UNsPiU80sWnEely8DBfbq2Hp7evKW8gmmh5qwb9L2tk=";
};
in
stdenv.mkDerivation {
pname = "linuxdeploy";
version = "0-unstable-2026-04-12";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "linuxdeploy";
repo = "linuxdeploy";
rev = "8dccfe12c273bb598937fcea6da46c0d29d84452";
hash = "sha256-gP9yZwrgpRZ4BBYvSnC306iWaV+1cOVxdpxlEBE7aHE=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace src/core/generate-excludelist.sh \
--replace-fail "wget --quiet \"\$url\" -O - " "cat ${excludelist}"
'';
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
cimg
libjpeg
libpng
];
meta = {
description = "Tool to bundle Linux applications into AppImage format";
homepage = "https://github.com/linuxdeploy/linuxdeploy";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ BatteredBunny ];
mainProgram = "linuxdeploy";
platforms = lib.platforms.linux;
};
}
@@ -18,11 +18,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "logisim-evolution";
version = "4.0.0";
version = "4.1.0";
src = fetchurl {
url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${finalAttrs.version}/logisim-evolution-${finalAttrs.version}-all.jar";
hash = "sha256-aZ+VekHVLAtPy8KJmhWpGC6RwZBui31lNCCABDhxYfQ=";
hash = "sha256-/mOGoyF6WRvMMRpO2knh9Do4m0md09D29A80T8hfJXc=";
};
dontUnpack = true;

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