Commit graph

5321 commits

Author SHA1 Message Date
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
Ludovic Courtès 3ec9838a44 Add Castle-Combat, a clone of Rampart.
svn path=/nixpkgs/trunk/; revision=12978
2008-10-06 22:49:37 +00:00
Ludovic Courtès b7ba44dff3 PyGame: Use SDL_mixer.
svn path=/nixpkgs/trunk/; revision=12977
2008-10-06 22:47:20 +00:00
Ludovic Courtès c82c0b17f1 PyGame: Use Numeric.
svn path=/nixpkgs/trunk/; revision=12976
2008-10-06 22:07:53 +00:00
Ludovic Courtès d77f3177fe Add Python Numeric.
svn path=/nixpkgs/trunk/; revision=12975
2008-10-06 18:56:47 +00:00
Pjotr Prins 9ff6ecf5dd Added older version of lesstif for arb
svn path=/nixpkgs/trunk/; revision=12974
2008-10-06 15:11:36 +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 487a8ddb9e Fixed missing parameters for arb - and added kernelHeaders_2.6.18
svn path=/nixpkgs/trunk/; revision=12970
2008-10-06 13:18:02 +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 9fdecb1296 * mirror://apache/.
svn path=/nixpkgs/trunk/; revision=12968
2008-10-06 12:58:21 +00:00
Eelco Dolstra 4138945727 * X.org mirrors.
svn path=/nixpkgs/trunk/; revision=12967
2008-10-06 12:38:45 +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
Eelco Dolstra 700677583c * Revert - this needs to go to the stdenv branch (I'll create it
tomorrow).

svn path=/nixpkgs/trunk/; revision=12965
2008-10-05 21:16:30 +00:00
Marc Weber 38c5e4fc67 moved pysqlite into PYTHON MODULES section
svn path=/nixpkgs/trunk/; revision=12964
2008-10-05 18:37:09 +00:00
Michael Raskin 76a6f437f8 Commenting out lapack/slr. Pjotr Prins, please add lapack gfortran.patch and uncomment.
svn path=/nixpkgs/trunk/; revision=12963
2008-10-05 12:55:00 +00:00
Michael Raskin 43e60fd473 Temporarily moved IceCat-3 to i686-only packages as its build fails on x86_64
svn path=/nixpkgs/trunk/; revision=12962
2008-10-05 11:59:53 +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 512b18ea4a Added kernelHeaders 2.6.18 - please leave them in as many Xen machines run
on older kernels

svn path=/nixpkgs/trunk/; revision=12960
2008-10-05 10:56:46 +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 10e0a6cf6d Add all my latest packages to all-packages.nix
svn path=/nixpkgs/trunk/; revision=12957
2008-10-05 09:04:30 +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 2391d84867 Two math packages
svn path=/nixpkgs/trunk/; revision=12955
2008-10-05 09:01:59 +00:00
Pjotr Prins ad3d886489 Two Ruby modules
svn path=/nixpkgs/trunk/; revision=12954
2008-10-05 09:00:56 +00:00
Pjotr Prins 034f28e268 Biology package
svn path=/nixpkgs/trunk/; revision=12953
2008-10-05 09:00:19 +00:00
Pjotr Prins cb546965bc Lesstif patches - lesstif stable has not been updated in a long time and these
are recognized patches (5 out of 6 are in Debian stable). Required for
the arb package.


svn path=/nixpkgs/trunk/; revision=12952
2008-10-05 08:59:26 +00:00
Pjotr Prins 1587e34e0a XML validating parser for Arb
svn path=/nixpkgs/trunk/; revision=12951
2008-10-05 08:57:39 +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 0e6536e5c6 sha256 for libxslt changed?!
svn path=/nixpkgs/trunk/; revision=12948
2008-10-05 08:47:34 +00:00
Pjotr Prins 859162564f Bumped pcre version
svn path=/nixpkgs/trunk/; revision=12947
2008-10-05 08:44:09 +00:00
Pjotr Prins 484313f696 Bumped gsl version
svn path=/nixpkgs/trunk/; revision=12946
2008-10-05 08:43:10 +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
Pjotr Prins bdc54592c7 Adding (disabled) time compatibility patch for coreutils - this allows
the compilation of older Linux kernels against newer headers (not a recommended
practise!)


svn path=/nixpkgs/trunk/; revision=12944
2008-10-05 08:41:54 +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
Michael Raskin b28de1b619 Added libVNCserver
svn path=/nixpkgs/trunk/; revision=12940
2008-10-04 15:13:31 +00:00
Ludovic Courtès ba2e3a7c36 Build GNU IceCat.
svn path=/nixpkgs/trunk/; revision=12939
2008-10-04 12:22:30 +00:00
Ludovic Courtès be84b08a8f Add GNU Ball and Paddle, the ultimate game.
svn path=/nixpkgs/trunk/; revision=12938
2008-10-04 10:08:59 +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
Michael Raskin ccf99b2ddf A helper to get the source some package is built from.
svn path=/nixpkgs/trunk/; revision=12933
2008-10-01 15:57:22 +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 9383cd0a48 Add `fetchbzr', to retrieve remote Bazaar repositories.
svn path=/nixpkgs/trunk/; revision=12924
2008-09-26 08:57:51 +00:00
Ludovic Courtès 3a9d5063bd xmlto: Add dependency on `w3m' for HTML to text conversions.
svn path=/nixpkgs/trunk/; revision=12923
2008-09-26 08:56:03 +00:00
Peter Simons 3d02ab54dd emacs: Lower prio of emacs-23 and generally get options from ${NIXPKGS_CONFIG}.
By default, 'nix-env --install emacs' will install Emacs 22.3, which is the
latest stable release. Furthermore, the following options are now supported:

  emacs =
  {
    xawSupport = false;         # used only by emacs 23
    xaw3dSupport = false;
    gtkSupport = true;
    xftSupport = true;          # used only by emacs 23
  };

svn path=/nixpkgs/trunk/; revision=12922
2008-09-25 21:38:16 +00:00
Peter Simons 1c587d2fe9 tk: update default version to 8.4.18
svn path=/nixpkgs/trunk/; revision=12921
2008-09-25 21:38:09 +00:00
Peter Simons 884f30e61f maude: update unstable version to 2.4 alpha 91c
svn path=/nixpkgs/trunk/; revision=12920
2008-09-25 21:37:59 +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
Eelco Dolstra cb4ca4aa36 * Change /nix/state back to /nix/var, this broke NixOS...
svn path=/nixpkgs/trunk/; revision=12916
2008-09-24 17:38:40 +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 db4c346392 all-packages.nix update of xscreensaver call
svn path=/nixpkgs/trunk/; revision=12913
2008-09-24 13:58:23 +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
Michael Raskin 44db8f356e Trivial fix
svn path=/nixpkgs/trunk/; revision=12911
2008-09-24 09:56:27 +00:00
Peter Simons b3ab93e46e Upgrade default to python version 2.5.x.
svn path=/nixpkgs/trunk/; revision=12910
2008-09-24 08:50:32 +00:00
Peter Simons e2d7d57ff6 Allow user config to override nix store paths, etc. Removed obsolete nixNoBDB.
Use the following settings in ${NIXPKGS_CONFIG} to customize the installation
of nixUnstable:

  nix =
  {
    OldDBSupport = false;
    storeDir = "/home/foobar/.nix/store";
    stateDir = "/home/foobar/.nix/var";
  }

svn path=/nixpkgs/trunk/; revision=12909
2008-09-24 08:50:05 +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 ffd1f5000b added lighthttpd
svn path=/nixpkgs/trunk/; revision=12907
2008-09-24 00:42:50 +00:00
Marc Weber d326561aaf proxytunnel fix
svn path=/nixpkgs/trunk/; revision=12906
2008-09-24 00:42:36 +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 49de4abefa * Don't use toString here - it causes the path of source file
(e.g. /home/foo/nixpkgs/.../glx-patch-0.6.2.patch) to be
  substituted, which is clearly impure.  I noticed this because I was
  getting different derivations for Compiz when running as root
  vs. another user.

svn path=/nixpkgs/trunk/; revision=12903
2008-09-23 00:52:05 +00:00
Eelco Dolstra bf65ff9ec6 * Use the texinfo-4.13a tarball. Strangely, the texinfo-4.13 tarball
has a different hash on ftp.nluug.nl, which happens to be the first
  mirror for fetchurl, thus building texinfo failed.

svn path=/nixpkgs/trunk/; revision=12902
2008-09-23 00:21:49 +00:00
Ludovic Courtès a4a186d4cf GNU Texinfo 4.13.
svn path=/nixpkgs/trunk/; revision=12901
2008-09-22 21:21:39 +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
Sander van der Burg 8d679b6351 Created simplified ejabberd Nix expression
svn path=/nixpkgs/trunk/; revision=12899
2008-09-22 14:07:25 +00:00
Ludovic Courtès 113e5eff46 zope: Fix name of argument.
svn path=/nixpkgs/trunk/; revision=12898
2008-09-19 14:39:57 +00:00
Pjotr Prins d96f2b1ea0 Ascertain Zope is using Python-2.4
svn path=/nixpkgs/trunk/; revision=12897
2008-09-19 13:55:14 +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
Ludovic Courtès 128f1cffdb Build Inkscape, XScreenSaver, XLockMore.
svn path=/nixpkgs/trunk/; revision=12893
2008-09-19 12:32:38 +00:00
Peter Simons 05d7c131d1 Re-apply Eelco's "installCommand --> installPhase" patch.
svn path=/nixpkgs/trunk/; revision=12892
2008-09-19 10:07:57 +00:00
Peter Simons f3ae22fa5f Install wrappers for Twisted binaries to ensure a correct ${PYTHONPATH}.
svn path=/nixpkgs/trunk/; revision=12891
2008-09-19 10:07:36 +00:00
Peter Simons 656127373d maude: Updated unstable version to 2.4-alpha-91b. All unit tests pass now.
svn path=/nixpkgs/trunk/; revision=12890
2008-09-19 10:06:58 +00:00
Ludovic Courtès db4b6d56a4 Allow `wrapFirefox' to read per-browser options.
svn path=/nixpkgs/trunk/; revision=12889
2008-09-19 09:46:21 +00:00
Ludovic Courtès a04d2c14be Build Lout.
svn path=/nixpkgs/trunk/; revision=12888
2008-09-19 08:53:05 +00:00
Ludovic Courtès a9ad71d940 Lout: Run fixupPhase' after installPhase'.
This removes dependency on GCC.

svn path=/nixpkgs/trunk/; revision=12887
2008-09-19 08:52:17 +00:00
Ludovic Courtès 508ae51b7a Lout 3.37.
svn path=/nixpkgs/trunk/; revision=12886
2008-09-19 08:32:37 +00:00
Eelco Dolstra 40df8c7b92 * Use the latest version while we're at it.
svn path=/nixpkgs/trunk/; revision=12885
2008-09-18 21:20:44 +00:00
Eelco Dolstra 8e494d50b3 * Fix a broken URL.
svn path=/nixpkgs/trunk/; revision=12884
2008-09-18 21:17:10 +00:00
Eelco Dolstra 0548c19dbe * NTP 4.2.4p5 (and the old url was broken).
svn path=/nixpkgs/trunk/; revision=12883
2008-09-18 21:15:14 +00:00
Ludovic Courtès cfef9ba3ad GNU Libgcrypt 1.4.3.
svn path=/nixpkgs/trunk/; revision=12882
2008-09-18 19:03:42 +00:00
Eelco Dolstra dbae3ea4a2 * Compiz 0.7.8.
svn path=/nixpkgs/trunk/; revision=12881
2008-09-18 15:20:53 +00:00
Eelco Dolstra 617a289fa7 * Provide some more disk space by default. Qcow makes it cheap anyway.
svn path=/nixpkgs/trunk/; revision=12880
2008-09-18 10:45:22 +00:00
Eelco Dolstra 8d7d8fc4bd * Linux 2.6.25.17.
svn path=/nixpkgs/trunk/; revision=12879
2008-09-18 09:53:12 +00:00
Eelco Dolstra e2accf1c2e * Bump the default kernel to 2.6.25, which seems stable enough
(cross fingers).

svn path=/nixpkgs/trunk/; revision=12878
2008-09-18 09:47:45 +00:00
Eelco Dolstra 35cc272d07 * Handle symlinks such as /dev/disk/by-label/bla. Previously
Grub installation barfed.

svn path=/nixpkgs/trunk/; revision=12877
2008-09-18 09:43:31 +00:00
Eelco Dolstra 74669a825c * Latest ntfs-3g.
svn path=/nixpkgs/trunk/; revision=12871
2008-09-17 12:52:46 +00:00
Ludovic Courtès 621b315eea Bigloo 3.1c.
svn path=/nixpkgs/trunk/; revision=12869
2008-09-16 21:18:33 +00:00