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
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
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