diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
commit | 4aad2947f8d680f18e5b01e115cf8cff22186998 (patch) | |
tree | a7a3d020efc6ec7be822bc06e08eca3ac311c9e2 /pkgs/tools/misc | |
parent | 2c5835b09a1d4966756212902d36b1b8ab242da6 (diff) | |
parent | 1d8a3973f46a2d1360f855eaa0f3a19859771793 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/bat/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/cbmem/default.nix | 28 | ||||
-rw-r--r-- | pkgs/tools/misc/coreboot-utils/default.nix | 104 | ||||
-rw-r--r-- | pkgs/tools/misc/ifdtool/default.nix | 28 | ||||
-rw-r--r-- | pkgs/tools/misc/intelmetool/default.nix | 32 | ||||
-rw-r--r-- | pkgs/tools/misc/most/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/nvramtool/default.nix | 34 | ||||
-rw-r--r-- | pkgs/tools/misc/yubikey-manager/default.nix | 4 |
8 files changed, 110 insertions, 128 deletions
diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 267b820df073..449be0f017f6 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -4,17 +4,17 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "07qxghplqq8km4kp9zas2acw302a77y72x3ix1272kb1zxhw4as6"; + sha256 = "1cpa8dal4c27pnbmmrar4vqzcl4h0zf8x1zx1dlf0riavdg9n56y"; fetchSubmodules = true; }; - cargoSha256 = "0j9wxv21a91yfvbbvgn5ms5zi1aipj1k2g42mfdvvw2vsdzqagxz"; + cargoSha256 = "0d7h0kn41w6wm4w63vjy2i7r19jkansfvfjn7vgh2gqh5m60kal2"; nativeBuildInputs = [ pkgconfig llvmPackages.libclang zlib ]; diff --git a/pkgs/tools/misc/cbmem/default.nix b/pkgs/tools/misc/cbmem/default.nix deleted file mode 100644 index d2efea1c03a6..000000000000 --- a/pkgs/tools/misc/cbmem/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "cbmem"; - version = "4.9"; - - src = fetchurl { - url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij"; - }; - - buildPhase = '' - make -C util/cbmem - ''; - - installPhase = '' - install -Dm755 util/cbmem/cbmem $out/bin/cbmem - ''; - - meta = with stdenv.lib; { - description = "Read coreboot timestamps and console logs"; - homepage = "https://www.coreboot.org"; - license = licenses.gpl2; - maintainers = [ maintainers.petabyteboy ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix new file mode 100644 index 000000000000..3f6988f1f657 --- /dev/null +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -0,0 +1,104 @@ +{ stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: + +let + version = "4.10"; + + meta = with stdenv.lib; { + description = "Various coreboot-related tools"; + homepage = "https://www.coreboot.org"; + license = licenses.gpl2; + maintainers = [ maintainers.petabyteboy ]; + platforms = platforms.linux; + }; + + generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation (rec { + inherit pname version meta; + + src = fetchurl { + url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; + sha256 = "1jsiz17afi2lqg1jv6lsl8s05w7vr7iwgg86y2qp369hcz6kcwfa"; + }; + + enableParallelBuilding = true; + + postPatch = '' + cd ${path} + ''; + + makeFlags = [ + "INSTALL=install" + "PREFIX=${placeholder "out"}" + ]; + } // args); + + utils = { + msrtool = generic { + pname = "msrtool"; + meta.description = "Dump chipset-specific MSR registers"; + buildInputs = [ pciutils zlib ]; + preConfigure = "export INSTALL=install"; + }; + cbmem = generic { + pname = "cbmem"; + meta.description = "Coreboot console log reader"; + }; + ifdtool = generic { + pname = "ifdtool"; + meta.description = "Extract and dump Intel Firmware Descriptor information"; + }; + intelmetool = generic { + pname = "intelmetool"; + meta.description = "Dump interesting things about Management Engine"; + buildInputs = [ pciutils zlib ]; + }; + cbfstool = generic { + pname = "cbfstool"; + meta.description = "Management utility for CBFS formatted ROM images"; + }; + nvramtool = generic { + pname = "nvramtool"; + meta.description = "Read and write coreboot parameters and display information from the coreboot table in CMOS/NVRAM"; + }; + superiotool = generic { + pname = "superiotool"; + meta.description = "User-space utility to detect Super I/O of a mainboard and provide detailed information about the register contents of the Super I/O"; + buildInputs = [ pciutils zlib ]; + }; + ectool = generic { + pname = "ectool"; + meta.description = "Dump the RAM of a laptop's Embedded/Environmental Controller (EC)"; + meta.platforms = [ "x86_64-linux" "i686-linux" ]; + preInstall = "mkdir -p $out/sbin"; + }; + inteltool = generic { + pname = "inteltool"; + meta.description = "Provides information about Intel CPU/chipset hardware configuration (register contents, MSRs, etc)"; + buildInputs = [ pciutils zlib ]; + }; + amdfwtool = generic { + pname = "amdfwtool"; + meta.description = "Create AMD firmware combination"; + installPhase = "install -Dm755 amdfwtool $out/bin/amdfwtool"; + }; + acpidump-all = generic { + pname = "acpidump-all"; + path = "util/acpi"; + meta.description = "Walk through all ACPI tables with their addresses"; + nativeBuildInputs = [ makeWrapper ]; + dontBuild = true; + installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all"; + postFixup = let + binPath = [ coreutils acpica-tools iasl gnugrep gnused file ]; + in "wrapProgram $out/bin/acpidump-all --set PATH ${stdenv.lib.makeBinPath binPath}"; + }; + }; + +in utils // { + coreboot-utils = (buildEnv { + name = "coreboot-utils-${version}"; + paths = stdenv.lib.attrValues utils; + postBuild = "rm -rf $out/sbin"; + }) // { + inherit meta version; + }; +} diff --git a/pkgs/tools/misc/ifdtool/default.nix b/pkgs/tools/misc/ifdtool/default.nix deleted file mode 100644 index 7fe4ad86b8eb..000000000000 --- a/pkgs/tools/misc/ifdtool/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "ifdtool"; - version = "4.9"; - - src = fetchurl { - url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij"; - }; - - buildPhase = '' - make -C util/ifdtool - ''; - - installPhase = '' - install -Dm755 util/ifdtool/ifdtool $out/bin/ifdtool - ''; - - meta = with stdenv.lib; { - description = "Extract and dump Intel Firmware Descriptor information"; - 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 deleted file mode 100644 index 87aa7df8d6d7..000000000000 --- a/pkgs/tools/misc/intelmetool/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchgit, zlib, pciutils }: - -stdenv.mkDerivation rec { - pname = "intelmetool"; - version = "4.8.1"; - - src = fetchgit { - url = "https://review.coreboot.org/coreboot.git"; - rev = version; - sha256 = "1gjisy9b7vgzjvy1fwaqhq3589yd59kkylv7apjmg5r2b3dv4zvr"; - fetchSubmodules = false; - }; - - 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; - license = licenses.gpl2; - maintainers = [ maintainers.gnidorah ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 6baaa38f1bb1..7adac5ee2ee6 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; makeFlags = [ - "DOC_DIR=${placeholder ''doc''}/share/doc/most" + "DOC_DIR=${placeholder "doc"}/share/doc/most" ]; preConfigure = '' diff --git a/pkgs/tools/misc/nvramtool/default.nix b/pkgs/tools/misc/nvramtool/default.nix deleted file mode 100644 index ecff547e9513..000000000000 --- a/pkgs/tools/misc/nvramtool/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchgit, iasl, flex, bison }: - -stdenv.mkDerivation rec { - pname = "nvramtool"; - version = "4.8.1"; - - src = fetchgit { - url = "http://review.coreboot.org/p/coreboot"; - rev = "refs/tags/${version}"; - sha256 = "0nrf840jg4fn38zcnz1r10w2yfpvrk1nvsrnbbgdbgkmpjxz0zw9"; - }; - - nativeBuildInputs = [ flex bison ]; - buildInputs = [ iasl ]; - - 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; - license = licenses.gpl2; - maintainers = [ maintainers.cryptix ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 939191b5c8f2..ee5556374742 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "2.1.1"; + version = "3.1.0"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "1jmczk6r6609kzbq4ixispkm4qpvw94wdyfps7q3r96x75si1p1s"; + sha256 = "0nb3qzpggyp61lchvprnklby5mf5n0xpn9z8vlhh99pz1k9sqdq1"; }; propagatedBuildInputs = |