patches and low-level development discussion
 help / color / mirror / code / Atom feed
* [PATCH] release/update.nix: fix import of efi
@ 2025-12-15 12:26 Alyssa Ross
  2025-12-15 18:28 ` Demi Marie Obenour
  2025-12-16 10:30 ` Alyssa Ross
  0 siblings, 2 replies; 3+ messages in thread
From: Alyssa Ross @ 2025-12-15 12:26 UTC (permalink / raw)
  To: devel; +Cc: Demi Marie Obenour

import does not pass through custom configuration options.

Fixes: 49f33a1 ("release: Create directory with system update")
Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
 release/update.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/update.nix b/release/update.nix
index 18a91ac..f6e7772 100644
--- a/release/update.nix
+++ b/release/update.nix
@@ -6,7 +6,7 @@ import ../lib/call-package.nix (
 { callSpectrumPackage, config, runCommand, stdenv }:
 
 let
-  efi = import ../host/efi.nix {};
+  efi = callSpectrumPackage ../host/efi.nix {};
 in
 runCommand "spectrum-update-directory" {
   __structuredAttrs = true;

base-commit: 6ceeb9b236cc50d2bba90068533ca1b7ff229c8b
-- 
2.51.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] release/update.nix: fix import of efi
  2025-12-15 12:26 [PATCH] release/update.nix: fix import of efi Alyssa Ross
@ 2025-12-15 18:28 ` Demi Marie Obenour
  2025-12-16 10:30 ` Alyssa Ross
  1 sibling, 0 replies; 3+ messages in thread
From: Demi Marie Obenour @ 2025-12-15 18:28 UTC (permalink / raw)
  To: Alyssa Ross, devel


[-- Attachment #1.1.1: Type: text/plain, Size: 957 bytes --]

On 12/15/25 07:26, Alyssa Ross wrote:
> import does not pass through custom configuration options.
> 
> Fixes: 49f33a1 ("release: Create directory with system update")
> Signed-off-by: Alyssa Ross <hi@alyssa.is>
> ---
>  release/update.nix | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/release/update.nix b/release/update.nix
> index 18a91ac..f6e7772 100644
> --- a/release/update.nix
> +++ b/release/update.nix
> @@ -6,7 +6,7 @@ import ../lib/call-package.nix (
>  { callSpectrumPackage, config, runCommand, stdenv }:
>  
>  let
> -  efi = import ../host/efi.nix {};
> +  efi = callSpectrumPackage ../host/efi.nix {};
>  in
>  runCommand "spectrum-update-directory" {
>    __structuredAttrs = true;
> 
> base-commit: 6ceeb9b236cc50d2bba90068533ca1b7ff229c8b

Clearly an oops in my commit, so:

Reviewed-by: Demi Marie Obenour <demiobenour@gmail.com>
-- 
Sincerely,
Demi Marie Obenour (she/her/hers)

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 7253 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] release/update.nix: fix import of efi
  2025-12-15 12:26 [PATCH] release/update.nix: fix import of efi Alyssa Ross
  2025-12-15 18:28 ` Demi Marie Obenour
@ 2025-12-16 10:30 ` Alyssa Ross
  1 sibling, 0 replies; 3+ messages in thread
From: Alyssa Ross @ 2025-12-16 10:30 UTC (permalink / raw)
  To: Alyssa Ross, devel; +Cc: Demi Marie Obenour

This patch has been committed as 65cb6209040be65294e7a0dec281cb11d26a8ee2,
which can be viewed online at
https://spectrum-os.org/git/spectrum/commit/?id=65cb6209040be65294e7a0dec281cb11d26a8ee2.

This is an automated message.  Send comments/questions/requests to:
Alyssa Ross <hi@alyssa.is>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2025-12-16 10:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-15 12:26 [PATCH] release/update.nix: fix import of efi Alyssa Ross
2025-12-15 18:28 ` Demi Marie Obenour
2025-12-16 10:30 ` Alyssa Ross

Code repositories for project(s) associated with this public inbox

	https://spectrum-os.org/git/crosvm
	https://spectrum-os.org/git/doc
	https://spectrum-os.org/git/mktuntap
	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/spectrum
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).