Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -23,11 +23,16 @@ let
|
||||
allowSubstitutes = false;
|
||||
buildInputs = [
|
||||
cfg.package
|
||||
pkgs.gtk2
|
||||
];
|
||||
|
||||
disallowedReferences = [
|
||||
(lib.getDev pkgs.gtk2)
|
||||
];
|
||||
}
|
||||
''
|
||||
mkdir -p $out/etc/gtk-2.0/
|
||||
GTK_PATH=${cfg.package}/lib/gtk-2.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk2.dev "gtk-query-immodules-2.0"} > $out/etc/gtk-2.0/immodules.cache
|
||||
GTK_PATH=${cfg.package}/lib/gtk-2.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} gtk-query-immodules-2.0 > $out/etc/gtk-2.0/immodules.cache
|
||||
'';
|
||||
|
||||
gtk3_cache =
|
||||
@@ -37,11 +42,16 @@ let
|
||||
allowSubstitutes = false;
|
||||
buildInputs = [
|
||||
cfg.package
|
||||
pkgs.gtk3
|
||||
];
|
||||
|
||||
disallowedReferences = [
|
||||
(lib.getDev pkgs.gtk3)
|
||||
];
|
||||
}
|
||||
''
|
||||
mkdir -p $out/etc/gtk-3.0/
|
||||
GTK_PATH=${cfg.package}/lib/gtk-3.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk3.dev "gtk-query-immodules-3.0"} > $out/etc/gtk-3.0/immodules.cache
|
||||
GTK_PATH=${cfg.package}/lib/gtk-3.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} gtk-query-immodules-3.0 > $out/etc/gtk-3.0/immodules.cache
|
||||
'';
|
||||
|
||||
in
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
position = "start-of-file";
|
||||
}
|
||||
];
|
||||
vendorHash = "sha256-66WNU+t/frHfbxexYdiXzgXKLxPyLnN6JuKnlG/kSQY=";
|
||||
vendorHash = "sha256-cvgq/Djlxjiu0C5QjaxrlEeG7O2mB6mGAwV7/reYlpY=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -2042,6 +2042,20 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
blink-lib = buildVimPlugin {
|
||||
pname = "blink.lib";
|
||||
version = "0-unstable-2026-06-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "saghen";
|
||||
repo = "blink.lib";
|
||||
rev = "5876dd95deeb70aadbe9f1c0b7117a135061cdac";
|
||||
hash = "sha256-FsDcgBiD3fl0EO1advAoQBbA2HY1p8Ja7lwhmpB++Zc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/saghen/blink.lib/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
blink-nerdfont-nvim = buildVimPlugin {
|
||||
pname = "blink-nerdfont.nvim";
|
||||
version = "0-unstable-2025-12-14";
|
||||
|
||||
@@ -3,25 +3,26 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
vimPlugins,
|
||||
vimUtils,
|
||||
stdenv,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Saghen";
|
||||
repo = "blink.pairs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-PTbj6jlXNRUOmwFSplvRDDiyyGqkBzUKtuBrvZm9kzM=";
|
||||
hash = "sha256-XWrsZAH0tIPyRjr3PnAS2QAGE3+1z00jdnsxkKG0qPE=";
|
||||
};
|
||||
|
||||
blink-pairs-lib = rustPlatform.buildRustPackage {
|
||||
pname = "blink-pairs";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-Cn9zRsQkBwaKbBD/JEpFMBOF6CBZTDx7fQa6Aoic4YU=";
|
||||
cargoHash = "sha256-XLlluprxhVueHhkIufJa7fJXvFxpJJzh89+yL9PZ4GI=";
|
||||
|
||||
env = {
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
@@ -42,13 +43,15 @@ vimUtils.buildVimPlugin {
|
||||
pname = "blink.pairs";
|
||||
inherit version src;
|
||||
|
||||
dependencies = [ vimPlugins.blink-lib ];
|
||||
|
||||
preInstall =
|
||||
let
|
||||
ext = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in
|
||||
''
|
||||
mkdir -p target/release
|
||||
ln -s ${blink-pairs-lib}/lib/libblink_pairs${ext} target/release/
|
||||
mkdir -p lib
|
||||
ln -s ${blink-pairs-lib}/lib/libblink_pairs_parser${ext} lib/
|
||||
'';
|
||||
|
||||
nvimSkipModules = [
|
||||
@@ -71,6 +74,9 @@ vimUtils.buildVimPlugin {
|
||||
homepage = "https://github.com/Saghen/blink.pairs";
|
||||
changelog = "https://github.com/Saghen/blink.pairs/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ isabelroses ];
|
||||
maintainers = with lib.maintainers; [
|
||||
isabelroses
|
||||
saadndm
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -146,6 +146,7 @@ https://github.com/MahanRahmati/blink-nerdfont.nvim/,,
|
||||
https://github.com/mikavilpas/blink-ripgrep.nvim/,,
|
||||
https://github.com/Saghen/blink.compat/,,
|
||||
https://github.com/Saghen/blink.indent/,,
|
||||
https://github.com/saghen/blink.lib/,,
|
||||
https://github.com/dundalek/bloat.nvim/,,
|
||||
https://github.com/HampusHauffman/block.nvim/,,
|
||||
https://github.com/uloco/bluloco.nvim/,,
|
||||
|
||||
@@ -4852,8 +4852,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "emacs-mcx";
|
||||
publisher = "tuttieee";
|
||||
version = "0.110.11";
|
||||
hash = "sha256-LiiZI0Ze5F5w7OtiqY7wMpzdtyof/ynUH57wRfQnxFs=";
|
||||
version = "0.111.0";
|
||||
hash = "sha256-3z4B1NBQD3hbGcwWpS48bXuUAN1jVlSRLF0PDKGJH3A=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
|
||||
@@ -5577,8 +5577,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-zig";
|
||||
publisher = "ziglang";
|
||||
version = "0.6.18";
|
||||
hash = "sha256-jn/2Nmz6N84BCWnRdnM8w5AdiF2hh55h39SDTmRry5I=";
|
||||
version = "0.6.19";
|
||||
hash = "sha256-kdoks0da6+uofzvN5lulkDAVihSS7xoF/Q6Fo5yzQbg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "dosbox-pure";
|
||||
version = "0-unstable-2026-07-06";
|
||||
version = "0-unstable-2026-07-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schellingb";
|
||||
repo = "dosbox-pure";
|
||||
rev = "d137f0cacff196fb44a2783ecbc6e8ddb3e57cfc";
|
||||
hash = "sha256-4KPYwvtVLrzZcn3LYqSWmP+qWFjtNsCjrVY/L93/ZOE=";
|
||||
rev = "a4a0bab7f8931433588f2fcad9045c85b277373d";
|
||||
hash = "sha256-sniDrr5kSU/OnoE08WXNmTTstfI6cHyq4I7xjtrM+7c=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "pcsx2";
|
||||
version = "0-unstable-2026-06-29";
|
||||
version = "0-unstable-2026-07-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "ps2";
|
||||
rev = "b03969a333f38de21f866c2a10da4300d170364d";
|
||||
hash = "sha256-djGM6hMQCvJQG2+PWDRLeM+13/Q8upD25uhH4vU/yko=";
|
||||
rev = "43129ad5ccbde21b022dd3b3fad1862f72a109bf";
|
||||
hash = "sha256-frS44hQeMAgNMEJ5xzmt4fUpx5om5csUsE4qe4kZBao=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -54,13 +54,13 @@
|
||||
"vendorHash": "sha256-sZeXHTrMUUPllPzvpbFjwA5FjFJXnO1k5h9B5i8U+vs="
|
||||
},
|
||||
"aminueza_minio": {
|
||||
"hash": "sha256-4b5K2Hyy26euJct1/0dxC39DMM41W6+jdJS68/d4yCw=",
|
||||
"hash": "sha256-lSjpFr0qBhCvwE1+DgaGPQe9gsgVNPh+go801BhedfY=",
|
||||
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
|
||||
"owner": "aminueza",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v3.38.3",
|
||||
"rev": "v3.38.5",
|
||||
"spdx": "AGPL-3.0",
|
||||
"vendorHash": "sha256-se32x/vxIRiAewIIUZb/wR9eB6sDpDzN3n7OS5m8t5g="
|
||||
"vendorHash": "sha256-gSGsjK6JOBN5NdV7tpTXU7UMze9t7UHMDe/W7suFNU0="
|
||||
},
|
||||
"argoproj-labs_argocd": {
|
||||
"hash": "sha256-c6+WY4oXL8evvPk/RzVrwtgq4XLB/LzAH5tpjErbE60=",
|
||||
@@ -364,22 +364,22 @@
|
||||
"vendorHash": "sha256-B8mYLd4VdADWoQLWiCM85VQrBfDdlYQ0wkCp9eUBQ4U="
|
||||
},
|
||||
"drfaust92_bitbucket": {
|
||||
"hash": "sha256-TPRHLR1wqX2uxV51iSk7IveqNQ1lLEy51G0fnfAM0No=",
|
||||
"hash": "sha256-m5Ya99ulMesUwl54sbHuvOYumbPcAhWMESVGbXIOJpE=",
|
||||
"homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket",
|
||||
"owner": "DrFaust92",
|
||||
"repo": "terraform-provider-bitbucket",
|
||||
"rev": "v2.51.0",
|
||||
"rev": "v2.52.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-RtS88NqkO1nG/8znM0sQqsAIfDc+sOMy8N4T4hmvaVA="
|
||||
"vendorHash": "sha256-uokHd4hDvWl6mrBa062F/uZmYPnW3TIZZKZwKBVq+Lo="
|
||||
},
|
||||
"e-breuninger_netbox": {
|
||||
"hash": "sha256-rCDopABF6BDJo4sdwfy+GrU9EPAIldjddj+j7opf8FA=",
|
||||
"hash": "sha256-qyzw5a35twJ5gsEe0ANv6a9MMD0UyV8hYbYt/2bBJ/k=",
|
||||
"homepage": "https://registry.terraform.io/providers/e-breuninger/netbox",
|
||||
"owner": "e-breuninger",
|
||||
"repo": "terraform-provider-netbox",
|
||||
"rev": "v5.6.2",
|
||||
"rev": "v5.7.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WaeRXTqXakFTYMHio+VLIKS4kS5wHQdY5zdJYwrlVjE="
|
||||
"vendorHash": "sha256-y9GRTuoh1X6GfGkGZbPpO500y8DoJS1dnwZL3BCTUcY="
|
||||
},
|
||||
"equinix_equinix": {
|
||||
"hash": "sha256-Tn8CnLx2ibkj7qlzpYCX7Cm+yoTcZujVELMJSbG+/ec=",
|
||||
@@ -508,13 +508,13 @@
|
||||
"vendorHash": "sha256-ikBqIxD5aTOcwNHCMN6EaOwSHCAP5n/SULuqQXPLpOc="
|
||||
},
|
||||
"hashicorp_aws": {
|
||||
"hash": "sha256-876U9ojKfnJCRKaTFhW9NvBQ6fvTpC0NYE+fhwkCwk8=",
|
||||
"hash": "sha256-ZeFC9ebkt7SWFOCpt6zD60wOTRB8tiV6SQYr/O38FRw=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v6.54.0",
|
||||
"rev": "v6.55.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-lxxSwaBXrl2xrZJ+OHrCBvHKmsq3D9Om7/Y0zPaYIQg="
|
||||
"vendorHash": "sha256-/6esBCIsNXUmx38NXUk/d3Td4uSgwZXvkETQhaERwLQ="
|
||||
},
|
||||
"hashicorp_awscc": {
|
||||
"hash": "sha256-SziDO4K6qv62zolBKdrhXIyaEOMM5hJ0h6ros1wC2l0=",
|
||||
@@ -715,13 +715,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"hetznercloud_hcloud": {
|
||||
"hash": "sha256-Clbg0LS5SYpaEyevbZ+oDG3xFXEWjV376JvStPi3MnU=",
|
||||
"hash": "sha256-pfcgLftuPwbVsKVPAE0iF9p59eK12dtLjwPY2YMy4KE=",
|
||||
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
|
||||
"owner": "hetznercloud",
|
||||
"repo": "terraform-provider-hcloud",
|
||||
"rev": "v1.66.0",
|
||||
"rev": "v1.66.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-6knIcS3hkzt3R1IC1hA6EKOceJl51/pJXpftEaZjgtY="
|
||||
"vendorHash": "sha256-Hh9sMVRVVoUEsu6nqdHhmPO2q4xPfyb0VNbhDvyPdRg="
|
||||
},
|
||||
"huaweicloud_huaweicloud": {
|
||||
"hash": "sha256-1WVZ5NOvVFuRIWJQpFy9lRvlt5GbOHINFISABexcb/M=",
|
||||
|
||||
@@ -27,6 +27,12 @@ rec {
|
||||
hash = "sha256-VUT86kF0ZHLGK457ZrrIBMeiZqg/rPRpbkBA/ua9rU8=";
|
||||
}
|
||||
)
|
||||
# remove usage of deprecated pkg_resources
|
||||
# remove on next release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/ab244d9c483b23f53e2548b73236d7fe4b94cb3f.patch";
|
||||
hash = "sha256-Wd6OK0BdyTcjLy1NhkLp9N2oOcQWB6geEPOlYDTBsHw=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ananicy-rules-cachyos";
|
||||
version = "0-unstable-2026-07-11";
|
||||
version = "0-unstable-2026-07-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "c59d59711268395b324fa5d4af149f2f94f17b4f";
|
||||
hash = "sha256-+hDuzZtsKkoP5mD0VmzO/mXNjP0RPLz+hzK2XFUBvpc=";
|
||||
rev = "e2db7f7db42e1a47fd8317bb861dea6d5d38ca7e";
|
||||
hash = "sha256-D26Kba5fNdufL+QGiJRn0Nn8Haw+YHyhRKJa6ymEvLs=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
Don't require python3 in PATH
|
||||
|
||||
Once packaged, the arcanoid.py script has an absolute path shebang to
|
||||
python3, so there is no need to also require python3 in PATH.
|
||||
|
||||
This prevents leaking in a python3 in PATH in the environment which arc
|
||||
runs linters etc.
|
||||
|
||||
Author: bjorn.forsman@gmail.com
|
||||
diff -uNr arcanist.orig/src/workflow/ArcanistAnoidWorkflow.php arcanist.new/src/workflow/ArcanistAnoidWorkflow.php
|
||||
--- arcanist.orig/src/workflow/ArcanistAnoidWorkflow.php 2022-03-31 13:23:30.865095192 +0200
|
||||
+++ arcanist.new/src/workflow/ArcanistAnoidWorkflow.php 2022-04-01 12:19:15.644159639 +0200
|
||||
@@ -24,13 +24,6 @@
|
||||
}
|
||||
|
||||
protected function runWorkflow() {
|
||||
- if (!Filesystem::binaryExists('python3')) {
|
||||
- throw new PhutilArgumentUsageException(
|
||||
- pht(
|
||||
- 'The "arc anoid" workflow requires "python3" to be available '.
|
||||
- 'in your $PATH.'));
|
||||
- }
|
||||
-
|
||||
$support_dir = phutil_get_library_root('arcanist');
|
||||
$support_dir = dirname($support_dir);
|
||||
$support_dir = $support_dir.'/support/';
|
||||
@@ -0,0 +1,102 @@
|
||||
{
|
||||
bison,
|
||||
cacert,
|
||||
fetchFromGitHub,
|
||||
flex,
|
||||
php,
|
||||
lib,
|
||||
stdenv,
|
||||
installShellFiles,
|
||||
which,
|
||||
python3,
|
||||
}:
|
||||
|
||||
# Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being
|
||||
# invoked and complains about it being an unknown toolset. We could use `makeWrapper`, but
|
||||
# then we’d need to still craft a script that does the `php libexec/arcanist/bin/...` dance
|
||||
# anyway... So just do everything at once.
|
||||
let
|
||||
makeArcWrapper = toolset: ''
|
||||
cat << WRAPPER > $out/bin/${toolset}
|
||||
#!$shell -e
|
||||
export PATH='${php}/bin:${which}/bin'\''${PATH:+':'}\$PATH
|
||||
exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@"
|
||||
WRAPPER
|
||||
chmod +x $out/bin/${toolset}
|
||||
'';
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "arcanist";
|
||||
version = "0-unstable-2026-07-19";
|
||||
|
||||
# The phorgeit fork is the maintained continuation of the upstream
|
||||
# (archived) phacility/arcanist.
|
||||
src = fetchFromGitHub {
|
||||
owner = "phorgeit";
|
||||
repo = "arcanist";
|
||||
rev = "b084cd508f587aaa2ed6fef5e2cee163b4bdd259";
|
||||
hash = "sha256-8QxRCYF4gnuuOBO2lZm9bbfj0ApeqUobPy/MXfhH8zE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./dont-require-python3-in-path.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
# python3 stays in buildInputs so patchShebangs resolves the
|
||||
# arcanoid.py shebang; php also runs at build time (xhpast codegen).
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
flex
|
||||
installShellFiles
|
||||
php
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isAarch64 ''
|
||||
substituteInPlace support/xhpast/Makefile \
|
||||
--replace "-minline-all-stringops" ""
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make cleanall -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES
|
||||
make xhpast -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/libexec
|
||||
make install -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES
|
||||
make cleanall -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES
|
||||
cp -R . $out/libexec/arcanist
|
||||
ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt $out/libexec/arcanist/resources/ssl/default.pem
|
||||
|
||||
${makeArcWrapper "arc"}
|
||||
${makeArcWrapper "phage"}
|
||||
|
||||
$out/bin/arc shell-complete --generate --
|
||||
installShellCompletion --cmd arc --bash $out/libexec/arcanist/support/shell/rules/bash-rules.sh
|
||||
installShellCompletion --cmd phage --bash $out/libexec/arcanist/support/shell/rules/bash-rules.sh
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/arc help diff -- > /dev/null
|
||||
$out/bin/phage help alias -- > /dev/null
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Command line interface to Phorge and Phabricator";
|
||||
homepage = "https://we.phorge.it/";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "arc";
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
alsa-lib,
|
||||
audacious-bare,
|
||||
curl,
|
||||
@@ -24,6 +25,7 @@
|
||||
libogg,
|
||||
libopenmpt,
|
||||
libpulseaudio,
|
||||
libresidfp,
|
||||
libsamplerate,
|
||||
libsidplayfp,
|
||||
libsndfile,
|
||||
@@ -54,7 +56,21 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-HfO59DOIYsEpBzUyaLYh/gXfz+zvH8lIY2yBVCn3wks=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ];
|
||||
patches = [
|
||||
./0001-Set-plugindir-to-PREFIX-lib-audacious.patch
|
||||
|
||||
# Remove when version >= 4.6
|
||||
(fetchpatch {
|
||||
name = "0001-audacious-plugins-sid-Use-new-sidplayfp-API.patch";
|
||||
url = "https://github.com/audacious-media-player/audacious-plugins/commit/42c05763a136d6523d611473ff3701e2d9e30bec.patch";
|
||||
hash = "sha256-bTC9nZFNwyo4PsGrLyDiQJDOrHTUDHUQaxEFe/wFPME=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0002-audacious-plugins-sid-Support-version-3.0-of-libsidplayfp-version.patch";
|
||||
url = "https://github.com/audacious-media-player/audacious-plugins/commit/2aaf45bd3840858e23b75d5863129a510299abd6.patch";
|
||||
hash = "sha256-FbGLd3aiKeoJXKgTMIdI/oBEx5EzcqyhL0jWhG6Fyfw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
@@ -85,6 +101,7 @@ stdenv.mkDerivation rec {
|
||||
libnotify
|
||||
libogg
|
||||
libpulseaudio
|
||||
libresidfp
|
||||
libsamplerate
|
||||
libsidplayfp
|
||||
libsndfile
|
||||
|
||||
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
baloo
|
||||
matthiasbeyer
|
||||
sshine
|
||||
];
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
installShellFiles,
|
||||
nixosTests,
|
||||
externalPlugins ? [ ],
|
||||
vendorHash ? "sha256-9LLTgIjOOMvYx4nhy+6X9bEBvqlKeTx//39q+YWXeHw=",
|
||||
vendorHash ? "sha256-K7cHC6IVawJmlCLR45SKEowXw7SfURIePHzj1LvKS84=",
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "coredns";
|
||||
version = "1.14.3";
|
||||
version = "1.14.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coredns";
|
||||
repo = "coredns";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Uk4oWsUxaGdLQzX5JywYzi7pmQHGo06uQdLeOkP4U/s";
|
||||
hash = "sha256-3BKXmrsSsDWFl6MT6c5Q8wcQiApO1vG0KeUtJLm89jU=";
|
||||
};
|
||||
|
||||
inherit vendorHash;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dblab";
|
||||
version = "0.44.1";
|
||||
version = "0.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danvergara";
|
||||
repo = "dblab";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zf/51s9RoK59XLYWHSuZEt8/KfuZtZkRAfH6UCDHH6A=";
|
||||
hash = "sha256-BxGw3vWBpPlzRtP0IRXZUJrsp0hN9yBrvNp+Mk2q7aM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-widzVKA85qslxuuO/ledG+IUvr+vw2HUiD3kVbe2D2A=";
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "dnsdiag";
|
||||
version = "2.9.3";
|
||||
version = "2.9.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "farrokhi";
|
||||
repo = "dnsdiag";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CMWjPgdYRL730AkC+PZaDAeefq9jCbO4o3RcdlIqsmU=";
|
||||
hash = "sha256-R/yv3cPohMQ+DoUj1cvm96Ts2+QFy+SQQoji+HADf8U=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "cryptography" ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "docker-credential-env";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "isometry";
|
||||
repo = "docker-credential-env";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EqSlbgGOuGQ2Y7aZ4MqUBgWK0aVI7Afi/KAxfdVu0zE=";
|
||||
hash = "sha256-KsOLY1XDJVrsm2rnDCffPqtlD2yw+arWsJaItwoOyUQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JTrFRpRjdLXKTvj7I2KYcIsFfuWLHPnjKV+3Q6b6DDs=";
|
||||
vendorHash = "sha256-Qr6T7NJaJcFD0EYuPS7mWJi0tjyut1aQ+Wbarc0tpGY=";
|
||||
|
||||
ldflags =
|
||||
let
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "doppler";
|
||||
version = "3.76.0";
|
||||
version = "3.76.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dopplerhq";
|
||||
repo = "cli";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-CmNSn4WRWMP07qC5APw8PTouCUOHJrz1ZYqpKhdiIDM=";
|
||||
hash = "sha256-8df60dWV/8ZezCAXVT7wmzCCB/TyljzAszv8sy7qRjU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u6SB3SXCqu7Y2aUoTAJ01mtDCxMofVQLAde1jDxVvks=";
|
||||
vendorHash = "sha256-rDpr4qWhMWXEhgZrmoW5tzPZif3KAv3gDtJNtXzbVq0=";
|
||||
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fdkaac";
|
||||
version = "1.0.7";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nu774";
|
||||
repo = "fdkaac";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Yx+adbWs1qmuK+geHjCj7i56URDLVrUdLbJ2gKrJ1Oo=";
|
||||
hash = "sha256-8fI3mbHPb6E5YXl4RaqU8P0ALldkOh+RKfecDX87m/s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flyway";
|
||||
version = "12.11.0";
|
||||
version = "13.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flyway/flyway/releases/download/flyway-${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-2IVSuzrtwqsvqpj7KlCQblD7j7HCK3HMOs1tkcL0ClU=";
|
||||
sha256 = "sha256-uVbvjvfEw+JqTicfB3N2a+Cxm6fJRptOJm4C8oZ15ao=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
dontBuild = true;
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
|
||||
hash = "sha256-B/QyB6ZdyjIBBOOZG1nnVcXyqbPGyf56AndELzi3IZY=";
|
||||
hash = "sha256-6nM9dJ6eoQ4ec6VfW1p6rxQ2U8CnOKe9unQ32jSnAWY=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
|
||||
hash = "sha256-IRSg7/jj8QRvVYuHiYzci/mWrQ2lW6RJy9QdZs/guFI=";
|
||||
hash = "sha256-r4drlfi1jz86w1b7LIt6pz7sW4WB7UiU49uVwxtXKdw=";
|
||||
}
|
||||
else
|
||||
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
callPackage,
|
||||
}:
|
||||
let
|
||||
version = "5.6.269";
|
||||
version = "5.6.274";
|
||||
pname = "gdevelop";
|
||||
meta = {
|
||||
description = "Graphical Game Development Studio";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "git-spice";
|
||||
version = "0.31.1";
|
||||
version = "0.31.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abhinav";
|
||||
repo = "git-spice";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XPDsjGufzShPdGQs90TCILNWeGntaZWizffqi10EUVw=";
|
||||
hash = "sha256-0f7n27oSz6a3piaXA4jj7UWgS6Vl4WzRkHh5VAF3tGo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xcU0B+ju1f/JfNVKpXkIy5SO9rd3O9Nl0FizW3kVgI0=";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gotify-cli";
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gotify";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-GwPIGWEpj5GjGV9bz3LctZctHQe+Vywoc1piNb9vAAw=";
|
||||
sha256 = "sha256-l6WiwAIxKSQnciyssY+dfEdn+GuCSrXdxxBNek4XRiA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+G0LWlPiDcYmEou4gpoIU/OAjzQ3VSHftM1ViG9lhYM=";
|
||||
vendorHash = "sha256-320MFcSPv05Zh/Lawq6ry+eemcsRpJu85LSd6TOZ8mM=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/gotify
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hacompanion";
|
||||
version = "1.0.30";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobias-kuendig";
|
||||
repo = "hacompanion";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-TC1ZnYT5WGbKP2Y2pOKaLj8Hmr3lU+LShkNV2DpcyDk=";
|
||||
hash = "sha256-WwzfRsRfDMiK7V9XH/G86+illsbQdTw+MEXNmW5MLLg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SohjueM0DwSuh7XVClYiWA/5d0V6x2vmp5aPxgmIJYY=";
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "igsc";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "igsc";
|
||||
tag = "V${finalAttrs.version}";
|
||||
hash = "sha256-GdeGGrnkxJQlg+vVQan5rJW/rxlStD4TAmWxfloX0+k=";
|
||||
hash = "sha256-NSNLiUMJBGtnfWUDIPIukyjgcI1YX9cfDDWphW8uSWs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
Generated
+216
-505
File diff suppressed because it is too large
Load Diff
@@ -1,79 +1,143 @@
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index df96f46c..f1f422f2 100644
|
||||
index 0f4d3f09..a44eec6f 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -126,42 +126,11 @@ fun isNonStable(version: String): Boolean {
|
||||
destinationDirectory.set(layout.buildDirectory)
|
||||
@@ -129,19 +129,6 @@ fun loadEnv(file: File): Map<String, String> {
|
||||
return envMap
|
||||
}
|
||||
|
||||
-val distWin by tasks.registering(Zip::class) {
|
||||
- group = "jadx"
|
||||
- description = "Build Windows bundle"
|
||||
-
|
||||
- from(distWinConfiguration)
|
||||
-
|
||||
- destinationDirectory.set(layout.buildDirectory.dir("distWin"))
|
||||
- archiveFileName.set("jadx-gui-$jadxVersion-win.zip")
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
-}
|
||||
-
|
||||
-val distWinWithJre by tasks.registering(Zip::class) {
|
||||
- description = "Build Windows with JRE bundle"
|
||||
-
|
||||
- from(distWinWithJreConfiguration)
|
||||
-
|
||||
- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre"))
|
||||
- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
-}
|
||||
-
|
||||
val dist by tasks.registering {
|
||||
group = "jadx"
|
||||
description = "Build jadx distribution zip bundles"
|
||||
|
||||
dependsOn(pack)
|
||||
-
|
||||
- val os = DefaultNativePlatform.getCurrentOperatingSystem()
|
||||
- if (os.isWindows) {
|
||||
- if (project.hasProperty("bundleJRE")) {
|
||||
- println("Build win bundle with JRE")
|
||||
- dependsOn(distWinWithJre)
|
||||
- } else {
|
||||
- dependsOn(distWin)
|
||||
- }
|
||||
-val distWinConfiguration =
|
||||
- configurations.create("distWinConfiguration") {
|
||||
- isCanBeConsumed = false
|
||||
- }
|
||||
}
|
||||
-val distWinWithJreConfiguration =
|
||||
- configurations.create("distWinWithJreConfiguration") {
|
||||
- isCanBeConsumed = false
|
||||
- }
|
||||
-dependencies {
|
||||
- distWinConfiguration(project(":jadx-gui", "distWinConfiguration"))
|
||||
- distWinWithJreConfiguration(project(":jadx-gui", "distWinWithJreConfiguration"))
|
||||
-}
|
||||
-
|
||||
val copyArtifacts =
|
||||
tasks.register<Copy>("copyArtifacts") {
|
||||
val jarCliPattern = "jadx-cli-(.*)-all.jar".toPattern()
|
||||
@@ -186,45 +173,12 @@ fun loadEnv(file: File): Map<String, String> {
|
||||
}
|
||||
}
|
||||
|
||||
val cleanBuildDir by tasks.registering(Delete::class) {
|
||||
-val distWin =
|
||||
- tasks.register<Zip>("distWin") {
|
||||
- group = "jadx"
|
||||
- description = "Build Windows bundle"
|
||||
-
|
||||
- from(distWinConfiguration)
|
||||
-
|
||||
- destinationDirectory.set(layout.buildDirectory.dir("distWin"))
|
||||
- archiveFileName.set("jadx-gui-$jadxVersion-win.zip")
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
- }
|
||||
-
|
||||
-val distWinWithJre =
|
||||
- tasks.register<Zip>("distWinWithJre") {
|
||||
- description = "Build Windows with JRE bundle"
|
||||
-
|
||||
- from(distWinWithJreConfiguration)
|
||||
-
|
||||
- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre"))
|
||||
- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
- }
|
||||
-
|
||||
val dist =
|
||||
tasks.register("dist") {
|
||||
group = "jadx"
|
||||
description = "Build jadx distribution zip bundles"
|
||||
|
||||
dependsOn(pack)
|
||||
-
|
||||
- val os = DefaultNativePlatform.getCurrentOperatingSystem()
|
||||
- if (os.isWindows) {
|
||||
- if (project.hasProperty("bundleJRE")) {
|
||||
- println("Build win bundle with JRE")
|
||||
- dependsOn(distWinWithJre)
|
||||
- } else {
|
||||
- dependsOn(distWin)
|
||||
- }
|
||||
- }
|
||||
}
|
||||
|
||||
val cleanBuildDir =
|
||||
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
|
||||
index ed67e57a..99aa9eb4 100644
|
||||
index 15f610b4..99aa9eb4 100644
|
||||
--- a/buildSrc/build.gradle.kts
|
||||
+++ b/buildSrc/build.gradle.kts
|
||||
@@ -4,8 +4,6 @@
|
||||
@@ -4,10 +4,6 @@
|
||||
|
||||
dependencies {
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10")
|
||||
-
|
||||
- implementation("org.openrewrite:plugin:6.19.1")
|
||||
- implementation("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.2.0")
|
||||
- implementation("net.ltgt.nullaway:net.ltgt.nullaway.gradle.plugin:2.3.0")
|
||||
}
|
||||
|
||||
repositories {
|
||||
diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
|
||||
index 0f60d301..5e577155 100644
|
||||
index 256dadde..7e044113 100644
|
||||
--- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts
|
||||
+++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
|
||||
@@ -3,8 +3,6 @@
|
||||
@@ -1,15 +1,8 @@
|
||||
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
|
||||
-import net.ltgt.gradle.errorprone.CheckSeverity
|
||||
-import net.ltgt.gradle.errorprone.errorprone
|
||||
-import net.ltgt.gradle.nullaway.nullaway
|
||||
|
||||
plugins {
|
||||
java
|
||||
checkstyle
|
||||
-
|
||||
- id("jadx-rewrite")
|
||||
- id("net.ltgt.errorprone")
|
||||
- id("net.ltgt.nullaway")
|
||||
}
|
||||
|
||||
val jadxVersion: String by rootProject.extra
|
||||
val jadxVersion = rootProject.extra["jadxVersion"] as String
|
||||
@@ -30,9 +23,6 @@
|
||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
||||
|
||||
testCompileOnly("org.jetbrains:annotations:26.1.0")
|
||||
-
|
||||
- errorprone("com.google.errorprone:error_prone_core:2.50.0")
|
||||
- errorprone("com.uber.nullaway:nullaway:0.13.7")
|
||||
}
|
||||
|
||||
repositories {
|
||||
@@ -77,21 +67,4 @@
|
||||
if (checkEnabled) {
|
||||
options.compilerArgs.add("-XDaddTypeAnnotationsToSymbol=true")
|
||||
}
|
||||
- options.errorprone {
|
||||
- isEnabled = checkEnabled
|
||||
- allErrorsAsWarnings = jadxBuildChecksMode == "warn"
|
||||
- excludedPaths = ".*/test/.*"
|
||||
- nullaway {
|
||||
- if (jadxBuildChecksMode == "error") {
|
||||
- error()
|
||||
- }
|
||||
- annotatedPackages.add("jadx")
|
||||
- }
|
||||
- // TODO: fix and enable all checks
|
||||
- disable("MixedMutabilityReturnType")
|
||||
- disable("EqualsGetClass")
|
||||
- disable("OperatorPrecedence")
|
||||
- disable("UnusedVariable")
|
||||
- disable("ImmutableEnumChecker")
|
||||
- }
|
||||
}
|
||||
diff --git a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
|
||||
deleted file mode 100644
|
||||
index ceca3fe5..00000000
|
||||
index c6f3e979..00000000
|
||||
--- a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
|
||||
+++ /dev/null
|
||||
@@ -1,35 +0,0 @@
|
||||
@@ -86,10 +150,10 @@ index ceca3fe5..00000000
|
||||
-}
|
||||
-
|
||||
-dependencies {
|
||||
- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.24.0")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.20.0")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.24.0")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.24.0")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.41.0")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.29.2")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.39.0")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.38.0")
|
||||
-}
|
||||
-
|
||||
-tasks {
|
||||
@@ -113,7 +177,7 @@ index ceca3fe5..00000000
|
||||
- }
|
||||
-}
|
||||
diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts
|
||||
index 2677881f..4cec0884 100644
|
||||
index fec42601..c4e20570 100644
|
||||
--- a/jadx-gui/build.gradle.kts
|
||||
+++ b/jadx-gui/build.gradle.kts
|
||||
@@ -3,7 +3,6 @@
|
||||
@@ -124,7 +188,7 @@ index 2677881f..4cec0884 100644
|
||||
id("org.beryx.runtime") version "2.0.1"
|
||||
}
|
||||
|
||||
@@ -129,36 +128,6 @@
|
||||
@@ -142,42 +141,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -145,79 +209,92 @@ index 2677881f..4cec0884 100644
|
||||
- supportUrl.set("https://github.com/skylot/jadx")
|
||||
-
|
||||
- bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%")
|
||||
- classpath.set(tasks.getByName("shadowJar").outputs.files.map { "%EXEDIR%/lib/${it.name}" }.sorted().toList())
|
||||
- classpath.set(
|
||||
- tasks
|
||||
- .getByName("shadowJar")
|
||||
- .outputs.files
|
||||
- .map { "%EXEDIR%/lib/${it.name}" }
|
||||
- .sorted()
|
||||
- .toList(),
|
||||
- )
|
||||
- println("Launch4J classpath: ${classpath.get()}")
|
||||
-
|
||||
- chdir.set("") // don't change current dir
|
||||
- libraryDir.set("") // don't add any libs
|
||||
-}
|
||||
-
|
||||
-fun escapeJVMOptions(): List<String> {
|
||||
- return application.applicationDefaultJvmArgs
|
||||
-fun escapeJVMOptions(): List<String> =
|
||||
- application.applicationDefaultJvmArgs
|
||||
- .toList()
|
||||
- .map { if (it.startsWith("-D")) "\"$it\"" else it }
|
||||
-}
|
||||
-
|
||||
runtime {
|
||||
addOptions("--strip-debug", "--compress", "zip-9", "--no-header-files", "--no-man-pages")
|
||||
addOptions("--strip-debug", "--no-header-files", "--no-man-pages")
|
||||
addModules(
|
||||
@@ -179,48 +148,6 @@ fun escapeJVMOptions(): List<String> {
|
||||
@@ -198,66 +161,6 @@ fun escapeJVMOptions(): List<String> =
|
||||
}
|
||||
}
|
||||
|
||||
-val copyDistWin by tasks.registering(Copy::class) {
|
||||
- description = "Copy files for Windows bundle"
|
||||
-val copyDistWin =
|
||||
- tasks.register<Copy>("copyDistWin") {
|
||||
- description = "Copy files for Windows bundle"
|
||||
-
|
||||
- val libTask = tasks.getByName("shadowJar")
|
||||
- dependsOn(libTask)
|
||||
- from(libTask.outputs) {
|
||||
- include("*.jar")
|
||||
- into("lib")
|
||||
- val libTask = tasks.getByName("shadowJar")
|
||||
- dependsOn(libTask)
|
||||
- from(libTask.outputs) {
|
||||
- include("*.jar")
|
||||
- into("lib")
|
||||
- }
|
||||
- val exeTask = tasks.getByName("createExe")
|
||||
- dependsOn(exeTask)
|
||||
- from(exeTask.outputs) {
|
||||
- include("*.exe")
|
||||
- }
|
||||
- into(layout.buildDirectory.dir("jadx-gui-win"))
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
- }
|
||||
- val exeTask = tasks.getByName("createExe")
|
||||
- dependsOn(exeTask)
|
||||
- from(exeTask.outputs) {
|
||||
- include("*.exe")
|
||||
- }
|
||||
- into(layout.buildDirectory.dir("jadx-gui-win"))
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
-}
|
||||
-
|
||||
-val copyDistWinWithJre by tasks.registering(Copy::class) {
|
||||
- description = "Copy files for Windows with JRE bundle"
|
||||
-val copyDistWinWithJre =
|
||||
- tasks.register<Copy>("copyDistWinWithJre") {
|
||||
- description = "Copy files for Windows with JRE bundle"
|
||||
-
|
||||
- val jreTask = tasks.runtime.get()
|
||||
- dependsOn(jreTask)
|
||||
- from(jreTask.jreDir) {
|
||||
- include("**/*")
|
||||
- into("jre")
|
||||
- val jreTask = tasks.runtime.get()
|
||||
- dependsOn(jreTask)
|
||||
- from(jreTask.jreDir) {
|
||||
- include("**/*")
|
||||
- into("jre")
|
||||
- }
|
||||
- val libTask = tasks.getByName("shadowJar")
|
||||
- dependsOn(libTask)
|
||||
- from(libTask.outputs) {
|
||||
- include("*.jar")
|
||||
- into("lib")
|
||||
- }
|
||||
- val exeTask = tasks.getByName("createExe")
|
||||
- dependsOn(exeTask)
|
||||
- from(exeTask.outputs) {
|
||||
- include("*.exe")
|
||||
- }
|
||||
- into(layout.buildDirectory.dir("jadx-gui-with-jre-win"))
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
- }
|
||||
- val libTask = tasks.getByName("shadowJar")
|
||||
- dependsOn(libTask)
|
||||
- from(libTask.outputs) {
|
||||
- include("*.jar")
|
||||
- into("lib")
|
||||
- }
|
||||
- val exeTask = tasks.getByName("createExe")
|
||||
- dependsOn(exeTask)
|
||||
- from(exeTask.outputs) {
|
||||
- include("*.exe")
|
||||
- }
|
||||
- into(layout.buildDirectory.dir("jadx-gui-with-jre-win"))
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
-}
|
||||
-
|
||||
/**
|
||||
* Register and expose distribution artifacts to use in top level packaging tasks
|
||||
*/
|
||||
@@ -230,10 +157,6 @@ fun escapeJVMOptions(): List<String> {
|
||||
val distWinWithJreConfiguration by configurations.creating {
|
||||
isCanBeResolved = false
|
||||
}
|
||||
-/**
|
||||
- * Register and expose distribution artifacts to use in top level packaging tasks
|
||||
- */
|
||||
-val distWinConfiguration =
|
||||
- configurations.create("distWinConfiguration") {
|
||||
- isCanBeResolved = false
|
||||
- }
|
||||
-val distWinWithJreConfiguration =
|
||||
- configurations.create("distWinWithJreConfiguration") {
|
||||
- isCanBeResolved = false
|
||||
- }
|
||||
-artifacts {
|
||||
- add(distWinConfiguration.name, copyDistWin)
|
||||
- add(distWinWithJreConfiguration.name, copyDistWinWithJre)
|
||||
-}
|
||||
|
||||
val syncNLSLines by tasks.registering(JavaExec::class) {
|
||||
group = "jadx-dev"
|
||||
-
|
||||
val syncNLSLines =
|
||||
tasks.register<JavaExec>("syncNLSLines") {
|
||||
group = "jadx-dev"
|
||||
|
||||
@@ -17,13 +17,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jadx";
|
||||
version = "1.5.5";
|
||||
version = "1.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skylot";
|
||||
repo = "jadx";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-WONsXDNhlDuqKsS2Olz3ndZIbi6mdi9JBKaHPpcdTQQ=";
|
||||
hash = "sha256-qwGFMj18xJOrBudthAIeKc/PT0uUzjmTgBYovF4A/94=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "kakoune-lsp";
|
||||
version = "21.0.1";
|
||||
version = "21.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kakoune-lsp";
|
||||
repo = "kakoune-lsp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZBeUxH/CBpg/Af1rYjOPWAyDkRNvgeifltpP5GGr+wA=";
|
||||
hash = "sha256-nY/DOXE7youb/xpUU7T0t23vSMrGqlEa6qs5tclDE88=";
|
||||
};
|
||||
|
||||
patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ];
|
||||
|
||||
cargoHash = "sha256-TBjoUy2e9GLYa0fNI1NgC4rr32vZXqaUGYksaSHE8hg=";
|
||||
cargoHash = "sha256-1ktWlguBYURqIEotG9D4953bJm0TMM7+BzufFqXUibk=";
|
||||
|
||||
meta = {
|
||||
description = "Kakoune Language Server Protocol Client";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "KDDockWidgets";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDAB";
|
||||
repo = "KDDockWidgets";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-/ioCX/Txqr84uJJYPhVLrZKug6VdWQDVirmsTg42PXs=";
|
||||
sha256 = "sha256-Bb9ZQTJ77Brn0XQY2DaBB68xk3Hw1ORuIU0xWIBVmhg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
testers,
|
||||
withDocumentation ? true,
|
||||
autoreconfHook,
|
||||
doxygen,
|
||||
graphviz,
|
||||
makeFontsConf,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libresidfp";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsidplayfp";
|
||||
repo = "libresidfp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xPIyJZWL5+tW3xk9b4dlL4klxXM6+cy38cALuhsH1zk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
]
|
||||
++ lib.optionals withDocumentation [
|
||||
"doc"
|
||||
];
|
||||
|
||||
# https://github.com/libsidplayfp/libresidfp/pull/41
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace-fail 'AC_SUBST([LIB_MAJOR])NEWS.md' 'AC_SUBST([LIB_MAJOR])'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
]
|
||||
++ lib.optionals withDocumentation [
|
||||
doxygen
|
||||
graphviz
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
# Supposedly runtime detection only supported on GCC
|
||||
# __builtin_cpu_supports on GCC's list of x86 built-in functions
|
||||
(lib.strings.withFeatureAs true "simd" (
|
||||
if (stdenv.cc.isGNU && stdenv.hostPlatform.isx86) then "runtime" else "none"
|
||||
))
|
||||
(lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests")
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildFlags = [
|
||||
"all"
|
||||
]
|
||||
++ lib.optionals withDocumentation [
|
||||
"doc"
|
||||
];
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
postInstall = lib.optionalString withDocumentation ''
|
||||
mkdir -p $doc/share/doc/
|
||||
mv docs/html $doc/share/doc/libresidfp
|
||||
'';
|
||||
|
||||
env = lib.optionalAttrs withDocumentation {
|
||||
FONTCONFIG_FILE = makeFontsConf {
|
||||
fontDirectories = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.hasPkgConfigModules {
|
||||
package = finalAttrs.finalPackage;
|
||||
versionCheck = true;
|
||||
};
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
ignoredVersions = "[a-zA-Z]";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Cycle exact SID emulation";
|
||||
homepage = "https://github.com/libsidplayfp/libresidfp";
|
||||
changelog = "https://github.com/libsidplayfp/libresidfp/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.OPNA2608 ];
|
||||
platforms = lib.platforms.all;
|
||||
pkgConfigModules = [
|
||||
"libresidfp"
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -10,7 +10,7 @@
|
||||
doxygen,
|
||||
graphviz,
|
||||
libexsid,
|
||||
libgcrypt,
|
||||
libresidfp,
|
||||
libusb1,
|
||||
perl,
|
||||
pkg-config,
|
||||
@@ -19,24 +19,29 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsidplayfp";
|
||||
version = "2.16.1";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsidplayfp";
|
||||
repo = "libsidplayfp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-gOnLjOw9TN2b0ne7Otm5DZhV/2D1xjLxwnaYilnlBgc=";
|
||||
hash = "sha256-T0No3gxlG/IHHReJ23ET9MYvKgMgCP+e9YivBbLQm0I=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
]
|
||||
++ lib.optionals docSupport [ "doc" ];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
perl
|
||||
@@ -50,30 +55,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
libexsid
|
||||
libgcrypt
|
||||
libresidfp
|
||||
libusb1
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
(lib.strings.enableFeature true "hardsid")
|
||||
(lib.strings.withFeature true "gcrypt")
|
||||
(lib.strings.withFeature true "exsid")
|
||||
(lib.strings.withFeature true "usbsid")
|
||||
# Supposedly runtime detection only supported on GCC
|
||||
# https://github.com/libsidplayfp/libsidplayfp/commit/65874166b14d44467782d2996f7b644fbde0ee87
|
||||
# __builtin_cpu_supports on GCC's list of x86 built-in functions
|
||||
(lib.strings.withFeatureAs true "simd" (
|
||||
if (stdenv.cc.isGNU && stdenv.hostPlatform.isx86) then "runtime" else "none"
|
||||
))
|
||||
(lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests")
|
||||
];
|
||||
|
||||
# Make Doxygen happy with the setup, reduce log noise
|
||||
env.FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf {
|
||||
fontDirectories = [ ];
|
||||
});
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preBuild = ''
|
||||
# Reduce noise from fontconfig during doc building
|
||||
@@ -89,6 +81,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mv docs/html $doc/share/doc/libsidplayfp/
|
||||
'';
|
||||
|
||||
# Make Doxygen happy with the setup, reduce log noise
|
||||
env.FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf {
|
||||
fontDirectories = [ ];
|
||||
});
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
updateScript = gitUpdater {
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
ninja,
|
||||
pkg-config,
|
||||
@@ -19,24 +18,16 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.7.37";
|
||||
version = "0.7.39";
|
||||
pname = "libsolv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openSUSE";
|
||||
repo = "libsolv";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-hiumMnTJ3eP+acH2V0eNTM71Fw//IWQPechCA0+kH1s=";
|
||||
hash = "sha256-nl1g1BKauSXV54xjO/1jDQMbr1WfycupR0CPqkgkzrA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2026-9149";
|
||||
url = "https://github.com/openSUSE/libsolv/commit/210386037c892a720972ad35a3d8f7073b4d763b.patch";
|
||||
hash = "sha256-ju3xn78UGMR5usq1e1ovFTWnKW1TPDA77sNGx8yc8Z8=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_COMPLEX_DEPS=true"
|
||||
(lib.cmakeBool "ENABLE_CONDA" withConda)
|
||||
|
||||
@@ -38,13 +38,13 @@ assert enableTools -> enableAudio && enableEmulation && enableLibplayer;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libvgm";
|
||||
version = "0-unstable-2026-06-07";
|
||||
version = "0-unstable-2026-06-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValleyBell";
|
||||
repo = "libvgm";
|
||||
rev = "08471963604c29353501439c4d6f97b57bf8b07b";
|
||||
hash = "sha256-1ddlxs/iq993DkjfYbdyCESspqfhAnmkjErALczpmdI=";
|
||||
rev = "867223e7c33d63de115d1ab955f784c44f19040a";
|
||||
hash = "sha256-GuvngfkqLy3E5Esb+HOnY6G1XYDyDzv1yz+NccaclGI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -18,18 +18,18 @@
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lux-cli";
|
||||
|
||||
version = "0.36.1";
|
||||
version = "0.39.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lumen-oss";
|
||||
repo = "lux";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-260gORAxU0l3gxv4ojUSmdNgHvdLpQNPdLkn8ze4HGA=";
|
||||
hash = "sha256-LTZGWwk4gVsPhNWpzK7kq5fYih8xgf0KbyPW50dDYO8=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "lux-cli";
|
||||
|
||||
cargoHash = "sha256-P9XonyY+gC0ni8WqkMPWJW6AjU4EBB7BEjxZ3U/q2qM=";
|
||||
cargoHash = "sha256-xpPXCTrlZE3Gl0AsA4O/baQyHtvOAf6cPaUdAEtwmx0=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
libarchive,
|
||||
libass,
|
||||
libbluray,
|
||||
libbs2b,
|
||||
libcaca,
|
||||
libcdio,
|
||||
libcdio-paranoia,
|
||||
@@ -66,7 +65,6 @@
|
||||
alsaSupport ? stdenv.hostPlatform.isLinux,
|
||||
archiveSupport ? true,
|
||||
bluraySupport ? true,
|
||||
bs2bSupport ? true,
|
||||
cacaSupport ? true,
|
||||
cddaSupport ? false,
|
||||
cmsSupport ? true,
|
||||
@@ -180,7 +178,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals alsaSupport [ alsa-lib ]
|
||||
++ lib.optionals archiveSupport [ libarchive ]
|
||||
++ lib.optionals bluraySupport [ libbluray ]
|
||||
++ lib.optionals bs2bSupport [ libbs2b ]
|
||||
++ lib.optionals cacaSupport [ libcaca ]
|
||||
++ lib.optionals cddaSupport [
|
||||
libcdio
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mtail";
|
||||
version = "3.4.3";
|
||||
version = "3.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaqx0r";
|
||||
repo = "mtail";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KX47oD7qLBpwItUVltysiekjy4wtpK13SVdvjSx9jmU=";
|
||||
hash = "sha256-uwEx/nhktiThUfV6tvTchEt4/hTpQsN+EXXSqL+Fzio=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "nerdfetch";
|
||||
version = "8.5.4";
|
||||
version = "8.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ThatOneCalculator";
|
||||
repo = "NerdFetch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tV8Ug7i/BTD+TxUCejwYdGLYauAYos18AnWQ1XgynWs=";
|
||||
hash = "sha256-LSp5UNXp4WBDk2MIb4UBxifTTYI36SpRU7BHL38p8VQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nym";
|
||||
version = "2024.14-crunch-patched";
|
||||
version = "2026.9-venaco";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nymtech";
|
||||
repo = "nym";
|
||||
tag = "nym-binaries-v${version}";
|
||||
hash = "sha256-ze0N+Hg+jVFKaoreCrZUUA3cHGtUZFtxCh5RwTqOdsc=";
|
||||
hash = "sha256-s3I4yfJfewJpMSqzHXmMFzvsfQAsVNZKzIroatpnfpA=";
|
||||
};
|
||||
|
||||
swagger-ui = fetchurl {
|
||||
@@ -27,11 +27,18 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-SBJE0IEgl7Efuu73n3HZQrFxYX+cn5UU5jrL4T5xzNw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-51QdzV4eYnA+pC1b7TagSF1g+n67IvZw3euJyI3ZRtM=";
|
||||
cargoHash = "sha256-ifdz+jZK9Hgezx4/Q9bDsOZOFynqE4GEFfIwXISuxp8=";
|
||||
|
||||
env = {
|
||||
SWAGGER_UI_DOWNLOAD_URL = "file://${swagger-ui}";
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
VERGEN_BUILD_TIMESTAMP = "0";
|
||||
VERGEN_BUILD_SEMVER = version;
|
||||
VERGEN_GIT_COMMIT_TIMESTAMP = "0";
|
||||
VERGEN_GIT_BRANCH = "master";
|
||||
VERGEN_RUSTC_SEMVER = rustc.version;
|
||||
VERGEN_RUSTC_CHANNEL = "stable";
|
||||
VERGEN_CARGO_PROFILE = "release";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -48,18 +55,12 @@ rustPlatform.buildRustPackage rec {
|
||||
rev-prefix = "nym-binaries-v";
|
||||
};
|
||||
|
||||
env = {
|
||||
VERGEN_BUILD_TIMESTAMP = "0";
|
||||
VERGEN_BUILD_SEMVER = version;
|
||||
VERGEN_GIT_COMMIT_TIMESTAMP = "0";
|
||||
VERGEN_GIT_BRANCH = "master";
|
||||
VERGEN_RUSTC_SEMVER = rustc.version;
|
||||
VERGEN_RUSTC_CHANNEL = "stable";
|
||||
VERGEN_CARGO_PROFILE = "release";
|
||||
};
|
||||
|
||||
checkFlags = [
|
||||
"--skip=ping::http::tests::resolve_host_with_valid_hostname_returns_some"
|
||||
"--skip=ecash::tests::credential_tests::blind_sign_correct"
|
||||
"--skip=ecash::tests::credential_tests::already_issued"
|
||||
"--skip=ecash::tests::issued_ticketbooks::issued_ticketbooks_for"
|
||||
"--skip=ecash::tests::issued_ticketbooks::issued_ticketbooks_challenge_commitment"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openbao";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openbao";
|
||||
repo = "openbao";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FJ+34HeRT025EFwFXY8ewfnJbQirqFb3j+kPNxpGOA4=";
|
||||
hash = "sha256-2wl06I6/yF/V5P9MFCCzpEiX4G+YTtXWRjvh+wDyB1U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-O0xx61S0KEk5QB/NsV+kBlErvVuKBfI/81o29rDye1w=";
|
||||
vendorHash = "sha256-2MMWs30e7GB0pcPmmDvw6RTBzKYXNwothAuQMZAFHoE=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -11,32 +11,26 @@
|
||||
fontconfig,
|
||||
gtk3,
|
||||
wrapGAppsHook3,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openboardview";
|
||||
version = "9.95.2";
|
||||
version = "10.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenBoardView";
|
||||
repo = "OpenBoardView";
|
||||
tag = version;
|
||||
hash = "sha256-B5VnuycRt8h7Cz3FTIbhcGcXuA60zPCz0FMvFENTwws=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rvCWzIbjEZOHh5diaeP4xVIRsMHqt4PGMuYOGfWvwhA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-darwin-build.patch";
|
||||
url = "https://github.com/OpenBoardView/OpenBoardView/commit/a1de2e5de908afd83eceed757260f6425314af2e.patch?full_index=1";
|
||||
hash = "sha256-DK+K4F0+QGqaoWCyc8AvuIsaiTCqhAG6AsTNg2hegh0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
python3
|
||||
python3Packages.jinja2
|
||||
wrapGAppsHook3
|
||||
];
|
||||
buildInputs = [
|
||||
@@ -62,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
mv "$out/openboardview.app" "$out/Applications/OpenBoardView.app"
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
wrapGApp "$out/bin/${pname}" \
|
||||
wrapGApp "$out/bin/${finalAttrs.pname}" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]}
|
||||
'';
|
||||
|
||||
@@ -74,8 +68,9 @@ stdenv.mkDerivation rec {
|
||||
description = "Linux SDL/ImGui edition software for viewing .brd files";
|
||||
mainProgram = "openboardview";
|
||||
homepage = "https://github.com/OpenBoardView/OpenBoardView";
|
||||
changelog = "https://github.com/OpenBoardView/OpenBoardView/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ k3a ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "opkssh";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openpubkey";
|
||||
repo = "opkssh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-COACiBNXHEpzZyGGYmz0uj0ubzYJFRabAEku2qOjLcg=";
|
||||
hash = "sha256-c+ZcC9m+PfwFyLSz+dwahYdQe+wKHQHECT+gNp1rdQU=";
|
||||
};
|
||||
|
||||
ldflags = [ "-X main.Version=${finalAttrs.version}" ];
|
||||
|
||||
vendorHash = "sha256-aRWu4yB83hBKtW78MVMg7l8iSzHdLgnYgskgt32tiLw=";
|
||||
vendorHash = "sha256-BmU/8Y6CweVnOeHftQhacKKLccQk1uNljzHe+/zkUn4=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
{
|
||||
autoPatchelfHook,
|
||||
copyDesktopItems,
|
||||
curl,
|
||||
fetchurl,
|
||||
gsettings-desktop-schemas,
|
||||
gtk3,
|
||||
lib,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
stdenv,
|
||||
webkitgtk_4_1,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "playdate-sdk";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.panic.com/playdate_sdk/Linux/PlaydateSDK-${version}.tar.gz";
|
||||
sha256 = "sha256-yKEl3UpVY3lB9LxAsx0RotTsNHv8WS76ZqpzRi6BSZg=";
|
||||
};
|
||||
|
||||
srcScript = ./playdate-simulator-wrapper.sh;
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/playdate-sdk
|
||||
cp -r * $out/share/playdate-sdk
|
||||
mkdir -p $out/bin
|
||||
|
||||
#### pdc
|
||||
makeWrapper $out/share/playdate-sdk/bin/pdc $out/bin/pdc \
|
||||
--run 'export PLAYDATE_SDK_PATH="''${XDG_DATA_HOME:-''$HOME/.local/share}/playdate-sdk-${version}"'
|
||||
|
||||
#### pdutil
|
||||
makeWrapper $out/share/playdate-sdk/bin/pdutil $out/bin/pdutil \
|
||||
--run 'export PLAYDATE_SDK_PATH="''${XDG_DATA_HOME:-''$HOME/.local/share}/playdate-sdk-${version}"'
|
||||
|
||||
#### PlaydateSimulator
|
||||
cp $srcScript $out/bin/PlaydateSimulator
|
||||
substituteInPlace $out/bin/PlaydateSimulator \
|
||||
--subst-var-by out "$out" \
|
||||
--subst-var-by version "${version}" \
|
||||
--subst-var-by ldLibraryPath "${
|
||||
lib.makeLibraryPath [
|
||||
curl
|
||||
]
|
||||
}" \
|
||||
--subst-var-by gsettingsSchemas "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}"
|
||||
chmod +x $out/bin/PlaydateSimulator
|
||||
|
||||
#### C API includes
|
||||
mkdir -p $out/include
|
||||
cp -r $out/share/playdate-sdk/C_API/pd_api $out/include/pd_api
|
||||
cp $out/share/playdate-sdk/C_API/pd_api.h $out/include/pd_api.h
|
||||
|
||||
#### udev rules
|
||||
mkdir -p $out/etc/udev/rules.d
|
||||
cp $out/share/playdate-sdk/Resources/50-playdate.rules $out/etc/udev/rules.d/
|
||||
|
||||
#### icons
|
||||
install -Dm644 $out/share/playdate-sdk/Resources/date.play.simulator.svg $out/share/icons/hicolor/scalable/apps/PlaydateSimulator.svg
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "PlaydateSimulator";
|
||||
exec = "PlaydateSimulator %u";
|
||||
icon = "PlaydateSimulator";
|
||||
desktopName = "Playdate Simulator";
|
||||
comment = "A toolset for developing games on the Playdate handheld console";
|
||||
categories = [ "Development" ];
|
||||
startupWMClass = "PlaydateSimulator";
|
||||
mimeTypes = [
|
||||
"application/x-playdate-game"
|
||||
"x-scheme-handler/playdate-simulator"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Official SDK and development tools for the Playdate handheld console, including Lua/C APIs, simulator, and Mirror capture utility";
|
||||
homepage = "https://play.date";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ atomicptr ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
USER_SDK_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/playdate-sdk-@version@"
|
||||
NIX_SDK_DIR="@out@/share/playdate-sdk"
|
||||
|
||||
if [ ! -d "$USER_SDK_DIR" ]; then
|
||||
echo "Initializing Playdate SDK workspace at $USER_SDK_DIR..."
|
||||
mkdir -p "$USER_SDK_DIR"
|
||||
cp -r "$NIX_SDK_DIR/." "$USER_SDK_DIR"
|
||||
chmod -R u+w "$USER_SDK_DIR"
|
||||
fi
|
||||
|
||||
export PLAYDATE_SDK_PATH="$USER_SDK_DIR"
|
||||
export LD_LIBRARY_PATH="@ldLibraryPath@"
|
||||
export XDG_DATA_DIRS="@gsettingsSchemas@:${XDG_DATA_DIRS:-}"
|
||||
|
||||
exec "$USER_SDK_DIR/bin/PlaydateSimulator" "$@"
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "runpodctl";
|
||||
version = "2.6.1";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "runpod";
|
||||
repo = "runpodctl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-hx0plQ5og4C6UY7r8RjYKo8LVk+WnWhtRErr0riNKbQ=";
|
||||
hash = "sha256-QorGhaHwgzcJJXa36dejLdN8STa8Q7H8qvKK66g2JBA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-38d+nWZDjWgcK091G3JCGtBqyE7iJ60edAhbx8GzxPM=";
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
python313Packages, # Require a working version of Kivy, which is not yet working with Python 3.14
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
python313Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "sideband";
|
||||
version = "1.9.7";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -15,16 +15,13 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "markqvist";
|
||||
repo = "Sideband";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YL8wqZGBrMEtm+mLVjyaZpTPj8XVM0YUjP6Kfo7QHfw=";
|
||||
hash = "sha256-RCSSyTtt2eN9hYT1xzPYjJloPjnkIS6bo21PHrlg5S8=";
|
||||
};
|
||||
|
||||
# Unable to upstream all of this
|
||||
# Reason: An owner of this repository has disabled the ability to open pull requests.
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail \
|
||||
"lxst>=0.4.6" \
|
||||
"lxst" \
|
||||
--replace-fail \
|
||||
'"kivymd")' \
|
||||
'"sbapp/kivymd")'
|
||||
@@ -32,15 +29,15 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
substituteInPlace sbapp/main.py \
|
||||
--replace-fail \
|
||||
"1.9.2" \
|
||||
"1.9.7"
|
||||
"2.0.0"
|
||||
'';
|
||||
|
||||
build-system = with python3Packages; [
|
||||
build-system = with python313Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
with python313Packages;
|
||||
[
|
||||
audioop-lts
|
||||
beautifulsoup4
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sioyek";
|
||||
version = "2.0.0-unstable-2026-07-11";
|
||||
version = "2.0.0-unstable-2026-07-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahrm";
|
||||
repo = "sioyek";
|
||||
rev = "8c4008653f3279633fe1e7e2a1be057aa210fe73";
|
||||
hash = "sha256-5GJpXyLhRziSWJLrDIfzXZS4QPMqiRhEp6gcPoSy1/8=";
|
||||
rev = "efc88cd7e0985e81d1707c907968088c44f75aea";
|
||||
hash = "sha256-dOjWV9NlTY0L9SK960TcVw02aSThYF9GcbmkTN9BUa0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "soteria";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imvaskel";
|
||||
repo = "soteria";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g6DGb8PWfc5YyjUpO9q3q0MxcPUbMjatOi6POFcZEE4=";
|
||||
hash = "sha256-2NlQSie3W7MgHyIX4AD2KX4yK13jNdL5hptmZBUkVBk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6Pk60J2RAInRgCiIk9thZRwwAyCQvychh5nVHmKU7Iw=";
|
||||
cargoHash = "sha256-MZjNhrcnHYq8hbZaXBPxVDrgLmsbhkeSfV/ugWxUayo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "spotdl";
|
||||
version = "4.5.0";
|
||||
version = "4.5.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spotDL";
|
||||
repo = "spotify-downloader";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-u5t8t9NJq+h/ujeLObKDCQG4brTqwdjSDslemmhePdc=";
|
||||
hash = "sha256-qztG9q7hwajyCTVg0iTrPrvL2UYrzAPw7Z+CFOTSi/U=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stevenblack-blocklist";
|
||||
version = "3.16.97";
|
||||
version = "3.16.99";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenBlack";
|
||||
repo = "hosts";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5r8r57m+Ilce6Onu/svc05yyrLGH5S65RixbwqlpmPU=";
|
||||
hash = "sha256-IZaEcG/u1zgJBxXc2Dyx0gxzpnmWQQ5NUyOrDBLiOXk=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "suitesparse-graphblas";
|
||||
version = "10.3.1";
|
||||
version = "10.3.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "DrTimothyAldenDavis";
|
||||
repo = "GraphBLAS";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-m+sjfRdgIwH/FEaHkEp6fl5+fehNcBDLVc4f5H5Lslw=";
|
||||
hash = "sha256-M9MSJfrZP8VY/CPGbQkjyLFVXg25xy+8mIiJsHOdhBI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -27,11 +27,11 @@ assert waylandSupport -> libxkbcommon != null;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vintagestory";
|
||||
version = "1.22.4";
|
||||
version = "1.22.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-6efnjDUXMweOzN1mnkwVyQzQjs1QlFHBss1qb62Z2o0=";
|
||||
hash = "sha256-ozpjsnqJKFdzKeJuOSuurYN8UEvLrBw17quGZeMN8PY=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
alsa-lib,
|
||||
dav1d,
|
||||
dbus,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
@@ -25,16 +26,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wayvr";
|
||||
version = "26.2.1";
|
||||
version = "26.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wlx-team";
|
||||
repo = "wayvr";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-v1Wkelru825KV+ciXD9esLq39oTyMm/Z4rRbN+jjviY=";
|
||||
hash = "sha256-SdHN3jDe2QJaRORy452RP7kTMxPOZOB/yjpApUOLhRU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-d6iRaOHq+4j90L76bx7+EwCLOY4MxPeqm3ELJ5H9O+8=";
|
||||
cargoHash = "sha256-eGmlFtlorKG7uygLer3UW6ERLQzdugoYyXVSC2sFh+k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -43,6 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
dav1d
|
||||
dbus
|
||||
libx11
|
||||
libxext
|
||||
@@ -78,6 +80,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
postInstall = ''
|
||||
install -D wayvr/wayvr.desktop -t $out/share/applications
|
||||
install -D wayvr/wayvr.svg -t $out/share/icons/hicolor/scalable/apps
|
||||
|
||||
rm $out/bin/prost_build
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -7,18 +7,22 @@
|
||||
wsjtx.overrideAttrs (
|
||||
finalAttrs: old: {
|
||||
pname = "wsjtz";
|
||||
version = "2.0.16";
|
||||
version = "2.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sq9fve";
|
||||
repo = "wsjt-z";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-O7HHAr3am4bH4b/RldoaB9LWWhciUbDc+u+lPO60UUY=";
|
||||
hash = "sha256-YxO4pSdKKeO0Ye7Ay/0gdjPvceLbC5eMQk1ZBh1ZHCw=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/wsjtx $out/bin/wsjtz
|
||||
mv $out/bin/wsjtx_app_version $out/bin/wsjtz_app_version
|
||||
|
||||
substituteInPlace $out/share/applications/wsjtx.desktop \
|
||||
--replace-fail "Exec=wsjtx" "Exec=wsjtz" \
|
||||
--replace-fail "Name=wsjtx" "Name=wsjtz"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -27,6 +31,7 @@ wsjtx.overrideAttrs (
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
Cryolitia
|
||||
scd31
|
||||
];
|
||||
mainProgram = "wsjtz";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
xmrig.overrideAttrs (oldAttrs: rec {
|
||||
pname = "xmrig-mo";
|
||||
version = "6.26.0-mo3";
|
||||
version = "6.26.0-mo4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MoneroOcean";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ceh/B0afhVbAhDQcYen+TWNSswXcSiUzCvrQJizVmpQ=";
|
||||
hash = "sha256-rPOu231VgVAgvfcv8ecPsTSKyUa/Oi8nQYIIbVkx1Sc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildGraalvmNativeImage (finalAttrs: {
|
||||
pname = "yamlscript";
|
||||
version = "0.2.27";
|
||||
version = "0.2.29";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yaml/yamlscript/releases/download/${finalAttrs.version}/yamlscript.cli-${finalAttrs.version}-standalone.jar";
|
||||
hash = "sha256-d2kG10M+AeADVRzzjShx5CMTpsVgScF5NDimQm/B0DM=";
|
||||
hash = "sha256-xbppej6p8r4fAx7xL5wQBgAqDFrCPRyT+LbwOUytbbA=";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "discid";
|
||||
version = "1.4.0";
|
||||
version = "1.4.2";
|
||||
pyproject = true;
|
||||
|
||||
outputs = [
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-UP09tEXK60S593Y3d+1JaIw89GM9qZ00DCW5GUlrqLU=";
|
||||
sha256 = "sha256-DLtLlpScaMvGPJ/EWF75t+wrnTniO84LTbXWHG97geY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -5,19 +5,22 @@
|
||||
beziers,
|
||||
glyphslib,
|
||||
numpy,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "glyphtools";
|
||||
version = "0.8.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-PXwXHWMJbsi6ZtN+daaXAnlw3gV5DFAhyRxdBa7UP+M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
beziers
|
||||
glyphslib
|
||||
numpy
|
||||
@@ -35,4 +38,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ danc86 ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "ha-garmin";
|
||||
version = "0.1.29";
|
||||
version = "0.1.31";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cyberjunky";
|
||||
repo = "ha-garmin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mny9QnmgRaCFZf4pExdIGDlljw6nSPhU8kB9rzSHymg=";
|
||||
hash = "sha256-pj0caMp4nPzKMImboA3erArpEIruOgXGnnso/AgWujA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202607211";
|
||||
version = "0.1.202607221";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-G6Yum+tZ49Lw44z+fPkFrSLY1JrWReTewx8QSlet6zA=";
|
||||
hash = "sha256-77NcYaPOTgmWr6zbezAu2esglYYe8DUjelKyFhldW/s=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jellyfin-apiclient-python";
|
||||
version = "1.12.0";
|
||||
version = "1.15.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-apiclient-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lxwJgYysp/6C/eYviYJu5lfStWulHyl7WxqxMnOE5iw=";
|
||||
hash = "sha256-+ZlJK1wbu/taOydgSOF7JNKcsLzqXph6m8PHww04QjI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "kafka-python";
|
||||
version = "3.0.8";
|
||||
version = "3.0.9";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "dpkp";
|
||||
repo = "kafka-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-f/4RcR4vUn0odVdm+YASkqklYFMRHuwlyYln19w/WOs=";
|
||||
hash = "sha256-Dvi5zWArY3QkQYUhM4XU//2HiSZ1Ks4bJFJ6a9xIEPQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
libpulseaudio,
|
||||
audioop-lts,
|
||||
@@ -14,19 +14,24 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "lxst";
|
||||
version = "0.4.4";
|
||||
pyproject = true;
|
||||
version = "0.5.0";
|
||||
format = "wheel";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "markqvist";
|
||||
repo = "lxst";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-MAJ1n6EUZ6FmIfKKuM2ppbTVrWkxpjC5KIICo5stc+k=";
|
||||
src = fetchPypi {
|
||||
pname = "lxst";
|
||||
version = finalAttrs.version;
|
||||
format = "wheel";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-k1HiWv/5iIuSjaeIIDyELX+1FHI3k15IJwxUwUutpM0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace LXST/Platforms/linux/soundcard.py \
|
||||
# We can't use a postPatch here to do the substitution because the wheel is
|
||||
# already built and the file is not present in the source tree, only the
|
||||
# wheel archive.
|
||||
postInstall = ''
|
||||
substituteInPlace "$out/lib/python"*/site-packages/LXST/Platforms/linux/soundcard.py \
|
||||
--replace-fail "libpulse.so" "${lib.getLib libpulseaudio}/lib/libpulse.so"
|
||||
'';
|
||||
|
||||
@@ -47,7 +52,7 @@ buildPythonPackage (finalAttrs: {
|
||||
changelog = "https://github.com/markqvist/LXST/releases/tag/${finalAttrs.version}";
|
||||
description = "Simple and flexible real-time streaming format and delivery protocol for Reticulum";
|
||||
homepage = "https://github.com/markqvist/LXST";
|
||||
license = lib.licenses.cc-by-nc-nd-40;
|
||||
license = lib.licenses.reticulum;
|
||||
maintainers = with lib.maintainers; [
|
||||
drupol
|
||||
];
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "materialyoucolor";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "T-Dynamos";
|
||||
repo = "materialyoucolor-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CCpYrNp79gdnj5TYcQ7fEiLsFW/kbuZ+3/cHZF4Bv/s=";
|
||||
hash = "sha256-wD6Vh0Ao+zq8FmUXcBaJYGcdw+hCk8lZ2FvODhwJBCE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "publicsuffixlist";
|
||||
version = "1.0.2.20260715";
|
||||
version = "1.0.2.20260722";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-C2hMkJSeC6BEyQLXzPFN5SaMnXCA/O9OiqqPSm4HGn0=";
|
||||
hash = "sha256-eQvXqMOPZpmtMirDStUmKmr5wk1GlNrGTRz5WPCzavw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -28,12 +28,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py3status";
|
||||
version = "3.63";
|
||||
version = "3.64";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-k9zkbkgw+rD/0JxQyxT5xdEgdDmY/y7zCw6wGo+2Xhg=";
|
||||
hash = "sha256-7hafyW7jq/8Xk4POAohX6sNViJ+Azuqs5/0i1JqCqr0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -63,7 +63,7 @@ buildPythonPackage (finalAttrs: {
|
||||
text = ''
|
||||
nix-update --build --commit python3Packages.genai-prices
|
||||
nix-update --build --commit python3Packages.pydantic-graph
|
||||
nix-update --build --commit python3Packages.pydantic-ai-slim
|
||||
nix-update --build python3Packages.pydantic-ai-slim
|
||||
'';
|
||||
});
|
||||
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyexploitdb";
|
||||
version = "0.3.35";
|
||||
version = "0.3.36";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-/yt39/XaLzqxlviFRzk+JR4TM8PHZYLYpNP0i9N4tvI=";
|
||||
hash = "sha256-qZc4+s2L5uRJIsHyfsWkjVrifBtiaJCzj90SrUQ5fQo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -371,13 +371,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "types-aiobotocore";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types_aiobotocore";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-/jXeUsEuX9uJymCzmJdm5/6Cfj0ulfz0WD6RWBlFIFw=";
|
||||
hash = "sha256-XK7qnJGmw3qSqgtkLDGKTJp0b1N71i/sVdCjMTdC0mU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
grafanaPlugin {
|
||||
pname = "grafana-metricsdrilldown-app";
|
||||
version = "2.2.0";
|
||||
zipHash = "sha256-NMs4aFZ1QFWbLRDBcGTzkK9SNHIfBA7eO4BQzeHbMuM=";
|
||||
version = "2.3.0";
|
||||
zipHash = "sha256-Ii4XYEtxbvkYSE3TlYcs0S3ZCRXH9s/Trn+tSggQWTM=";
|
||||
meta = {
|
||||
description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries";
|
||||
license = lib.licenses.agpl3Only;
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGhidraExtension (finalAttrs: {
|
||||
pname = "Ghidra-GolangAnalyzerExtension";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mooncat-greenpy";
|
||||
repo = "Ghidra_GolangAnalyzerExtension";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-zKN9SKprJIA5hQCvaQUdfBchN+2wPo47bkOchnQrr5A=";
|
||||
hash = "sha256-bd0NmIql4OHxaWtSvNvbJZLiJUjaRKgkA+nCSiVo478=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/GolangAnalyzerExtension";
|
||||
|
||||
@@ -39499,10 +39499,10 @@ with self;
|
||||
|
||||
YAMLSyck = buildPerlPackage {
|
||||
pname = "YAML-Syck";
|
||||
version = "1.45";
|
||||
version = "1.47";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.45.tar.gz";
|
||||
hash = "sha256-8t4a+08MVsNubVJgqgvSyPGOTYUAnc9YQiBOoqf7w98=";
|
||||
url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.47.tar.gz";
|
||||
hash = "sha256-ZyGWyhwCHjxo9LX3tK7DBa1HG7v0SMU8fkADTW67fh0=";
|
||||
};
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu11";
|
||||
meta = {
|
||||
|
||||
Reference in New Issue
Block a user