diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 271f0f66480..ea1cff03fe2 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -212,6 +212,7 @@ fuuzetsu = "Mateusz Kowalczyk "; fuzzy-id = "Thomas Bach "; fxfactorial = "Edgar Aroutiounian "; + gabesoft = "Gabriel Adomnicai "; gal_bolle = "Florent Becker "; garbas = "Rok Garbas "; garrison = "Jim Garrison "; diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix new file mode 100644 index 00000000000..ce8ad76ba82 --- /dev/null +++ b/pkgs/tools/misc/mmake/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "mmake-${version}"; + version = "1.2.0"; + + goPackagePath = "github.com/tj/mmake"; + + src = fetchFromGitHub { + owner = "tj"; + repo = "mmake"; + rev = "v${version}"; + sha256 = "1pyqgk04v0f7a28cwq9c40bd2cgrkrv4wqcijdzpgn4bqhrqab4f"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/tj/mmake; + description = "Mmake is a small program which wraps make to provide additional functionality, such as user-friendly help output, remote includes, and eventually more. It otherwise acts as a pass-through to standard make."; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.gabesoft ]; + }; +} diff --git a/pkgs/tools/misc/mmake/deps.nix b/pkgs/tools/misc/mmake/deps.nix new file mode 100644 index 00000000000..0721ad0af60 --- /dev/null +++ b/pkgs/tools/misc/mmake/deps.nix @@ -0,0 +1,30 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/apex/log"; + fetch = { + type = "git"; + url = "https://github.com/apex/log"; + rev = "0296d6eb16bb28f8a0c55668affcf4876dc269be"; + sha256 = "067px84y73h60bai1yy6xqf2l05gq6zsp64fn58d4fwzk04aa16v"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "c605e284fe17294bda444b34710735b29d1a9d90"; + sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6"; + }; + } + { + goPackagePath = "github.com/segmentio/go-env"; + fetch = { + type = "git"; + url = "https://github.com/segmentio/go-env"; + rev = "ea0600a7760cd15ccca9057be4a87d68e95ee876"; + sha256 = "0rgclbi0na5042cirr52lriwyb5a2rdpqx211zfwyrrvc3zq4lwq"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7926b693aa..d729d57d74a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3277,6 +3277,8 @@ with pkgs; mktorrent = callPackage ../tools/misc/mktorrent { }; + mmake = callPackage ../tools/misc/mmake { }; + modemmanager = callPackage ../tools/networking/modemmanager {}; modsecurity_standalone = callPackage ../tools/security/modsecurity { };