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

1043 commits

Author SHA1 Message Date
Ludovic Courtès 448452a734 Gnash: Run the test suite. 
svn path=/nixpkgs/trunk/; revision=13073
 2008-10-15 08:43:50 +00:00
Ludovic Courtès 624c3c9ff6 GNU ed 1.1. 
svn path=/nixpkgs/trunk/; revision=13072
 2008-10-15 07:26:14 +00:00
Marc Weber 1669c048a2 added meta tag to xvidcap 
svn path=/nixpkgs/trunk/; revision=13071
 2008-10-14 15:26:25 +00:00
Eelco Dolstra 9fd8d270e1 * Subversion 1.5.3. 
svn path=/nixpkgs/trunk/; revision=13070
 2008-10-14 14:59:43 +00:00
Marc Weber 5a4a28e437 added cinelerra (video editing application) 
svn path=/nixpkgs/trunk/; revision=13068
 2008-10-14 14:01:50 +00:00
Ludovic Courtès 064d1af52b GNU Gnash 0.8.4. 
svn path=/nixpkgs/trunk/; revision=13059
 2008-10-14 08:26:00 +00:00
Armijn Hemel ed9151d338 gimp 2.4 -> 2.6 + update dependencies 
svn path=/nixpkgs/trunk/; revision=13039
 2008-10-09 23:21:39 +00:00
Marc Weber d827e4f16f updated darcs2 to last release (2.1.0pre3) which fixed some http download problems. 
Also adding assertion to force users to switch to darcs-2 unless they really want to keep using darcs-1

svn path=/nixpkgs/trunk/; revision=13038
 2008-10-09 22:58:14 +00:00
Ludovic Courtès 750e48549d abcde: Fix URL. 
svn path=/nixpkgs/trunk/; revision=13012
 2008-10-08 18:52:20 +00:00
Ludovic Courtès 61f18ebe83 Quack: Update hash to the current version. 
svn path=/nixpkgs/trunk/; revision=13008
 2008-10-08 18:01:24 +00:00
Pjotr Prins 3ce5cba9c7 Added pkgMaintainer info to these 'biology' section packages. 
svn path=/nixpkgs/trunk/; revision=12987
 2008-10-07 15:12:06 +00:00
Pjotr Prins b3aa5d6bfc Added meta.pkgMaintainer to biology packages - a claim to fame, or 
you know who to blame!

svn path=/nixpkgs/trunk/; revision=12986
 2008-10-07 15:12:01 +00:00
Pjotr Prins 4ab58fc7f3 Squashed commit of the following: 
commit 74c0e9192e17d9dfce50f811fdb7e82a2785134e
Author: Pjotr <pjotr.public05@thebird.nl>
Date:   Tue Oct 7 16:33:39 2008 +0200

    Merge

commit ad91fb07a47226ed9e99f2dcb55b69ea0e70aa84
Author: Pjotr <pjotr.public05@thebird.nl>
Date:   Tue Oct 7 16:23:20 2008 +0200

    openmotif: added some comments on license and download

commit 68a552975f5c7e0964c7c9625e08de0864757255
Author: Pjotr <pjotr.public05@thebird.nl>
Date:   Tue Oct 7 16:10:49 2008 +0200

    Match parameters so arb starts compiling against openmotif

commit 16c52fb4071193f89acf6f7f53cfeff322285555
Author: Pjotr <pjotr.public05@thebird.nl>
Date:   Tue Oct 7 16:04:06 2008 +0200

    Added openmotif package

commit 75c4bba418f16859e99e97f48785e27ad87e99f5
Author: Pjotr <pjotr.public05@thebird.nl>
Date:   Tue Oct 7 15:20:55 2008 +0200

    Adding openmotif

commit 83a847d194b007e2ef856f2a5ad7c49939b6cf8c
Merge: 52918f1... 5ba4f06...
Author: Pjotr <pjotr.public05@thebird.nl>
Date:   Tue Oct 7 14:15:05 2008 +0200

    Merge branch 'syncsvn'

    Conflicts:
    	pkgs/top-level/all-packages.nix

commit 52918f1f3af55429cc80c99d695e4a8d8b7869b0
Author: Pjotr Prins <wrk@nema-ws01.wurnet.nl>
Date:   Mon Oct 6 18:31:06 2008 +0200

    arb: Removed xfig as dependency (will add later)
    arb: Don't recurse chmod settings of shared dir

commit c283733782dcbf0dcd88710e83f3eededf8f0866
Merge: e434cdf... a51773a...
Author: Pjotr Prins <wrk@nema-ws01.wurnet.nl>
Date:   Mon Oct 6 17:09:42 2008 +0200

    Merge branch 'master' of ssh://bio4.xparrot.eu//export/data/repositories/git/nixpkgs-testing-pjotr

commit a51773a3d4295d7ce16e6a7e983ded814180e30a
Merge: 290ae0b... 241012c...
Author: Pjotr <pjotr.public05@thebird.nl>
Date:   Mon Oct 6 16:54:14 2008 +0200

    Merge branch 'master' of ssh://bio4.xparrot.eu//export/data/repositories/git/nixpkgs-testing-pjotr

commit e434cdf9b9acefab4f54e18204ff16af179c442d
Merge: ef57566... 241012c...
Author: Pjotr Prins <wrk@nema-ws01.wurnet.nl>
Date:   Mon Oct 6 16:12:27 2008 +0200

    Merge branch 'master' of ssh://bio4.xparrot.eu//export/data/repositories/git/nixpkgs-testing-pjotr

commit 241012cae194d0f770be2224b5bb18b66e3ae0f0
Author: Pj <wrk@bio03.(none)>
Date:   Mon Oct 6 16:11:11 2008 +0200

    Added older version of lesstif for arb

commit 290ae0b802285a8dda41b3c5730e53239d73b47c
Merge: dfdf7fe... 53b6ceb...
Author: Pjotr <pjotr.public05@thebird.nl>
Date:   Mon Oct 6 15:20:17 2008 +0200

    Merge branch 'master' of ssh://bio4.xparrot.eu//export/data/repositories/git/nixpkgs-testing-pjotr

commit dfdf7fe8ac9599ec372bdb83630a236f227ad7d5
Author: Pjotr <pjotr.public05@thebird.nl>
Date:   Mon Oct 6 15:15:04 2008 +0200

    Fixed missing parameters for arb - and added kernelHeaders_2.6.18

commit ef57566834eb786cdcb57a799b7d1cb284eee389
Author: Pjotr Prins <wrk@nema-ws01.wurnet.nl>
Date:   Mon Oct 6 15:06:26 2008 +0200

    Changed arb permissions and priority

svn path=/nixpkgs/trunk/; revision=12985
 2008-10-07 14:35:11 +00:00
Eelco Dolstra a4b6f1066c * Subversion 1.5: fix building the Apache module and the 
Python/Perl bindings.

svn path=/nixpkgs/trunk/; revision=12979
 2008-10-06 23:01:54 +00:00
Eelco Dolstra 781bb5a6e1 * Apache httpd: build against apr, aputil and pcre instead of using 
its own copies.

svn path=/nixpkgs/trunk/; revision=12971
 2008-10-06 13:38:45 +00:00
Pjotr Prins bd0b84b3c7 Changed arb permissions and priority 
svn path=/nixpkgs/trunk/; revision=12969
 2008-10-06 13:17:56 +00:00
Eelco Dolstra 6591cc2640 * Subversion 1.5.2, Neon 0.28.3, Apache 2.2.9. 
svn path=/nixpkgs/trunk/; revision=12966
 2008-10-06 12:35:05 +00:00
Pjotr Prins 6d70506401 Small fixes to ARB 
Included older kernel headers

svn path=/nixpkgs/trunk/; revision=12961
 2008-10-05 10:56:47 +00:00
Pjotr Prins c38a72a573 Added more dependencies for ARB 
svn path=/nixpkgs/trunk/; revision=12959
 2008-10-05 10:56:44 +00:00
Pjotr Prins fcb2efbc92 Added shared dir and updated reference to ARB 
svn path=/nixpkgs/trunk/; revision=12958
 2008-10-05 10:56:23 +00:00
Pjotr Prins 29d6189e8b The arb package (biology) 
svn path=/nixpkgs/trunk/; revision=12956
 2008-10-05 09:03:58 +00:00
Pjotr Prins 034f28e268 Biology package 
svn path=/nixpkgs/trunk/; revision=12953
 2008-10-05 09:00:19 +00:00
Pjotr Prins 6c772d627f rq (a cluster runner) works 
svn path=/nixpkgs/trunk/; revision=12950
 2008-10-05 08:48:49 +00:00
Pjotr Prins d2499a6e52 Patch for rq (send upstream) 
svn path=/nixpkgs/trunk/; revision=12949
 2008-10-05 08:48:23 +00:00
Pjotr Prins df1e47822b Lower priority of this package because of zlib.so conflict 
svn path=/nixpkgs/trunk/; revision=12945
 2008-10-05 08:42:40 +00:00
Marc Weber 7d09a82119 opera: don't strip because of patchelf usage 
svn path=/nixpkgs/trunk/; revision=12943
 2008-10-04 18:18:23 +00:00
Michael Raskin b6531cd295 Desperate effort to fix x86_64 build by using -fPIC 
svn path=/nixpkgs/trunk/; revision=12942
 2008-10-04 16:21:28 +00:00
Michael Raskin 3a7ffa5c58 Some of preparation work for adding Xen. Troubles: 1. Xen Dom0 support not complete in mainline. 2. Xen's love to check for headers in /usr/include. To do afterwards: We need to change bootloading setup a bit. 
svn path=/nixpkgs/trunk/; revision=12941
 2008-10-04 15:24:08 +00:00
Ludovic Courtès e2c0146ad0 GNU IceCat 3.0.3-g1. 
svn path=/nixpkgs/trunk/; revision=12936
 2008-10-02 13:00:18 +00:00
Ludovic Courtès 4e283a4dcb MPlayerPlugin: Add missing `icecat3-idldir.path'. 
svn path=/nixpkgs/trunk/; revision=12931
 2008-09-29 21:59:31 +00:00
Ludovic Courtès b46faa7a45 GNU IceCat: Allow compilation of XulRunner. 
In turn, this allows compilation of plug-ins like MPlayer's.

svn path=/nixpkgs/trunk/; revision=12930
 2008-09-29 21:58:25 +00:00
Ludovic Courtès 2e30347099 MPlayerPlugin: Allow compilation with GNU IceCat 3. 
Similar changes would allow it to be compiled for Mozilla Firefox 3.

svn path=/nixpkgs/trunk/; revision=12929
 2008-09-29 21:56:17 +00:00
Marc Weber c4906848f4 fix building of opera, it is still killed 
svn path=/nixpkgs/trunk/; revision=12928
 2008-09-27 00:45:55 +00:00
Ludovic Courtès 4f0a7f0d40 GNU gv 3.6.6. 
svn path=/nixpkgs/trunk/; revision=12927
 2008-09-26 15:31:38 +00:00
Ludovic Courtès fab4b2bca4 bitlbee-otr: Correctly link against libgcrypt. 
svn path=/nixpkgs/trunk/; revision=12926
 2008-09-26 12:32:06 +00:00
Ludovic Courtès d495ee42d9 Add Bitbee-OTR, an unofficial version of Bitlbee with OTR support. 
svn path=/nixpkgs/trunk/; revision=12925
 2008-09-26 09:03:22 +00:00
Ludovic Courtès 47da0e9902 GNU IceCat 3.0.2-g1. 
svn path=/nixpkgs/trunk/; revision=12919
 2008-09-25 08:45:37 +00:00
Ludovic Courtès 3d27b5db34 GNU IceCat: Prepare for Xulrunner build. 
svn path=/nixpkgs/trunk/; revision=12918
 2008-09-25 07:33:04 +00:00
Ludovic Courtès da14d70415 GNU IceCat: Prepare for Xulrunner build. 
svn path=/nixpkgs/trunk/; revision=12917
 2008-09-25 07:32:57 +00:00
Michael Raskin 530c8a4e5b Double oops 
svn path=/nixpkgs/trunk/; revision=12915
 2008-09-24 14:45:28 +00:00
Michael Raskin 6b97827f14 oops, recursionwas needed on an attribute set 
svn path=/nixpkgs/trunk/; revision=12914
 2008-09-24 14:15:35 +00:00
Michael Raskin 4b21f11fda Updated xscreensaver; removed all versions as sources are removed off site anyway.. 
svn path=/nixpkgs/trunk/; revision=12912
 2008-09-24 13:57:16 +00:00
Marc Weber 8d02b898c0 updated darcs to the last stable release (2.0.2) 
svn path=/nixpkgs/trunk/; revision=12908
 2008-09-24 00:43:05 +00:00
Marc Weber 92fb53a1a5 removed subversion14merge 
I don't think anyone is still using it
everyone caring about merging is using git or such anyway
and subversion15 has support built in.

svn path=/nixpkgs/trunk/; revision=12905
 2008-09-24 00:42:21 +00:00
Marc Weber 32e2dbf87f added wavesurfer (sound analysis tool) and its dependency snack (tcl /python sound tool library) 
svn path=/nixpkgs/trunk/; revision=12904
 2008-09-24 00:42:06 +00:00
Eelco Dolstra ba6845d03e * gphoto updated to 2.4.2. 
svn path=/nixpkgs/trunk/; revision=12900
 2008-09-22 17:06:31 +00:00
Pjotr Prins c09e1e540c Introduced pal2nal package 
svn path=/nixpkgs/trunk/; revision=12896
 2008-09-19 13:39:17 +00:00
Pjotr Prins 301f2e3094 Bumped PAML version 
svn path=/nixpkgs/trunk/; revision=12895
 2008-09-19 13:36:35 +00:00
Ludovic Courtès b998c44e4c Change name' attribute of Emacs 23 to emacs-snapshot-23-xxx'. 
This is so that "nix-env -u emacs" doesn't switch from, say, Emacs 22
to Emacs 23.

svn path=/nixpkgs/trunk/; revision=12894
 2008-09-19 12:34:04 +00:00
Eelco Dolstra dbae3ea4a2 * Compiz 0.7.8. 
svn path=/nixpkgs/trunk/; revision=12881
 2008-09-18 15:20:53 +00:00
Michael Raskin 8261a3b1b0 Hm, midori build would like to use file. 
svn path=/nixpkgs/trunk/; revision=12865
 2008-09-15 10:30:04 +00:00
Armijn Hemel dbcba78213 pidgin otr + libotr 3.1.0 -> 3.2.0 
svn path=/nixpkgs/trunk/; revision=12860
 2008-09-13 10:40:33 +00:00
Armijn Hemel 263b3d8f1e 3.0.0 -> 3.0.4 
svn path=/nixpkgs/trunk/; revision=12858
 2008-09-13 10:11:39 +00:00
Armijn Hemel e89fed21f9 update to 1.0.3 
svn path=/nixpkgs/trunk/; revision=12845
 2008-09-11 22:04:27 +00:00
Armijn Hemel 831deddc00 0.9 -> 1.0 (after 20 years or so) 
svn path=/nixpkgs/trunk/; revision=12843
 2008-09-11 17:30:57 +00:00
Ludovic Courtès a2c47582b3 GNU Emacs 22.3. 
svn path=/nixpkgs/trunk/; revision=12825
 2008-09-08 12:10:22 +00:00
Marc Weber 1aea0c12a3 updated freemind to 0.9.0_Beta_20, purified env sto make it work for everyone a 
svn path=/nixpkgs/trunk/; revision=12819
 2008-09-07 21:17:49 +00:00
Michael Raskin 958ea79a78 Added Midori - a light, WebKit-based GTK browser. 
svn path=/nixpkgs/trunk/; revision=12818
 2008-09-07 12:58:56 +00:00
Michael Raskin 317d89066b Force Pidgin to use GnuTLS when it is offered. 
svn path=/nixpkgs/trunk/; revision=12816
 2008-09-06 18:23:55 +00:00
Michael Raskin de45b13c79 Options to remove OpenSSL and use gnuTLS for Pidgin (reported to work better with, say, Amessage or any other XMPP server which requires strong channel encryption) 
svn path=/nixpkgs/trunk/; revision=12813
 2008-09-06 10:30:55 +00:00
Nicolas Pierron 6c4a6e83b4 Move maxima close to scilab. (applications/science/math) 
Requested by Michael Raskin.

svn path=/nixpkgs/trunk/; revision=12812
 2008-09-05 17:21:45 +00:00
Nicolas Pierron 517a120ff8 Add scilab-4.1.2 
svn path=/nixpkgs/trunk/; revision=12810
 2008-09-05 17:12:04 +00:00
Ludovic Courtès 54a5f9c9fc IceCat: Remove outdated comment. 
svn path=/nixpkgs/trunk/; revision=12805
 2008-09-05 09:16:15 +00:00
Ludovic Courtès a31f01e83b GNUnet: Wrap `gnunetd' so that it can dlopen the modules. 
svn path=/nixpkgs/trunk/; revision=12801
 2008-09-04 20:24:03 +00:00
Ludovic Courtès 6f2086ec0e Git 1.6.0.1. 
svn path=/nixpkgs/trunk/; revision=12800
 2008-09-04 19:52:27 +00:00
Eelco Dolstra 35f684458a * Removed some unnecessary code. 
svn path=/nixpkgs/trunk/; revision=12799
 2008-09-04 12:27:17 +00:00
Eelco Dolstra c754b8b27c * Thunderbird 2.0.0.16. 
* Re-enabled chatzilla in the channel.

svn path=/nixpkgs/trunk/; revision=12796
 2008-09-04 09:36:04 +00:00
Eelco Dolstra 313515452c * Removed an outdated comment. 
svn path=/nixpkgs/trunk/; revision=12795
 2008-09-04 09:33:59 +00:00
Eelco Dolstra 549a4405e3 * xulrunner-wrapper: use Firefox 3 directly (via "firefox -app"), 
since it has full support for running XUL applications.  This saves
  a lot of space (you don't need two copies of basically the same
  software).
* Deleted the old xulrunner (1.8.0.4), it didn't compile anyway with
  recent GTK.
* Updated chatzilla to 0.9.83.

svn path=/nixpkgs/trunk/; revision=12794
 2008-09-04 09:29:09 +00:00
Eelco Dolstra 5d9dfc1e60 * Removed $installCommand, it's no longer needed since we split the 
install and fixup phases.  You can just override installPhase.

svn path=/nixpkgs/trunk/; revision=12787
 2008-09-02 13:51:32 +00:00
Armijn Hemel d7d4d48d9e update to 2.5.1 
svn path=/nixpkgs/trunk/; revision=12785
 2008-09-02 10:21:41 +00:00
Ludovic Courtès 98e810a79e GNUnet: Fix the way tests are run, but don't run them anyway. 
svn path=/nixpkgs/trunk/; revision=12776
 2008-08-30 21:36:28 +00:00
Pjotr Prins 73d2e4f49d - Some Ruby interpreter bumped version 
- Kernel headers 2.6.18 added (XEN virtual images)
- unifdef package added for kernel headers 2.6.18
- Python Zope and 4suite added
- Trying bioconductor packages with R-lang (still failing)
- Bumped gmp version
- Added rq cluster runner - still requires extra gems (installs, but does not run)


svn path=/nixpkgs/trunk/; revision=12766
 2008-08-29 13:53:28 +00:00
Eelco Dolstra 6c2cbbbe87 * Updated Audacious and its dependencies. 
svn path=/nixpkgs/trunk/; revision=12763
 2008-08-29 11:31:16 +00:00
Michael Raskin 988a1f1ef3 One more bison inheritance fix 
svn path=/nixpkgs/trunk/; revision=12713
 2008-08-25 17:55:09 +00:00
Ludovic Courtès eddce10d13 Add GNUnet, GNU's anonymous peer-to-peer communication framework. 
svn path=/nixpkgs/trunk/; revision=12699
 2008-08-24 18:48:09 +00:00
Armijn Hemel a5deaa8e07 update to 2.4.7, python problems are still there 
svn path=/nixpkgs/trunk/; revision=12698
 2008-08-23 08:47:14 +00:00
Ludovic Courtès 396ef44630 Git 1.6.0. 
svn path=/nixpkgs/trunk/; revision=12697
 2008-08-22 21:35:25 +00:00
Marc Weber 01979f7940 add window-manager dwm contributed by viric 
svn path=/nixpkgs/trunk/; revision=12687
 2008-08-21 20:44:08 +00:00
Marc Weber 2d354aa6f1 added ngspice 
svn path=/nixpkgs/trunk/; revision=12686
 2008-08-21 20:43:53 +00:00
Ludovic Courtès 4162dfe9c5 EMMS: Default to the libtag info back-end for MP3s. 
svn path=/nixpkgs/trunk/; revision=12683
 2008-08-21 14:56:57 +00:00
Ludovic Courtès d4e5ed0596 Add EMMS, the Emacs Multimedia System. 
svn path=/nixpkgs/trunk/; revision=12675
 2008-08-21 08:58:51 +00:00
Michael Raskin a84989091f Refactoring to work with refactored builderDefs 
svn path=/nixpkgs/trunk/; revision=12670
 2008-08-20 11:21:58 +00:00
Michael Raskin 8ad11e65a7 Version bump 
svn path=/nixpkgs/trunk/; revision=12669
 2008-08-20 11:21:15 +00:00
Michael Raskin 87ff8d6347 Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner. 
svn path=/nixpkgs/trunk/; revision=12655
 2008-08-19 05:54:09 +00:00
Marc Weber fea2f910e5 snd shows it's help in firefox now 
svn path=/nixpkgs/trunk/; revision=12651
 2008-08-18 16:03:38 +00:00
Marc Weber 9a0fc0863b added qjackctl 
svn path=/nixpkgs/trunk/; revision=12650
 2008-08-18 16:03:21 +00:00
Marc Weber 5479dfea93 added beast Sound Engine 
svn path=/nixpkgs/trunk/; revision=12647
 2008-08-18 10:50:16 +00:00
Michael Raskin a031f1cbf0 Trying to fix OO.o 2.4.1 
svn path=/nixpkgs/trunk/; revision=12629
 2008-08-15 07:28:53 +00:00
Ludovic Courtès a8b28c34af Try out expression for OpenOffice.org 2.4.1. 
Warning: I have *not* built it locally, so the main purpose is
to run the whole build on the build farm, hoping it won't fail.
Feel free to fix or revert if it does.

svn path=/nixpkgs/trunk/; revision=12622
 2008-08-14 15:09:41 +00:00
Ludovic Courtès 2f5212ef5a Add KeyJnote, a nifty presentation tool. 
svn path=/nixpkgs/trunk/; revision=12610
 2008-08-13 09:15:14 +00:00
Armijn Hemel e60a0c2591 7.1 -> 7.2 
svn path=/nixpkgs/trunk/; revision=12573
 2008-08-10 15:05:08 +00:00
Michael Raskin 6bfd25923d Made possible stumpwm debug run now - install lisp sources, too 
svn path=/nixpkgs/trunk/; revision=12567
 2008-08-09 22:10:46 +00:00
Michael Raskin eb50dd2c0d Added StumpWM 
svn path=/nixpkgs/trunk/; revision=12566
 2008-08-09 20:21:33 +00:00
Marc Weber 8302b6ba69 some fixes for bash completion (git, darcs) (-> etc/bash_completion.d/*) 
svn path=/nixpkgs/trunk/; revision=12538
 2008-08-07 17:30:35 +00:00
Marc Weber 9e55727832 Added: 
* dmenu
* gftp
* micropolis
* byacc as a build-time dependency for micropolis
contributed by baldo <baldo@quimby.lan>

svn path=/nixpkgs/trunk/; revision=12526
 2008-08-06 20:39:01 +00:00
Marc Weber cc44e2bb54 updated jwm's url as suggested by Saadfuijk Naas <tachermourir@rambler.ru> 
svn path=/nixpkgs/trunk/; revision=12508
 2008-08-06 09:50:41 +00:00
Peter Simons cea5d01592 git-git: change ${name} to reflect that this is not a pristine version 
The git-git expression promises to build the current git HEAD, but in
fact it builds git HEAD plus a fairly extensive, undocumented, untested
patch that is apparently not part of the repository. By changing the
name of the installed package to 'git-git-with-glob-patch', we ensure
that users aren't mislead about what exactly they'll get when installing
this package. Technically, GIT-VERSION-FILE should be patched so that
the installed git binaries reflect this change too when called with
'--version', but the current solution is probably good enough.

svn path=/nixpkgs/trunk/; revision=12506
 2008-08-05 17:31:13 +00:00
Eelco Dolstra d0aa54c8fa * Pan 0.133. 
svn path=/nixpkgs/trunk/; revision=12496
 2008-08-04 18:00:49 +00:00
Marc Weber 43d7fe0cfb Merge branch 'git_patch_glob' 
svn path=/nixpkgs/trunk/; revision=12468
 2008-08-03 12:23:27 +00:00