Commit graph

93109 commits

Author SHA1 Message Date
Rob Vermaas a9f054c834
dd-agent: Add default config files of dd-agent and auto_conf dir
to /etc/dd-agent/conf.d by default, and make sure
/etc/dd-agent/conf.d is used.

Before NixOS 17.03, we were using dd-agent 5.5.X which
used configuration from /etc/dd-agent/conf.d

In NixOS 17.03 the default conf.d location is first used relative,
meaning that $out/agent/conf.d was used without NixOS overrides.

This change implements similar functionality as PR #25288, without
breaking backwards compatibility.

(cherry picked from commit 77c85b0ecbc1070d7adff31b339bede92e4193fa)
2017-05-04 09:47:21 +00:00
Chris Hodapp f277137522 gdal: add GeoPDF support via poppler 2017-05-04 09:34:19 +02:00
Vaibhav Sagar d575102556 nginx: remove syslog module
This module has not been required for over 2 years. See https://github.com/yaoweibin/nginx_syslog_patch/issues/15
2017-05-04 09:39:19 +08:00
Daniel Peebles 2e51d27787 Merge pull request #25473 from aneeshusa/update-capnproto-to-0.6.0
capnproto: 0.5.3 -> 0.6.0
2017-05-03 21:20:52 -04:00
Tim Steinbach 2a38ecc055
linux: 4.10.13 -> 4.10.14 2017-05-03 20:46:48 -04:00
Tim Steinbach 6076843be3
linux: 4.9.25 -> 4.9.26 2017-05-03 20:44:09 -04:00
Tim Steinbach af933bc7d3
linux: 4.4.65 -> 4.4.66 2017-05-03 20:41:46 -04:00
Benjamin Staffin 39f571f6c7 Merge pull request #25461 from benley/helm-2.3.1
kubernetes-helm: 2.2.3 -> 2.3.1
2017-05-03 15:12:31 -07:00
Shea Levy 2aae62fad6 Merge branch 'intero-nix-shim' of git://github.com/michalrus/nixpkgs 2017-05-03 17:59:26 -04:00
Michal Rus 9925c5c9b1
intero-nix-shim: init at 0.1.2 2017-05-03 23:36:02 +02:00
Jörg Thalheim f556d94527 Merge pull request #25484 from l2dy/nix-confdir
nix: add confDir argument
2017-05-03 21:52:01 +01:00
Stefan Lau 03c519b2e2 rustRegistry: 2017-04-13 -> 2017-05-03 2017-05-03 21:35:23 +02:00
Domen Kožar c5badb123a Merge pull request #25482 from PierreR/master
hackage2nix: remove postgrest/postgrest-ws from broken packages
2017-05-03 18:37:05 +02:00
Eelco Dolstra 20d846bcdd
nixUnstable.perlBindings: Fix Nix::Config generation
The configure script calls nix-instantiate, which fails if /nix/var
doesn't exist (e.g. in a sandbox). This caused a bogus Nix::Config
module to be generated, causing issues in Hydra.
2017-05-03 17:39:43 +02:00
Nikolay Amiantov 61e5763694 sqlitebrowser: wrap Qt application 2017-05-03 18:00:22 +03:00
Thomas Tuegel 53f896eb41
melpa-packages: 2017-05-03
Adds explicit names for source files fetched from EmacsWiki, correcting an
outstanding bug.
2017-05-03 09:39:38 -05:00
Thomas Tuegel d42aa83347
elpa-packages: 2017-05-03 2017-05-03 09:39:37 -05:00
Peter Simons a9737f610f Merge pull request #25398 from ljli/ghci-sys-libs
haskell: set LD_LIBRARY_PATH in shellHook
2017-05-03 15:50:06 +02:00
Vladimír Čunát 4ea520ce48
ocamlPackages.utop: add missing makeWrapper
... fixing the build.  No testing otherwise.
2017-05-03 15:48:21 +02:00
Leon Isenberg e73e5c884f haskell: set LD_LIBRARY_PATH in shellHook
LD_LIBRARY_PATH is considered by GHCI.
Previously e.g. `cabal repl` failed on packages with
system library dependencies.
2017-05-03 15:18:45 +02:00
Zero King 8bb7328300 nix: add confDir argument 2017-05-03 13:04:52 +00:00
Pierre Radermecker 1124c0ff6b hackage2nix: remove postgrest/postgrest-ws from broken packages 2017-05-03 14:53:14 +02:00
Peter Simons 5e5d16f425 R: import upstream patch to fix broken "R CMD Sweave" command
The command "R CMD Sweave" always exits with error code "1", even if the
command was successful. This upstream patch remedies this issue.
2017-05-03 14:20:41 +02:00
Domen Kožar eacb230a56
hlint: add as statically linked haskell binary 2017-05-03 14:02:56 +02:00
Théo Zimmermann 017a723939 camlp5: fix install with ocaml 4.04
The problem was that bytecode executables were shrinked.

This closes #25367.
2017-05-03 11:57:33 +02:00
Peter Simons 1fdc34b737 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.2-1-gd2334f4 from Hackage revision
b0588eb8a1.
2017-05-03 10:10:45 +02:00
Peter Simons 4b7caa7408 LTS Haskell 8.13 2017-05-03 10:10:36 +02:00
Frederik Rietdijk 664ff4069c pythonPackages.magic-wormhole: fix build
- fixes build
- use buildPythonPackage and pass in individual packages

As mentioned in https://github.com/NixOS/nixpkgs/pull/20722 this
packages is both an application and a library.

If a package is both then we use buildPythonPackage and put it in
python-packages.nix. That way we can guarantee we use the correct
version of dependencies when using it as a library. Unfortunately, it
does mean the name of the package is prefixed with `pythonX.X-`.
2017-05-03 09:52:53 +02:00
Frederik Rietdijk 52b1995250 pythonPackages.os-testr: mark as broken 2017-05-03 09:42:33 +02:00
Cray Elliott cebce78be9 mwprocapture: fix compile on linux 4.11 2017-05-03 00:11:22 -07:00
Frederik Rietdijk a6175a477c pythonPackages.pivy: disable on 3.x 2017-05-03 08:57:06 +02:00
Frederik Rietdijk 82e99edf31 pythonpackages.pywinrm: broken 2017-05-03 08:53:58 +02:00
Frederik Rietdijk 3dfa709706 pythonPackages.line_profiler: fix build 2017-05-03 08:50:48 +02:00
Frederik Rietdijk 8017bc934e Merge pull request #25453 from LnL7/python-stevedore
python-stevedore: 1.7.0 -> 1.21.0
2017-05-03 08:46:32 +02:00
Frederik Rietdijk 97630b21c9 pythonPackages.pydot: fix build 2017-05-03 08:42:24 +02:00
Frederik Rietdijk d317e834c1 pythonPackages.pytestcov: never propagate pytest
Because we have multiple versions of pytest and we do not want to end up
with multiple in one closure.
2017-05-03 08:34:47 +02:00
Frederik Rietdijk 6d1408153c pythonPackages.setuptoolsTrial: do not depend on old pytest 2017-05-03 08:30:08 +02:00
Frederik Rietdijk a7b206bb89 pythonPackages.certifi: move to separate file 2017-05-03 08:19:58 +02:00
Aneesh Agrawal 65d06f33cc capnproto: 0.5.3 -> 0.6.0 2017-05-03 02:14:31 -04:00
Frederik Rietdijk 8d52769ef2 Merge pull request #25459 from LnL7/darwin-gdal
gdal: fix darwin build
2017-05-03 08:13:51 +02:00
Frederik Rietdijk 9e48fc3268 Merge pull request #24131 from nand0p/buildbot-0.9.5
buildbot: 0.9.4 -> 0.9.5
2017-05-03 07:56:29 +02:00
Pascal Wittmann c5a5ac1ef7 Merge pull request #25471 from aneeshusa/update-mosh-to-1.3.0
mosh: 1.2.6 -> 1.3.0
2017-05-03 07:33:44 +02:00
Michael Raskin c42f9a81ef Merge pull request #25466 from aneeshusa/fix-meta-platforms-treewide
treewide: meta.platform -> meta.platforms
2017-05-03 01:44:10 +02:00
Aneesh Agrawal bc4e30a12b mosh: 1.2.6 -> 1.3.0
Release announcement is available at
http://mailman.mit.edu/pipermail/mosh-users/2017-March/000341.html.
2017-05-02 19:39:25 -04:00
Victor Calvert 3d27a84a1c tomb: 2.2 -> 2.4 (#25465) 2017-05-03 00:32:51 +01:00
Aneesh Agrawal ded7953478 treewide: meta.platform -> meta.platforms 2017-05-02 19:32:02 -04:00
Thomas Tuegel 572fd3de58
dropbox: 24.4.17 -> 25.4.28 2017-05-02 16:18:25 -05:00
Benjamin Staffin 07b66093c9
kubernetes-helm: 2.2.3 -> 2.3.1 2017-05-02 14:14:11 -07:00
Daiderd Jordan 516f909acb
gdal: fix darwin build 2017-05-02 22:21:03 +02:00
Michael Raskin beff1984f4 qtinstaller: build submodule-style 2017-05-02 21:47:07 +02:00