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

635 commits

Author SHA1 Message Date
Eelco Dolstra 2e92cabb37 * substitute: support patterns starting with a dash. 
* Updated the kernel headers.
* ghc: setup hooks are now generated using substituteAll.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10838
 2008-02-22 18:19:04 +00:00
Michael Raskin 8ea6496a10 - 
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10823
 2008-02-22 03:06:12 +00:00
Ludovic Courtès 96177fce34 VPNC: Clarify run-time dependencies. 
svn path=/nixpkgs/trunk/; revision=10818
 2008-02-21 19:33:21 +00:00
Ludovic Courtès a21609b1ab Add GNU Inetutils. 
svn path=/nixpkgs/trunk/; revision=10817
 2008-02-21 18:58:11 +00:00
Eelco Dolstra 67c961fd63 * Merged -r10790:HEAD from the trunk. 
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10815
 2008-02-21 17:34:03 +00:00
Eelco Dolstra bda5d7d471 * Hack around a weird build problem on Darwin. 
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10804
 2008-02-21 14:47:59 +00:00
Eelco Dolstra c9f2559e30 * Don't include <malloc.h>, it doesn't exist on all platforms. 
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10803
 2008-02-21 14:01:19 +00:00
Eelco Dolstra 051cd950fe * Use the latest Nix. What a relief. :-) 
svn path=/nixpkgs/trunk/; revision=10801
 2008-02-21 13:44:06 +00:00
Eelco Dolstra e12b421add * Merged most of the stdenv-updates branch. Some stuff didn't 
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
 2008-02-20 23:02:41 +00:00
Wouter den Breejen 03473a3fc3 Added SNIX which is Nix extended with options to handle state (not stable yet and needs ext3cow so i do not recommend updating unless you are interested) 
svn path=/nixpkgs/trunk/; revision=10771
 2008-02-20 12:29:41 +00:00
Yury G. Kudryashov 0aa0847307 added gnupg-1.x compatibility symlinks to gnupg-2.x, removed gnupg2 attr 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10746
 2008-02-18 20:52:59 +00:00
Yury G. Kudryashov 8ea549b319 sharutils added (4.6.3) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10744
 2008-02-18 20:52:25 +00:00
Michael Raskin 66914f5438 Added src overriding option for relfs 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10721
 2008-02-18 10:42:04 +00:00
Michael Raskin 96ddccf6b2 Some fixes to build elfutils and ltrace, added x11vnc, forward-ported kernel 2.6.23.16 as default. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10718
 2008-02-18 07:23:05 +00:00
Ludovic Courtès 4fd7a30a36 Improve Lout package: improved directory layout, and documentation is now installed. 
svn path=/nixpkgs/trunk/; revision=10708
 2008-02-15 13:42:24 +00:00
Michael Raskin 2a087141cb Ported replace renaming to replace-literal to avoid conflict with MySQL package supplying own tool with name replace. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10704
 2008-02-15 11:14:40 +00:00
Eelco Dolstra 5f45fb3ae9 * substitute() in stdenv: use the replace program instead of awful 
sed hackery.
* Some indentation fixes in setup.sh.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10658
 2008-02-13 14:23:09 +00:00
Ludovic Courtès c81efcdedb Add GNU lsh, a GPL'd implementation of SSH, and `liboop', and event loop library. 
svn path=/nixpkgs/trunk/; revision=10637
 2008-02-12 10:51:44 +00:00
Ludovic Courtès c3096df3d0 Add Lout, a document layout system based on a purely functional language. 
svn path=/nixpkgs/trunk/; revision=10634
 2008-02-12 09:58:57 +00:00
Ludovic Courtès 4ad48cffed VPNC fix: binary would refer to `/etc/vpnc/vpnc-script'. 
svn path=/nixpkgs/trunk/; revision=10619
 2008-02-10 22:52:39 +00:00
Ludovic Courtès df326e6a44 Add VPNC, a Cisco-compatible VPN client. 
svn path=/nixpkgs/trunk/; revision=10618
 2008-02-10 21:54:01 +00:00
Yury G. Kudryashov eddff7a74a * A more pure man implementation. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10602
 2008-02-10 17:40:54 +00:00
Yury G. Kudryashov 38fc3e6259 * man -> man-db. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10601
 2008-02-10 17:40:46 +00:00
Yury G. Kudryashov 71dd78fe64 * man-db 2.5.1. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10600
 2008-02-10 17:40:39 +00:00
Yury G. Kudryashov 7830284677 * Latest unstable version. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10599
 2008-02-10 17:40:31 +00:00
Yury G. Kudryashov 8bcddb0413 svn path=/nixpkgs/branches/stdenv-updates/; revision=10592 2008-02-10 17:39:34 +00:00
Yury G. Kudryashov 7753a1c5e9 * Remove a time-dependent impurity from mc which was caused by touching all the source files. Depending on whether files were touched in the same second things would either be rebuilt (which would fail) or not. 
Maybe this breaks unzip support, not tested.


svn path=/nixpkgs/branches/stdenv-updates/; revision=10587
 2008-02-10 17:38:46 +00:00
Yury G. Kudryashov 17a801ad4c * Remove the Reiser4 patch from Gentoo, it broke Grub, with a message like 
Running "install --stage2=/boot/grub/stage2 /boot/grub/stage1 (hd0) (hd0)1+15 p (hd0,5)/boot/grub/stage /boot/grub/menu.lst"... failed
    Error 15: File not found


svn path=/nixpkgs/branches/stdenv-updates/; revision=10585
 2008-02-10 17:38:24 +00:00
Yury G. Kudryashov 7b3c313ec6 Fixed shebangfix 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10581
 2008-02-10 17:37:38 +00:00
Yury G. Kudryashov 703135a4de Don't know wether you want to build perl and zip because of mc.. But one of mc's features is beeing able to unpack on the fly. You can do that now (.zip) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10579
 2008-02-10 17:37:10 +00:00
Michael Raskin 4df190c703 Various fixes and updates to build that all. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10568
 2008-02-10 16:44:43 +00:00
Eelco Dolstra 3e158a1c19 * ktorrent 2.2.5. 
svn path=/nixpkgs/trunk/; revision=10555
 2008-02-08 15:40:03 +00:00
Eelco Dolstra 4c59a67b32 * A more pure man implementation. 
svn path=/nixpkgs/trunk/; revision=10547
 2008-02-07 14:39:07 +00:00
Eelco Dolstra f21f531e4e * man -> man-db. 
svn path=/nixpkgs/trunk/; revision=10543
 2008-02-07 13:38:44 +00:00
Eelco Dolstra 3918ffc86d * man-db 2.5.1. 
svn path=/nixpkgs/trunk/; revision=10541
 2008-02-07 13:32:48 +00:00
Eelco Dolstra 7842f1cbf2 * Latest unstable version. 
svn path=/nixpkgs/trunk/; revision=10536
 2008-02-07 10:21:52 +00:00
Eelco Dolstra bf95691d1c svn path=/nixpkgs/trunk/; revision=10514 2008-02-06 14:19:58 +00:00
Eelco Dolstra 5a9affd896 * Added lzma, a compression program that compresses better than 
bzip2.

svn path=/nixpkgs/trunk/; revision=10513
 2008-02-06 13:52:41 +00:00
Eelco Dolstra 8cd1b893cf * coreutils-6.10, findutils-4.2.32. 
* Added some meta attributes.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10511
 2008-02-06 13:18:50 +00:00
Eelco Dolstra c583b8389b * Remove a time-dependent impurity from mc which was caused by 
touching all the source files.  Depending on whether files were
  touched in the same second things would either be rebuilt (which
  would fail) or not.

  Maybe this breaks unzip support, not tested.

svn path=/nixpkgs/trunk/; revision=10500
 2008-02-05 09:34:39 +00:00
Eelco Dolstra 7cc6713bdd * Remove the Reiser4 patch from Gentoo, it broke Grub, with 
a message like

    Running "install --stage2=/boot/grub/stage2 /boot/grub/stage1 (hd0) (hd0)1+15 p (hd0,5)/boot/grub/stage /boot/grub/menu.lst"... failed
    Error 15: File not found


svn path=/nixpkgs/trunk/; revision=10497
 2008-02-04 14:35:15 +00:00
Michael Raskin cc1a66d42d Fixed shebangfix 
svn path=/nixpkgs/trunk/; revision=10492
 2008-02-04 12:07:27 +00:00
Michael Raskin 652984a43b Added dosfstools 
svn path=/nixpkgs/trunk/; revision=10487
 2008-02-04 04:41:55 +00:00
Marc Weber 9a9a078ccf Don't know wether you want to build perl and zip because of mc.. But one of 
mc's features is beeing able to unpack on the fly. You can do that now (.zip)

svn path=/nixpkgs/trunk/; revision=10486
 2008-02-03 23:33:54 +00:00
Michael Raskin 540214e9fd Fixed stable socat (applied patch by Nicolas Pierron); updated Tk installation step for XMaxima compatibility 
svn path=/nixpkgs/trunk/; revision=10482
 2008-02-03 14:17:22 +00:00
Michael Raskin f763d29010 Added socat, updated zsh 
svn path=/nixpkgs/trunk/; revision=10470
 2008-02-03 11:03:54 +00:00
Michael Raskin f6ee57b67f Added nc6, updated xkeyboard-config 
svn path=/nixpkgs/trunk/; revision=10469
 2008-02-03 08:53:47 +00:00
Yury G. Kudryashov f5bf68f9a8 wget: version 1.11 added, made default. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10456
 2008-02-02 20:39:44 +00:00
Yury G. Kudryashov 891295a46a More homepages 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10432
 2008-01-31 10:42:02 +00:00
Yury G. Kudryashov fbfab88e04 Nix-expr style review 
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.


svn path=/nixpkgs/branches/stdenv-updates/; revision=10429
 2008-01-31 10:41:04 +00:00
Yury G. Kudryashov b1b8c4f258 * Added ms-sys, a program for writing Microsoft compatible boot records. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10428
 2008-01-31 10:40:21 +00:00
Yury G. Kudryashov 4ef94bc906 * Latest unstable Nix. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10424
 2008-01-31 10:39:31 +00:00
Yury G. Kudryashov 4d5a4ea903 More homepages 
svn path=/nixpkgs/trunk/; revision=10419
 2008-01-31 10:11:09 +00:00
Yury G. Kudryashov 5bca69ac34 Nix-expr style review 
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
 2008-01-30 17:20:48 +00:00
Eelco Dolstra f831e0420a * Added ms-sys, a program for writing Microsoft compatible boot records. 
svn path=/nixpkgs/trunk/; revision=10414
 2008-01-30 17:08:38 +00:00
Eelco Dolstra 5e629257d8 * Latest unstable Nix. 
svn path=/nixpkgs/trunk/; revision=10397
 2008-01-30 00:56:10 +00:00
Yury G. Kudryashov 6e74bb5974 finger client and daemon added 
svn path=/nixpkgs/trunk/; revision=10364
 2008-01-28 19:51:14 +00:00
Yury G. Kudryashov 0b15fe76ab mc nix-expr review 
svn path=/nixpkgs/trunk/; revision=10361
 2008-01-28 19:49:59 +00:00
Yury G. Kudryashov b85bd7a25e gnupg2 added 
svn path=/nixpkgs/trunk/; revision=10346
 2008-01-28 19:45:57 +00:00
Yury G. Kudryashov 2f9d6fc9ba finger client and daemon added 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10303
 2008-01-26 12:02:57 +00:00
Yury G. Kudryashov 9b2659eec7 Merged with trunk again 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10295
 2008-01-25 14:16:25 +00:00
Michael Raskin 5cc556e313 Added smbfsFuse (executable name fusesmb) 
svn path=/nixpkgs/trunk/; revision=10285
 2008-01-25 10:15:19 +00:00
Michael Raskin dac5ce6e48 Added rlwrap - readline wrapper 
svn path=/nixpkgs/trunk/; revision=10271
 2008-01-23 23:39:06 +00:00
Yury G. Kudryashov f7da6595d6 mc nix-expr review 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10269
 2008-01-23 21:27:44 +00:00
Yury G. Kudryashov da57804fff Merged with trunk again 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
 2008-01-23 18:11:03 +00:00
Sander van der Burg 8c9f87cd0c Added midnight commander package 
svn path=/nixpkgs/trunk/; revision=10257
 2008-01-23 09:58:07 +00:00
Michael Raskin e2c0809777 fixed "which" src 
svn path=/nixpkgs/trunk/; revision=10235
 2008-01-20 22:55:43 +00:00
Armijn Hemel aa275908c0 which: 
* update to 2.19
* add readline dependency
* use mirror:// for download location

svn path=/nixpkgs/trunk/; revision=10231
 2008-01-20 18:23:55 +00:00
Michael Raskin a5e3c976f4 Updated nixUnstable 
svn path=/nixpkgs/trunk/; revision=10230
 2008-01-20 11:19:20 +00:00
Eelco Dolstra 8215b6c953 * pciutils 2.2.8, with the latest pci.ids. 
svn path=/nixpkgs/trunk/; revision=10218
 2008-01-18 14:39:24 +00:00
Eelco Dolstra e55c2246ff * ntp 4.2.4p4. 
svn path=/nixpkgs/trunk/; revision=10217
 2008-01-18 13:20:04 +00:00
Michael Raskin bc46eaf404 Some review of builder-defs and dependent files. No rebuild needed. Now it should be possible to override elements in builderDefs 
svn path=/nixpkgs/trunk/; revision=10214
 2008-01-18 12:36:56 +00:00
Eelco Dolstra a5e0e39cdb * makeWrapper: option --run <CMD> to run a command from the wrapper. 
This is so that the Unison wrapper can be generated with
  makeWrapper.
* Use makeWrapper as a buildInput everywhere.
* Updated BitTorrent, cvs2svn.

svn path=/nixpkgs/trunk/; revision=10213
 2008-01-18 11:28:41 +00:00
Yury G. Kudryashov 16d153bea5 gnupg2 added 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10195
 2008-01-17 13:01:19 +00:00
Eelco Dolstra 42e974a9fe * Apply all patches from Gentoo. 
svn path=/nixpkgs/trunk/; revision=10175
 2008-01-16 13:26:57 +00:00
Andres Löh 5dd65bbfad * updated lhs2TeX to 1.13pre3 
svn path=/nixpkgs/trunk/; revision=10170
 2008-01-16 10:33:06 +00:00
Yury G. Kudryashov 6e8ff2b24b Merged with trunk again 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10155
 2008-01-15 14:32:10 +00:00
Yury G. Kudryashov f7c4d82dd7 gnupg: using sha256 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10152
 2008-01-15 01:42:31 +00:00
Yury G. Kudryashov a7703662a4 Merged with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
 2008-01-15 00:55:21 +00:00
Armijn Hemel 8e71dd811c add chkrootkit. It might need some tweaks to work properly. 
svn path=/nixpkgs/trunk/; revision=10141
 2008-01-14 14:43:24 +00:00
Armijn Hemel ff0c267fb6 416 -> 418 
* update + license change

svn path=/nixpkgs/trunk/; revision=10114
 2008-01-10 21:34:09 +00:00
Eelco Dolstra 43bb722ed9 * Reviving the bleeding edge. 
svn path=/nixpkgs/trunk/; revision=10079
 2008-01-05 23:23:36 +00:00
Michael Raskin 498d47b583 Added module_aggregator. Pass some directories with modules to it, and it will give you a directory to use instead of pkgs.kernel . addSbinPath in builderDefs to use sbin/ in addToEnv . Some catching up in xlaunch. 
svn path=/nixpkgs/trunk/; revision=10075
 2008-01-04 17:02:12 +00:00
Eelco Dolstra 7a3501953c * Grub: patch for splashimage support. 
svn path=/nixpkgs/trunk/; revision=10062
 2008-01-03 16:56:03 +00:00
Eelco Dolstra 1cc3c2b778 * Added Memtest86+. 
svn path=/nixpkgs/trunk/; revision=10059
 2008-01-03 15:14:37 +00:00
Michael Raskin 2d08dca911 Now xlaunch can launch more than one X session. Use first argument starting with : for that. 
svn path=/nixpkgs/trunk/; revision=10053
 2008-01-02 16:43:36 +00:00
Michael Raskin a677869546 Looks like final fix for xlaunch 
svn path=/nixpkgs/trunk/; revision=10044
 2008-01-01 21:01:58 +00:00
Michael Raskin e0317df04f Yet another attempt to fix xlaunch 
svn path=/nixpkgs/trunk/; revision=10039
 2008-01-01 12:15:40 +00:00
Michael Raskin 9784b59b8b Another attempt to fix xlaunch 
svn path=/nixpkgs/trunk/; revision=10038
 2008-01-01 11:49:18 +00:00
Michael Raskin af2c151d9d Fix for xlaunch 
svn path=/nixpkgs/trunk/; revision=10037
 2008-01-01 11:33:25 +00:00
Eelco Dolstra 5a870b6ea9 * Nix 0.11. 
svn path=/nixpkgs/trunk/; revision=10036
 2008-01-01 11:30:41 +00:00
Armijn Hemel e0a14721b1 update to 416 
svn path=/nixpkgs/trunk/; revision=10033
 2007-12-31 23:10:32 +00:00
Eelco Dolstra 8ae848454a * Fix GnuPG download location. 
svn path=/nixpkgs/trunk/; revision=10028
 2007-12-31 21:56:38 +00:00
Armijn Hemel 06e63bccf4 0.6.9 -> 0.6.15 
svn path=/nixpkgs/trunk/; revision=10024
 2007-12-31 21:19:49 +00:00
Armijn Hemel 10af2c18ff download location moved 
svn path=/nixpkgs/trunk/; revision=10023
 2007-12-31 21:08:38 +00:00
Armijn Hemel ff9750bbf1 update to 3.9.8 
svn path=/nixpkgs/trunk/; revision=10006
 2007-12-31 18:43:00 +00:00
Eelco Dolstra 7f91ba32ec * file 4.23. 
svn path=/nixpkgs/trunk/; revision=10002
 2007-12-31 17:56:13 +00:00
Eelco Dolstra 9c2eea2924 * Graphviz 2.16.1. 
svn path=/nixpkgs/trunk/; revision=9999
 2007-12-31 17:53:33 +00:00
Eelco Dolstra 2048819a9b * GNUPG 1.4.8. 
svn path=/nixpkgs/trunk/; revision=9998
 2007-12-31 17:53:11 +00:00
Michael Raskin fa272cab14 Fixed bridge-utils, added qemu, tuned builder-defs unpack, added xlaunch - a tool to launch X using everything possible from the job except slim. 
svn path=/nixpkgs/trunk/; revision=9985
 2007-12-31 08:49:41 +00:00
Michael Raskin a7fada5648 Added Firefox-3b2 (still no idea why it crashes, though), fixed updated FUSE, made relfs_grant add user if none exists 
svn path=/nixpkgs/trunk/; revision=9967
 2007-12-25 12:29:02 +00:00
Eelco Dolstra 5c6cb19b3d * Latest FUSE, sshfs. 
svn path=/nixpkgs/trunk/; revision=9964
 2007-12-24 13:27:07 +00:00
Eelco Dolstra 895f7c9ab4 * Curl 7.17.1. 
* Added a patch to fix --retry in case of connection timeouts when
  --connect-timeout is used.  (--retry is still broken when
  --connect-timeout isn't used.)

svn path=/nixpkgs/trunk/; revision=9956
 2007-12-19 18:39:59 +00:00
Michael Raskin 4290be9a99 Various fixes to lessen reliance on nix.cs.uu.nl for tarballs; version bumps for unavailabel tarballs; ATI driver builds now 
svn path=/nixpkgs/trunk/; revision=9952
 2007-12-18 22:56:12 +00:00
Eelco Dolstra 08bf29ef70 * Added psmisc. 
svn path=/nixpkgs/trunk/; revision=9905
 2007-12-11 11:47:23 +00:00
Marc Weber 1463d5642f hddtemp (tool to get harddisk temperatures) added and 
unfinished qgis expression (in case someone else want's to continue working on it)

svn path=/nixpkgs/trunk/; revision=9903
 2007-12-10 22:36:52 +00:00
Michael Raskin 4830f9589b Dirty fix for BitTornado; draft support for .nar.bz2 in builder-defs; binary Firefox 3b1 (not that it works well, but a starting point anyway.) 
svn path=/nixpkgs/trunk/; revision=9899
 2007-12-10 16:56:55 +00:00
Yury G. Kudryashov d23f0bf7e9 merging trunk... 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9895
 2007-12-08 15:21:03 +00:00
Yury G. Kudryashov 8515c17966 Added gdmap, changed builder-defs to use derivation attribute on propagatedBuildInputs, manually fixed Xorg expression problem for Compiz, various fixes. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9893
 2007-12-08 01:10:32 +00:00
Yury G. Kudryashov 6281ec3eb8 fix name (was 2.16, should have been 2.17) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9890
 2007-12-08 01:09:57 +00:00
Michael Raskin 8dd296f5db Added Relational FS 
svn path=/nixpkgs/trunk/; revision=9865
 2007-12-06 00:32:21 +00:00
Eelco Dolstra 87d67364d8 * Use /etc/ssh/ssh_config to allow system-wide ssh configuration. 
svn path=/nixpkgs/trunk/; revision=9853
 2007-12-04 12:28:22 +00:00
Yury G. Kudryashov a1f7a312c0 cpio: unneeded patches removed 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9817
 2007-12-01 20:04:21 +00:00
Michael Raskin 1bbc6fe55a Added gdmap, changed builder-defs to use derivation attribute on propagatedBuildInputs, manually fixed Xorg expression problem for Compiz, various fixes. 
svn path=/nixpkgs/trunk/; revision=9812
 2007-12-01 16:20:23 +00:00
Armijn Hemel 1589f14709 fix name (was 2.16, should have been 2.17) 
svn path=/nixpkgs/trunk/; revision=9806
 2007-11-28 18:31:37 +00:00
Yury G. Kudryashov b8fafa21e6 Merge commit 'trunk' 
Conflicts:

	pkgs/development/compilers/ocaml/default.nix
	pkgs/development/interpreters/python/default.nix
	pkgs/tools/package-management/nix/unstable.nix
	pkgs/top-level/all-packages.nix

svn path=/nixpkgs/branches/stdenv-updates/; revision=9762
 2007-11-19 22:43:29 +00:00
Eelco Dolstra b37f504680 * Updated various stdenv packages (grep, gawk, tar, cpio, findutils, 
pcre).

svn path=/nixpkgs/branches/stdenv-updates/; revision=9758
 2007-11-19 17:39:19 +00:00
Eelco Dolstra b98c67b1c3 * Use the latest Nix. 
svn path=/nixpkgs/trunk/; revision=9751
 2007-11-19 11:07:51 +00:00
Yury G. Kudryashov 8792fb81c7 Merged with trunk. 
The following is autogenerated by git:

commit 9aaede75e73be646f35069d0717c8c70004ba3f0
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 18:37:23 2007 +0000

    This was needed for me to get a working gnome-doc-utils package

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:30:34 2007 +0000

    gdb upgraded

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit bb908853924046681d1cd6a85b05273aed14fd9f
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:29:11 2007 +0000

    gphoto2 upgraded to 2.4.0: all-packages.nix

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 619c7004d7140d6016927cd1114fd778aca3ecce
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:28:53 2007 +0000

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit f09310ed8403428021d2d751e273fc0add438032
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:28:17 2007 +0000

    gphoto2 upgraded to 2.4.0

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 26d5cc1628e51853fdb9a7d162361b3a13581461
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:27:27 2007 +0000

    missing catalog added. Now you can open files

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:09:32 2007 +0000

    nix expression creating startup wrapper for jedit

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 69701148e45d29b1712c9f14628459def54be076
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:06:53 2007 +0000

    The nice programmers editor jedit is now built on nix as well.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 15ecdd411e78b952d8004323ec871ce6c4969c2e
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:41:15 2007 +0000

    Missing gecko now.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6975eb6f2a972cca2adb2943190a41880e3bedf7
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:36:15 2007 +0000

    Fix path of libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:34:02 2007 +0000

    added libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7fb35510feb89fecc9d92810a723baead232dff4
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:33:36 2007 +0000

    added libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7a9eb1e172ef5b111556d78a30003a87aee7f775
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:24:24 2007 +0000

    libnotify is missing

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 433cc0578ce00860ddfac7d7934818ec0584f6e1
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:08:04 2007 +0000

    Added libsexy

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 194a84b18965e9a3c8f9fa1305fac57690e683cb
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:07:30 2007 +0000

    Added libsexy

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 1d832560cf94bfa6793d90ff43f2235415bc3958
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 13:49:02 2007 +0000

    Added openftd. Doesnt work (yet)

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 13:08:20 2007 +0000

    * GCC 3.4: pass --disable-multilib to make it build on x86_64.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 03:45:42 2007 +0000

    bzip2 dependency added in a couple of places

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 128ac8a7ee8668fc933f4933a66f491c44234379
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 23:47:03 2007 +0000

    Added python to libgsf dependencies

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 1847defee6331b03ba8a54ae9e3e68033310f7a2
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 17:05:45 2007 +0000

    * Use latest Nix.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit cb1992780c20cb5885cf4d3932e7352f8b912533
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 04:23:46 2007 +0000

    Added a currently more functional URL for libgcrypt

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 9d099dbef1a5721065bff5f2edd73844c829f538
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:16:03 2007 +0000

    facile: fixed a typo

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 031c5b7d0797f5eee7be0a06856530c29adee710
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:11:56 2007 +0000

    Added kde-4

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:08:58 2007 +0000

    Added new kde-4 staff

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 18edb608ee7822438d4b2dc2a76af7567efd646a
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:48:40 2007 +0000

    kde-4: removed old staff from kde-4 dir

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:46:48 2007 +0000

    lame: upgrade to 3.97

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 52f8f699f29b6def41eee392f489c7e8ecd9399d
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:44:21 2007 +0000

    libgsf: meta written

    0.14.7 in my previous commit was a typo: 1.14.7 of course

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:40:39 2007 +0000

    libgsf: upgraded to 0.14.7

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7787b342945cb13856168a353fdc9b0062e5f32b
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:37:51 2007 +0000

    clucene: upgrade, kde4: remove

    clucene-core upgraded to 0.9.20
    clucene-contrib removed (can't find any version later than 0.9.16a and don't
    know whether it's compatible with new clucene-core)
    kde4: old staff removed, will add new tonight

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit b4900dece179788dfb8879518b8ec639ba089980
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:25:32 2007 +0000

    Strigi removed

    I'll add a version from kdesupport trunk today

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ffad224993440be069d4f15cf5e73ed018979311
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:23:36 2007 +0000

    dbus-glib upgraded to 0.74, meta written

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:13:29 2007 +0000

    xine-lib: upgraded to 1.1.8

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:11:37 2007 +0000

    chmlib: upgraded to 0.39

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:05:11 2007 +0000

    Added facile library

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:03:29 2007 +0000

    libgcrypt-1.3.1

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ca314a236b855b73024677f6dc5bc021070c4e72
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:49:24 2007 +0000

    Fixed a typo in ocaml-3.10.0

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit b3fa79d09289ab61a30f63692e7c475d0aec142e
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:39:58 2007 +0000

    ocaml: Added 3.10.0, using getVersion staff

    I've added the latest (3.10.0) version of ocaml and let the user choose default
    version.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 853d65d8a9fd65f7bf918c42342baf6690008f54
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:22:06 2007 +0000

    Let user to choose python2.4 or python2.5

    Currently, there is some code duplication. I'll try to rewrite it without
    modifying resulting derivations.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 21:57:26 2007 +0000

    useVersion function added

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 21:41:01 2007 +0000

    git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit dd564f36bd54d4900aefa759bc94cfac7496d1a2
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 19:07:38 2007 +0000

    added small script fixing the shebang (#!/bin/...) path.
    It searches the PATH env variable for the same executable.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 2f9213e49fbaa40634ccb9699e44aec239212aea
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 01:20:17 2007 +0000

    Now SVN Nix builds as a purely alternative Nix choice

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 016b6bfcc67244964251d68d86e1fa6de2062e54
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Tue Nov 13 15:52:16 2007 +0000

    Added possibility to use non-default Nix.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 89f53d7b8dae8d4ec537322340be212602524102
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Tue Nov 13 01:26:54 2007 +0000

    implemented proposal by niksnut.
    Now you have to use either date= or tag= when specifying cvs revision

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:45:47 2007 +0000

    * Symlink $out/bin to $out/libexec.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit d454ab8861882e18ed3b79287727890ec6668455
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:42:13 2007 +0000

    Beta-version of builderDefs fixes.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 959e395c49753d902201d457cee102b40608d3f9
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:12:50 2007 +0000

    djview location corrected

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 52530f607a15017e94225ee50e2698963325ed80
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 13:51:46 2007 +0000

    * Revert the setup hook changes on the trunk (but they remain on the
      stdenv-updates branch).

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 977bdfec49557f48bc1e121e3375c21d4991434f
Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 13:48:33 2007 +0000

    * added Haskell package gtk2hs

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
 2007-11-16 21:05:15 +00:00
Michael Raskin dded839300 bzip2 dependency added in a couple of places 
svn path=/nixpkgs/trunk/; revision=9702
 2007-11-16 03:45:42 +00:00
Eelco Dolstra 15d26bb5c9 * Use latest Nix. 
svn path=/nixpkgs/trunk/; revision=9695
 2007-11-15 17:05:45 +00:00
Marc Weber a89817cba8 added small script fixing the shebang (#!/bin/...) path. 
It searches the PATH env variable for the same executable.

svn path=/nixpkgs/trunk/; revision=9667
 2007-11-14 19:07:38 +00:00
Michael Raskin 076cc3a7d8 Now SVN Nix builds as a purely alternative Nix choice 
svn path=/nixpkgs/trunk/; revision=9666
 2007-11-14 01:20:17 +00:00
Michael Raskin 29e0bc3103 Added possibility to use non-default Nix. 
svn path=/nixpkgs/trunk/; revision=9663
 2007-11-13 15:52:16 +00:00
Michael Raskin 43b208bbb9 Fixed synaptics; Added GOCR (not that it is a good OCR); reverted MarcWeber's update to setup-new-2.sh (he has no time to use it in nearest future; later I hope it will be irrelevant) 
svn path=/nixpkgs/trunk/; revision=9613
 2007-11-09 13:54:02 +00:00
Eelco Dolstra 8b3190234c * Build ssmtp with TLS support. 
* Added gnutls (but it turns out that ssmtp also builds with openssl,
  so I don't actually use it).

svn path=/nixpkgs/trunk/; revision=9604
 2007-11-08 17:48:52 +00:00
Michael Raskin a8db1746a5 Fixed log nesting; added Qi. 
svn path=/nixpkgs/trunk/; revision=9601
 2007-11-08 14:34:54 +00:00
Eelco Dolstra 623437eaa2 * Latest version. 
svn path=/nixpkgs/trunk/; revision=9584
 2007-11-05 11:22:37 +00:00
Marc Weber 82ed95c0cc Hardwiring in xauth path so that user does not have to install xauth to run the tightvnc server 
svn path=/nixpkgs/trunk/; revision=9580
 2007-11-05 09:17:05 +00:00
Wouter den Breejen e4455ea7c1 Removing ftpfuse again (which does no build since it has no --prefix option) because we have curlftpfs which does the same. 
svn path=/nixpkgs/trunk/; revision=9522
 2007-10-25 14:50:05 +00:00
Wouter den Breejen f90b297ea1 Added curlftpfs really this time 
svn path=/nixpkgs/trunk/; revision=9521
 2007-10-25 14:45:00 +00:00
Wouter den Breejen 48df959548 Added curlftpfs which is for mounting ftp's with fuse. 
svn path=/nixpkgs/trunk/; revision=9520
 2007-10-25 14:07:50 +00:00
Eelco Dolstra deb889e5f2 * OpenSSH 4.7p1. Also pass --with-mantype=man to prevent an impurity 
where "make install" installs the manpages under either "man" or
  "cat" depending on whether it can run /usr/bin/groff (or something
  like that).

svn path=/nixpkgs/trunk/; revision=9503
 2007-10-22 11:41:30 +00:00
Armijn Hemel 614a3b47c6 update to 2.17 
svn path=/nixpkgs/trunk/; revision=9499
 2007-10-20 17:39:28 +00:00
Eelco Dolstra dc49f13eef * Latest version. 
svn path=/nixpkgs/trunk/; revision=9479
 2007-10-19 11:38:58 +00:00
Eelco Dolstra 8d4986e2e8 * Added smartmontools. 
svn path=/nixpkgs/trunk/; revision=9466
 2007-10-18 13:05:43 +00:00
Michael Raskin 77a46300fa Added patch from Gentoo for glibc 2.6 compatibility. It just randomly renames an inner function, so glibc 2.5-safe. 
svn path=/nixpkgs/trunk/; revision=9441
 2007-10-11 03:41:29 +00:00
Eelco Dolstra 08f647a5e6 * Added a telnet client. 
svn path=/nixpkgs/trunk/; revision=9431
 2007-10-09 09:56:39 +00:00
Michael Raskin c86efaec81 Added E authomated theorem prover and script eproof-tptp for TPTP syntax. 
svn path=/nixpkgs/trunk/; revision=9418
 2007-10-07 13:37:08 +00:00
Michael Raskin 7aec010f6a Added aMule 
svn path=/nixpkgs/trunk/; revision=9413
 2007-10-06 15:59:35 +00:00
Michael Raskin 0de5cbedef Corrected vncserver 
svn path=/nixpkgs/trunk/; revision=9406
 2007-10-05 05:55:44 +00:00
Michael Raskin 3ea21c3fdc Added Xvnc build to tightvnc 
svn path=/nixpkgs/trunk/; revision=9404
 2007-10-04 18:49:04 +00:00
Michael Raskin d2c1953e8d Updated keynav; new features; do not forget to copy keynavrc from share/keynav/doc to ~/.keynavrc 
svn path=/nixpkgs/trunk/; revision=9391
 2007-10-01 19:47:53 +00:00
Michael Raskin 3dc3021d01 Renamed replace executable to replace-literal (Yurii Kudryashov noticed conflict with MySQL) 
svn path=/nixpkgs/trunk/; revision=9376
 2007-09-27 14:48:09 +00:00
Michael Raskin 2c25696b76 Returned timidity and its expression with a last-minute-fix.. 
svn path=/nixpkgs/trunk/; revision=9362
 2007-09-23 16:28:56 +00:00
Marc Weber aec8aa6ed1 sorry for the typo 
svn path=/nixpkgs/trunk/; revision=9360
 2007-09-23 15:17:30 +00:00
Marc Weber fff189ae08 xclip added 
svn path=/nixpkgs/trunk/; revision=9355
 2007-09-21 21:40:23 +00:00
Eelco Dolstra ebacd32b71 * Added libgd. 
* gnuplot 4.2.2.

svn path=/nixpkgs/trunk/; revision=9354
 2007-09-21 20:43:43 +00:00
Eelco Dolstra 639faa0233 * Use latest Nix-unstable. 
svn path=/nixpkgs/trunk/; revision=9333
 2007-09-18 14:57:47 +00:00
Eelco Dolstra b1dbdd9903 * Added TestDisk, a program for fixing unbootable disks. 
svn path=/nixpkgs/trunk/; revision=9318
 2007-09-12 15:49:28 +00:00
Eelco Dolstra 8f4d8573c0 * Fix a bunch of URLs. 
svn path=/nixpkgs/trunk/; revision=9292
 2007-09-11 10:15:07 +00:00
Marc Weber bc92b20f9a rdiff-backup added 
svn path=/nixpkgs/trunk/; revision=9280
 2007-09-08 20:45:23 +00:00
Eelco Dolstra a1022416c5 * Latest unstable Nix. 
svn path=/nixpkgs/trunk/; revision=9274
 2007-09-06 20:45:36 +00:00
Eelco Dolstra af7da7f19d * Added p7zip for decompressing 7-zip archives. 
svn path=/nixpkgs/trunk/; revision=9248
 2007-09-04 11:55:19 +00:00
Marc Weber 088a6817db added: 
dnsmasq, uisp, fltk libixp_for_wmii, acerhk kernel module, reiserfsprogs, radeontools, msmtp,
procmail, pstree, gxemul

changed:
umlutilities to also support building tunctl optionally (needing kernel header files)
wmii updated and wmiimenu added                                                 

svn path=/nixpkgs/trunk/; revision=9242
 2007-09-03 12:10:57 +00:00
Eelco Dolstra d8046322a9 * Added netselect. 
svn path=/nixpkgs/trunk/; revision=9225
 2007-08-31 11:14:05 +00:00
Marc Weber 606dba5d0a update nix version to latest nix-0.11pre9217 
svn path=/nixpkgs/trunk/; revision=9218
 2007-08-30 14:44:02 +00:00
Eelco Dolstra 3ef0b80bdd * Added jwhois, the GNU whois client. 
svn path=/nixpkgs/trunk/; revision=9211
 2007-08-28 14:45:00 +00:00
Eelco Dolstra d39fd2a578 * Rewrite all the kernel.org URLs to mirror://kernel/. 
svn path=/nixpkgs/trunk/; revision=9202
 2007-08-27 13:59:40 +00:00
Eelco Dolstra 544cb9cb83 * Rewrite all URLs to GNU mirrors to mirror://gnu/. 
svn path=/nixpkgs/trunk/; revision=9201
 2007-08-27 13:42:00 +00:00
Eelco Dolstra 607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/. 
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
 2007-08-27 13:01:33 +00:00
Andres Löh 1cb9fc74b7 * added propagated-user-env-packages for lhs2tex and polytable 
svn path=/nixpkgs/trunk/; revision=9195
 2007-08-24 20:15:00 +00:00
Eelco Dolstra a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl 
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
 2007-08-24 12:32:36 +00:00
Armijn Hemel 5021eefe40 0.6 -> 0.8 
svn path=/nixpkgs/trunk/; revision=9182
 2007-08-21 20:51:34 +00:00
Eelco Dolstra 2f21c59a3f * Use FontForge to give Wine better fonts. 
svn path=/nixpkgs/trunk/; revision=9181
 2007-08-21 12:31:33 +00:00
Michael Raskin 8fd03a4dac Added wvVare - tools for converting Microsoft Word formats to usable ones. 
svn path=/nixpkgs/trunk/; revision=9152
 2007-08-18 08:32:12 +00:00
Eelco Dolstra eeb42a6dae * Doh. 
svn path=/nixpkgs/trunk/; revision=9149
 2007-08-17 13:37:53 +00:00
Eelco Dolstra f3b3d53600 * Sudo 1.6.9p4. 
svn path=/nixpkgs/trunk/; revision=9148
 2007-08-17 13:37:28 +00:00
Armijn Hemel e08a441603 add axel, a downloader with support for multiple connection for faster downloading 
svn path=/nixpkgs/trunk/; revision=9139
 2007-08-16 19:50:59 +00:00
Eelco Dolstra 6f1ad6fd79 * Function `writeScript' which is like writeText but makes its output executable. 
* Latest unstable Nix.

svn path=/nixpkgs/trunk/; revision=9123
 2007-08-14 16:41:41 +00:00
Eelco Dolstra fbfed1e2d8 * xine-lib 1.1.7, xine-ui 0.99.5. 
svn path=/nixpkgs/trunk/; revision=9118
 2007-08-14 12:10:11 +00:00
Michael Raskin efbabdb598 Converted Vim package to a template-based form with only lists filled in manually. Added library functions to support it. Added two proposed package templates to top-level, so that every discussion about package format can result in just editing templates or adding new ones. 
svn path=/nixpkgs/trunk/; revision=9100
 2007-08-11 10:34:07 +00:00
Michael Raskin 4d137ad014 Added xmacro; updated clisp - well, it compiles now... 
svn path=/nixpkgs/trunk/; revision=9098
 2007-08-10 18:54:44 +00:00
Eelco Dolstra 254b6fe6d3 * Added ktorrent. To use, add your ~/.nix-profile to the KDEDIRS 
environment variable and rerun kbuildsycoca.  (Otherwise ktorrent
  will work, but it won't be able to find its plugins.)

svn path=/nixpkgs/trunk/; revision=9081
 2007-08-09 16:55:14 +00:00
Andres Löh 7f30b40e65 * add ssmtp 
still rather rough around the edges:
  - example config files are installed to $out/etc/ssmtp
  - the binary expects config files in /etc/ssmtp
  - it's the user's responsibility to add the global config files

svn path=/nixpkgs/trunk/; revision=9064
 2007-08-07 22:22:31 +00:00
Andres Löh b90010367e * update sudo version 
svn path=/nixpkgs/trunk/; revision=9050
 2007-08-05 18:21:28 +00:00
Michael Raskin 99d499f0c8 Added X11 option for gnuplot. 
svn path=/nixpkgs/trunk/; revision=9046
 2007-08-04 15:11:48 +00:00
Michael Raskin 5708413b42 Added keynav. 
svn path=/nixpkgs/trunk/; revision=9045
 2007-08-04 13:21:09 +00:00
Michael Raskin ffc6782e4e Updated nmap; X version also builds now 
svn path=/nixpkgs/trunk/; revision=9043
 2007-08-04 12:49:53 +00:00
Michael Raskin ce5b2cfa14 Added lftp ftp client. 
svn path=/nixpkgs/trunk/; revision=9041
 2007-08-04 12:40:45 +00:00
Wouter den Breejen eb1bfefa91 Fixed a /bin/echo reference 
svn path=/nixpkgs/trunk/; revision=8995
 2007-07-18 10:32:20 +00:00
Michael Raskin 656cd8bf80 Added replace. Maybe abandon sed for substituteAll ? 
svn path=/nixpkgs/trunk/; revision=8987
 2007-07-15 11:59:33 +00:00
Michael Raskin 9e8cc9787e Added Filelight - a tool to quickly find disk eating files/directories. 
svn path=/nixpkgs/trunk/; revision=8983
 2007-07-14 14:41:06 +00:00
Michael Raskin f584c9fe75 Added ncat - for IPv6 support. 
svn path=/nixpkgs/trunk/; revision=8964
 2007-07-09 07:23:16 +00:00
Armijn Hemel 9c542effbe ed 0.6: 
* few fixes
* GPLv3

svn path=/nixpkgs/trunk/; revision=8942
 2007-07-02 20:26:49 +00:00
Michael Raskin 68d6762e0f I hope I disabled ncursesw in Cygwin. Also fixed device-mapper mention in system.nix. Also added pam in the list of sudo dependencies, it should be done anyway, but still only NOPASSWD entries work. 
svn path=/nixpkgs/trunk/; revision=8931
 2007-06-28 22:14:25 +00:00
Yury G. Kudryashov 40657fbece * ncurses: added symlinks for bynary packages linked against libncurses. Tested 
with ghc. I will add 'unicode' option next check in (for cygwin).
* pidgin:  Got rid of builder.sh, added ncurses to the dependencies, so it builds
           finch.
* xorg:    Added glproto and mesaHeaders to xf86videosis dependencies. Now it
           compiles.
* pwgen:   Added.
* device-mapper: Version bump. Added 'static' option for use in initrd.
* lvm2:          Version bump. Added 'static' option for use in initrd.

svn path=/nixpkgs/trunk/; revision=8923
 2007-06-28 09:53:12 +00:00
Michael Raskin d80093f2ff Added version suffixes. 
svn path=/nixpkgs/trunk/; revision=8921
 2007-06-26 12:13:17 +00:00
Michael Raskin 42f841bcab Added some descriptions. 
svn path=/nixpkgs/trunk/; revision=8920
 2007-06-26 11:49:45 +00:00
Michael Raskin 868554700b Added unrar 
svn path=/nixpkgs/trunk/; revision=8916
 2007-06-24 15:34:44 +00:00
Michael Raskin 53b7c42a92 Added GNU units - unit conversion tool. 
svn path=/nixpkgs/trunk/; revision=8907
 2007-06-20 15:15:51 +00:00
Michael Raskin 9dc9c364bc Changed DHCP expression not to fail on global /var/state installation. 
svn path=/nixpkgs/trunk/; revision=8904
 2007-06-20 12:45:02 +00:00
Michael Raskin 35ae2ce5c3 Adding forgot new files for sudo and BitTornado 
svn path=/nixpkgs/trunk/; revision=8899
 2007-06-20 09:34:42 +00:00
Eelco Dolstra fffe4c7900 * /var/state -> /var/run. 
svn path=/nixpkgs/trunk/; revision=8851
 2007-06-09 19:46:27 +00:00
Eelco Dolstra 97b9846c06 * Latest unstable Nix. 
svn path=/nixpkgs/trunk/; revision=8823
 2007-06-04 10:22:26 +00:00
Eelco Dolstra ce0fdeb20a * Latest AEFS. 
svn path=/nixpkgs/trunk/; revision=8822
 2007-06-03 20:17:15 +00:00
Eelco Dolstra d16ae4efcf * Added wxGTK/wxPython 2.8. However this was quite pointless as 
Bittorrent is even more broken with wxPython 2.8.

svn path=/nixpkgs/trunk/; revision=8812
 2007-05-31 13:43:13 +00:00
Eelco Dolstra 89a47c3feb * Added unshield, a program for unpacking InstallShield CAB files 
(which are different from Windows Installer CAB files).

svn path=/nixpkgs/trunk/; revision=8797
 2007-05-28 17:09:30 +00:00
Wouter den Breejen 5200276c3b nixpkgs dir: nvidia and libsrvg 
svn path=/nixpkgs/trunk/; revision=8785
 2007-05-28 14:10:46 +00:00
Eelco Dolstra eec1e8dc0e * New xmltv. 
svn path=/nixpkgs/trunk/; revision=8779
 2007-05-27 13:23:27 +00:00