mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity
18560 commits 218 branches 122 tags 7.1 GiB
Commit graph

2243 commits

Author SHA1 Message Date
Eelco Dolstra 17fe5f329a * man: Prefer /etc/man.conf over $out/lib/man.conf. Man only reads 
the first file that exists, so this is necessary to allow the
  builtin config to be overriden.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32812
 2012-03-06 10:14:00 +00:00
Eelco Dolstra b57e0d8829 * man: Work around a bug in substituteInPlace. It loses the final 
newline, and man requires every line in man.conf to be terminated by
  a newline.  We should fix the bug eventually though.
* man updated to 1.6g.  

svn path=/nixpkgs/branches/stdenv-updates/; revision=32811
 2012-03-06 10:10:56 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Eelco Dolstra 962b01f686 * Remove unnecessary copy on sed. 
svn path=/nixpkgs/trunk/; revision=32773
 2012-03-04 15:52:41 +00:00
Eelco Dolstra 27809f0ec4 * No longer needed. 
svn path=/nixpkgs/trunk/; revision=32772
 2012-03-04 15:50:03 +00:00
Yury G. Kudryashov d4ffc7332c Merge trunk right before reintegrating 
svn path=/nixpkgs/branches/libpng15/; revision=32758
 2012-03-04 09:09:21 +00:00
Lluís Batlle i Rossell 53e80e5316 Adding a manpage for tar, using help2man 
svn path=/nixpkgs/trunk/; revision=32749
 2012-03-03 09:52:55 +00:00
Eelco Dolstra 11d1104a88 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
 2012-03-01 22:22:24 +00:00
Lluís Batlle i Rossell f20a947a5d Updating lzop 
svn path=/nixpkgs/trunk/; revision=32730
 2012-03-01 22:03:34 +00:00
Eelco Dolstra 6a5ea980ab * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=32724
 2012-03-01 20:18:33 +00:00
Yury G. Kudryashov 84fb9ca331 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32719
 2012-03-01 15:05:27 +00:00
Eelco Dolstra a75ccf7dca * Don't set the nscd restart action here. 
svn path=/nixpkgs/trunk/; revision=32717
 2012-03-01 14:45:27 +00:00
Yury G. Kudryashov 0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Peter Simons 57b612cb05 vpnc: added patch to fix the 'Error: either "to" is duplicate, or "ipid" is a garbage' bug 
Further details are at:

  http://www.rz.uni-konstanz.de/activekb/questions/250/VPNC+unter+Ubuntu+11.10+%22Error%3A+either+%22to%22+is+duplicate%2C+or+%22ipid%22+is+a+garbage.%22

svn path=/nixpkgs/trunk/; revision=32712
 2012-02-29 22:50:33 +00:00
Evgeny Egorochkin 6e5a378f48 Vidalia: version bump 
svn path=/nixpkgs/trunk/; revision=32696
 2012-02-29 13:30:14 +00:00
Evgeny Egorochkin bf667c9389 Vidalia: packaged 
svn path=/nixpkgs/trunk/; revision=32694
 2012-02-29 13:30:06 +00:00
Evgeny Egorochkin 0def4140f6 network-manager-applet: version bump 
svn path=/nixpkgs/trunk/; revision=32693
 2012-02-29 13:30:04 +00:00
Evgeny Egorochkin b01a720d65 TOR: version bump 
svn path=/nixpkgs/trunk/; revision=32692
 2012-02-29 13:30:01 +00:00
Evgeny Egorochkin cff68ececb network-manager: version bump 
svn path=/nixpkgs/trunk/; revision=32691
 2012-02-29 13:29:59 +00:00
Peter Simons 9a5c6611d0 moderncv: updated sha hash 
svn path=/nixpkgs/trunk/; revision=32681
 2012-02-28 17:34:39 +00:00
Peter Simons 8bcba9e6d4 moderncv: upgraded to 0.19 
svn path=/nixpkgs/trunk/; revision=32664
 2012-02-28 00:09:52 +00:00
Florian Friesdorf 360ec296a6 Revert "adapted xpf to new libxml2Python" 
This reverts commit b1f634f3d384a39e015d69e348cf220855457049.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32649
 2012-02-28 00:07:08 +00:00
Florian Friesdorf ee15dc2327 Revert "fix bittorrent by using buildPythonPackage" 
This reverts commit c029f9f7fe86867cfd94461996dc6a6415e0e8d0.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32639
 2012-02-28 00:06:36 +00:00
Florian Friesdorf 2eb54f5062 fix bittorrent by using buildPythonPackage 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32636
 2012-02-27 22:53:44 +00:00
Lluís Batlle i Rossell f00e2914e3 Removing grub 1.98. It was useful only when we only had 1.99rc1 to boot from raid md 
devices. In 1.99, all worked.


svn path=/nixpkgs/trunk/; revision=32602
 2012-02-26 21:06:55 +00:00
Florian Friesdorf c0dcbb912c adapted xpf to new libxml2Python 
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32597
 2012-02-26 17:23:54 +00:00
Shea Levy 584ccabaac svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32569
 2012-02-25 20:52:15 +00:00
Eelco Dolstra e4ff365eb4 * EC2 AMI tools updated to 1.4.0.5. 
svn path=/nixpkgs/trunk/; revision=32568
 2012-02-25 20:26:25 +00:00
Shea Levy b4bee8caf5 nixUnstable: Run checkPhase after installPhase to work around a test suite bug 
svn path=/nixpkgs/trunk/; revision=32567
 2012-02-25 20:18:00 +00:00
Shea Levy ea195b2507 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
 2012-02-25 19:57:34 +00:00
Lluís Batlle i Rossell bfb0389d6c Disabling NLS for the zip at openoffice builders. I think it breaks the builds, based on 
the nixpkgs diff for the breakage at http://hydra.nixos.org/build/1964660 .


svn path=/nixpkgs/trunk/; revision=32556
 2012-02-25 15:54:57 +00:00
Peter Simons 4716f6735d vpnc: install the README file into $out/share/doc 
svn path=/nixpkgs/trunk/; revision=32544
 2012-02-24 17:32:11 +00:00
Yury G. Kudryashov 3652c61aed svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32522
 2012-02-23 20:35:33 +00:00
Yury G. Kudryashov bf2579b4a3 Latest netpbm (builds with libpng-1.5) 
svn path=/nixpkgs/trunk/; revision=32521
 2012-02-23 20:24:00 +00:00
Yury G. Kudryashov 38e3d7bc86 svn merge ^/nixpkgs/trunk 
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
 2012-02-23 20:06:21 +00:00
Peter Simons 4b8cceb571 wicd: emit ip-up and ip-down as well 
svn path=/nixpkgs/trunk/; revision=32482
 2012-02-22 20:29:15 +00:00
Eelco Dolstra f71dd91a43 * Apply r32435 from the trunk (always build Python with SSL support). 
Remove .ssl references from some packages missed in that commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
 2012-02-21 23:35:35 +00:00
Eelco Dolstra e64443baf1 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
 2012-02-21 23:29:21 +00:00
Peter Simons da2159548a nbd: avoid use of "install -D", which doesn't seem to work on FreeBSD 
svn path=/nixpkgs/trunk/; revision=32459
 2012-02-21 15:07:39 +00:00
Peter Simons 4e76d21c84 nbd: updated to version 3.0 
svn path=/nixpkgs/trunk/; revision=32450
 2012-02-21 10:58:15 +00:00
Arie Middelkoop 869543fa05 Updated the hash of texlive's 'moderncv.zip'. 
Apparently the file gets updated once in a while. It does not have a version number either. Not very nice.

svn path=/nixpkgs/trunk/; revision=32444
 2012-02-21 09:01:56 +00:00
Eelco Dolstra 45fed14272 * Revert r32435. We'll be doing a stdenv merge in a few days, so 
let's put it in there rather than having the Nth near-complete
  rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436
 2012-02-20 18:59:43 +00:00
Peter Simons 95cbf4ed55 Modified the Python 2.7 expression so that the interpreter has unconditional 
OpenSSL support. Having OpenSSL available at the time the core interpreter is
built enables all kinds of important crypto features (i.e. additional hashlib
algorithms, etc.) that otherwise won't be available.

svn path=/nixpkgs/trunk/; revision=32435
 2012-02-20 18:52:52 +00:00
Eelco Dolstra fd41f11208 * dhcpcd: get the entry/exit hooks from /etc. 
svn path=/nixpkgs/trunk/; revision=32429
 2012-02-20 15:12:34 +00:00
Yury G. Kudryashov d8454e538c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32417
 2012-02-20 05:30:06 +00:00
Eelco Dolstra ebe141d306 * Updated dhcpcd to 5.5.4. 
svn path=/nixpkgs/trunk/; revision=32412
 2012-02-20 01:14:57 +00:00
Eelco Dolstra ea82288eec * Remove the unused graphviz/2.24.nix file. Also remove the unused 
attribute graphviz_2_24 (which was actually referring to Graphviz
  2.0).

svn path=/nixpkgs/trunk/; revision=32406
 2012-02-19 17:54:37 +00:00
Eelco Dolstra 5baef98dd9 * Cromfs updated to 1.5.10 (to get it to build with GCC 4.6). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32400
 2012-02-19 16:58:40 +00:00
Yury G. Kudryashov 313a029f16 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
 2012-02-19 11:16:24 +00:00
Yury G. Kudryashov 14a5b4991c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32360
 2012-02-17 17:44:20 +00:00