Commit graph

23 commits

Author SHA1 Message Date
Evgeny Egorochkin 829b29153b clean up git revision handling in several packages 2013-11-13 12:46:55 +02:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Lluis Batlle 0353c08d38 uboot: updating the default uboot to 2012.07
This is what I use in the sheevplug, with the provided patches.
The old sheevaplug uboot doesn't understand ubifs.
2013-01-27 15:38:39 +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
Lluís Batlle i Rossell f5cb1ecaf4 Updating the sheevaplug uboot. I've not tried it, but the old one disappeared from the server.
svn path=/nixpkgs/trunk/; revision=34394
2012-06-09 07:27:40 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Lluís Batlle i Rossell d391d56f97 Setting the nanonote uboot to load 4MiB, and not 2MiB. My last 2.6.37 kernel
has more than 2MiB.


svn path=/nixpkgs/trunk/; revision=31393
2012-01-07 09:20:16 +00:00
Eelco Dolstra 3ea1c30846 * Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing
in its interaction with the ‘dontStrip’ attribute.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30848
2011-12-12 14:02:12 +00:00
Lluís Batlle i Rossell df8db9a701 Making the nanonote uboot not start the default console in ttyS0, but in tty0
instead.
It's more comfortable for those not having a serial line attached to it.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24828
2010-11-23 20:46:45 +00:00
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Ludovic Courtès 0f5aed60d4 U-Boot: Fix the environment address for the GuruPlug.
svn path=/nixpkgs/trunk/; revision=24126
2010-10-07 07:29:12 +00:00
Ludovic Courtès bcba3664d9 Add U-Boot for the GuruPlug.
svn path=/nixpkgs/trunk/; revision=24060
2010-10-04 22:23:57 +00:00
Lluís Batlle i Rossell b17d1d7d07 Adding nanonote kernel and uboot
svn path=/nixpkgs/branches/stdenv-updates/; revision=22943
2010-08-04 11:07:13 +00:00
Lluís Batlle i Rossell eb047010f8 Trying to get a better expression for uboot upstream, allowing normal and cross build
with proper assertions.


svn path=/nixpkgs/trunk/; revision=20319
2010-03-01 23:22:48 +00:00
Lluís Batlle i Rossell 95e22a39c7 Trying to make uboot not annoy the nixpkgs tarball. Tested.
svn path=/nixpkgs/trunk/; revision=20310
2010-03-01 15:21:24 +00:00
Lluís Batlle i Rossell e1760d529b I still did not fix the nixpkgs tarball in the previous commit...
Next attempt, now simpler.

svn path=/nixpkgs/trunk/; revision=20129
2010-02-19 14:42:50 +00:00
Lluís Batlle i Rossell 7b4529cfc7 Allowing multiplatform uboot (sheevaplug/integratorcp).
svn path=/nixpkgs/trunk/; revision=20079
2010-02-17 21:09:27 +00:00
Lluís Batlle i Rossell aca3e65338 Adding the mainline uboot.
svn path=/nixpkgs/trunk/; revision=20078
2010-02-17 20:53:01 +00:00
Lluís Batlle i Rossell 4dfc635cbb Fixing the uboot cross-build.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18473
2009-11-19 21:43:03 +00:00
Lluís Batlle i Rossell 7ade207f6b - Removed all *NoCross expressions I dupilcated in nixpkgs, while maintaining
the cross compilation functionality.
- I renamed some expected stdenv.mkDerivation parameter attributes so we can
  keep this branch properly updated from trunk. We agreed with Nicolas Pierron
  doing a massive renaming, so all current buildInputs become hostInputs (input
  as build for the host machine, in autotools terminology) , and
  then buildInputs would mean "input as for the build machine".
  By now, the specific "input as for the build machine" is specified through
  buildNativeInputs. We should fix this in the merge to trunk.
- I made the generic stdenv understand the buildNativeInputs, otherwise if
  we start changing nixpkgs expressions so they distinguish the current
  buildInputs into buildInputs and buildNativeInputs, we could break even more
  nixpkgs for other platforms.
- I changed the default result of mkDerivation so it becomes the derivation for
  to be run in the build machine. This allows, without any special rewriting,
  "fetchurl" derivations to be always results for the build machine to use
  them.
- The change above implies that, for anyone wanting to cross-compile, has to
  build the hostDrv of the wanted derivation. For example, after this commit,
  the usual test of "nix-build -A bison.hostDrv arm.nix" works. I described
  the contents of this arm.nix in r18398.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18471
2009-11-19 19:03:34 +00:00
Lluís Batlle i Rossell d82c7e0a69 Adding uboot cross compilation. I had to adapt the package a bit, because it
does not use autotools.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18362
2009-11-15 22:56:06 +00:00
Lluís Batlle i Rossell 4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00