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

2356 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 7c92bab1e5 Made xbursttools have libusb and libusb1. Looks like depending on both. 
svn path=/nixpkgs/trunk/; revision=32969
 2012-03-10 11:26:55 +00:00
Eelco Dolstra d1cbcc3971 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=32965
 2012-03-09 19:57:33 +00:00
Yury G. Kudryashov 93683bf273 networkmanagement-0.9.0 
svn path=/nixpkgs/trunk/; revision=32964
 2012-03-09 19:34:10 +00:00
Yury G. Kudryashov b94c51c2f7 gnome-keyring -> libgnome-keyring 
svn path=/nixpkgs/trunk/; revision=32906
 2012-03-08 16:49:14 +00:00
Joachim Schiele 88b69df2dc Added two missing dependencies (to make the packages build) 
svn path=/nixpkgs/trunk/; revision=32890
 2012-03-08 13:31:16 +00:00
Lluís Batlle i Rossell b2653605c4 Setting myself as maintainer of netkit tftp, to get updates if it fails to build. 
svn path=/nixpkgs/trunk/; revision=32869
 2012-03-07 22:21:24 +00:00
Lluís Batlle i Rossell 906f400681 I think xburst needs pkgconfig 
svn path=/nixpkgs/trunk/; revision=32858
 2012-03-07 21:38:19 +00:00
Lluís Batlle i Rossell ce482ec155 Adding a new url for netkit tftp, as the other is down. 
svn path=/nixpkgs/trunk/; revision=32855
 2012-03-07 18:13:03 +00:00
Eelco Dolstra ed325cd1ae * We accidentally lost xz support in rpm. This broke RPM builds 
(http://hydra.nixos.org/build/2230623).

svn path=/nixpkgs/trunk/; revision=32847
 2012-03-07 09:47:22 +00:00
Lluís Batlle i Rossell 1981a57c13 Updating inadyn. The old sourceforge place did not work anymore. 
svn path=/nixpkgs/trunk/; revision=32845
 2012-03-07 08:37:07 +00:00
Eelco Dolstra 38615a16e9 * Fix the checkinstall build on Glibc 2.13. 
svn path=/nixpkgs/trunk/; revision=32831
 2012-03-06 19:06:33 +00:00
Eelco Dolstra 3c56e571af * Final sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
 2012-03-06 11:34:11 +00:00
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
Lluís Batlle i Rossell dbe98be6a1 Updating btar 
svn path=/nixpkgs/trunk/; revision=32807
 2012-03-05 21:23:22 +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
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