Unverified Commit fae82392 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #227971 from rogarb/hexdiff 

hexdiff: init at unstable-2018-01-24
parents 0e98987f f7011145

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -13427,6 +13427,12 @@ 
    githubId = 710906;

    name = "Roel van Dijk";

  };

  rogarb = {

    email = "rogarb@rgarbage.fr";

    github = "rogarb";

    githubId = 69053978;

    name = "rogarb";

  };

  roman = {

    email = "open-source@roman-gonzalez.info";

    github = "roman";

pkgs/tools/misc/hexdiff/default.nix

0 → 100644
+39 −0
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub }:



stdenv.mkDerivation {

  pname = "hexdiff";

  version = "unstable-2018-01-24";



  src = fetchFromGitHub {

    owner = "ahroach";

    repo = "hexdiff";

    rev = "3e96f27e65167c619ede35ab04232163dc273e69";

    sha256 = "sha256-G6Qi7e4o+0ahcslJ8UfJrdoc8NNkY+nl6kyDlkJCo9I=";

  };



  dontConfigure = true;



  buildPhase = ''

    runHook preBuild



    $CC -o hexdiff hexdiff.c



    runHook postBuild

  '';



  installPhase = ''

    runHook preInstall



    install -D hexdiff  -t $out/bin/



    runHook postInstall

  '';



  meta = {

    homepage = "https://github.com/ahroach/hexdiff";

    description = "A terminal application for differencing two binary files, with color-coded output";

    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ rogarb ];

    platforms = lib.platforms.linux;

  };

}

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -1564,6 +1564,8 @@ with pkgs; 














  headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { };



























  hexdiff = callPackage ../tools/misc/hexdiff { };



























  httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { };





























  inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service;