diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4cbedd7be031..a58e6aa7539c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -329,6 +329,7 @@ nicknovitski = "Nick Novitski "; nico202 = "Nicolò Balzarotti "; NikolaMandic = "Ratko Mladic "; + nixy = "Andrew R. M. "; notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; nslqqq = "Nikita Mikhailov "; diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix new file mode 100644 index 000000000000..ee6ac6d39e53 --- /dev/null +++ b/pkgs/development/interpreters/hy/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "hy-${version}"; + version = "0.11.1"; + + src = fetchurl { + url = "mirror://pypi/h/hy/${name}.tar.gz"; + sha256 = "1msqv747iz12r73mz4qvsmlwkddwjvrahlrk7ysrcz07h7dsscxs"; + }; + + buildInputs = [ pythonPackages.appdirs ]; + propagatedBuildInputs = [ pythonPackages.clint pythonPackages.astor pythonPackages.rply ]; + + meta = { + description = "A LISP dialect embedded in Python"; + homepage = http://hylang.org/; + license = stdenv.lib.licenses.mit; + maintainers = stdenv.lib.maintainers.nixy; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c247b5dddf6..73a249e169c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17923,4 +17923,6 @@ in fpm2 = callPackage ../tools/security/fpm2 { }; simplenote = callPackage ../applications/misc/simplenote { }; + + hy = callPackage ../development/interpreters/hy {}; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a0141729e30f..e5840effca3d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1064,6 +1064,23 @@ in { }; }; + astor = buildPythonPackage rec { + name = "astor-${version}"; + version = "0.5"; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/astor/${name}.tar.gz"; + sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa"; + }; + + meta = with pkgs.stdenv.lib; { + descriptions = "Library for reading, writing and rewriting python AST"; + homepage = https://github.com/berkerpeksag/astor; + license = licenses.bsd3; + maintainers = with maintainers; [ nixy ]; + }; + }; + asyncio = if (pythonAtLeast "3.3") then buildPythonPackage rec { name = "asyncio-${version}"; version = "3.4.3"; @@ -22797,6 +22814,25 @@ in { }); + rply = buildPythonPackage rec { + name = "rply-${version}"; + version = "0.7.4"; + + src = pkgs.fetchurl { + url = "mirror://pypi/r/rply/${name}.tar.gz"; + sha256 = "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj"; + }; + + buildInputs = with self; [ appdirs ]; + + meta = with pkgs.stdenv.lib; { + descriptions = "A python Lex/Yacc that works with RPython"; + homepage = https://github.com/alex/rply; + license = licenses.bsd3; + maintainers = with maintainers; [ nixy ]; + }; + }; + rpm = (pkgs.rpm.override{inherit python;}); rpy2 = buildPythonPackage rec {