Skip to content

[Backport release-25.05] linux_latest-libre: 19812 -> 19835 #456441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alyssais merged 3 commits into from
Oct 28, 2025
Merged

[Backport release-25.05] linux_latest-libre: 19812 -> 19835 #456441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e2dbb4
linux_latest-libre: run hooks in the phases
philiptaron Jul 1, 2025
487ae3c
linux_latest-libre: refactor update script to use SRI hashes
philiptaron Jul 1, 2025
b1cd007
linux_latest-libre: 19812 -> 19835
philiptaron Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions pkgs/os-specific/linux/kernel/linux-libre.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
linux,
scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19812";
sha256 = "1bhkc0r5p3d4mmmi26k5lsk56jgbc8hi46bfih313hxmrnsd07dy";
rev = "19835";
hash = "sha256-5usyLmlTr5nlM+/uWPQepzhhNSLi3Hol1BfnWb9CFws=";
},
...
}@args:
Expand All @@ -30,16 +30,30 @@ linux.override {
src = stdenv.mkDerivation {
name = "${linux.name}-libre-src";
src = linux.src;

buildPhase = ''
runHook preBuild

# --force flag to skip empty files after deblobbing
${scripts}/${majorMinor}/deblob-${majorMinor} --force \
${major} ${minor} ${patch}
${scripts}/${majorMinor}/deblob-${majorMinor} --force ${major} ${minor} ${patch}

runHook postBuild
'';

checkPhase = ''
runHook preCheck

${scripts}/deblob-check

runHook postCheck
'';

installPhase = ''
runHook preInstall

cp -r . "$out"

runHook postInstall
'';
};

Expand Down
8 changes: 4 additions & 4 deletions pkgs/os-specific/linux/kernel/update-libre.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ nixpkgs="$(git rev-parse --show-toplevel)"
path="$nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix"

old_rev="$(grep -o 'rev = ".*"' "$path" | awk -F'"' '{print $2}')"
old_sha256="$(grep -o 'sha256 = ".*"' "$path" | awk -F'"' '{print $2}')"

svn_url=https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/
rev="$(curl -s "$svn_url" | grep -Em 1 -o 'Revision [0-9]+' | awk '{print $2}')"
Expand All @@ -16,15 +15,16 @@ if [ "$old_rev" = "$rev" ]; then
exit 0
fi

old_hash="$(grep -o 'hash = ".*"' "$path" | awk -F'"' '{print $2}')"
sha256="$(QUIET=1 nix-prefetch-svn "$svn_url" "$rev" | tail -1)"
new_hash="$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$sha256")"

if [ "$old_sha256" = "$sha256" ]; then
if [ "$old_hash" = "$new_hash" ]; then
echo "No updates for linux-libre"
exit 0
fi

sed -i -e "s/rev = \".*\"/rev = \"$rev\"/" \
-e "s/sha256 = \".*\"/sha256 = \"$sha256\"/" "$path"
sed -i -e "s,rev = \".*\",rev = \"$rev\",; s,hash = \".*\",hash = \"$new_hash\"," "$path"

if [ -n "${COMMIT-}" ]; then
git commit -qm "linux_latest-libre: $old_rev -> $rev" "$path" \
Expand Down
Loading