diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-07-26 23:09:22 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-07-26 23:09:22 +0300 |
commit | 3877501f9da61025f21abf22c40e6a6a81d04afd (patch) | |
tree | 2e53b770fc8d551f4e9c1c4dff1cedcb11cf9cc1 /pkgs | |
parent | f59e6f4037a741d41bee04e9b1ee684aae956d86 (diff) | |
parent | 62dca7c9ab08ee5cc2043d6d374013b8041a3f21 (diff) | |
download | nixlib-3877501f9da61025f21abf22c40e6a6a81d04afd.tar nixlib-3877501f9da61025f21abf22c40e6a6a81d04afd.tar.gz nixlib-3877501f9da61025f21abf22c40e6a6a81d04afd.tar.bz2 nixlib-3877501f9da61025f21abf22c40e6a6a81d04afd.tar.lz nixlib-3877501f9da61025f21abf22c40e6a6a81d04afd.tar.xz nixlib-3877501f9da61025f21abf22c40e6a6a81d04afd.tar.zst nixlib-3877501f9da61025f21abf22c40e6a6a81d04afd.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/eclipse/plugins.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 2 | ||||
-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/top-level/python-packages.nix | 2 |
5 files changed, 36 insertions, 2 deletions
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 8b03d93d1838..84371d152493 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -555,12 +555,12 @@ rec { spotbugs = buildEclipseUpdateSite rec { name = "spotbugs-${version}"; - version = "3.1.5"; + version = "3.1.6"; src = fetchzip { stripRoot = false; url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip"; - sha256 = "0fxdirz6ik9rqykm2lcr720apsaqgngr4c7q793rjb9b3bn30c85"; + sha256 = "1qsams12n64slp00nfc9v943sy9bzffzm7anqqaz2hjw64iia7fh"; }; meta = with stdenv.lib; { diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 2739537c25dc..91f9e7c71e35 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -185,6 +185,8 @@ stdenv.mkDerivation { "mips64" = "btsmip"; "mips64el" = "ltsmip"; }.${targetPlatform.parsed.cpu.name} + else if targetPlatform.isPowerPC then "powerpc" + else if targetPlatform.isSparc then "sparc" else throw "unknown emulation for platform: " + targetPlatform.config; in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80f7a6d43598..c71082f6a4fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17728,6 +17728,8 @@ EOF z3 = (toPythonModule (pkgs.z3.override { inherit python; })).python; + + rfc7464 = callPackage ../development/python-modules/rfc7464 { }; }); in fix' (extends overrides packages) |