From 19298c32f004c2f31f803bf0c760c900abac56ce Mon Sep 17 00:00:00 2001 From: eljamm Date: Sun, 7 Dec 2025 12:12:01 +0100 Subject: [PATCH 1/3] linux_xanmod: change URL prefetching in update script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recently, there has been an issue with `nix-prefetch` that broke the update script: ``` --- SHOWING ERROR LOG FOR linux-xanmod-6.12.62 ---------------------- this path will be fetched (0.02 MiB download, 0.07 MiB unpacked): /nix/store/6xiirw87j5l8n6da4ijibw90r8v1b7zh-nix-prefetch-0.4.1 copying path '/nix/store/6xiirw87j5l8n6da4ijibw90r8v1b7zh-nix-prefetch-0.4.1' from 'https://cache.nixos.org'... Updating Xanmod "lts" from 6.12.62 to 6.12.63 (xanmod1) error: … while calling the 'zipAttrsWith' builtin at /nix/store/wdqrnd6fkxdsf4xn2kkfa8f42shfw0i3-source/lib/attrsets.nix:1701:5: 1700| in 1701| f [ ] [ rhs lhs ]; | ^ 1702| … while evaluating a branch condition at /nix/store/wdqrnd6fkxdsf4xn2kkfa8f42shfw0i3-source/lib/attrsets.nix:1478:29: 1477| */ 1478| optionalAttrs = cond: as: if cond then as else { }; | ^ 1479| (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: expected a set but found a function: «lambda extendsWithExclusion @ /nix/store/wdqrnd6fkxdsf4xn2kkfa8f42shfw0i3-source/lib/customisation.nix:846:30» ``` It's possible that this is caused by something else, but we should keep the update script working until we find out what exactly and fix it. Note: This first started happening to me on `nixos-25.11`, and is [reproducible by other people](https://github.com/NixOS/nixpkgs/pull/468873#issuecomment-3624990626) --- pkgs/os-specific/linux/kernel/update-xanmod.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/update-xanmod.sh b/pkgs/os-specific/linux/kernel/update-xanmod.sh index 062b9595458d..aa749bc227d0 100755 --- a/pkgs/os-specific/linux/kernel/update-xanmod.sh +++ b/pkgs/os-specific/linux/kernel/update-xanmod.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt +#!nix-shell -I nixpkgs=./. -i bash -p bash nix curl jq gawk gnused nixfmt set -euo pipefail @@ -49,8 +49,13 @@ done < <(echo "$RELEASE_URLS" | jq -r) >&2 echo "Updating Xanmod \"$VARIANT\" from $OLD_VERSION to $NEW_VERSION ($SUFFIX)" +prefetchURL() { + result=$(nix-build -E "with import ./. {}; fetchzip { url=\"$1\"; hash=\"\"; }" 2>&1) + echo "$result" | awk '/got:/ {print $NF}' +} + URL="https://gitlab.com/api/v4/projects/xanmod%2Flinux/repository/archive.tar.gz?sha=$NEW_VERSION-$SUFFIX" -HASH="$(nix-prefetch fetchzip --quiet --url "$URL")" +HASH="$(prefetchURL "$URL")" update_variant() { local file_path="$1" From 76032e38a09ffddf006ca0dd7bff20d80441a246 Mon Sep 17 00:00:00 2001 From: eljamm Date: Fri, 19 Dec 2025 06:34:28 +0000 Subject: [PATCH 2/3] linux_xanmod: 6.12.62 -> 6.12.63 - Changelog: https://dl.xanmod.org/changelog/6.12/ChangeLog-6.12.63-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.12.62-xanmod1..6.12.63-xanmod1?from_project_id=51590166 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d6831801d1fb..a429b2c01419 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,8 +15,8 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.12.62"; - hash = "sha256-NAcE8ml7HDhpLNDKZEKlEFwdylRiFte+Gi+uxnlyVHQ="; + version = "6.12.63"; + hash = "sha256-lrDglbhEch2/xtWayWcCw2Qm5qzTVa50Pwy2vn4ppCo="; isLTS = true; }; # ./update-xanmod.sh main From 723ea2adf21fca75215bbcb7d28063cdd5115f34 Mon Sep 17 00:00:00 2001 From: eljamm Date: Fri, 19 Dec 2025 06:46:00 +0000 Subject: [PATCH 3/3] linux_xanmod_latest: 6.17.12 -> 6.18.2 - Changelog: https://dl.xanmod.org/changelog/6.18/ChangeLog-6.18.2-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.17.12-xanmod1..6.18.2-xanmod1?from_project_id=51590166 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index a429b2c01419..7699a566ee45 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -21,8 +21,8 @@ let }; # ./update-xanmod.sh main main = { - version = "6.17.12"; - hash = "sha256-1IdlQEh+BQID91j/KpkJwzM3WMymbw/AXWpcEMitYfs="; + version = "6.18.2"; + hash = "sha256-LSzoUpQiqVAeboKKyRzKyiYpuUbueJvHTtN5mm8EHL8="; }; };