Merge 5a21d1bfee into haskell-updates

This commit is contained in:
nixpkgs-ci[bot] 2026-06-16 01:04:21 +00:00 committed by GitHub
commit 9029909ba3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
386 changed files with 23678 additions and 6378 deletions

View file

@ -36,6 +36,12 @@
- Support for the legacy UBoot image format has been removed from the Linux kernel builders, as it is deprecated upstream and no longer used by any platform in Nixpkgs.
- `rke2` retires ingress-nginx and transitions to Traefik starting in `rke2_1_36`. Because ingress-nginx was retired upstream as of March 2026, Traefik is now the default
for new clusters starting in v1.36 (existing clusters will keep their current ingress upon upgrade to avoid breakage). This transition brings the following structural changes:
- Airgapped Environments: The rke2-images-core tarball now contains Traefik images instead of ingress-nginx. The standalone rke2-images-traefik tarball has been removed.
Users who must continue using ingress-nginx will now need to manually provide the rke2-images-ingress-nginx tarball.
- Future Removal: The ingress-nginx chart will not receive any additional updates and will be completely removed in v1.37 for community users.
- `requireFile` now sets `meta.license = lib.licenses.unfree` by default. Users of `requireFile`-based derivations that preserve this default will need to explicitly allow their evaluation as described in [](#sec-allow-unfree).
- `librest` providing 0.7 ABI was removed. `librest_1_0` providing 1.0 ABI was renamed to `librest` and `librest_1_0` was kept as an alias.
@ -74,4 +80,3 @@
### Additions and Improvements {#sec-nixpkgs-release-26.11-lib-additions-improvements}
- Create the first release note entry in this section!

View file

@ -10455,6 +10455,11 @@
githubId = 14929991;
keys = [ { fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC"; } ];
};
haansn08 = {
name = "Stefan Haan";
github = "haansn08";
githubId = 6215916;
};
hacker1024 = {
name = "hacker1024";
email = "hacker1024@users.sourceforge.net";
@ -13045,6 +13050,13 @@
name = "João Moreira";
keys = [ { fingerprint = "F457 0A3A 5F89 22F8 F572 E075 EF8B F2C8 C5F4 097D"; } ];
};
joaosreis = {
email = "joaosreis@outlook.pt";
github = "joaosreis";
githubId = 3420596;
name = "João Santos Reis";
keys = [ { fingerprint = "9BEB F137 4CAC 96D6 A4ED EC49 BA2E 05BD B7F8 C0EE"; } ];
};
joaquintrinanes = {
email = "hi@joaquint.io";
github = "JoaquinTrinanes";
@ -18343,6 +18355,13 @@
github = "mkleczek";
githubId = 11559480;
};
mkoppmann = {
email = "dev@mkoppmann.at";
github = "mkoppmann";
githubId = 21209717;
matrix = "@shibayashi:ncrypt.at";
name = "Michael Koppmann";
};
mksafavi = {
name = "MK Safavi";
email = "mksafavi@gmail.com";
@ -20629,12 +20648,6 @@
matrix = "@olduser101:matrix.org";
name = "Nathan Gill";
};
olebedev = {
email = "ole6edev@gmail.com";
github = "olebedev";
githubId = 848535;
name = "Oleg Lebedev";
};
oleina = {
email = "antholeinik@gmail.com";
github = "antholeole";

View file

@ -70,7 +70,6 @@ with lib.maintainers;
members = [
mboes
cbley
olebedev
groodt
aherrmann
ylecornec

View file

@ -4,21 +4,33 @@
teams = [ lib.teams.freedesktop ];
};
options = {
xdg.autostart.enable = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Whether to install files to support the
[XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest).
'';
};
options.xdg.autostart = {
enable =
lib.mkEnableOption "auto-starting of desktop applications according to the [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest)."
// lib.mkOption {
default = true;
};
install =
lib.mkEnableOption ''
install desktop files following the [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest) into `/etc/xdg/autostart/`.
These are handled by your desktop environment or [`systemd-xdg-autostart-generator`](https://www.freedesktop.org/software/systemd/man/latest/systemd-xdg-autostart-generator.html).
''
// lib.mkOption {
default = true;
};
};
config = lib.mkIf config.xdg.autostart.enable {
environment.pathsToLink = [
config = {
# FIXME this does not actually work because "/etc/xdg" is linked
# unconditionally in `nixos/modules/config/system-path.nix`
environment.pathsToLink = lib.mkIf config.xdg.autostart.install [
"/etc/xdg/autostart"
];
};
# On by default
systemd.user.generators.systemd-xdg-autostart-generator = lib.mkIf (!config.xdg.autostart.enable) (
lib.mkDefault "/dev/null"
);
};
}

View file

@ -1961,6 +1961,7 @@
./system/boot/systemd/userdbd.nix
./system/boot/timesyncd.nix
./system/boot/tmp.nix
./system/boot/tzpfms.nix
./system/boot/uki.nix
./system/boot/unl0kr.nix
./system/boot/uvesafb.nix

View file

@ -17,9 +17,7 @@ in
Note that only users in the "uinput" group will be able to use the package
'';
};
package = lib.mkPackageOption pkgs "mouse-actions" {
example = "mouse-actions-gui";
};
package = lib.mkPackageOption pkgs "mouse-actions" { };
autorun = lib.mkOption {
type = lib.types.bool;
default = false;

View file

@ -46,6 +46,19 @@ let
folders = lib.pipe cfg.settings.folders [
(lib.filterAttrs (_: folder: folder.enable))
builtins.attrValues
(map (
folder:
folder
// {
devices = map (
device:
if builtins.isString device then
{ deviceId = cfg.settings.devices.${device}.id; }
else
{ deviceId = cfg.settings.devices.${device.name}.id; } // device
) folder.devices;
}
))
];
jq = "${pkgs.jq}/bin/jq";

View file

@ -0,0 +1,247 @@
{
config,
lib,
pkgs,
utils,
...
}:
# NOTE: the loading of keys is done in separate tzpfms systemd services
# defined below rather than inline in the ZFS import scripts.
let
cfgZFS = config.boot.zfs;
cfg = cfgZFS.tzpfms;
datasetToPool = x: lib.elemAt (lib.splitString "/" x) 0;
pools = lib.unique (map datasetToPool cfg.datasets);
# All ZFS filesystems
zfsFilesystems = lib.filter (x: x.fsType == "zfs") config.system.build.fileSystems;
# Pools that are already imported in initrd (have neededForBoot filesystems)
fsToPool = fs: lib.elemAt (lib.splitString "/" fs.device) 0;
rootPools = lib.unique (map fsToPool (lib.filter utils.fsNeededForBoot zfsFilesystems));
# Only include initrd resources if datasets belong to pools that need initrd import.
# A pool needs initrd import if it has neededForBoot filesystems.
initrdPools = lib.filter (pool: lib.elem pool rootPools) pools;
systemPools = lib.filter (pool: !(lib.elem pool rootPools)) pools;
needsInitrd = initrdPools != [ ];
datasetsByPool = lib.groupBy datasetToPool cfg.datasets;
# Goup neededForBoot filesystems by pool → initrd mount units
initrdMountsByPool = lib.foldl' (
acc: fs:
let
p = lib.elemAt (lib.splitString "/" fs.device) 0;
mount = "${utils.escapeSystemdPath ("/sysroot" + (lib.removeSuffix "/" fs.mountPoint))}.mount";
in
if utils.fsNeededForBoot fs then acc // { ${p} = (acc.${p} or [ ]) ++ [ mount ]; } else acc
) { } zfsFilesystems;
# Group all ZFS filesystems by pool → system mount units
systemMountsByPool = lib.foldl' (
acc: fs:
let
pool = lib.elemAt (lib.splitString "/" fs.device) 0;
mount = "${utils.escapeSystemdPath (lib.removeSuffix "/" fs.mountPoint)}.mount";
in
acc // { ${pool} = (acc.${pool} or [ ]) ++ [ mount ]; }
) { } zfsFilesystems;
# Generate tzpfms key-loading bash script
mkTzpfmsScript = datasets: /* bash */ ''
tzpfms_load_key() {
zfs-tpm-list -H ${backendArgs} "$@" 2>/dev/null | while IFS=$'\t' read -r name backend status _; do
case "$backend" in
${lib.optionalString (lib.elem "TPM2" cfg.backends) /* bash */ ''
TPM2)
zfs-tpm2-load-key "$name" || true
;;
''}
${lib.optionalString (lib.elem "TPM1.X" cfg.backends) /* bash */ ''
TPM1.X)
zfs-tpm1x-load-key "$name" || true
;;
''}
*)
echo "[WARN] boot.zfs.tzpfms: Unsupported tzpfms backend: $backend; $name not unlocked" >&2
;;
esac
done
}
${lib.concatMapStringsSep "\n" (ds: "tzpfms_load_key -u ${lib.escapeShellArg ds}") datasets}
'';
mkTzpfmsService =
{
pool,
mountUnits,
script,
}:
{
description = "Load TPM keys for ZFS pool ${pool}";
after = [ "zfs-import-${pool}.service" ];
before = mountUnits ++ [ "zfs-import.target" ];
requiredBy = mountUnits ++ [ "zfs-import.target" ];
unitConfig.DefaultDependencies = "no";
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
};
inherit script;
};
backendArgs = lib.escapeShellArgs (
lib.concatMap (b: [
"-b"
b
]) cfg.backends
);
in
{
meta.maintainers = with lib.maintainers; [ toastal ];
options = {
boot.zfs.tzpfms = {
enable = lib.mkEnableOption ''
TPM-backed ZFS encryption using tzpfms.
Supports both TPM 2.0 & TPM 1.x.
'';
package = lib.mkPackageOption pkgs "tzpfms" { };
backends = lib.mkOption {
type =
with lib.types;
nonEmptyListOf (enum [
"TPM2"
"TPM1.X"
]);
default = [
"TPM2"
];
description = ''
TPM backends to include in for tzpfms.
'';
};
datasets = lib.mkOption {
# Needs to be explicit so we can build thy systemd services
type = with lib.types; nonEmptyListOf str;
example = [
"tank/root"
"tank/var"
];
description = ''
Explicit list of ZFS datasets to unlock with TPM at boot.
'';
};
};
};
config = lib.mkIf cfg.enable {
assertions = [
{
assertion =
config.boot.supportedFilesystems.zfs or config.boot.initrd.supportedFilesystems.zfs or false;
message = "ZFS filesystem support needs to be enabled for boot.tzpfms to work";
}
{
assertion = initrdPools != { } -> config.boot.initrd.systemd.enable;
message = "boot.zfs.tzpfms requires boot.initrd.systemd.enable = true";
}
{
assertion =
!(cfgZFS.requestEncryptionCredentials == true) || cfgZFS.requestEncryptionCredentials == [ ];
message = ''
boot.zfs.requestEncryptionCredentials = true would prompt for all
encrypted dataset passphrases at boot, which conflicts with automatic
TPM unlock via tzpfms. Either set it to false, or explicitly list the
datasets that still need passphrase prompting.
'';
}
(
let
intersected = lib.intersectLists cfg.datasets (
if lib.isList cfgZFS.requestEncryptionCredentials then cfgZFS.requestEncryptionCredentials else [ ]
);
in
{
assertion = builtins.length intersected == 0;
message = ''
The following datasets are listed in both boot.zfs.tzpfms.datasets
& boot.zfs.requestEncryptionCredentials, which would cause a
passphrase prompt to block boot before tzpfms can unlock them via
TPM:
${lib.concatMapStringsSep "\n" (d: " ${d}") intersected}
Remove them from boot.zfs.requestEncryptionCredentials to allow
automatic TPM unlock.
'';
}
)
];
environment.systemPackages = [ cfg.package ];
# Automatically register pools from tzpfms datasets as extraPools
boot.zfs.extraPools = pools;
boot.initrd = lib.mkMerge [
(lib.mkIf cfg.enable {
availableKernelModules = [
"tpm_tis"
"tpm_crb"
];
})
(lib.mkIf needsInitrd (
lib.mkMerge [
(lib.mkIf config.boot.initrd.systemd.enable {
systemd.extraBin = {
zfs-tpm-list = "${lib.getBin cfg.package}/bin/zfs-tpm-list";
}
// lib.optionalAttrs (lib.elem "TPM2" cfg.backends) {
zfs-tpm2-load-key = "${lib.getBin cfg.package}/bin/zfs-tpm2-load-key";
}
// lib.optionalAttrs (lib.elem "TPM1.X" cfg.backends) {
zfs-tpm1x-load-key = "${lib.getBin cfg.package}/bin/zfs-tpm1x-load-key";
};
systemd.storePaths =
lib.optional (lib.elem "TPM2" cfg.backends) pkgs.tpm2-tss
++ lib.optional (lib.elem "TPM1.X" cfg.backends) pkgs.trousers;
systemd.services = lib.genAttrs' initrdPools (pool: {
name = "tzpfms-load-${pool}";
value = mkTzpfmsService {
inherit pool;
mountUnits = initrdMountsByPool.${pool} or [ ];
script = mkTzpfmsScript (datasetsByPool.${pool} or [ ]);
};
});
})
]
))
];
systemd.services = lib.genAttrs' systemPools (
pool:
let
mnts = systemMountsByPool.${pool} or [ ];
in
{
name = "tzpfms-load-${pool}";
value = mkTzpfmsService {
inherit pool;
mountUnits = mnts;
script = mkTzpfmsScript (datasetsByPool.${pool} or [ ]);
};
}
);
};
}

View file

@ -111,7 +111,7 @@ let
with import ./.. { inherit system; };
hydraJob (
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = makeModules module { };
}).config.system.build.isoImage
@ -123,7 +123,7 @@ let
with import ./.. { inherit system; };
hydraJob (
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = makeModules module { };
}).config.system.build.sdImage
@ -141,7 +141,7 @@ let
let
config =
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = makeModules module { };
}).config;
@ -183,7 +183,7 @@ let
makeNetboot =
{ module, system, ... }:
let
configEvaled = import lib/eval-config.nix {
configEvaled = import ./lib/eval-config.nix {
inherit system;
modules = makeModules module { };
};
@ -209,7 +209,7 @@ let
in
rec {
channel = import lib/make-channel.nix {
channel = import ./lib/make-channel.nix {
inherit
pkgs
nixpkgs
@ -232,7 +232,7 @@ rec {
kexec = forMatchingSystems supportedSystems (
system:
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = [
./modules/installer/netboot/netboot-minimal.nix
@ -312,7 +312,7 @@ rec {
with import ./.. { inherit system; };
hydraJob (
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = [
./modules/virtualisation/proxmox-image.nix
@ -331,7 +331,7 @@ rec {
with import ./.. { inherit system; };
hydraJob (
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = [
./modules/virtualisation/proxmox-image.nix
@ -346,7 +346,7 @@ rec {
with import ./.. { inherit system; };
hydraJob (
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = [
./modules/virtualisation/proxmox-lxc.nix
@ -362,7 +362,7 @@ rec {
with import ./.. { inherit system; };
hydraJob (
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = [
configuration
@ -379,7 +379,7 @@ rec {
with import ./.. { inherit system; };
hydraJob (
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = [
configuration
@ -403,7 +403,7 @@ rec {
with import ./.. { inherit system; };
hydraJob (
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = [
configuration
@ -427,7 +427,7 @@ rec {
with import ./.. { inherit system; };
hydraJob (
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = [
configuration
@ -451,7 +451,7 @@ rec {
with import ./.. { inherit system; };
hydraJob (
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = [
configuration
@ -475,7 +475,7 @@ rec {
with import ./.. { inherit system; };
hydraJob (
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = [
configuration
@ -491,7 +491,7 @@ rec {
system:
pkgs.runCommand "dummy" {
toplevel =
(import lib/eval-config.nix {
(import ./lib/eval-config.nix {
inherit system;
modules = singleton (
{ ... }:
@ -539,14 +539,14 @@ rec {
{ ... }:
{
boot.isContainer = true;
imports = [ modules/profiles/minimal.nix ];
imports = [ ./modules/profiles/minimal.nix ];
}
);
ec2 = makeClosure (
{ ... }:
{
imports = [ modules/virtualisation/amazon-image.nix ];
imports = [ ./modules/virtualisation/amazon-image.nix ];
}
);

View file

@ -1740,6 +1740,7 @@ in
twingate = runTest ./twingate.nix;
txredisapi = runTest ./txredisapi.nix;
typesense = runTest ./typesense.nix;
tzpfms = runTest ./tzpfms.nix;
tzupdate = runTest ./tzupdate.nix;
ucarp = runTest ./ucarp.nix;
udisks2 = runTest ./udisks2.nix;

135
nixos/tests/tzpfms.nix Normal file
View file

@ -0,0 +1,135 @@
{ lib, ... }:
{
name = "tzpfms";
meta = {
maintainers = with lib.maintainers; [ toastal ];
};
nodes.machine =
{ pkgs, ... }:
{
environment.systemPackages = [
pkgs.jq
pkgs.parted
pkgs.tzpfms
];
boot = {
initrd.systemd.enable = true;
loader = {
systemd-boot.enable = true;
timeout = 0;
efi.canTouchEfiVariables = true;
};
supportedFilesystems = [ "zfs" ];
zfs = {
devNodes = "/dev";
forceImportRoot = lib.mkDefault false;
requestEncryptionCredentials = false;
};
};
networking.hostId = "deadbeef";
virtualisation = {
emptyDiskImages = [ 1024 ];
mountHostNixStore = true;
useBootLoader = true;
useEFIBoot = true;
tpm.enable = true;
};
specialisation.tzpfms-unlock.configuration = {
boot = {
kernelParams = [
"rd.debug"
"rd.log=all"
];
zfs = {
devNodes = "/dev";
requestEncryptionCredentials = false;
tzpfms = {
enable = true;
datasets = [
"tpmpool/boot"
"tpmpool/data"
];
};
};
};
virtualisation.fileSystems = {
"/bootz" = {
device = "tpmpool/boot";
fsType = "zfs";
options = [ "zfsutil" ];
neededForBoot = true;
};
"/dataz" = {
device = "tpmpool/data";
fsType = "zfs";
options = [ "zfsutil" ];
neededForBoot = false;
};
};
};
};
testScript = /* python */ ''
datasets = ["boot", "data"]
machine.start(allow_reboot=True)
machine.wait_for_unit("multi-user.target")
machine.succeed("test -e /dev/tpm0")
machine.succeed("test -e /dev/tpmrm0")
machine.succeed("parted --script /dev/vdb mklabel gpt")
machine.succeed("parted --script /dev/vdb -- mkpart primary 1M 100%")
with subtest("Create encrypted ZFS datasets"):
machine.succeed("zpool create -O mountpoint=none tpmpool /dev/vdb1")
for ds in datasets:
machine.succeed("echo aoeuhtns | zfs create -o encryption=aes-128-gcm -o keyformat=passphrase -o mountpoint=/" + ds + "z tpmpool/" + ds)
with subtest("Wrap keys to TPM with backup"):
for ds in datasets:
machine.succeed("printf '\\n\\n' | zfs-tpm2-change-key -b /tmp/tzpfms-backup-" + ds + ".key tpmpool/" + ds)
machine.succeed("test -f /tmp/tzpfms-backup-" + ds + ".key")
list = machine.succeed("zfs-tpm-list -H")
for ds in datasets:
assert "tpmpool/" + ds in list
with subtest("Verify backup keys work"):
for ds in datasets:
machine.succeed("zfs unmount tpmpool/" + ds + " || true")
machine.succeed("zfs unload-key tpmpool/" + ds)
machine.succeed("zfs load-key tpmpool/" + ds + " </tmp/tzpfms-backup-" + ds + ".key")
assert "available" in machine.succeed("zfs get -Ho value keystatus tpmpool/" + ds)
with subtest("Verify loading key"):
# Assertion that the key is loadable, as suggested in the manpage
for ds in datasets:
assert "OK" in machine.succeed("zfs-tpm2-load-key -n tpmpool/" + ds)
with subtest("Switch to tzpfms configuration & reboot"):
machine.succeed("zpool export tpmpool || true")
# Set the specialization as the default boot entry
entry_id = machine.succeed("bootctl list --json=short | jq -r '.[] | select(.title | test(\"tzpfms-unlock\")) | .id'")
assert id != "", "Missing boot entry"
machine.succeed("bootctl set-default " + entry_id)
machine.succeed("sync")
machine.reboot()
with subtest("Verify automatic TPM unlock at boot"):
machine.wait_for_unit("multi-user.target")
for ds in datasets:
status = machine.succeed("zfs get -Ho value keystatus tpmpool/" + ds).strip()
print("tpmpool/" + ds + ": " + status)
assert status == "available", ds + " key must be auto-loaded"
'';
}

View file

@ -13,18 +13,18 @@
writableTmpDirAsHomeHook,
}:
let
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "dmtrKovalenko";
repo = "fff.nvim";
tag = "v${version}";
hash = "sha256-9k1XWnHzBjy7dABCzZ0yxCHqgX1bsWkkxksLVLDqdmc=";
hash = "sha256-q/RfjfVZMM8RyfOP1o2NjUP6NrOh7D2ribgq5Dvwxkc=";
};
fff-nvim-lib = rustPlatform.buildRustPackage {
pname = "fff-nvim-lib";
inherit version src;
cargoHash = "sha256-R/w3Km9LTqWQ2NFbwYbTCld72av26BdXtxC/K0sqdlQ=";
cargoHash = "sha256-NmQDTsevfJq6UGfoxaHwEX4+eJZLXebndpFAsbUNvl8=";
cargoBuildFlags = [
"-p"

View file

@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
mktplcRef = {
name = "amazon-q-vscode";
publisher = "AmazonWebServices";
version = "2.2.0";
hash = "sha256-HwgInQOaSKHSs8CU+Ng4jYA6aaP/g3l4CSb/0ewkmc4=";
version = "2.3.0";
hash = "sha256-2EEhGU+I61yiVvPEIJlQUgTej9Oi7jW3n5znN2Y2vP4=";
};
meta = {

View file

@ -481,8 +481,8 @@ let
mktplcRef = {
publisher = "ban";
name = "spellright";
version = "3.0.148";
hash = "sha256-h1xKEpKg4j7mGw3EQQDPZBDBDY/xjk2lsGk0ktd2ems=";
version = "3.0.154";
hash = "sha256-vGzmzY78FOS8ZsrT1YpTNOUJprW4rZHVuM83cZz6V+Q=";
};
meta = {
description = "Visual Studio Code extension for Spellchecker";
@ -2346,8 +2346,8 @@ let
mktplcRef = {
name = "vscode-vibrancy-continued";
publisher = "illixion";
version = "1.1.78";
hash = "sha256-w0i0Gmqj2atCtEYW+0XvZech37qQaTjkt8MJRdHamxs=";
version = "1.1.79";
hash = "sha256-Yja0W+wIizOOyF9um8t1V7g0DMdv9fVlR4uJCE/pbjk=";
};
meta = {
downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";
@ -4164,8 +4164,8 @@ let
mktplcRef = {
name = "metals";
publisher = "scalameta";
version = "1.66.0";
hash = "sha256-hC2YR67hRfk9QuKVbmK1IzHIGyQ3XTBNvaCP66eC/no=";
version = "1.67.0";
hash = "sha256-THrd3Yix0gohTo/cshy9ZYZysA+xCGLx4KJHFk4zmCM=";
};
meta = {
license = lib.licenses.asl20;

View file

@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "ms-azuretools";
name = "vscode-containers";
version = "2.4.2";
hash = "sha256-qkQAv53y+PVKJdReffjHwoJbvj20o4DF/c6omLIWB80=";
version = "2.4.5";
hash = "sha256-Js+403StdF3WmlHOiB78UKM77njReuKOiQ9NHnFljs8=";
};
meta = {

View file

@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "ms-python";
name = "pylint";
version = "2026.4.0";
hash = "sha256-yWp7poC1PCoou+1XADmW0ftzyQDtJbqb3YyMf24Jprc=";
version = "2026.6.0";
hash = "sha256-lJl+nQyLjnkuMfewYXcrU+Nne7R2foUPn50TtE9OqDA=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/ms-python.pylint/changelog";

View file

@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "material-icon-theme";
publisher = "PKief";
version = "5.33.1";
hash = "sha256-GWHWEdi2kPkxS0RGAxFcy+njFCl1iiEBu41V/5sHqvc=";
version = "5.35.0";
hash = "sha256-u4c5KTSsdsR92Nm0a+eK17pnOpfHxXkgsr8RExcX6NE=";
};
meta = {
description = "Material Design Icons for Visual Studio Code";

View file

@ -35,17 +35,17 @@ let
hash =
{
x86_64-linux = "sha256-L975R3F779LgaFTL4B6ZtImPd1LyXhImnDgCPmO5PI8=";
x86_64-darwin = "sha256-Sygw/VkIiyV+iABylgFpTiHs0f5dS6NYPWSm5BNh9tQ=";
aarch64-linux = "sha256-jcFC668WKAjlYju33RI6poAKnhm3fL1hO16alUwjwv4=";
aarch64-darwin = "sha256-AY6WeDzGEH5zXRosN1H/osxC3e5j0Hs9s2Ys2xe1UxI=";
armv7l-linux = "sha256-LqofnnZid/I0lVTyhC7yHD+Fxz4dSBxKJ8n+lp2uucQ=";
x86_64-linux = "sha256-L0o9+vxfAkmtOHJvmf0G8WIbp3bXjAuuIAtTtFvbwjQ=";
x86_64-darwin = "sha256-WYcRDrFLEjwyQhVdNASz3JUQlLuubDuPjBXa/ROs3h8=";
aarch64-linux = "sha256-3CBrenqZs35gMWmVtI//4w0JGSKP8cbu3cJH14P4aEU=";
aarch64-darwin = "sha256-0JVfgcYxgdaeWfeGFrfG3qxpWHilQte/dLiW33yxm8o=";
armv7l-linux = "sha256-O8nDg1aJ0IbjbRS5kiNoFHzciyHErKK8PP+uujzJOxk=";
}
.${system} or throwSystem;
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.123.0";
version = "1.124.2";
# The update server (update.code.visualstudio.com) expects the version path
# segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
@ -53,7 +53,7 @@ let
downloadVersion = lib.versions.pad 3 version;
# This is used for VS Code - Remote SSH test
rev = "6a44c352bd24569c417e530095901b649960f9f8";
rev = "6928394f91b684055b873eecb8bc281365131f1c";
in
buildVscode {
pname = "vscode" + lib.optionalString isInsiders "-insiders";
@ -86,7 +86,7 @@ buildVscode {
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
hash = "sha256-i034bIsaPlxlVFNY5cKf/ftWPy17SFokbFUMa+zeLng=";
hash = "sha256-S4RcYGjK9vEtPp+vTNFV4SN+7osYzfuCiXmQC39PYhI=";
};
stdenv = stdenvNoCC;
};

View file

@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "flycast";
version = "0-unstable-2026-06-05";
version = "0-unstable-2026-06-12";
src = fetchFromGitHub {
owner = "flyinghead";
repo = "flycast";
rev = "751295151eed3cae619b14bcee49bb07f4fdb59c";
hash = "sha256-PwmJspKYWS7WUAK7XRr2FYiAMnc03xp8qH23EZUC6Hs=";
rev = "c0f2cf4319d6c77d577599906ca0a90627a3afc8";
hash = "sha256-ie0mP7IcvWsFX/k0UhJ6eMkdyDq69W8aCcjwkAoL5II=";
fetchSubmodules = true;
};

View file

@ -9,11 +9,11 @@
buildMozillaMach rec {
pname = "firefox";
version = "140.11.0esr";
version = "140.12.0esr";
applicationName = "Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "d06adb3ef4de1324e3d61872d70de31ab08ac013f33903549bed28c6ebcc5b4dee94bb36388282c1935d77d1a564079f3adbf08d6bb80284a899cbb3d861300c";
sha512 = "3d598dd964bca074d11b71f84d586811b0a736bdd4d1e6cedb9286c56b1e11584e85ca1d0369c9b2f8d9e4d0eaf014d1b9232a96e71ac25f71fa9ed0807f642d";
};
meta = {

View file

@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "151.0.4";
version = "152.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "7df6099411843764321e1480b058530193bf134f590b97aadf053603c356c34599f42d6b83d739c2d6440a78cd81dd0b19fd2ddc2a59746d6bbe7e39f00b7e04";
sha512 = "2c7adf367004063ee9f3385e692f612d8e5c0c10662bf294996c118001e43dec12ca8cb4fd70e67a25a903dbf5adf83d22e487f04bf3f930da2a815c80378ceb";
};
meta = {

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "helm-diff";
version = "3.15.8";
version = "3.15.9";
src = fetchFromGitHub {
owner = "databus23";
repo = "helm-diff";
rev = "v${version}";
hash = "sha256-rH5EgSrL6yBmLd8m5QhEe3VTv8NVmyO5AC++7QQw/wI=";
hash = "sha256-dZ2bXouzjX0rw9NoUJjtF4KzTuZVdHm2ik6puiOg2Tc=";
};
vendorHash = "sha256-wBGHhjVNqA7SAueg9xowqxcCda8HzggepmOprsKPnjo=";
vendorHash = "sha256-GanQBm/g+PcMHaXA5gAaqacpOuv6kES6ng/CmH8/0j4=";
ldflags = [
"-s"

View file

@ -7,7 +7,7 @@
}:
let
version = "1.1.0";
version = "1.1.1";
in
buildGoModule {
pname = "helm-unittest";
@ -17,10 +17,10 @@ buildGoModule {
owner = "helm-unittest";
repo = "helm-unittest";
tag = "v${version}";
hash = "sha256-tSagZzAEaJRNZwflrqoyuIMWmt3oCsyHPHwctNTrtVM=";
hash = "sha256-oiTW8F0yo+kN943MI2mR5uEEYbMVxJx4RdEislJ3XSo=";
};
vendorHash = "sha256-LZOvss6wiZZi5USuXfivqtt69dTKzEmm7lM2LUDACfY=";
vendorHash = "sha256-4ckjM520MGYb64LbjYURe7AIScm4aGbj81rGKSSYaAo=";
# NOTE: Remove the install and upgrade hooks.
postPatch = ''

View file

@ -1,138 +1,138 @@
{
"images-calico-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
"sha256": "dd6d234775759b8abdd3a87a1a748f92db648f096cc9381eb27afd8ae8186f20"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz",
"sha256": "f2341239b5fd73f2b07b074d88c7b34334a808684462f4a6e70fa27591e479a7"
},
"images-calico-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
"sha256": "1c10516660617d6db897bec16e362b4c4e4a0c1f43f08bb9a87663e051d8b806"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst",
"sha256": "8b91f83ee480ae60cc85601e150a2bf412531763ab8e2eaab0b0e4cefa1a83a5"
},
"images-calico-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
"sha256": "02a2df53bea7805ee124e17db2263d17588a74d091c9656dd07052bcaf7fc159"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz",
"sha256": "4fdf2f4bc634c60e6503c7ddd52042baa2d65570a8a0a41eb883bd34920e6766"
},
"images-calico-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
"sha256": "7b8e832bfde832d24335786c43a8c0aeede3c04e2aee4c8349822383f2fa390e"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst",
"sha256": "dacd942276d2ffe8487bee4f7ff8df1522b935eed4eef2cae89f260580eb3305"
},
"images-canal-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
"sha256": "16275efc94e4a399f0edbbf5ebfe46d8c5c7784d5a4ea300c7313ebbb24190d8"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz",
"sha256": "a3e0c2e05174839fe3e66639afa40bb96466a09e60fb73ec15685d1628f96191"
},
"images-canal-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst",
"sha256": "3a7828ce0143c3eb91cae940cebdfa0145960e91be056e88a8b077ee39ccc54d"
},
"images-canal-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
"sha256": "14fb90f2931bea3f030e7ba6c682013911260177bce91eadb2b45f23936465a5"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz",
"sha256": "d86eb346ca1db9ab0efaaf5b4c3418cc096ffd476d2c57f9d4a98a3bab06ef32"
},
"images-canal-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
"sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst",
"sha256": "63b0888d1adebb72a77c2d1f1eb1ced1519cfdeb57681026a94c1f53f87f5610"
},
"images-cilium-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
"sha256": "59f494c03d9aa0f96d99d28e505fae57dd2c30907ea055b888705555ae289d3c"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz",
"sha256": "fd6f6e0051f68efd21425364f17156d58f605063f562069fddf398e208a08032"
},
"images-cilium-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
"sha256": "21ebfe2078b4ef92b2ac3dfe664fd48556cf2b79f9058dd3cd6ed5ed10fcbe1b"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst",
"sha256": "3623e1e59fd4d4a47c4b5e4143d7a8ef31707efbca7d7bf9c299d700c0e1d291"
},
"images-cilium-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
"sha256": "766acd7cbff87a3eab89cc0dc433df34c5d44bfc5304872adfffa432f968450c"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz",
"sha256": "70b362df86f882e64c4d7a8a01901a528bb22e12a28a6996d754bd04b9f396e5"
},
"images-cilium-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
"sha256": "6bd03722d01aa1d281da47318ddca6e1dafbac7acf23f7dc864c7799b4616479"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst",
"sha256": "030d22fd0cb52d90321b37e2d1cd9448b571ba5eeb6b1d68daba40ecff515214"
},
"images-core-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
"sha256": "4b61e3e97e6770b9a2625a21925282e1774bc9114f0a9df5392cd1199b4df744"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-core.linux-amd64.tar.gz",
"sha256": "4513f277d0380330eba4d31dc8096142c2a654a34f01f1c90ab167b78dc58181"
},
"images-core-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
"sha256": "c9a0fe7e3a747fb01d19b0a846df97d4d53a31f563e5308d86401d6b000b031b"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-core.linux-amd64.tar.zst",
"sha256": "a82003606da83f683a7025de7481ef9939d1b10a9f9b222ca5e80f34885a87dc"
},
"images-core-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
"sha256": "899f8e8b8ece3d85384de407fd3f8d375daa9b6f0c1bbd54108426e22fa4a623"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-core.linux-arm64.tar.gz",
"sha256": "121690236b9c7f0dd094d4070e80cf9b624888e2418b10c66ebbf894d63c2788"
},
"images-core-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
"sha256": "be6bc62be91cef6ebb9f995fb4a3e7ca68ab485eec7eb304d129c9d44d543e0c"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-core.linux-arm64.tar.zst",
"sha256": "26edec0d747a5578f7e638a36f54e8f301a06bcc87814d3b2274db571900f44f"
},
"images-flannel-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
"sha256": "56c322cf540988649257018f8be4cac80ff1fafb206c3efeb7cfc190d76eff6f"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz",
"sha256": "cb33139d9e7569f9b6ad5822f481c83f259a6cd13639f3980e2ad8c2dabb8284"
},
"images-flannel-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
"sha256": "832aae87b5eba45be64b47a5ebc04824060095dbc79d58adb009dbc0b738252a"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst",
"sha256": "23695fd8c2a77f043a089c44437d12b5bde88422dbcd1d70edcda7a78f651137"
},
"images-flannel-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
"sha256": "ffc90536663d1edd4cd101e492d84dcd79dd1af1b3b16643786ab8a5d2fcccb7"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz",
"sha256": "a4d428464b3e3e11aafa8fab70a7f183d57d152049f02bd295a6bb4e925a4dbf"
},
"images-flannel-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
"sha256": "39b36764f09857c01eaa9520da3e2d5023d7df881bc72379e4c55d05ebde8f6f"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst",
"sha256": "8aa8e19b739bc3fd897115f92d54acd081453441ee4dae8ca694ec47662838a7"
},
"images-harvester-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
"sha256": "93e0f6a8e5024f054cdce242aea4fdb833e476d7b2531b454f5f3267f724594e"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz",
"sha256": "97cd2eb0920d433ef57c1a8c8f4a6680faba9a0589c9605c30a56e2c09110c77"
},
"images-harvester-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
"sha256": "2b72f3bf1485a986d4a325cd15cb12163f4acabcdd4fcf77400a4c226a26c097"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst",
"sha256": "f16ef32d0b9586fb7e600013e56dd9098149dc5ce5239f4828ad03dc7463553f"
},
"images-harvester-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
"sha256": "4e675fca42ba1862810e021570f58462046e11fb92552d699e20d314be4dd54f"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz",
"sha256": "86fe56d8a277208c26c13a9b04b18b4eb4f2b6debcc7ad754af873e4c64d66c5"
},
"images-harvester-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
"sha256": "c642cadb4f1ccf8439e3c47b10933cae6db0d29c2d9bb9b45267ca69191b0c3f"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst",
"sha256": "dc8e9aa0dd1ce2a62b58b7ebfc673911364bd2c3228781f4a226e4796d0436be"
},
"images-multus-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
"sha256": "080cbffc7710eb25167e65619101b9cbfbd80d6510da2c857a7fe2d70140358d"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz",
"sha256": "287437a99ff5c42516764d625571c10d2fbb44ef82cdb026d37b141e56305664"
},
"images-multus-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst",
"sha256": "108543225439fc50053a904b953813a39a0d0d4e6c7a76a2e99a8ee26a69f1a2"
},
"images-multus-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
"sha256": "1009e845edf77dbe04e8d815ce036c73f1309c0a4a2ec69abafb3e058365513c"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz",
"sha256": "98f213f7c8a70c4b0d0fb22329212190e08c82d6be482b227e3256637388c732"
},
"images-multus-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
"sha256": "f76f06cd2344a2c44283733c0e02a94b1bea6c63bc0b7cb6aa2871a474661628"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst",
"sha256": "c310597f504b2dd8ac46cc2b87125dcf57a3ae77e4bbbeba4f436a598a2b96f3"
},
"images-traefik-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
"sha256": "4268db05101d1022ee1002f46516aebeac1b9f8171288ea2d14ddd4763b35ff1"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-traefik.linux-amd64.tar.gz",
"sha256": "86a46ecea0d7a60a68314a5794698d6421aa4ce69c05a1f836360e9be996a36b"
},
"images-traefik-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-traefik.linux-amd64.tar.zst",
"sha256": "aec23459c8e51ec16491b4657a3b2a64e49357d3e6cef0a11ac7d3c2f285fe4b"
},
"images-traefik-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
"sha256": "39381c15bf462071edeb8f735d447ec6d750cc23f6dd3efb45d7b38193ccb7a2"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-traefik.linux-arm64.tar.gz",
"sha256": "29372e44e2c1b682c4bc070a764746138a850e24c2cef7edbc97bb2afae51bd8"
},
"images-traefik-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-traefik.linux-arm64.tar.zst",
"sha256": "dd5efa19d02ca7a8a0bcb05febd2781e8ad85016c09b1defe09cdc5f494f05fc"
},
"images-vsphere-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
"sha256": "6bcd307750c4077eca4cf934dffa4e93277479512639f4c2458f0b0b0eb2cddb"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz",
"sha256": "237d3f47fdbc2e511b002ed700536125ccb0fcf7c69f2b192db3bd351043d3cc"
},
"images-vsphere-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
"sha256": "707374e5a6066ec39b70f46ac43e5ca7c10a04811c509dbbacd3edd2cbc8fc0f"
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst",
"sha256": "be5e7d4a33142cb07ac687b777c2c892354f44061d769a72b4731af49c307ec1"
}
}

View file

@ -1,13 +1,13 @@
{
rke2Version = "1.33.12+rke2r1";
rke2Commit = "2cf00d600ee7064fe19efee3e35195ad92c006ef";
rke2TarballHash = "sha256-CESLU8qyr0MnVmXRKaPZ7CFvBmIqpLAiklBrsuw9W/k=";
rke2Version = "1.33.12+rke2r2";
rke2Commit = "341f3e620b43d178daccfe5199f9cb752b0c3922";
rke2TarballHash = "sha256-fjhAeDjX8w3c943wjaOamlR4NXZEIhE68iSIP6co6OQ=";
rke2VendorHash = "sha256-I09PTw359mW9b8j/tjbedu7gJ0cp+NPEvmikxJMOufQ=";
k8sImageTag = "v1.33.12-rke2r1-build20260512";
k8sImageTag = "v1.33.12-rke2r2-build20260521";
etcdVersion = "v3.6.7-k3s1-build20260512";
pauseVersion = "3.6";
ccmVersion = "v1.33.11-0.20260415182038-2566e39d309b-build20260416";
dockerizedVersion = "v1.33.12-rke2r1";
dockerizedVersion = "v1.33.12-rke2r2";
helmJobVersion = "v0.10.0-build20260513";
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
}

View file

@ -1,138 +1,138 @@
{
"images-calico-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
"sha256": "9191dccc4fa6bdb8bc589d20d34c643227fe2c1e3d198eaf600780a1c44dfd5d"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz",
"sha256": "351e9047ce160cbf3b9ed4a32996f36bb4266c200e9957407178d2d28e55f8e5"
},
"images-calico-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
"sha256": "707eaba12e9e9d5e5090bb5fb3e066b893c0b0aeeee6f3627c1153e2db380567"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst",
"sha256": "aa746ea4dd91422e37d2cac07b36854ddc1c551b4da061c261d1e0132a983656"
},
"images-calico-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
"sha256": "33421abe9967b3f00799b3251f84a3a36ab03378a4f1c556663ac2b829f59cf4"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz",
"sha256": "96829f58e60b02ccee8e19b9ec4ad2ce7ade6f9030b1379eadedd42d151a783b"
},
"images-calico-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
"sha256": "f727fa092650bf685b68358cf41422c260fe9eee7a2aebecc68f14a2fd24a678"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst",
"sha256": "6a7f4404f92e88eb515bbff4513b5771e82c69111dfdd7e88c7d83d4366480e6"
},
"images-canal-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
"sha256": "b46d57b12bd62a5f4c4227fc1339ba8785853e55f81031c97774f44844c6769d"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz",
"sha256": "16bc527e0b4ab9612747534c2b5801487a12379a364da4936d01816fcb608040"
},
"images-canal-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst",
"sha256": "d4d14e4ae3f34d0615fd6007e7048b54bc5a15be9f57fa6be6cd72346c39ccdf"
},
"images-canal-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
"sha256": "977c126339368ac55ccd3cb658dcc6530d46426292735dc8cff95dad99543ebd"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz",
"sha256": "ece067531498aec3847a73cd4e4e379c2bb3186f72717601b4766f2a50df0f3a"
},
"images-canal-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst",
"sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d"
},
"images-cilium-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
"sha256": "2ad31cd1bcb0ba5ca050bda0942a0b6b79f21ae4dfc70f70001be08921c4c3cb"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz",
"sha256": "95d566220546d6b49f6b79fb729c976fc435ae85fcb39add9ca4e8cade953e8f"
},
"images-cilium-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
"sha256": "c812ea710fcac1dd25e1be8f45e9fd3218296fdd6414c90a5b856fc16a5835f5"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst",
"sha256": "fc146c92933270bd4291a75069f1d724629c84ebb6c8cd5549756a895a5a9e3d"
},
"images-cilium-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
"sha256": "07507811563e82578142bd56c2b394b32b55bd53c965f8fc9a9881570feac68d"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz",
"sha256": "d5bfc28db9031a8be3a5c325fe6f6cc6dca8f101af5fce394d11e00a0e866dc2"
},
"images-cilium-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
"sha256": "0d5813611f47a460c7762f1902e1be7785f52903b8340fc112dd67c5ba9e0adf"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst",
"sha256": "0590f43bf3d6ea590a9069d62170956d72f6ff1b1a45574ef7129a6fb07481ae"
},
"images-core-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
"sha256": "4716d37e4c4974c50d88a6c4a4dd1ae59e5d416b06161dc97af267ac91005200"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-core.linux-amd64.tar.gz",
"sha256": "2d89ef07043ee8475bd91c97c7419dcb068e089ba8d74f31a503749fdd29a700"
},
"images-core-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
"sha256": "c326f685c5037ae41a76d0a57d81ad365664fdb4f09dd8ed1c085daef6e8898c"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-core.linux-amd64.tar.zst",
"sha256": "663f048d7ad31aeaf5820effc4e9fd6499ee038c2736afa6721c2384c049765c"
},
"images-core-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
"sha256": "8439de0d0159a2d0458a94c48d4f856dd499106bb97a1228315172a8ccf7a227"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-core.linux-arm64.tar.gz",
"sha256": "740bed7351bab07dbdaaef316d3c9c817c381fefff4ce43af78381596e1f34d6"
},
"images-core-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
"sha256": "dbfb0ba0d552b9f09d6fd7c3f1313c2d3a65b1fe9d003925f90206bb908ceb1c"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-core.linux-arm64.tar.zst",
"sha256": "d224ffbf50eb2be8edaa1b923323df17336b8c435bce034e2ba4ae96a54244ec"
},
"images-flannel-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
"sha256": "2b65ebfff9edad28dc5df77d58a9f9191ae6ed1ffd47e001c61979940dbd30cc"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz",
"sha256": "1a84527d66538b5ff96e331493006bbd3ccc06529d51a8b7c9a3e0d219c25a6f"
},
"images-flannel-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst",
"sha256": "832aae87b5eba45be64b47a5ebc04824060095dbc79d58adb009dbc0b738252a"
},
"images-flannel-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
"sha256": "17393dba1ce79c78739381ba2c6dc9383f41bf78e511b04a3eca0564d88a58d9"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz",
"sha256": "80d7ab29cce2d595926ed0999e663932489c62c9e4b818909a05739357e584bc"
},
"images-flannel-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
"sha256": "8aa8e19b739bc3fd897115f92d54acd081453441ee4dae8ca694ec47662838a7"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst",
"sha256": "39b36764f09857c01eaa9520da3e2d5023d7df881bc72379e4c55d05ebde8f6f"
},
"images-harvester-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
"sha256": "8d6e85fbf15c10faa6c50098f462e1f042e37e80df8aaa67f4e4a4cfbb61b3f7"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz",
"sha256": "86299476461d69c9db81c47f1bff915f122dd31f229679033cb9ac3888f34d20"
},
"images-harvester-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
"sha256": "44bca782f1503b189e17248edbfc344c129ffedeabf886c5ecae89717a68e6df"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst",
"sha256": "c3c2539999dbd963deb1533d76fef211902322d7204c977b7534c37342a6ccba"
},
"images-harvester-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
"sha256": "0af1f6bf05788880ac4617271b8896662c41ed3b099ad617bae21aa41f669f68"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz",
"sha256": "dadfbc1e60b11be02c186343748f3c5e6a7c03bedf4bf36b1007b6addafaf6e2"
},
"images-harvester-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
"sha256": "085489645c3bdeb44216be70e0194f6e356a4e0116e861fac7009dfc671f99b8"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst",
"sha256": "ec9d3370c2cb488fe98ed38688fd3cec14ba136783efd894b3bec2a5599f8c08"
},
"images-multus-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
"sha256": "6c759cc8ce3e9ae7b6aef0b5cdf4094762f6f69d55dd70b6d9a405db796f1cb3"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz",
"sha256": "a4bbad1ab2c8d7f65e6cc9238d63f29524774bc07163a4a23688d9a0a63c4629"
},
"images-multus-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
"sha256": "530f83485923076b7769c4ced5c87b88979dff0e4d28faf33fc5e9b67fc5dadf"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst",
"sha256": "98e17b69423ff3de402803a0ec2fb63748252c800c672a232f912d312cf41ff5"
},
"images-multus-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
"sha256": "efc94b4850aef8d2973f51bff0df31ce0689949e22bd05161fd5c12cfa9672ce"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz",
"sha256": "1ec1676f8bcb054ab243cc7b3df555e0099fd2a227683615f15c8cbb95db040a"
},
"images-multus-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
"sha256": "883d23d8ef3733d9747251c8a1d223571153fd233eb93e5d32a76129a6c64f2c"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst",
"sha256": "c310597f504b2dd8ac46cc2b87125dcf57a3ae77e4bbbeba4f436a598a2b96f3"
},
"images-traefik-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
"sha256": "282c456cbcdaf42f2b4c62b110aaa459e5517dba0a7dd8c6fd539ce93c9fd632"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-traefik.linux-amd64.tar.gz",
"sha256": "288cb12a19e0419f91a56286c934823eda31c523f865bb24b66c9cdeb89cc73f"
},
"images-traefik-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-traefik.linux-amd64.tar.zst",
"sha256": "aec23459c8e51ec16491b4657a3b2a64e49357d3e6cef0a11ac7d3c2f285fe4b"
},
"images-traefik-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
"sha256": "4ffe8a7b25bc4c116f34b29f51de69ffbe7702f473f8b68577ac086f88e0c5fb"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-traefik.linux-arm64.tar.gz",
"sha256": "f3d34ffea490540c028f800362862c74d1b45efb0acb3db072f5417443b71733"
},
"images-traefik-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-traefik.linux-arm64.tar.zst",
"sha256": "dd5efa19d02ca7a8a0bcb05febd2781e8ad85016c09b1defe09cdc5f494f05fc"
},
"images-vsphere-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
"sha256": "b15c7523c8ece5525acdd1e04bdcde1a3e54435fcdb1a8ec949de9395f69a3aa"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz",
"sha256": "c87a8f5b553e664f0c7dfa44b2fdea40b7bbe22bbf4d96667009a76f5b181f86"
},
"images-vsphere-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
"sha256": "ca086d7c16de41dfd1fd5f2e745949f0a51d4de45f9bacdaa3b1955936f595e9"
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst",
"sha256": "df524665950321e45d0b8521532263e969533af82f7c77dddc86b4b6dfa675a3"
}
}

View file

@ -1,13 +1,13 @@
{
rke2Version = "1.34.8+rke2r1";
rke2Commit = "4fdfd151975bbc58c8d392620db8eea72fea2abc";
rke2TarballHash = "sha256-n98pZhWARQMyKj8G9+ymmMZyzoiGo+KPMr0F5KDphqU=";
rke2Version = "1.34.8+rke2r2";
rke2Commit = "b227fefe1936a550450ce3b6248c559fa58b5cd3";
rke2TarballHash = "sha256-Ojc4PhsEYJBhgj+r+XEcdFEjZIlJCCVNC+w7mZWY2hA=";
rke2VendorHash = "sha256-752RlnL+7reFk4G/X8kgHdad71fatY+Ss714MbJDvg8=";
k8sImageTag = "v1.34.8-rke2r1-build20260512";
k8sImageTag = "v1.34.8-rke2r2-build20260521";
etcdVersion = "v3.6.7-k3s1-build20260512";
pauseVersion = "3.6";
ccmVersion = "v1.34.7-0.20260415182025-e7567db58dd7-build20260416";
dockerizedVersion = "v1.34.8-rke2r1";
dockerizedVersion = "v1.34.8-rke2r2";
helmJobVersion = "v0.10.0-build20260513";
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
}

View file

@ -1,138 +1,138 @@
{
"images-calico-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
"sha256": "483d18ab6a64d279b4411098dec8b6f4219839bdb0d3e023f87679e6c71905de"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz",
"sha256": "d53e659b7f934fb811eadeb7d6e348b12ef932b0a414073301bdf03d1501f32f"
},
"images-calico-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
"sha256": "c8ab27e9f5cd0d85cc20ed8c02c71128f021199a0256c5a051734817193e913c"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst",
"sha256": "b7cf99a56b03469169e8b1a32f9aa61b828268dd5aff9482503d00c884260f0e"
},
"images-calico-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
"sha256": "01339c90624d6745e16b7706585fdb32825df66adb892a9bd265257d2de315a5"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz",
"sha256": "53a95f56dbd4aeefe631afdf05d00592da7bbb2c089e694d06ffd6c6c8665375"
},
"images-calico-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
"sha256": "9816fa61d5b89ab40ba59db3c0593ed37f712c6bfd1f3b763641b0bfad8b5d04"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst",
"sha256": "c49ef55be8b1a30597e4315fac563282cac7870045a465ba7e1ee2c81db44cf6"
},
"images-canal-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
"sha256": "cc4d48fde0650c666f87322ef3fec4987de06d99b4f008a07b667a7650451069"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz",
"sha256": "f6ffb60b14b0fda2e3a138f4d6a7e9cb71e8fc759d69cb0fda00aedcaa03ab0f"
},
"images-canal-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst",
"sha256": "3a7828ce0143c3eb91cae940cebdfa0145960e91be056e88a8b077ee39ccc54d"
},
"images-canal-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
"sha256": "977c126339368ac55ccd3cb658dcc6530d46426292735dc8cff95dad99543ebd"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz",
"sha256": "2319ab1753330cb13ea7ac56198d9da78123aaa6a3b66ea3d970a6c57de9ce41"
},
"images-canal-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
"sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst",
"sha256": "63b0888d1adebb72a77c2d1f1eb1ced1519cfdeb57681026a94c1f53f87f5610"
},
"images-cilium-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
"sha256": "0877802ec5502223f1b233573b2e87e3347a7922f2bb52702f9461958ac0c043"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz",
"sha256": "9c6ab1f22a157e7a74c35c4be3c025eb154e6315be9c2085451f59b11b63f8e1"
},
"images-cilium-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
"sha256": "345afdae010cf3c77e02c4e339749f3c3a5d4d62c3ed486edab0bb1d4089c67e"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst",
"sha256": "38892592ae5e45e27e4cad76d4364c549bdb386def54398cc26c9249bbd34760"
},
"images-cilium-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
"sha256": "00161836b5f27f1ce07be67337d08781033d6df4efe429bd922459738145ecdc"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz",
"sha256": "a0a02109ef5a5f4eae1a06003ba80544b405b155840ce5c3535b1c4e02d16f0e"
},
"images-cilium-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
"sha256": "32b275bc86c35471d9deea33b6119a33667a28477c06500db3ea9d1d0cdf7d4b"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst",
"sha256": "8110fc9517469dad0c291258e0dbdece6e4e3c9a51d539531527f4236692b7bd"
},
"images-core-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
"sha256": "e0519dd39f2f3297a84fa7c2e9c6fdda508386169474a47ebbb570c66f51c27c"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-core.linux-amd64.tar.gz",
"sha256": "2d32c6205a83ac776fe54d7777472725edfc204fd7a30befa0ee9c5f7fde80cc"
},
"images-core-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
"sha256": "6f63f6cf296f828ef1ff98041691e9a6126490000ae2e90648c0699ab1bde91f"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-core.linux-amd64.tar.zst",
"sha256": "48bdbb2bc2652eb6647ce3f2ce215ac9bf12cf5fbe4936688e5de34605f0fb2c"
},
"images-core-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
"sha256": "b66332a3a903e1d18c783a7d58d9eb74aef9d4cb0fe91a4aa75a63cff5b3e92a"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-core.linux-arm64.tar.gz",
"sha256": "3e392555a295ec6f7e3ea477ded0bb71c04957dccd168de87d87226dfdbb753f"
},
"images-core-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
"sha256": "98abe8232378ef17f9890e3c77cd405a90e7aa2fdf5d612bd7d42ee174714cf6"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-core.linux-arm64.tar.zst",
"sha256": "29d28cb1b2035c1d5123fdb6bb0fa8cc647ad9cd570edf434bc7e560806426fa"
},
"images-flannel-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
"sha256": "4ea4b1fb4a653a5ad00dd206406482abddf9f53a1b1c4f884e7e7fb4fe720c90"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz",
"sha256": "e86e5631c691d2dcac99764542c875e4bed902f385f5a6e2f6e6b88facf114aa"
},
"images-flannel-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst",
"sha256": "23695fd8c2a77f043a089c44437d12b5bde88422dbcd1d70edcda7a78f651137"
},
"images-flannel-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
"sha256": "d4dcaa35507a5f9d407a5d3a3fccee3e52061256bd0b420123bf888a24915758"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz",
"sha256": "396084ee38b31e5b78e3d8c3a015f8a56194119204aecb9de052a5be20c61e01"
},
"images-flannel-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst",
"sha256": "39b36764f09857c01eaa9520da3e2d5023d7df881bc72379e4c55d05ebde8f6f"
},
"images-harvester-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
"sha256": "b47becfdf139af069eaf1f691498ff689b577af43ed934edba119257bf652cab"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz",
"sha256": "38eecc385bbb77bde48d7dec9aa48bc897136c5714e5eff9c56c9df580dfb35d"
},
"images-harvester-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
"sha256": "b00afa052e7b67d4111f19a4eefb22095c836a7972911880e65dee2044975898"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst",
"sha256": "20e7b012ab2802a057be6cf6ef3d8f04a65484403615ddd3c2852d59d3ed7453"
},
"images-harvester-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
"sha256": "1e9a034a075472ecaa6f9e66c7ff2ada6f97b4a02a5e070ce36208b4eb4f1fcc"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz",
"sha256": "8b712f389d2118a802a70ec4175e83be0557a4b699bc238bd228c862aa337419"
},
"images-harvester-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
"sha256": "8ddfde1b1ceea2f08db9fef9da9cb9745bbe74b2520cfceeb150c623102401a3"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst",
"sha256": "dfa539c18041a6e0ef1747c469c718f7e608e031dbc99eada2dbf56768f6de72"
},
"images-multus-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
"sha256": "b75549d8d650823ac9c8f5b5ba247901a8c5681ac91d909aea5a0d4f66d0b5bd"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz",
"sha256": "48a6e3c5fc5534b6c77957dd82e488f46cd6c6a713233da32ab18e94961f33a2"
},
"images-multus-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
"sha256": "108543225439fc50053a904b953813a39a0d0d4e6c7a76a2e99a8ee26a69f1a2"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst",
"sha256": "98e17b69423ff3de402803a0ec2fb63748252c800c672a232f912d312cf41ff5"
},
"images-multus-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
"sha256": "c0f20bbcc6b238af7249c265a7c6458c30f9358007c1380c7b99de01ee219398"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz",
"sha256": "cf99f6af0ae8389926f9cba977370ffbe1ee261d429281957eb2b5cfb015a71e"
},
"images-multus-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
"sha256": "eee8c18cf3bfea3df603e2d9fb0c30c75fcc7e88dc58c1cab1b8d5926aa8dd52"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst",
"sha256": "f76f06cd2344a2c44283733c0e02a94b1bea6c63bc0b7cb6aa2871a474661628"
},
"images-traefik-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
"sha256": "1aed02afe45b0f6abe3b8934bdd6beee5a8018b31e81be896e9bbfbf75cd2bc5"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-traefik.linux-amd64.tar.gz",
"sha256": "f77681adb7835d43c2eb77d189573990f32fa8b3d98bf7d8fb559788f0e30eea"
},
"images-traefik-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-traefik.linux-amd64.tar.zst",
"sha256": "aec23459c8e51ec16491b4657a3b2a64e49357d3e6cef0a11ac7d3c2f285fe4b"
},
"images-traefik-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
"sha256": "4ffe8a7b25bc4c116f34b29f51de69ffbe7702f473f8b68577ac086f88e0c5fb"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-traefik.linux-arm64.tar.gz",
"sha256": "5a57534fd048ad725e15a38a8be65a642f6ad443cb55c9dad6eff276d704dd44"
},
"images-traefik-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-traefik.linux-arm64.tar.zst",
"sha256": "dd5efa19d02ca7a8a0bcb05febd2781e8ad85016c09b1defe09cdc5f494f05fc"
},
"images-vsphere-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
"sha256": "4d1a7ba7c43d474d796d7b05a0f24a423b6c3a5a53388e9d803fd31c54efb912"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz",
"sha256": "c3e5339a35bba7b7184850935bbfcda7d6c2dc7dd4e34d7c9f390a58766ac654"
},
"images-vsphere-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
"sha256": "d2f8909d694493222aa1051f8c013ffa73615567141336b872ada5c9e6312cd8"
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst",
"sha256": "f0a388912b6150d4ff820b53ee58c398d5572c325f381ad5ce4d82f0d10f5849"
}
}

View file

@ -1,13 +1,13 @@
{
rke2Version = "1.35.5+rke2r1";
rke2Commit = "e28e7c1a0404f1e9bf36e8b7222d64aec6b7a004";
rke2TarballHash = "sha256-t++HKNbR4WGzZiR6rVMke7lbixXA8H5ibovfitwPuXE=";
rke2Version = "1.35.5+rke2r2";
rke2Commit = "a779b949d9a7987fc51e7c71c146db4160d0e3bf";
rke2TarballHash = "sha256-eMqaz7DmIwANpvcQxEA6rJQcLmdBlEFT8Qju+Wr0dTo=";
rke2VendorHash = "sha256-LV3ISu7bW6kxlKFe0GUqkB9Jte1Ey5DaWm+OKq1/1uY=";
k8sImageTag = "v1.35.5-rke2r1-build20260512";
k8sImageTag = "v1.35.5-rke2r2-build20260521";
etcdVersion = "v3.6.7-k3s1-build20260512";
pauseVersion = "3.6";
ccmVersion = "v1.35.4-0.20260415195656-e51c0636351d-build20260415";
dockerizedVersion = "v1.35.5-rke2r1";
dockerizedVersion = "v1.35.5-rke2r2";
helmJobVersion = "v0.10.0-build20260513";
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
}

View file

@ -1,138 +1,138 @@
{
"images-calico-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
"sha256": "bc9fb1ba72af6185de90e4e0f8a384993657c4b0fdedbb14e7ca5cf93bf2303d"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz",
"sha256": "ec37f597d76bbe3f30b6108049faaf9f4a6e99b4d228f9b8485fb492c31aa0aa"
},
"images-calico-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
"sha256": "38fc5ecd017e9a66e3831ece42efedcfedaafc000759eaa4fb9f19a68122ec51"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst",
"sha256": "5112e4bf4f4f5f553addb98abf53636b8ff57cbf18514d7537ec03c344d5b345"
},
"images-calico-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
"sha256": "e86ac7f4cf14e4f02fcdd0e3d74e832fa43654f592068c2b5d8c044c69e2b749"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz",
"sha256": "7161e8af4ae5c45d480be7083f15d3e7992745e9559d460584c5136d9caca789"
},
"images-calico-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
"sha256": "03df93db61bc54f351bb6131c632279c265d4b71af0a90e2a6898f9b99b453f4"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst",
"sha256": "f63ba6f6b30564626d6839002117325b3d48b2f2a131a8bfeb1192244da1de7e"
},
"images-canal-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
"sha256": "5cce5314ed6ff237c646723456c81876e89517b9164368728a9df00697655858"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz",
"sha256": "7478fa0950554451cd856dbb8a800486f73fbb4758ccad28d1d218febe9b0b39"
},
"images-canal-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
"sha256": "3a7828ce0143c3eb91cae940cebdfa0145960e91be056e88a8b077ee39ccc54d"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst",
"sha256": "d4d14e4ae3f34d0615fd6007e7048b54bc5a15be9f57fa6be6cd72346c39ccdf"
},
"images-canal-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
"sha256": "e8346348137747fbd626846e5b71d182c49e8a1dcb997ea9e91f50e7bd907129"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz",
"sha256": "4a77a243413b7963e3f3a98fcdb1cc2bd96cbe83b6a3f3d7ca73f05c1d7bd855"
},
"images-canal-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
"sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst",
"sha256": "63b0888d1adebb72a77c2d1f1eb1ced1519cfdeb57681026a94c1f53f87f5610"
},
"images-cilium-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
"sha256": "8c52261340b4af54186f83d2913c676a2dcef820f25a1b42b8c51cfef1dcdbc6"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz",
"sha256": "83642c47920ab60e3042895aee5e56914187c822ac279178096c5430ce655988"
},
"images-cilium-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
"sha256": "865913456dc55b2ba4748b0fe76489e4960a60990f207341c66bcbf9e93e95b3"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst",
"sha256": "442a391b5486a551fec98464a02396179e6f70a4cc41e0bb631b0ea70a8affc3"
},
"images-cilium-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
"sha256": "4170bfc7d0ebf9167a94d24e393fbff0fc7dce4da1443257709fdbe603ffc579"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz",
"sha256": "a5d7ec33831f617546aee8ad44a521e06cdef30c5ac9e3c23b1876dddacccb9b"
},
"images-cilium-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
"sha256": "016caf748e5c39460b9618d998d261c7db8fe8348f9fa43d35693a47d4913b86"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst",
"sha256": "d5b757ba6313c6bfb4e85b238aa318ac12aeed7ec8f1e4af825405648737e1bb"
},
"images-core-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
"sha256": "03a72f2c228131b7cb616c5b7758cd1c00b7f3e7d589573c5faf837e4e2ab764"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-core.linux-amd64.tar.gz",
"sha256": "30ff144583c0b3249b06801d78c902305e1a5009bf3ab7211862d989fca18267"
},
"images-core-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
"sha256": "37acd15d183693fb0bb465840590593ed78d72415752a052d282a418fdb905cf"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-core.linux-amd64.tar.zst",
"sha256": "e056f1ba054b8b39a68c4df19480d878327327583ea843f4a80ea0289e796e15"
},
"images-core-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
"sha256": "4798bf3293e7b5b62e694bee8a811c3ace86bb5c7516c9f196a4ba48dc947c3f"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-core.linux-arm64.tar.gz",
"sha256": "54d0d3d97462f8f70c75479cc77edd482cf318bef31ecaa3063b354432d7af9a"
},
"images-core-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
"sha256": "ff8c770fa2b17151e333a0a4449bc4dc3cd5c65662ec88b2ffc31fde6a40d0ed"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-core.linux-arm64.tar.zst",
"sha256": "62528323277c307d46e0564288508d9203dc460f93be222075b5a1c1be1c910e"
},
"images-flannel-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
"sha256": "0e5c71c9ecd89f11bb1cc0ea72a0297090e7a44395efe5fd74e14af3db3581a8"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz",
"sha256": "b9742e4656c394dff69f7356e9fd22bc7ed4e0b4cac2d86e224cdbb5d793158e"
},
"images-flannel-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst",
"sha256": "23695fd8c2a77f043a089c44437d12b5bde88422dbcd1d70edcda7a78f651137"
},
"images-flannel-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
"sha256": "d9f75aaace63bcba2cbaeba2662d9877d39ec822621fd96824e9ec3fbe62a79c"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz",
"sha256": "e2ea34d8f0207197758c75dbadb1e6ea1e31758ea26f49ac6cd8cb5ea941e743"
},
"images-flannel-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
"sha256": "8aa8e19b739bc3fd897115f92d54acd081453441ee4dae8ca694ec47662838a7"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst",
"sha256": "39b36764f09857c01eaa9520da3e2d5023d7df881bc72379e4c55d05ebde8f6f"
},
"images-harvester-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
"sha256": "c9442d489c4170fc515d04c2c5c7c76ff3ca2fb4093a94aea0d0a6fb1719c5d3"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz",
"sha256": "34d08bdfe771f5d6c2c1a077519aa9dea2c4ec5ff6598812630b5175e15b0436"
},
"images-harvester-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
"sha256": "9551558d7baba1a78de7954f4801cf4329b5fb5ffd0cc3566b9fa32732ff950c"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst",
"sha256": "04e83f1ee26a6e40cd4267025b85a8afba847e8b89bbf25ad33d3f598128c3d5"
},
"images-harvester-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
"sha256": "11ea150625fc1a4700cec2859367692d533f7f9288f7196b331a77682766d742"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz",
"sha256": "b56ec39e51d0f99a3bee9cb7b93fa5c07e4b91a2709bf6cca246d3c47f442c1d"
},
"images-harvester-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
"sha256": "045db3938a0a11f6d5b4936f63471fec48fd76d29ef85e9cfe6bae5bddd8525e"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst",
"sha256": "e8a51c1926db9e71ab970b0a08a2becb85b2c2aab0108120d1f3d6d21f17f1cd"
},
"images-ingress-nginx-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-amd64.tar.gz",
"sha256": "0af77531d170d30b844518bb4665b29f3f386cf160f7c2b955467516f4d04dc3"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-ingress-nginx.linux-amd64.tar.gz",
"sha256": "100d6841727443cc9558a4aaed924c1f23e8d39e4302bd32dac6fbdebed940e9"
},
"images-ingress-nginx-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-amd64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-ingress-nginx.linux-amd64.tar.zst",
"sha256": "d5b7d3f12de0799cebf84fc6260fc4f093f2837c5fef6fc84849d8f1da5cbc22"
},
"images-ingress-nginx-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-arm64.tar.gz",
"sha256": "8c5d5eea216102e5dd07621671f2e462dfade184f20c81adb8facbaa58e59c2c"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-ingress-nginx.linux-arm64.tar.gz",
"sha256": "f10675c08075e5312f650bde022990e2122de979e4559f2c56aa1ec941516eb2"
},
"images-ingress-nginx-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-arm64.tar.zst",
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-ingress-nginx.linux-arm64.tar.zst",
"sha256": "363f42d83118e3398e72996f6b42477230000ffd50d93fdda570140ea020539b"
},
"images-multus-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
"sha256": "ec3d8557e36db43acd9a76c38242de6feea354e41ae3ff8b9ab55de82ee19026"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz",
"sha256": "70dd5bf043e5ade8f15bf794ed68c2632fa168cdabb88a59e1664c21802b1b72"
},
"images-multus-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
"sha256": "8be7075092a5e179e50fb526ea730018103d9f8a609f22f0d1431482690a9d7f"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst",
"sha256": "98e17b69423ff3de402803a0ec2fb63748252c800c672a232f912d312cf41ff5"
},
"images-multus-linux-arm64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
"sha256": "caebabf77d9d3190d76156990d8eaa0c2df5cb563a8447f1e506b50f4104e1a0"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz",
"sha256": "70dc7d7e6b5ceee67e1ea31a9fb8915b23697b46ab81962fcf2bc23994eadcdb"
},
"images-multus-linux-arm64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
"sha256": "39bd89d250894254f7c1f9b061401a574716574ab3f51cc3a82c03eb4e804825"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst",
"sha256": "7d768e2a1ba9eeb051e2cc74e1886a21cef515230a531a300dfe8b988a426fdf"
},
"images-vsphere-linux-amd64-tar-gz": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
"sha256": "d07ed8b72db67fae9024540fca3eed7990b4a4b3a7ba6eef78a2eae8e6b3b4d3"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz",
"sha256": "a16d790a062b96f792952a8e87df314050032e1306d3f1b411c4c1e80cea574a"
},
"images-vsphere-linux-amd64-tar-zst": {
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
"sha256": "4cd43197b21bd1344c0a7e87a7f28c8766b3edfab8e2fb2bb6954d144f3b44a7"
"url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst",
"sha256": "bb33b083c06d621bb430942aad52ddfe45fd4cff956072104d83ea22ef91be02"
}
}

View file

@ -1,13 +1,13 @@
{
rke2Version = "1.36.1+rke2r1";
rke2Commit = "b4a8e78038f35eb282a8d6e3c29797a1181fa961";
rke2TarballHash = "sha256-SD7+lNYu6/5iMxEmHEpkD8g9UCgN6gjkFsGdQn9o1Cc=";
rke2Version = "1.36.1+rke2r2";
rke2Commit = "05cf623e2245271b63d1d7ef2caced897636175c";
rke2TarballHash = "sha256-hxnO8w+ec9cx6betH2hdC50AO/VHmPlseeKV8HgH5ZE=";
rke2VendorHash = "sha256-gUgRAC9yKDa8JYb/jdCxZdP6500XxjqHprmYlPv5A8c=";
k8sImageTag = "v1.36.1-rke2r1-build20260512";
k8sImageTag = "v1.36.1-rke2r2-build20260521";
etcdVersion = "v3.6.7-k3s1-build20260512";
pauseVersion = "3.6";
ccmVersion = "v1.36.0-rc2.0.20260427154526-d239025e2a23-build20260429";
dockerizedVersion = "v1.36.1-rke2r1";
ccmVersion = "v1.36.1-0.20260508014929-7bbbf7c9b258-build20260515";
dockerizedVersion = "v1.36.1-rke2r2";
helmJobVersion = "v0.10.0-build20260513";
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
}

View file

@ -101,11 +101,11 @@
"vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
},
"baidubce_baiducloud": {
"hash": "sha256-+doYnLRuseR5YtqMJeoxJtnb0UGBx+UgZ7S1sOLiF68=",
"hash": "sha256-kA2s+STTaax/PEevdHdbGzhQcFPJFRin6ALu1FkRzsg=",
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
"owner": "baidubce",
"repo": "terraform-provider-baiducloud",
"rev": "v1.23.2",
"rev": "v1.23.3",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -580,13 +580,13 @@
"vendorHash": "sha256-sPQR+LDZRMXygLUd9xj6/bI+8DhAPKbkytlTzmrEOBU="
},
"hashicorp_google": {
"hash": "sha256-GTcMwL5lZ81KDtohog4cCvy9zxXU/jh5k+aLosZZfRM=",
"hash": "sha256-xAzkBYqQR1VdERjt9zJFyItTj8dpfywHO8xex0biXPQ=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"repo": "terraform-provider-google",
"rev": "v7.35.0",
"rev": "v7.36.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-R3Bd+n/ySx4FyDQAP72P0hIjTSQjzNJE2QqUgRV+eQE="
"vendorHash": "sha256-Ub+Dvddw5jcSy2hR72OSsy4EgHphhCW1kekPyrQGc9E="
},
"hashicorp_google-beta": {
"hash": "sha256-WsZY4O5kUoOkDcP2iKmkLo85XaBM2oQxaB/7ibJMDwA=",

View file

@ -153,14 +153,13 @@ let
stageModules = writeShellScript "discord-stage-modules" ''
store_modules="$1"
modules_dir="''${XDG_CONFIG_HOME:-$HOME/.config}/${lib.toLower binaryName}/${version}/modules"
if [ ! -f "$modules_dir/installed.json" ]; then
mkdir -p "$modules_dir"
for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do
ln -sfn "$store_modules/$m" "$modules_dir/$m"
done
echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \
> "$modules_dir/installed.json"
fi
rm -rf "$modules_dir"
mkdir -p "$modules_dir"
for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do
ln -sn "$store_modules/$m" "$modules_dir/$m"
done
echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \
> "$modules_dir/installed.json"
'';
disableBreakingUpdates =
@ -261,6 +260,7 @@ stdenv.mkDerivation (finalAttrs: {
${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName}:${addDriverRunpath.driverLink}/lib \
--suffix VK_ADD_DRIVER_FILES : "${addDriverRunpath.driverLink}/share/vulkan/icd.d" \
${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \
--run "${stageModules} $out/opt/${binaryName}/modules" \
--add-flags ${lib.escapeShellArg commandLineArgs}

View file

@ -46,7 +46,7 @@
libredirect,
libseccomp,
libsecret,
libsoup_2_4,
# libsoup_2_4,
libvorbis,
libxml2_13,
libxslt,
@ -210,7 +210,7 @@ stdenv.mkDerivation rec {
libpulseaudio
libseccomp
libsecret
libsoup_2_4
# libsoup_2_4
libvorbis
libxml2_13
libxslt
@ -443,9 +443,11 @@ stdenv.mkDerivation rec {
'';
meta = {
# Older versions need webkitgtk_4_0 which was removed.
# 25.08 bundles the same.
broken = lib.versionOlder version "25.08";
# citrix_workspace has a hard dependency on libsoup 2.4 (autoPatchelf
# fails if it is not present), which was removed for being insecure.
#
# Versions older than 25.08 also required webkitgtk_4_0, which was removed.
broken = true;
license = lib.licenses.unfree;
description = "Citrix Workspace";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "easycrypt";
version = "2026.05";
version = "2026.06";
src = fetchFromGitHub {
owner = "easycrypt";
repo = "easycrypt";
tag = "r${finalAttrs.version}";
hash = "sha256-+tVGJAfngTHpn7qFGwl36verbcxOqH21zwojgOxcuuY=";
hash = "sha256-+exP4UWfNGZauznLZTA/NkMOHJNstz4oaTqI0bSnkH8=";
};
nativeBuildInputs =

View file

@ -10,18 +10,15 @@
stdenv.mkDerivation rec {
pname = "obs-vertical-canvas";
version = "1.6.2";
version = "1.6.4";
src = fetchFromGitHub {
owner = "Aitum";
repo = "obs-vertical-canvas";
rev = version;
sha256 = "sha256-LaVDwC+L96cvq3OpNnD33bf+tV1RZ9AdUHjG4oIFzpY=";
sha256 = "sha256-cWiC4e+ZojTuNAaNwuBQ1pPlchdiuTsVhWMHvcyxx2A=";
};
# Remove after https://github.com/Aitum/obs-vertical-canvas/pull/26 is released :)
patches = [ ./obs-vertical-canvas.diff ];
nativeBuildInputs = [ cmake ];
buildInputs = [

View file

@ -1,7 +1,7 @@
{
symlinkJoin,
writeTextFile,
runCommand,
runCommandLocal,
testers,
}:
@ -31,7 +31,7 @@ let
text = "qux";
};
emulatedSymlinkJoinFooBarStrip = runCommand "symlinkJoin-strip-foo-bar" { } ''
emulatedSymlinkJoinFooBarStrip = runCommandLocal "symlinkJoin-strip-foo-bar" { } ''
mkdir $out
ln -s ${foo}/etc/test.d/foo $out/
ln -s ${bar}/etc/test.d/bar $out/
@ -48,7 +48,7 @@ in
baz
];
};
expected = runCommand "symlinkJoin-foo-bar-baz" { } ''
expected = runCommandLocal "symlinkJoin-foo-bar-baz" { } ''
mkdir -p $out/{var/lib/arbitrary,etc/test.d}
ln -s {${foo},${bar}}/etc/test.d/* $out/etc/test.d
ln -s ${baz}/var/lib/arbitrary/baz $out/var/lib/arbitrary/
@ -66,7 +66,7 @@ in
baz
];
};
expected = runCommand "symlinkJoin-foo-bar-baz" { } ''
expected = runCommandLocal "symlinkJoin-foo-bar-baz" { } ''
mkdir -p $out/{var/lib/arbitrary,etc/test.d}
ln -s {${foo},${bar}}/etc/test.d/* $out/etc/test.d
ln -s ${baz}/var/lib/arbitrary/baz $out/var/lib/arbitrary/
@ -115,7 +115,7 @@ in
};
symlinkJoin-fails-on-missing =
runCommand "symlinkJoin-fails-on-missing"
runCommandLocal "symlinkJoin-fails-on-missing"
{
failed = testBuildFailure (symlinkJoin {
name = "symlinkJoin-fail";
@ -134,7 +134,7 @@ in
'';
symlinkJoin-fails-on-file =
runCommand "symlinkJoin-fails-on-file"
runCommandLocal "symlinkJoin-fails-on-file"
{
failed = testBuildFailure (symlinkJoin {
name = "symlinkJoin-fail";

View file

@ -873,7 +873,7 @@ let
;;
esac
'') packagesLists}
perl -w ${rpm/rpm-closure.pl} \
perl -w ${./rpm/rpm-closure.pl} \
${
lib.concatImapStrings (i: pl: "./packages_${toString i}.xml ${pl.snd} ") (
lib.zipLists packagesLists urlPrefixes
@ -973,7 +973,7 @@ let
esac
done
perl -w ${deb/deb-closure.pl} \
perl -w ${./deb/deb-closure.pl} \
./Packages ${urlPrefix} ${toString packages} > $out
nixfmt $out
'';

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "adrs";
version = "0.7.4";
version = "0.7.6";
src = fetchFromGitHub {
owner = "joshrotenberg";
repo = "adrs";
tag = "v${finalAttrs.version}";
hash = "sha256-JtYj30XGs+SbbbSy1aHbyZFlwQ/rkZ3JPrvRm4hicxg=";
hash = "sha256-PB/BuZP2pvYJCjaazEPs9d2ik8Fs7nuTnHdLREsu+wQ=";
};
cargoHash = "sha256-uvgadUtRmHoa3piEiTaLhVKEeGA/YIl6AMRPHNubYhQ=";
cargoHash = "sha256-RzX3moZog5BIppvWtQcU4Yauk4hZQfc8ZuFkvRs5jXA=";
meta = {
description = "Command-line tool for managing Architectural Decision Records";

View file

@ -1,76 +0,0 @@
{
rustPlatform,
lib,
fetchFromGitHub,
pkg-config,
# webkitgtk_4_0,
openssl,
nodejs,
npmHooks,
fetchNpmDeps,
gtk3,
wrapGAppsHook3,
cargo-tauri_1,
librsvg,
libappindicator-gtk3,
}:
rustPlatform.buildRustPackage rec {
pname = "alexandria";
version = "0.13.1";
src = fetchFromGitHub {
owner = "btpf";
repo = "Alexandria";
tag = "v${version}";
hash = "sha256-18i3/HLTfhBSa9/c55dCOfFal+V40wcHcLoYt1dU+d0=";
fetchSubmodules = true;
};
npmDeps = fetchNpmDeps {
inherit src;
hash = "sha256-6r9bEY7e1Eef/0/CJ26ITpFJcCVUEKLrFx+TNEomLPE=";
};
cargoRoot = "src-tauri";
buildAndTestSubdir = "src-tauri";
cargoHash = "sha256-VX/G4dF9DhlGfifp4xf9xkXli7BHFtKY2+HaMHqqPiA=";
env = {
OPENSSL_NO_VENDOR = 1;
};
nativeBuildInputs = [
cargo-tauri_1.hook
nodejs
npmHooks.npmConfigHook
pkg-config
rustPlatform.bindgenHook
wrapGAppsHook3
];
buildInputs = [
openssl
# webkitgtk_4_0
gtk3
librsvg
libappindicator-gtk3
];
meta = {
# webkitgtk_4_0 was removed
broken = true;
homepage = "https://github.com/btpf/Alexandria";
changelog = "https://github.com/btpf/Alexandria/releases/tag/v${version}";
description = "Minimalistic cross-platform eBook reader";
maintainers = with lib.maintainers; [ bot-wxt1221 ];
mainProgram = "alexandria";
platforms = [
"x86_64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
license = lib.licenses.gpl3Plus;
};
}

View file

@ -0,0 +1,31 @@
{
lib,
nix-update-script,
rustPlatform,
fetchFromGitLab,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "allmytoes";
version = "0.5.1";
src = fetchFromGitLab {
owner = "allmytoes";
repo = "allmytoes";
tag = finalAttrs.version;
hash = "sha256-BYKcDJN/uKESj0pnb2xvrx1lO6rOGdi+PVT6ywZqjbQ=";
};
cargoHash = "sha256-Pzbruv1E4mMohw//lf1JBoK+4BHDJVr4/9xXE4FrWbA==";
passthru.updateScript = nix-update-script { };
__structuredAttrs = true;
meta = {
description = "Provides thumbnails by using the freedesktop-specified thumbnail database (aka XDG standard)";
homepage = "https://gitlab.com/allmytoes/allmytoes";
mainProgram = "allmytoes";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ luminarleaf ];
};
})

View file

@ -82,13 +82,13 @@ let
in
stdenv.mkDerivation {
pname = "ansel";
version = "0-unstable-2026-06-04";
version = "0-unstable-2026-06-13";
src = fetchFromGitHub {
owner = "aurelienpierreeng";
repo = "ansel";
rev = "05dc2ee4269f59143596f368acb83efd4c9da604";
hash = "sha256-1lR+xSBsq9N3R9gVJ+mvZxiPIQKFpFTybjQym/YJfqo=";
rev = "2a9850bdc393d88f799b2cb3d80f22757d467d3e";
hash = "sha256-hCleHtaqH9dRHDtOVuKN16L1jPMeYJbr4qSwVPLIgL8=";
fetchSubmodules = true;
};

View file

@ -10,14 +10,14 @@
buildGo126Module (finalAttrs: {
pname = "athens";
version = "0.17.1";
version = "0.18.0";
src = applyPatches {
src = fetchFromGitHub {
owner = "gomods";
repo = "athens";
tag = "v${finalAttrs.version}";
hash = "sha256-hNk0hW7R7HdE4Wt1KuKSIUarRGKbtbFqQbfls1HXTqI=";
hash = "sha256-sFNxAG0hIxsoKCuef/ROy2MOjA7iC5ehXRvnUr20U0Y=";
};
# Trim the patch version, not needed anyway.
postPatch = ''
@ -25,7 +25,7 @@ buildGo126Module (finalAttrs: {
'';
};
vendorHash = "sha256-he7GNkCfqLgOXuCTahvqOnwW5TpbYjlCMfMGfKGwYZ4=";
vendorHash = "sha256-nTkrma32+JR+5a5u/XM+EFh9o7YwKMvZJ9cz4evo7Ec=";
env.CGO_ENABLED = "0";
ldflags = [

View file

@ -63,13 +63,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "audacity";
version = "3.7.7";
version = "3.7.8";
src = fetchFromGitHub {
owner = "audacity";
repo = "audacity";
rev = "Audacity-${finalAttrs.version}";
hash = "sha256-UyQffN9vOSD3uDk4jpYGsjH577pU4V7FpFAu0xdsXUA=";
hash = "sha256-Vp3Nx3LuNu5fqeLF6dvZ9/hhkoUCu0eCAdIEDtS1IwU=";
};
patches = [

View file

@ -30,23 +30,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ayatana-indicator-display";
version = "24.5.2";
version = "26.6.0";
src = fetchFromGitHub {
owner = "AyatanaIndicators";
repo = "ayatana-indicator-display";
tag = finalAttrs.version;
hash = "sha256-rsZjEfAiz1HC5XMjPume1Y6miNAv1kmPFP4J/+NKlsA=";
hash = "sha256-A4v2cdsFgR50b8BGAMpR9DrHxlVlahaM8Fii+eQ3UcA=";
};
patches = [
# This should be dropped once the issue is fixed upstream.
# https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/108
./patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch
./patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch
./patches/0003-Fix-cppcheck-warning-has-no-initializer.patch
];
postPatch = ''
# Replace systemd prefix in pkg-config query, use GNUInstallDirs location for /etc
substituteInPlace data/CMakeLists.txt \

View file

@ -1,26 +0,0 @@
From 5a1ce0ea5fd630efc7d85d681dacb562c356c3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jbicha@ubuntu.com>
Date: Sun, 29 Mar 2026 21:49:07 -0700
Subject: [PATCH 1/3] service.cpp: Mark create_phone_menu as static
to satisfy cppcheck
---
src/service.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/service.cpp b/src/service.cpp
index d6b4ed7..ced370c 100644
--- a/src/service.cpp
+++ b/src/service.cpp
@@ -1058,7 +1058,7 @@ private:
static_cast<Impl*>(gself)->update_phone_header();
}
- GMenuModel* create_phone_menu()
+ static GMenuModel* create_phone_menu()
{
GMenu* menu;
GMenu* section;
--
2.43.0

View file

@ -1,49 +0,0 @@
From 3f30df763c2b0ac84b1c754faaedc69107539508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jbicha@ubuntu.com>
Date: Sun, 29 Mar 2026 17:02:56 -0700
Subject: [PATCH 2/3] cppcheck: Workaround undefined function-like macro for
GLIB_CHECK_VERSION
Copy a snippet from gtk.cfg.
I didn't include gtk.cfg directly because its config triggers
additional failures, so only copy the one line that we need
https://github.com/danmar/cppcheck/commit/8c762adcdd9e
https://bugs.debian.org/1125642
Closes: #106
---
tests/CMakeLists.txt | 2 +-
tests/ayatana.cfg | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 tests/ayatana.cfg
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index bdc074f..97d6be0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
add_compile_options(${CXX_WARNING_ARGS})
-add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride)
+add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt --library=${CMAKE_SOURCE_DIR}/tests/ayatana.cfg -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride)
add_subdirectory (unit)
diff --git a/tests/ayatana.cfg b/tests/ayatana.cfg
new file mode 100644
index 0000000..035020a
--- /dev/null
+++ b/tests/ayatana.cfg
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<def format="2">
+ <!-- cppcheck override copied from gtk.cfg -->
+ <define name="GLIB_CHECK_VERSION(major, minor, micro)" value="1"/>
+</def>
--
2.43.0

View file

@ -1,30 +0,0 @@
From 172bf8a7d8e232d31a85ef61d21ee54b6c2eab7c Mon Sep 17 00:00:00 2001
From: fliiiix <hi@l33t.name>
Date: Tue, 9 Jun 2026 15:33:29 +0200
Subject: [PATCH 3/3] Fix cppcheck warning has no initializer
cppcheck 2.21.0
---
src/service.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/service.cpp b/src/service.cpp
index ced370c..251df5b 100644
--- a/src/service.cpp
+++ b/src/service.cpp
@@ -50,9 +50,9 @@ extern "C"
typedef struct
{
- guint nTempLow;
- guint nTempHigh;
- const gchar *sName;
+ guint nTempLow{};
+ guint nTempHigh{};
+ const gchar *sName = nullptr;
} TempProfile;
TempProfile m_lTempProfiles[] =
--
2.43.0

View file

@ -44,6 +44,6 @@ stdenv.mkDerivation {
platforms
;
broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.1");
broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.2");
};
}

View file

@ -44,6 +44,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
homepage = "https://github.com/joscha/bkyml";
description = "CLI tool to generate a pipeline.yaml file for Buildkite on the fly";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ olebedev ];
maintainers = [ ];
};
})

View file

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "boundary";
version = "0.19.0";
version = "0.21.2";
src =
let
@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
aarch64-darwin = "darwin_arm64";
};
hash = selectSystem {
x86_64-linux = "sha256-tqgY0308n3F/ZYGhn3bAsHa4cBdFz0oGgSHI6y6J1LY=";
aarch64-linux = "sha256-vvc8rOpyOd91crZTQQofj3RixUuWHe7SbMM0BZDkdRw=";
x86_64-darwin = "sha256-wsI8hqULVN+W6zwQsXcWQHbxmocrijsl5eUJgUxLxf8=";
aarch64-darwin = "sha256-S0QXBBiO2qgSazjtwd1bWgL/6gJUimKYPv369L419UU=";
x86_64-linux = "sha256-S5wt4Wy2SfO+36YwxQo86vnSIv4I0tMdfXro3i2qS6k=";
aarch64-linux = "sha256-bu+tYL5uHs67JG1MxCUDIQ9xwYxArbz/FElN0QCXNU4=";
x86_64-darwin = "sha256-sRPq9+JnKYD5+0JVqhfGpCflHZgFdsrPprJqfxuAlpI=";
aarch64-darwin = "sha256-PEaxwEKCidLvDbMSfXZ2ehWOwblLjzU+yy9Qq9tavtw=";
};
in
fetchzip {

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "knorrie";
repo = "btrfs-heatmap";
rev = "v${finalAttrs.version}";
tag = "v${finalAttrs.version}";
sha256 = "sha256-yCkuZqWwxrs2eS7EXY6pAOVVVSq7dAMxJtf581gX8vg=";
};
@ -40,12 +40,18 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
strictDeps = true;
__structuredAttrs = true;
enableParallelBuilding = true;
meta = {
description = "Visualize the layout of a mounted btrfs";
mainProgram = "btrfs-heatmap";
homepage = "https://github.com/knorrie/btrfs-heatmap";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = [ ];
maintainers = with lib.maintainers; [
sandarukasa
];
};
})

View file

@ -1,68 +0,0 @@
{
lib,
stdenv,
bzip2,
pkg-config,
rustPlatform,
xz,
zstd,
cargo-tauri,
}:
cargo-tauri.overrideAttrs (
finalAttrs: oldAttrs: {
version = "1.6.6";
src = oldAttrs.src.override {
hash = "sha256-UE/mJ0WdbVT4E1YuUCtu80UB+1WR+KRWs+4Emy3Nclc=";
};
patches = [ ];
postPatch = "";
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
sourceRoot = "${finalAttrs.src.name}/tooling/cli";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs)
pname
version
src
sourceRoot
;
hash = "sha256-kAaq6Kam3e5n8569Y4zdFEiClI8q97XFX1hBD7NkUqw=";
};
nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkg-config ];
buildInputs = [
# Required by `zip` in `tauri-bundler`
bzip2
zstd
]
# Required by `rpm` in `tauri-bundler`
++ lib.optionals stdenv.hostPlatform.isLinux [ xz ];
env = {
ZSTD_SYS_USE_PKG_CONFIG = true;
};
passthru = {
inherit (oldAttrs.passthru) hook gst-plugin;
tests = { inherit (oldAttrs.passthru.tests) version; };
};
meta = {
inherit (oldAttrs.meta)
description
homepage
changelog
license
maintainers
mainProgram
;
};
}
)

View file

@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "clickhouse-backup";
version = "2.7.1";
version = "2.7.2";
src = fetchFromGitHub {
owner = "Altinity";
repo = "clickhouse-backup";
tag = "v${finalAttrs.version}";
hash = "sha256-hS3Hhy8NYIP/xpXZNSdzO4U0jWcl7nw+H8I1rnpvBmQ=";
hash = "sha256-rzCVuyG04IHl5oUyw9XuyN56tM/AzAmveZ9NsB7Co68=";
};
vendorHash = "sha256-8vWqfoAJiZyb7ABk5bC3kuTu1s8dPgB+oHAI5eENDWY=";
vendorHash = "sha256-MZfAEXoONdx/2Zb4NeDrdM1WT4jnqhwdNkMm6QzasGY=";
ldflags = [
"-X main.version=${finalAttrs.version}"

View file

@ -11,16 +11,16 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "clouddrive2";
version = "1.0.8";
version = "1.0.10";
src = fetchurl {
url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
hash =
{
x86_64-linux = "sha256-LB2G5g5Bj+kFmrY/kgQEGsXmrmrGQbH7pdshr8lfank=";
aarch64-linux = "sha256-XYjHiB9JDkfoKS1uzzvJ0o79+YipABedY56JnmCyInE=";
x86_64-darwin = "sha256-avzB7gUiVPKuRha+Ls7huNfrPtDKmyFPc6gFfuWOBPw=";
aarch64-darwin = "sha256-frldCUG6aGfXDoPzvG8QYMTL4SxTEd2hPLy0+7YWtIE=";
x86_64-linux = "sha256-XFhJNf6DFIgGgfuBCNSCtT4S1tO0UecFO0uuEbkPYFM=";
aarch64-linux = "sha256-OoG3Se2iTekIuC1Igq99zVLrVPDK71wcrF3qIsVHz58=";
x86_64-darwin = "sha256-kuXBcIFxItfd1Wyq79l4O++/n8MvqKFOl/FD3uc37QY=";
aarch64-darwin = "sha256-nLjSBuqaZJy5vTnpNBEi4fxe+3hmmBL3Bq51ceJ7wxQ=";
}
.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
};

View file

@ -1,8 +1,8 @@
{
lib,
fetchFromGitHub,
fetchpatch,
fetchurl,
fetchpatch,
nix-update-script,
cmake,
boost,
@ -62,14 +62,12 @@ let
onnxruntime
]
++ lib.optionals cudaSupport [
cudatoolkit
(lib.getOutput "static" cudaPackages.cuda_cudart)
cudaPackages.cuda_cudart # CUDA::cudart, used by COLMAP and faiss
cudaPackages.libcublas # CUDA::cublas, propagated by faiss' exported targets
cudaPackages.libcurand # CUDA::curand, used by COLMAP
]
++ lib.optional stdenv'.cc.isClang llvmPackages.openmp;
# TODO: migrate to redist packages
inherit (cudaPackages) cudatoolkit;
# COLMAP needs these model files to run the ONNX tests
# Based on: https://github.com/colmap/colmap/blob/79efc74b2b614935a3c69b1f983f2bad23a836a1/src/colmap/feature/resources.h#L36
modelsForTesting = [
@ -100,16 +98,41 @@ let
}
];
in
stdenv'.mkDerivation rec {
stdenv'.mkDerivation (finalAttrs: {
version = "4.0.4";
pname = "colmap";
src = fetchFromGitHub {
owner = "colmap";
repo = "colmap";
tag = version;
tag = finalAttrs.version;
hash = "sha256-n9YwEqMSIh6vM2MVf7qxxVvDpsTLEsT37xoHiX66bL0=";
};
__structuredAttrs = true;
strictDeps = true;
patches =
lib.optionals stdenv'.hostPlatform.isAarch64 [
# Set SANITIZE_PR for PoissonRecon to fix data races on aarch64
# https://github.com/colmap/colmap/pull/4429
(fetchpatch {
url = "https://github.com/colmap/colmap/commit/e13294e43baae6cf7f4e3ec05a19060e0b230a72.patch";
hash = "sha256-hoIjWdrOlXeT78X+g3YCDWaWnmQMzHVQNkdpx5vXpGk=";
})
(fetchpatch {
url = "https://github.com/colmap/colmap/commit/6c5c59f96f9e819bcc57267ef48b193d77707fe0.patch";
hash = "sha256-2dAhy3sgxF2SXPAYE/EV1hd61dm05vJ5JJXEjQxEKWM=";
})
]
++ lib.optionals (stdenv'.hostPlatform.isLinux && stdenv'.hostPlatform.isAarch64) [
# Fix determinism check in rotation_averaging_test
# https://github.com/colmap/colmap/pull/4426
(fetchpatch {
url = "https://github.com/colmap/colmap/commit/d38b65b9312c66e841739989f4a38924d8cb5ec5.patch";
hash = "sha256-dbs+TNfa4o5L79+krPpF4VmP8PhFHtzYZehYZbsnx5s=";
})
];
cmakeFlags = [
(lib.cmakeBool "DOWNLOAD_ENABLED" true) # We want COLMAP to be able to fetch models like LightGlue.
(lib.cmakeBool "UNINSTALL_ENABLED" false)
@ -117,8 +140,8 @@ stdenv'.mkDerivation rec {
(lib.cmakeBool "FETCH_FAISS" false)
(lib.cmakeBool "FETCH_ONNX" false)
(lib.cmakeBool "TESTS_ENABLED" enableTests)
(lib.cmakeFeature "CHOLMOD_INCLUDE_DIR_HINTS" "${suitesparse.dev}/include")
(lib.cmakeFeature "CHOLMOD_LIBRARY_DIR_HINTS" "${suitesparse}/lib")
(lib.cmakeFeature "CHOLMOD_INCLUDE_DIR_HINTS" "${lib.getDev suitesparse}/include")
(lib.cmakeFeature "CHOLMOD_LIBRARY_DIR_HINTS" "${lib.getLib suitesparse}/lib")
]
++ lib.optionals cudaSupport [
(lib.cmakeBool "CUDA_ENABLED" cudaSupport)
@ -135,6 +158,7 @@ stdenv'.mkDerivation rec {
glog
libGLU
glew
gtest
qt5.qtbase
flann
lz4
@ -153,21 +177,43 @@ stdenv'.mkDerivation rec {
]
++ lib.optionals cudaSupport [
autoAddDriverRunpath
cudaPackages.cuda_nvcc
];
doCheck = enableTests;
preCheck = lib.optionalString enableTests ''
export GTEST_FILTER='-*Gpu*:*GPU*:*OpenGL*' # Disable any test involving OpenGL or GPU, these won't work in the sandbox.
export HOME=$PWD
preCheck = lib.optionalString enableTests (
let
disabledTestPatterns = [
# Disable any test involving OpenGL or GPU, these won't work in the sandbox.
"*Gpu*"
"*GPU*"
"*OpenGL*"
]
++ lib.optionals stdenv'.hostPlatform.isDarwin [
# reconstruction_pruning_test.cc:65: Failure
# Expected: (redundant_point3D_ids.size()) > (prev_num_redundant_points3D), actual: 0 vs 0
"FindRedundantPoints3D.VaryingCoverageGain"
];
in
''
export GTEST_FILTER='-${lib.concatStringsSep ":" disabledTestPatterns}'
''
+ ''
export HOME=$PWD
''
# Pre-fetch the ONNX models into COLMAP's cache dir so we can run their tests.
mkdir -p .cache/colmap
${lib.concatMapStringsSep "\n" (model: ''
ln -s ${fetchurl model} .cache/colmap/${model.sha256}-${model.name}
'') modelsForTesting}
'';
+ ''
mkdir -p .cache/colmap
${lib.concatMapStringsSep "\n" (model: ''
ln -s ${fetchurl model} .cache/colmap/${model.sha256}-${model.name}
'') modelsForTesting}
''
);
passthru.depsAlsoForPycolmap = depsAlsoForPycolmap;
passthru.updateScript = nix-update-script { };
passthru = {
depsAlsoForPycolmap = depsAlsoForPycolmap;
updateScript = nix-update-script { };
};
meta = {
description = "Structure-From-Motion and Multi-View Stereo pipeline";
@ -177,6 +223,8 @@ stdenv'.mkDerivation rec {
'';
mainProgram = "colmap";
homepage = "https://colmap.github.io/index.html";
downloadPage = "https://github.com/colmap/colmap";
changelog = "https://github.com/colmap/colmap/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
license = lib.licenses.bsd3;
platforms = if cudaSupport then lib.platforms.linux else lib.platforms.unix;
maintainers = with lib.maintainers; [
@ -185,4 +233,4 @@ stdenv'.mkDerivation rec {
chpatrick
];
};
}
})

View file

@ -13,13 +13,13 @@
buildGoModule (finalAttrs: {
pname = "cosign";
version = "3.0.6";
version = "3.1.1";
src = fetchFromGitHub {
owner = "sigstore";
repo = "cosign";
rev = "v${finalAttrs.version}";
hash = "sha256-Flvi+dVb9RcaS5f1X8A8kevfzNbiSyglEYfJfievVfM=";
hash = "sha256-DOsGLU6W0JrUGpthILTZfKv3fC45SlIXkvt+idUn5Tc=";
};
buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite);
@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
installShellFiles
];
vendorHash = "sha256-q9dB54s9LD0klbDW8bWlXmFzPIPrFBcWJrhYRkyKTp0=";
vendorHash = "sha256-AeVvp+6iKiTZ4dWy5kjAS2njI3IU+ANgTdUxOFcihSg=";
subPackages = [
"cmd/cosign"

View file

@ -1,8 +1,8 @@
[
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "10.0.7",
"hash": "sha256-uQmTQarMn0fuZV03MyCb78Ex+96cuqFHNO5SyFOPkJk="
"version": "10.0.8",
"hash": "sha256-HV30fu+lF/GYkeVP+Yq/EU1FzgdMqwqlepCpvxUgugE="
},
{
"pname": "Serilog",

View file

@ -14,13 +14,13 @@
buildDotnetModule rec {
pname = "crossmacro-daemon";
version = "1.1.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "alper-han";
repo = "CrossMacro";
tag = "v${version}";
hash = "sha256-M+Mat8pYeUyzomuvDdHdTHbyquTBDqrHHObVixTM3is=";
hash = "sha256-lMXp7ItwpZ14ATRKuR7Q8/FhfMNQ+YCgHL13oj6iBNs=";
};
projectFile = "src/CrossMacro.Daemon/CrossMacro.Daemon.csproj";

View file

@ -1,13 +1,8 @@
[
{
"pname": "Acornima",
"version": "1.4.0",
"hash": "sha256-7SCe3Bgcyzlv6nXQfTOy3UZLc7ilZ3YXxgl6mcTF82s="
},
{
"pname": "Avalonia",
"version": "12.0.2",
"hash": "sha256-Ht2h4cBtnVhrk9VWsHDOEvU1wd/y80CxMDWn8W0lHKk="
"version": "12.0.4",
"hash": "sha256-sHu0eifno4DJ0Tnl3v4e3OZY1oy41OO482UfKVkQfK0="
},
{
"pname": "Avalonia.BuildServices",
@ -16,28 +11,28 @@
},
{
"pname": "Avalonia.Fonts.Inter",
"version": "12.0.2",
"hash": "sha256-23iKfc71xCy+vaHlxSRi19ZsJ48Dey6mdOx9CGzg2SA="
"version": "12.0.4",
"hash": "sha256-h0Nlzl9gpvt2z24lsJBD7l56ceCcZfOQKSzGOARgNV8="
},
{
"pname": "Avalonia.FreeDesktop",
"version": "12.0.2",
"hash": "sha256-raEQGX8Vwr+c7W5SzkEZ/phEEs/a5N0xeUfAWKEpl6A="
"version": "12.0.4",
"hash": "sha256-mj1icR/oMR4b6AygR3/ycq39DMuEpXHPy/fWeuwLYs8="
},
{
"pname": "Avalonia.FreeDesktop.AtSpi",
"version": "12.0.2",
"hash": "sha256-5AQPlWW6g7G6pm7qI8RHR/MQ45VGd7iAFWseXUitIVI="
"version": "12.0.4",
"hash": "sha256-FgfModA3bLccR6HM91A/+0198SR4NWg8zZIA3EE4wW8="
},
{
"pname": "Avalonia.HarfBuzz",
"version": "12.0.2",
"hash": "sha256-FUYKVfweWiFix+LJZt9scI7HYiIl3C+8j9K0/yKsOIE="
"version": "12.0.4",
"hash": "sha256-tpTETc9r5b0CtXiYZEVgV57Tubqh3BS22+oq/ZU4YRQ="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "12.0.2",
"hash": "sha256-19hc0GSsa9JujiZlHxLKn7x6fUjAeJSH3lO43hL0bD0="
"version": "12.0.4",
"hash": "sha256-uuc61RM/WBfRmWCcBkoenLCreOxEGcF8U4t8RptrxiE="
},
{
"pname": "Avalonia.Skia",
@ -46,18 +41,18 @@
},
{
"pname": "Avalonia.Skia",
"version": "12.0.2",
"hash": "sha256-ZzNoO/8/SYG4xN0RmPz9AC6N1RtPTnSaTVrQ0+NNvGU="
"version": "12.0.4",
"hash": "sha256-ba80KHyzW0NdoDK3iPntbi3NKEnh2c1rbrv4mu2xWcI="
},
{
"pname": "Avalonia.Themes.Fluent",
"version": "12.0.2",
"hash": "sha256-H8AXau1gV8m33lKYrSzxp0GDmoCuyx7+B93gTfcpXXU="
"version": "12.0.4",
"hash": "sha256-8b0+L0zU8J0csMkuRzeebsU/BENxD0iP2y5rSRmeMMk="
},
{
"pname": "Avalonia.X11",
"version": "12.0.2",
"hash": "sha256-not3Qv87nbN6Bi8sE49WKDSNzUTISBdcNR3rcFqgwHE="
"version": "12.0.4",
"hash": "sha256-r6cV/4kqiZ6lBNgN2HrYagG41JFZrOe7GZzbSelBT2g="
},
{
"pname": "CommunityToolkit.Mvvm",
@ -69,31 +64,16 @@
"version": "4.3.1",
"hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o="
},
{
"pname": "HarfBuzzSharp",
"version": "7.3.0.3",
"hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
},
{
"pname": "HarfBuzzSharp",
"version": "8.3.1.3",
"hash": "sha256-/+ZEhjpOs8B4tMPw3vDyuQqGGZHJEWvy3WaKMaDwmrU="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Linux",
"version": "7.3.0.3",
"hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Linux",
"version": "8.3.1.3",
"hash": "sha256-feWOna/8ncvmrq7CxnDczv1facV2poZV5R+OyCtocpU="
},
{
"pname": "HarfBuzzSharp.NativeAssets.macOS",
"version": "7.3.0.3",
"hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
},
{
"pname": "HarfBuzzSharp.NativeAssets.macOS",
"version": "8.3.1.3",
@ -104,21 +84,11 @@
"version": "8.3.1.3",
"hash": "sha256-arBiI82fXPjAqftqnG7Wc3BRzZ6+vKd7b58vQSWJVk0="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Win32",
"version": "7.3.0.3",
"hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Win32",
"version": "8.3.1.3",
"hash": "sha256-WNUQmLWVFSwBKT9x7UdhSz9T2FA7wibvwjuPew/3yUM="
},
{
"pname": "Jint",
"version": "4.8.0",
"hash": "sha256-+K8NGiJ1SChiyMrjn4dJOiBdnWXP6UOfXSsNsJ5//tI="
},
{
"pname": "MicroCom.Runtime",
"version": "0.11.4",
@ -126,13 +96,13 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "10.0.7",
"hash": "sha256-dICogdaqa5mHqyvFA0lTomFa39Dqm4nn7Pit6qi6eQY="
"version": "10.0.8",
"hash": "sha256-eKex/vpm5A4o2WV6sJyjqKPydWhekJFO6wrH0V7RyBY="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "10.0.7",
"hash": "sha256-uQmTQarMn0fuZV03MyCb78Ex+96cuqFHNO5SyFOPkJk="
"version": "10.0.8",
"hash": "sha256-HV30fu+lF/GYkeVP+Yq/EU1FzgdMqwqlepCpvxUgugE="
},
{
"pname": "Serilog",
@ -171,73 +141,68 @@
},
{
"pname": "ShimSkiaSharp",
"version": "4.6.0",
"hash": "sha256-t2QHrLvtB9gONm2LA7GzGZIQXN5T0OrNDEdMqogWLic="
"version": "5.0.0",
"hash": "sha256-zNZuDK+xWu4wl5NZG4z2JhuaYN/I6i70s3U5yKD6OGw="
},
{
"pname": "SkiaSharp",
"version": "2.88.9",
"hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
"version": "3.119.2",
"hash": "sha256-A9F397K5FfLeOsNZacKmUh4IU/WMK60B4Z6TEtS/oqo="
},
{
"pname": "SkiaSharp",
"version": "3.119.4-preview.1.1",
"hash": "sha256-yUHsoau6WVQkzYV5UVnKcgpABiapa9aoTDd1pw/J5r8="
"version": "3.119.4",
"hash": "sha256-4ypEnTGUXAudFp61vGduHj9YmqtpiI5J1wP9wcOEwXY="
},
{
"pname": "SkiaSharp.NativeAssets.Linux",
"version": "3.119.4-preview.1.1",
"hash": "sha256-jcf0FhUgOzxpJ4ENn1q5uPe8dT+kXl0/yUWJs+hDYNA="
"version": "3.119.4",
"hash": "sha256-+uBVQFmxEH73iI5GwgvftUhAHvenpvc5GtT63HQy1Qo="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "3.119.4-preview.1.1",
"hash": "sha256-olbqFOHmkiCdlnXHU4l1lTb04yAPn21CvLNMP4AGncs="
"version": "3.119.4",
"hash": "sha256-9/L1Oc5bujN6pKjW6sJcr1jL3RLt8/Mt3MmClOcwzyw="
},
{
"pname": "SkiaSharp.NativeAssets.WebAssembly",
"version": "3.119.4-preview.1.1",
"hash": "sha256-R+67ADA6luDa9b7xvsE4PSL6GWwQTaNYzw2WYou/ofQ="
"version": "3.119.4",
"hash": "sha256-xLfsWBsFFpv5Qg79GIMi+5CM6YDfcg//oywNlB5Y3J0="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "3.119.4-preview.1.1",
"hash": "sha256-Sd+KnMezIKbc4OLklHsfeM7EVZERtmawWuSCoaySteM="
"version": "3.119.4",
"hash": "sha256-WlaYsbTh/cn/6YaN9odNtfpp8hpN52unGgGlQum0M5E="
},
{
"pname": "Svg.Animation",
"version": "4.6.0",
"hash": "sha256-KwXuouxbsgb98pyrYEL9HGWVkAXUzmfOsWYttCJQ1fk="
"version": "5.0.0",
"hash": "sha256-paKYinI4AxOnVo+NKihYD5MA/6yu57CdL9a4J/ncGww="
},
{
"pname": "Svg.Controls.Skia.Avalonia",
"version": "12.0.0.6",
"hash": "sha256-W0SLHlfzXIAO1YrbxwXcXBwV1CH18inaUv5l2qL/D68="
"version": "12.0.0.11",
"hash": "sha256-/JXGujh32o9MOTe1aCoyGg0mn0/eJVia8f2iP6eN2Oc="
},
{
"pname": "Svg.Custom",
"version": "4.6.0",
"hash": "sha256-Vp2VtpY1GMKh9FVTbgX5l6OtX/KKO+T+uj6KczNVLZk="
},
{
"pname": "Svg.JavaScript",
"version": "4.6.0",
"hash": "sha256-u9Bf3OU+cB5VnQr/CL7wBQw3YBxfh4OIXehXumDCYnI="
"version": "5.0.0",
"hash": "sha256-WUu3lT9byGpjiwHnmzYUJey5T7sWPoMK5EZP6+UkgFY="
},
{
"pname": "Svg.Model",
"version": "4.6.0",
"hash": "sha256-2b2g4TyQEYIEoubJHrB8Fpu2ZWb7eHN4vM/PZqJ1tbw="
"version": "5.0.0",
"hash": "sha256-ROHls25fS8Y7MV70S2pzEqWkwTGeTOq9bfYd0QjEDuM="
},
{
"pname": "Svg.SceneGraph",
"version": "4.6.0",
"hash": "sha256-8O89YBURkaJS08paV/LqLP4Z8oTdMJPrgkm8HAjWCcs="
"version": "5.0.0",
"hash": "sha256-OA1qMUlnj7aJBltK0Mnwz2A8lv7ux8DveWt7gagojuc="
},
{
"pname": "Svg.Skia",
"version": "4.6.0",
"hash": "sha256-kOUnFu2asUQqd3TfxN25WKbxR2TbcXOPTDCaR7LScP0="
"version": "5.0.0",
"hash": "sha256-5o1HX5Eborn2GG1ns34ArYXeo2bEuIib9iXhMCSHoA8="
},
{
"pname": "Tmds.DBus.Protocol",

View file

@ -27,13 +27,13 @@
buildDotnetModule rec {
pname = "crossmacro";
version = "1.1.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "alper-han";
repo = "CrossMacro";
tag = "v${version}";
hash = "sha256-M+Mat8pYeUyzomuvDdHdTHbyquTBDqrHHObVixTM3is=";
hash = "sha256-lMXp7ItwpZ14ATRKuR7Q8/FhfMNQ+YCgHL13oj6iBNs=";
};
projectFile = "src/CrossMacro.UI.Linux/CrossMacro.UI.Linux.csproj";

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cyme";
version = "3.0.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "tuna-f1sh";
repo = "cyme";
rev = "v${finalAttrs.version}";
hash = "sha256-5BDvFtqBkMxhZu9Yk8Ov30Hmfg8xD1kRnD7lnEvR6v0=";
hash = "sha256-yc4oV5Sm5BuABEcfQVu7otNtHGDWVmSkV/FjTLER78Q=";
};
cargoHash = "sha256-kzpYbpCo8E5KQBkPwxe5pz+vjD1H3J51fnVdOW9LawM=";
cargoHash = "sha256-zNRZOOrKvYhDgCaNRS5P+UIZ8uzSW9nePciOn13LLB8=";
nativeBuildInputs = [
pkg-config

View file

@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "cz-cli";
version = "4.3.0";
version = "4.3.2";
src = fetchFromGitHub {
owner = "commitizen";
repo = "cz-cli";
tag = "v${version}";
hash = "sha256-4kyGxidE8dzkHL0oPv/XxDxQ3qlEE6TKSgj+1g9uvJM=";
hash = "sha256-+MBFO3sisxV/4iddZTsfJW8QARZ+JlWK5ao3KNJ3zSA=";
};
npmDepsHash = "sha256-zQ0T/1khnn+CXm/3yc9nANL0ROEEE03U5fV57btEmPg=";
npmDepsHash = "sha256-6UpTaMqd7T17gx4yJowcWJMgKmFeq2r2yckrx1OpTCc=";
meta = {
description = "Commitizen command line utility";

View file

@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "dalfox";
version = "3.0.2";
version = "3.1.0";
src = fetchFromGitHub {
owner = "hahwul";
repo = "dalfox";
tag = "v${finalAttrs.version}";
hash = "sha256-IUCpDTTJJHZS+e/7ZR2ObZOxLIQhPD6MZvYp9opqUAI=";
hash = "sha256-QV2+eKTMuvt//krGrPrjViIsLiog5i4bzhgq8lgHvR0=";
};
vendorHash = null;

View file

@ -33,17 +33,17 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "deno";
version = "2.8.2";
version = "2.8.3";
src = fetchFromGitHub {
owner = "denoland";
repo = "deno";
tag = "v${finalAttrs.version}";
fetchSubmodules = true; # required for tests
hash = "sha256-WtACDLrC1c7KxkoQgYrNavykkm8+tZmF46UU1YrLwVs=";
hash = "sha256-jOcIrZj+830XMZJcgTm0C4yDvk96dbW7RYGgyhLHS4Y=";
};
cargoHash = "sha256-Og+owcfHfdFJ08Xtiye2IEvKWd2Q/7f7QzQ/898IOcQ=";
cargoHash = "sha256-QtCkmNXOrtl4T4NSESV7J3qiyKMwMOoa4oWfTZIJRMc=";
patches = [
./patches/0002-tests-replace-hardcoded-paths.patch

View file

@ -71,14 +71,14 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rusty-v8";
version = "149.2.0";
version = "149.3.0";
src = fetchFromGitHub {
owner = "denoland";
repo = "rusty_v8";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-OAwfrSU1bu80+qcseUHtScVLZCTe9mY3NEfq0+hmVMg=";
hash = "sha256-hQfSDpdQBeQrOerXi+fI6mGCXkFH2ro90eWZX7xcwjA=";
};
patches = [
@ -90,7 +90,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
./librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch
];
cargoHash = "sha256-dkuvWJaDPmsU25f3UGifWl2GvYku6+7Htk9tm5JVpLU=";
cargoHash = "sha256-ROz8f+o/OVNKSm4Hp1z4eCI2pmlNTUpBZ5447uvVXUk=";
nativeBuildInputs = [
llvmPackages.clang

View file

@ -1,85 +0,0 @@
{
lib,
rustPlatform,
buildNpmPackage,
fetchFromGitHub,
copyDesktopItems,
makeDesktopItem,
pkg-config,
gtk3,
libsoup_2_4,
}:
rustPlatform.buildRustPackage rec {
pname = "desktop-postflop";
version = "0.2.7";
src = fetchFromGitHub {
owner = "b-inary";
repo = "desktop-postflop";
rev = "v${version}";
hash = "sha256-pOPxNHM4mseIuyyWNoU0l+dGvfURH0+9+rmzRIF0I5s=";
};
npmDist = buildNpmPackage {
name = "${pname}-${version}-dist";
inherit src;
npmDepsHash = "sha256-HWZLicyKL2FHDjZQj9/CRwVi+uc/jHmVNxtlDuclf7s=";
installPhase = ''
mkdir -p $out
cp -r dist/* $out
'';
};
sourceRoot = "${src.name}/src-tauri";
cargoHash = "sha256-pMvh2Rr+rMe0nMB9yRDrGatrS36+VM7os0eeBR31oCM=";
postPatch = ''
substituteInPlace tauri.conf.json \
--replace "../dist" "${npmDist}"
'';
# postflop-solver requires unstable rust features
env.RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [
copyDesktopItems
pkg-config
];
buildInputs = [
gtk3
libsoup_2_4
# webkitgtk_4_0
];
postInstall = ''
install -Dm644 ${src}/public/favicon.png $out/share/icons/hicolor/128x128/apps/desktop-postflop.png
'';
desktopItems = [
(makeDesktopItem {
name = "desktop-postflop";
exec = "desktop-postflop";
icon = "desktop-postflop";
desktopName = "Desktop Postflop";
comment = meta.description;
categories = [ "Utility" ];
terminal = false;
})
];
meta = {
# webkitgtk_4_0 was removed
broken = true;
changelog = "https://github.com/b-inary/desktop-postflop/releases/tag/${src.rev}";
description = "Free, open-source GTO solver for Texas hold'em poker";
homepage = "https://github.com/b-inary/desktop-postflop";
license = lib.licenses.agpl3Plus;
mainProgram = "desktop-postflop";
maintainers = with lib.maintainers; [ tomasajt ];
};
}

View file

@ -7,13 +7,13 @@
}:
buildGoModule (finalAttrs: {
pname = "devbox";
version = "0.17.2";
version = "0.17.3";
src = fetchFromGitHub {
owner = "jetify-com";
repo = "devbox";
tag = finalAttrs.version;
hash = "sha256-4K7Y0GxMhnhlQP30NGAAqJSgEo6aTNCsUoOfaa+aYkE=";
hash = "sha256-nG/6qRhoCYUCxNXYHj7zyeOSaQBqguaIjEip9HVZbp8=";
};
ldflags = [

View file

@ -7,29 +7,29 @@
}:
let
version = "2026.5.26-6";
version = "2026.5.26-8";
throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
srcs = {
x86_64-linux = fetchurl {
url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-unknown-linux.tar.gz";
hash = "sha256-8jEq0X2owEnOdSWzEhDOYahAdq/3G/JIUZShHbYrR2c=";
hash = "sha256-TqSABBxigiYTafi0vxFYnssLjHbiXYaNxI8prkkp8CE=";
};
aarch64-linux = fetchurl {
url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-unknown-linux.tar.gz";
hash = "sha256-i8m05WrmO/KQCt/4jVFkRxz9nIXZEDi8idVhXkXxDig=";
hash = "sha256-1hoTd6JR43nR+heLqU7igP+debI1bhWcIlG6BGyaj3I=";
};
aarch64-darwin = fetchurl {
url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-apple-darwin.tar.gz";
hash = "sha256-WPL1kPMSmqh9/n2m9CvNnUcyLfjHz3PC9tAjGrjaZfw=";
hash = "sha256-/8vd26V0z1qyt8EOJ2Z/JdWNGjb+iN+YkgaJQRoBHUk=";
};
x86_64-darwin = fetchurl {
url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-apple-darwin.tar.gz";
hash = "sha256-HtB5iCT3d3AprPM+1uNkPkX0v4wSerTJlEu5F4P6pp0=";
hash = "sha256-uF6ORbWwC0hgIURFoXFQh/5oPvfS4cgRBaCui4S0E0E=";
};
};
in

View file

@ -3,8 +3,8 @@
set -euo pipefail
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; devin-cli.version or (lib.getVersion devin-cli)" | tr -d '"')
latestVersion=$(curl https://static.devin.ai/cli/current/manifest.json | jq '.version' | tr -d '"')
currentVersion=$(nix-instantiate --eval --raw -E "with import ./. {}; devin-cli.version or (lib.getVersion devin-cli)")
latestVersion=$(curl https://static.devin.ai/cli/current/manifest.json | jq -r '.version')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "package is up-to-date: $currentVersion"
@ -18,6 +18,7 @@ for system in \
aarch64-linux \
x86_64-darwin \
aarch64-darwin; do
hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; devin-cli.src.url" --system "$system" | tr -d '"')))
hash=$(nix store prefetch-file --json --hash-type sha256 \
$(nix-instantiate --eval --raw -E "with import ./. {}; devin-cli.src.url" --system "$system") | jq -r '.hash')
update-source-version devin-cli $latestVersion $hash --system=$system --ignore-same-version
done

View file

@ -344,6 +344,7 @@ python.pkgs.buildPythonApplication rec {
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
danielfullmer
mdaniels5757
raitobezarius
];
platforms = lib.platforms.unix;

View file

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "door-knocker";
version = "0.8.0";
version = "0.9.0";
src = fetchFromCodeberg {
owner = "tytan652";
repo = "door-knocker";
rev = finalAttrs.version;
hash = "sha256-Yz/HVffOJNpu0D8SE32ehwI3UQ7yPKMqR6yYIAVuBDc=";
hash = "sha256-h7wDJRePWUZ/oHdkSXLFcDWau1K8Yof9pQXFjexZxbA=";
};
nativeBuildInputs = [

View file

@ -22,13 +22,13 @@ let
in
stdenv.mkDerivation rec {
pname = "ed-odyssey-materials-helper";
version = "3.6.6";
version = "3.7.0";
src = fetchFromGitHub {
owner = "jixxed";
repo = "ed-odyssey-materials-helper";
tag = version;
hash = "sha256-ljCN2tW7iH+kTiSXwUt+OsAhjYKlAy0W5x/JDmQeR6M=";
hash = "sha256-vQn45gHcMRLH5ta5+h3QXLODUlmDWeG1PSRRl/hgfiE=";
};
nativeBuildInputs = [
@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/jixxed/ed-odyssey-materials-helper";
downloadPage = "https://github.com/jixxed/ed-odyssey-materials-helper/releases/tag/${version}";
changelog = "https://github.com/jixxed/ed-odyssey-materials-helper/releases/tag/${version}";
license = lib.licenses.gpl3Only;
license = lib.licenses.mit;
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryBytecode # mitm cache

View file

@ -7,13 +7,13 @@
}:
llvmPackages.stdenv.mkDerivation rec {
pname = "enzyme";
version = "0.0.264";
version = "0.0.267";
src = fetchFromGitHub {
owner = "EnzymeAD";
repo = "Enzyme";
rev = "v${version}";
hash = "sha256-iv9BCN5b6Qn2N85vpyyuqHR3HlCSxPRYGgaf04D8bBk=";
hash = "sha256-FoL4m7dxGS05f4fksOYmVyFoS9tlFTc6/v+lB497hog=";
};
postPatch = ''

View file

@ -17,16 +17,16 @@
}:
let
version = "0.309.0";
version = "0.309.1";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
tag = version;
hash = "sha256-Uyb83sBFNJLRU78Q60Mj3Q6j9Uvrv3unj0kkAdTXePc=";
hash = "sha256-fMWLr8UrwejLlPiPdcs5lLd//81iqvuE5Ia9Ne0d3l4=";
};
vendorHash = "sha256-95yI/ObkLByzO+BBbACylaNcCrple8MpxY8dKLGqFDE=";
vendorHash = "sha256-lCXIgJuUg5NG8E/iYobGxtvxfTk77Y8ZzVi0GsjbbHw=";
commonMeta = {
license = lib.licenses.mit;

View file

@ -97,10 +97,22 @@ stdenv.mkDerivation (finalAttrs: {
python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .)
'';
postInstall = lib.optionalString pythonSupport ''
mkdir "$dist"
cp faiss/python/dist/*.whl "$dist/"
'';
postInstall =
lib.optionalString pythonSupport ''
mkdir "$dist"
cp faiss/python/dist/*.whl "$dist/"
''
# The GPU targets in faiss-targets.cmake reference CUDA imported targets
# (CUDA::cudart, CUDA::cublas), but faiss-config.cmake never finds them.
# Declare the dependency so downstream find_package(faiss) resolves them.
+ lib.optionalString cudaSupport ''
substituteInPlace "$out/share/faiss/faiss-config.cmake" \
--replace-fail \
'include("''${CMAKE_CURRENT_LIST_DIR}/faiss-targets.cmake")' \
'include(CMakeFindDependencyMacro)
find_dependency(CUDAToolkit)
include("''${CMAKE_CURRENT_LIST_DIR}/faiss-targets.cmake")'
'';
passthru = {
inherit cudaSupport cudaPackages pythonSupport;

View file

@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "firefox-sync-client";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "Mikescher";
repo = "firefox-sync-client";
rev = "v${finalAttrs.version}";
hash = "sha256-tzYuYSifV/a9SPb5KyabhQ29ByXuAgQgi3t0VMHVSH8=";
hash = "sha256-hZ6sd/IM/X8WWNc1ca7w1R4fsixo5VMGEujmPJvEMQc=";
};
vendorHash = "sha256-kDh/5SOwKPYl9sC9W17bnzG73fGI5iX6lSjcB3IjOss=";
vendorHash = "sha256-NQKF5LugGh2wNWf6M3uUhS2YOTuv2/K56gWUv5ACwEU=";
meta = {
description = "Commandline-utility to list/view/edit/delete entries in a firefox-sync account";

View file

@ -0,0 +1,78 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
cargo-tauri,
nodejs,
npmHooks,
fetchNpmDeps,
pkg-config,
webkitgtk_4_1,
libayatana-appindicator,
libxscrnsaver,
cacert,
wrapGAppsHook3,
autoPatchelfHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "fluux-messenger";
version = "0.16.0";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "processone";
repo = "fluux-messenger";
rev = "v${finalAttrs.version}";
hash = "sha256-P4bRyge5EGdlZBdX+gIWh48itkCLQ+EjKLHt4xv6qnY=";
};
cargoRoot = "apps/fluux/src-tauri";
cargoHash = "sha256-YIX/F9LMuHFGJ89NIsFLUjjrR7XBoJF78OsyXiSjEqU=";
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src;
hash = "sha256-rzkFrvLb/0c+pg2SIUnhyTHK2MGL2ugRI9XuHtdm8XE=";
};
nativeBuildInputs = [
cargo-tauri.hook
nodejs
npmHooks.npmConfigHook
pkg-config
]
++ lib.optionals stdenv.hostPlatform.isLinux [
(wrapGAppsHook3.override { isGraphical = true; })
autoPatchelfHook
];
buildInputs = [
webkitgtk_4_1
libayatana-appindicator
libxscrnsaver
cacert
];
# libayatana-appindicator is not in the RUNPATH by default
runtimeDependencies = [ libayatana-appindicator ];
tauriBuildFlags = [ "--no-sign" ];
# setting buildAndTestSubdir from the beginning interferes with buildPhase
preCheck = "export buildAndTestSubdir=${finalAttrs.cargoRoot}";
# tauriInstallHook only works when we are in cargoRoot
preInstall = "pushd $buildAndTestSubdir";
postInstall = "popd";
meta = {
description = "XMPP client for communities and organizations";
homepage = "https://github.com/processone/fluux-messenger";
license = lib.licenses.agpl3Plus;
mainProgram = "fluux";
maintainers = [ lib.maintainers.haansn08 ];
platforms = lib.platforms.all;
};
})

View file

@ -1,63 +0,0 @@
{
lib,
buildGoModule,
fetchFromGitHub,
foks,
pcsclite,
pkg-config,
stdenv,
buildPackages,
}:
let
templFoks = buildPackages.templ.overrideAttrs (old: {
pname = "templ-foks";
version = "0.3.833";
src = old.src.override {
hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8=";
};
vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM=";
});
in
buildGoModule (finalAttrs: {
pname = "foks-server";
version = "0.1.7";
src = fetchFromGitHub {
owner = "foks-proj";
repo = "go-foks";
tag = "v${finalAttrs.version}";
hash = "sha256-UZ4BZ2/S44hnG+uLHtWR/qqQtr6tbbQbQOgIrN4ciT0=";
};
vendorHash = "sha256-+ysHa5KNhoxtoXPgOWC9ZDJKYqF+84s7oyxRib2S6a8=";
postPatch = ''
cd ./server/web/templates
templ generate
cd -
'';
postInstall = ''
ln -s $out/bin/{foks-server,git-remote-foks}
'';
subPackages = [ "server/foks-server" ];
excludedPackages = [ "server" ];
buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ];
nativeBuildInputs = [
pkg-config
templFoks
foks
];
__structuredAttrs = true;
meta = {
description = "Federated key management and distribution system";
homepage = "https://foks.pub";
downloadPage = "https://github.com/foks-proj/go-foks";
changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ poptart ];
mainProgram = "foks";
};
})

View file

@ -1,54 +1,72 @@
{
lib,
stdenv,
buildGoModule,
buildPackages,
fetchFromGitHub,
versionCheckHook,
pcsclite,
pkg-config,
stdenv,
templ,
buildPackages,
foks, # self
server ? false,
}:
let
templFoks = buildPackages.templ.overrideAttrs (old: {
pname = "templ-foks";
version = "0.3.833";
src = old.src.override {
hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8=";
};
vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM=";
});
client = !server;
pname = if server then "foks-server" else "foks";
subPackages = if server then [ "server/foks-server" ] else [ "client/foks" ];
in
buildGoModule (finalAttrs: {
pname = "foks";
version = "0.1.7";
inherit pname;
version = "0.1.8";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "foks-proj";
repo = "go-foks";
tag = "v${finalAttrs.version}";
hash = "sha256-UZ4BZ2/S44hnG+uLHtWR/qqQtr6tbbQbQOgIrN4ciT0=";
hash = "sha256-JY0ec+LNRQf0S8gTeazvQhvQ7LRM3zz1qvopGPaKM1k=";
};
vendorHash = "sha256-+ysHa5KNhoxtoXPgOWC9ZDJKYqF+84s7oyxRib2S6a8=";
vendorHash = "sha256-W0lyLy7k3xin8VSdxNgeh1FpHprOKIDduHIW3Oqk1LY=";
postPatch = ''
cd ./server/web/templates
${templFoks}/bin/templ generate
templ generate
cd -
'';
postInstall = ''
inherit subPackages;
excludedPackages = [ "server" ];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];
nativeBuildInputs = [
pkg-config
finalAttrs.passthru.templ
];
postInstall = lib.optionalString client ''
ln -s $out/bin/{foks,git-remote-foks}
'';
subPackages = [ "client/foks" ];
excludedPackages = [ "server" ];
doInstallCheck = true;
versionCheckProgramArg = "version";
nativeInstallCheckInputs = [ versionCheckHook ];
buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ];
nativeBuildInputs = [
pkg-config
];
__structuredAttrs = true;
passthru = {
templ = buildPackages.templ.overrideAttrs (old: {
pname = "templ-foks";
version = "0.3.833";
src = old.src.override {
hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8=";
};
vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM=";
});
server = foks.override { server = true; };
};
meta = {
description = "Federated key management and distribution system";
@ -56,7 +74,10 @@ buildGoModule (finalAttrs: {
downloadPage = "https://github.com/foks-proj/go-foks";
changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ poptart ];
mainProgram = "foks";
maintainers = with lib.maintainers; [
poptart
phanirithvij
];
mainProgram = pname;
};
})

View file

@ -1,72 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
pantheon,
vala,
pkg-config,
meson,
ninja,
python3,
glib,
gsettings-desktop-schemas,
gtk3,
libgee,
libhandy,
libsoup_2_4,
json-glib,
glib-networking,
desktop-file-utils,
wrapGAppsHook3,
}:
stdenv.mkDerivation rec {
pname = "fondo";
version = "1.6.1";
src = fetchFromGitHub {
owner = "calo001";
repo = "fondo";
rev = version;
sha256 = "sha256-JiDbkVs+EZRWRohSiuh8xFFgEhbnMYZfnZtz5Z4Wdb0=";
};
nativeBuildInputs = [
desktop-file-utils
meson
ninja
pkg-config
python3
vala
wrapGAppsHook3
];
buildInputs = [
glib
glib-networking
gsettings-desktop-schemas
gtk3
json-glib
libgee
libhandy
libsoup_2_4
pantheon.granite
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/calo001/fondo";
description = "Find the most beautiful wallpapers for your desktop";
license = lib.licenses.agpl3Plus;
teams = [ lib.teams.pantheon ];
platforms = lib.platforms.linux;
mainProgram = "com.github.calo001.fondo";
};
}

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fut";
version = "3.3.3";
version = "3.3.4";
src = fetchFromGitHub {
owner = "fusionlanguage";
repo = "fut";
tag = "fut-${finalAttrs.version}";
hash = "sha256-CBCL+LKHFr982riDBSKkcp0QP/9Ukjrs3gs1y4AN/2I=";
hash = "sha256-mFNyMo6pQ3LshYy8JDGFalNEgK1A9cxLp/wAnlO1I6k=";
};
buildPhase = ''

View file

@ -1,70 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
meson,
ninja,
vala,
pkg-config,
desktop-file-utils,
glib,
gtk3,
glib-networking,
libgee,
libsoup_2_4,
json-glib,
sqlite,
# webkitgtk_4_0,
libmanette,
libxtst,
wrapGAppsHook3,
}:
stdenv.mkDerivation rec {
pname = "GameHub";
version = "0.16.3-2";
src = fetchFromGitHub {
owner = "tkashkin";
repo = "GameHub";
rev = "${version}-master";
hash = "sha256-dBGzXwDO9BvnEIcdfqlGnMzUdBqaVA96Ds0fY6eukes=";
};
nativeBuildInputs = [
desktop-file-utils
meson
ninja
pkg-config
vala
wrapGAppsHook3
];
buildInputs = [
glib
glib-networking
gtk3
json-glib
libgee
libmanette
libsoup_2_4
libxtst
sqlite
# webkitgtk_4_0
];
meta = {
# webkitgtk_4_0 was removed
broken = true;
homepage = "https://tkashkin.github.io/projects/gamehub";
description = "Unified library for all your games";
longDescription = ''
GameHub is a unified library for all your games. It allows you to store
your games from different platforms into one program to make it easier
for you to manage your games.
'';
maintainers = with lib.maintainers; [ pasqui23 ];
license = with lib.licenses; [ gpl3Only ];
platforms = lib.platforms.linux;
};
}

View file

@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "gatus";
version = "5.35.0";
version = "5.36.0";
src = fetchFromGitHub {
owner = "TwiN";
repo = "gatus";
rev = "v${finalAttrs.version}";
hash = "sha256-I1HjeJ4/yLLgcoIEOQCv3WQDNrpIAFhzDvVpz24T7gU=";
hash = "sha256-YduXhHra6w7zo1f+brCjiusH7xCSdAzo5uF6aN5uv/A=";
};
vendorHash = "sha256-PBy/0My0TdlolpagDSdt7r2dPPLJOVHEsU1xaV8RFjg=";
vendorHash = "sha256-RbFNtojZthf7bKMhGStH/jOkeIR6EHpw2vvAMLEFtKI=";
subPackages = [ "." ];

View file

@ -15,18 +15,18 @@
buildNpmPackage (finalAttrs: {
pname = "gemini-cli";
version = "0.43.0";
version = "0.44.1";
src = fetchFromGitHub {
owner = "google-gemini";
repo = "gemini-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-UFz+CQLGbzFlpa5Mhf/frnQJWttF35URvua1QTfoaZ0=";
hash = "sha256-FizxmHWOomlnWZoCK2lOLc94RjNTQM33vN16nLXsJI0=";
};
nodejs = nodejs_22;
npmDepsHash = "sha256-7Pl020NKKzRpQftzEYRpQ0v1mkPnO3kVZITvFSLYztI=";
npmDepsHash = "sha256-yn17dwHIpL3T2Z9nSOyBMehggrj4y6so7WMhnk2VwoA=";
dontPatchElf = stdenv.hostPlatform.isDarwin;
@ -54,9 +54,13 @@ buildNpmPackage (finalAttrs: {
# Remove node-pty dependency from packages/core/package.json
${jq}/bin/jq 'del(.optionalDependencies."node-pty")' packages/core/package.json > packages/core/package.json.tmp && mv packages/core/package.json.tmp packages/core/package.json
# Fix ripgrep path for SearchText; ensureRgPath() on its own may return the path to a dynamically-linked ripgrep binary without required libraries
# Prefer the Nix ripgrep binary by prepending it to candidate paths
substituteInPlace packages/core/src/tools/ripGrep.ts \
--replace-fail "await ensureRgPath();" "'${lib.getExe ripgrep}';"
--replace-fail "const candidatePaths = [" "const candidatePaths = [\"${lib.getExe ripgrep}\", "
# Trust the Nix store path by adding it to standard system prefixes
substituteInPlace packages/core/src/utils/paths.ts \
--replace-fail "const trustedPrefixes = [" "const trustedPrefixes = [\"/nix/store\", "
# Disable auto-update by changing default values in settings schema
sed -i '/enableAutoUpdate:/,/default: true/ s/default: true/default: false/' packages/cli/src/config/settingsSchema.ts

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ghciwatch";
version = "1.3.5";
version = "1.4.1";
src = fetchFromGitHub {
owner = "MercuryTechnologies";
repo = "ghciwatch";
rev = "v${finalAttrs.version}";
hash = "sha256-ivSn1q/E0akz2JEkGcfB8i46Vom8/Pp/DlFBI+Zmo5Q=";
hash = "sha256-ho6j9/MKvLNbgWqGNTCHLacyka6Nf8qchjG4YnsK7wA=";
};
cargoHash = "sha256-LZIBQ5dKtqTsMjLrhBucsgSAdmsGKkhOFtMCGh3clPk=";
cargoHash = "sha256-BUtUcqYYYiA3ulrCXlA6stcONxTvilKEDO+Vq3Pvok8=";
# integration tests are not run but the macros need this variable to be set
env.GHC_VERSIONS = "";

View file

@ -11,16 +11,16 @@
buildGo126Module (finalAttrs: {
pname = "ghq";
version = "1.9.4";
version = "1.10.1";
src = fetchFromGitHub {
owner = "x-motemen";
repo = "ghq";
tag = "v${finalAttrs.version}";
sha256 = "sha256-z7tLCSThR4EFLk8GnyrB8H6d/9t5AKegVEdzlleCS94=";
sha256 = "sha256-SmcgBwd5k/lAv9bwYRpkIM0fil2ajSlT8zznP7bgpDk=";
};
vendorHash = "sha256-/uk1hf5eXpNULKm7UeVgQ7Lc7YOU+eV9Yd/4lYorz/8=";
vendorHash = "sha256-8aC1J/mM7ZTEQBdZwstvHxMKDPqgzjzYztC7shuwu/Q=";
doCheck = false;

View file

@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "github-mcp-server";
version = "1.1.2";
version = "1.3.0";
src = fetchFromGitHub {
owner = "github";
repo = "github-mcp-server";
tag = "v${finalAttrs.version}";
hash = "sha256-/Wf0p3Ug3fxtXhvfab+ZSPe0XlGlWC0ujxkMb52D+oM=";
hash = "sha256-FVKnslJhjFoxyEWFQE7kXpS5bZ43WxpSflH9/e2XmV4=";
};
vendorHash = "sha256-J1hC4hdEKLENXLJrsyV41TaJ9+2CuPz5KoIMm2mXvTE=";

View file

@ -22,7 +22,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gitte";
version = "0.6.1";
version = "0.7.0";
__structuredAttrs = true;
@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ckruse";
repo = "Gitte";
tag = finalAttrs.version;
hash = "sha256-ieW/oOFdyJWVR/7B62Rzcyii+/zDj/Xp6KCrVOf6mpA=";
hash = "sha256-oZJmjpPAiMNlHJBdTLXmT7FOf9dCITPuazEU7GtWmM8=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-VhcJepTeEjA/ZogqR82Whlyz4NRuI5MLB2HqNjGe8zQ=";
hash = "sha256-PZ1Q1GREBiZHQyEe/NrKFJ16ynuuPA/hXUhsP3r6WMg=";
};
strictDeps = true;

View file

@ -1,161 +0,0 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
autoconf,
automake,
libtool,
mm-common,
intltool,
itstool,
doxygen,
graphviz,
makeFontsConf,
freefont_ttf,
boost,
libxmlxx3,
libxslt,
libgdamm,
libarchive,
libepc,
python311,
python3,
ncurses,
glibmm,
gtk3,
openssl,
gtkmm3,
goocanvasmm2,
evince,
isocodes,
gtksourceview,
gtksourceviewmm,
postgresql,
gobject-introspection,
yelp-tools,
wrapGAppsHook3,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "glom";
version = "1.32.0";
outputs = [
"out"
"lib"
"dev"
"doc"
"devdoc"
];
src = fetchurl {
url = "mirror://gnome/sources/glom/${lib.versions.majorMinor finalAttrs.version}/glom-${finalAttrs.version}.tar.xz";
hash = "sha256-U78gfryoLFY7nme86XdFmhfn/ZTjXCfBlphnNtokjfE=";
};
gda = libgdamm.override {
mysqlSupport = true;
postgresSupport = true;
};
python = python311.withPackages (
pkgs: with pkgs; [
pygobject3
distutils
]
);
python_boost = python311.withPackages (pkgs: with pkgs; [ pygobject3 ]);
sphinx-build = python311.pkgs.sphinx.overrideAttrs (super: {
postFixup = super.postFixup or "" + ''
# Do not propagate Python
rm $out/nix-support/propagated-build-inputs
'';
});
boost_python = boost.override {
enablePython = true;
python = finalAttrs.python_boost;
};
nativeBuildInputs = [
pkg-config
autoconf
automake
libtool
mm-common
intltool
(yelp-tools.override {
python3 = python311;
})
itstool
doxygen
graphviz
finalAttrs.sphinx-build
wrapGAppsHook3
gobject-introspection # for setup hook
];
buildInputs = [
finalAttrs.boost_python
glibmm
gtk3
openssl
libxmlxx3
libxslt
python311.pkgs.pygobject3
finalAttrs.gda
libarchive
libepc
finalAttrs.python
ncurses # for python
gtkmm3
goocanvasmm2
evince
isocodes
gtksourceview
gtksourceviewmm
postgresql # for postgresql utils
];
enableParallelBuilding = true;
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
configureFlags = [
"--with-boost-python=boost_python${lib.versions.major python311.version}${lib.versions.minor python311.version}"
"--with-postgres-utils=${lib.getBin postgresql}/bin"
];
makeFlags = [
"libdocdir=${placeholder "doc"}/share/doc/$(book_name)"
"devhelpdir=${placeholder "devdoc"}/share/devhelp/books/$(book_name)"
];
# Fontconfig error: Cannot load default config file
env.FONTCONFIG_FILE = makeFontsConf {
fontDirectories = [ freefont_ttf ];
};
preFixup = ''
gappsWrapperArgs+=(
--prefix PYTHONPATH : "${placeholder "out"}/${python311.sitePackages}"
--set PYTHONHOME "${finalAttrs.python}"
)
'';
meta = {
description = "Easy-to-use database designer and user interface";
license = with lib.licenses; [
lgpl2
gpl2
];
homepage = "https://gitlab.gnome.org/Archive/glom";
maintainers = with lib.maintainers; [
bot-wxt1221
];
platforms = lib.platforms.linux;
};
})

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