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

387 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 5417c720fd Merging from trunk. 
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
 2010-08-02 15:48:19 +00:00
Eelco Dolstra b1afe4e7ac * Finish renaming. 
svn path=/nixpkgs/trunk/; revision=22801
 2010-07-29 07:02:26 +00:00
Eelco Dolstra 5b2dcdd24d * Remove the old PHP. 
svn path=/nixpkgs/trunk/; revision=22800
 2010-07-29 07:00:00 +00:00
Eelco Dolstra f1598a8941 * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22798
 2010-07-28 18:01:17 +00:00
Eelco Dolstra 749b8607ca * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22795
 2010-07-28 15:35:01 +00:00
Eelco Dolstra 6609710409 * Get rid of many instances of "args: with args;", and other coding 
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
 2010-07-28 11:55:54 +00:00
Eelco Dolstra 0e6ea04477 * Update Ruby to 1.8.7-p299 to fix a build problem caused by the 
upgrade to OpenSSL 1.0.0
  (http://hydra.nixos.org/build/494496/nixlog/1/raw).

svn path=/nixpkgs/branches/x-updates/; revision=22700
 2010-07-22 09:49:48 +00:00
Peter Simons 9f8ff9f714 pkgs/development/interpreters/python/2.6/default.nix: enable parallel building 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22673
 2010-07-20 13:13:30 +00:00
Eelco Dolstra ed1172a0e5 * PHP updated to 5.2.13. Removed the "if version == ..." stuff, it's 
bad practice.

svn path=/nixpkgs/trunk/; revision=22592
 2010-07-13 22:35:50 +00:00
Michael Raskin 7c5e566c5c Cleaned up the unspecified-extra-argument calls where there is no way to access extra arguments. Tarball and full instantiation checks passed. 
svn path=/nixpkgs/trunk/; revision=22539
 2010-07-08 19:22:50 +00:00
Michael Raskin ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense. 
svn path=/nixpkgs/trunk/; revision=22529
 2010-07-08 13:25:52 +00:00
Michael Raskin 6c77fda8c1 Restore R13B version 
svn path=/nixpkgs/trunk/; revision=22476
 2010-07-05 12:43:59 +00:00
Lluís Batlle i Rossell 5b4e3a5b40 Adding Wings 3D (as a side effect, update erlang, and add esdl). 
svn path=/nixpkgs/trunk/; revision=22436
 2010-07-01 09:08:37 +00:00
Lluís Batlle i Rossell 9885a6a4da I did not enable well the -fPIC for lua in my last commit. 2nd attempt, for vlc to build fine. 
Making vlc build finally (disabling dbus in it)

svn path=/nixpkgs/trunk/; revision=22415
 2010-06-25 18:34:35 +00:00
Lluís Batlle i Rossell 029299e710 Making lua build with -fPIC. This allows building vlc on linux-x86_64. 
svn path=/nixpkgs/trunk/; revision=22411
 2010-06-24 23:05:15 +00:00
Peter Simons 70240d36ac Enable parallel building of gcc, glibc, gmp, mpfr, coreutils, perl, git, and qt4. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22400
 2010-06-23 14:35:18 +00:00
Ludovic Courtès f1ea4d1835 GNU Guile 1.8: Fix builds with GCC 4.5. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22369
 2010-06-22 08:06:12 +00:00
Ludovic Courtès 298b0ff43c GNU Guile 1.9.11. 
svn path=/nixpkgs/trunk/; revision=22215
 2010-06-10 21:52:28 +00:00
Marc Weber 5a59b1b55d adding PHP. 5.3.2. See comments. 
I had to add the newer PHP because current PHP 5.2.11 doesn't read SOAP
from https urls. Debian's PHP does work - I couldn't find their fix

svn path=/nixpkgs/trunk/; revision=22056
 2010-05-29 18:26:54 +00:00
Peter Simons fd8c6ae43d Moved 'maintainers' attribute into the meta section of the expression. 
I've also set the 'platforms' attribute to ensure that Hydra actually
builds these packages. Thanks to Lluís Batlle i Rossell for pointing out
these mistakes.

svn path=/nixpkgs/trunk/; revision=21688
 2010-05-09 16:01:44 +00:00
Marc Weber 3303106e97 python: support ncurses, replace composedArgsAndFun by makeOverridable 
because composedArgsAndFun didn't pass values to the builder

svn path=/nixpkgs/trunk/; revision=21686
 2010-05-09 14:33:50 +00:00
Peter Simons bba637c718 pkgs/development/interpreters/python/3.1: renamed this package to "python3" 
Python version 3.x is really quite different from 2.x. Using a new name
for the package prevents Nix from performing unintended updates to the
3.x version.

svn path=/nixpkgs/trunk/; revision=21264
 2010-04-23 10:42:29 +00:00
Eelco Dolstra f20c7e9c46 * Cleanup: removed the unused `python-new'. 
svn path=/nixpkgs/trunk/; revision=21198
 2010-04-21 11:12:06 +00:00
Marc Weber 8c0b7e4ad2 - adding experimental python31 build 
- cleanup python libraries:
 * moving all python libraries into a attr set into a directory
   so that expressions can be used for both: python 2.5 and 2.6 easily
 * disabling packages which don't build

svn path=/nixpkgs/trunk/; revision=21142
 2010-04-17 18:28:25 +00:00
Ludovic Courtès 8a2edb8797 GNU Guile 1.9.10. 
svn path=/nixpkgs/trunk/; revision=21110
 2010-04-15 22:53:11 +00:00
Lluís Batlle i Rossell 35639242b5 I made a typo in ruby libs.nix 
svn path=/nixpkgs/trunk/; revision=21033
 2010-04-12 21:03:18 +00:00
Lluís Batlle i Rossell d7cba8fc61 Adding rubygems/lib to RUBYLIB in wrapProgram for ruby libs.nix 
Adding ncursesw, and feeding it to sup for wide character support

svn path=/nixpkgs/trunk/; revision=21032
 2010-04-12 19:23:14 +00:00
Lluís Batlle i Rossell cf70c1ecbc Updating ruby libs - the same as there were 
svn path=/nixpkgs/trunk/; revision=21031
 2010-04-12 18:48:38 +00:00
Peter Simons 774a276ff3 pkgs/development/interpreters/maude: added myself as a maintainer 
svn path=/nixpkgs/trunk/; revision=21029
 2010-04-12 11:21:42 +00:00
Marc Weber 7b5896ca33 add Groovy 1.7.1 
patch provided by Francois Perrad

svn path=/nixpkgs/trunk/; revision=20862
 2010-03-29 23:36:32 +00:00
Peter Simons d791abd982 pkgs/development/interpreters/python/2.6: updated to version 2.6.5 
svn path=/nixpkgs/trunk/; revision=20775
 2010-03-23 09:34:52 +00:00
Ludovic Courtès 1a1cea3076 GNU Guile 1.9.9. 
svn path=/nixpkgs/trunk/; revision=20762
 2010-03-19 13:57:17 +00:00
Lluís Batlle i Rossell ba274e578c Made graphicsmagick-config not say anything about libraries that would be needed for static linking, because we are linking it dynamically. 
Made octave link with graphicsmagick to get imread() working.

Nevertheless, imread does not work, because of some problems between octave and latest versions of graphicsmagick: http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html

Next to do: add an older version of graphics magick for octave.

svn path=/nixpkgs/trunk/; revision=20389
 2010-03-04 16:41:10 +00:00
Michael Raskin c902a64fb7 Update PLT Scheme 
svn path=/nixpkgs/trunk/; revision=20141
 2010-02-20 18:34:50 +00:00
Ludovic Courtès 97c9ff361f GNU Guile 1.9.8. 
svn path=/nixpkgs/trunk/; revision=20140
 2010-02-20 16:19:36 +00:00
Michael Raskin 5401a03919 Disable checks - the failure reason is impossibility to resolve localhost 
svn path=/nixpkgs/trunk/; revision=20065
 2010-02-17 06:43:49 +00:00
Eelco Dolstra 822d59d4f9 * Remove phpIniBuilder (obsolete). 
svn path=/nixpkgs/trunk/; revision=20028
 2010-02-15 20:29:50 +00:00
Lluís Batlle i Rossell 6c622c014d octave wants x11 (I reported this to octave as a bug). 
Maybe it got in from their recent fltk/gl attempts to make their own plotter.

svn path=/nixpkgs/trunk/; revision=20017
 2010-02-15 17:10:25 +00:00
Lluís Batlle i Rossell 43e167641f Updating octave and gnuplot. 
svn path=/nixpkgs/trunk/; revision=20007
 2010-02-15 10:54:50 +00:00
Eelco Dolstra 64f1191313 * Fix Perl on FreeBSD. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19685
 2010-01-26 18:10:59 +00:00
Lluís Batlle i Rossell bcba809460 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
 2010-01-25 18:52:07 +00:00
Lluís Batlle i Rossell b14e1f31c9 Fixing the 'platforms' at python 2.6. 
svn path=/nixpkgs/trunk/; revision=19602
 2010-01-21 16:43:27 +00:00
Michael Raskin e70276079f Add myself as a maintainer 
svn path=/nixpkgs/trunk/; revision=19594
 2010-01-21 10:07:25 +00:00
Ludovic Courtès 50a7b78fb4 GNU Guile 1.9.7. 
svn path=/nixpkgs/trunk/; revision=19565
 2010-01-20 11:09:00 +00:00
Eelco Dolstra d348b996cf svn path=/nixpkgs/branches/stdenv-updates/; revision=19546 2010-01-19 17:10:03 +00:00
Eelco Dolstra fa5a119fcd * Perl 5.10.1. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19517
 2010-01-18 12:09:51 +00:00
Lluís Batlle i Rossell 67038ea160 Fixing the meta platforms of python 2.6. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19507
 2010-01-17 22:19:10 +00:00
Lluís Batlle i Rossell 70dd97620c Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
 2010-01-16 15:19:23 +00:00
Marc Weber 92a0256e8e ruby update: 
* xrefresh server on Linux (only paths config option is honored)
* sup can be started without hacks now :)
* rubygems update 1.3.5
* fix handling of /bin/* ruby scripts
* only recognize runtime dependencies when creating nix derivations.
  Some development dependencies are no longer available.
* make ruby lib ffy compile by using NIX_POST_EXTRACT_FILES_HOOK
* update rubygems patch: Even if there is a missing dep create attr
  item. Maybe this missing source can be fixed manually.

svn path=/nixpkgs/trunk/; revision=19470
 2010-01-15 19:35:06 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk. 
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
 2010-01-14 14:49:31 +00:00