Commit graph

6049 commits

Author SHA1 Message Date
Lluís Batlle i Rossell c4cc88aca2 Merge branch 'pi-stdenv-updates' of https://github.com/viric/nixpkgs into pi-stdenv-updates 2012-12-28 21:21:24 +01:00
Lluís Batlle i Rossell 4485ee5916 glibc: removing raspberrypi specific code
I think its --with-fp or --without-fp makes nothing, for arm.
2012-12-28 21:16:25 +01:00
Lluís Batlle i Rossell 719ba63004 Merge branch 'stdenv-updates' into pi-stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.6/default.nix
	pkgs/development/compilers/gcc/4.7/default.nix

The 4.7 had some weird parameters added in crossAttrs; I've removed
them, but I don't understand where they come from.
2012-12-28 20:14:01 +00:00
Eelco Dolstra 88b11196c1 Clean up redundant "if condition then true else false" 2012-12-28 19:57:47 +01:00
Eelco Dolstra 84779a6f7d Remove unnecessary parentheses around if conditions
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra 5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Lluís Batlle i Rossell affca4a11c Making the raspberrypi glibc include hard float. 2012-12-28 16:53:18 +00:00
Lluís Batlle i Rossell 2717392cbf The glibc doesn't like "gnueabihf" in the triplet.
I better set "gnueabi".
2012-12-26 22:01:55 +00:00
Lluís Batlle i Rossell 0af1283e97 Undoing more glibc unneeded changes 2012-12-26 22:01:26 +00:00
Lluís Batlle i Rossell 68a65bcf2a Undoing glibc 2.13 work for the pi
(previous attempt of bootstrapping from the armv5tel bootstrap tools)
2012-12-26 22:01:22 +00:00
root 1b29d29c76 First movement to get the raspberrypi stdenv building. 2012-12-26 21:59:54 +00:00
Lluís Batlle i Rossell 636722eb93 Less intrussive fix for glibc 2.16 cross-rpcgen build
Using LD_LIBRARY_PATH, sets overrides of libs for all binaries run.

On mips64, the libz in the bootstrap-tools is a bit incompatible with
the libz binutils are built with (ld.so outputs a warning at every program run
that uses libz). binutils need to be dynamically linked to the libz they
have been linked to.

Glibc creates 'shlib.lds' using the gas program output, and it includes the
ld.so warning in case of using LD_LIBRARY_PATH. That breaks the glibc build.

As Makefile includes BUILD_LDFLAGS for the purpose of cross-rpcgen, I
use this instead of the intrusive LD_LIBRARY_PATH.
2012-12-24 13:06:04 +01:00
Lluís Batlle i Rossell 06f6bb0559 vxl: fixing build with the new linux headers 2012-12-21 10:53:10 +01:00
Eelco Dolstra 88f7000aa4 openssl: Fix building on Darwin
http://hydra.nixos.org/build/3491716
2012-12-18 18:03:26 +01:00
Eelco Dolstra f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
Peter Simons f284ff8326 haskell-yesod: update to version 1.1.7 2012-12-12 11:54:27 +01:00
Peter Simons c90c6a776e haskell-yesod-default: update to version 1.1.3 2012-12-12 11:54:27 +01:00
Peter Simons 04bef3c9a2 haskell-yesod-auth: update to version 1.1.2.2 2012-12-12 11:54:27 +01:00
Peter Simons b092e70e33 haskell-word8: update to version 0.0.3 2012-12-12 11:54:27 +01:00
Peter Simons 32ca1065d8 haskell-warp: update to version 1.3.6 2012-12-12 11:54:27 +01:00
Peter Simons 453976e0dd haskell-vector-space: update to version 0.8.6 2012-12-12 11:54:27 +01:00
Peter Simons 38779740b6 haskell-snap: update to version 0.10.0.1 2012-12-12 11:54:27 +01:00
Peter Simons fddf48d435 haskell-persistent: update to version 1.1.0.1 2012-12-12 11:54:27 +01:00
Peter Simons 677e274bbb haskell-persistent-template: update to version 1.1.1 2012-12-12 11:54:27 +01:00
Peter Simons bebe2376dd haskell-language-c-quote: update to version 0.4.4 2012-12-12 11:54:27 +01:00
Peter Simons b177c326ee haskell-iproute: update to version 1.2.9 2012-12-12 11:54:27 +01:00
Peter Simons f21cecadfc haskell-http-reverse-proxy: update to version 0.1.0.7 2012-12-12 11:54:27 +01:00
Peter Simons 5bf750e568 haskell-http-conduit: update to version 1.8.5.1 2012-12-12 11:54:27 +01:00
Peter Simons 2b57173a4b haskell-ghc-mod: update to version 1.11.3 2012-12-12 11:54:26 +01:00
Peter Simons 0ab913ecf9 haskell-diagrams-lib: update to version 0.6 2012-12-12 11:54:26 +01:00
Peter Simons 60363063b1 haskell-diagrams: update to version 0.6 2012-12-12 11:54:26 +01:00
Peter Simons ff255d83bf haskell-diagrams-core: update to version 0.6 2012-12-12 11:54:26 +01:00
Peter Simons 2e453bc006 haskell-diagrams-cairo: update to version 0.6 2012-12-12 11:54:26 +01:00
Peter Simons fbaec0afc3 haskell-crypto-conduit: update to version 0.4.2 2012-12-12 11:54:26 +01:00
Peter Simons 15b8c51cf8 haskell-classy-prelude: update to version 0.4.2 2012-12-12 11:54:26 +01:00
Peter Simons b360b1642e haskell-classy-prelude-conduit: update to version 0.4.2 2012-12-12 11:54:26 +01:00
Peter Simons b9bf83031c haskell-blaze-svg: add version 0.3.3.0 2012-12-12 11:40:10 +01:00
Peter Simons 8572b50535 haskell-dual-tree: add version 0.1.0.0 2012-12-12 11:40:00 +01:00
Peter Simons 75173b144f haskell-force-layout: add version 0.2 2012-12-12 11:39:51 +01:00
Peter Simons 72a16af4b3 haskell: add minimorph-0.1.4.0 and miniutter-0.4.0 2012-12-12 11:39:17 +01:00
Peter Simons 1612d80354 haskell-monoid-extras: add version 0.2.2.1 2012-12-12 11:39:03 +01:00
Peter Simons b5ec495f5f haskell: add diagrams-contrib-0.6 and diagrams-svg-0.6 2012-12-12 11:37:44 +01:00
Lluís Batlle i Rossell 36f78f6d5f opencv: update to 2.4.3 2012-12-11 13:47:41 +01:00
Lluís Batlle i Rossell eee3a373cf opencascade: update to 6.5.4
For GL programs, it has this new requirement:
export CSF_GraphicShr=$CASROOT/lib/libTKOpenGl.so

http://www.salome-platform.org/forum/forum_10/thread_2350
2012-12-11 09:53:26 +01:00
Lluís Batlle i Rossell d190975896 ftgl: making it link to GL properly.
Its shared objects require mesa symbols of gl and glu.
2012-12-11 09:53:26 +01:00
Peter Simons ea68e083a1 haskell-wai-app-static: update to version 1.3.0.5 2012-12-10 12:43:49 +01:00
Peter Simons bc41c1dc05 haskell-uniplate: update to version 1.6.9 2012-12-10 12:43:49 +01:00
Peter Simons d62a757266 haskell-stylish-haskell: update to version 0.5.5.2 2012-12-10 12:43:49 +01:00
Peter Simons 780e808177 haskell-snap: update to version 0.10.0 2012-12-10 12:43:49 +01:00