Commit Graph

17 Commits

Author SHA1 Message Date
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
06536251c9 readline: Don't use gcc-apple 2014-07-01 15:56:08 +02:00
Lluís Batlle i Rossell
b9163ab332 Revert "Updating GNU readline to 6.3."
This reverts commit dbaa07b8ef.

vcunat reported on IRC that the update breaks python and parted at least.
http://hydra.nixos.org/build/9661091/nixlog/1/tail-reload
2014-03-20 12:53:20 +01:00
Lluís Batlle i Rossell
dbaa07b8ef Updating GNU readline to 6.3.
I remove all 6.2 patches manually, but I keep the logic to add later patches.
2014-03-20 10:47:36 +01:00
Ludovic Courtès
eaaaad5203 GNU Readline: Fix typo.
svn path=/nixpkgs/branches/stdenv-updates/; revision=29606
2011-10-03 19:27:10 +00:00
Ludovic Courtès
41d04539a6 GNU Readline 6.2: Update patch set.
svn path=/nixpkgs/branches/stdenv-updates/; revision=29603
2011-10-03 17:35:04 +00:00
Shea Levy
4d70ba6cc9 Merge from trunk up through r28790
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Ludovic Courtès
7762934904 BDW-GC, GMP, libffi, libunistring, Readline: Don't use the native `strip'.
Using the native `strip' breaks static libraries when cross-compiling.

svn path=/nixpkgs/trunk/; revision=27572
2011-07-01 13:20:12 +00:00
Ludovic Courtès
c1cfa58556 GNU Readline 6.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=26118
2011-02-25 15:28:26 +00:00
Ludovic Courtès
1bc4535ed9 GNU Readline 6.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19222
2010-01-05 11:27:54 +00:00
Lluís Batlle i Rossell
5c14f92b30 Reverting a wrong name change I once did, when I thought that we would update
all the naming in nixpkgs to match the new build/host cross compilation stdenv.
Nevertheless, we decided not to do the renaming, but I forgot this change in
readline until ludo told me about it.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18474
2009-11-19 22:15:13 +00:00
Lluís Batlle i Rossell
e7c8e8da4f I made the whole nixpkgs dependencies available to the cross compiler, no
needing to keep a new tree of expressions apart for the expressions to get
cross-compiled.

I changed the whole way of using cross compilation with nixpkgs, which before
was done through a simple adapter.

Now the adapter became complex, and I've tried to avoid the most obvious
recursivities. For example, the fetchurl expression should
never be cross-compiled, as the gmp, mpfr, and some others, like
some ncurses, perl, ... I made overrided copies of those necessary as
perlNoCross, ncursesNoCross, as stdenvNoCross, keeping in mind that
the stdenv (capable of cross compilation) is built upon stdenvNoCross using
an adapter.

So, to cross compile, instead of building using "nixpkgs/default.nix",
you should build with your
own "myarchiteture.nix", which should have contents like these, for example:

import /etc/nixos/nixpkgs/default.nix
{
    crossSystem = {
        config = "armv5tel-unknown-linux-gnueabi";
        bigEndian = false;
        arch = "arm";
        float = "soft";
    };
}


svn path=/nixpkgs/branches/stdenv-updates/; revision=18398
2009-11-17 22:58:48 +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
Eelco Dolstra
94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Eelco Dolstra
edb9a250c9 * The shobj-darwin patch doesn't apply anymore, and it doesn't seem
necessary anymore either.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14842
2009-04-02 15:36:09 +00:00
Ludovic Courtès
2d41dce5b6 GNU Readline 6.0.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14208
2009-02-23 18:10:41 +00:00