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" diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d6831801d1fb..7699a566ee45 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ 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 main = { - version = "6.17.12"; - hash = "sha256-1IdlQEh+BQID91j/KpkJwzM3WMymbw/AXWpcEMitYfs="; + version = "6.18.2"; + hash = "sha256-LSzoUpQiqVAeboKKyRzKyiYpuUbueJvHTtN5mm8EHL8="; }; };