zimbatm
138a42dd11
webfs: fix mime types
...
Unfortunately the shared_mime_info format is not compatible with webfs.
Instead of pulling the whole httpd package I opted for just fetching the
mime.types file from the apache httpd project.
2015-11-28 14:24:21 +00:00
Peter Simons
a9925f20a9
Merge pull request #11295 from mayflower/pkg/dovecot
...
dovecot: 2.2.16 -> 2.2.19
2015-11-27 10:45:51 +01:00
Franz Pletz
ceca397a1a
dovecot: 2.2.16 -> 2.2.19
2015-11-27 03:03:53 +01:00
Tobias Geerinckx-Rice
2798b02ad0
Convert some *Flags from strings to lists
2015-11-26 23:45:31 +01:00
Robert Irelan
fbceebb2c7
subsonic: 5.2.1 -> 5.3
2015-11-25 09:34:55 -08:00
Austin Seipp
882344e480
nixpkgs: plex 0.9.12.13.1464 -> 0.9.12.19.1537
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-11-24 21:07:00 -06:00
Rodney Lorrimar
96f81e3be5
longview: Linode metrics collector
...
Longview is a perl script used for sending server metrics to Linode
virtual private server hosting.
2015-11-22 12:37:00 +00:00
Shea Levy
db995a95ee
Merge remote-tracking branch 'origin/master' into staging
2015-11-21 07:46:55 -05:00
Jude Taylor
852988348d
Merge branch 'staging' of https://github.com/NixOS/nixpkgs into sandbox-profiles
2015-11-20 19:58:46 -08:00
Bob van der Linden
f65ebd022d
darkhttpd: init at 1.11
2015-11-19 14:51:14 +01:00
goibhniu
e9c31d9368
Merge pull request #11034 from zimbatm/webfs-1.21
...
webfs: init at 1.21
2015-11-18 19:19:28 +01:00
William A. Kennington III
baf30718ca
Merge branch 'master.upstream' into staging.upstream
2015-11-18 02:36:33 -08:00
William A. Kennington III
f9f3b47c72
xkbcomp: 1.3.0 -> 1.3.1
2015-11-18 02:36:18 -08:00
William A. Kennington III
4da7935a8e
xinput: 1.6.1 -> 1.6.2
2015-11-18 02:36:18 -08:00
William A. Kennington III
b52f2f6401
xorg-server: 1.18.0 -> 1.17.4
...
There were lots of issues with the proprietary nvidia driver on 352.63
and we don't yet have a proprietary AMD driver.
2015-11-18 02:34:26 -08:00
Pascal Wittmann
c283a3da68
Replace 'with plaforms; platform' with 'platforms.platform'
2015-11-18 11:34:09 +01:00
William A. Kennington III
ee153a619a
xorg: Fix hashes
2015-11-17 21:25:15 -08:00
William A. Kennington III
2e595e32f6
xf86-video-ati: 7.5.0 -> 7.6.1
2015-11-17 21:15:30 -08:00
William A. Kennington III
2792b9228c
xf86-input-synaptics: 1.8.2 -> 1.8.3
2015-11-17 21:15:04 -08:00
William A. Kennington III
7a2283b08e
xf86-input-libinput: 0.14.0 -> 0.15.0
2015-11-17 21:14:46 -08:00
William A. Kennington III
5b3bbd1ac1
xf86-input-evdev: 2.9.2 -> 2.10.0
2015-11-17 21:14:18 -08:00
William A. Kennington III
020f6cfadc
xorg-server: 1.17.2 -> 1.18.0
2015-11-17 21:11:53 -08:00
Pascal Wittmann
7fd2796e99
Replace 'with plaforms; platform' with 'platforms.platform'
2015-11-17 21:30:43 +01:00
Jaka Hudoklin
be067811ff
Merge pull request #11048 from offlinehacker/pkgs/influxdb/update_0.9.4
...
influxdb: 0.8.3 -> 0.9.4, fix module
2015-11-17 17:18:24 +01:00
Jaka Hudoklin
7955be7a82
Merge pull request #11051 from offlinehacker/pkgs/bosun/update_0.5.0
...
bosun: 0.3.0 -> 0.5.0-alpha, udpate module
2015-11-17 17:17:44 +01:00
Jaka Hudoklin
0667fe29c9
Merge pull request #11061 from offlinehacker/nixos/heapster/add
...
heapster module: init
2015-11-17 17:17:01 +01:00
Jaka Hudoklin
69a1b3977b
Merge pull request #11055 from offlinehacker/pkgs/grafana/update_2.5.0
...
grafana: 2.0.0-beta1 -> 2.5.0
2015-11-17 17:14:23 +01:00
aszlig
d81fc427da
xf86-video-intel: 2015-11-13 -> 2015-11-14
...
Fixes quite an annoying and reproducable memory leak when I was using
multiple heads. This is the fix in question:
http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=2d26643cab33a32847afaf13b50d326d09d58bf7
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-11-17 14:46:52 +01:00
Pascal Wittmann
743151e9f3
Merge pull request #11054 from makefu/acng_init
...
apt-cacher-ng: init at 0.8.6
2015-11-16 20:00:01 +01:00
zimbatm
6a0ed9361b
webfs: init at 1.21
2015-11-16 17:29:40 +01:00
Jaka Hudoklin
15c76d17fe
heapster: init at 3057a2c07061c8d9ffaf77e5442ffd7512ac0133
2015-11-16 16:58:09 +01:00
Jaka Hudoklin
abda14309f
grafana: 2.0.0-beta1 -> 2.5.0
2015-11-16 14:59:16 +01:00
makefu
8db9408ac6
apt-cacher-ng: init at 0.8.6
2015-11-16 14:45:21 +01:00
Jaka Hudoklin
c8d1e900d6
bosun: 0.3.0 -> 0.5.0-alpha
2015-11-16 14:23:54 +01:00
Jaka Hudoklin
9c1943fb6f
influxdb: 0.8.3 -> 0.9.4, fix module
2015-11-16 14:22:08 +01:00
Ryan Trinkle
5d4595621d
mariadb: fix missing CoreServices framework dependency on darwin
2015-11-15 14:57:06 -05:00
William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
.
This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
William A. Kennington III
64f31fbc35
xf86-video-intel: 2015-11-10 -> 2015-11-13
2015-11-13 10:37:27 -08:00
Arseniy Seroka
3087ef37bb
Merge pull request #10807 from joachifm/fix-hyperdex-hashes
...
hyperdex: blindly fix hashes of local dependencies
2015-11-13 17:48:08 +03:00
Christoph Hrdinka
a4ea5e4e4b
nsd: 4.13 -> 4.16
2015-11-12 14:51:47 +01:00
Vladimír Čunát
dd71ccef28
gatling: fix meta evaluation
...
/cc maintainer @the-kenny.
2015-11-11 08:31:56 +01:00
William A. Kennington III
bf985091d5
xf86-video-intel: 2015-07-22 -> 2015-11-10
2015-11-10 18:27:46 -08:00
William A. Kennington III
21ddfcaffa
unifi: 4.7.5 -> 4.7.6
2015-11-10 16:44:52 -08:00
Moritz Ulrich
af73b4cc2e
gatling: Init at 0.13.
2015-11-10 23:59:38 +01:00
Peter Simons
adb74ad2f9
Merge pull request #10620 from gebner/postfix-3.0.3
...
postfix: 2.11.5 -> 3.0.3
2015-11-08 18:10:26 +01:00
Arseniy Seroka
848d16ca75
Merge pull request #10883 from k0ral/mpd
...
mpd: 0.19.9 -> 0.19.11
2015-11-08 17:11:14 +03:00
koral
51c0dc06dd
mpd: 0.19.9 -> 0.19.11
2015-11-08 11:59:17 +00:00
William A. Kennington III
a26c8e9b83
Merge branch 'master.upstream' into staging.upstream
2015-11-07 15:51:51 -08:00
aszlig
9846e69ae2
mariadb: 10.0.21 -> 10.0.22
...
Fixes the following security vulnerabilities:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4802
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4807
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4815
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4826
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4830
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4836
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4858
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4861
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4870
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4913
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4792
Release notes can be found here:
https://mariadb.com/kb/en/mariadb/mariadb-10022-release-notes/
Detailled changelog:
https://mariadb.com/kb/en/mariadb/mariadb-10022-changelog/
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-11-06 16:10:23 +01:00
Domen Kožar
0a05adc711
Merge pull request #10056 from pmahoney/s6-rc
...
s6-rc: new derivation
2015-11-06 11:11:56 +01:00
William A. Kennington III
1e7aa4f17d
Merge branch 'master.upstream' into staging.upstream
2015-11-05 18:30:11 -08:00
William A. Kennington III
97d215deba
pulseaudio: 7.0 -> 7.1
2015-11-05 18:21:43 -08:00
William A. Kennington III
4251612faa
Merge branch 'master.upstream' into staging.upstream
2015-11-04 01:00:48 -08:00
Joachim Fasting
2456dd0246
hyperdex: blindly fix hashes of local dependencies
...
This patch blindly fixes the source archive checksums for the local dependencies
of hyperdex. I have not looked into why those hashes changed, but I have
verified that the hyperdex package now builds successfully.
2015-11-03 15:22:50 +01:00
Nikolay Amiantov
9265cc58c3
Merge pull request #10474 from abbradar/nginx-pam-modules
...
nginx: factor out modules into a separate file, add new "pam" module
2015-11-02 01:05:54 +03:00
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Vladimír Čunát
4e1fdadd02
mariadb: fix non-Darwin builds after 86dae701
...
I took care to get the same derivation as before that commit on Linux
and not to change derivation on Darwin.
2015-10-30 09:29:02 +01:00
Jude Taylor
86dae70173
mariadb: fix multiple outputs on darwin
2015-10-29 12:52:30 -07:00
Lluís Batlle i Rossell
61c6597246
Bringing back eo symbols for xkb
...
I port the patch for esperanto symbols removed in
1be2acd131
to the current
xkeyboardconfig.
(cherry picked from commit 4a830de0323e34592a36dea660d9a3ec8348964e)
2015-10-29 13:32:35 +01:00
Jude Taylor
e6bc23a801
Merge pull request #10603 from datakurre/datakurre-rabbitmq
...
darwin: erlangR18 + rabbitmq_server: add needed inputs
2015-10-28 17:23:11 -07:00
Jude Taylor
c749714170
clean up xquartz arguments
2015-10-28 13:56:13 -07:00
Jude Taylor
98395a07e9
mariadb: complete build on darwin
2015-10-28 13:34:53 -07:00
Domen Kožar
4355ef9e41
mailman: use python2.7 package dns
2015-10-28 18:23:17 +01:00
Domen Kožar
27d5fb07a0
pythonPackages{dns, dnspython}: merge
2015-10-28 18:20:43 +01:00
Sander van der Burg
b054207813
axis2: bump to version 1.6.3
2015-10-28 10:24:29 +00:00
Vladimír Čunát
40455f27c3
mariadb: build without snappy on 32-bit
...
... to work around a build problem
https://mariadb.atlassian.net/browse/MDEV-9000
I took care not to cause a rebuild on 64-bit.
2015-10-27 14:34:31 +01:00
Jude Taylor
5469e9c581
fix xquartz build
2015-10-26 18:37:05 -07:00
Jude Taylor
cf12f3e4d2
patch out system include in libAppleWM
2015-10-26 17:13:29 -07:00
Jude Taylor
2e29399993
update packages with new cf-private compatibility
2015-10-26 17:13:29 -07:00
Asko Soukka
3ea269a7e6
darwin: rabbitmq_server: add needed inputs for Darwin
2015-10-26 22:02:57 +02:00
Gabriel Ebner
929e734f19
postfix: 2.11.5 -> 3.0.3
2015-10-26 11:46:17 +01:00
Austin Seipp
0939e6f613
nixpkgs: plex 0.9.12.11.1406 -> 0.9.12.13.1464
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-10-25 06:32:19 -05:00
Aristid Breitkreuz
054a5ee9d9
update postgresql binaries
2015-10-25 02:39:01 +02:00
goibhniu
352a4e4a73
Merge pull request #10576 from simonvandel/tvheadend
...
tvheadend: 4.0.6 -> 4.0.7
2015-10-24 18:01:42 +02:00
Simon Vandel Sillesen
c62f051e5a
tvheadend: 4.0.6 -> 4.0.7
...
Also patches a file that would cause a runtime error otherwise
2015-10-24 17:50:30 +02:00
Jude Taylor
f35f421d60
apache-httpd: add libiconv for darwin
2015-10-23 10:57:43 -07:00
Vladimír Čunát
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02:00
William A. Kennington III
491764afc0
samba: 4.3.0 -> 4.3.1
2015-10-21 21:49:10 -07:00
aszlig
f15420b0fe
thttpd: Fix SHA256 of the upstream tarball.
...
It's a bit unfortunate to see this, but while looking online to download
the old version of the file I found that MacPorts and FreeBSD had the
same issue:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=199562
I've checked the diff as well and found no big functional changes,
except a function rename, copyright updates and changed syslog
priorities:
https://bz-attachments.freebsd.org/attachment.cgi?id=155775
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-21 17:15:18 +02:00
Arseniy Seroka
77803f4cb7
Merge pull request #10505 from simonvandel/tvheadend-4-0-6
...
tvheadend: 4.0.4 -> 4.0.6
2015-10-21 16:18:15 +03:00
Simon Vandel Sillesen
d495ac2957
tvheadend: 4.0.4 -> 4.0.6
...
Added a comment about network download, and cleaned it up a little
2015-10-21 09:01:42 +02:00
Jude Taylor
68087185e3
rethinkdb: build on darwin
2015-10-19 18:40:55 -07:00
Hajo Möller
0baef5b806
asterisk: 13.3.2 -> 13.6.0
2015-10-19 19:05:41 +02:00
Tobias Geerinckx-Rice
e07faf00f0
cassandra 2.1.10 -> 2.1.11
2015-10-19 18:19:00 +02:00
Nikolay Amiantov
d2fc6e6a02
nginxModules.pam: init at 1.4
2015-10-19 16:46:09 +03:00
Nikolay Amiantov
9424238d14
nginx: factor out modules in a separate file
2015-10-19 16:46:02 +03:00
Eelco Dolstra
9a3276b4b3
Merge pull request #10463 from mayflower/update-apache-httpd
...
apacheHttpd: 2.4.16 -> 2.4.17
2015-10-19 11:00:55 +02:00
Vladimír Čunát
2755d2b241
xorg: adjust generator to work with other archive types
...
In the end I didn't utilize it, but it shouldn't hurt.
2015-10-19 10:08:16 +02:00
Vladimír Čunát
b6059b2c6a
xorg: add three missing video drivers - chips, s3virge, xgi
...
Only building was tested.
2015-10-19 10:06:48 +02:00
Vladimír Čunát
ff94673659
xorg.xf86-video-sis: minor update 0.10.7 -> 0.10.8
2015-10-19 09:39:32 +02:00
Vladimír Čunát
801a843bdb
xorg.xorg-server: use the generated expression
...
... to avoid future surprises. Also add libunwind to deps.
I don't know why libxshmfence is no longer detected.
2015-10-19 09:35:07 +02:00
Vladimír Čunát
15f27723b3
xorg.xf86-input-libinput: update 0.12.0 -> 0.14.0
2015-10-19 09:20:13 +02:00
Robert Irelan
678c81b74d
xorg.xf86-video-ast: 0.98.0 -> 1.1.5 ( close #10451 )
...
Fix failure of 0.98.0 to compile with NixOS 15.09 (due to referencing a
symbol `IOADDRESS` that has been removed from X.org drivers).
2015-10-19 09:06:33 +02:00
William A. Kennington III
480b289f5b
mongodb: 3.0.6 -> 3.0.7
...
Use the vendored wiredtiger as the system one is not compatible
2015-10-18 17:23:51 -07:00
Robin Gloster
8521bc097c
apacheHttpd: 2.4.16 -> 2.4.17
2015-10-18 17:42:55 +00:00
William A. Kennington III
e58996cba1
mariadb: Add extra dependencies for 10.1
2015-10-17 14:14:34 -07:00
William A. Kennington III
2cfb8d11cf
mariadb: 10.0.21 -> 10.1.8
...
Also try enabling parallel building again to see if the issue was fixed.
2015-10-17 13:46:08 -07:00
William A. Kennington III
8a44a36ca4
Merge branch 'master.upstream' into staging.upstream
2015-10-15 10:22:28 -07:00
Nikolay Amiantov
8dec927f46
uwsgi: 2.0.11.1 -> 2.0.11.2
2015-10-15 17:07:38 +03:00
goibhniu
d7c0612f4b
Merge pull request #10049 from anderslundstedt/upgradeplex
...
Upgrade plex to 0.9.12.11.1406
2015-10-10 19:49:43 +02:00
Arseniy Seroka
9c61b4fe4d
Merge pull request #10216 from offlinehacker/pkgs/rippled/0.29.0-hf1
...
rippled: 0.28.1 -> 0.30.0-rc1
2015-10-09 20:32:36 +03:00
Andrey Pavlov
d9e1d3f14b
rabbitmq-server: 3.4.3 -> 3.5.6
2015-10-08 12:44:03 +03:00
Tobias Geerinckx-Rice
65bb240357
cassandra 2.1.9 -> 2.1.10
2015-10-08 01:42:46 +02:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539
, reversing
changes made to a27ca029ee
.
Conflicts:
pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Arseniy Seroka
2e3f646d1b
Merge pull request #10225 from aespinosa/update-fleet
...
fleet: 0.9.0 -> 0.11.5
2015-10-05 02:47:57 +03:00
Jaka Hudoklin
a6c4c9df1f
rippled: 0.28.1 -> 0.30.0-rc1
2015-10-04 22:44:13 +02:00
Gabriel Ebner
8fd982ec2b
spamassassin: 3.4.0 -> 3.4.1
2015-10-04 17:26:12 +02:00
Allan Espinosa
7d3b92f6c1
fleet: 0.9.0 -> 0.11.5
2015-10-04 20:20:32 +09:00
Vladimír Čunát
f7d5210677
mysql55: remove lib/*.a, as probably noone needs it
...
/cc #172 .
2015-10-03 11:24:17 +02:00
Peter Simons
3018739223
mini-httpd: update to version 1.5
2015-10-02 22:13:49 +02:00
William A. Kennington III
2ef6508c7f
Merge branch 'master.upstream' into staging.post-15.06
2015-10-02 12:41:09 -07:00
Gabriel Ebner
0dfddc5a54
opensmtpd: support filters.
2015-10-02 13:01:50 +02:00
Gabriel Ebner
db18b6e828
opensmtpd-extras: init at 5.7.1
2015-10-02 13:01:47 +02:00
Gabriel Ebner
c5f2f2d814
opensmtpd: 5.4.5p1 -> 5.7.1p1
2015-10-02 13:01:43 +02:00
William A. Kennington III
98172435f7
Merge branch 'master.upstream' into staging.upstream
2015-10-01 10:43:44 -07:00
Thomas Strobel
e0d5b14ce4
neard: enable support for Secure Elements
2015-10-01 15:30:34 +02:00
Arseniy Seroka
b752952a33
Merge pull request #10132 from matthiasbeyer/update-jetty
...
jetty: 5.1.4 -> 6.1.4
2015-10-01 14:21:38 +03:00
William A. Kennington III
e7bb9e1023
Merge branch 'master.upstream' into staging.upstream
2015-09-30 13:26:04 -07:00
James ‘Twey’ Kay
1b5fdd1bc9
openfire: Fix JVM test
2015-09-30 16:39:09 +01:00
Thomas Strobel
cc29a6e788
neard: add sample applications
2015-09-30 16:10:16 +02:00
Tobias Geerinckx-Rice
c7c677bc7b
p910nd: init at 0.97
2015-09-30 02:29:52 +02:00
William A. Kennington III
271972de0a
Merge branch 'master.upstream' into staging.upstream
2015-09-29 15:54:33 -07:00
Jaka Hudoklin
ea4850ca64
Merge pull request #10023 from offlinehacker/pkgs/modsecurity/add
...
modsecurity: add modsecurity, and create nginx plugin
2015-09-30 00:19:38 +02:00
Thomas Strobel
8d7fba9b65
neard: init at 0.15-post-git-20510929
2015-09-29 17:54:26 +02:00
Matthias Beyer
e547393fac
jetty: 5.1.4 -> 6.1.4
2015-09-29 10:41:26 +02:00
Jude Taylor
4f9ef9bbfb
give xquartz impure deps to make it build
2015-09-28 14:45:45 -07:00
Charles Strahan
25e582c497
meteor: init at 1.2.0.1
...
closes #10064
2015-09-28 10:39:37 -04:00
Matthias Beyer
0f1620c887
taskserver: 1.0.0 -> 1.1.0
2015-09-27 13:13:11 +02:00
lethalman
3e4bbe048a
Merge pull request #10038 from pmahoney/skarnet
...
Skarnet updates
2015-09-25 15:15:53 +02:00
Jaka Hudoklin
5d6500fee8
Merge pull request #10028 from itkovian/elasticsearch-1.7.2
...
elasticsearch: 1.5.2 -> 1.7.2
2015-09-25 11:10:10 +02:00
Jaka Hudoklin
0322596721
Merge pull request #10040 from maxxk/libmemcached-darwin
...
libmemcached on darwin
2015-09-25 11:09:23 +02:00
Anders Lundstedt
00244d0713
upgrade plex to 0.9.12.11.1406
2015-09-25 04:53:21 +02:00
Patrick Mahoney
d4e0b35f18
s6: move to tools/system
...
Matches runit, a similar process supervisor.
2015-09-24 20:18:03 -05:00
Patrick Mahoney
560674ae83
s6 2.1.3.0 -> 2.2.1.0
2015-09-24 20:13:22 -05:00
William A. Kennington III
83ac62eb5d
pulseaudio: 6.0 -> 7.0
2015-09-24 16:33:57 -07:00
William A. Kennington III
0f85ef3982
unifi: 4.6.6 -> 4.7.5
2015-09-24 16:15:31 -07:00
Maxim Krivchikov
7216159cbe
memcached: build on darwin
...
Versions up to 1.4.24 are broken when building with clang:
https://code.google.com/p/memcached/issues/detail?id=409
2015-09-24 23:06:22 +03:00
Andy Georges
cdf13a0a06
elasticsearch: 1.5.2 -> 1.7.2
2015-09-24 00:18:29 +02:00
William A. Kennington III
d3f4ba9d6f
Merge branch 'master.upstream' into staging.upstream
2015-09-23 14:44:21 -07:00
William A. Kennington III
5cfe893cc4
Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
...
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Jaka Hudoklin
46828582ab
nginx: add support for modescurity
2015-09-23 20:35:28 +02:00
Vladimír Čunát
76ef7a93e3
Merge: xlibs and x11 attribute cleanup
...
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Jude Taylor
76a6539829
work on making xquartz buildable in a pure environment
2015-09-22 16:27:51 -07:00
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 dc0fe8ebf40b7724de1ca0b195236854591fdb5f)
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
Vladimír Čunát
862900e42e
mass-replace deprecated usage of find -perm ( Fixes #9044 )
...
sed 's|-perm +0|-perm /0|g'
It's a mass-rebuild due to usage in stdenv's default setup hooks.
2015-07-30 10:30:17 +02:00
William A. Kennington III
58e3c658ce
etcd: Use goPackages version
2015-07-29 18:28:28 -07:00
William A. Kennington III
884e3cd772
vault: Use the gopackage version
2015-07-29 18:17:27 -07:00
William A. Kennington III
3932ba7a54
bind: 9.10.2-P2 -> 9.10.2-P3
2015-07-29 10:36:45 -07:00
William A. Kennington III
aaef42ab8c
Merge branch 'master.upstream' into staging.upstream
2015-07-29 10:23:08 -07:00
John Wiegley
5c896e5511
emacs: Update Mac Port Emacs to 24.5-mac-5.9
2015-07-28 20:08:53 -07:00