philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

2481 commits

Author SHA1 Message Date
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
Yury G. Kudryashov 615f0423e8 telnet.meta.platforms 
svn path=/nixpkgs/trunk/; revision=32355
 2012-02-17 16:22:07 +00:00
Yury G. Kudryashov 79d0d410cb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
 2012-02-17 13:43:31 +00:00
Yury G. Kudryashov 8b4f571491 kdiff3-0.9.96 
svn path=/nixpkgs/trunk/; revision=32348
 2012-02-17 13:29:34 +00:00
Yury G. Kudryashov ed8caa2c7f svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32347
 2012-02-17 13:10:05 +00:00
Eelco Dolstra a3da139c73 * Remove ext3cow, it's dead. 
svn path=/nixpkgs/trunk/; revision=32340
 2012-02-16 19:30:41 +00:00
Yury G. Kudryashov ee75764bdb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32338
 2012-02-16 18:46:10 +00:00
Eelco Dolstra 148612239c * Added openresolv, a program for managing /etc/resolv.conf. 
svn path=/nixpkgs/trunk/; revision=32337
 2012-02-16 18:40:05 +00:00
Yury G. Kudryashov f8926aa0d7 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32335
 2012-02-16 18:18:34 +00:00
Eelco Dolstra 9da1dd6c90 * dnsmasq updated to 2.59. 
svn path=/nixpkgs/trunk/; revision=32334
 2012-02-16 18:03:12 +00:00
Yury G. Kudryashov e5027e5b36 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
 2012-02-16 15:02:26 +00:00
Yury G. Kudryashov 82aab32119 Remove knetworkmanager. Use networkmanagement instead 
svn path=/nixpkgs/trunk/; revision=32329
 2012-02-16 14:54:13 +00:00
Yury G. Kudryashov a03eacdf22 kde4.networkmanagement needs pkg-config 
svn path=/nixpkgs/trunk/; revision=32328
 2012-02-16 14:53:51 +00:00
Yury G. Kudryashov bedbebc2e4 enblend-enfuse: build with libpng-1.5 
svn path=/nixpkgs/branches/libpng15/; revision=32322
 2012-02-16 11:50:29 +00:00
Yury G. Kudryashov 070874c5f1 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32321
 2012-02-16 11:23:36 +00:00
Shea Levy dfda68af54 Fix tarball 
I don't know what nbd is, I just followed the complaints in the log

svn path=/nixpkgs/trunk/; revision=32310
 2012-02-16 02:21:17 +00:00
Eelco Dolstra 219b00faa2 * e2fsprogs updated to 1.42. 
svn path=/nixpkgs/trunk/; revision=32293
 2012-02-15 01:09:33 +00:00
Peter Simons ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix. 
svn path=/nixpkgs/trunk/; revision=32292
 2012-02-14 17:00:37 +00:00
Yury G. Kudryashov c81f618a34 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32273
 2012-02-14 14:33:10 +00:00
Yury G. Kudryashov 96c20f97b7 unzip: fix typo in meta 
svn path=/nixpkgs/trunk/; revision=32272
 2012-02-14 14:29:25 +00:00
Yury G. Kudryashov f7886ac78b svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
 2012-02-13 19:47:36 +00:00
Sander van der Burg da6e4f95d4 Bumped revision of Disnix activation scripts 
svn path=/nixpkgs/trunk/; revision=32234
 2012-02-12 13:34:06 +00:00
Yury G. Kudryashov fc21cca549 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32231
 2012-02-12 09:33:54 +00:00
Eelco Dolstra 761785c4ab * Fix ebook-tools. It broke because of the libzip update. 
svn path=/nixpkgs/trunk/; revision=32215
 2012-02-10 18:33:14 +00:00
Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk 
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
 2012-02-10 10:24:30 +00:00
Eelco Dolstra ff1bfcaefb * Added fuse-zip, a FUSE filesystem for accessing zip files. 
svn path=/nixpkgs/trunk/; revision=32143
 2012-02-08 15:45:26 +00:00
Peter Simons 85f4a69a14 nbd: the test suite still doesn't work on Hydra 
svn path=/nixpkgs/trunk/; revision=32132
 2012-02-07 21:45:05 +00:00
Peter Simons 07a925d08a nbd: re-enable the test suite to see what happens 
svn path=/nixpkgs/trunk/; revision=32127
 2012-02-07 19:54:31 +00:00
Peter Simons 1451109c95 nbd: linking with -lrt is no longer necessary because we don't link glib statically anymore 
svn path=/nixpkgs/trunk/; revision=32126
 2012-02-07 19:54:28 +00:00
Peter Simons a62fa4480a nbd: updated to version 2.9.25 
svn path=/nixpkgs/trunk/; revision=32125
 2012-02-07 19:54:25 +00:00
Yury G. Kudryashov c615cbae70 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32099
 2012-02-07 09:38:20 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
 2012-02-06 23:03:12 +00:00
Peter Simons febe726020 duplicity: updated to version 0.6.17 
svn path=/nixpkgs/trunk/; revision=32086
 2012-02-06 19:45:18 +00:00
Michael Raskin bc851612c9 A kludge to avoid removal of zlib from RPATH -- needed for LilyPond build 
svn path=/nixpkgs/trunk/; revision=32046
 2012-02-06 05:49:27 +00:00
Yury G. Kudryashov 33f14fc3cf enblend-enfuse-4.0 
svn path=/nixpkgs/trunk/; revision=32037
 2012-02-05 09:26:06 +00:00
Arie Middelkoop 3f1054b1ec Added 'bumblebee', a package that facilitates NVidia Optimus graphics with X11. 
Note: it relies heavily on 'virtualgl'. This also makes the approach taken
by bumblebee not very effective.
So, this package is actually mainly useful for shutting down your card so that
it does not consume power/produce heat.

See the comments in bumblebee/default.nix

svn path=/nixpkgs/trunk/; revision=32036
 2012-02-05 00:51:35 +00:00
Peter Simons 60c8201514 analog: install images directory, too 
svn path=/nixpkgs/trunk/; revision=32030
 2012-02-04 10:48:48 +00:00
Peter Simons 282449afe8 analog: added version 6.0 
svn path=/nixpkgs/trunk/; revision=32029
 2012-02-04 10:32:07 +00:00
Peter Simons b69d6bf7e0 Moved all LaTeX expressions into tools/typesetting hierarchy. 
svn path=/nixpkgs/trunk/; revision=32028
 2012-02-04 09:31:07 +00:00
Peter Simons dbafd99a0a Moved python debugger into development/tools hierarchy. 
svn path=/nixpkgs/trunk/; revision=32027
 2012-02-04 09:30:53 +00:00
Yury G. Kudryashov df037ddafd svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31987
 2012-02-02 20:36:11 +00:00
Yury G. Kudryashov 75262bcbed zip, unzip: add NLS support 
svn path=/nixpkgs/trunk/; revision=31961
 2012-02-01 22:32:16 +00:00
Florian Friesdorf bf95f7fa3c Revert "sudo upgrade to 1.8.3p2 (security fix included)" 
before was 1.7.2, which is not affected

svn path=/nixpkgs/trunk/; revision=31944
 2012-01-31 14:09:54 +00:00
Florian Friesdorf 8565aba2cd sudo upgrade to 1.8.3p2 (security fix included) 
svn path=/nixpkgs/trunk/; revision=31943
 2012-01-31 13:49:53 +00:00
Eelco Dolstra 4fe11e8438 * OpenSSH updated to 5.9p1. 
svn path=/nixpkgs/trunk/; revision=31939
 2012-01-31 11:01:12 +00:00
Rob Vermaas 6cff3215f4 add meta attribute for cowsay 
svn path=/nixpkgs/trunk/; revision=31938
 2012-01-31 06:59:02 +00:00
Rob Vermaas 37b404816a add cowsay 
svn path=/nixpkgs/trunk/; revision=31936
 2012-01-30 19:05:24 +00:00
Peter Simons c5ecd1752c hardlink: initial version 
Hardlink consolidates duplicate files in a directory hierarchy with hardlinks,
similar to "nix-store --optimise".

IHMO, this program should be run by the default builder after $out has been set
up, to remove redundancy in the generated closures.

svn path=/nixpkgs/trunk/; revision=31934
 2012-01-30 11:40:20 +00:00
Yury G. Kudryashov 491316794c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31905
 2012-01-28 12:29:35 +00:00
Yury G. Kudryashov 8c1f88549d fontforge-20100222 
svn path=/nixpkgs/trunk/; revision=31902
 2012-01-28 09:04:48 +00:00
Yury G. Kudryashov e155073b2c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31888
 2012-01-27 17:49:20 +00:00
Yury G. Kudryashov b31c67e24d svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
 2012-01-27 16:43:39 +00:00
Eelco Dolstra 26bcec3897 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=31880
 2012-01-27 13:39:47 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk 
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
 2012-01-26 15:27:03 +00:00
Yury G. Kudryashov 2ced89b7f1 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31846
 2012-01-26 08:45:19 +00:00
Yury G. Kudryashov b1762c6b49 plotutils: fix compilation with libpng15 (debian) 
svn path=/nixpkgs/branches/libpng15/; revision=31837
 2012-01-25 18:06:30 +00:00
Sander van der Burg c0be721441 Bumped version of DisnixOS 
svn path=/nixpkgs/trunk/; revision=31833
 2012-01-24 22:28:40 +00:00
Sander van der Burg c436381674 Bumped versions of disnix and disnixos 
svn path=/nixpkgs/trunk/; revision=31825
 2012-01-24 21:13:42 +00:00
Eelco Dolstra 3cf71dcfd1 * Curl is used during the bootstrap, so don't rely on pattern 
substitution being efficient.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31792
 2012-01-23 13:06:01 +00:00
Eelco Dolstra 3ac44bde79 * Disable make check because it fails randomly due to a race. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31790
 2012-01-23 12:34:07 +00:00
Eelco Dolstra c44e954bdc * Fix the squashfs build (it links against xz, so xz has 
to be in the buildInputs).  While at it, update to 
  version 4.2.  "attr" is no longer needed as a dependency.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31744
 2012-01-20 17:43:50 +00:00
Eelco Dolstra bafc4ff59d * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
 2012-01-20 15:29:04 +00:00
Eelco Dolstra b786ce664d * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=31738
 2012-01-20 15:26:47 +00:00
Yury G. Kudryashov 734de478a6 svn merge ^/nixpkgs/trunk, no conflicts 
svn path=/nixpkgs/branches/libpng15/; revision=31731
 2012-01-20 00:50:16 +00:00
Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
 2012-01-19 21:31:51 +00:00
Eelco Dolstra 2ebf8df601 * Apply the latest Gentoo patches to Grub 1. 
svn path=/nixpkgs/trunk/; revision=31720
 2012-01-19 21:08:33 +00:00
Yury G. Kudryashov a525fdb18d svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31718
 2012-01-19 21:00:43 +00:00
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Ludovic Courtès 94a0bbcef3 GNU Source-Highlight 3.1.6. 
svn path=/nixpkgs/trunk/; revision=31676
 2012-01-18 20:52:55 +00:00
Ludovic Courtès 9975a56711 GNU xnee 3.11. 
svn path=/nixpkgs/trunk/; revision=31675
 2012-01-18 20:52:50 +00:00
Ludovic Courtès 7ce8cc9f2c GNU Parallel 20111222. 
svn path=/nixpkgs/trunk/; revision=31674
 2012-01-18 20:52:45 +00:00
Ludovic Courtès d9433c2167 GNU ddrescue 1.15. 
svn path=/nixpkgs/trunk/; revision=31673
 2012-01-18 20:52:40 +00:00
Ludovic Courtès 649168b846 GNU FreeIPMI 1.1.1. 
svn path=/nixpkgs/trunk/; revision=31668
 2012-01-18 20:52:17 +00:00
Ludovic Courtès 3d7597fdb9 GNU recutils 1.5. 
svn path=/nixpkgs/trunk/; revision=31666
 2012-01-18 20:52:07 +00:00
Ludovic Courtès 2a6f139c5d expect: Remove unneeded dependency on Autoconf. 
svn path=/nixpkgs/trunk/; revision=31663
 2012-01-18 20:51:52 +00:00
Peter Simons 0f3fa64430 wicd: integrate with upstart events 
quite some services need to be started/restarted when a connection is
established/teared down. Also, some services are optional depending on
the connected access point. For example: use a vpn on an untrusted
network.

these small trigger scripts don't change any behaviour by themselves,
but allow you to hook in to them if you need.

example use:

  jobs.gw6c.startOn = pkgs.lib.mkForce "started  openvpn-dcsOffice";
  jobs.gw6c.stopOn  = pkgs.lib.mkForce "stopping openvpn-dcsOffice";
  jobs."openvpn-dcsOffice".startOn        = pkgs.lib.mkForce "wicd-postconnect";
  jobs."openvpn-dcsOffice".stopOn         = pkgs.lib.mkForce "stopping network-interfaces or wicd-predisconnect";

In the example, I use 3 layers. When a physical connection is
available (wifi connect), I setup a vpn connection, and setup an ipv6
tunnel on top of that. When disconnecting, they are automatically shut
down in the right order as well.

svn path=/nixpkgs/trunk/; revision=31662
 2012-01-18 20:38:34 +00:00
Peter Simons 8b3dd70553 openvpn: use iproute2 instead of net-tools 
for setting up tunnel/routes.
I had some issues with ipv6, iproute2 fixed those.

Both are equally well supported by upstream.

svn path=/nixpkgs/trunk/; revision=31660
 2012-01-18 20:38:27 +00:00
Peter Simons 7b1be8e27d btrfs-progs: small fix for Makefile 
line was split so we cannot append anymore because that appends after \

svn path=/nixpkgs/trunk/; revision=31656
 2012-01-18 20:32:45 +00:00
Peter Simons e58052514b youtube-dl: new package (download clips from youtube) 
svn path=/nixpkgs/trunk/; revision=31654
 2012-01-18 20:32:37 +00:00
Peter Simons 3dd02a75ef openvpn: upgraded to latest version 
svn path=/nixpkgs/trunk/; revision=31647
 2012-01-18 20:32:17 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Eelco Dolstra f7159c195a * coreutils 8.15. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31643
 2012-01-18 20:09:26 +00:00
Eelco Dolstra 01f48c7fc1 * Fix "most". Not clear how passing "-ncurses" to the linker ever 
worked.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31641
 2012-01-18 19:44:16 +00:00
Michael Raskin faedda84ef A more correct condition for adding scripts to install 
svn path=/nixpkgs/trunk/; revision=31638
 2012-01-18 17:23:41 +00:00
Eelco Dolstra 48ee2523da * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
 2012-01-18 15:53:12 +00:00
Eelco Dolstra bbe40d00f4 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=31619
 2012-01-18 12:23:42 +00:00
Eelco Dolstra dc9830111b * Added wkhtmltopdf. 
svn path=/nixpkgs/trunk/; revision=31604
 2012-01-17 11:04:14 +00:00
Peter Simons 0e224241bf logstalgica: added version 1.0.3 
svn path=/nixpkgs/trunk/; revision=31590
 2012-01-16 11:34:00 +00:00
Peter Simons 3c8a798411 gource: added meta information and moved the package into version-management category 
svn path=/nixpkgs/trunk/; revision=31570
 2012-01-15 11:44:02 +00:00
Yury G. Kudryashov 13c81f6c79 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31568
 2012-01-14 21:40:24 +00:00
Yury G. Kudryashov 0c79434ccb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
 2012-01-14 21:34:37 +00:00
Peter Simons f685f874a7 asymptote: dropped old code to find boehmgc 
svn path=/nixpkgs/trunk/; revision=31473
 2012-01-10 20:34:45 +00:00
Peter Simons f5bd12aa80 asymptote: enable off-screen rendering (and configure build to find boehmgc) 
svn path=/nixpkgs/trunk/; revision=31472
 2012-01-10 20:32:25 +00:00
Lluís Batlle i Rossell 9dca11bc33 Updating tmux to 1.5. Patch sent to nix-dev by Phil Hagelberg. 
svn path=/nixpkgs/trunk/; revision=31463
 2012-01-10 09:43:46 +00:00
Yury G. Kudryashov 365e05f7ce svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31448
 2012-01-08 23:33:18 +00:00
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk 
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
 2012-01-08 16:01:12 +00:00
Peter Simons 2c7ac76079 unclutter: X cursor management tool 
Unclutter hides your X mouse cursor when you do not need it, to prevent
it from getting in the way. You have only to move the mouse to restore
the mouse cursor. Unclutter is very usefull in tiling wm's where you do
not need the mouse often.

Just run it from your .bash_profile like that:

	unclutter -idle 1 &

svn path=/nixpkgs/trunk/; revision=31431
 2012-01-08 14:01:17 +00:00
Yury G. Kudryashov 3ce77ab9c4 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31386
 2012-01-06 23:08:30 +00:00
Yury G. Kudryashov 1401241864 qrencode-3.2.0 
Remove builderDefs magic, add meta

Cherry-pick r31382 from branches/libpng15

svn path=/nixpkgs/trunk/; revision=31385
 2012-01-06 23:05:11 +00:00
Yury G. Kudryashov 26ea77ad65 qrencode-3.2.0 
Remove builderDefs magic, add meta

svn path=/nixpkgs/branches/libpng15/; revision=31382
 2012-01-06 23:01:44 +00:00
Lluís Batlle i Rossell 3e1ee548ba Make mtdtools crossbuild. 
svn path=/nixpkgs/trunk/; revision=31381
 2012-01-06 22:42:10 +00:00
Lluís Batlle i Rossell 01c5028c7c Updating xburst-tools (blind commit, I did not try to build them) 
svn path=/nixpkgs/trunk/; revision=31377
 2012-01-06 21:06:22 +00:00
Shea Levy 8c063fdfc7 Fix tarball 
svn path=/nixpkgs/trunk/; revision=31352
 2012-01-06 16:14:02 +00:00
Yury G. Kudryashov 900c6e18cd svn merge ^/nixpkgs/trunk 
Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
 2012-01-06 01:07:45 +00:00
Yury G. Kudryashov 5925d6d9a7 most: add random meta.platforms 
svn path=/nixpkgs/trunk/; revision=31322
 2012-01-05 23:15:41 +00:00
Yury G. Kudryashov fcaa6a1abe usbmuxd-1.0.7 
svn path=/nixpkgs/trunk/; revision=31321
 2012-01-05 23:15:33 +00:00
Yury G. Kudryashov 6ed3147550 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31311
 2012-01-05 12:11:18 +00:00
Eelco Dolstra 961ad6a314 * rp-pppoe requires a version attribute in ppp. 
svn path=/nixpkgs/trunk/; revision=31295
 2012-01-04 19:04:09 +00:00
Yury G. Kudryashov 394fd28e4e svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31280
 2012-01-04 15:22:16 +00:00
Yury G. Kudryashov 3ca6582874 ppp-2.4.5, a few patches 
svn path=/nixpkgs/trunk/; revision=31279
 2012-01-04 15:10:27 +00:00
Yury G. Kudryashov 3d61c49b42 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
 2012-01-04 09:54:17 +00:00
Lluís Batlle i Rossell 855e8f45a4 Fixing a typo in the icoutils file. 
svn path=/nixpkgs/trunk/; revision=31267
 2012-01-04 09:47:22 +00:00
Yury G. Kudryashov bdb01cc707 svn merge /path/to/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31266
 2012-01-04 09:45:28 +00:00
Lluís Batlle i Rossell 8fadcd285a Adding icoutils 
svn path=/nixpkgs/trunk/; revision=31265
 2012-01-04 09:42:38 +00:00
Lluís Batlle i Rossell b15381fcf6 Adding pngtoico. 
svn path=/nixpkgs/trunk/; revision=31264
 2012-01-04 09:29:52 +00:00
Yury G. Kudryashov b3709689db Add modemmanager 
svn path=/nixpkgs/trunk/; revision=31263
 2012-01-04 09:05:22 +00:00
Yury G. Kudryashov 2bca92e32d Merge trunk 
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
 2012-01-03 17:25:24 +00:00
Yury G. Kudryashov 53739d23dc Merge trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31239
 2012-01-03 15:50:39 +00:00
Yury G. Kudryashov 3af2d4a89e Add kde4.networkmanagement 
You still need to start NetworkManager daemon manually to use this widget

svn path=/nixpkgs/trunk/; revision=31229
 2012-01-03 13:39:09 +00:00
Yury G. Kudryashov 67add4eec5 pngcrush-1.7.22 
svn path=/nixpkgs/branches/libpng15/; revision=31218
 2012-01-02 19:25:08 +00:00
Yury G. Kudryashov 08761e83fc Merge trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
 2012-01-02 14:12:40 +00:00
Florian Friesdorf aefc550ae0 asciidoc-8.6.6 
svn path=/nixpkgs/trunk/; revision=31169
 2011-12-31 04:05:33 +00:00
Lluís Batlle i Rossell 58af7eb6bf Adding smbldap-tools. And some CPAN packages as bonus. 
svn path=/nixpkgs/trunk/; revision=31118
 2011-12-27 21:35:50 +00:00
Lluís Batlle i Rossell 0def824532 Updating webalizer. 
svn path=/nixpkgs/trunk/; revision=31105
 2011-12-26 17:27:30 +00:00
Yury G. Kudryashov f77741e018 merge trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
 2011-12-25 05:47:23 +00:00
Yury G. Kudryashov f806eca299 Actually upgrade ntfs-3g 
ntfsprogs collection is now part of ntfs-3g

svn path=/nixpkgs/trunk/; revision=31065
 2011-12-24 22:28:00 +00:00
Peter Simons f4439564cb asymptote: fix info dir some more 
svn path=/nixpkgs/trunk/; revision=31060
 2011-12-24 18:28:23 +00:00
Peter Simons a4a5a35f2d asymptote: added fixInfoDir hook to move the generated info files into the correct location 
svn path=/nixpkgs/trunk/; revision=31059
 2011-12-24 18:03:51 +00:00
Peter Simons f13c4dba3d asymptote: updated to version 2.15 
svn path=/nixpkgs/trunk/; revision=31058
 2011-12-24 11:05:21 +00:00
Eelco Dolstra 3f209edf6e * Updated ntfs-3g to 2011.4.12. Also create a sbin/mount.ntfs symlink 
to ensure that NTFS filesystems are mounted using ntfs-3g, which is
  much better than the kernel NTFS driver.  In particular, this
  ensures that udisks will automount external NTFS drives with
  read/write support.  (See also
  http://www.tuxera.com/community/ntfs-3g-faq/#plugandplay)

svn path=/nixpkgs/trunk/; revision=31055
 2011-12-23 14:19:45 +00:00
Eelco Dolstra cddfcd7bcc * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=31043
 2011-12-22 12:30:59 +00:00
Lluís Batlle i Rossell e91a225a37 Updating gnuplot 
svn path=/nixpkgs/trunk/; revision=31027
 2011-12-21 22:48:33 +00:00
Yury G. Kudryashov b077940b3b svn merge https://nixos.org/repos/nix/nixpkgs/trunk 
No conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
 2011-12-15 19:16:38 +00:00
Yury G. Kudryashov aaba1c0bf9 pdf2djvu-0.7.11 
Preparing to poppler-0.18.x update

svn path=/nixpkgs/trunk/; revision=30896
 2011-12-14 18:58:12 +00:00
Eelco Dolstra f8f4f4af33 * gnugrep needs xz to unpack its sources. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30879
 2011-12-14 10:26:44 +00:00
Ludovic Courtès d2c923bc01 GNU grep 2.10. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30868
 2011-12-13 16:09:48 +00:00
Ludovic Courtès 79819a5262 Wicd: Protect the password in the WPA2-TTLS template. 
svn path=/nixpkgs/trunk/; revision=30867
 2011-12-13 14:54:15 +00:00
Eelco Dolstra c044d7f56f * Forgot a few utillinuxng references. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30866
 2011-12-13 12:57:32 +00:00
Michael Raskin f9227dc459 Update BtrFS utilities to latest Git 
svn path=/nixpkgs/trunk/; revision=30864
 2011-12-13 04:30:49 +00:00
Eelco Dolstra 661ea8936f * ‘which’ doesn't actually depend on readline. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30861
 2011-12-12 23:41:02 +00:00
Eelco Dolstra 33090b2198 * bzip2 updated to 1.0.6 (with a fix for CVE-2010-0405). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30853
 2011-12-12 17:06:31 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
 2011-12-12 16:54:35 +00:00
Eelco Dolstra 3ea1c30846 * Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing 
in its interaction with the ‘dontStrip’ attribute.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30848
 2011-12-12 14:02:12 +00:00
Peter Simons c561cbe8c8 upgraded mc 
svn path=/nixpkgs/trunk/; revision=30838
 2011-12-11 19:39:06 +00:00
Lluís Batlle i Rossell 894a3756e5 Updating btar to latest release. 
svn path=/nixpkgs/trunk/; revision=30821
 2011-12-10 22:00:56 +00:00
Lluís Batlle i Rossell 4a6af291a3 Adding btar 0.9! 
svn path=/nixpkgs/trunk/; revision=30815
 2011-12-09 21:15:41 +00:00
Eelco Dolstra 5ce6bf04f2 * vde2 updated to 2.3.2. 
svn path=/nixpkgs/trunk/; revision=30804
 2011-12-09 11:14:02 +00:00
Lluís Batlle i Rossell b4c5f72d9e Updating ts 
svn path=/nixpkgs/trunk/; revision=30797
 2011-12-07 15:26:34 +00:00
Peter Simons 088470ef55 pkgs/tools/networking/p2p/rtorrent/default.nix: avoid use of "install -D" to make FreeBSD happy 
svn path=/nixpkgs/trunk/; revision=30783
 2011-12-06 20:44:31 +00:00
Eelco Dolstra 8ed604d4b8 * Bump. 
svn path=/nixpkgs/trunk/; revision=30740
 2011-12-05 12:12:20 +00:00
Ludovic Courtès b7833639ba Seeks 0.4.0. 
svn path=/nixpkgs/trunk/; revision=30729
 2011-12-04 22:03:03 +00:00
Michael Raskin fdbef21ceb Adjust most things to be cross-buildable. Problem: gnutls. Solution: manually replace it with openssl while cross-building 
svn path=/nixpkgs/trunk/; revision=30709
 2011-12-03 09:29:38 +00:00
Michael Raskin a6da9f24c7 Fix more incorrect native/target buildInput split in tigervnc; current stumbling block is gnutls 
svn path=/nixpkgs/trunk/; revision=30682
 2011-12-02 06:02:40 +00:00
Michael Raskin 791aaf0357 Use Xorg buildNativeInputs correctly 
svn path=/nixpkgs/trunk/; revision=30680
 2011-12-02 05:50:53 +00:00
Michael Raskin 3b1a603782 Propagate buildNativeInputs without changing their types 
svn path=/nixpkgs/trunk/; revision=30679
 2011-12-02 05:50:08 +00:00
Michael Raskin 32eff94091 Pass all configureFlags - including cross-build options, for example 
svn path=/nixpkgs/trunk/; revision=30678
 2011-12-02 04:16:58 +00:00
Ludovic Courtès ccc5902325 GNU recutils 1.4. 
svn path=/nixpkgs/trunk/; revision=30671
 2011-12-01 22:44:29 +00:00
Ludovic Courtès 6b920275b8 GNU FreeIPMI 1.0.9. 
svn path=/nixpkgs/trunk/; revision=30668
 2011-12-01 22:44:10 +00:00
Ludovic Courtès 95696578a9 GNU wdiff 1.10. 
svn path=/nixpkgs/trunk/; revision=30665
 2011-12-01 22:43:53 +00:00
Ludovic Courtès 170399a858 GNU Xorriso 1.1.8. 
svn path=/nixpkgs/trunk/; revision=30664
 2011-12-01 22:43:46 +00:00
Ludovic Courtès 2f87b70323 GNU Parallel 20111122. 
svn path=/nixpkgs/trunk/; revision=30662
 2011-12-01 22:43:31 +00:00
Eelco Dolstra d10ed1b45b * Bump. 
svn path=/nixpkgs/trunk/; revision=30630
 2011-11-29 22:56:29 +00:00
Michael Raskin 15f77a015e Update fakeroot 
svn path=/nixpkgs/trunk/; revision=30610
 2011-11-29 05:13:20 +00:00
Michael Raskin 36ae9193c4 Fix tmux cross-build 
svn path=/nixpkgs/trunk/; revision=30585
 2011-11-28 15:58:45 +00:00
Russell O'Connor c9b2f32c45 Updating bitcoin to version 0.5.0. 
svn path=/nixpkgs/trunk/; revision=30553
 2011-11-24 19:48:20 +00:00
Eelco Dolstra 6c02d31c68 * Bump. 
svn path=/nixpkgs/trunk/; revision=30544
 2011-11-23 15:59:09 +00:00
Rob Vermaas 47e2f1c820 update nixUnstable 
svn path=/nixpkgs/trunk/; revision=30511
 2011-11-21 15:41:19 +00:00
Florian Friesdorf 1b8c781a0c add dtach-0.8 
svn path=/nixpkgs/trunk/; revision=30497
 2011-11-20 21:48:56 +00:00
Rob Vermaas e2fd2c4e23 openvpn: enable option to use password files 
svn path=/nixpkgs/trunk/; revision=30461
 2011-11-18 02:10:14 +00:00
Eelco Dolstra 86e8dcc34b * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=30460
 2011-11-17 12:05:52 +00:00
Shea Levy 10cbd00396 Allow cross-compiling configurations to explicitly give a system string when cross-building nix 
svn path=/nixpkgs/trunk/; revision=30458
 2011-11-16 21:04:02 +00:00
Shea Levy e895fe5e2f Use gc, dbi, and dbd-sqlite when cross-building nix 
The dbi and dbd-sqlite may be hacks since they're not cross-built, I'm not certain

svn path=/nixpkgs/trunk/; revision=30455
 2011-11-16 20:21:58 +00:00
Ludovic Courtès 0093d96841 GNU Wget: Prepare for cross-compilation of a stripped-down version. 
svn path=/nixpkgs/trunk/; revision=30445
 2011-11-16 14:48:27 +00:00
Piotr Pietraszkiewicz 63d36b5185 Version bump - Gource 0.37 
svn path=/nixpkgs/trunk/; revision=30429
 2011-11-14 20:03:43 +00:00
Eelco Dolstra e6cbed31ee * Hard-code the path to xdpyinfo rather than expecting it to be in 
$PATH.  This is necessary because x11vnc does a "su - <user>
  ... xdpyinfo" somewhere.

svn path=/nixpkgs/trunk/; revision=30387
 2011-11-11 03:11:09 +00:00
Lluís Batlle i Rossell 8ce410c6f3 Adding more libraries to have a more featured dar. 
svn path=/nixpkgs/trunk/; revision=30377
 2011-11-10 21:29:00 +00:00
Lluís Batlle i Rossell 1791ea0919 Another update to dar. Let's use the very latest release. 
svn path=/nixpkgs/trunk/; revision=30376
 2011-11-10 21:23:09 +00:00
Lluís Batlle i Rossell 9908557ae0 Updating dar. 
svn path=/nixpkgs/trunk/; revision=30375
 2011-11-10 21:19:30 +00:00
Eelco Dolstra 75b527df8e * Fix some hard-coded paths. 
svn path=/nixpkgs/trunk/; revision=30373
 2011-11-10 19:06:02 +00:00
Eelco Dolstra d0c78d6a58 * TigerVNC updated to 1.1.0. 
* Build TigerVNC with TLS and PAM support.  TLS support is important
  to support encrypted VNC servers.

svn path=/nixpkgs/trunk/; revision=30372
 2011-11-10 19:05:43 +00:00
Lluís Batlle i Rossell c761760442 Adding imapproxy 
svn path=/nixpkgs/trunk/; revision=30360
 2011-11-09 18:25:55 +00:00
Eelco Dolstra 43b5478d1d * x11vnc updated to 0.9.13. 
svn path=/nixpkgs/trunk/; revision=30356
 2011-11-09 16:44:49 +00:00
Evgeny Egorochkin 64ee527151 Duplicity: version bump 
svn path=/nixpkgs/trunk/; revision=30352
 2011-11-09 13:01:46 +00:00
Lluís Batlle i Rossell d72fe9fee2 Adding prayer. It builds on linux x86_64, but I've not tried to run it. 
svn path=/nixpkgs/trunk/; revision=30347
 2011-11-08 21:07:57 +00:00
Eelco Dolstra 169d5c3214 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=30319
 2011-11-08 14:18:59 +00:00
Peter Simons 368ac01473 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
 2011-11-08 10:18:35 +00:00
Lluís Batlle i Rossell 74ef91cfae Updating ntp 
svn path=/nixpkgs/trunk/; revision=30290
 2011-11-07 15:07:19 +00:00
Shea Levy 83acc83fb7 Reenable grub2_efi 
svn path=/nixpkgs/trunk/; revision=30262
 2011-11-06 17:08:05 +00:00
Eelco Dolstra 4d95b41bc8 * curl updated to 7.22.0. Dropped the connect timeout patch because 
it doesn't seem necessary anymore.

svn path=/nixpkgs/trunk/; revision=30243
 2011-11-05 01:55:53 +00:00
Lluís Batlle i Rossell 15c16f50aa Adding dnstop 
svn path=/nixpkgs/trunk/; revision=30209
 2011-11-03 18:43:48 +00:00
Peter Simons 69488d688d synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
 2011-11-02 10:28:32 +00:00
Lluís Batlle i Rossell d4b26a727a Updating unbound. 
svn path=/nixpkgs/trunk/; revision=30174
 2011-11-01 22:33:40 +00:00
Eelco Dolstra 0918b83c75 * Added the Docbook 4.1 SGML DTDs. 
* Fixed the "docbook2man --sgml" command in docbook2x.
* Fixed the module-init-tools manual pages.

svn path=/nixpkgs/trunk/; revision=30165
 2011-11-01 16:47:18 +00:00
Eelco Dolstra bd5e996e20 * Apply a patch to fix the "max resident" size reported by ‘time’ 
being off by a factor of 4.  (The most recent release of ‘time’ is
  from 1996 BTW...)

svn path=/nixpkgs/trunk/; revision=30143
 2011-10-31 14:44:32 +00:00
Cillian de Roiste e15db25ff3 Updating unetbootin to 563, the previous version was not working for me at all, it dropped me to a busybox shell 
svn path=/nixpkgs/trunk/; revision=30139
 2011-10-31 00:25:55 +00:00
Ludovic Courtès 929841f10a GNU Wget 1.13.4. 
svn path=/nixpkgs/trunk/; revision=30121
 2011-10-30 00:01:24 +00:00
Ludovic Courtès 1476689828 GNU Fdisk 1.3.0a. 
svn path=/nixpkgs/trunk/; revision=30115
 2011-10-30 00:00:48 +00:00
Ludovic Courtès 9b12043e62 GNU FreeIPMI 1.0.8. 
svn path=/nixpkgs/trunk/; revision=30114
 2011-10-30 00:00:43 +00:00
Ludovic Courtès 7da5374672 GNU Xorriso 1.1.6. 
svn path=/nixpkgs/trunk/; revision=30113
 2011-10-30 00:00:39 +00:00
Ludovic Courtès 54786058b2 GNU Parallel 20111022. 
svn path=/nixpkgs/trunk/; revision=30112
 2011-10-30 00:00:34 +00:00
Shea Levy c90c831a85 ntfs-3g: The tuxera url isn't working 
svn path=/nixpkgs/trunk/; revision=30092
 2011-10-28 21:28:52 +00:00
Shea Levy a5c4b75643 reiserfsprogs: Use the kernel mirrors 
svn path=/nixpkgs/trunk/; revision=30088
 2011-10-28 21:02:34 +00:00
Eelco Dolstra 041170f5ec * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=30078
 2011-10-28 18:06:23 +00:00
Eelco Dolstra 78ff18a538 * ec2-api-tools updated to 1.4.4.2. 
svn path=/nixpkgs/trunk/; revision=30054
 2011-10-27 15:15:28 +00:00
Peter Simons 61c4b72f0e coreutils: added missing xz build input 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30028
 2011-10-26 09:58:19 +00:00
Peter Simons dfd063cf12 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30027
 2011-10-26 09:15:25 +00:00
Lluís Batlle i Rossell cb823d1c08 Adding mu0, maildir utils. 
svn path=/nixpkgs/trunk/; revision=29995
 2011-10-24 16:36:03 +00:00
Alexander Tsamutali 5cd2d19bb5 tools/misc/qjoypad: New nixbuild. 
svn path=/nixpkgs/trunk/; revision=29977
 2011-10-22 22:12:45 +00:00
Peter Simons 68198ed18d smartmontools: updated to version 5.42 
svn path=/nixpkgs/trunk/; revision=29966
 2011-10-21 17:00:03 +00:00
Eelco Dolstra 9704af30c3 * Latest EC2 AMI tools. 
svn path=/nixpkgs/trunk/; revision=29963
 2011-10-21 16:25:27 +00:00
Sander van der Burg 631f071df8 Bumped version of disnixos 
svn path=/nixpkgs/trunk/; revision=29929
 2011-10-20 11:07:47 +00:00
Sander van der Burg 4f32c23d86 Bumped some versions of Disnix tools 
svn path=/nixpkgs/trunk/; revision=29890
 2011-10-19 12:24:24 +00:00
Peter Simons 8dfef0f4a0 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29851
 2011-10-14 22:06:50 +00:00
Ludovic Courtès 5d5b893223 GNU Coreutils 8.14. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29848
 2011-10-14 21:56:16 +00:00
Ludovic Courtès 0baf364715 XZ Utils 5.0.3. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29846
 2011-10-14 21:56:07 +00:00
Rob Vermaas c7cea676ce add disper 
svn path=/nixpkgs/trunk/; revision=29845
 2011-10-14 18:04:34 +00:00
Peter Simons 85c97efc50 nbd: updated to version 2.9.24 
svn path=/nixpkgs/trunk/; revision=29829
 2011-10-13 17:00:46 +00:00
Lluís Batlle i Rossell 19503ac12a Updating task spooler 
svn path=/nixpkgs/trunk/; revision=29809
 2011-10-13 08:59:56 +00:00
Peter Simons ee2fdfb00d mscgen: added version 0.20 
svn path=/nixpkgs/trunk/; revision=29803
 2011-10-13 07:38:44 +00:00
Peter Simons e3984c2caf synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29739
 2011-10-10 17:01:17 +00:00
Peter Simons 6170e88607 pkgs/tools/text/odt2txt: fixed evaluation error 
svn path=/nixpkgs/trunk/; revision=29738
 2011-10-10 08:56:08 +00:00
Joachim Schiele f3f0940e25 added support for cntlm on nixos! 
svn path=/nixpkgs/trunk/; revision=29736
 2011-10-09 22:28:41 +00:00
Yury G. Kudryashov 8d94826486 colordiff: fix man install path 
svn path=/nixpkgs/trunk/; revision=29735
 2011-10-09 18:45:47 +00:00
Yury G. Kudryashov 9caf409d96 odt2txt-0.4 
svn path=/nixpkgs/trunk/; revision=29734
 2011-10-09 18:22:18 +00:00
Yury G. Kudryashov c35c6ec9fa Drop 'gnomevfs = gnome_vfs;' alias 
s/gnomevfs/gnome_vfs/ in packages

svn path=/nixpkgs/trunk/; revision=29718
 2011-10-08 12:06:03 +00:00
Peter Simons 1add4b2e6d synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29696
 2011-10-06 13:16:47 +00:00
Peter Simons ddd571e253 strip trailing whitespace 
svn path=/nixpkgs/trunk/; revision=29695
 2011-10-06 13:15:09 +00:00
Peter Simons 8686ca6278 btrfsprogs: override -Werror option in CFLAGS to fix build errors with GCC 4.6.1 
svn path=/nixpkgs/trunk/; revision=29693
 2011-10-06 13:15:02 +00:00
Ludovic Courtès 88dd456354 GNU grep 2.9. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29592
 2011-10-02 20:36:06 +00:00
Ludovic Courtès 29d669037e GNU Awk 4.0.0. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29591
 2011-10-02 20:36:01 +00:00
Ludovic Courtès 14a86cfa3b GNU diffutils 3.2. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29590
 2011-10-02 20:35:57 +00:00
Ludovic Courtès 40f2ee9200 GNU tar 1.26. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29589
 2011-10-02 20:35:53 +00:00
Peter Simons 07a5a121fb synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29524
 2011-09-28 14:48:34 +00:00
Lluís Batlle i Rossell afe142e963 Making jwhois connect fine for those without ipv6 network. 
svn path=/nixpkgs/trunk/; revision=29519
 2011-09-28 07:25:59 +00:00
Peter Simons 01022a1502 lxc: moved package into the "applications/virtualization" category 
svn path=/nixpkgs/trunk/; revision=29491
 2011-09-26 08:12:14 +00:00
Peter Simons a004ca1a7d lxc: fixed build to include the SGML documentation 
svn path=/nixpkgs/trunk/; revision=29490
 2011-09-26 08:12:10 +00:00
Michael Raskin 0b9c88cba1 Taking a patch from ArchLinux to fix altermime build 
svn path=/nixpkgs/trunk/; revision=29489
 2011-09-26 04:48:35 +00:00
Yury G. Kudryashov 9dd3dbe2c7 fdm: remove -I- from GNUmakefile. Fixes build on i686 
svn path=/nixpkgs/trunk/; revision=29485
 2011-09-25 23:16:16 +00:00
Yury G. Kudryashov fe3df64918 Add version info to bittornado.name 
svn path=/nixpkgs/trunk/; revision=29483
 2011-09-25 22:56:38 +00:00
Lluís Batlle i Rossell e129d97f19 Updating rtmpdump to the 2.4 (what I think it is 2.4) in their git repository. 
They don't use tags or branches.


svn path=/nixpkgs/trunk/; revision=29479
 2011-09-25 09:04:24 +00:00
Peter Simons 808aa6c62d rtorrent: install man page manually (the upstream makefile is broken) 
svn path=/nixpkgs/trunk/; revision=29471
 2011-09-24 12:46:24 +00:00
Michael Raskin 4d6030f56b Adding hyenae - patch by MarcWeber 
svn path=/nixpkgs/trunk/; revision=29470
 2011-09-24 09:14:21 +00:00
Shea Levy 01df54f5cc Merge from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
 2011-09-23 16:58:45 +00:00
Peter Simons 730afe1f8b lxc: added perl buildInput to fix the lxc-ps script 
Also added myself as a maintainer, improved the meta section a little,
and stripped trailing whitespace.

svn path=/nixpkgs/trunk/; revision=29450
 2011-09-23 11:16:10 +00:00
Lluís Batlle i Rossell ddcb4a295d Adding pdnsd 
svn path=/nixpkgs/trunk/; revision=29438
 2011-09-22 11:28:56 +00:00
Michael Raskin 234a58870a Check bittornado with newer wxGTK, generic cleanup 
svn path=/nixpkgs/trunk/; revision=29433
 2011-09-22 06:31:35 +00:00
Florian Friesdorf 113f2c851f iodine-0.6.0-rc1 
svn path=/nixpkgs/trunk/; revision=29429
 2011-09-21 20:05:38 +00:00
Lluís Batlle i Rossell ed9d78b75f Adding pngcrush 
svn path=/nixpkgs/trunk/; revision=29411
 2011-09-21 07:33:38 +00:00
Yury G. Kudryashov 9ee5230537 Move qt3/qt4 choice to .nix expressions 
svn path=/nixpkgs/trunk/; revision=29404
 2011-09-20 22:49:13 +00:00
Yury G. Kudryashov d9ad31c468 pfstools-1.8.3; builds against qt4 
svn path=/nixpkgs/trunk/; revision=29403
 2011-09-20 22:49:07 +00:00
Peter Simons 11e2fe77ce nbd: don't try to build this tool on Cygwin 
svn path=/nixpkgs/trunk/; revision=29358
 2011-09-19 17:02:15 +00:00
Peter Simons 2120523889 pdsh: don't try to build this tool on Cygwin 
svn path=/nixpkgs/trunk/; revision=29357
 2011-09-19 17:00:37 +00:00
Yury G. Kudryashov f4a96780d1 Upgrade to pcsclite-1.7.4 
-1 HAL reverse-dependency...

svn path=/nixpkgs/trunk/; revision=29345
 2011-09-19 13:01:47 +00:00
Alexander Tsamutali 95f7c02feb tools/system/gptfdisk: Updated to 0.8.0. 
svn path=/nixpkgs/trunk/; revision=29319
 2011-09-17 12:54:46 +00:00
Ludovic Courtès e15f102b5f GNU wdiff 1.0.1. 
svn path=/nixpkgs/trunk/; revision=29317
 2011-09-17 10:09:39 +00:00
Peter Simons 2d9c68fd28 tools/misc/myhasktags: fixed incorrect sha256 hash 
svn path=/nixpkgs/trunk/; revision=29310
 2011-09-16 18:25:23 +00:00
Yury G. Kudryashov 284ffb7713 nm-applet-0.9.0 
svn path=/nixpkgs/trunk/; revision=29272
 2011-09-14 16:52:06 +00:00
Yury G. Kudryashov 5fd7590140 Add NetworkManager-pptp 
svn path=/nixpkgs/trunk/; revision=29271
 2011-09-14 15:50:14 +00:00
Yury G. Kudryashov 5aed28d802 Better propagated/native/ buildInputs separation 
svn path=/nixpkgs/trunk/; revision=29270
 2011-09-14 15:50:01 +00:00
Yury G. Kudryashov 1d91e3ac45 Add pptp client 
svn path=/nixpkgs/trunk/; revision=29267
 2011-09-14 08:39:51 +00:00
Peter Simons a4239c7e14 tahoe-lafs: updated to version 1.8.3, which fixes an important security bug 
Note that we currently cannot run the test suite!

svn path=/nixpkgs/trunk/; revision=29253
 2011-09-13 20:10:41 +00:00
Yury G. Kudryashov 8c6b8753d5 NM: propagate dbus-glib 
svn path=/nixpkgs/trunk/; revision=29247
 2011-09-13 19:27:41 +00:00
Eelco Dolstra bc1298e651 * Updated nixUnstable. 
svn path=/nixpkgs/trunk/; revision=29203
 2011-09-12 10:02:03 +00:00