diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index 5aa73528e9d72..22903460130b3 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, iasl, python }: stdenv.mkDerivation rec { - - name = "seabios-${version}"; - version = "1.11.0"; + pname = "seabios"; + version = "1.12.1"; src = fetchurl { - url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz"; - sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2"; + url = "https://review.coreboot.org/cgit/seabios.git/snapshot/seabios-rel-${version}.tar.gz"; + sha256 = "15kdrn0w7wrdrjnjx0g8pw7n00p1ss1r1gcdnq62dvcrzczvpy5m"; }; buildInputs = [ iasl python ]; @@ -37,7 +36,7 @@ stdenv.mkDerivation rec { It can run in an emulator or it can run natively on X86 hardware with the use of coreboot. SeaBIOS is the default BIOS for QEMU and KVM. ''; - homepage = http://www.seabios.org; + homepage = "https://www.seabios.org"; license = licenses.lgpl3; maintainers = [ maintainers.tstrobel ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/tools/misc/cbfstool/default.nix similarity index 79% rename from pkgs/applications/virtualization/cbfstool/default.nix rename to pkgs/tools/misc/cbfstool/default.nix index 13060a50290b8..060591261d552 100644 --- a/pkgs/applications/virtualization/cbfstool/default.nix +++ b/pkgs/tools/misc/cbfstool/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, iasl, flex, bison }: stdenv.mkDerivation rec { - name = "cbfstool-${version}"; - version = "4.9"; + pname = "cbfstool"; + version = "4.10"; src = fetchurl { url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij"; + sha256 = "1jsiz17afi2lqg1jv6lsl8s05w7vr7iwgg86y2qp369hcz6kcwfa"; }; nativeBuildInputs = [ flex bison ]; @@ -15,18 +15,18 @@ stdenv.mkDerivation rec { buildPhase = '' export LEX=${flex}/bin/flex make -C util/cbfstool - ''; + ''; installPhase = '' mkdir -p $out/bin cp util/cbfstool/cbfstool $out/bin cp util/cbfstool/fmaptool $out/bin cp util/cbfstool/rmodtool $out/bin - ''; + ''; meta = with stdenv.lib; { description = "Management utility for CBFS formatted ROM images"; - homepage = https://www.coreboot.org; + homepage = "https://www.coreboot.org"; license = licenses.gpl2; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/cbmem/default.nix b/pkgs/tools/misc/cbmem/default.nix index d2efea1c03a6c..a9d32b14ed8e4 100644 --- a/pkgs/tools/misc/cbmem/default.nix +++ b/pkgs/tools/misc/cbmem/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cbmem"; - version = "4.9"; + version = "4.10"; src = fetchurl { url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij"; + sha256 = "1jsiz17afi2lqg1jv6lsl8s05w7vr7iwgg86y2qp369hcz6kcwfa"; }; buildPhase = '' diff --git a/pkgs/tools/misc/ifdtool/default.nix b/pkgs/tools/misc/ifdtool/default.nix index 7d15825c27e8f..da7bca88dfd8d 100644 --- a/pkgs/tools/misc/ifdtool/default.nix +++ b/pkgs/tools/misc/ifdtool/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ifdtool-${version}"; - version = "4.9"; + pname = "ifdtool"; + version = "4.10"; src = fetchurl { url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij"; + sha256 = "1jsiz17afi2lqg1jv6lsl8s05w7vr7iwgg86y2qp369hcz6kcwfa"; }; buildPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract and dump Intel Firmware Descriptor information"; - homepage = https://www.coreboot.org; + homepage = "https://www.coreboot.org"; license = licenses.gpl2; maintainers = [ maintainers.petabyteboy ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/intelmetool/default.nix b/pkgs/tools/misc/intelmetool/default.nix index 66378e457a26d..2abac2d615908 100644 --- a/pkgs/tools/misc/intelmetool/default.nix +++ b/pkgs/tools/misc/intelmetool/default.nix @@ -1,30 +1,28 @@ -{ stdenv, fetchgit, zlib, pciutils }: +{ stdenv, fetchurl, zlib, pciutils }: stdenv.mkDerivation rec { - name = "intelmetool-${version}"; - version = "4.8.1"; + pname = "intelmetool"; + version = "4.10"; - src = fetchgit { - url = "https://review.coreboot.org/coreboot.git"; - rev = version; - sha256 = "1gjisy9b7vgzjvy1fwaqhq3589yd59kkylv7apjmg5r2b3dv4zvr"; - fetchSubmodules = false; + src = fetchurl { + url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; + sha256 = "1jsiz17afi2lqg1jv6lsl8s05w7vr7iwgg86y2qp369hcz6kcwfa"; }; buildInputs = [ zlib pciutils ]; buildPhase = '' make -C util/intelmetool - ''; + ''; installPhase = '' mkdir -p $out/bin cp util/intelmetool/intelmetool $out/bin - ''; + ''; meta = with stdenv.lib; { description = "Dump interesting things about Management Engine"; - homepage = https://www.coreboot.org/Nvramtool; + homepage = "https://www.coreboot.org"; license = licenses.gpl2; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/nvramtool/default.nix b/pkgs/tools/misc/nvramtool/default.nix index fdce7076661a9..9326d7d96f71a 100644 --- a/pkgs/tools/misc/nvramtool/default.nix +++ b/pkgs/tools/misc/nvramtool/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit, iasl, flex, bison }: +{ stdenv, fetchurl, iasl, flex, bison }: stdenv.mkDerivation rec { - name = "nvramtool-${version}"; - version = "4.8.1"; + pname = "nvramtool"; + version = "4.10"; - src = fetchgit { - url = "http://review.coreboot.org/p/coreboot"; - rev = "refs/tags/${version}"; - sha256 = "0nrf840jg4fn38zcnz1r10w2yfpvrk1nvsrnbbgdbgkmpjxz0zw9"; + src = fetchurl { + url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; + sha256 = "1jsiz17afi2lqg1jv6lsl8s05w7vr7iwgg86y2qp369hcz6kcwfa"; }; nativeBuildInputs = [ flex bison ]; @@ -16,16 +15,16 @@ stdenv.mkDerivation rec { buildPhase = '' export LEX=${flex}/bin/flex make -C util/nvramtool - ''; + ''; installPhase = '' mkdir -p $out/bin cp util/nvramtool/nvramtool $out/bin - ''; + ''; meta = with stdenv.lib; { - description = "utility for reading/writing coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM"; - homepage = https://www.coreboot.org/Nvramtool; + description = "Read/write coreboot parameters and display information from the coreboot table in CMOS/NVRAM"; + homepage = "https://www.coreboot.org/Nvramtool"; license = licenses.gpl2; maintainers = [ maintainers.cryptix ]; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 267cbcc5bca0f..c0f7e2fb6c882 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14949,7 +14949,7 @@ in seabios = callPackage ../applications/virtualization/seabios { }; - cbfstool = callPackage ../applications/virtualization/cbfstool { }; + cbfstool = callPackage ../tools/misc/cbfstool { }; ifdtool = callPackage ../tools/misc/ifdtool { };