3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

273 commits

Author SHA1 Message Date
Marc Weber 2d99612b73 update python 2.4. It's only used by zope and even plone (beeing based
on zope) runs with this python version so it should be fine (?)

svn path=/nixpkgs/trunk/; revision=16293
2009-07-09 22:23:54 +00:00
Marc Weber 6ec3225722 fix pygtk in pyhtonNew
svn path=/nixpkgs/trunk/; revision=16261
2009-07-09 03:50:22 +00:00
Ludovic Courtès 8e0c39c285 GNU Guile 1.8.7.
svn path=/nixpkgs/trunk/; revision=16181
2009-07-05 21:41:36 +00:00
Eelco Dolstra 222ab9d494 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=16160
2009-07-03 11:55:17 +00:00
Peter Simons c713cfa0be Maude needs libgmpxx.
svn path=/nixpkgs/trunk/; revision=16159
2009-07-03 11:31:33 +00:00
Marc Weber 108052a4e9 really fix the name conflicts by patching the patch which generates the code
svn path=/nixpkgs/trunk/; revision=16123
2009-06-30 21:45:17 +00:00
Ludovic Courtès 1b9dbe740b Avoid collision between Ruby-GetText and GNU Gettext.
svn path=/nixpkgs/trunk/; revision=16120
2009-06-30 21:05:13 +00:00
Marc Weber d1e39e78f9 adding rubygems support to nix - implemented target libraries/apps: sup mail client
svn path=/nixpkgs/trunk/; revision=16100
2009-06-30 14:29:20 +00:00
Marc Weber 8661c406f2 ruby / gems update
svn path=/nixpkgs/trunk/; revision=16099
2009-06-30 14:29:17 +00:00
Eelco Dolstra cdf4cf5c23 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=16094
2009-06-30 11:42:15 +00:00
Marc Weber 3fa07803c6 adding jruby-1.1.6 cause the one shipping with netbeans can't get uid.
svn path=/nixpkgs/trunk/; revision=16060
2009-06-26 16:52:58 +00:00
Marc Weber ffb53a0e6f adding sqlalchemy which is a nice orm mapper for python
svn path=/nixpkgs/trunk/; revision=16059
2009-06-26 16:52:54 +00:00
Marc Weber 959342d209 PHP enable SOAP and openssl support
svn path=/nixpkgs/trunk/; revision=15953
2009-06-14 01:30:04 +00:00
Rob Vermaas 342d9834bf * -msse2 flag for python on i686-darwin
svn path=/nixpkgs/trunk/; revision=15914
2009-06-10 09:18:51 +00:00
Michael Raskin 526f6f63c7 Updating CLisp and adding SBCL. SBCL currently has to be symlinked to a writable directory (I am investigating a fix). CLisp 2.47 is somewhat incompatible with lots of software, so I added 2.44.1 as preserved version
svn path=/nixpkgs/trunk/; revision=15806
2009-05-31 06:07:25 +00:00
Marc Weber 3157bb1098 removed all __primops from nixpkgs
svn path=/nixpkgs/trunk/; revision=15693
2009-05-24 10:57:46 +00:00
Marc Weber f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
2009-05-24 10:57:41 +00:00
Marc Weber 2774979bf7 missing patch
svn path=/nixpkgs/trunk/; revision=15688
2009-05-23 13:15:07 +00:00
Marc Weber 3c25ec6a3a adding soappy
svn path=/nixpkgs/trunk/; revision=15687
2009-05-23 13:04:41 +00:00
Marc Weber 8d3c1ea9e2 adding pyxml
svn path=/nixpkgs/trunk/; revision=15684
2009-05-21 17:39:13 +00:00
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