ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-20 05:28:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

flake.nix: revert to mmlb state and testing

Browse Source 
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
This commit is contained in:
Thierry Laurion 2024-05-03 10:13:09 -04:00
parent 973e905ef6
commit 3d0991f6c1
No known key found for this signature in database
GPG Key ID: 9A53E1BB3FF00461
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
flake.nix
View File

@ -22,7 +22,7 @@
bashInteractive bashInteractive
coreutils coreutils
bc bc
bison bison # Generate flashmap descriptor parser
bzip2 bzip2
cacert cacert
ccache ccache
@ -47,8 +47,8 @@
innoextract # ROM extraction for dGPU. innoextract # ROM extraction for dGPU.
libtool libtool
m4 m4
ncurses5 ncurses5 # make menuconfig and slang
openssl openssl #needed for talos-2 kernel build
parted parted
patch patch
perl perl
@ -67,21 +67,22 @@
] ++ [ ] ++ [
# Packages for qemu support with Canokey integration. # Packages for qemu support with Canokey integration.
qemu # To test make BOARD=qemu-coreboot-* boards and then call make BOARD=qemu-coreboot-* with inject_gpg statement, and then run statement (RTFM). qemu # To test make BOARD=qemu-coreboot-* boards and then call make BOARD=qemu-coreboot-* with inject_gpg statement, and then run statement (RTFM).
canokey-qemu # Canokey lib for qemu build-time compilation. #canokey doesn;t work still even if compiled in, so no reason to add 1Gb of stuff in the image
(qemu.override { #canokey-qemu # Canokey lib for qemu build-time compilation.
canokeySupport = true; # This override enables Canokey support in QEMU, resulting in -device canokey being available. #(qemu.override {
}) # canokeySupport = true; # This override enables Canokey support in QEMU, resulting in -device canokey being available.
#})
] ++ [ ] ++ [
# Additional tools for editing and testing. # Additional tools for debugging/editing/testing.
vim # Mostly used amongst us, sorry if you'd like something else, open issue. vim # Mostly used amongst us, sorry if you'd like something else, open issue.
swtpm # QEMU requirement to emulate tpm1/tpm2. swtpm # QEMU requirement to emulate tpm1/tpm2.
dosfstools # QEMU requirement to produce valid fs to store exported public key to be fused through inject_key on qemu (so qemu flashrom emulated SPI support). dosfstools # QEMU requirement to produce valid fs to store exported public key to be fused through inject_key on qemu (so qemu flashrom emulated SPI support).
] ++ [ ] ++ [
# Tools for handling binary blobs and compression. # Tools for handling binary blobs in their compressed state. (blobs/xx30/vbios_[tw]530.sh)
bundler bundler
p7zip p7zip
ruby ruby
sudo sudo # ( °-° )
upx upx
]; ];
@ -124,7 +125,7 @@
packages.dockerImage = pkgs.dockerTools.buildLayeredImage { packages.dockerImage = pkgs.dockerTools.buildLayeredImage {
name = "linuxboot/heads"; # Image name. name = "linuxboot/heads"; # Image name.
tag = "dev-env"; # Image tag. tag = "dev-env"; # Image tag.
config.Entrypoint = ["bash" "-c" ''source /devenv.sh; if (( $# == 0 )); then exec bash; else exec "$@"; fi'']; # Entrypoint configuration. config.Entrypoint = ["bash" "-c" ''source /devenv.sh; if (( $# == 0 )); then exec bash; else exec "$0" "$@"; fi'']; # Entrypoint configuration.
# Contents of the Docker image, including stripped binaries for size optimization. # Contents of the Docker image, including stripped binaries for size optimization.
contents = stripBinaries ++ [ contents = stripBinaries ++ [