From 6ebd6ad7aa13f60f2279fa9e85ea6c694c429f7a Mon Sep 17 00:00:00 2001 From: Matti Kariluoma Date: Sat, 2 Mar 2019 10:23:21 -0600 Subject: [PATCH 1/2] add matti-kariluoma to maintainers list --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3b9ccb36482..6b08dfb8417 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2865,6 +2865,11 @@ github = "matthiasbeyer"; name = "Matthias Beyer"; }; + matti-kariluoma = { + email = "matti@kariluo.ma"; + github = "matti-kariluoma"; + name = "Matti Kariluoma"; + }; maurer = { email = "matthew.r.maurer+nix@gmail.com"; github = "maurer"; From 7b5318f065076c0b1b29f75c4f421f932a3ddcfa Mon Sep 17 00:00:00 2001 From: Matti Kariluoma Date: Sun, 24 Feb 2019 17:50:11 -0600 Subject: [PATCH 2/2] candle: init at 1.1 --- pkgs/applications/misc/candle/default.nix | 32 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/misc/candle/default.nix diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix new file mode 100644 index 00000000000..35aa681df4b --- /dev/null +++ b/pkgs/applications/misc/candle/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: + +stdenv.mkDerivation rec { + name = "candle-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "Denvi"; + repo = "Candle"; + rev = "v${version}"; + sha256 = "1gpx08gdz8awbsj6lsczwgffp19z3q0r2fvm72a73qd9az29pmm0"; + }; + + nativeBuildInputs = [ qmake ]; + + sourceRoot = "source/src"; + + installPhase = '' + runHook preInstall + install -Dm755 Candle $out/bin/candle + runHook postInstall + ''; + + buildInputs = [ qtbase qtserialport ]; + + meta = with stdenv.lib; { + description = "GRBL controller application with G-Code visualizer written in Qt"; + homepage = https://github.com/Denvi/Candle; + license = licenses.gpl3; + maintainers = with maintainers; [ matti-kariluoma ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 370c498b8a0..275239b24d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1107,6 +1107,8 @@ in boost = pkgs.boost.override { python = python3; }; }; + candle = libsForQt5.callPackage ../applications/misc/candle { }; + capstone = callPackage ../development/libraries/capstone { }; unicorn-emu = callPackage ../development/libraries/unicorn-emu { };