From 7a2084ee7b260c8282874ec45b6712a3c1b94966 Mon Sep 17 00:00:00 2001 From: Adam Saponara Date: Tue, 17 Sep 2019 09:30:27 -0400 Subject: [PATCH 1/2] maintainers: add adsr --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 058561eb624..96cd75b014b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -184,6 +184,12 @@ githubId = 1250775; name = "Adolfo E. GarcĂ­a Castro"; }; + adsr = { + email = "as@php.net"; + github = "adsr"; + githubId = 315003; + name = "Adam Saponara"; + }; aepsil0n = { email = "eduard.bopp@aepsil0n.de"; github = "aepsil0n"; From c7a92135050a1fdec5e7d0bb9bba150360397738 Mon Sep 17 00:00:00 2001 From: Adam Saponara Date: Tue, 17 Sep 2019 09:33:10 -0400 Subject: [PATCH 2/2] mle: init at 1.4.1 --- pkgs/applications/editors/mle/default.nix | 33 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/editors/mle/default.nix diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/applications/editors/mle/default.nix new file mode 100644 index 00000000000..f91d1d8fde6 --- /dev/null +++ b/pkgs/applications/editors/mle/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, termbox, pcre, uthash, lua5_3 }: + +stdenv.mkDerivation rec { + pname = "mle"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "adsr"; + repo = "mle"; + rev = "v${version}"; + sha256 = "15i5lzcp0zar2zh34ky9m6pvvi41zgdrl3hmylpgsqnnj4r87vqc"; + }; + + # Fix location of Lua 5.3 header and library + postPatch = '' + substituteInPlace Makefile --replace "-llua5.3" "-llua"; + substituteInPlace mle.h --replace "