Merge pull request #305530 from NixOS/revert-302719-fw-ectool

Revert "fw-ectool: unstable-2022-12-03 -> 0-unstable-2023-12-15, switch upstream"

authored by Nick Cao and committed by GitHub 68165781 44fa1ee8

+14 -19
+14 -19
pkgs/os-specific/linux/fw-ectool/default.nix
··· 1 1 { stdenv 2 2 , lib 3 - , fetchFromGitLab 4 - , cmake 3 + , fetchFromGitHub 5 4 , pkg-config 6 - , libusb1 7 - , libftdi1 5 + , hostname 8 6 }: 9 7 10 8 stdenv.mkDerivation { 11 9 pname = "fw-ectool"; 12 - version = "0-unstable-2023-12-15"; 10 + version = "unstable-2022-12-03"; 13 11 14 - src = fetchFromGitLab { 15 - domain = "gitlab.howett.net"; 12 + src = fetchFromGitHub { 16 13 owner = "DHowett"; 17 - repo = "ectool"; 18 - rev = "3ebe7b8b713b2ebfe2ce92d48fd8d044276b2879"; 19 - hash = "sha256-s6PrFPAL+XJAENqLw5oJqFmAf11tHOJ8h3F5l3pOlZ4="; 14 + repo = "fw-ectool"; 15 + rev = "54c140399bbc3e6a3dce6c9f842727c4128367be"; 16 + hash = "sha256-2teJFz4zcA+USpbVPXMEIHLdmMLem8ik7YrmrSxr/n0="; 20 17 }; 21 18 22 19 nativeBuildInputs = [ 23 - cmake 24 20 pkg-config 21 + hostname 25 22 ]; 26 23 27 - buildInputs = [ 28 - libusb1 29 - libftdi1 30 - ]; 24 + buildPhase = '' 25 + patchShebangs util 26 + make out=out utils 27 + ''; 31 28 32 29 installPhase = '' 33 - runHook preInstall 34 - install -Dm555 src/ectool "$out/bin/ectool" 35 - runHook postInstall 30 + install -D out/util/ectool $out/bin/ectool 36 31 ''; 37 32 38 33 meta = with lib; { 39 34 description = "EC-Tool adjusted for usage with framework embedded controller"; 40 - homepage = "https://gitlab.howett.net/DHowett/ectool"; 35 + homepage = "https://github.com/DHowett/framework-ec"; 41 36 license = licenses.bsd3; 42 37 maintainers = [ maintainers.mkg20001 ]; 43 38 platforms = platforms.linux;