Commit Graph

628492 Commits

Author SHA1 Message Date
Rob Vermaas 5af066c31c add x86_64 stdenv based on stdenvNative
svn path=/nixpkgs/trunk/; revision=18649
2009-11-26 15:16:42 +00:00
Rob Vermaas 0db7aaca02 add x86_64-darwin as platform
svn path=/nixpkgs/trunk/; revision=18646
2009-11-26 15:03:42 +00:00
Marco Maggesi 729bf2e2f0 Fix wrong upstart directives in openafs-client
svn path=/nixos/trunk/; revision=18645
2009-11-26 14:12:19 +00:00
Marco Maggesi 7cefe762db Fix openafs-client for the new Upstart 0.6
svn path=/nixos/trunk/; revision=18644
2009-11-26 13:11:56 +00:00
Eelco Dolstra a71971f671 * Inkscape 0.47.
svn path=/nixpkgs/trunk/; revision=18641
2009-11-26 12:39:22 +00:00
Rob Vermaas d55c6d8404 revert change from ludo rev. 18634. for now this order is needed for the stratego packages in the buildfarm, and the order should matter as normally nothing gets built in check phase that is needed for install phase
svn path=/nixpkgs/trunk/; revision=18637
2009-11-26 06:52:13 +00:00
Ludovic Courtès 22c531b162 Switching back to Flex 2.5.4a as it caused a major rebuild.
svn path=/nixpkgs/trunk/; revision=18635
2009-11-25 23:20:11 +00:00
Ludovic Courtès f5236b1e0d releaseTools.nixBuild: Perform `checkPhase' before `installPhase'.
svn path=/nixpkgs/trunk/; revision=18634
2009-11-25 23:15:18 +00:00
Ludovic Courtès 46526b4ac9 Default to Flex 2.5.35; move 2.5.4a out of the way.
svn path=/nixpkgs/trunk/; revision=18633
2009-11-25 23:13:28 +00:00
Eelco Dolstra 8c134a151c * Merged the Upstart 0.6 branch.
svn path=/nixos/trunk/; revision=18620
2009-11-25 10:48:36 +00:00
Ludovic Courtès 57fa034f8a Geeqie: Fix typos.
svn path=/nixpkgs/trunk/; revision=18615
2009-11-25 09:08:27 +00:00
Ludovic Courtès aca6f17400 Add Geeqie, a GQview fork.
svn path=/nixpkgs/trunk/; revision=18613
2009-11-25 08:58:42 +00:00
Rob Vermaas 2ffa48af25 update maven2
svn path=/nixpkgs/trunk/; revision=18609
2009-11-25 07:51:06 +00:00
Eelco Dolstra 8e8b3f9313 * Mount /var/run/nscd only once.
svn path=/nixos/branches/upstart-0.6/; revision=18607
2009-11-24 17:25:35 +00:00
Eelco Dolstra ed6daf4ea4 * Doh! I lost ${flags} somewhere along the way, so Postgres
wouldn't get the -i option anymore...

svn path=/nixos/branches/upstart-0.6/; revision=18606
2009-11-24 17:07:23 +00:00
Eelco Dolstra a21f18e81f * Synced with the trunk.
svn path=/nixos/branches/upstart-0.6/; revision=18602
2009-11-24 16:11:01 +00:00
Eelco Dolstra e76f14714b svn path=/nixos/trunk/; revision=18599 2009-11-24 15:05:08 +00:00
Eelco Dolstra 88b26c47ad * Run cronjobs with a more userfriendly $PATH.
svn path=/nixos/trunk/; revision=18595
2009-11-24 14:20:33 +00:00
Eelco Dolstra f52952e504 * Nix updated to nix-0.14pre18592.
svn path=/nixpkgs/trunk/; revision=18594
2009-11-24 14:19:20 +00:00
Lluís Batlle i Rossell 6f2e018c7a Enabling plugins in avidemux.
Adding an assertion, for stdenv having glibc. avidemux wants pthreads.

svn path=/nixpkgs/trunk/; revision=18593
2009-11-24 14:01:48 +00:00
Rob Vermaas 4a0fd9efbb sendmail patch for CS173Tourney
svn path=/nixpkgs/trunk/; revision=18586
2009-11-24 09:39:51 +00:00
Lluís Batlle i Rossell d634b32abf Adding avidemux.
svn path=/nixpkgs/trunk/; revision=18584
2009-11-24 08:27:18 +00:00
Lluís Batlle i Rossell 1ec11edce5 I should learn to concatenate lists.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18579
2009-11-23 23:40:24 +00:00
Ludovic Courtès 807655e1f9 Switch to glibc 2.11 and hope for the best.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18578
2009-11-23 23:35:59 +00:00
Lluís Batlle i Rossell eadcd4462d Making, in cross-builds, every buildInput a propagatedBuildInput. We need
this because 'ld' wants to know the path of every library involved in a dynamic
linking. I imagine that ld does not need that in native builds because it can
call the loader for it to resolve the library rpaths, but this is not the case
for cross-building.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18577
2009-11-23 23:16:40 +00:00
Lluís Batlle i Rossell 7ac3ee0800 Updating supertuxkart.
svn path=/nixpkgs/trunk/; revision=18576
2009-11-23 23:12:27 +00:00
Michael Raskin be75df0b0d update webkit
svn path=/nixpkgs/trunk/; revision=18575
2009-11-23 22:31:12 +00:00
Lluís Batlle i Rossell 3881f13ad6 Updating the nvidia legacy drivers. Without this update, the drivers
did not work with xorg-server-1.7

svn path=/nixpkgs/trunk/; revision=18574
2009-11-23 21:40:51 +00:00
Lluís Batlle i Rossell b4e31ce1bf fixing the name in the openchrome expression.
svn path=/nixpkgs/trunk/; revision=18573
2009-11-23 21:40:26 +00:00
Lluís Batlle i Rossell 931f6655f0 Fixing the filelight 1.0 expression (kde3), so it builds again.
svn path=/nixpkgs/trunk/; revision=18571
2009-11-23 21:15:15 +00:00
Lluís Batlle i Rossell c922164751 Adding filelight for kde4.
svn path=/nixpkgs/trunk/; revision=18570
2009-11-23 21:15:11 +00:00
Lluís Batlle i Rossell d8aa5b5db1 Fixing stdenv's chain of propagated-build-inputs (2nd level propagated build
inputs did not get in)
Updating the xorg builder script to support cross building (in fact, support
for propagating the required build inputs).


svn path=/nixpkgs/branches/stdenv-updates/; revision=18569
2009-11-23 19:45:18 +00:00
Lluís Batlle i Rossell fce5b7fe78 Adding a hack for gettext to cross-build with gcc+glibc in linux.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18568
2009-11-23 19:38:34 +00:00
Michael Raskin e8c3467487 Fix linkFarm for its new location
svn path=/nixpkgs/trunk/; revision=18567
2009-11-23 19:28:03 +00:00
Michael Raskin e99acbff72 Restore linkFarm trivial builder
svn path=/nixpkgs/trunk/; revision=18566
2009-11-23 19:18:53 +00:00
Lluís Batlle i Rossell c6b526495b Improving the crossStripping. A cross-glibc gets broken if stripped by the
native strip. So we now distinguish dontStrip and dontCrossStrip. I updated
the expressions for glibc-2.9 and glibc-2.11 accordingly.
I could get rid of the cross-glibc depending on the cross-gcc-stage-static.

Enabling nls in the final cross-gcc.

I still have problems on wint_t/wchar_t not working on cross build. Gettext
does not build.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18562
2009-11-23 17:06:57 +00:00
Lluís Batlle i Rossell 75b60caea0 Updating guile so it uses gawk as a buildNativeInput and not as buildInput.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18561
2009-11-23 17:01:28 +00:00
Sander van der Burg ff177a01a7 Fixed ejabberd service so that it will be started on startup
svn path=/nixos/branches/upstart-0.6/; revision=18557
2009-11-23 13:29:47 +00:00
Sander van der Burg 7fc40ca2f1 Enabled startOn event of the MySQL and Tomcat server so that they are initialised on startup
svn path=/nixos/branches/upstart-0.6/; revision=18556
2009-11-23 13:26:33 +00:00
Michael Raskin bbd6e56d69 Fix the cleanup-induced problems
svn path=/nixpkgs/trunk/; revision=18554
2009-11-23 12:21:34 +00:00
Lluís Batlle i Rossell 45886e474d On native builds:
- Disabling guile test, because one fails. I commented on that in the source.
On cross builds:
- Adding stripping
- Updating the glibc-2.11 expression to match the parameters of glibc-2.9,
  which I was updating more.
- Renaming from selfNativeBuildInput to selfBuildNativeInput, so this matches
  better the pattern buildNativeInputs.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18550
2009-11-22 22:48:43 +00:00
Eelco Dolstra 0df5c155c6 * Firefox 3.5.5.
svn path=/nixpkgs/trunk/; revision=18548
2009-11-22 22:40:39 +00:00
Ludovic Courtès 98af7b9cb9 GNU Guile 1.8: Clean up.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18545
2009-11-22 22:16:58 +00:00
Marc Weber 10e806bcef testAllTrue helper function
svn path=/nixpkgs/trunk/; revision=18540
2009-11-22 21:28:46 +00:00
Marc Weber 976def943b nix lib: add nixType returning type of value as string which is used in
eqStrict now to return false when a b have different types. Passing
string and {} to eqStrict caused coercion failures when running tests
previously

svn path=/nixpkgs/trunk/; revision=18539
2009-11-22 21:28:43 +00:00
Marc Weber 88e654b1ed follow runTests change prefixing all tests by "test"
svn path=/nixpkgs/trunk/; revision=18538
2009-11-22 21:28:41 +00:00
Marc Weber 02972b92d5 nix lang runTests: ignore tests which are not prefixed by "test"
svn path=/nixpkgs/trunk/; revision=18537
2009-11-22 21:28:38 +00:00
Marc Weber 715d09d836 add some debugging functions
traceCallXml is used to trace arguments and result

svn path=/nixpkgs/trunk/; revision=18536
2009-11-22 21:28:36 +00:00
Marc Weber d0cc584711 myhasktags: new hash
svn path=/nixpkgs/trunk/; revision=18535
2009-11-22 21:28:28 +00:00
Lluís Batlle i Rossell 585ba8c27f Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 19:51:45 +00:00