public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3007 from wkennington/master.syslinux

Browse Source 
syslinux: Update 4.07 -> 6.02
This commit is contained in:
Michael Raskin 2014-06-30 10:29:28 +04:00
commit 5a8a92c01a
3 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/nasm/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nasm-2.11.01"; name = "nasm-${version}";
version = "2.11.05";
src = fetchurl { src = fetchurl {
url = "http://www.nasm.us/pub/nasm/releasebuilds/2.11.01/${name}.tar.bz2"; url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
sha256 = "0p0rhq18in2hyv3gircgxj72n2b1mvr8bvjlqscpaz8m62cyvam7"; sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa";
}; };
meta = { meta = {

31
pkgs/development/libraries/gnu-efi/default.nix
View File

@ -1,23 +1,15 @@
{ stdenv { stdenv, fetchurl }:
, fetchurl
}:
let version = "3.0u"; in stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gnu-efi_${version}";
name = "gnu-efi-${version}"; version = "3.0v";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz"; url = "mirror://sourceforge/gnu-efi/${name}.orig.tar.gz";
sha256 = "0klkdxh1aqwwfm393q67nxww6liffyp2lfybbnh4q819b06la39w"; sha256 = "1pqgpm999l7zb8gh3s0zd2ax6f0n2l4jip7h0d2y91hhcy6zjxn7";
}; };
meta = { arch = with stdenv.lib; head (splitString "-" stdenv.system);
description = "GNU EFI development toolchain";
homepage = http://sourceforge.net/projects/gnu-efi/;
license = "GPL";
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = ["x86_64-linux" "i686-linux"];
};
makeFlags = [ makeFlags = [
"CC=gcc" "CC=gcc"
@ -34,8 +26,17 @@ let version = "3.0u"; in stdenv.mkDerivation {
''; '';
installPhase = '' installPhase = ''
mkdir -pv $out/include/efi/{protocol,$arch}
make PREFIX="$out" $makeFlags install make PREFIX="$out" $makeFlags install
mkdir -pv $out/share/gnu-efi mkdir -pv $out/share/gnu-efi
install -D -m644 apps/*.efi $out/share/gnu-efi install -D -m644 apps/*.efi $out/share/gnu-efi
''; '';
meta = with stdenv.lib; {
description = "GNU EFI development toolchain";
homepage = http://sourceforge.net/projects/gnu-efi/;
license = licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = platforms.linux;
};
} }

32
pkgs/os-specific/linux/syslinux/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, nasm, perl, libuuid }: { stdenv, fetchurl, nasm, perl, libuuid }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "syslinux-4.07"; name = "syslinux-6.02";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/boot/syslinux/4.xx/${name}.tar.bz2"; url = "mirror://kernel/linux/utils/boot/syslinux/${name}.tar.xz";
sha256 = "0nm0lx45h4c5nxnsr538bvryzvqvj1p1p4vqxzd8nlcv47ja8h0j"; sha256 = "0y2ld2s64s6vc5pf8rj36w71rq2cfax3c1iafp0w1qbjpxy1p8xg";
}; };
patches = [ ./perl-deps.patch ]; patches = [ ./perl-deps.patch ];
@ -14,15 +14,27 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
preBuild = preBuild = ''
'' substituteInPlace Makefile --replace /bin/pwd $(type -P pwd)
substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo) substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo)
substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl)
makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include DATADIR=$out/share MANDIR=$out/share/man PERL=perl) '';
'';
meta = { makeFlags = [
"BINDIR=$(out)/bin"
"SBINDIR=$(out)/sbin"
"LIBDIR=$(out)/lib"
"INCDIR=$(out)/include"
"DATADIR=$(out)/share"
"MANDIR=$(out)/share/man"
"PERL=perl"
"bios"
];
meta = with stdenv.lib; {
homepage = http://www.syslinux.org/; homepage = http://www.syslinux.org/;
description = "A lightweight bootloader"; description = "A lightweight bootloader";
license = licenses.gpl2;
platforms = platforms.linux;
}; };
} }