Commit graph

4187 commits

Author SHA1 Message Date
Michael Raskin
6c20576972 Ported fixes for lsof and gw6c from stdenv-updates
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10825
2008-02-22 06:16:53 +00:00
Michael Raskin
8ea6496a10 -
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10823
2008-02-22 03:06:12 +00:00
Eelco Dolstra
b7e2573912 * Don't build gcc42 with texinfo. Texinfo has a dependency on ncurses which
doesn't compile in the bootstrap environment...

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10821
2008-02-21 20:32:53 +00:00
Eelco Dolstra
bfb1947a2e * Disable openoffice for now.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10816
2008-02-21 17:37:25 +00:00
Eelco Dolstra
67c961fd63 * Merged -r10790:HEAD from the trunk.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10815
2008-02-21 17:34:03 +00:00
Eelco Dolstra
3bcc70349b svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10814 2008-02-21 17:26:46 +00:00
Eelco Dolstra
bfefe63726 * Disable tetix on powerpc-linux for now because replace is missing in the stdenv.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10813
2008-02-21 17:25:54 +00:00
Eelco Dolstra
1d49f0daff * Renamed the darwin stdenv to powerpc-darwin, since i686-darwin uses stdenv/nix.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10812
2008-02-21 17:25:10 +00:00
Eelco Dolstra
662bea8e0c svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10811 2008-02-21 16:24:44 +00:00
Eelco Dolstra
a62b2564ba * Merge the makeFlags check.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10810
2008-02-21 16:23:47 +00:00
Eelco Dolstra
e7570bb9cf * Don't strip all symbols from $out/bin by default, since it makes
stack traces impossible.
* When stripping all symbols on Darwin, don't use the "-s" flag
  since it has a completely different meaning (it takes an argument 
  specifying a file containing a list of symbols).

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10809
2008-02-21 16:20:51 +00:00
Eelco Dolstra
5e985bc375 * Perl 5.10.0, while we're at it.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10808
2008-02-21 16:19:09 +00:00
Ludovic Courtès
4050f8fa45 Add MPICH2, an implementation of the Message Passing Interface.
svn path=/nixpkgs/trunk/; revision=10807
2008-02-21 16:17:43 +00:00
Eelco Dolstra
af40c15c30 * Use CPAN mirrors.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10806
2008-02-21 15:52:31 +00:00
Ludovic Courtès
cee8b8ebac Add GNU Texinfo 4.9, use it to produce GCC 4.x documentation.
svn path=/nixpkgs/trunk/; revision=10805
2008-02-21 15:34:56 +00:00
Eelco Dolstra
bda5d7d471 * Hack around a weird build problem on Darwin.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10804
2008-02-21 14:47:59 +00:00
Eelco Dolstra
c9f2559e30 * Don't include <malloc.h>, it doesn't exist on all platforms.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10803
2008-02-21 14:01:19 +00:00
Eelco Dolstra
289a6dd48a * Fix broken URLs.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10802
2008-02-21 13:47:11 +00:00
Eelco Dolstra
051cd950fe * Use the latest Nix. What a relief. :-)
svn path=/nixpkgs/trunk/; revision=10801
2008-02-21 13:44:06 +00:00
Eelco Dolstra
b2dfd26d36 * Merged r9820.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10800
2008-02-21 12:26:03 +00:00
Michael Raskin
ed3cf0a497 Fixed setup.sh - non-default Makefile may be passed in makeFlags. OpenFire added, doesn't work yet
svn path=/nixpkgs/branches/stdenv-updates/; revision=10795
2008-02-21 04:48:55 +00:00
Eelco Dolstra
3c65ca0d64 svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10794 2008-02-20 23:19:24 +00:00
Eelco Dolstra
e12b421add * Merged most of the stdenv-updates branch. Some stuff didn't
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
2008-02-20 23:02:41 +00:00
Eelco Dolstra
b67cb39b7d svn path=/nixpkgs/branches/stdenv-updates/; revision=10789 2008-02-20 17:22:45 +00:00
Eelco Dolstra
96aa40524e * Hack hack hack.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10788
2008-02-20 17:22:32 +00:00
Eelco Dolstra
10f7a2614a * Make the "Entering directory ..." message appear *before* "building
blah".

svn path=/nixpkgs/branches/stdenv-updates/; revision=10787
2008-02-20 17:13:06 +00:00
Eelco Dolstra
39c3cd4259 * Get rid of all the phase wrapper functions, just do that generically
in genericBuild.  This also means that you can override a phase
  function by redefining it, like

    buildPhase() {
      ... do something ...
    }

  and you still get the log nesting stuff.

* GNUmakefile is also a valid makefile name.

* Evaluate the variables $preHook and $postHook to allow more stdenv
  overrideability.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10786
2008-02-20 17:10:36 +00:00
Eelco Dolstra
0ebff4e1d0 * buildPhase: skip if there is no Makefile (just like configurePhase
is skipped when there is no configure script).  So you don't need to
  set

    buildPhase = "true";

  for derivations that don't have any build action.

* Variable $makefile to allow the makefile to be specified.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10784
2008-02-20 15:16:48 +00:00
Eelco Dolstra
3a49502530 * Reverted accidental change to kernel attribute.
svn path=/nixpkgs/trunk/; revision=10782
2008-02-20 13:54:08 +00:00
Eelco Dolstra
a1bcd5d936 * No idea what this was for.
svn path=/nixpkgs/trunk/; revision=10779
2008-02-20 13:07:11 +00:00
Tobias Hammerschmidt
96ec69e4f5 Wesnoth 1.3.18 aka 1.4-rc1
svn path=/nixpkgs/trunk/; revision=10775
2008-02-20 12:52:38 +00:00
Sander van der Burg
92910e461e Extract war archive so that it can be deployed from a nix profile
svn path=/nixpkgs/trunk/; revision=10773
2008-02-20 12:33:17 +00:00
Wouter den Breejen
4a59b2d875 Added SNIX
svn path=/nixpkgs/trunk/; revision=10772
2008-02-20 12:30:16 +00:00
Wouter den Breejen
03473a3fc3 Added SNIX which is Nix extended with options to handle state (not stable yet and needs ext3cow so i do not recommend updating unless you are interested)
svn path=/nixpkgs/trunk/; revision=10771
2008-02-20 12:29:41 +00:00
Tobias Hammerschmidt
182d10bca9 java 6 update 4, can someone confirm that amd64 works properly?
svn path=/nixpkgs/trunk/; revision=10770
2008-02-20 11:34:48 +00:00
Ludovic Courtès
c9c4108a7d BBDB: Install Emacs Lisp code to `$out/share/emacs/site-lisp'; install documentation.
svn path=/nixpkgs/trunk/; revision=10769
2008-02-20 11:16:59 +00:00
Ludovic Courtès
067c7ed0af Install BBDB to `$out/share/emacs/site-lisp'.
svn path=/nixpkgs/trunk/; revision=10767
2008-02-20 10:32:22 +00:00
Ludovic Courtès
d494e7e709 Git 1.5.4.2 + Emacs mode.
svn path=/nixpkgs/trunk/; revision=10766
2008-02-20 10:29:32 +00:00
Tobias Hammerschmidt
777768d544 modified firmware location, firmware must reside in subdir zd1211
svn path=/nixpkgs/trunk/; revision=10765
2008-02-20 09:40:35 +00:00
Ludovic Courtès
401543289c GNU Guile 1.8.4.
svn path=/nixpkgs/trunk/; revision=10764
2008-02-20 09:02:00 +00:00
Tobias Hammerschmidt
f2fbbc6052 Added firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip.
svn path=/nixpkgs/trunk/; revision=10762
2008-02-20 08:53:42 +00:00
Yury G. Kudryashov
bcffa9bb34 kde-4.0.1
svn path=/nixpkgs/branches/stdenv-updates/; revision=10753
2008-02-18 20:54:39 +00:00
Yury G. Kudryashov
ab3fc34bce mysql: +libmysqld, +openssl
svn path=/nixpkgs/branches/stdenv-updates/; revision=10752
2008-02-18 20:54:08 +00:00
Yury G. Kudryashov
8aaa563709 Result link was accidentially added. Removing
svn path=/nixpkgs/branches/stdenv-updates/; revision=10751
2008-02-18 20:53:57 +00:00
Yury G. Kudryashov
c0588c0bb7 libjingle added: 0.3.11 (tapioca version) compiles, 0.4 (vanilla Google) doesn't.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10750
2008-02-18 20:53:47 +00:00
Yury G. Kudryashov
805424e33f libxklavier added
svn path=/nixpkgs/branches/stdenv-updates/; revision=10749
2008-02-18 20:53:36 +00:00
Yury G. Kudryashov
f1459725b6 telepathy stuff
svn path=/nixpkgs/branches/stdenv-updates/; revision=10748
2008-02-18 20:53:23 +00:00
Yury G. Kudryashov
fc33ef9f7b libraw1394: URL corrected
svn path=/nixpkgs/branches/stdenv-updates/; revision=10747
2008-02-18 20:53:11 +00:00
Yury G. Kudryashov
0aa0847307 added gnupg-1.x compatibility symlinks to gnupg-2.x, removed gnupg2 attr
svn path=/nixpkgs/branches/stdenv-updates/; revision=10746
2008-02-18 20:52:59 +00:00
Yury G. Kudryashov
0b2d493521 libarchive: 2.4.12 added
svn path=/nixpkgs/branches/stdenv-updates/; revision=10745
2008-02-18 20:52:40 +00:00