Merge 48a7fb14a7 into haskell-updates
This commit is contained in:
@@ -290,6 +290,12 @@
|
||||
githubId = 92977828;
|
||||
name = "Mori Zen";
|
||||
};
|
||||
_7591yj = {
|
||||
email = "yeongjin.kim@proton.me";
|
||||
github = "7591yj";
|
||||
githubId = 77034308;
|
||||
name = "Yeongjin Kim";
|
||||
};
|
||||
_7karni = {
|
||||
email = "7karni@proton.me";
|
||||
name = "7karni";
|
||||
@@ -20414,6 +20420,12 @@
|
||||
githubId = 31112680;
|
||||
name = "oidro";
|
||||
};
|
||||
ojsef39 = {
|
||||
name = "Josef Hofer";
|
||||
github = "ojsef39";
|
||||
email = "me+github@jhofer.de";
|
||||
githubId = 43563019;
|
||||
};
|
||||
ok-nick = {
|
||||
email = "nick.libraries@gmail.com";
|
||||
github = "ok-nick";
|
||||
@@ -22760,6 +22772,13 @@
|
||||
github = "ranfdev";
|
||||
githubId = 23294184;
|
||||
};
|
||||
ranidspace = {
|
||||
name = "ranidspace";
|
||||
email = "dev@ranid.space";
|
||||
matrix = "@ranidspace:4d2.org";
|
||||
github = "ranidspace";
|
||||
githubId = 56847308;
|
||||
};
|
||||
raphaelr = {
|
||||
email = "raphael-git@tapesoftware.net";
|
||||
matrix = "@raphi:tapesoftware.net";
|
||||
@@ -30030,6 +30049,12 @@
|
||||
githubId = 973709;
|
||||
name = "Jairo Llopis";
|
||||
};
|
||||
yamadashy = {
|
||||
email = "koukun0120@gmail.com";
|
||||
github = "yamadashy";
|
||||
githubId = 5019072;
|
||||
name = "Kazuki Yamada";
|
||||
};
|
||||
yamashitax = {
|
||||
email = "hello@yamashit.ax";
|
||||
github = "yamashitax";
|
||||
|
||||
@@ -81,8 +81,8 @@ in
|
||||
fi
|
||||
echo "vm.mmap_rnd_bits=$mmap_rnd_bits_max" >> $out
|
||||
''
|
||||
# HAVE_ARCH_MMAP_RND_COMPAT_BITS is not defined for LoongArch64
|
||||
+ lib.optionalString (!pkgs.stdenv.hostPlatform.isLoongArch64) ''
|
||||
# HAVE_ARCH_MMAP_RND_COMPAT_BITS is not defined on 32-bit architectures or LoongArch64
|
||||
+ lib.optionalString (with pkgs.stdenv.hostPlatform; (!is32bit && !isLoongArch64)) ''
|
||||
mmap_rnd_compat_bits_max=$(grep "^CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=" $configfile | grep --only-matching "[0-9]*$")
|
||||
if [[ -z "$mmap_rnd_compat_bits_max" ]]; then
|
||||
echo "Unable to determine mmap_rnd_compat_bits_max. Check your kernel configfile is valid."
|
||||
|
||||
@@ -286,6 +286,7 @@
|
||||
./programs/noisetorch.nix
|
||||
./programs/npm.nix
|
||||
./programs/ns-usbloader.nix
|
||||
./programs/nxdumpclient.nix
|
||||
./programs/oblogout.nix
|
||||
./programs/obs-studio.nix
|
||||
./programs/oddjobd.nix
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
options.programs.nxdumpclient = {
|
||||
enable = lib.mkEnableOption "NX Dump Client";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.programs.nxdumpclient.enable {
|
||||
environment.systemPackages = [ pkgs.nxdumpclient ];
|
||||
services.udev.packages = [ pkgs.nxdumpclient ];
|
||||
};
|
||||
}
|
||||
@@ -7,13 +7,18 @@
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
literalExpression
|
||||
mkDefault
|
||||
mkEnableOption
|
||||
mkPackageOption
|
||||
mkOption
|
||||
maintainers
|
||||
;
|
||||
inherit (lib.types)
|
||||
addCheck
|
||||
bool
|
||||
listOf
|
||||
package
|
||||
port
|
||||
str
|
||||
submodule
|
||||
@@ -29,6 +34,37 @@ in
|
||||
|
||||
package = mkPackageOption pkgs "navidrome" { };
|
||||
|
||||
plugins = mkOption {
|
||||
type = listOf (
|
||||
addCheck package (p: p.isNavidromePlugin or false)
|
||||
// {
|
||||
name = "navidrome plugin";
|
||||
description = "package that is a navidrome plugin";
|
||||
}
|
||||
);
|
||||
default = [ ];
|
||||
description = "List of Navidrome plugins";
|
||||
example = literalExpression ''
|
||||
with pkgs.navidromePlugins; [
|
||||
listenbrainz-daily-playlist
|
||||
];
|
||||
'';
|
||||
};
|
||||
|
||||
finalPackage = mkOption {
|
||||
type = package;
|
||||
readOnly = true;
|
||||
default = cfg.package.override {
|
||||
inherit (cfg) plugins;
|
||||
};
|
||||
defaultText = literalExpression ''
|
||||
config.services.navidrome.package.override {
|
||||
inherit (config.services.navidrome) plugins;
|
||||
}
|
||||
'';
|
||||
description = "The final navidrome package including all selected plugins.";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
@@ -51,6 +87,29 @@ in
|
||||
description = "Enable anonymous usage data collection, see <https://www.navidrome.org/docs/getting-started/insights/> for details.";
|
||||
type = bool;
|
||||
};
|
||||
|
||||
Plugins = {
|
||||
Enabled = mkOption {
|
||||
default = (builtins.length cfg.plugins) != 0;
|
||||
defaultText = literalExpression "builtins.length \"\${config.services.navidrome.plugins != 0}\"";
|
||||
description = ''
|
||||
Enable plugin support in navidrome.
|
||||
|
||||
This is automatically enabled if {option}`services.navidrome.plugins` is used.
|
||||
'';
|
||||
};
|
||||
Folder = mkOption {
|
||||
default = "${cfg.finalPackage}/share/plugins";
|
||||
description = ''
|
||||
The folder containing navidrome plugins.
|
||||
|
||||
This directory is automatically created from plugins defined in {option}`services.navidrome.plugins`.
|
||||
'';
|
||||
readOnly = true;
|
||||
type = str;
|
||||
defaultText = literalExpression "\"\${config.services.navidrome.finalPackage}/share/plugins\"";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
@@ -78,7 +137,7 @@ in
|
||||
description = "Whether to open the TCP port in the firewall";
|
||||
};
|
||||
|
||||
environmentFile = lib.mkOption {
|
||||
environmentFile = mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = "Environment file, used to set any secret ND_* environment variables.";
|
||||
@@ -114,7 +173,7 @@ in
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${getExe cfg.package} --configfile ${settingsFormat.generate "navidrome.json" cfg.settings}
|
||||
${getExe cfg.finalPackage} --configfile ${settingsFormat.generate "navidrome.json" cfg.settings}
|
||||
'';
|
||||
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
|
||||
User = cfg.user;
|
||||
@@ -180,5 +239,8 @@ in
|
||||
|
||||
networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.Port ];
|
||||
};
|
||||
meta.maintainers = with maintainers; [ fsnkty ];
|
||||
meta.maintainers = with maintainers; [
|
||||
fsnkty
|
||||
tebriel
|
||||
];
|
||||
}
|
||||
|
||||
@@ -46,7 +46,24 @@ in
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = format.type;
|
||||
type = lib.types.submodule {
|
||||
options = {
|
||||
options = {
|
||||
workers = lib.mkOption {
|
||||
type = lib.types.ints.unsigned;
|
||||
default = 0;
|
||||
description = "Values above 0 will enable the multi-processing HTTP server, this should be set for production setups. This needs to be set to >0 for real-time connections in the discuss app. For configuration recommendations see <https://www.odoo.com/documentation/19.0/administration/on_premise/deploy.html#builtin-server>";
|
||||
};
|
||||
proxy_mode = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = cfg.domain != null;
|
||||
defaultText = "services.odoo.domain != null";
|
||||
description = "Enables the use of X-Forwarded-* headers through Werkzeug’s proxy support. Must be enabled if reverse proxy is used.";
|
||||
};
|
||||
};
|
||||
};
|
||||
freeformType = format.type;
|
||||
};
|
||||
default = { };
|
||||
description = ''
|
||||
Odoo configuration settings. For more details see <https://www.odoo.com/documentation/15.0/administration/install/deploy.html>
|
||||
@@ -96,7 +113,7 @@ in
|
||||
'';
|
||||
|
||||
locations = {
|
||||
"/longpolling" = {
|
||||
"/websocket" = {
|
||||
proxyPass = "http://odoochat";
|
||||
};
|
||||
|
||||
@@ -127,7 +144,6 @@ in
|
||||
);
|
||||
settings.options = {
|
||||
data_dir = "/var/lib/private/odoo/data";
|
||||
proxy_mode = cfg.domain != null;
|
||||
# Disable the database manager by default
|
||||
# https://www.odoo.com/documentation/master/administration/on_premise/deploy.html#database-manager-security
|
||||
list_db = lib.mkDefault false;
|
||||
|
||||
@@ -131,6 +131,7 @@ let
|
||||
"v2ray"
|
||||
"varnish"
|
||||
"wireguard"
|
||||
"zfs-siebenmann"
|
||||
"zfs"
|
||||
]
|
||||
(
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
options,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.zfs-siebenmann;
|
||||
inherit (lib)
|
||||
mkOption
|
||||
types
|
||||
concatStringsSep
|
||||
optionalString
|
||||
;
|
||||
in
|
||||
{
|
||||
port = 9700;
|
||||
|
||||
extraOpts = {
|
||||
pools = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Name of the pool(s) to collect, repeat for multiple pools (default: all pools).
|
||||
'';
|
||||
};
|
||||
|
||||
depth = mkOption {
|
||||
type = types.int;
|
||||
default = 1;
|
||||
description = ''
|
||||
Depth of the vdev tree to report on.
|
||||
0 is the pool, 1 is top level vdevs, 2 is devices too.
|
||||
'';
|
||||
};
|
||||
|
||||
fullPath = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Report the full path of disks.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
serviceOpts = {
|
||||
# needs zpool
|
||||
path = [ config.boot.zfs.package ];
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-siebenmann-zfs-exporter}/bin/zfs_exporter \
|
||||
--listen-addr ${cfg.listenAddress}:${toString cfg.port} \
|
||||
--depth ${toString cfg.depth} \
|
||||
${optionalString cfg.fullPath "--fullpath"} \
|
||||
${concatStringsSep " " (map (p: "--pool=${p}") cfg.pools)} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
ProtectClock = false;
|
||||
PrivateDevices = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1177,15 +1177,27 @@ in
|
||||
octoprint = runTest ./octoprint.nix;
|
||||
oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { };
|
||||
odoo17 = runTest {
|
||||
imports = [ ./odoo.nix ];
|
||||
imports = [ ./odoo/single-process.nix ];
|
||||
_module.args.package = pkgs.odoo17;
|
||||
};
|
||||
odoo17-multiprocess = runTest {
|
||||
imports = [ ./odoo/multi-process.nix ];
|
||||
_module.args.package = pkgs.odoo17;
|
||||
};
|
||||
odoo18 = runTest {
|
||||
imports = [ ./odoo.nix ];
|
||||
imports = [ ./odoo/single-process.nix ];
|
||||
_module.args.package = pkgs.odoo18;
|
||||
};
|
||||
odoo18-multiprocess = runTest {
|
||||
imports = [ ./odoo/multi-process.nix ];
|
||||
_module.args.package = pkgs.odoo18;
|
||||
};
|
||||
odoo19 = runTest {
|
||||
imports = [ ./odoo.nix ];
|
||||
imports = [ ./odoo/single-process.nix ];
|
||||
_module.args.package = pkgs.odoo19;
|
||||
};
|
||||
odoo19-multiprocess = runTest {
|
||||
imports = [ ./odoo/multi-process.nix ];
|
||||
_module.args.package = pkgs.odoo19;
|
||||
};
|
||||
oh-my-zsh = runTest ./oh-my-zsh.nix;
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
};
|
||||
|
||||
services.jellyfin.enable = true;
|
||||
# Jellyfin requires at least 2 GB of disk space
|
||||
virtualisation.diskSize = 3 * 1024; # 3 GB
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
@@ -26,9 +28,12 @@
|
||||
testScript = ''
|
||||
machine.start()
|
||||
|
||||
with subtest("Install a progressive web app"):
|
||||
with subtest("Wait for Jellyfin to be ready"):
|
||||
machine.wait_for_unit("jellyfin.service")
|
||||
machine.wait_for_open_port(8096)
|
||||
machine.wait_until_succeeds("curl -fs http://localhost:8096/web/manifest.json")
|
||||
|
||||
with subtest("Install a progressive web app"):
|
||||
machine.succeed("firefoxpwa site install http://localhost:8096/web/manifest.json >&2")
|
||||
|
||||
with subtest("Launch the progressive web app"):
|
||||
|
||||
@@ -5,11 +5,19 @@
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
{
|
||||
services.navidrome.enable = true;
|
||||
services.navidrome = {
|
||||
enable = true;
|
||||
plugins = with pkgs.navidromePlugins; [
|
||||
listenbrainz-daily-playlist
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("navidrome")
|
||||
machine.wait_for_console_text("Starting plugin manager")
|
||||
# Make sure we saw at least one plugin load
|
||||
machine.wait_for_console_text("plugin=listenbrainz-daily-playlist")
|
||||
machine.wait_for_open_port(4533)
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
package,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
name = "odoo-multi-process";
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
mkg20001
|
||||
xanderio
|
||||
];
|
||||
|
||||
nodes.server = {
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
recommendedProxySettings = true;
|
||||
};
|
||||
|
||||
services.odoo = {
|
||||
enable = true;
|
||||
package = package;
|
||||
autoInit = true;
|
||||
autoInitExtraFlags = [ "--without-demo=all" ];
|
||||
domain = "localhost";
|
||||
settings.options.workers = 2;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = # python
|
||||
''
|
||||
server.wait_for_unit("odoo.service")
|
||||
server.wait_until_succeeds(
|
||||
"test $(journalctl -u odoo | grep -o 'Worker WorkerHTTP ([[:digit:]]*) alive' | wc -l) = 2"
|
||||
)
|
||||
server.wait_until_succeeds("curl -s http://localhost:8069/web/database/selector | grep '<title>Odoo</title>'")
|
||||
server.succeed("curl -s http://localhost/web/database/selector | grep '<title>Odoo</title>'")
|
||||
server.succeed("curl http://localhost/web/database/manager | grep 'database manager has been disabled'")
|
||||
'';
|
||||
}
|
||||
@@ -4,8 +4,11 @@
|
||||
...
|
||||
}:
|
||||
{
|
||||
name = "odoo";
|
||||
meta.maintainers = with lib.maintainers; [ mkg20001 ];
|
||||
name = "odoo-single-process";
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
mkg20001
|
||||
xanderio
|
||||
];
|
||||
|
||||
nodes.server = {
|
||||
services.nginx = {
|
||||
@@ -3892,7 +3892,7 @@ assertNoAdditions {
|
||||
};
|
||||
});
|
||||
|
||||
run-nvim = super.run-nvim.overrideAttrs {
|
||||
run-nvim = super.run-nvim.overrideAttrs (old: {
|
||||
dependencies = [
|
||||
self.telescope-nvim
|
||||
];
|
||||
@@ -3902,7 +3902,11 @@ assertNoAdditions {
|
||||
# Issue: https://github.com/NixOS/nixpkgs/issues/394939
|
||||
self.plenary-nvim
|
||||
];
|
||||
};
|
||||
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.gpl3Only;
|
||||
};
|
||||
});
|
||||
|
||||
rust-tools-nvim = super.rust-tools-nvim.overrideAttrs {
|
||||
dependencies = [ self.nvim-lspconfig ];
|
||||
|
||||
@@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-5xOaNdKtE2p1f1vg7nRtrIOyKsfNCTKpkpVsMn5brz0=";
|
||||
hash = "sha256-cn/GLWORkVa/mJRdpV5jqOm5iFW1QFFrTlGPGCzm1/o=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-bbB/2qLNdnZUXGsMscYFeInvJAb49CMSqnQRC4EqO9Q=";
|
||||
hash = "sha256-w7RB1WI5Lyn8LkFarIgwSTbuECuLF0wT5ht3jnGO+9A=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-NjA5HuAM5Rt3PwkX8Rv6kPwnVVMFFFZLWyqPWy5tVY4=";
|
||||
hash = "sha256-XTE03L6SrIGZNaz2/XSKGLp3D45EWeh6RUxgBabURz0=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-Dqi+3C7wCyrvdmh12/tu0MEXrlx0WRFB93h4tqGtQ48=";
|
||||
hash = "sha256-Xq2+C9/g9y+K9s6qIMgUZxyyPaMSLQI31uLyR5dAyww=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.128";
|
||||
version = "2.1.131";
|
||||
}
|
||||
// sources.${stdenvNoCC.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
vulkanSupport ? false,
|
||||
sdlSupport ? false,
|
||||
usbSupport ? false,
|
||||
mingwSupport ? stdenv.hostPlatform.isDarwin,
|
||||
mingwSupport ? stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64,
|
||||
waylandSupport ? false,
|
||||
x11Support ? false,
|
||||
ffmpegSupport ? false,
|
||||
@@ -268,6 +268,16 @@ stdenv.mkDerivation (
|
||||
}
|
||||
'';
|
||||
|
||||
# Fix dcomp test for aarch64
|
||||
postPatch = lib.optionalString (useStaging && stdenv.hostPlatform.isAarch64) ''
|
||||
if [ -f dlls/dcomp/tests/dcomp.c ]; then
|
||||
substituteInPlace dlls/dcomp/tests/dcomp.c \
|
||||
--replace-fail \
|
||||
'#error "Unsupported architecture"' \
|
||||
'__asm__ __volatile__("mov %0, sp" : "=r"(stack_pointer));'
|
||||
fi
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
prevConfigFlags
|
||||
++ lib.optionals waylandSupport [ "--with-wayland" ]
|
||||
|
||||
@@ -12,7 +12,13 @@ args@{
|
||||
callPackage,
|
||||
darwin,
|
||||
wineRelease ? "stable",
|
||||
wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32",
|
||||
wineBuild ?
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
"wineWow"
|
||||
else if stdenv.hostPlatform.isAarch64 then
|
||||
"wine64"
|
||||
else
|
||||
"wine32",
|
||||
gettextSupport ? false,
|
||||
fontconfigSupport ? false,
|
||||
alsaSupport ? false,
|
||||
@@ -39,7 +45,7 @@ args@{
|
||||
vulkanSupport ? false,
|
||||
sdlSupport ? false,
|
||||
usbSupport ? false,
|
||||
mingwSupport ? stdenv.hostPlatform.isDarwin,
|
||||
mingwSupport ? stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64,
|
||||
waylandSupport ? false,
|
||||
x11Support ? false,
|
||||
ffmpegSupport ? false,
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
zlib,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
# Used as a workaround for ucrtAarch64.
|
||||
# compiler-rt due to pthread.h not being found during cross-build.
|
||||
|
||||
let
|
||||
version = "20260421";
|
||||
|
||||
hostArch =
|
||||
if stdenv.hostPlatform.isAarch64 then
|
||||
"aarch64"
|
||||
else if stdenv.hostPlatform.isx86_64 then
|
||||
"x86_64"
|
||||
else
|
||||
throw "llvm-mingw: unsupported host platform ${stdenv.hostPlatform.system}";
|
||||
|
||||
hashes = {
|
||||
aarch64 = "sha256-6c+lqTKQy4Utxaa5DM3iVUA6YzMmSL4XFHDKPBrTeCg=";
|
||||
x86_64 = "sha256-+LjM53mv/qtHvK7Gzm6edosWYJSjZhI+9kstCzicwSE=";
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "llvm-mingw-${hostArch}";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mstorsjo/llvm-mingw/releases/download/${version}/llvm-mingw-${version}-ucrt-ubuntu-22.04-${hostArch}.tar.xz";
|
||||
hash = hashes.${hostArch};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [
|
||||
(lib.getLib stdenv.cc.cc) # libstdc++
|
||||
zlib
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -r * $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
autoPatchelfIgnoreMissingDeps = [ "*.dll" ];
|
||||
dontStrip = true;
|
||||
|
||||
meta = {
|
||||
description = "LLVM/Clang/LLD-based mingw-w64 toolchain (prebuilt)";
|
||||
homepage = "https://github.com/mstorsjo/llvm-mingw";
|
||||
license = lib.licenses.zlib;
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
@@ -28,6 +28,8 @@ let
|
||||
mono
|
||||
;
|
||||
|
||||
llvm-mingw = callPackage ./llvm-mingw.nix { };
|
||||
|
||||
# Args to pass through to base.nix (support flags, etc.)
|
||||
baseArgs = removeAttrs args [
|
||||
"stdenv_32bit"
|
||||
@@ -71,13 +73,19 @@ in
|
||||
pname = "wine64";
|
||||
inherit version patches;
|
||||
pkgArches = [ pkgs ];
|
||||
mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
|
||||
mingwGccs =
|
||||
if pkgs.stdenv.hostPlatform.isAarch64 then
|
||||
[ llvm-mingw ]
|
||||
else
|
||||
with pkgsCross; [ mingwW64.buildPackages.gcc ];
|
||||
geckos = [ gecko64 ];
|
||||
monos = [ mono ];
|
||||
configureFlags = [ "--enable-win64" ];
|
||||
configureFlags =
|
||||
if pkgs.stdenv.hostPlatform.isAarch64 then [ "--enable-archs=aarch64" ] else [ "--enable-win64" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-linux"
|
||||
];
|
||||
mainProgram = "wine";
|
||||
}
|
||||
@@ -119,16 +127,26 @@ in
|
||||
inherit version patches;
|
||||
mingwSupport = true; # Required because we request "--enable-archs=x86_64"
|
||||
pkgArches = [ pkgs ];
|
||||
mingwGccs = with pkgsCross; [
|
||||
mingw32.buildPackages.gcc
|
||||
mingwW64.buildPackages.gcc
|
||||
];
|
||||
mingwGccs =
|
||||
if pkgs.stdenv.hostPlatform.isAarch64 then
|
||||
[ llvm-mingw ]
|
||||
else
|
||||
with pkgsCross;
|
||||
[
|
||||
mingw32.buildPackages.gcc
|
||||
mingwW64.buildPackages.gcc
|
||||
];
|
||||
geckos = [ gecko64 ];
|
||||
monos = [ mono ];
|
||||
configureFlags = [ "--enable-archs=x86_64,i386" ];
|
||||
configureFlags =
|
||||
if pkgs.stdenv.hostPlatform.isAarch64 then
|
||||
[ "--enable-archs=aarch64,x86_64,i386" ]
|
||||
else
|
||||
[ "--enable-archs=x86_64,i386" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-linux"
|
||||
];
|
||||
mainProgram = "wine";
|
||||
}
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "150.0.1";
|
||||
version = "150.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "b3710e1b35002312bf248e822681039b75ec1196f8d014c88b0377c9b06f34780469152a98ad967440a51a4a0ca45418ba6239438f869ae564cc82c023645179";
|
||||
sha512 = "e22fc66f7faeb9bef4036d0a90af4c27dabc45a3dc59c7290536bfe46c7624d73388d29b36a8999e364065fa31a5fa167596632229b0af9bc1baf4135fa29a4d";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,138 +1,138 @@
|
||||
{
|
||||
"images-calico-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "641e70087040bffb40e5d021f125ddfe3c3fd1cfa60a6c47abd1647bbc69a460"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "b91a3ffe046a2a3c6938352a0698da76bb88766df71c30e47ecf1ba41cd91da7"
|
||||
},
|
||||
"images-calico-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "02579703f9ec013132fb4f1a34d61bb067caa8a0eed987f09bab26bdf34c9d85"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "ba406b694207371dd59a08a4e22b6b8ad2506c5a617df1399d7084f52c04f383"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "60ebbb953e2f86f5a8fdc3617298d2fa5b867913c7d1223e7b2a6058a4b55cf4"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "60004be2877bc9e018c47b76f82779e754acd4931b19bfa4bb158c5013a44362"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "0cf92d03e00550af2edbef01f248588dc0ec84346c9068c38dea01e5b33cca0b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "d7eb347708ea97b387e90eed671c64b4e0a1e11fb60af4f94995d21e0ba840d4"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "825a67b5c88bcd4572b41d684d3a78bc860057331b446b906a43507f6313a40c"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "45709e41c8b5d1ff3c9e780c8f22754cb1102d25e78932572033a716ebf7b0f7"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "a7c22d3de484a2f9e9b6ca9d2a454d392160a1fada9a958917f2aa3bf3f38b81"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "d513d2d3887b6d6a9b91f24a177aaae736fe34af64d67b772b0e5c322c717437"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "65354b633f282f77d1462430e05d1814676235c257895c759f4ab67e5d995458"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "75afdb00dc9bf90a0bf153909df0886ea41d28c39387a6440d4830e00dd05f95"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "8b8af6dadeb165fed27993f0763c31f2fc55742e152c6432d712aa13841650b5"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "be15ffd05156b50b27cdac28768005a27484c0b16946f9ef2531bb1d0a6185e2"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "079198afe353632ede96795721c8c06d25095e94a37143d82aacffaa0858fad1"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "fa2d53df0ec302f5a5f418cb0eb4dc7c19e653c2345b1f4f9ae9a46f267013ad"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "094ec55290bd89bb058c979a80216ac4d49e3d081e45ee7e1ebb08fb12ea0f50"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "ce5325e6bd901a241bf0f06929da7ac35352c304f9180598b89502adbde603cf"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "d439daf97b18bd91c1b716c22c51a3131ca30b8a8107a33cc98e2238d7fe2ff7"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "cadcaa43d750d68ea137b63b1a4bf36eea64b4c05d3d7573420ea065b58c9803"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "8d02d4ef7460929b8dcc8f6be838e8822443bee546e01f0852b158fa8ea1d18e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "7099afbc3ea21b9969cbb90a694093f91d862c6da671340753f01ddbdb7c6d25"
|
||||
},
|
||||
"images-core-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "8a21224c48ddfa8d234045cfeb4f8610df3f4114d2e927310694ce563d5db6e4"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "92e2f3d822fdd264a133680a909aa03104e75ab784e8b819c5ab3c6e7452ba79"
|
||||
},
|
||||
"images-core-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "824fc4f4c13d04acec697355dd6c89fe334ec7a0034305fbbe55410d08584e10"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "3916099fd9c991ce5f837dad902f187aed47d7fce066cc5ffcc37ad43a909ece"
|
||||
},
|
||||
"images-core-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "fcae3611339ad4f0437fb5cc8c4f246dd3d49b88d908533c9293eaef14544b4f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "24a3e2a68b8f4c16dea632ebe2b10876737c8fb5a457273cef83f0b935e3e793"
|
||||
},
|
||||
"images-core-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "51ed4890c66fdaa75fa33dc2c01296b5231e678b5f0da674216f9f0e9ab04dc3"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "1440c406f7c9def8170e8b279de5298cbc2a91f72fda2290581660fcd614e1a8"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "8527c05d35be8b89343236c2e8c0d0159717750414afb554e14382e348a3984f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "de3abd803043588ae3c349a276dd52093528a3ae86115c9d4979982b6a1d59d3"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "99e1aa2dcf3f39d736abaf8cddf229d9931ab4c80940881cd7c6b89ff357bd17"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "68b492ed357fcc513adc0baf0a5306a625d5eccfda4389ab303e4f03d1d54ca3"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "0e14946966080e5a71852eb140489916271de41ef9c7a91c5c3bd1dc6c4c3ad8"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "046f1884d788be8fcc343c73d7ff699d8be89fe6c607e0536b4a8732c5d27a13"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "c94fecb19b6b1eaa347c49fc60def2e1251d866714e9ab05ea6ce29d5da41fb3"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "0d1c03990ca8e243ba4a291312f1a1ce62b52e28170ee6f85b0a95f8032b3eef"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "2580870d652d80dc9d2f6904cb247d42490a96760d020a4a054e5cdc6f68a873"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "b0f286a53c7da0f9275da9a4e648913b588ccfcf70c8289886e48008f256ea51"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "9def3c6c9094030c258e6e02aa24195f33e4f2ce6abdb5d7a219100bf1d86e11"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "4d4340241b1e417cac9be28f60b6a4f48bb6e513fb01f261bb72e47b162b8917"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "9f5777b154a7df4977cd12d162ab559edd8c1ec1a716aab4e2b33e5bb39ae69e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "a5a225e9b8d57bccbb04095ab86d77897ef39beda4c9db56fe43152f7922e213"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "47f9647b674c412ceb915c71790ca1ce71424f733d0dbdb675699335fb33d2d8"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "3786e9642a9ad14a55c87917ca8a3b2a03b9cb8cf7ee7320d0ea4e122c566a8f"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "7e3ed1fa01a9f44dc957f2adc6e5e877b1e1d32b94a3ea5a1722ed1d12c9189b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "a6d84f504820e9199859f7943662e1232621ece3bd1559c1e630dfac2726f344"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "8d3884444e465f8f41a8fc64d2af0a9ee010239ab5d7cc531fdad8e8e48952f9"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "d2084cdb68c8a68d70854b68d15382baddc197980d48de0d45707391f252656e"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "92fc511e73ffc08defc7b8e71fb6ef769531cb2a8fe3ed2053d4a7d337644cf4"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "ceb393f3f89bd550de3ac4bfdbfa4d090fa6693d7f0b3428bd0db5dc4ebd7ac0"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "ba77ac84eda9704594aa9eb6629430f7b60606fb532e245c21bf4ca0f7fbee9b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "fe7cda504690bcc90694b9c88c6bab70ea4e89d14c17ab0b726de6eaa3c3055d"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "87ab074fda05e5d55dfeda6c1af492c8e87b2f37a1087183a8faa73ca07d7499"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "d24aeb2d60ee5009dcf663b6edea6a5a30ff4486a98b91f87661b02d83fc116c"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "3b5b1a5016c70cc91676165a21594ce9ddc8866704c54613b98e5360e59a9f30"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "2fbbcb3af0673dfd2f046150fb0775468f6139dd41537bd8bff77f3bdfb5ffbe"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "beaee2bd0190ecaee7a61f74c20cc4586c1f6e80f74dfe4d2993ec5468f7d26a"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "ae97992ad44e403271ce5b54ed5856c06ab8a2decade2768debc06d3ca6e0486"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "c642a0fece74ba83840a1683159c06ca029012eda63458f42919ca69d14bd724"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "c458b9de8dd82d2f39b071551ce3605fd602ece178e03bb81b756dabf69471e8"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "0e62fd6dae520a9ef9d0ab252cba54d86d434c5de60eb4018f7577877a6b3ae5"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "857457306f280f261deb1bea6663a8146ca3d0539311920a81252ad611b93a72"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "b954552b6235421c910330e2c80a7bea34c93ea64ad15fdfcbced66b826203b2"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "c78e808f09935dd0c633ed4b63c9fadbe6577b7992b2111a9c884bf042710a97"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
rke2Version = "1.33.9+rke2r1";
|
||||
rke2Commit = "91477e5799063a35553b4d855e7a21bdd53c7009";
|
||||
rke2TarballHash = "sha256-2QLG5FHmKQJWu/UjdwtXvXpoNu/to29ORDbo7SgjXSI=";
|
||||
rke2VendorHash = "sha256-1hkGjui1RDE8UzK7h2SrhYwUX59lRsHLJ3g/OQZ9JTQ=";
|
||||
k8sImageTag = "v1.33.9-rke2r1-build20260227";
|
||||
etcdVersion = "v3.5.26-k3s1-build20260227";
|
||||
rke2Version = "1.33.11+rke2r1";
|
||||
rke2Commit = "9e559b0969f73df7242fd618386ffb475ae2d460";
|
||||
rke2TarballHash = "sha256-+OnesNR5rnT/jwANvHGyM9ZLoBm/yvTyDD/idP7ncT0=";
|
||||
rke2VendorHash = "sha256-9zXirLuvIR/su5irILDgOI6OqbatSeTrenBLgSZEAqY=";
|
||||
k8sImageTag = "v1.33.11-rke2r1-build20260416";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260415";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.33.8-0.20260211145912-3552cfc26032-build20260211";
|
||||
dockerizedVersion = "v1.33.9-rke2r1";
|
||||
helmJobVersion = "v0.9.14-build20260210";
|
||||
ccmVersion = "v1.33.11-0.20260415182038-2566e39d309b-build20260416";
|
||||
dockerizedVersion = "v1.33.11-rke2r1";
|
||||
helmJobVersion = "v0.9.17-build20260422";
|
||||
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
|
||||
}
|
||||
|
||||
@@ -1,138 +1,138 @@
|
||||
{
|
||||
"images-calico-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "3bb5170ba08641b4a285dde9fabb65348f186e1c507d84fa540fe6e966e8aad0"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "a1dceccd822e24281f715a4a608539507968ffd97810484d3e370b96017f16ff"
|
||||
},
|
||||
"images-calico-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "279b3a0ce8d142c8c24a60e1af7a1be542355da75549cec27b3b1135da3da0bd"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "a9de3a4aef52e0ead9a69156556f8432d9026a7fd1716770185863f14c7d7f07"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "b144a24be9db33353d78c3c7147c0cbdc3ac66e80e914760d17851f5ecd69373"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "df74183ec867c9c607d8ab3286fa3bc19dd92088e1074a1f8a75be7a4a290e57"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "2a2345c6daa2742119fc36118f6b08240465c65354efea0d67c1272fb0d905c7"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "8c91f98adc2f4ee970d13e230525692b5622124627163e956e7a597e24fc5c80"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "e500be563eca5c594af9b893abb8187a7f1d8a5dabff2f901d3b5f43c9e7ee31"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "51ba6ed5197c381f2303e8a09cf4a453026b910bf265b077c3fc7ab3428f6ced"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "a7c22d3de484a2f9e9b6ca9d2a454d392160a1fada9a958917f2aa3bf3f38b81"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "924e92a89d33e1cd8ffbcf15787d4d5b02883a8b3714f3671d239670aef59ecc"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "c6aa1b6be5e0795b9261ce53b98421272a03f3351844a70f2677fc36a24af96e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "2e2386f91dc12d6f50a69d04e90322d0075bc0881263b2566679e94a9da11873"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "8b8af6dadeb165fed27993f0763c31f2fc55742e152c6432d712aa13841650b5"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "be15ffd05156b50b27cdac28768005a27484c0b16946f9ef2531bb1d0a6185e2"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "34c22f24882d990843880e297c3296406b76ed270423b6a512c7bba6a3d855cd"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "e3773afb1951f0c21eb37e155fa7375bbf12c8fa884dca2cd5338dcc918d0151"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "1ab41422cc16f5d030b8f62889133dff5d9dce985fbf13360c16049340ede6c1"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "944c1785483bffb7f20559432fea2d1b7d3ce6a37ac344557c7a1c8293fa4e8c"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "f5736ff7058e98562a6de4720207a7aa47e85633e6cd186c2d50b743934c44cc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "8426be3703efc7126d1a25b2fc2738d6b63ca202c32dc3b3d9c72d4b1e0f8757"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "41dd1cefcaf487a8b3269c6a06ef114ee91d362855bb3c807d15795616bc346c"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "7136a51e4c62479664010d19fb4acb05794cdbea9c0d7c9ab0f2cd1486ba96ae"
|
||||
},
|
||||
"images-core-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "2622a22bb70fb4d5167bb116fde2206925d209429ff1ae62fd585f788aa2b885"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "11659fecf1ec1b98a2fabfdc4b9db4fac79513b383b0ae51c0bd4d359317548d"
|
||||
},
|
||||
"images-core-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "0916003d2cb70501fffd58f278a8b24a1f2c991a9b5d9013b4ba7e8aef92e577"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "2fe0b9b21ad6db41b7d6d6d682353844efb9e44d520d69824b7e46c503a73a67"
|
||||
},
|
||||
"images-core-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "e3f71f6ac15157c2f03ca9999580f112acdc11f440b1a2f084e08ab7dbafb0fd"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "0bdcf82427f6fe49e211c28023ea0a4390f0abf4811f1c94b5b3442cdab9c2e0"
|
||||
},
|
||||
"images-core-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "92b648b60561fec1252194c70949e5e9ea4bd3fa4157e05663f69493bae74138"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "44212de2ccbed50fccd9c9c5c2648a3883b3efcc1ee00fc4554defe61bb64ffa"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "d0350e10ed7766927b4400eab8dda06029ebc72df4ef36f5708056110b74b2fc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "7ad8b7519b8b7faed7788eb362a0f667da81021466c6bd5a911be2095be47c87"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "d843630e86003cf4b18a1ef070b44c3a73e1431770244e853eafcecdb714bfa3"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "05d378074e3886f42858bd67dedcda0ad1f926faf69f2ce5bdc6e2a97a29a436"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "8037cc34fc3de43395ef89025509c584ac98b9bf4a9e7cb7159b0f24540765bb"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "618934aaa80d160f8b39466f260b7d47946eda18ed8c0f52e3a1545e087f01cf"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "c94fecb19b6b1eaa347c49fc60def2e1251d866714e9ab05ea6ce29d5da41fb3"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "26803301b9d26b82afeaa7aa94b66ec80825c3cb2b42f7468f60a3770926744f"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "6f8bd02f7c9122238c667f97379ed59756c4dcd2c556ab222ba32970eb1889b9"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "bd9f7cf98e625f62b10bbdfded475f3f05d04e80f07deb195f6778fb1b9c9df0"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "236fb612c6cc5870fb075c0fe964544e3b1c66463c11f8fa84c9bcc6c5c1e93e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "532ee3aef895744d85899634cbd65023f6026b3b494c97ab9ac8b38188ce3bdf"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "dd3649306bef4a412ca4125c7a71c00225dec711dbe218b2b402f1c7ded8b277"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "63c55631be709190646f5e70a17dd7ba54f5593420b83496e252e01543f02096"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "66e2f545da94a72d29090d69cf9a225024095a4f1a644a5bacf1b2e1873665ee"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "cd12831ceb77a071fdbd9f0ec37fbcc60cb99d6dfd4f3901803b27ea318fa38d"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "1e25054f03859407565f9598791212868bdffc007513e21a537a20ada1da8a22"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "00a39e85d561fac062c000bc8e663b10d44c9d14a425ee6cff343f2869bf2ed5"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "035612c8628d1d18548082bfd72db0393949fbfd5f21a35d96e22dc7070a5d52"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "cfb4cea40d0ff547033bb75eb5ff3fb160633284bd433e0acee57e88c6b697cd"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "1b6b6f55366e0e7014fb3241d7bb01b786eebf72a13ed1e7c7ea86850d31f28f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "753a1715fc153dfe940778bdc00fb86ff5b0de1c590261777e6e280d838aa02a"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "d3eb6dab20944a417d0cbc6eed3a4838c008646a40c3e6b637729f7f9251ff8c"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "d84f65ba2aae7706313d3009fc471335a1acb8ef091e1369ccd3054bf010f0c0"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "3e0daa3ef4f04bf1739e76640fdec8956d81f07d2263b1a3d66555cc0944c17e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "dc97c8fc3016eae77ef15de114d7d26b850d5ad6d15555a1e827a7fb78c0573a"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "3b5b1a5016c70cc91676165a21594ce9ddc8866704c54613b98e5360e59a9f30"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "2fbbcb3af0673dfd2f046150fb0775468f6139dd41537bd8bff77f3bdfb5ffbe"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "5313e18d388665b358dc8c4f11112d0798ae76b0d03c4bb101de44b334c11479"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "a067bc1b29dd65e7c96fee7e69659bb254abfccd77451d357f17c0c017849b1b"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "c642a0fece74ba83840a1683159c06ca029012eda63458f42919ca69d14bd724"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "c458b9de8dd82d2f39b071551ce3605fd602ece178e03bb81b756dabf69471e8"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "4435f093077efbd3e635aab2adb30837d91e45cc28c062918ec0af275317334b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "5f1e96e34a1ba8d3e5aa703a259ac0726b994efab1a9f38a058ee6c7b056b41b"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "861be8cbcc110ba986dc1443c83811c2c4ce92a534895f4cfc231d446ecf11d0"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "3a7cb81f2635f5771c95e57029c0a6538b2b470857b92188a5180ecffc665624"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
rke2Version = "1.34.5+rke2r1";
|
||||
rke2Commit = "105ddbd880270e1edcf8ea26a73e1f9be922ec83";
|
||||
rke2TarballHash = "sha256-Wc0kZsPfxSi+HoNLo//CYDUROiOkdYreUkcnlYQc7uA=";
|
||||
rke2VendorHash = "sha256-qYMOtIyRb3iZnEunssZOO/O8a9muhFZr62rLH9P7+WU=";
|
||||
k8sImageTag = "v1.34.5-rke2r1-build20260227";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260227";
|
||||
rke2Version = "1.34.7+rke2r1";
|
||||
rke2Commit = "6fb975ad761d191a245a4c0215843e8c19423ac9";
|
||||
rke2TarballHash = "sha256-2+EVvexT0oco6xI/nAfau4yz9wotynD4ejm6xC8JssQ=";
|
||||
rke2VendorHash = "sha256-eX29l/K8UIWkSKIcJBn9Be2zPqxqoWlsmK0xs/bdxOo=";
|
||||
k8sImageTag = "v1.34.7-rke2r1-build20260416";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260415";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.34.4-0.20260211145917-c6017918a65c-build20260211";
|
||||
dockerizedVersion = "v1.34.5-rke2r1";
|
||||
helmJobVersion = "v0.9.14-build20260210";
|
||||
ccmVersion = "v1.34.7-0.20260415182025-e7567db58dd7-build20260416";
|
||||
dockerizedVersion = "v1.34.7-rke2r1";
|
||||
helmJobVersion = "v0.9.17-build20260422";
|
||||
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
|
||||
}
|
||||
|
||||
@@ -1,138 +1,138 @@
|
||||
{
|
||||
"images-calico-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "adc04088139474163dd7e2f0f80ec7cd9918c50c1f6e4a518d84b1e6f0a717b8"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "1563bfb894ac077320a8ef535c3c3caa541b7ed19ca9181920702bfdd7e6e57d"
|
||||
},
|
||||
"images-calico-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "13b07010c7f9e002557786590b4e3a7e8ad043f6d90ec557eff59e2ffddda11b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "30a3c779a7b87884d6a2185345407842c42d4d5de16e1303f4a86cb07de316ac"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "4e48981cdb0c47b0bc4d19ba7851203c9f862e175a0e791291c69ad5b7f10147"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "b4afde3c8932c286bbaa0835a50dc7854cc951a84dddfa1d376aaf49e97bc3d2"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "1a7db48cd3667b5142eab1ebfd03c1e2c33dd4555aef9a928682c744ea8e568a"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "3d7536615244d0f60d666c95fad1efa834b93e64b7b1117e2a0d33d7869136bd"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "d5d7e0ec035ce8d8c206791a40e384376afad18f830412977c51a280ff2c8067"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "e031ac4cd1c2e5152b751370af1905404edd15e6bf662213dc22441c535c8985"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "a7c22d3de484a2f9e9b6ca9d2a454d392160a1fada9a958917f2aa3bf3f38b81"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "d513d2d3887b6d6a9b91f24a177aaae736fe34af64d67b772b0e5c322c717437"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "441b03258d68260f7ce0a6bda7acee9c2b2a4515182a5ecf55e33876586ea50a"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "9ee8839e3060464ff0d3c8aabf9d992bcffc97df7e0ec04445b56d0a36fb341b"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "50f4d1b1bb03523b922d7ce989d2d83f009d751d7fbf4aa8821fe52c9b9fd96d"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "837a399259b8fd41e52d7e9f7f9d263c4678b76954fd280966b012a2516a00aa"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "feaddac5752336c1a883d39848fc604ff2e0c92de3a027460f55303b2591c228"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "a86d13c29b8c7cc65d1bb4575352ea4106c7a893fa34071b00d8abf7c96fdb3f"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "443a2c6052035d4953f27516d0dcab0f9a7f68ae93f0c48da74f9569096b87cc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "96757062b058c0a3617a4b20c3749ad9be738f884f70d2ace87f18b9a943d77e"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "98dbee7b3e4a17e42dcf60d1d9bea593ad961893659504a7388ee4dbf1cab4a9"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "af212d7b0925dedd7099b212a7d6ae3b315cf87cb744d0448bbc10a7b3754dfc"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "827081118238089e882b2b14218fcb8bade4ea27fde7a460b626c111796cdc50"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "1b1faaa36f90cfe78e74008a68af69919fb661c34cc8a567e8a06bdb4a398f06"
|
||||
},
|
||||
"images-core-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "e5447136a26f542f7bb0ef9045c1900472928952623e73737e1e6f1eb3900b8f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "4a01c3364f5891fbcb329e17e9f6662631d303be63b545373f483377f055257c"
|
||||
},
|
||||
"images-core-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "8f802a9ca9822c0cae78b84e8a67c172294c9278ac76503b1f8b04c5701d9491"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "e8355a07f9fbb1e2d3442a07796d8a5e0f359ec0f1cbd10f372812970542fabb"
|
||||
},
|
||||
"images-core-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "06f57e254ac74f4a7d7a1195592c0fee130470dd0fe23bd7f6fd54f25f3b749a"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "3875876ee6d45d3bcb1fcbb97cf738c8afd64242d590f896100b1f71c531d8c0"
|
||||
},
|
||||
"images-core-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "aeca03ab172bd667742262e942b1d799f5524a96757de3c0aab4b84f19b02ba0"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "ddfc6020222b15fc0eed8a5e9f9aefdee8334a039a20d0000801f40c81dd22d1"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "f50f5e118230b2b63f85a7a1c99f63a5331e1f7bccf0514b9800012e8a91339c"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "7df86fe7e2481bb9c04ec775d48f832899bd456c19208271ec23fd05f4176d2d"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "99e1aa2dcf3f39d736abaf8cddf229d9931ab4c80940881cd7c6b89ff357bd17"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "05d378074e3886f42858bd67dedcda0ad1f926faf69f2ce5bdc6e2a97a29a436"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "0e3669bc9b0d5f265b361817949f00e5f8cb2fea647b22d69a6c3c8bbf7409ae"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "2db5385f6d06d08296eb936bec9cad3db3d37620cd48b2b6def2deca58b11e78"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "fd01dba6b0b12d99e575f6c6f428be59d93d7bf89eba6721dab5f9727483facb"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "26803301b9d26b82afeaa7aa94b66ec80825c3cb2b42f7468f60a3770926744f"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "9d43e3d5cbebd9b060c645b101cc11025184309a33c448f91036f9b4c63fe7a1"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "5c3f8ea51103b12549d64bb790ec511aebd7ce53bd34fcbdc8564e641ae029ed"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "06b37736600989520644d34d2d5a4b797e40f298a9775c2a923e33a159d2c600"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "61804cf3ed8347bbea0dd47f7805bbbc550b3eb39844782beae442f8b7ef44dc"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "cd1b237ef3fcdbc193aa324c42385c21e5fd6493824b79e69e360036383589af"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "b9aec99429066e3cea35ddd6aaa16b1eb84435a2feb156f8a0a5af541f87bb07"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "7321e46d1822e3d3f5c9e751563e8cbd34eaeab77cbd85c7c93e42658ce82f17"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "d359809efb1030af287b2077e534e1ae0e2c1b777280ef65b614939026f9ae0f"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "45468bf2b855ea9ac2d4b560b9a974796bbcb9a9681c758e78db41cea0f94229"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "725862931f0675fa8699ce8a1167914d222d1d2fc3e689a20e662b9319a48683"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "988106315218556fd3ea366a6c27dde2a72c231e14d295c0f0f4cb26eddb88fa"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "c2015d80e510d2a9a3d8f0eebadaa65c8c4a4eed7f63948011ab8d0a3549a97f"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "1c85da0b7a7946c88d5f4d489b7a76517909f68d436a0558fe89d01a94c0f9ef"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "69b950a05bc980405a0f7a7ae96233924b33685d812def46cfae11fb30891010"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "27b8fbe74bcc4d7956b7a341e107b279372a295ae6a37855b20340defd8a6768"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "f5f6ffdfd37164d12624390c9292ee7436c4c6dfa5c8cc889852f356e6964167"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "dd6d4f1272bcda3e23d8730359848b346b8baed70b5b18eab64fd0dee555b4fc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "6c98ce847abbd827e9c48ecba380084348dd6abca838de34d748c502bf3a7978"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "3b5b1a5016c70cc91676165a21594ce9ddc8866704c54613b98e5360e59a9f30"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "2fbbcb3af0673dfd2f046150fb0775468f6139dd41537bd8bff77f3bdfb5ffbe"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "be4d81082cd9334ae1e196165f3a0a18f7d836560eb410b027f3d5ce1d5afb8e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "ff9491f09bb3c8e0444209c1070542d2381bc1ff450cda26ff9c000bb929a614"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "c642a0fece74ba83840a1683159c06ca029012eda63458f42919ca69d14bd724"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "c458b9de8dd82d2f39b071551ce3605fd602ece178e03bb81b756dabf69471e8"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "4dc6c827aee2411205c2dd9310f761b1f34fd481bae2d2dade3beb9b2e44dea4"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "311aa5805c5a6e947e65f1d48dac789428ee056679d142d8b96e791e78868b6b"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "945d0d7cce48975f14e4b5c1230d6ce70cdc4a968df63f8e2d1f6921387b7513"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "4000891ee00df8441d49b8d1864208dfd4d1287efcfed59fbb6c44626144ceaa"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
rke2Version = "1.35.2+rke2r1";
|
||||
rke2Commit = "b1cd9d8e735bcd84cad7407109423a8dd7b648d8";
|
||||
rke2TarballHash = "sha256-s5lZK7S+WReRF+Io9+X4bSd6mAvBq9qUXbYEOH++cFA=";
|
||||
rke2VendorHash = "sha256-3i//hVONK/QxIsiOth92fN0Rxw6Ex4cgBQe7NG//URc=";
|
||||
k8sImageTag = "v1.35.2-rke2r1-build20260227";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260227";
|
||||
rke2Version = "1.35.4+rke2r1";
|
||||
rke2Commit = "5dc4f4390d27d77b17b6506d8b22aed72aa4fbe6";
|
||||
rke2TarballHash = "sha256-VWhml35keKn9Fhj/SeySpusi8yzz9dwgPC2rfABXPrk=";
|
||||
rke2VendorHash = "sha256-uaPjOFSwCxMWH/LD8tvE0VttPWJ9agMYm4E2mWiuYfw=";
|
||||
k8sImageTag = "v1.35.4-rke2r1-build20260416";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260415";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.35.1-0.20260211145923-50fa2d70c239-build20260211";
|
||||
dockerizedVersion = "v1.35.2-rke2r1";
|
||||
helmJobVersion = "v0.9.14-build20260210";
|
||||
ccmVersion = "v1.35.4-0.20260415195656-e51c0636351d-build20260415";
|
||||
dockerizedVersion = "v1.35.4-rke2r1";
|
||||
helmJobVersion = "v0.9.17-build20260422";
|
||||
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
|
||||
}
|
||||
|
||||
@@ -526,11 +526,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"hashicorp_azurerm": {
|
||||
"hash": "sha256-YQV1akoUREn2FHtX+L9DixHo4ghm4wLSrQsAUv1nqaQ=",
|
||||
"hash": "sha256-grtfKOTj8LBG1LypCA3Nl/FP7z57kyF1HnMbBJAxM0E=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v4.70.0",
|
||||
"rev": "v4.71.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -1238,13 +1238,13 @@
|
||||
"vendorHash": "sha256-/4v25xY/fmfSAEALRbXu/a+x3nC1Ly/IJPOEKmYjgmw="
|
||||
},
|
||||
"splunk-terraform_signalfx": {
|
||||
"hash": "sha256-m+qD71tTqQycD+9xju5T83IaYCgJhkfh+byn6yrdfO4=",
|
||||
"hash": "sha256-pzro0Uyu12u1pKy22GrZAktoTKngjn4h5mZpABqARk0=",
|
||||
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
|
||||
"owner": "splunk-terraform",
|
||||
"repo": "terraform-provider-signalfx",
|
||||
"rev": "v9.27.1",
|
||||
"rev": "v9.28.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-u3WK/pLsuwySJX6GMNho8ImB+F+XXUPC6h+IQtDrOp8="
|
||||
"vendorHash": "sha256-L+J3vsxxmF3TjQaDL5Uo9IentkDJfGpjfzBYTQzzGvY="
|
||||
},
|
||||
"spotinst_spotinst": {
|
||||
"hash": "sha256-0Wc+QgEeizydsvtyBdnxgLhpYuBZLMB3JGjmTDXzJY0=",
|
||||
@@ -1274,11 +1274,11 @@
|
||||
"vendorHash": "sha256-R/+PS4cUtr8/twUXOPRiVweb5I9NNiD6mGOcAFr9IDs="
|
||||
},
|
||||
"sysdiglabs_sysdig": {
|
||||
"hash": "sha256-g1al4OJTbnnOIT6ZsjMhEzB+dXvMrBUzctw+Jh2uFYI=",
|
||||
"hash": "sha256-yjuh6JVIt+FYVe9yILORklwt/KiBFcjmZnEHf5oeQQw=",
|
||||
"homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
|
||||
"owner": "sysdiglabs",
|
||||
"repo": "terraform-provider-sysdig",
|
||||
"rev": "v3.7.2",
|
||||
"rev": "v3.8.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978="
|
||||
},
|
||||
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required (VERSION 2.6.3)" "cmake_minimum_required (VERSION 3.10)"
|
||||
substituteInPlace {dcpp,dht,extra,}json/CMakeLists.txt \
|
||||
substituteInPlace {dcpp,dht,extra,json}/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required (VERSION 3.10)"
|
||||
substituteInPlace eiskaltdcpp-{cli,daemon}/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required (VERSION 3.10)"
|
||||
|
||||
@@ -88,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
based on the NetX project.
|
||||
'';
|
||||
homepage = "https://github.com/adoptopenjdk/icedtea-web";
|
||||
license = lib.licenses.WITH lib.licenses.gpl2Only lib.licenses.classpathException20;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "age-plugin-openpgp-card";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wiktor-k";
|
||||
repo = "age-plugin-openpgp-card";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-uJmYtc+GxJZtCjLQla/h9vpTzPcsL+zbM2uvAQsfwIY=";
|
||||
hash = "sha256-z1Q1Sg6qcQwhNDI6dCMf4BejZn5K9VzqLCVvkisB//k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YZGrEO6SOS0Kir+1d8shf54420cYjvcfKYS+T2NlEug=";
|
||||
cargoHash = "sha256-MrtCm41Q/Zs3FZCkdsNX30vFFuxIHNHHz4fbhMXuxD4=";
|
||||
|
||||
buildInputs = [ pcsclite ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "akkoma-fe";
|
||||
version = "3.18.0";
|
||||
version = "3.19.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "akkoma.dev";
|
||||
owner = "AkkomaGang";
|
||||
repo = "akkoma-fe";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s9rHuZsNHQLCXqqF8VJPgiTHkHHXro97mUTvLB9WKfI=";
|
||||
hash = "sha256-2uyyW/Ai0lbjj/nxjpN039iskg9UQ4QqUmjnhvsj33k=";
|
||||
|
||||
# upstream repository archive fetching is broken
|
||||
forceFetchGit = true;
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = "sha256-QB523QZX8oBMHWBSFF7MpaWWXc+MgEUaw/2gsCPZ9a4=";
|
||||
hash = "sha256-oGmO2AVa6tGYIvs3K7bJ+5db6NxTjO1ZR40aZ/yJQ2M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
aria2,
|
||||
mpv,
|
||||
nodejs,
|
||||
qt5,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "anime-downloader";
|
||||
version = "5.0.14";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anime-dl";
|
||||
repo = "anime-downloader";
|
||||
tag = version;
|
||||
sha256 = "sha256-Uk2mtsSrb8fCD9JCFzvLBzMEB7ViVDrKPSOKy9ALJ6o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aria2
|
||||
mpv
|
||||
nodejs
|
||||
]
|
||||
++ (with python3.pkgs; [
|
||||
beautifulsoup4
|
||||
cfscrape
|
||||
click
|
||||
coloredlogs
|
||||
fuzzywuzzy
|
||||
jsbeautifier
|
||||
pycryptodome
|
||||
pysmartdl
|
||||
pyqt5
|
||||
requests
|
||||
requests-cache
|
||||
selenium
|
||||
tabulate
|
||||
]);
|
||||
|
||||
preFixup = ''
|
||||
wrapQtApp "$out/bin/anime" --prefix PATH : ${lib.makeBinPath propagatedBuildInputs}
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
# FIXME: checks must be disabled because they are lacking the qt env.
|
||||
# They fail like this, even if built and wrapped with all Qt and runtime dependencies.
|
||||
# Ref.: https://github.com/NixOS/nixpkgs/blob/634141959076a8ab69ca2cca0f266852256d79ee/pkgs/applications/misc/openlp/lib.nix#L20-L23
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/anime-dl/anime-downloader";
|
||||
description = "Simple but powerful anime downloader and streamer";
|
||||
license = lib.licenses.unlicense;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
mainProgram = "anime";
|
||||
};
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
version="$(curl --silent "https://api.github.com/repos/anime-dl/anime-downloader/releases" | jq '.[0].tag_name' --raw-output)"
|
||||
|
||||
update-source-version anime-downloader "$version"
|
||||
@@ -27,6 +27,9 @@ buildGoModule (finalAttrs: {
|
||||
"-X=github.com/bloodhoundad/azurehound/v2/constants.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
# flaky: races a 5ms sleep against a 5ms batch timeout
|
||||
checkFlags = [ "-skip=^TestBatch$" ];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -21,16 +21,16 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "balena-cli";
|
||||
version = "24.1.4";
|
||||
version = "25.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balena-io";
|
||||
repo = "balena-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NFZoJVhixD67dqLq0tVB2GtMHl0n6qngw1uj/Qqxz8w=";
|
||||
hash = "sha256-zDjSzjR5y4fQPMRVuddf3zTddFoaR4p1D6v/+BHQzZo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-yGPn9sJ5dsNIvrofqL1/F9E3T/vhI04RmZEQwjsHQa0=";
|
||||
npmDepsHash = "sha256-VE4HY8gRlB6r+qS/56Tj0UackFxO35/MFSY2l4EH0kY=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "beekeeper-studio";
|
||||
version = "5.6.5";
|
||||
version = "5.7.2";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchurl {
|
||||
url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/${asset}";
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-JQs/B2CkwUuVBWgn+eJCokE3wWNrQzl8nj8Rd1UcCgk=";
|
||||
aarch64-linux = "sha256-/yyXvp2x2elVUqDAzB7/jWQi2Z/7b1td8sGBD7WRPDw=";
|
||||
x86_64-darwin = "sha256-0cSsRiFCFVKMkPjUj3bC096ijZu8rAj0GObeLlpvaX8=";
|
||||
aarch64-darwin = "sha256-Mtf0xlEvFcsE7O2IgXFmOzVU7P9WKr5DhJRmf5WCU4E=";
|
||||
x86_64-linux = "sha256-PYgNkEixbIDcUKfWzYCsB0CZ4HlP2G3WHiN2xxvO/mw=";
|
||||
aarch64-linux = "sha256-VVv3qi7Fyd+pajmO1fxDjzcQL82ebXRlaPlOjiXOUxw=";
|
||||
x86_64-darwin = "sha256-kRSO/XPiUOsxWi4l6DQMkFYxL58XA1fOmtyyLDuQyr0=";
|
||||
aarch64-darwin = "sha256-IpHLpkk5gKrNK/OyhE3W4meDJCwfhcyyDJxiJ+GIZ+I=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "better-commits";
|
||||
version = "1.21.0";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Everduin94";
|
||||
repo = "better-commits";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JgAe55aMr6gP9/dEj3rDW5glA+ntftthJSCFYvtmWso=";
|
||||
hash = "sha256-d2e+vA8qPr5H70X6caeW+s4yjI1zGByvmZd50j2nAQI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-7+WMrkAYKQgUdOBI4jSOTt6gxwfCwft4GcUKMvpTiYc=";
|
||||
npmDepsHash = "sha256-18fkqQ3Y0fflSGXDPaMpHW7nC0ARMoCStxBzkEXiujs=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "biome";
|
||||
version = "2.4.13";
|
||||
version = "2.4.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biomejs";
|
||||
repo = "biome";
|
||||
rev = "@biomejs/biome@${finalAttrs.version}";
|
||||
hash = "sha256-Pie1oc1mc6lsdmSiOu04ci67DToDYRt36hdHsU0ZGXw=";
|
||||
hash = "sha256-kiA6qgW/kWaoLMIrWd7HraK7DOERMwCSvOTk5y7fkmY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ayFCjh1gBLOJoUnDKm+kwUzshGS0utqTewfe5wEdvQ0=";
|
||||
cargoHash = "sha256-sSZEukcCyEdoJ1GD1bNnXJkDYtNX6phiCj2EKJhHJZw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
makeFlags = [
|
||||
"GIT_TAG_RAW=v${finalAttrs.version}"
|
||||
"GIT_TAG=v${finalAttrs.version}"
|
||||
"USBLIB_TYPE=HIDAPI"
|
||||
"HIDAPI_TYPE=LIBUSB"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-deb";
|
||||
version = "3.6.4";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kornelski";
|
||||
repo = "cargo-deb";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-De4ouk+tub/sDSoIuEaoWYd9qjpLDA05xvuuQlaHF6M=";
|
||||
hash = "sha256-x/SUGHMW+MUpK+pFp3MfWc+2hgn5HDE0s12kp9Up1fY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jac3VFOCeYKuedFHt4lEfBHlErHdfczRF6Mrs8Se88o=";
|
||||
cargoHash = "sha256-Wd6Uj6fi4OtZJGz6QIzBNIdB5HnJzJWFMV53ucvr6Fw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-hakari";
|
||||
version = "0.9.36";
|
||||
version = "0.9.37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
tag = "cargo-hakari-${finalAttrs.version}";
|
||||
hash = "sha256-qEYdJhLt4f3+RZz3/T6/vlQgrQYK6S5dNEmu8QH/wj0=";
|
||||
hash = "sha256-Rf/1IhcvSp9Q8dLo/kuG0O9uIUH15Aw567ggaABANJw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NrPfdVAi0QblJKFsHTL0BGQWUnqQEpIJwW3HBVHFZpE=";
|
||||
cargoHash = "sha256-vL+1oJO9qTg/SX0mvt3hvKo1t3FhQJmUSLoK6LZuqZc=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
||||
@@ -1,47 +1,47 @@
|
||||
{
|
||||
"version": "2.1.128",
|
||||
"commit": "d6caed183d5f5b985cab02ef8c812d2abee9ecd9",
|
||||
"buildDate": "2026-05-04T17:39:35Z",
|
||||
"version": "2.1.131",
|
||||
"commit": "c122cd1bd5247f2a4bde8bcaec712fb1dff247e8",
|
||||
"buildDate": "2026-05-06T06:18:01Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "1a56ae4cd171ba7839fc2b03d558022ffaebb5693be532d8f3c344731063e979",
|
||||
"size": 216953600
|
||||
"checksum": "cc6066b0db7bb423c75316366542f771a41923999a76a5771afad87dd65dceae",
|
||||
"size": 217349888
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "eb7f5441fcc169a01ec6a655d7663dffbcfe9cb03491dc0c7a157e9e67da3737",
|
||||
"size": 218517840
|
||||
"checksum": "a1bd2c782c3f961987d7d6456f75b3fa538cc425f1573908850afedcb038ca5f",
|
||||
"size": 218914128
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "e2a31879b7433f658d915e6716249f10b913b467873950e8e7e066ba7c4d96e9",
|
||||
"size": 248973888
|
||||
"checksum": "0919cdf512ca673b38230882b458801b78e9248eb472383631cfc12d8d0d55cf",
|
||||
"size": 249367104
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "770c81373ad42970ef576676da78d6be60413f4ade23abadbf1343ca0809bb3e",
|
||||
"size": 248789632
|
||||
"checksum": "9af15b9302ffde3fa83e3ea4a41cdd00158301cd8badc755567a8e9149f1c36c",
|
||||
"size": 249178752
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "7d0e38623925ee076ede98392b2169bd88a2c529f080d7807ae03c350b6b2337",
|
||||
"size": 241699200
|
||||
"checksum": "78ffce2cad108ef1ca3301fc34307277b8a98e4095344b091b84be1678bd6ebc",
|
||||
"size": 242092416
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "b6480ddd313432e37b35a356c38067b1a76b900a936e30e975111ad11f70dcf4",
|
||||
"size": 243054976
|
||||
"checksum": "f712c043f6df7552b95d30d256ebc4feb9c3a642f04b0e823719b524e3128939",
|
||||
"size": 243444096
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "1d920cb73f612083ae4133ea4b63e1e8c7a4624a8ba827dfc928c12e86ad803e",
|
||||
"size": 254711968
|
||||
"checksum": "49204d250c5fe1797f74bc68f305016e72b356b06fe7ff1f8a651f7ad6a0df8b",
|
||||
"size": 255085216
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "3b957bec823951455840accbdb6cfa970505691ce39b1fefa9de5c32a2ee2ff6",
|
||||
"size": 250775712
|
||||
"checksum": "d1b1336200468b5e29a0e4cc8c1dfc5c79d01f11118d8594756243bb6102dc40",
|
||||
"size": 251148960
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "consul";
|
||||
version = "1.22.6";
|
||||
version = "1.22.7";
|
||||
|
||||
# Note: Currently only release tags are supported, because they have the Consul UI
|
||||
# vendored. See
|
||||
@@ -22,7 +22,7 @@ buildGoModule rec {
|
||||
owner = "hashicorp";
|
||||
repo = "consul";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UgUhTiDfbKqS0uMEfXzm9j8eNT6UKEQ6OidMQB+KlcI=";
|
||||
hash = "sha256-lcb2Dbr5rpNbtstEk7kQxEYHdN3/FQEHFH+NIa6czDU=";
|
||||
};
|
||||
|
||||
# This corresponds to paths with package main - normally unneeded but consul
|
||||
@@ -32,7 +32,7 @@ buildGoModule rec {
|
||||
"connect/certgen"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-sovOseYC72zUPY9WHDgemU7HcDpJzcsQsRALgHveins=";
|
||||
vendorHash = "sha256-tFa8UKeaAQR4q+WpRl/u5P+TpjdBh9Gf6bVQcwzP5QQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 9988e765..906917c0 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -660,38 +660,13 @@
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<executions>
|
||||
- <execution>
|
||||
- <id>frontend-download</id>
|
||||
- <phase>prepare-package</phase>
|
||||
- <configuration>
|
||||
- <target>
|
||||
- <get src="https://github.com/DependencyTrack/frontend/releases/download/${frontend.version}/frontend-dist.zip" dest="${project.build.directory}" verbose="true"/>
|
||||
- </target>
|
||||
- </configuration>
|
||||
- <goals>
|
||||
- <goal>run</goal>
|
||||
- </goals>
|
||||
- </execution>
|
||||
- <execution>
|
||||
- <id>frontend-extract</id>
|
||||
- <phase>prepare-package</phase>
|
||||
- <configuration>
|
||||
- <target>
|
||||
- <unzip src="${project.build.directory}/frontend-dist.zip" dest="${project.build.directory}/frontend">
|
||||
- </unzip>
|
||||
- </target>
|
||||
- </configuration>
|
||||
- <goals>
|
||||
- <goal>run</goal>
|
||||
- </goals>
|
||||
- </execution>
|
||||
<execution>
|
||||
<id>frontend-resource-deploy</id>
|
||||
<phase>prepare-package</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
<copy todir="${project.build.directory}/${project.artifactId}">
|
||||
- <fileset dir="${project.build.directory}/frontend/dist">
|
||||
+ <fileset dir="${project.basedir}/frontend/dist">
|
||||
<include name="**/*"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
@@ -1,17 +0,0 @@
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 9988e765..f69576b4 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -457,6 +457,12 @@
|
||||
<version>${lib.testcontainers.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>com.kohlschutter.junixsocket</groupId>
|
||||
+ <artifactId>junixsocket-core</artifactId>
|
||||
+ <version>2.10.0</version>
|
||||
+ <type>pom</type>
|
||||
+ </dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@@ -5,6 +5,7 @@
|
||||
nodejs_20,
|
||||
jre_headless,
|
||||
protobuf_30,
|
||||
xmlstarlet,
|
||||
cyclonedx-cli,
|
||||
makeWrapper,
|
||||
maven,
|
||||
@@ -12,7 +13,7 @@
|
||||
nixosTests,
|
||||
}:
|
||||
let
|
||||
version = "4.13.6";
|
||||
version = "4.14.1";
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
pname = "dependency-track-frontend";
|
||||
@@ -25,7 +26,7 @@ let
|
||||
owner = "DependencyTrack";
|
||||
repo = "frontend";
|
||||
rev = version;
|
||||
hash = "sha256-SSnbmAFXQwxAZQzMZeDzf/ebbWUVRICAs1msFXMMi98=";
|
||||
hash = "sha256-xjIRkffmXYMAfZ8wJehnPRfTThJjTgNL8ONl9N9ZJ+M=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -33,7 +34,7 @@ let
|
||||
cp -R ./dist $out/
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-2VK3LOqUxOJaR8cUuINhrhMkvHGyUr206RJR18NCvUo=";
|
||||
npmDepsHash = "sha256-CW9LOur8N3obrOeHgYFH2OO/vg8XihUspuXS5Zrix8I=";
|
||||
forceGitDeps = true;
|
||||
makeCacheWritable = true;
|
||||
|
||||
@@ -50,23 +51,51 @@ maven.buildMavenPackage rec {
|
||||
owner = "DependencyTrack";
|
||||
repo = "dependency-track";
|
||||
rev = version;
|
||||
hash = "sha256-EL0Yd8pfTG8/DlY9A3F0lRuPl/wU2/LyACclzttrsjw=";
|
||||
hash = "sha256-pIZM8FQ0IFqRbTQT5VIlCmS+fCCXULJJ6bdEv6xfjbc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0000-remove-frontend-download.patch
|
||||
./0001-add-junixsocket.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pom.xml \
|
||||
--replace-fail '<protocArtifact>''${tool.protoc.version}</protocArtifact>' \
|
||||
"<protocCommand>${protobuf_30}/bin/protoc</protocCommand>"
|
||||
# update to version 5.1.3 to fix NullPointer and specify protoc path
|
||||
xmlstarlet ed --inplace -N x=http://maven.apache.org/POM/4.0.0 \
|
||||
--update '//x:plugin[x:artifactId="protobuf-maven-plugin"]/x:version' -v "5.1.3" \
|
||||
--delete '//x:plugin[x:artifactId="protobuf-maven-plugin"]/x:configuration/x:protoc' \
|
||||
--subnode '//x:plugin[x:artifactId="protobuf-maven-plugin"]/x:configuration' -t elem -n protoc -v "" \
|
||||
--var protoc '$prev' \
|
||||
--insert '$protoc' -t attr -n kind -v "path" \
|
||||
--subnode '$protoc' -t elem -n name -v "protoc" \
|
||||
pom.xml
|
||||
|
||||
# remove frontend related tasks
|
||||
xmlstarlet ed --inplace -N x=http://maven.apache.org/POM/4.0.0 \
|
||||
--delete '//x:execution[x:id="frontend-download"]' \
|
||||
--delete '//x:execution[x:id="frontend-extract"]' \
|
||||
--delete '//x:execution[x:id="frontend-resource-deploy"]' \
|
||||
pom.xml
|
||||
|
||||
# add junixsocket to enable unixsocket connection to postgres
|
||||
xmlstarlet ed --inplace -N x=http://maven.apache.org/POM/4.0.0 \
|
||||
--subnode '/x:project/x:dependencies' -t elem -n dependency -v "" \
|
||||
--var dependency '$prev' \
|
||||
--subnode '$dependency' -t elem -n groupId -v "com.kohlschutter.junixsocket" \
|
||||
--subnode '$dependency' -t elem -n artifactId -v "junixsocket-core" \
|
||||
--subnode '$dependency' -t elem -n version -v "2.10.0" \
|
||||
--subnode '$dependency' -t elem -n type -v "pom" \
|
||||
pom.xml
|
||||
'';
|
||||
|
||||
mvnJdk = jre_headless;
|
||||
mvnHash = "sha256-UrLni4shNCv9aHvaGdkzFNBVe8BT4/z4cQ6Ekjr0l9s=";
|
||||
manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ];
|
||||
mvnHash = "sha256-4N4KuJBF/RFZwpp3dIgXntxSEfKHyfvrShKQoUqY5bE=";
|
||||
manualMvnArtifacts = [
|
||||
"com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1"
|
||||
# added to saticfy protobuf compiler plugin dependency resolving
|
||||
"jakarta.el:jakarta.el-api:5.0.1"
|
||||
"com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.19.1"
|
||||
"com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.0"
|
||||
"com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.3"
|
||||
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.0"
|
||||
"io.micrometer:micrometer-core:1.16.0"
|
||||
"io.micrometer:micrometer-observation:1.16.0"
|
||||
];
|
||||
buildOffline = true;
|
||||
|
||||
mvnDepsParameters = lib.escapeShellArgs [
|
||||
@@ -91,7 +120,11 @@ maven.buildMavenPackage rec {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
xmlstarlet
|
||||
protobuf_30
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
Generated
+4535
File diff suppressed because it is too large
Load Diff
@@ -6,16 +6,18 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "deployer";
|
||||
version = "7.5.12";
|
||||
version = "8.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deployphp";
|
||||
repo = "deployer";
|
||||
rev = "7b108897baa94b8ac438c821ec1fb815d95eba77";
|
||||
hash = "sha256-wtkixHexsJNKsLnnlHssh0IzxwWYMPKDcaf/D0zUNKk=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mbqwAYfEiJB1ELkxQwuMVmgXZZLi9jLjg33o0ZfgT4Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sgWPZw5HiXd7c45I0f5qnw4l2HwgLaTJwzmXw8140kk=";
|
||||
composerLock = ./composer.lock;
|
||||
|
||||
vendorHash = "sha256-X30D05d0PCmw2tHN7PC9PiAXVlnI6SkQg2l7G+tZ4Mo=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/deployphp/deployer/releases/tag/v${finalAttrs.version}";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchpatch2,
|
||||
bison,
|
||||
flex,
|
||||
makeWrapper,
|
||||
@@ -32,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./gs-allowpstransparency.patch
|
||||
# fix curly brace escaping in eukleides.texi for newer texinfo compatiblity
|
||||
./texinfo-escape.patch
|
||||
(fetchpatch2 {
|
||||
url = "https://salsa.debian.org/georgesk/eukleides/-/raw/debian/1.5.4-6/debian/patches/fixes-for-gcc15.patch";
|
||||
hash = "sha256-MVC2bkMGkkDqF/kg8MPvOYacUOXshaG2RZ0a9UVXLSI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fabric-ai";
|
||||
version = "1.4.451";
|
||||
version = "1.4.452";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielmiessler";
|
||||
repo = "fabric";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5eKARPLPD24MQLMlSIa76R7YoR1axCmn5vL9V7Zly5o=";
|
||||
hash = "sha256-2O/g0DC0ptxzEzXA1NYZWfdnUeIVFuLWNyw1uct2XyM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oSHrn2Oad6XuIFjrqeC4NGC/rasCu+49xADY15YNSbc=";
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "filebeat";
|
||||
version = "8.19.14";
|
||||
version = "8.19.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "beats";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rNXT8GVL5M/Hx0XA3oksbW1w+tt9FhobZlg2tCQxroc=";
|
||||
hash = "sha256-PHLdHY0XdcbZpE9yOjmb+9Eesb7M13+Je+/8cQ5Klls=";
|
||||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
|
||||
vendorHash = "sha256-4jLLZxnjV8QnHh/FtBWD0OcvcdqEMSJxFeRjURZPAVo=";
|
||||
vendorHash = "sha256-y4f5gJSb/XI0PVZol8cXgurquwtMaOk6mrWNLfNxRFo=";
|
||||
|
||||
subPackages = [ "filebeat" ];
|
||||
|
||||
|
||||
@@ -16,19 +16,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "firefoxpwa-unwrapped";
|
||||
version = "2.18.0";
|
||||
version = "2.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "filips123";
|
||||
repo = "PWAsForFirefox";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F/Sj72er6aNxoV/dR7wCafgAHOKkQ7267/E+vfXdfdw=";
|
||||
hash = "sha256-eNJKR6dmG4dDKwvWjC0Nbzk5ixNJtnRXjWJgxc9W5i8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/native";
|
||||
buildFeatures = [ "immutable-runtime" ];
|
||||
|
||||
cargoHash = "sha256-PnqfYZO454t9XCzc9dwNCe4Qcp0FrG82sQcHUNdEnoo=";
|
||||
cargoHash = "sha256-w3poeQsJf6s8uqqZtigJNHqnO0fpD7T4zyY3WzdE6Bo=";
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml
|
||||
|
||||
@@ -4,18 +4,31 @@
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
gmp,
|
||||
zstd,
|
||||
mpfr,
|
||||
zlib,
|
||||
flint,
|
||||
}:
|
||||
|
||||
let
|
||||
zstd_src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "zstd";
|
||||
# latest commit on dev (only branch that has that folder) that changed zlibWrapper (https://github.com/facebook/zstd/commits/dev/zlibWrapper)
|
||||
rev = "0b96e6d42a9b22eb472a050fcd2cc4be3ffb8e2b";
|
||||
hash = "sha256-EPsLRjCCj0ruQ+z7eBzr/ACF0wh5LzUmdpbw/w5moWU=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "4.3.1";
|
||||
pname = "form";
|
||||
version = "5.0.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "form-dev";
|
||||
repo = "form";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZWpfPeTekHEALqXVF/nLkcNsrkt17AKm2B/uydUBfvo=";
|
||||
hash = "sha256-cYO8B5uDJQ9eUc4w5Le47su3JS/jGYwUFtHFunuQaJc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -24,9 +37,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
gmp
|
||||
mpfr
|
||||
zstd
|
||||
zlib
|
||||
flint
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
mkdir -p source/extern/zstd
|
||||
cp -r ${zstd_src}/zlibWrapper source/extern/zstd/
|
||||
chmod -R +w source
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Symbolic manipulation of very big expressions";
|
||||
homepage = "https://www.nikhef.nl/~form/";
|
||||
|
||||
@@ -70,13 +70,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freerdp";
|
||||
version = "3.24.2";
|
||||
version = "3.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-gIe5MoPaKCTHlNGBt+Gc4QZFQ24avas9EBARtiRfLQE=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7yUqZXuUn3OFhlWrZyXmmh/aGOp0uRJ7XxaLl1fVnVQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -227,6 +227,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
|
||||
following the Microsoft Open Specifications.
|
||||
'';
|
||||
changelog = "https://github.com/FreeRDP/FreeRDP/releases/tag/${finalAttrs.src.tag}";
|
||||
homepage = "https://www.freerdp.com/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ deimelias ];
|
||||
|
||||
@@ -84,6 +84,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://github.com/ValveSoftware/gamescope/commit/4ce1a91fb219f570b0871071a2ec8ac97d90c0bc.diff";
|
||||
hash = "sha256-O358ScIIndfkc1S0A8g2jKvFWoCzcXB/g6lRJamqOI4=";
|
||||
})
|
||||
|
||||
# Backport upstream patch for wlroots fixing build with libinput 1.31
|
||||
(fetchpatch {
|
||||
url = "https://github.com/misyltoad/wlroots/compare/54e844748029d4874e14d0c086d50092c04c8899...c08d99437ec8bb56a703f04ad1ef199502c62d10.diff";
|
||||
stripLen = 1;
|
||||
extraPrefix = "subprojects/wlroots/";
|
||||
hash = "sha256-q2zekWNn111lX8N938y8HjREvlNMtdCLJ4RveX9z8u8=";
|
||||
})
|
||||
];
|
||||
|
||||
# We can't substitute the patch itself because substituteAll is itself a derivation,
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gerrit";
|
||||
version = "3.13.5";
|
||||
version = "3.13.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${finalAttrs.version}.war";
|
||||
hash = "sha256-Imhi9mZsLmjbwpUipQEdQLBbyBvMJw2THXkfxaikNkA=";
|
||||
hash = "sha256-nGKl5KNundR+FkiQ5CO/qBezOSNAHDHcPsssm1lZAhk=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
meson,
|
||||
mesonEmulatorHook,
|
||||
ninja,
|
||||
pkg-config,
|
||||
exiv2,
|
||||
glib,
|
||||
gobject-introspection,
|
||||
vala,
|
||||
gi-docgen,
|
||||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gexiv2";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
version = "0.16.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"devdoc"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gexiv2/${lib.versions.majorMinor finalAttrs.version}/gexiv2-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "2W+JXyRTn5ZvV3srskia6E+CMpcKjQwGTkoAdHSne7s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
vala
|
||||
gi-docgen
|
||||
(python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ]))
|
||||
]
|
||||
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
mesonEmulatorHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gi-docgen
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
exiv2
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
"-Dtests=true"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
preCheck =
|
||||
let
|
||||
libName = if stdenv.hostPlatform.isDarwin then "libgexiv2-0.16.4.dylib" else "libgexiv2-0.16.so.4";
|
||||
in
|
||||
''
|
||||
# Our gobject-introspection patches make the shared library paths absolute
|
||||
# in the GIR files. When running unit tests, the library is not yet installed,
|
||||
# though, so we need to replace the absolute path with a local one during build.
|
||||
# We are using a symlink that will be overridden during installation.
|
||||
mkdir -p $out/lib
|
||||
ln -s $PWD/gexiv2/${libName} $out/lib/${libName}
|
||||
export GI_TYPELIB_PATH=$PWD/gexiv2
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gexiv2";
|
||||
description = "GObject wrapper around the Exiv2 photo metadata library";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
teams = [ lib.teams.gnome ];
|
||||
maintainers = [ lib.maintainers._7591yj ];
|
||||
};
|
||||
})
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchDebianPatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -13,6 +14,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "sha256-j7iCCzHXwffHdhQcyzxPBvQK+RXaY3QSjXUtHu463fI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchDebianPatch {
|
||||
pname = "gputils";
|
||||
version = "1.5.2";
|
||||
debianRevision = "2";
|
||||
patch = "01-use-stdbool.diff";
|
||||
hash = "sha256-YuQqWWKC5cntaok1J7hZUv6NX/Xv1mI6+K3if3Owkzc=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://gputils.sourceforge.io";
|
||||
description = "Collection of tools for the Microchip (TM) PIC microcontrollers. It includes gpasm, gplink, and gplib";
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
pkgs,
|
||||
fetchFromGitHub,
|
||||
fetchDebianPatch,
|
||||
glib,
|
||||
gtk3,
|
||||
gtksourceview3,
|
||||
@@ -18,13 +19,23 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.8.3";
|
||||
pname = "gummi";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexandervdm";
|
||||
repo = "gummi";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-71n71KjLmICp4gznd27NlbyA3kayje3hYk/cwkOXEO0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchDebianPatch {
|
||||
pname = "gummi";
|
||||
version = "0.8.3+really0.8.3";
|
||||
debianRevision = "6";
|
||||
patch = "0002-build-with-gcc-15.patch";
|
||||
hash = "sha256-YNOVgZHJIVy7y60FOZRI8N8qxoOkUsResLo0PNZ0dkY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
intltool
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "homebridge";
|
||||
version = "1.11.4";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "homebridge";
|
||||
repo = "homebridge";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-usp7zszkEfGsWXApywAolFhG0i59Pr/IvvaBMeU7YHc=";
|
||||
hash = "sha256-KRDeS9qYefdafGpX8RF68ce6uSlS22aIRqJimmhI8Ko=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Ci5aIDIEchB0niORK2cRy06qObLplCSogo6wRVXv9Vs=";
|
||||
npmDepsHash = "sha256-CkizIWaHzmotAr/64yY2wKAtqFoBdr5ylN5WcgdpMis=";
|
||||
|
||||
# Homebridge's clean phase attempts to install rimraf directly, which fails in nix builds
|
||||
# rimraf is already in the declared dependencies, so we just don't need to do it.
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
}:
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprpicker" + lib.optionalString debug "-debug";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprpicker";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7zYWeFIqdpvH5rQ0KF0dSyNaKghyTAXeEvhrgXiXCs8=";
|
||||
hash = "sha256-ABumeksE8Bvtdb6g4vJ2jA9BLlYHnXU86VAuKJhBPoY=";
|
||||
};
|
||||
|
||||
cmakeBuildType = if debug then "Debug" else "Release";
|
||||
|
||||
@@ -38,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: libvars.a(vars-freeze-lex.o):src/libvars/vars-freeze-lex.l:23:
|
||||
# multiple definition of `line_number'; ifm-main.o:src/ifm-main.c:46: first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
# gnu17: libvars uses K&R-style () prototypes; C23 redefines them as (void).
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon -std=gnu17";
|
||||
|
||||
enableParallelBuilding = false; # ifm-scan.l:16:10: fatal error: ifm-parse.h: No such file or directory
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "jwx";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lestrrat-go";
|
||||
repo = "jwx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tVvesVrsbFONhmpFo59c/kC3vxAjWpQwnbaUmrx8O5E=";
|
||||
hash = "sha256-CGBQF//smVUt1/SQkxvZJ+7zlAhAuxVtO3WWWHCSvII=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jCAHyCfTEcbtGEkxPLJvXJ90mVDyijWOoHJ5dbJouCs=";
|
||||
vendorHash = "sha256-g+kawcxLJdR77kkR6pJoRKe48kV+/kS33gYjOY30pAc=";
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/cmd/jwx";
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lego";
|
||||
version = "4.31.0";
|
||||
version = "4.35.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-acme";
|
||||
repo = "lego";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YzslAEZVJDAa8Q7/YTWb2pH0MiWwgHipL11A/UD+nYg=";
|
||||
hash = "sha256-NBCvVlMDEEhlfWWG7X5T1Udg+42+ibS1Ph6F+/yrXF0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9ead3yA/fvNRP4uP2O6Wy6aRzVAig3iyin8UgMcA8mc=";
|
||||
vendorHash = "sha256-Q85McGGSILE8BPwreCtih6my1nih9ameLKHFe1dgNWQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libgpiod";
|
||||
version = "2.2.2";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MePv6LsK+8zCxG8l4vyiiZPSVqv9F4H4KQB0gHjm0YM=";
|
||||
hash = "sha256-PtkJZ9p6r6S47RjiCRv4cVmlY4BHdB6FCMJ+M/IPnw0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libphonenumber";
|
||||
version = "9.0.29";
|
||||
version = "9.0.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "libphonenumber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VhVPLDD7KHRxD7adOyYGxVxfI3n77QCk5pLPtN8YfPQ=";
|
||||
hash = "sha256-+VGANm6L2TZkOW97PDYCH+rELyppyJ/GIiabnZXWNTc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
@@ -22,24 +21,16 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libplacebo";
|
||||
version = "7.351.0";
|
||||
version = "7.360.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "code.videolan.org";
|
||||
owner = "videolan";
|
||||
repo = "libplacebo";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ccoEFpp6tOFdrfMyE0JNKKMAdN4Q95tP7j7vzUj+lSQ=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-h8uMWRe4SysbKNLWdGYxAwj2k7yh4sO62/Ca30mRT3g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "python-compat.patch";
|
||||
url = "https://code.videolan.org/videolan/libplacebo/-/commit/12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch";
|
||||
hash = "sha256-RrlFu0xgLB05IVrzL2EViTPuATYXraM1KZMxnZCvgrk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
@@ -92,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://code.videolan.org/videolan/libplacebo";
|
||||
changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${finalAttrs.version}";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ ProxyVT ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -48,7 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--without-cython"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# Tests segfault on aarch64-darwin: https://hydra.nixos.org/build/323410364
|
||||
doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
|
||||
|
||||
postFixup = lib.optionalString enablePython ''
|
||||
moveToOutput "lib/${python3.libPrefix}" "$py"
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "libretro-shaders-slang";
|
||||
version = "0-unstable-2026-04-26";
|
||||
version = "0-unstable-2026-05-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "slang-shaders";
|
||||
rev = "cc71b5eff24a962bd055a92d2032f806635fdf97";
|
||||
hash = "sha256-PeG6H5XArKdptbSicMgXPFtnrkglmkwZieGKSr0aPaQ=";
|
||||
rev = "2ba50bfaeae630741216a9b60b5147485657316f";
|
||||
hash = "sha256-3hJ/rpTDI8oqd4t/dTAHztmWkXW769cAqbmt5jVdIHE=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lint-staged";
|
||||
version = "16.4.0";
|
||||
version = "17.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okonet";
|
||||
repo = "lint-staged";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JwULZ5rwlQfoFIhzhd/etVajTD1A4NJvqRADfzv1PZo=";
|
||||
hash = "sha256-6WlTa1QFQU3lzAv3y9GgJi4FtfFvpnSvDgzyy38TbeQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-140Sjkwb+NpNj+MEnUb2zQFyjP6Uel25ZZXnNMEU5NY=";
|
||||
npmDepsHash = "sha256-Ew4nR9G/YqIY5LpEajGyE+wmn+8gHiNPFV4woVkffr8=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -39,13 +39,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "linyaps";
|
||||
version = "1.12.2";
|
||||
version = "1.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenAtom-Linyaps";
|
||||
repo = finalAttrs.pname;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Pm0ijMAwDiQpotxuAgrCXiA3Z0FCejsqYIJ89/GKR9o=";
|
||||
hash = "sha256-AbiUHoNRaz2yL6pV5D1R0kmDGcV8+nmEa+EDDK6soe0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "liteparse";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "run-llama";
|
||||
repo = "liteparse";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-e3c8ak4kww8vQDfYT8S9m7Tv7vnBiox2qaI73yUb23U=";
|
||||
hash = "sha256-hbCD9kXuI3Zh4S69FCXtNQxVFWpP172YwJ95BY/INBw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-KhtwPl1J9ZZMT9xT5bQJjPa3fYTvi9oRnxijCm0o+2c=";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lstk";
|
||||
version = "0.5.8";
|
||||
version = "0.6.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -14,10 +14,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "localstack";
|
||||
repo = "lstk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-sZd3hZaS6rJoAUkCfgQh/zQj4ng8nevsQFsZaxOccHs=";
|
||||
sha256 = "sha256-sK3xtmbXxoqKGpFPscKxqy/8rr+G6tpcKXtRL9FLMK0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MzvWeJa9fXqek/MenT4B28XKB0srjGpqwUxAuT1zgI4=";
|
||||
vendorHash = "sha256-wXSFZpZUaeBNevirGIG1qsrroK3S5ccZZ31z8pRdmKM=";
|
||||
|
||||
excludedPackages = "test/integration";
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "magic-wormhole-rs";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magic-wormhole";
|
||||
repo = "magic-wormhole.rs";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-j+SweUDOp38QMz2yPEOV9ZEXE8R2zL2hq7OkGX32zpc=";
|
||||
sha256 = "sha256-23NXmXkuFGMocicw2UxsXroCZ4N0PYkrOropuQYe0d8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6ydO9vrlOwTrnn624GQ59nWoClnGaO0UxHhW+01APGw=";
|
||||
cargoHash = "sha256-LqsYyyJyMxJ97c4JOsjyL28idKLyV6GOQMccuyDRlYs=";
|
||||
|
||||
buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libxcb ];
|
||||
|
||||
|
||||
@@ -155,10 +155,14 @@ let
|
||||
);
|
||||
in
|
||||
fnOrAttrs:
|
||||
if !lib.isFunction fnOrAttrs then
|
||||
buildMavenPackage fnOrAttrs
|
||||
else
|
||||
let
|
||||
finalAttrs = fnOrAttrs finalAttrs;
|
||||
in
|
||||
buildMavenPackage finalAttrs
|
||||
let
|
||||
finalPackage =
|
||||
if !lib.isFunction fnOrAttrs then
|
||||
buildMavenPackage fnOrAttrs
|
||||
else
|
||||
let
|
||||
finalAttrs = fnOrAttrs (finalAttrs // { inherit finalPackage; });
|
||||
in
|
||||
buildMavenPackage finalAttrs;
|
||||
in
|
||||
finalPackage
|
||||
|
||||
@@ -15,16 +15,16 @@ in
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "mediamtx";
|
||||
# check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
|
||||
version = "1.18.0";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluenviron";
|
||||
repo = "mediamtx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DScZKan8PnEF0znAxJVx8fgbEskw73tv35v38d2jJtM=";
|
||||
hash = "sha256-3ZKN2J3M8JhjbGWnYjweERM2GvlT+GK2OahPcFEpsLA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FJqERr/rC4y8nBFKh8luwm9pOeVEiKPHorZ5z57wD1E=";
|
||||
vendorHash = "sha256-QCUMMYMwg/5a8dPqCegEkm4yChk7BrdOjSoAFZS9Arg=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${hlsJs} internal/servers/hls/hls.min.js
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
installShellFiles,
|
||||
xar,
|
||||
cpio,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "mist-cli";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ninxsoft/mist-cli/releases/download/v${finalAttrs.version}/mist-cli.${finalAttrs.version}.pkg";
|
||||
hash = "sha256-d+tm37X6JC5r23D8WTsxIkL0RU4U58pJmLermwjOgCE=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
xar
|
||||
cpio
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
xar -xf "$src"
|
||||
gunzip -dc Payload | cpio -idmv
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D usr/local/bin/mist "$out/bin/mist"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
|
||||
installShellCompletion --cmd mist \
|
||||
--bash <($out/bin/mist --generate-completion-script bash) \
|
||||
--fish <($out/bin/mist --generate-completion-script fish) \
|
||||
--zsh <($out/bin/mist --generate-completion-script zsh)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Command-line tool that downloads macOS firmwares and installers";
|
||||
homepage = "https://github.com/ninxsoft/mist-cli";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "mist";
|
||||
maintainers = with lib.maintainers; [ ojsef39 ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
undmg,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "mist";
|
||||
version = "0.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ninxsoft/Mist/releases/download/v${finalAttrs.version}/Mist.${finalAttrs.version}.dmg";
|
||||
hash = "sha256-J3Oxtw+yFV2Mpzqc6NqPPJR76r0DwywJdAU1FSvbYKE=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/Applications"
|
||||
cp -r *.app "$out/Applications"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Utility that automatically downloads macOS firmwares and installers";
|
||||
homepage = "https://github.com/ninxsoft/Mist";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ojsef39 ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
@@ -22,13 +22,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mixing-station";
|
||||
version = "2.8.2";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mixingstation.app/backend/api/web/download/archive/mixing-station-pc/update/${finalAttrs.version}";
|
||||
name = "mixing-station-${finalAttrs.version}.zip";
|
||||
extension = "zip";
|
||||
hash = "sha256-hGxwr+Juf8ES4Mifs/B6wq5h2Vs+ymcMl8k8Y6HxcJk=";
|
||||
hash = "sha256-tyoagT21lIT0kIL9RZT1qQ7Aa7E3WAfmdsqvqc7iEGU=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "12.75";
|
||||
version = "12.84";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
|
||||
hash = "sha256-IH72Sjgh4ERkufo1rEHucbpOeMuNeEhfrQBpXvvAvhg=";
|
||||
hash = "sha256-WYBc59DJM5DVe7hZVXCsMJsShUQf8Ib0OLKISRjg4pY=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -197,13 +197,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mpd";
|
||||
version = "0.24.9";
|
||||
version = "0.24.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MusicPlayerDaemon";
|
||||
repo = "MPD";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-WBIPGdn8Hg/YH236epiNuenp8XwHoBcmgJa+CApIjBE=";
|
||||
sha256 = "sha256-qwBX5NG1h55HoNtHMyLfjDQhua1xCyONqd386+QB6IU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -97,7 +97,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg_7 ]
|
||||
);
|
||||
|
||||
version = "15.0.11";
|
||||
version = "15.0.12";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -109,7 +109,7 @@ let
|
||||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-+skGid5BYrptv3aHLPogxew28DNFArV6kEDhCTxD2Ic=";
|
||||
hash = "sha256-Tqfa9f2q4bv2KpotoDKvklEmHa5AF4ARp/qKxlVBomE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mystmd";
|
||||
version = "1.8.3";
|
||||
version = "1.9.0";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "jupyter-book";
|
||||
repo = "mystmd";
|
||||
tag = "mystmd@${finalAttrs.version}";
|
||||
hash = "sha256-OmREjNDgmq5+nidBZh4DUy9bMtDeHMrGWZEqKo5TUrQ=";
|
||||
hash = "sha256-gAUfL2sTdTmslPuOnkeTwv/GmarM5nWpxjg3KPL+1fs=";
|
||||
};
|
||||
|
||||
node_modules = stdenv.mkDerivation {
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
nix-update-script,
|
||||
ffmpegSupport ? true,
|
||||
versionCheckHook,
|
||||
plugins ? [ ],
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -46,6 +47,8 @@ buildGoModule (finalAttrs: {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
runtimeInputs = plugins;
|
||||
|
||||
overrideModAttrs = oldAttrs: {
|
||||
nativeBuildInputs = lib.filter (drv: drv != npmHooks.npmConfigHook) oldAttrs.nativeBuildInputs;
|
||||
preBuild = null;
|
||||
@@ -77,6 +80,13 @@ buildGoModule (finalAttrs: {
|
||||
make buildjs
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/plugins/
|
||||
${lib.concatMapStringsSep "\n" (plugin: ''
|
||||
ln -s ${plugin}/share/${plugin.pname}.ndp $out/share/plugins/
|
||||
'') plugins}
|
||||
'';
|
||||
|
||||
tags = [
|
||||
"netgo"
|
||||
"sqlite_fts5"
|
||||
@@ -91,6 +101,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit plugins;
|
||||
tests.navidrome = nixosTests.navidrome;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
# Packaging guidelines
|
||||
|
||||
## Basics
|
||||
|
||||
Each navidrome plugin is a `.zip` file named `${pname}.ndp`. Inside this zip is
|
||||
two files named exactly:
|
||||
- `manifest.json` which defines permissions and configuration
|
||||
- `plugin.wasm` which is the output of the plugin build
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
buildNavidromePlugin,
|
||||
}:
|
||||
|
||||
buildNavidromePlugin rec {
|
||||
pname = "apple-music-plugin";
|
||||
version = "0.2.0";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "navidrome";
|
||||
repo = "apple-music-plugin";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-45nUrIDXCtkh08TeZoc6j2BcGLQnpVJu23L56nIBN1s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-G1B6W8ZKoLuNwvOt3z5vSKcQmF2574j41A0lC+u39uI=";
|
||||
|
||||
meta = {
|
||||
description = "Fetches artist metadata from Apple Music using free iTunes/Apple Music endpoints";
|
||||
homepage = "https://github.com/navidrome/apple-music-plugin";
|
||||
license = lib.licenses.gpl3Only;
|
||||
sourceProvenance = with lib.sourceTypes; [ fromSource ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
{
|
||||
buildGoModule,
|
||||
lib,
|
||||
navidrome,
|
||||
zip,
|
||||
}:
|
||||
|
||||
{
|
||||
pname,
|
||||
src,
|
||||
version,
|
||||
vendorHash,
|
||||
meta,
|
||||
...
|
||||
}@args:
|
||||
|
||||
buildGoModule (
|
||||
finalAttrs:
|
||||
{
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
vendorHash
|
||||
;
|
||||
|
||||
env = {
|
||||
CGO_ENABLED = "0";
|
||||
}
|
||||
// (args.env or { });
|
||||
|
||||
postBuild = ''
|
||||
GOOS=wasip1 \
|
||||
GOARCH=wasm \
|
||||
go build \
|
||||
-buildmode=c-shared \
|
||||
-o $GOPATH/bin/plugin.wasm .
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/share
|
||||
pushd $(mktemp -d)
|
||||
cp $GOPATH/bin/plugin.wasm .
|
||||
cp ${finalAttrs.src}/manifest.json .
|
||||
${lib.getExe zip} \
|
||||
$out/share/${finalAttrs.pname}.ndp \
|
||||
plugin.wasm \
|
||||
manifest.json
|
||||
popd
|
||||
rm -r $out/bin
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
isNavidromePlugin = true;
|
||||
}
|
||||
// args.passthru or { };
|
||||
|
||||
meta = {
|
||||
inherit (navidrome.meta) platforms maintainers;
|
||||
}
|
||||
// args.meta or { };
|
||||
}
|
||||
// removeAttrs args [
|
||||
"meta"
|
||||
"passthru"
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
buildNavidromePlugin,
|
||||
}:
|
||||
buildNavidromePlugin rec {
|
||||
pname = "discord-rich-presence-plugin";
|
||||
version = "1.0.0";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "navidrome";
|
||||
repo = "discord-rich-presence-plugin";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YH1K6uagIloQQ4gdezKMAfx9KbGL9chiTx/i8CiH4io=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-M5dI0gNfy2x9IVN1284pdvUaCui0sgxFCC+9weq2ipM=";
|
||||
|
||||
meta = {
|
||||
description = "Displays your currently playing track in your Discord status";
|
||||
homepage = "https://github.com/navidrome/discord-rich-presence-plugin";
|
||||
license = lib.licenses.gpl3Only;
|
||||
sourceProvenance = with lib.sourceTypes; [ fromSource ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
buildNavidromePlugin,
|
||||
}:
|
||||
buildNavidromePlugin rec {
|
||||
pname = "listenbrainz-daily-playlist";
|
||||
version = "5.0.2";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "kgarner7";
|
||||
repo = "navidrome-listenbrainz-daily-playlist";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DsbnTu+Xi9pAG9fKgtlixxrd3od41TTeZ1hdjyEyGnk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zCKLwS85+aC4jfRcC2SjKGK/OYjW+izIhKKKLxNroQg=";
|
||||
|
||||
meta = {
|
||||
description = "fetch daily/weekly playlists from ListenBrainz";
|
||||
homepage = "https://github.com/kgarner7/navidrome-listenbrainz-daily-playlist";
|
||||
license = lib.licenses.mit;
|
||||
sourceProvenance = with lib.sourceTypes; [ fromSource ];
|
||||
};
|
||||
}
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "newflasher";
|
||||
version = "59";
|
||||
version = "60";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "munjeni";
|
||||
repo = "newflasher";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-ulcHbSoMXnu0pauYUaZiTVvl5VtEYnYy3ljtZ0oEvGM=";
|
||||
hash = "sha256-YmFY0WPT92f5zN10TEfuRv2mzhEweqeZEpzWCK4otYg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nixfmt-rs";
|
||||
version = "0.3.0";
|
||||
version = "0.4.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "Mic92";
|
||||
repo = "nixfmt-rs";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-H4APJn0NGaD2LrkjcJ7io+fu3aKoO0Cn2BJk731YlqQ=";
|
||||
hash = "sha256-MsSefbTC6u9GAEB9PhDSz9GvWTCASgTxysIHRrqGINc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gJq6PxA6WaWObHnIL7jsKQBOSHQj31kzlrM95OY27ro=";
|
||||
cargoHash = "sha256-QSckmh8hBpQjpg0/4rwlpJZ2uxEZ1sPQvZfjmi4NFEc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [
|
||||
gitMinimal
|
||||
nixfmt
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "norgolith";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NTBBloodbath";
|
||||
repo = "norgolith";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-n9Obf2PoTQ8EyxF/i5YU9/AlN9IizWYW/sG89Z8qp1k=";
|
||||
hash = "sha256-9Ezp2aK+O4TcINcnUdptejlrczIqr65nNWPmB+APrAI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1DOys3N42jlC/tc5D0Ixg+yXV/RRMIi4qcXzUwpl7XQ=";
|
||||
cargoHash = "sha256-NwbiS83OUq/YodBea9ShZtSTyBtWy3wWyOLwoHb16V8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
mkdocs,
|
||||
python3,
|
||||
python3Packages,
|
||||
runtimeShell,
|
||||
}:
|
||||
|
||||
buildGoModule (
|
||||
@@ -71,6 +72,12 @@ buildGoModule (
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's# /bin/echo# echo#' Makefile
|
||||
substituteInPlace \
|
||||
cmd/subscribe_unix.go \
|
||||
cmd/subscribe_darwin.go \
|
||||
--replace \
|
||||
'scriptLauncher = []string{"sh", "-c"}' \
|
||||
'scriptLauncher = []string{"${runtimeShell}", "-c"}'
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
vala,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
desktop-file-utils,
|
||||
gusb,
|
||||
gtk4,
|
||||
glib,
|
||||
wrapGAppsHook4,
|
||||
blueprint-compiler,
|
||||
libadwaita,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
pname = "nxdumpclient";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v1993";
|
||||
repo = "nxdumpclient";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6jekESpsV6sDhBh23D7d5/BlGWI1G5SYgWudNvQKzqc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
vala
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
desktop-file-utils
|
||||
wrapGAppsHook4
|
||||
blueprint-compiler
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
glib
|
||||
gusb
|
||||
libadwaita
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonEnable "libportal" false)
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Client program for dumping over USB with nxdumptool";
|
||||
homepage = "https://github.com/v1993/nxdumpclient";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ ranidspace ];
|
||||
mainProgram = "nxdumpclient";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -55,6 +55,13 @@ python.pkgs.buildPythonApplication rec {
|
||||
}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# hardcode the location of the unwrapped python scrip, otherwise the websocket
|
||||
# server (called longpoll in codebase) will fail to start.
|
||||
substituteInPlace odoo/service/server.py \
|
||||
--replace-fail 'sys.argv[0]' "'${placeholder "out"}/bin/.odoo-wrapped'"
|
||||
'';
|
||||
|
||||
build-system = with python.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
@@ -111,7 +118,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests = {
|
||||
inherit (nixosTests) odoo17;
|
||||
inherit (nixosTests) odoo17 odoo17-multiprocess;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
let
|
||||
odoo_version = "18.0";
|
||||
odoo_release = "20250506";
|
||||
odoo_release = "20260420";
|
||||
python = python312.override {
|
||||
self = python;
|
||||
};
|
||||
@@ -21,11 +21,18 @@ python.pkgs.buildPythonApplication rec {
|
||||
|
||||
src = fetchzip {
|
||||
# find latest version on https://nightly.odoo.com/${odoo_version}/nightly/src
|
||||
url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip";
|
||||
url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz";
|
||||
name = "odoo-${version}";
|
||||
hash = "sha256-rNG0He+51DnRT5g1SovGZ9uiE1HWXtcmAybcadBMjY4="; # odoo
|
||||
hash = "sha256-+ilM07s33pdwZc3XoAXbID7MRz/m6PHnzjHzi183eyM="; # odoo
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# hardcode the location of the unwrapped python scrip, otherwise the websocket
|
||||
# server (called longpoll in codebase) will fail to start.
|
||||
substituteInPlace odoo/service/server.py \
|
||||
--replace-fail 'sys.argv[0]' "'${placeholder "out"}/bin/.odoo-wrapped'"
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
@@ -97,7 +104,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests = {
|
||||
inherit (nixosTests) odoo18;
|
||||
inherit (nixosTests) odoo18 odoo18-multiprocess;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -27,6 +27,6 @@ fi
|
||||
|
||||
cd "$SCRIPT_DIR"
|
||||
|
||||
sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix
|
||||
sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.tar.gz")\"; # odoo|g" package.nix
|
||||
sed -ri "s|odoo_version = .+|odoo_version = \"$VERSION\";|" package.nix
|
||||
sed -ri "s|odoo_release = .+|odoo_release = \"$RELEASE\";|" package.nix
|
||||
|
||||
@@ -26,6 +26,13 @@ python.pkgs.buildPythonApplication rec {
|
||||
hash = "sha256-JsbJ39zPZm4eyRTXkvdCMHwYaA08yUxZXcLglRn3kWs="; # odoo
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# hardcode the location of the unwrapped python scrip, otherwise the websocket
|
||||
# server (called longpoll in codebase) will fail to start.
|
||||
substituteInPlace odoo/service/server.py \
|
||||
--replace-fail 'sys.argv[0]' "'${placeholder "out"}/bin/.odoo-wrapped'"
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
@@ -92,7 +99,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests = {
|
||||
inherit (nixosTests) odoo19;
|
||||
inherit (nixosTests) odoo19 odoo19-multiprocess;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -46,11 +46,43 @@ buildNpmPackage (finalAttrs: {
|
||||
# should not break other things.
|
||||
npmFlags = [ "--ignore-scripts" ];
|
||||
|
||||
postPatch = ''
|
||||
# NW.js 0.102 in Chrome-packaged-app mode never advances
|
||||
# document.readyState past "loading", so DOMContentLoaded and load
|
||||
# events never fire and the wizard UI never initializes (the window
|
||||
# only shows the page background and the "Last message received"
|
||||
# footer text). Dispatch the events manually after the bottom-of-body
|
||||
# scripts have registered their listeners.
|
||||
substituteInPlace app/app.html \
|
||||
--replace-fail \
|
||||
'<script src="/scripts/dialog-links.js"></script>' \
|
||||
'<script src="/scripts/dialog-links.js"></script>
|
||||
<script>setTimeout(() => { document.dispatchEvent(new Event("DOMContentLoaded")); window.dispatchEvent(new Event("load")); }, 0);</script>'
|
||||
|
||||
# The app should not create autostart entries on first launch.
|
||||
substituteInPlace app/app.js \
|
||||
--replace-fail \
|
||||
"} else if (!localStorage.hasOwnProperty('autoLaunch')) {" \
|
||||
"} else if (false && !localStorage.hasOwnProperty('autoLaunch')) {"
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
substituteInPlace build/package.json \
|
||||
--replace-fail '"name": "OnlyKey-dev"' '"name": "OnlyKey"' \
|
||||
--replace-fail '"toolbar": true' '"toolbar": false'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
rm -rf node_modules
|
||||
npm ci --omit=dev --omit=optional --ignore-scripts
|
||||
rm -rf node_modules/nw
|
||||
rm -f node_modules/.bin/nw
|
||||
|
||||
mkdir -p "$out/share"
|
||||
cp -r build "$out/share/onlykey"
|
||||
cp -r node_modules "$out/share/onlykey/node_modules"
|
||||
|
||||
ln -s "${finalAttrs.desktopItem}/share/applications" "$out/share/applications"
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
callPackage,
|
||||
lib,
|
||||
jre_headless,
|
||||
jre_minimal,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
maven,
|
||||
@@ -10,7 +10,26 @@
|
||||
}:
|
||||
|
||||
let
|
||||
jre = jre_headless;
|
||||
jre = jre_minimal.override {
|
||||
modules = [
|
||||
"java.base"
|
||||
"java.compiler"
|
||||
"java.datatransfer"
|
||||
"java.desktop"
|
||||
"java.instrument"
|
||||
"java.logging"
|
||||
"java.management"
|
||||
"java.naming"
|
||||
"java.net.http"
|
||||
"java.prefs"
|
||||
"java.scripting"
|
||||
"java.security.jgss"
|
||||
"java.sql"
|
||||
"java.xml"
|
||||
"jdk.compiler"
|
||||
"jdk.unsupported"
|
||||
];
|
||||
};
|
||||
version = "7.21.0";
|
||||
mainProgram = "openapi-generator-cli";
|
||||
this = maven.buildMavenPackage {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user