diff options
| author | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-27 14:13:12 +0800 |
|---|---|---|
| committer | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-27 14:13:12 +0800 |
| commit | a33d4ed98489a7ec0f7c39000c57f724147a6545 (patch) | |
| tree | 0bf31428efaf5052f18f591e3d0792343983ac2d /pkgs/development | |
| parent | b2104d93ff319e26a036b1d5afe8d57322c536be (diff) | |
| parent | f8e8ecde51b49132d7f8d5adb971c0e37eddcdc2 (diff) | |
| download | nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.tar nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.tar.gz nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.tar.bz2 nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.tar.lz nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.tar.xz nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.tar.zst nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.zip | |
Merge branch 'master' into cross-compiling-postgresql
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/python-modules/rfc7464/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/tools/rshell/default.nix | 20 |
3 files changed, 50 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/rfc7464/default.nix b/pkgs/development/python-modules/rfc7464/default.nix new file mode 100644 index 000000000000..60a5308d718a --- /dev/null +++ b/pkgs/development/python-modules/rfc7464/default.nix @@ -0,0 +1,19 @@ +{ buildPythonPackage, fetchPypi, lib }: + +buildPythonPackage rec { + pname = "rfc7464"; + version = "17.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hcn6h38qplfcmq392cs58r01k16k202bqyap4br02376pr4ik7a"; + extension = "zip"; + }; + + meta = with lib; { + homepage = https://github.com/moshez/rfc7464; + description = "RFC 7464 is a proposed standard for streaming JSON documents."; + license = [ licenses.mit ]; + maintainers = with maintainers; [ shlevy ]; + }; +} diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 3c355d085760..9d4f5679e26e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -206,6 +206,13 @@ in buildFlags = [ "--with-system-v8=true" ]; }; + libxml-ruby = attrs: { + buildFlags = [ + "--with-xml2-lib=${libxml2.out}/lib" + "--with-xml2-include=${libxml2.dev}/include/libxml2" + ]; + }; + msgpack = attrs: { buildInputs = [ libmsgpack ]; }; @@ -395,4 +402,8 @@ in ''; }; + zookeeper = attrs: { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ]; + }; + } diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix new file mode 100644 index 000000000000..b6ba02633ac0 --- /dev/null +++ b/pkgs/development/tools/rshell/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonApplication, fetchPypi, pyserial, pyudev }: + +buildPythonApplication rec { + pname = "rshell"; + version = "0.0.14"; + + src = fetchPypi { + inherit pname version; + sha256 = "12gh9l13lwnlp330jl3afy3wgfkpjvdxr43flrg9k9kyyhbr191g"; + }; + + propagatedBuildInputs = [ pyserial pyudev ]; + + meta = with lib; { + homepage = https://github.com/dhylands/rshell; + description = "Remote Shell for MicroPython"; + license = licenses.mit; + maintainers = with maintainers; [ c0deaddict ]; + }; +} |