Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fe1f77ad2bca
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fbd0f1d3e5a8
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 5, 2020

  1. uefitool: init at A56 and 0.27.0 

    default to new-engine
    @ajs124
    ajs124 committed Jan 5, 2020
    Copy the full SHA
    65a2c70 View commit details

Commits on Jan 6, 2020

  1. Merge pull request #57034 from ajs124/uefitool 

    uefitool: init at A55 and 0.27.0
    @ryantm
    ryantm authored Jan 6, 2020
    Copy the full SHA
    fbd0f1d View commit details
Showing with 57 additions and 0 deletions.
  1. +39 −0 pkgs/tools/system/uefitool/common.nix
  2. +15 −0 pkgs/tools/system/uefitool/variants.nix
  3. +3 −0 pkgs/top-level/all-packages.nix
39 changes: 39 additions & 0 deletions pkgs/tools/system/uefitool/common.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{ version, sha256, installFiles }:
{ lib, mkDerivation, fetchFromGitHub, qtbase, qmake, cmake, zip }:

mkDerivation rec {
passthru = {
inherit version;
inherit sha256;
inherit installFiles;
};
pname = "uefitool";
inherit version;

src = fetchFromGitHub {
inherit sha256;
owner = "LongSoft";
repo = pname;
rev = version;
};

buildInputs = [ qtbase ];
nativeBuildInputs = [ qmake cmake zip ];

configurePhase = ":";
buildPhase = "bash unixbuild.sh";

installPhase = ''
mkdir -p "$out"/bin
cp ${lib.concatStringsSep " " installFiles} "$out"/bin
'';

meta = with lib; {
description = "UEFI firmware image viewer and editor";
homepage = "https://github.com/LongSoft/uefitool";
license = licenses.bsd2;
maintainers = with maintainers; [ ajs124 ];
# uefitool supposedly works on other platforms, but their build script only works on linux in nixpkgs
platforms = platforms.linux;
};
}
15 changes: 15 additions & 0 deletions pkgs/tools/system/uefitool/variants.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{ libsForQt5 }:
let
common = opts: libsForQt5.callPackage (import ./common.nix opts) {};
in rec {
new-engine = common rec {
version = "A56";
sha256 = "0sxmjkrwcchxg2qmcjsw2vr42s7cdcg2fxkwb8axq2r2z23465gp";
installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ];
};
old-engine = common rec {
version = "0.27.0";
sha256 = "1i1p823qld927p4f1wcphqcnivb9mq7fi5xmzibxc3g9zzgnyc2h";
installFiles = [ "UEFITool" "UEFIReplace/UEFIReplace" "UEFIPatch/UEFIPatch" ];
};
}
3 changes: 3 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -21704,6 +21704,9 @@ in

udocker = pythonPackages.callPackage ../tools/virtualization/udocker { };

uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {});
uefitool = uefitoolPackages.new-engine;

unigine-valley = callPackage ../applications/graphics/unigine-valley { };

inherit (ocaml-ng.ocamlPackages_4_05) unison;