From f2685502facf04beb2b4487186972409aa254ca8 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Thu, 24 Apr 2025 14:19:40 +0200 Subject: [PATCH 1/5] sof-firmware: remove use of with lib; --- pkgs/by-name/so/sof-firmware/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/so/sof-firmware/package.nix b/pkgs/by-name/so/sof-firmware/package.nix index e9c483c4c1bf..344d300f52b3 100644 --- a/pkgs/by-name/so/sof-firmware/package.nix +++ b/pkgs/by-name/so/sof-firmware/package.nix @@ -27,20 +27,20 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { changelog = "https://github.com/thesofproject/sof-bin/releases/tag/v${version}"; description = "Sound Open Firmware"; homepage = "https://www.sofproject.org/"; - license = with licenses; [ + license = with lib.licenses; [ bsd3 isc ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ lblasc evenbrenden hmenke ]; - platforms = with platforms; linux; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = with lib.platforms; linux; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } From b7d9d27e80b504af5abe255340ab59fd62819ff1 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Thu, 24 Apr 2025 14:21:37 +0200 Subject: [PATCH 2/5] sof-firmware: use finalAttrs pattern --- pkgs/by-name/so/sof-firmware/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/so/sof-firmware/package.nix b/pkgs/by-name/so/sof-firmware/package.nix index 344d300f52b3..3b09ee0075c6 100644 --- a/pkgs/by-name/so/sof-firmware/package.nix +++ b/pkgs/by-name/so/sof-firmware/package.nix @@ -4,12 +4,12 @@ stdenvNoCC, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "sof-firmware"; version = "2025.01.1"; src = fetchurl { - url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-${version}.tar.gz"; + url = "https://github.com/thesofproject/sof-bin/releases/download/v${finalAttrs.version}/sof-bin-${finalAttrs.version}.tar.gz"; sha256 = "sha256-o2IQ2cJF6BsNlnTWsn0f1BIpaM+SWu/FW0htNlD4gyM="; }; @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = { - changelog = "https://github.com/thesofproject/sof-bin/releases/tag/v${version}"; + changelog = "https://github.com/thesofproject/sof-bin/releases/tag/v${finalAttrs.version}"; description = "Sound Open Firmware"; homepage = "https://www.sofproject.org/"; license = with lib.licenses; [ @@ -43,4 +43,4 @@ stdenvNoCC.mkDerivation rec { platforms = with lib.platforms; linux; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -} +}) From 0f767e03253391c1f51d4ecafc15d953ba1c82d0 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Thu, 24 Apr 2025 14:25:05 +0200 Subject: [PATCH 3/5] sof-firmware: simplify install phase --- pkgs/by-name/so/sof-firmware/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/so/sof-firmware/package.nix b/pkgs/by-name/so/sof-firmware/package.nix index 3b09ee0075c6..3467f4f8321f 100644 --- a/pkgs/by-name/so/sof-firmware/package.nix +++ b/pkgs/by-name/so/sof-firmware/package.nix @@ -17,13 +17,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall + mkdir -p $out/lib/firmware/intel - cp -av sof $out/lib/firmware/intel/sof - cp -av sof-tplg $out/lib/firmware/intel/sof-tplg - cp -av sof-ace-tplg $out/lib/firmware/intel/sof-ace-tplg - cp -av sof-ipc4 $out/lib/firmware/intel/sof-ipc4 - cp -av sof-ipc4-tplg $out/lib/firmware/intel/sof-ipc4-tplg - cp -av sof-ipc4-lib $out/lib/firmware/intel/sof-ipc4-lib + # copy sof and sof-* recursively, preserving symlinks + cp -R -d sof{,-*} $out/lib/firmware/intel/ + runHook postInstall ''; From 0317b15adf2d3fa255c74b93016ba3cb3205e627 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Thu, 24 Apr 2025 14:41:50 +0200 Subject: [PATCH 4/5] sof-firmware: provide update script --- pkgs/by-name/so/sof-firmware/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/so/sof-firmware/package.nix b/pkgs/by-name/so/sof-firmware/package.nix index 3467f4f8321f..adb409eb01e0 100644 --- a/pkgs/by-name/so/sof-firmware/package.nix +++ b/pkgs/by-name/so/sof-firmware/package.nix @@ -2,6 +2,7 @@ lib, fetchurl, stdenvNoCC, + nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -25,6 +26,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/thesofproject/sof-bin/releases/tag/v${finalAttrs.version}"; description = "Sound Open Firmware"; From 54e960363a5b009cbd09efea8c53ff90b6aeadf8 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Thu, 24 Apr 2025 15:01:07 +0200 Subject: [PATCH 5/5] sof-firmware: replace src.sha256 with src.hash --- pkgs/by-name/so/sof-firmware/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/so/sof-firmware/package.nix b/pkgs/by-name/so/sof-firmware/package.nix index adb409eb01e0..6b3b22cb0c7b 100644 --- a/pkgs/by-name/so/sof-firmware/package.nix +++ b/pkgs/by-name/so/sof-firmware/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/thesofproject/sof-bin/releases/download/v${finalAttrs.version}/sof-bin-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-o2IQ2cJF6BsNlnTWsn0f1BIpaM+SWu/FW0htNlD4gyM="; + hash = "sha256-o2IQ2cJF6BsNlnTWsn0f1BIpaM+SWu/FW0htNlD4gyM="; }; dontFixup = true; # binaries must not be stripped or patchelfed