diff options
author | Pascal Bach <pasci.bach@gmail.com> | 2016-09-25 04:35:46 +0200 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2016-09-25 04:35:46 +0200 |
commit | 888551887b5b04c0655d102b8d05515d354b8a3d (patch) | |
tree | f9615ce4d6826ec672ef026bd1d65b346c3ab6e6 /pkgs/tools/misc | |
parent | b49d147a05edec74af6e3c4e1e23f36bf65fe66b (diff) | |
download | nixlib-888551887b5b04c0655d102b8d05515d354b8a3d.tar nixlib-888551887b5b04c0655d102b8d05515d354b8a3d.tar.gz nixlib-888551887b5b04c0655d102b8d05515d354b8a3d.tar.bz2 nixlib-888551887b5b04c0655d102b8d05515d354b8a3d.tar.lz nixlib-888551887b5b04c0655d102b8d05515d354b8a3d.tar.xz nixlib-888551887b5b04c0655d102b8d05515d354b8a3d.tar.zst nixlib-888551887b5b04c0655d102b8d05515d354b8a3d.zip |
ipxe: 20141124 -> 20160831 (#18938)
HTTPS support is enabled
Diffstat (limited to 'pkgs/tools/misc')
-rwxr-xr-x[-rw-r--r--] | pkgs/tools/misc/ipxe/default.nix | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 6ee14a0ce937..1efac3b78441 100644..100755 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchgit, perl, cdrkit, syslinux }: +{ stdenv, fetchgit, perl, cdrkit, syslinux, xz, openssl }: let - date = "20141124"; - rev = "5cbdc41778622c07429e00f5aee383b575532bf0"; + date = "20160831"; + rev = "827dd1bfee67daa683935ce65316f7e0f057fe1c"; in stdenv.mkDerivation { name = "ipxe-${date}-${builtins.substring 0 7 rev}"; - buildInputs = [ perl cdrkit syslinux ]; + buildInputs = [ perl cdrkit syslinux xz openssl ]; src = fetchgit { url = git://git.ipxe.org/ipxe.git; - sha256 = "0wiy3kag6x8a2a71pc9za9izmac8gdz90vaqp2mwgih6p2lz01zq"; + sha256 = "11w8b0vln3skfn8r1cvzngslz12njdkwmnacyq3qffb96k2dn2ww"; inherit rev; }; - preConfigure = "cd src"; - # not possible due to assembler code hardeningDisable = [ "pic" "stackprotector" ]; @@ -28,11 +26,17 @@ stdenv.mkDerivation { "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin" ]; - installPhase = - '' - mkdir $out - cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn bin/undionly.kpxe $out - ''; + + configurePhase = '' + echo "#define DOWNLOAD_PROTO_HTTPS" >> src/config/general.h + ''; + + preBuild = "cd src"; + + installPhase = '' + mkdir -p $out + cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn bin/undionly.kpxe $out + ''; meta = with stdenv.lib; { description = "Network boot firmware"; |