aboutsummaryrefslogtreecommitdiff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/coreboot-payload-coreinfo/default.nix7
-rw-r--r--pkgs/coreboot-payload-grub2/default.nix23
-rw-r--r--pkgs/coreboot-payload-nvramcui/default.nix4
-rw-r--r--pkgs/coreboot-payload-seabios/default.nix11
-rw-r--r--pkgs/coreboot-payload-tianocore/default.nix73
-rw-r--r--pkgs/coreboot-payload-tint/default.nix16
-rw-r--r--pkgs/coreboot/default.nix46
-rw-r--r--pkgs/overlay.nix14
8 files changed, 85 insertions, 109 deletions
diff --git a/pkgs/coreboot-payload-coreinfo/default.nix b/pkgs/coreboot-payload-coreinfo/default.nix
index 21e00031166e..0ecb41add1cc 100644
--- a/pkgs/coreboot-payload-coreinfo/default.nix
+++ b/pkgs/coreboot-payload-coreinfo/default.nix
@@ -1,9 +1,4 @@
-{ coreboot
-, lib
-, stdenv
-, writeText
-, coreinfoConfig ? {}
-}:
+{ coreboot, lib, stdenv, writeText, coreinfoConfig ? { } }:
stdenv.mkDerivation rec {
pname = "coreboot-payload-coreinfo";
diff --git a/pkgs/coreboot-payload-grub2/default.nix b/pkgs/coreboot-payload-grub2/default.nix
index c01d4065ecfe..120afaa12036 100644
--- a/pkgs/coreboot-payload-grub2/default.nix
+++ b/pkgs/coreboot-payload-grub2/default.nix
@@ -1,11 +1,22 @@
-{ grub2
-, lib
-, extraPayloadModules ? [ "png" "gfxmenu" "gfxterm_background" "ls" "cat" "echo" "linux" "xfs" "bsd" ]
-}:
+{ grub2, lib, extraPayloadModules ? [
+ "png"
+ "gfxmenu"
+ "gfxterm_background"
+ "ls"
+ "cat"
+ "echo"
+ "linux"
+ "xfs"
+ "bsd"
+] }:
grub2.overrideAttrs (oA: {
pname = "coreboot-payload-${oA.pname}";
- configureFlags = oA.configureFlags ++ [ "--with-platform=coreboot" "--enable-boot-time" ];
- postBuild = "make -j $NIX_BUILD_CORES default_payload.elf EXTRA_PAYLOAD_MODULES=\"${lib.concatStringsSep " " extraPayloadModules}\"";
+ configureFlags = oA.configureFlags
+ ++ [ "--with-platform=coreboot" "--enable-boot-time" ];
+ postBuild = ''
+ make -j $NIX_BUILD_CORES default_payload.elf EXTRA_PAYLOAD_MODULES="${
+ lib.concatStringsSep " " extraPayloadModules
+ }"'';
installPhase = "install -D default_payload.elf -t $out";
})
diff --git a/pkgs/coreboot-payload-nvramcui/default.nix b/pkgs/coreboot-payload-nvramcui/default.nix
index 418f809960d7..2c9ddb36286b 100644
--- a/pkgs/coreboot-payload-nvramcui/default.nix
+++ b/pkgs/coreboot-payload-nvramcui/default.nix
@@ -1,6 +1,4 @@
-{ coreboot
-, stdenv
-}:
+{ coreboot, stdenv }:
stdenv.mkDerivation rec {
pname = "coreboot-payload-nvramcui";
diff --git a/pkgs/coreboot-payload-seabios/default.nix b/pkgs/coreboot-payload-seabios/default.nix
index f2b1ee3b6021..72a104e1b046 100644
--- a/pkgs/coreboot-payload-seabios/default.nix
+++ b/pkgs/coreboot-payload-seabios/default.nix
@@ -1,9 +1,8 @@
-{ seabios
-, coreboot
-, stdenv
-, fetchurl
-, seabiosConfig ? { CONFIG_COREBOOT = "y"; CONFIG_VGA_COREBOOT = "y"; CONFIG_BUILD_VGABIOS = "y"; }
-}:
+{ seabios, coreboot, stdenv, fetchurl, seabiosConfig ? {
+ CONFIG_COREBOOT = "y";
+ CONFIG_VGA_COREBOOT = "y";
+ CONFIG_BUILD_VGABIOS = "y";
+} }:
seabios.overrideAttrs (oA: rec {
pname = "coreboot-payload-seabios";
diff --git a/pkgs/coreboot-payload-tianocore/default.nix b/pkgs/coreboot-payload-tianocore/default.nix
index 07e90a97d984..5c3e5362462f 100644
--- a/pkgs/coreboot-payload-tianocore/default.nix
+++ b/pkgs/coreboot-payload-tianocore/default.nix
@@ -1,12 +1,4 @@
-{ fetchFromGitHub
-, python2
-, stdenv
-, libuuid
-, bc
-, utillinux
-, nasm
-, iasl
-, seabios
+{ fetchFromGitHub, python2, stdenv, libuuid, bc, utillinux, nasm, iasl, seabios
}:
# we can not override the source in edk2, so we had to copy the entire thing
@@ -22,7 +14,7 @@ let
version = "unstable";
- pythonEnv = python2.withPackages (ps: [ps.tkinter]);
+ pythonEnv = python2.withPackages (ps: [ ps.tkinter ]);
toolchain = stdenv.mkDerivation {
pname = "edk2-coreboot";
@@ -46,42 +38,41 @@ let
enableParallelBuilding = true;
};
-in
- stdenv.mkDerivation {
- pname = "coreboot-payload-tianocore";
- inherit version src;
+in stdenv.mkDerivation {
+ pname = "coreboot-payload-tianocore";
+ inherit version src;
- buildInputs = [ bc pythonEnv utillinux nasm iasl ];
+ buildInputs = [ bc pythonEnv utillinux nasm iasl ];
- prePatch = ''
- rm -rf BaseTools
- ln -sv ${toolchain}/BaseTools BaseTools
- '';
+ prePatch = ''
+ rm -rf BaseTools
+ ln -sv ${toolchain}/BaseTools BaseTools
+ '';
- configurePhase = ''
- runHook preConfigure
- export WORKSPACE="$PWD"
- . ${toolchain}/edksetup.sh BaseTools
- runHook postConfigure
- '';
+ configurePhase = ''
+ runHook preConfigure
+ export WORKSPACE="$PWD"
+ . ${toolchain}/edksetup.sh BaseTools
+ runHook postConfigure
+ '';
- buildPhase = ''
- runHook preBuild
- build -a X64 -a IA32 -b RELEASE -t GCC5 -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc -n $NIX_BUILD_CORES -D CSM_ENABLE
- runHook postBuild
- '';
+ buildPhase = ''
+ runHook preBuild
+ build -a X64 -a IA32 -b RELEASE -t GCC5 -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc -n $NIX_BUILD_CORES -D CSM_ENABLE
+ runHook postBuild
+ '';
- installPhase = ''
- runHook preInstall
- mv -v Build/*/* $out
- runHook postInstall
- '';
+ installPhase = ''
+ runHook preInstall
+ mv -v Build/*/* $out
+ runHook postInstall
+ '';
- hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ];
+ hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ];
- postPatch = ''
- cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
- '';
+ postPatch = ''
+ cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
+ '';
- dontPatchELF = true;
- }
+ dontPatchELF = true;
+}
diff --git a/pkgs/coreboot-payload-tint/default.nix b/pkgs/coreboot-payload-tint/default.nix
index a410a46a254d..b953c773336d 100644
--- a/pkgs/coreboot-payload-tint/default.nix
+++ b/pkgs/coreboot-payload-tint/default.nix
@@ -1,7 +1,4 @@
-{ coreboot
-, stdenv
-, fetchurl
-}:
+{ coreboot, stdenv, fetchurl }:
# the original tint does not support building as a coreboot payload
# the patches from the coreboot repo require building tint in-tree
@@ -14,10 +11,13 @@ stdenv.mkDerivation rec {
preConfigure = "cd payloads/external/tint";
preBuild = ''
- tar -xf ${fetchurl {
- url = "https://mirror.fsf.org/trisquel/pool/main/t/tint/tint_${version}.tar.gz";
- sha256 = "17gbga1lha9yp5hpyr5vn1sc93fx413cksxmpyl8zv3b5rjvzsy1";
- }}
+ tar -xf ${
+ fetchurl {
+ url =
+ "https://mirror.fsf.org/trisquel/pool/main/t/tint/tint_${version}.tar.gz";
+ sha256 = "17gbga1lha9yp5hpyr5vn1sc93fx413cksxmpyl8zv3b5rjvzsy1";
+ }
+ }
mv tint{-${version},}
'';
installPhase = "install -D tint/tint.elf -t $out";
diff --git a/pkgs/coreboot/default.nix b/pkgs/coreboot/default.nix
index 3a24dd92fb54..cc0c2f39b209 100644
--- a/pkgs/coreboot/default.nix
+++ b/pkgs/coreboot/default.nix
@@ -1,17 +1,5 @@
-{ fetchgit
-, fetchurl
-, stdenv
-, m4
-, flex
-, bison
-, zlib
-, gnat
-, curl
-, writeText
-, callPackage
-, lib
-, corebootConfig ? { CONFIG_PAYLOAD_NONE = "y"; }
-}:
+{ fetchgit, fetchurl, stdenv, m4, flex, bison, zlib, gnat, curl, writeText
+, callPackage, lib, corebootConfig ? { CONFIG_PAYLOAD_NONE = "y"; } }:
let
version = "4.12";
@@ -25,18 +13,12 @@ let
toolchain = stdenv.mkDerivation rec {
pname = "coreboot-toolchain";
inherit version src;
- nativeBuildInputs = [
- curl
- stdenv
- m4
- flex
- bison
- zlib
- gnat
- ];
+ nativeBuildInputs = [ curl stdenv m4 flex bison zlib gnat ];
buildPhase = ''
mkdir -p util/crossgcc/tarballs
- ${lib.concatMapStringsSep "\n" (file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}") (callPackage ./files.nix {})}
+ ${lib.concatMapStringsSep "\n"
+ (file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}")
+ (callPackage ./files.nix { })}
NIX_HARDENING_ENABLE="$\{NIX_HARDENING_ENABLE/ format/\}" make crossgcc-i386 CPUS=$NIX_BUILD_CORES
'';
installPhase = ''
@@ -44,11 +26,13 @@ let
'';
};
- writeConfig = config: let
- filteredConfig = lib.filterAttrs (n: v: v != null) config;
- lines = lib.mapAttrsToList (name: value: "${name}=${value}") filteredConfig;
- configFile = writeText "config" (lib.concatStringsSep "\n" lines);
- in configFile;
+ writeConfig = config:
+ let
+ filteredConfig = lib.filterAttrs (n: v: v != null) config;
+ lines =
+ lib.mapAttrsToList (name: value: "${name}=${value}") filteredConfig;
+ configFile = writeText "config" (lib.concatStringsSep "\n" lines);
+ in configFile;
in stdenv.mkDerivation rec {
@@ -74,7 +58,5 @@ in stdenv.mkDerivation rec {
cp build/coreboot.rom $out
'';
- passthru = {
- inherit toolchain writeConfig corebootConfig;
- };
+ passthru = { inherit toolchain writeConfig corebootConfig; };
}
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 37af2f9e81ce..f997739f2b7a 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -1,15 +1,15 @@
final: prev:
let inherit (final) callPackage;
in {
- coreboot = callPackage ./coreboot {};
+ coreboot = callPackage ./coreboot { };
# primary payloads
- coreboot-payload-grub2 = callPackage ./coreboot-payload-grub2 {};
- coreboot-payload-tianocore = callPackage ./coreboot-payload-tianocore {};
- coreboot-payload-seabios = callPackage ./coreboot-payload-seabios {};
+ coreboot-payload-grub2 = callPackage ./coreboot-payload-grub2 { };
+ coreboot-payload-tianocore = callPackage ./coreboot-payload-tianocore { };
+ coreboot-payload-seabios = callPackage ./coreboot-payload-seabios { };
# secondary payloads
- coreboot-payload-nvramcui = callPackage ./coreboot-payload-nvramcui {};
- coreboot-payload-tint = callPackage ./coreboot-payload-tint {};
- coreboot-payload-coreinfo = callPackage ./coreboot-payload-coreinfo {};
+ coreboot-payload-nvramcui = callPackage ./coreboot-payload-nvramcui { };
+ coreboot-payload-tint = callPackage ./coreboot-payload-tint { };
+ coreboot-payload-coreinfo = callPackage ./coreboot-payload-coreinfo { };
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 03:06:59 +0000