3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

49551 commits

Author SHA1 Message Date
Eelco Dolstra cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Eelco Dolstra c1cf0b7dd5 libc++abi: Don't use fetchsvn
This prevents the Darwin stdenv from depending on Subversion.
2014-09-18 22:38:12 +02:00
Eelco Dolstra 91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Eelco Dolstra f32e964cc4 perl: Fix assertion failure on Darwin
This assertion doesn't make sense to me, because a multi-threaded
build on Darwin works fine, despite not having Glibc.
2014-09-18 22:27:20 +02:00
Peter Simons aa67e95bb5 haskell-here: revert "new expression"
This reverts commit 3e5bcdc327. The
package doesn't compile.
2014-09-18 21:16:44 +02:00
Moritz Ulrich 7f7505c620 dwarf-fortress: Bump to 0.40.13. 2014-09-18 20:41:54 +02:00
William A. Kennington III 194419244d radvd: 2.6 -> 2.7 2014-09-18 11:26:01 -07:00
Eelco Dolstra 0de982d75b httpd: Add option for specifying robots.txt 2014-09-18 19:05:26 +02:00
Eelco Dolstra 837a0c05e5 httpd: Don't emit robots.txt if there are no robots entries 2014-09-18 18:48:28 +02:00
Eelco Dolstra ee082af1e0 Merge pull request #4151 from lostdj/ltp/master/tzdata2014g
tzdata: bump to 2014g
2014-09-18 18:37:37 +02:00
lethalman ef8ac7fec4 Merge pull request #4147 from cstrahan/ruby-interp-fixes
Fix the new Ruby interpreters (fixes #3509).
2014-09-18 18:21:27 +02:00
lostdj 4dce30e510 tzdata: bump to 2014g. 2014-09-18 20:21:26 +04:00
Joachim Schiele 5b17ce8675 Merge pull request #4149 from qknight/dog
dog-1.7: added potential cat replacement
2014-09-18 18:08:55 +02:00
Joachim Schiele 03b411d968 Merge pull request #4150 from qknight/dfc
dfc-3.0.4: a colored df -h replacement
2014-09-18 18:08:38 +02:00
Joachim Schiele 2a3bae70b4 Merge pull request #4063 from qknight/dcfldd
dcfldd: added advanced dd replacement
2014-09-18 18:08:07 +02:00
Joachim Schiele dc86f52740 dfc-3.0.4: a colored df -h replacement 2014-09-18 18:06:49 +02:00
lethalman 1fe2905b26 Merge pull request #4146 from DamienCassou/screenkey
Add screenkey to screencast your keys
2014-09-18 17:51:12 +02:00
Charles Strahan e38d7cbfb2 Fix the new Ruby interpreters (fixes #3509).
Ruby >= 2.1.0 will try to download config.{sub,guess} if not already present.
This provides both files in a pure manner, and also deletes the download script
to prevent any future confusion.
2014-09-18 11:43:16 -04:00
Damien Cassou 092235bde6 Add screenkey to screencast your keys 2014-09-18 17:42:04 +02:00
Joachim Schiele c60bd6e435 dog-1.7: added potential cat replacement 2014-09-18 17:41:36 +02:00
Luca Bruno d9bd04b90c Revert "spiped: 1.3.1 -> 1.4.0"
This reverts commit 792afca113.

Version 1.4.0 failed to build.
2014-09-18 17:07:15 +02:00
Luca Bruno eca58fd02f vimNox: fix after lua upgrade for ZHF 2014-09-18 16:22:37 +02:00
Eelco Dolstra 9b66e1f7b1 Fix the manual jobs 2014-09-18 16:21:26 +02:00
Eelco Dolstra ec4f38c56f Manual: Remove some option defaults that refer to store paths
Option defaults should not refer to store paths, because they cause
the manual to be rebuilt gratuitously. It's especially bad to refer to
a highly variable path like a computed configuration file.
2014-09-18 16:21:26 +02:00
lethalman 72c2898e74 Merge pull request #4142 from wyvie/lua51filesystem
Added lua-filesystem module built with lua-5.1
2014-09-18 15:58:01 +02:00
wyvie e8c2159809 Added lua-filesystem module built with lua-5.1 2014-09-18 17:17:06 +04:00
Domen Kožar 47761617d0 python33Packages.sqlalchemy_imageattach: disable 2014-09-18 14:21:55 +02:00
Domen Kožar cee221bc84 setuptools: 2.1 -> 5.8 2014-09-18 14:03:16 +02:00
Domen Kožar 4742c886dd libtoxcore: disable tests for now 2014-09-18 13:53:40 +02:00
Domen Kožar b851e970da Revert "protobuf: 2.5.0 -> 2.6.0"
This reverts commit 5dff5ede0a.
2014-09-18 13:12:01 +02:00
Michael Raskin a87e5507c0 More specific Ocsigen license checked by FlorentBecker 2014-09-18 14:42:54 +04:00
Luca Bruno 979206c0b1 mysqlWorkbench: fix after lua upgrade for ZHF 2014-09-18 12:37:50 +02:00
Luca Bruno 634e9ab4f8 love: fix after lua upgrade for ZHF 2014-09-18 12:37:50 +02:00
Eelco Dolstra 97a8e959b4 Remove some ISOs 2014-09-18 12:19:09 +02:00
Eelco Dolstra 8e2e4216ba boehm-gc: Support --enable-large-config 2014-09-18 12:19:09 +02:00
Luca Bruno 0ce741f571 eiskaltdcpp: fix after lua upgrade for ZHF 2014-09-18 11:26:26 +02:00
Luca Bruno bca4fa5fc0 asc: fix after lua upgrade for ZHF 2014-09-18 11:26:26 +02:00
Cillian de Róiste 05e2859ab6 gem-nix: change platforms to unix, tested on OS X 2014-09-18 11:18:25 +02:00
Luca Bruno 6e6dc04a6b awesome 3.4: fix after lua upgrade for ZHF 2014-09-18 11:00:26 +02:00
Luca Bruno fc265a85aa Fix evaluation 2014-09-18 10:47:01 +02:00
lethalman 8206870894 Merge pull request #4139 from NixOS/revert-4137-bump/keepnote
Revert "keepnote: add myself as a maintainer"
2014-09-18 10:45:03 +02:00
lethalman 8f8f99bcc8 Revert "keepnote: add myself as a maintainer" 2014-09-18 10:44:01 +02:00
Pascal Wittmann 180b9939d7 Merge pull request #4130 from k0ral/httptunnel
Added httptunnel package.
2014-09-18 10:13:46 +02:00
Pascal Wittmann d6b3d70a3b Merge pull request #4137 from robberer/bump/keepnote
keepnote: add myself as a maintainer
2014-09-18 10:11:11 +02:00
Pascal Wittmann 2157d47185 Merge pull request #4136 from robberer/pkgs/clamav
clamav: add myself as a maintainer
2014-09-18 10:10:46 +02:00
William A. Kennington III b2600df4a8 protobuf-c: 0.15 -> 1.0.2 2014-09-18 00:49:18 -07:00
William A. Kennington III 5dff5ede0a protobuf: 2.5.0 -> 2.6.0 2014-09-18 00:49:18 -07:00
William A. Kennington III e0479f3489 gtest: Update meta 2014-09-18 00:49:17 -07:00
Longrin Wischnewski 23db66e792 keepnote: add myself as a maintainer 2014-09-18 08:24:55 +02:00
Longrin Wischnewski 14b2b31113 clamav: add myself as a maintainer 2014-09-18 08:15:16 +02:00