jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,174 Commits 266 Branches 122 Tags 5.3 GiB
98419b2e54
Commit Graph

2328 Commits

Author SHA1 Message Date
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +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
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