Commit Graph

303 Commits

Author SHA1 Message Date
Marc Weber
52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Eelco Dolstra
f786614e7e * PHP: build with an external, dynamically linked sqlite. Otherwise
PHP builds an internal copy of sqlite, and we get into trouble when
  other Apache modules use a dynamically linked sqlite.  For instance,
  Subversion 1.6 barfs with "(20014)Internal error: SQLite compiled for
  3.6.12, but running with 3.3.7".

svn path=/nixpkgs/trunk/; revision=15587
2009-05-13 10:43:34 +00:00
Michael Raskin
50d7f81d1d Io source update
svn path=/nixpkgs/trunk/; revision=15537
2009-05-10 19:42:43 +00:00
Marc Weber
13080750d4 only use -O1 for php. Using -O2 causes some annoying segfaults. See comment
svn path=/nixpkgs/trunk/; revision=15482
2009-05-07 05:45:40 +00:00
Eelco Dolstra
5f70884dd3 * Slight purity improvement.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15471
2009-05-06 14:03:26 +00:00
Michael Raskin
67066d1c56 Update erlang
svn path=/nixpkgs/trunk/; revision=15452
2009-05-05 15:46:03 +00:00
Lluís Batlle i Rossell
ef25944cdb Updating tcl/tk
svn path=/nixpkgs/trunk/; revision=15434
2009-05-03 14:35:56 +00:00
Armijn Hemel
7445bc765c update python to 2.5.4
update scummvm to 0.13.1

svn path=/nixpkgs/trunk/; revision=15414
2009-04-30 14:01:25 +00:00
Eelco Dolstra
210ba6316e * Urgh. Some files that had been deleted in the trunk came back
through the stdenv-updates merge (probably because they had been
  modified in the branch).

svn path=/nixpkgs/trunk/; revision=15403
2009-04-29 16:19:57 +00:00
Marc Weber
761e653515 reenable curl support for php
-lssl was missing

svn path=/nixpkgs/trunk/; revision=15327
2009-04-27 01:18:03 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra
686ed295da * Disable curl support in PHP - it breaks for some reason.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15263
2009-04-23 09:56:15 +00:00
Eelco Dolstra
7e4dcb6c2b * Urgh. Perl is built during the stdenv bootstrap, where we don't
have libpthread.  So don't build with thread support there.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15253
2009-04-22 17:44:44 +00:00
Eelco Dolstra
a98d8aee74 * Install Perl modules in $out/lib/perl5. This is what Perl wants by
default, but it didn't happen in Nixpkgs because the string "perl"
  appeared in the prefix, and in that case Perl uses $out/lib.
* Enable thread-safe Perl while we're at it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15252
2009-04-22 17:37:21 +00:00
Eelco Dolstra
94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Eelco Dolstra
ff057f0d07 * Build libperl.so.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15233
2009-04-21 22:38:52 +00:00
Lluís Batlle i Rossell
a6e86e241f Updating lua5.
svn path=/nixpkgs/trunk/; revision=15223
2009-04-21 19:47:20 +00:00
Eelco Dolstra
fd473913f5 * Removed some obsolete nullglobs.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15140
2009-04-19 08:55:27 +00:00
Eelco Dolstra
6b9ccbaf78 * setup.sh: turn on nullglob globally.
* setup.sh: removed some obsolete features, specifically some that
  were only used by the old build farm.
* addToSearchPath: removed some parameters that weren't used
  anywhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15136
2009-04-18 22:22:51 +00:00
Eelco Dolstra
79cb8d11a6 * editline: renamed to libedit (which seems to be the proper name for
the package).
* Removed the old ghc-wrapper, which hasn't been used for a long time.
* Renamed the "boot" GHC to "binary", which is more descriptive.
  (They *can* be used for other things than bootstrapping a GHC
  source build.)
* Updated the GHC 6.10.1 binary to 6.10.2.

svn path=/nixpkgs/trunk/; revision=15095
2009-04-16 19:25:22 +00:00
Eelco Dolstra
eeed10ba8e * g77 -> gfortran throughout. Got rid of the separate
expressions/builders for Fortran.  Tested by building Octave with
  gfortran 4.3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14978
2009-04-09 15:24:33 +00:00
Eelco Dolstra
2eb05cf933 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
2009-04-09 12:19:57 +00:00
Eelco Dolstra
b22899a7cb * Fix some evaluation errors.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14960
2009-04-09 09:48:14 +00:00
Lluís Batlle i Rossell
9f2a2a6a84 Adding qhull, and updating octaves.
svn path=/nixpkgs/trunk/; revision=14955
2009-04-08 20:06:03 +00:00
Eelco Dolstra
3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Eelco Dolstra
46f7027688 * Reverted r14547, r14526 -> these belong in the stdenv-branch.
svn path=/nixpkgs/trunk/; revision=14549
2009-03-16 10:00:26 +00:00
Lluís Batlle i Rossell
de8bbafb53 Adding -fPIC code for static library code in perl and vxl, for x86_64.
svn path=/nixpkgs/trunk/; revision=14526
2009-03-13 16:46:10 +00:00
Marc Weber
b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +00:00
Marc Weber
51289a41b0 adjust packages to overridableDelayableArgs
svn path=/nixpkgs/trunk/; revision=14427
2009-03-06 23:21:24 +00:00
Marc Weber
307fd7b70f added pexpect and mechanize python libraries
svn path=/nixpkgs/trunk/; revision=14111
2009-02-18 11:50:46 +00:00
Peter Simons
25a9e73924 Updated SHA256 hash for Full Maude 2.4. Unfortunately, the maintainers
have the habit of releasing updates under the exact same file name and
URL.

svn path=/nixpkgs/trunk/; revision=14094
2009-02-17 12:51:04 +00:00
Eelco Dolstra
390695e73f * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
2009-02-12 21:16:55 +00:00
Eelco Dolstra
599015e8b0 * Split lib/default.nix into several files, as it had become a big
mess.  Also cleaned up some functions:

  - foldl appeared broken (it recursively called fold).
  - Renamed logicalAND/logicalOR to and/or.
  - Removed listOfListsToAttrs, eqStrings: obsolete.
  - Removed isInList, which does the same thing as elem.
  - stringToCharacters: don't return a "" at the end of the list.
  - Renamed concatList to concat, as concatList (singular) is a
    misnomer: it takes two lists.  Likewise, renamed mergeAttr to
    mergeAttrs.

  misc.nix still contains a lot of stuff that should be refactored and
  moved to other files.

svn path=/nixpkgs/trunk/; revision=14013
2009-02-09 16:51:03 +00:00
Eelco Dolstra
9f3a83f247 svn path=/nixpkgs/branches/stdenv-updates/; revision=13944 2009-02-01 21:30:27 +00:00
Eelco Dolstra
c1579d2e78 * stdenv branch: synced with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
2009-01-16 10:59:27 +00:00
Marc Weber
e6ab06e3fa python wrapper: install pydoc as well
svn path=/nixpkgs/trunk/; revision=13767
2009-01-14 16:23:17 +00:00
Marc Weber
7807b74774 php: enable gd support (2d graphics) by default
svn path=/nixpkgs/trunk/; revision=13736
2009-01-11 14:31:48 +00:00
Marc Weber
692d493f4e php: enabling mbstring support by default
svn path=/nixpkgs/trunk/; revision=13704
2009-01-04 20:18:20 +00:00
Marc Weber
5638574907 fixes for previous commit
svn path=/nixpkgs/trunk/; revision=13662
2008-12-20 02:15:26 +00:00
Marc Weber
e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Eelco Dolstra
e4a8b61eba svn path=/nixpkgs/branches/stdenv-updates/; revision=13604 2008-12-10 10:58:07 +00:00
Eelco Dolstra
e31341510d * Merged from the trunk. Let's see how well this works with
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
2008-12-10 09:59:21 +00:00
Ludovic Courtès
37812e79dd GNU Guile 1.8.6.
svn path=/nixpkgs/trunk/; revision=13599
2008-12-08 22:15:47 +00:00
Marc Weber
90b53dcccc bleeding edge octave version (without docs)
svn path=/nixpkgs/trunk/; revision=13561
2008-12-02 22:55:45 +00:00
Marc Weber
896fb49cb0 Hopefully build farm fix
I've forgotten to comment out a name preventing filtering out a half finished derivation.
(The missing glib is passed using fix by the following code)

svn path=/nixpkgs/trunk/; revision=13555
2008-12-02 13:23:31 +00:00
Marc Weber
a7e33ec60c updates: istanbul starts without errors. But no window appears.
svn path=/nixpkgs/trunk/; revision=13554
2008-12-02 12:28:45 +00:00
Marc Weber
30794845ee python 25 proposal
svn path=/nixpkgs/trunk/; revision=13547
2008-12-02 12:27:05 +00:00
Michael Raskin
d6f1d7acb3 Added Tk support for Python
svn path=/nixpkgs/trunk/; revision=13526
2008-12-01 00:02:25 +00:00
Eelco Dolstra
21c1ee574c * Use exec.
svn path=/nixpkgs/trunk/; revision=13384
2008-11-24 09:59:38 +00:00
Peter Simons
c2417256a8 Finalized maude 2.4 release.
- Updated full-maude to 2.4. 
 - Added program wrapper to set ${MAUDE_LIB} correctly.
 - TODO: the documentation is still not quite up-to-date.

svn path=/nixpkgs/trunk/; revision=13303
2008-11-14 22:53:09 +00:00
Eelco Dolstra
aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Peter Simons
893757cfd9 Updated maude to 2.4 release.
TODO: The full-maude distribution is missing from the web site. The
expression installs 2.3j until that is fixed. Also, the documentation
that's installed isn't up-to-date yet, it's from version 2.3.

svn path=/nixpkgs/trunk/; revision=13285
2008-11-13 19:35:48 +00:00
Michael Raskin
c4e1f47334 More Io fixes - hopefully final for now
svn path=/nixpkgs/trunk/; revision=13259
2008-11-12 11:13:49 +00:00
Michael Raskin
d7528deba0 More Io binding dependencies..
svn path=/nixpkgs/trunk/; revision=13246
2008-11-11 13:07:09 +00:00
Michael Raskin
add91332e8 Added Io programming language
svn path=/nixpkgs/trunk/; revision=13241
2008-11-11 08:53:47 +00:00
Peter Simons
0eed283de0 maudeUnstable: updated to alpha91d
svn path=/nixpkgs/trunk/; revision=13227
2008-11-07 22:46:03 +00:00
Michael Raskin
c5363217ad meta.function -> passthru.function, not killing other contents of passthru
svn path=/nixpkgs/trunk/; revision=13190
2008-11-04 21:24:10 +00:00
Eelco Dolstra
93a49a00f1 * Use xulrunner for chatzilla.
svn path=/nixpkgs/trunk/; revision=13162
2008-10-30 13:13:43 +00:00
Marc Weber
ffcfd819f5 added longDescription example usage to ruby-gems
svn path=/nixpkgs/trunk/; revision=13097
2008-10-19 12:59:34 +00:00
Eelco Dolstra
f370f61ee9 * f77 -> fortran.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13042
2008-10-10 08:55:15 +00:00
Peter Simons
f1328839d4 maudeUnstable: updated full-maude to latest alpha release
svn path=/nixpkgs/trunk/; revision=13017
2008-10-09 10:10:49 +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
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
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
Marc Weber
8e7577363b enabling php sockets openssl and curl support
svn path=/nixpkgs/trunk/; revision=12777
2008-08-31 06:36:56 +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
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
Pjotr Prins
48d8e0779c Fixed Ruby download path, new version 1.8.7-p72
svn path=/nixpkgs/trunk/; revision=12618
2008-08-14 11:47:51 +00:00
Michael Raskin
abe260b6c5 Now CLisp builds with full CLX (XShape included)
svn path=/nixpkgs/trunk/; revision=12559
2008-08-08 22:37:37 +00:00
Pjotr Prins
07595b0397 Introduced biolib package
svn path=/nixpkgs/trunk/; revision=12535
2008-08-07 15:01:21 +00:00
Pjotr Prins
f222b38f00 Added rightly named package gfortran and updated gcc version for compiling gfortran
r-lang debends on gfortran


svn path=/nixpkgs/trunk/; revision=12529
2008-08-07 08:33:03 +00:00
Pjotr Prins
bc6b7a3213 Updated Ruby package to support shared libs and pthreads
svn path=/nixpkgs/trunk/; revision=12466
2008-08-02 22:25:54 +00:00
Peter Simons
a16eebd0a6 Cosmetic, no functional change intended.
This patch moves curly braces to the end of the line, i.e.

  foo = { 
    ...
  };

instead of the previously used style:

  foo = 
  { 
    ...
  };

I commit this change hoping that my contributions to this project now conform
to the rules described in maintainers/docs/coding-conventions.txt so that the
self-appointed indention sheriff of the NixOS community can finally get off my
back and rest assured knowing that all i's are dotted and all t's are crossed.

svn path=/nixpkgs/trunk/; revision=12386
2008-07-18 20:11:25 +00:00
Peter Simons
057bd7c1c2 maude: build of unstable beta version because it has less bugs in full-maude
svn path=/nixpkgs/trunk/; revision=12385
2008-07-18 20:11:12 +00:00
Peter Simons
b64e42ce35 added maude beta version
svn path=/nixpkgs/trunk/; revision=12384
2008-07-18 20:11:02 +00:00
Michael Raskin
ecefcac4d7 Added PLT Scheme
svn path=/nixpkgs/trunk/; revision=12370
2008-07-17 09:57:47 +00:00
Peter Simons
8d7fe32a0e maude, tecla, buddy: new packages
Maude is a high-level specification language. Buddy and libtecla are required
to build Maude.

svn path=/nixpkgs/trunk/; revision=12358
2008-07-15 09:58:30 +00:00
Michael Raskin
65b252a0df Patched Guile to load srfi .so files correctly from its own directory.
svn path=/nixpkgs/trunk/; revision=12120
2008-06-16 14:27:26 +00:00
Eelco Dolstra
4192f35202 * unixODBCDrivers needs sqlite.
svn path=/nixpkgs/trunk/; revision=12072
2008-06-13 09:44:43 +00:00
Eelco Dolstra
bb2a310c5c * Cleaned up the PHP expression. Added support for GD. Also
turned on PostgreSQL support by default (maybe I shouldn't,
  since it makes PHP rather dependency-heavy...).

svn path=/nixpkgs/trunk/; revision=12002
2008-06-06 13:03:55 +00:00
Michael Raskin
99c9108757 OpenSSL support for Python
svn path=/nixpkgs/trunk/; revision=11894
2008-05-26 12:27:17 +00:00
Michael Raskin
9d3b0a2cb7 Added bazaar tools (not installed globally, just copied to share, you have to symlink them to your ~/.bazaar/plugins). Also readline support for python.
svn path=/nixpkgs/trunk/; revision=11893
2008-05-26 11:39:08 +00:00
Michael Raskin
642ff45e22 Added codeville - a distributed revision control system with special efforts spent on merging. Heh, efforts into RCS availability seem to have side effects on Python side, too..
svn path=/nixpkgs/trunk/; revision=11891
2008-05-26 07:47:07 +00:00
Ludovic Courtès
7cc1d84272 GNU Guile 1.8.5.
svn path=/nixpkgs/trunk/; revision=11798
2008-05-09 12:12:26 +00:00
Pjotr Prins
4609c9dae9 Support for R-language (statistical)
svn path=/nixpkgs/trunk/; revision=11769
2008-05-07 11:24:28 +00:00
Michael Raskin
26bdb2a619 Added option for SQLite support to Python2.5
svn path=/nixpkgs/trunk/; revision=11754
2008-05-06 07:01:34 +00:00
Michael Raskin
c0426f6fe7 Added Ruby Gems. I have no idea how to better use repository-provided dependencies.
svn path=/nixpkgs/trunk/; revision=11557
2008-04-11 09:23:33 +00:00
Michael Raskin
0ef3e9e148 Added zlib and OpenSSL optional support to ruby
svn path=/nixpkgs/trunk/; revision=11556
2008-04-11 09:21:27 +00:00
Ludovic Courtès
144e3b4e9d Guile: Use `share/guile/site' as the standard Guile module location.
svn path=/nixpkgs/trunk/; revision=11507
2008-04-09 08:15:30 +00:00
Ludovic Courtès
d0d98958d2 Python 2.5: Add GDBM support.
svn path=/nixpkgs/trunk/; revision=11485
2008-04-08 07:37:49 +00:00
Eelco Dolstra
15a322f887 * php_unstable: caused nix-env to barf on FreeBSD.
svn path=/nixpkgs/trunk/; revision=11464
2008-04-04 18:49:49 +00:00
Marc Weber
0b6e4828cc added php curl support
svn path=/nixpkgs/trunk/; revision=11446
2008-04-01 18:16:01 +00:00
Ludovic Courtès
95f0e6a1a7 Differentiate between longDescription' and description'.
svn path=/nixpkgs/trunk/; revision=11230
2008-03-20 14:35:03 +00:00
Ludovic Courtès
420506d752 Guile: Add various fixes allowing the test suite to run.
svn path=/nixpkgs/trunk/; revision=11196
2008-03-19 08:42:30 +00:00
Eelco Dolstra
26a152653d * Adde xpra. Doesn't quite work yet.
* Removed python_alts.

svn path=/nixpkgs/trunk/; revision=11161
2008-03-17 13:45:50 +00:00
Ludovic Courtès
9433120f1f Guile: Disable `doCheck' for now.
svn path=/nixpkgs/trunk/; revision=11107
2008-03-13 21:04:07 +00:00
Ludovic Courtès
c1389c4f36 Guile: Run the test suite.
Warning: This makes `nix-worker' hang at the very end of the process,
once "make install" has completed and all installed files have been
scanned for references.

svn path=/nixpkgs/trunk/; revision=11099
2008-03-13 14:18:29 +00:00
Michael Raskin
ae7274413b Changed port in test-suite to avoid OpenFire port conflict during build.
svn path=/nixpkgs/trunk/; revision=11066
2008-03-11 20:58:29 +00:00
Armijn Hemel
1be3f71528 update to 2.5.2
svn path=/nixpkgs/trunk/; revision=10934
2008-03-03 23:15:15 +00:00