1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 01:51:24 +00:00
Commit graph

2328 commits

Author SHA1 Message Date
Hoang Xuan Phu 4ac4f2dcd9 nginx: add an option to build the stream module 2015-09-22 13:09:11 +08:00
Hoang Xuan Phu 942d2798c5 nginx: bump lua module to fix build error
(https://github.com/openresty/lua-nginx-module/pull/500)
2015-09-22 13:08:42 +08:00
William A. Kennington III 6e09223627 Merge branch 'master.upstream' into staging.upstream 2015-09-18 17:16:27 -07:00
William A. Kennington III 58a45a4459 samba: 4.2.3 -> 4.3.0 2015-09-18 14:52:51 -07:00
William A. Kennington III 37bba4ec2c mongodb: 3.0.5 -> 3.0.6 2015-09-18 14:52:51 -07:00
Jude Taylor d78936131a preparation for being able to build xquartz 2015-09-17 16:11:18 -07:00
William A. Kennington III ecd90e61cc bind: 9.10.2-P4 -> 9.10.3 2015-09-17 14:12:38 -07:00
Bjørn Forsman 0b9d83737c lighttpd: 1.4.35 -> 1.4.37 2015-09-16 07:46:34 +02:00
Austin Seipp bab211893b nixpkgs: rethinkdb 2.0.4 -> 2.1.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-09-15 18:42:12 -05:00
William A. Kennington III 773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát 0c74f18e4c xlibs.xlibs: remove
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
2015-09-15 11:59:33 +02:00
Domen Kožar eb29d8e44b Merge pull request #9869 from Mathnerd314/import-fix
all-packages: Use callPackage where possible
2015-09-15 06:53:50 +02:00
Mathnerd314 eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Domen Kožar b487fb65e3 Merge pull request #9860 from ktosiek/openafs-linux-4.2
openafs: patches for linux 4.2
2015-09-15 06:14:03 +02:00
Tomasz Kontusz afff88e599 openafs: patches for linux 4.2 2015-09-14 21:28:20 +02:00
Pascal Wittmann 483479ffba Merge pull request #9362 from 4z3/bump-exim
exim: 4.85 -> 4.86
2015-09-14 16:51:23 +02:00
Benjamin Saunders a6f6c0eeeb libxcb: add xinput support (close #9835) 2015-09-13 10:51:21 +02:00
Vladimír Čunát 8ab4c20998 xorg.{libXi,libxcb}: maintenance update 2015-09-13 10:51:21 +02:00
Arseniy Seroka bd37676269 Merge pull request #9154 from tomberek/shellinabox_update_repo
shellinabox: 2.14 -> 2.16
2015-09-09 13:49:11 +03:00
Thomas Bereknyei e7a0b8c941 shellinabox: 2.14 -> 2.16 2015-09-08 17:05:46 -04:00
Thomas Strobel 119a6e33ed dnschain: init at 0.5.3 2015-09-07 19:14:23 +02:00
Vladimír Čunát 8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
William A. Kennington III 4b02b32255 influxdb-backup: Move to go-packages 2015-09-05 00:06:05 -07:00
William A. Kennington III fe8a27cd64 mesos-dns: Move to go-packages 2015-09-04 23:57:00 -07:00
William A. Kennington III 68be570a0a skydns: Move to go-packages 2015-09-04 21:26:35 -07:00
William A. Kennington III 8fe216dd3e bosun: Move to go-packages 2015-09-04 21:11:42 -07:00
William A. Kennington III c6f689f951 Merge branch 'master.upstream' into staging.upstream 2015-09-04 12:05:11 -07:00
William A. Kennington III b68e45dfa7 mini-httpd: Boost 1.59 compat 2015-09-04 11:21:37 -07:00
Domen Kožar 66214fba8d Xorg: apply patch to fix X crashes
(cherry picked from commit dc0fe8ebf4)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-04 18:47:40 +02:00
William A. Kennington III 21370fb150 bind: 9.10.2-P3 -> 9.10.2-P4 2015-09-02 21:49:43 -07:00
William A. Kennington III cb8a2e9503 nsq: Move to go-packages and 0.2.28 -> 0.3.5 2015-09-02 18:15:01 -07:00
William A. Kennington III 5f35b0f7da serfdom: Migrate to go-packages 2015-09-02 17:51:03 -07:00
Tobias Geerinckx-Rice 5385a0a82a cassandra: use mirrors
Upstream likes to move "old" releases to an archive mirror as soon as a
new one is released. This is now handled for free by mirrors.nix.

(No idea why cs.utah.edu was used to begin with; it's now added to
mirrors.nix. Note that it doesn't support SSL, but that applies to
several others so I don't see the harm.)
2015-09-02 20:04:11 +02:00
Tobias Geerinckx-Rice 6c377c864a cassandra: 2.1.8 -> 2.1.9
The 2.1.8 sources have been removed upstream.
2015-09-02 16:01:09 +02:00
Eelco Dolstra 9013dc5826 inotifyTools -> inotify-tools
Fixes #9456.
2015-09-01 10:52:47 +02:00
Austin Seipp 4068869d62 nixpkgs: openresty 1.7.10.1 -> 1.9.3.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-31 03:18:13 -05:00
Austin Seipp 860d720940 nixpkgs: nginxUnstable 1.9.3 -> 1.9.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-31 03:17:17 -05:00
Domen Kožar 556eb9b30b Merge pull request #9546 from dfoxfranke/openafs-client
openafs-client: 1.6.9 -> 1.6.14, fix build
2015-08-31 00:18:27 +02:00
Benjamin Staffin 395c268ab7 prometheus-statsd-bridge: fold into go-packages.nix 2015-08-30 00:26:10 -07:00
Benjamin Staffin d17a29a150 prometheus-pushgateway: fold into go-packages.nix 2015-08-30 00:22:09 -07:00
Benjamin Staffin 4c95e49593 prometheus-node-exporter: fold into go-packages.nix 2015-08-30 00:16:00 -07:00
Benjamin Staffin 6122488297 prometheus-nginx-exporter: fold into go-packages.nix 2015-08-30 00:12:09 -07:00
Benjamin Staffin 4f53847ca2 prometheus-mysqld-exporter: fold into go-packages.nix 2015-08-29 23:51:19 -07:00
Benjamin Staffin 52dd6ea9d9 prometheus-mesos-exporter: fold into go-packages.nix 2015-08-29 23:47:13 -07:00
Benjamin Staffin 9001ad4106 prometheus-haproxy-exporter: fold into go-packages.nix 2015-08-29 23:37:48 -07:00
Benjamin Staffin c5b6f17e1c prometheus-collectd-exporter: fold into go-packages.nix 2015-08-29 23:30:27 -07:00
Benjamin Staffin fe5a2b0a39 prom2json: fold into go-packages.nix 2015-08-29 23:19:48 -07:00
Benjamin Staffin 853602fae5 prometheus-cli: fold into go-packages.nix 2015-08-29 23:17:13 -07:00
Benjamin Staffin 87655d9fe8 prometheus-alertmanager: fold into go-packages.nix 2015-08-29 22:55:22 -07:00
Benjamin Staffin d74e65bd6f prometheus: fold definition into go-packages.nix 2015-08-29 22:46:57 -07:00
Benjamin Staffin ff03cf23c6 prometheus-*: trivial cleanup 2015-08-29 22:30:26 -07:00
Benjamin Staffin e734ce05b8 prometheus-pushgateway: move go-bindata into nativeBuildInputs
Thereotically make life easier for a future cross-compilation path.
2015-08-29 22:13:51 -07:00
Benjamin Staffin 94407ad644 prometheus-alertmanager: streamline build, prune buildInputs
It turns out it's no longer necessary to run the protoc and
static-asset compile steps ourselves, as those are included in the
upstream repo now.
2015-08-29 22:13:51 -07:00
Benjamin Staffin a480bd89dc prometheus-*: fixes to deal with goPackages multiple-outputs changes 2015-08-29 22:13:51 -07:00
Benjamin Staffin 96882b14d5 prometheus: Include console templates and libraries
Also tweaked to work with the recent goPackages multiple-outputs stuff.
2015-08-29 22:13:51 -07:00
Daniel Fox Franke dbf8feb815 openafs-client: 1.6.9 -> 1.6.14, fix build
* Upgrade 1.6.9 -> 1.6.14
* Support all kernels
* Clean up nested smart-quotes that seemed to be causing a build failure
* Remove redundant `assert isLinux`: already checked by meta.platforms
2015-08-29 23:34:56 -04:00
Jaka Hudoklin bb708a5dad Merge pull request #9531 from offlinehacker/pkgs/skydns/update_2.5.2b
skydns: 2.5.0a -> 2.5.2b
2015-08-29 18:34:04 +02:00
Jaka Hudoklin e2f673e024 skydns: 2.5.0a -> 2.5.2b 2015-08-29 18:28:50 +02:00
Domen Kožar 806b679b6d Merge pull request #9515 from benley/prometheus-0.15.1
Prometheus: update to 0.15.1
2015-08-29 14:04:43 +02:00
Benjamin Staffin 86eca38b0c prometheus: 0.14.0 -> 0.15.1 2015-08-29 00:19:22 -07:00
Tuomas Tynkkynen 6b866a37fc xrdb: Use mcpp as the preprocessor
Close #9501, fixes #9480.

By default, xrdb uses GCC as the preprocessor at runtime for X resource files.
However, gcc is a large dependency, so replace it with mcpp, a much smaller
preprocessor (currently under a megabyte on i686).

Arch Linux already does this as well, so this should be relatively safe:
https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/xorg-xrdb
2015-08-29 08:29:59 +02:00
Luca Bruno 591d43ec91 freeswitch: use gcc 4.8 to fix build (ZHF) 2015-08-27 11:54:38 +02:00
lethalman a45a0911d4 Merge pull request #9376 from rick68/softether
softether: support SoftEther VPN 4.18
2015-08-26 10:45:46 +02:00
Wei-Ming Yang efd34824eb softether: support SoftEther VPN 4.18 2015-08-21 13:59:00 +08:00
William A. Kennington III 2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
tv 84295986e7 exim: 4.85 -> 4.86 2015-08-20 09:42:11 +02:00
Jaka Hudoklin 2bec93dde8 elasticsearch: add search_guard plugin 2015-08-20 00:20:44 +02:00
Jaka Hudoklin 1d1a336c6a elasticsearch: update plugins 2015-08-20 00:20:31 +02:00
Jaka Hudoklin 8aa50beb1f elasticsearch 1.4.5 -> 1.5.2 2015-08-20 00:18:46 +02:00
William A. Kennington III 2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
Max Zerzouri 807a0e4609 xorg-server: fix XKB_BINDIR usage (close #8993)
Previously, XKB_BINDIR was read inside a loop over the program
arguments, so was only read if it had arguments that weren't matched by
the first some number of checks.
2015-08-18 10:14:11 +02:00
Bjørn Forsman 5079b4f27b cassandra: 2.1.7 -> 2.1.8
Version 2.1.7 is not available anymore from current mirror. This is a
stable update.
2015-08-16 19:30:05 +02:00
Pascal Wittmann a1d4e7ff70 u9fs: move from googlecode to bitbucket 2015-08-15 21:04:32 +02:00
William A. Kennington III 952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
ts468 6ae2e2b0f9 Merge pull request #9200 from ts468/upstream.openpts
openpts: init at 0.2.6
2015-08-11 14:10:59 +02:00
Rickard Nilsson 3afc387b4a scollector: Update from 20150506172827 to 0.3.0 2015-08-11 13:46:17 +02:00
Rickard Nilsson 9f7cfea070 bosun: Update from 0.2.0 to 0.3.0 2015-08-11 13:46:17 +02:00
Thomas Strobel 3607cf316e openpts: init at 0.2.6 2015-08-11 13:38:58 +02:00
Eelco Dolstra a6f466065c mysql: Update to 5.4.45 2015-08-11 11:46:31 +02:00
Bjørn Forsman 9c20b9c779 openxpki: fix license attribute (unbreak nixpkgs tarball job) 2015-08-10 23:11:15 +02:00
Thomas Strobel 4da188cf54 openxpki: init at git 2015/08/07 2015-08-10 22:05:20 +02:00
Alexander V. Nikolaev 2c2a4cd099 Revert "vault: init at v0.1.2"
This reverts commit 41bbb904eb.
2015-08-10 14:18:15 +03:00
William A. Kennington III 6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00
Michael Raskin 1caa629b33 Apache Jena: 2.13.0 -> 3.0.0 2015-08-08 21:01:31 +03:00
William A. Kennington III 5b6db8f1df mongodb: 3.0.4 -> 3.0.5 2015-08-07 14:23:09 -07:00
William A. Kennington III 6aa5502129 mariadb: 10.0.20 -> 10.0.21 2015-08-07 14:19:15 -07:00
William A. Kennington III 4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Luca Bruno 629ac021b7 Revert "rethinkdb: Force dynamic linking and allow dependency substitution"
This reverts commit 5960a652f1.

Build is broken since the beginning at configure phase @wkennington ,
I wonder how you were able to build this.

See http://hydra.nixos.org/build/24167778/nixlog/1/raw
2015-08-06 16:25:51 +02:00
Pascal Wittmann 7f2200117d serfdom: fix build by updating from 0.6.3 to 0.6.4
and using an old version of memberlist
2015-08-06 15:59:51 +02:00
Luca Bruno 855db4dbbc pulseaudio: fix .la file 2015-08-06 12:40:09 +02:00
William A. Kennington III 0ecc61b4d7 Merge branch 'master.upstream' into staging.upstream 2015-08-05 16:24:57 -07:00
Charles Strahan f178817aee xquartz: 1.14.6 -> 1.17.2
closes #9126
2015-08-05 13:57:02 -05:00
Cillian de Róiste f63fd63eb1 yaws: update from 1.99 to 2.0 2015-08-05 10:29:47 +02:00
William A. Kennington III 926f073f55 Merge branch 'master.upstream' into staging.upstream 2015-08-04 15:32:43 -07:00
Charles Strahan 878e69c67c riak2: use sensible default paths
Make exporting the RIAK_{ETC,LOG,DATA}_DIR variables optional;
if they're not in the environment, we use the same default values as
NixOS.
2015-08-03 21:48:29 -04:00
William A. Kennington III 09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
Eelco Dolstra 55932c1bec Don't statically depend on cacert for certificates
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
2015-07-31 01:34:58 +02:00
John Wiegley 23562aad59 Revert "emacs: Update Mac Port Emacs to 24.5-mac-5.9"
This reverts commit 5c896e5511, which was
a set of local changes unrelated to the commit title.
2015-07-30 16:21:39 -07:00
William A. Kennington III 7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00