Lluís Batlle i Rossell
8c638e5e68
Fixing what I broke in the last commit in setup.sh.
...
I made the stdenvCross adapter simpler, according to Nicolas Pierron comments,
and I commented it a bit.
There are still jobs to do. At least:
- Plan for the general renaming from buildInputs to hostInputs
- We should not break merges from trunk.
- Make the generic stdenv understand about host/buildInputs, at least for
native builds, because it is used in the always-native building of
stdenvLinux. This should allow us to remove all duplications of "*NoCross" in
nixpkgs.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18449
2009-11-18 19:25:57 +00:00
Rob Vermaas
4dca2c8b12
echo to stderr in stead of stdout. else hydra cannot read hash/path
...
svn path=/nixpkgs/trunk/; revision=18448
2009-11-18 19:10:24 +00:00
Lluís Batlle i Rossell
4c09cfc8a3
Adding generic builder management of cross compilation: envHooksHost, pkgsHost, ...
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18446
2009-11-18 18:16:35 +00:00
Ludovic Courtès
4f20056bca
nix-prefetch-git: Default to SHA256.
...
svn path=/nixpkgs/trunk/; revision=18443
2009-11-18 16:39:09 +00:00
Ludovic Courtès
39476057a2
nix-prefetch-git: Support $NIX_PREFETCH_GIT_LEAVE_DOT_GIT.
...
svn path=/nixpkgs/trunk/; revision=18442
2009-11-18 16:39:06 +00:00
Ludovic Courtès
3124661215
nix-prefetch-git: Remove `--depth' argument since it's risky.
...
The `--depth' argument asks Git to fetch the last revisions of the given
repo on *any* branch, which is often useless.
Thanks to Lluís Battle for clarifying this.
svn path=/nixpkgs/trunk/; revision=18438
2009-11-18 16:24:31 +00:00
Eelco Dolstra
eb9ff07031
* Package naming / versioning guidelines.
...
svn path=/nixpkgs/trunk/; revision=18433
2009-11-18 15:05:09 +00:00
Ludovic Courtès
15da008651
Slightly generalize `sourceTarball'.
...
svn path=/nixpkgs/trunk/; revision=18426
2009-11-18 14:12:39 +00:00
Ludovic Courtès
1f9e87871e
GNU Guile 1.9: Remove unnecessary patch.
...
svn path=/nixpkgs/trunk/; revision=18418
2009-11-18 13:41:17 +00:00
Ludovic Courtès
2bbaf039da
fetchurl: Improve GNU mirror list.
...
svn path=/nixpkgs/trunk/; revision=18416
2009-11-18 13:18:28 +00:00
Ludovic Courtès
e615bc4574
GNU Guile 1.9.5.
...
svn path=/nixpkgs/trunk/; revision=18415
2009-11-18 13:18:24 +00:00
Eelco Dolstra
b19ada9e05
* Fix the GPM URL.
...
svn path=/nixpkgs/trunk/; revision=18413
2009-11-18 12:47:58 +00:00
Eelco Dolstra
221ad8362f
* Use the stable Nix to test the Nixpkgs expressions, since we always
...
want to be compatible with the last stable Nix release.
svn path=/nixpkgs/trunk/; revision=18411
2009-11-18 12:22:24 +00:00
Eelco Dolstra
fcddb50e66
* Remove some more unused functions.
...
svn path=/nixpkgs/trunk/; revision=18407
2009-11-18 11:47:02 +00:00
Eelco Dolstra
b4636d333c
svn path=/nixpkgs/trunk/; revision=18406
2009-11-18 11:46:35 +00:00
Eelco Dolstra
4437778e33
svn path=/nixpkgs/trunk/; revision=18405
2009-11-18 11:38:20 +00:00
Eelco Dolstra
7f5b839524
* Removed selectVersion. There's no good reason to write
...
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
packages.
* Renamed several files to `default.nix'. As a general rule, version
numbers should only be included in the filename when there is a
reason to keep multiple versions of a package in Nixpkgs.
Otherwise, it just makes it harder to update the package.
svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +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
0c631f6181
Trying to move all stdenv cross-compiling details out of the stdenv expression,
...
into a stdenv adapater.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18397
2009-11-17 21:14:57 +00:00
Sander van der Burg
52e9488541
Upgraded ejabberd to the latest stable 2.1.0 and also claimed maintainership since I really need this for one of my experiments
...
svn path=/nixpkgs/trunk/; revision=18396
2009-11-17 16:54:04 +00:00
Lluís Batlle i Rossell
4acd0bdb8c
Making xorgserver build also Xnest.
...
svn path=/nixpkgs/trunk/; revision=18395
2009-11-17 16:46:51 +00:00
Rob Vermaas
66a537f774
redirect stdout of git calls to stderr to allow git to work in hydra as input
...
svn path=/nixpkgs/trunk/; revision=18393
2009-11-17 15:50:20 +00:00
Eelco Dolstra
aed79cca1a
* Another unused function.
...
svn path=/nixpkgs/trunk/; revision=18391
2009-11-17 15:36:48 +00:00
Eelco Dolstra
a56509c0db
* Remove some more unused functions.
...
svn path=/nixpkgs/trunk/; revision=18390
2009-11-17 15:31:48 +00:00
Eelco Dolstra
802fa4ba0b
* Remove sumArgs and its few remaining uses. Idem for composedArgs.
...
svn path=/nixpkgs/trunk/; revision=18388
2009-11-17 15:26:22 +00:00
Eelco Dolstra
18a08aa008
* Add an openSUSE mirror that contains discontinued releases (such as
...
10.3).
svn path=/nixpkgs/trunk/; revision=18385
2009-11-17 14:26:42 +00:00
Eelco Dolstra
c3ea7a9212
* Added Digest::SHA.
...
svn path=/nixpkgs/trunk/; revision=18382
2009-11-17 13:07:14 +00:00
Rob Vermaas
b82da9824b
make nix overridable
...
svn path=/nixpkgs/trunk/; revision=18380
2009-11-17 12:30:17 +00:00
Lluís Batlle i Rossell
2c7fa189fb
Making the definition of the cross compiling target an attribute set.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18378
2009-11-16 23:21:13 +00:00
Nicolas Pierron
01e98e49b1
* Add a stdenv adapter which can remove all maintainers fields. This can
...
be used to remove error reports from development branches.
svn path=/nixpkgs/trunk/; revision=18377
2009-11-16 22:23:11 +00:00
Nicolas Pierron
29384d43f2
* Update Go's version. Make 8g & 8l commands working with no need of
...
extra argument to locate the Go's libraries.
svn path=/nixpkgs/trunk/; revision=18376
2009-11-16 18:42:43 +00:00
Rob Vermaas
ede5426070
name typo
...
svn path=/nixpkgs/trunk/; revision=18375
2009-11-16 13:57:11 +00:00
Rob Vermaas
30e6d32b33
update baseline for stratego related packages
...
svn path=/nixpkgs/trunk/; revision=18374
2009-11-16 13:21:12 +00:00
Sander van der Burg
88a90ec1c5
Upgraded Axis2 to 1.5.1
...
svn path=/nixpkgs/trunk/; revision=18373
2009-11-16 12:50:04 +00:00
Rob Vermaas
94a659596b
ln issue mingw
...
svn path=/nixpkgs/trunk/; revision=18372
2009-11-16 12:22:55 +00:00
Rob Vermaas
4e50b362f7
svn path=/nixpkgs/trunk/; revision=18371
2009-11-16 11:24:49 +00:00
Rob Vermaas
e0389e41f0
different behaviour of ln on mingw
...
svn path=/nixpkgs/trunk/; revision=18370
2009-11-16 11:22:11 +00:00
Rob Vermaas
b7ebd57d93
mingw related stuff
...
svn path=/nixpkgs/trunk/; revision=18369
2009-11-16 08:47:31 +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
3c4edd6bfa
Fixing the gcc cross wrapper (removing some /usr/) so it gives proper linking.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18361
2009-11-15 21:36:13 +00:00
Lluís Batlle i Rossell
d06dce4e42
Fixing some conflict on the variable 'cross'.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18357
2009-11-15 19:07:21 +00:00
Lluís Batlle i Rossell
81f695899a
I think I fixed the gcc builder for the usual stdenv, I broke in the commit
...
before.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18356
2009-11-15 17:48:10 +00:00
Lluís Batlle i Rossell
307cbd7b3b
First attempt for the full stdenvCross. I think that it should work. The
...
toolchain for arm built.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18355
2009-11-15 16:48:36 +00:00
Lluís Batlle i Rossell
2412034611
Cleaning a bit around gcc43_RealCross
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18352
2009-11-15 05:39:22 +00:00
Lluís Batlle i Rossell
9b977f5c60
Fixing many things related to the cross compilation in stdenvCross.
...
It still does not work, but I think I already get glibc cross compiled.
Next: gcc and g++, and set some setup script hooks on stdenvCross.
It took quite enough hours for this commit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18351
2009-11-15 05:28:35 +00:00
Nicolas Pierron
66ef37d260
* Fix "cgo" binary be defining LC_ALL=C inside the binary.
...
svn path=/nixpkgs/trunk/; revision=18350
2009-11-14 23:39:53 +00:00
Nicolas Pierron
a61a4bc4bc
* Fix TimeZone in The Go Programming Language.
...
svn path=/nixpkgs/trunk/; revision=18349
2009-11-14 23:39:46 +00:00
Nicolas Pierron
da1311b893
* Add the Go Programming Language compiler.
...
svn path=/nixpkgs/trunk/; revision=18348
2009-11-14 20:14:28 +00:00
Nicolas Pierron
c8cb5210fb
* Add a fetchhg builder to checkout mercurial repositories.
...
svn path=/nixpkgs/trunk/; revision=18347
2009-11-14 20:14:21 +00:00
Nicolas Pierron
7482474aef
* Improve showVal: handle integer and strings.
...
svn path=/nixpkgs/trunk/; revision=18346
2009-11-14 20:14:15 +00:00
Nicolas Pierron
47de42835a
* Add https support for mercurial.
...
svn path=/nixpkgs/trunk/; revision=18345
2009-11-14 20:14:09 +00:00
Lluís Batlle i Rossell
2aba922d30
My first attempt at getting cross compilers in nixpkgs.
...
My idea is to provide special stdenv expressions that will contain in the path
additional cross compilers. As most expressions for programs accept a stdenv parameter,
we could substitute this parameter with the special stdenv, which will have a
generic builder that attempts the usual "--target=..." and can additionally
have an env variable like "cross" with the target architecture set.
So, finally we could have additional expressions like this:
bashRealArm = makeOverridable (import ../shells/bash) {
inherit fetchurl bison;
stdenv = stdenvCross "armv5tel-unknown-linux-gnueabi";
};
Meanwhile it does not work - I still cannot get the cross-gcc to build.
I think it does not fill the previous expressions with a lot of noise, so I
think it may be a good path to follow.
I only touched some files of the current stdenv: gcc-4.3, kernel headers
2.6.28, glibc 2.9, ...
I tried to use the gcc-cross-wrapper, that may be very outdated. Maybe I will
update it, or update the gcc-wrapper expression to make it fit the cross tools,
but meanwhile I even cannot build gcc, so I have not tested the wrapper.
This new idea on cross compiling is not similar to that of the
nixpkgs/branches/cross-compilation, which mostly added bare new expressions for
anything to be cross compiled, if I understood it correctly.
I cared not to break anything of the usual stdenv in all this work.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18343
2009-11-14 08:11:30 +00:00
Lluís Batlle i Rossell
6864119104
Updating from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18341
2009-11-13 19:19:34 +00:00
Rob Vermaas
f26614bb78
stuff for mingw
...
svn path=/nixpkgs/trunk/; revision=18339
2009-11-13 11:58:17 +00:00
Rob Vermaas
079451fa9e
other location for msys
...
svn path=/nixpkgs/trunk/; revision=18338
2009-11-13 11:41:56 +00:00
Rob Vermaas
290d47d0f3
trying to fix mingw setup
...
svn path=/nixpkgs/trunk/; revision=18337
2009-11-13 10:30:29 +00:00
Marc Weber
f5d0193047
synergy broke by xorg-update
...
svn path=/nixpkgs/trunk/; revision=18335
2009-11-12 16:11:44 +00:00
Eelco Dolstra
9d15a2ed67
* Grub 1.97.1.
...
svn path=/nixpkgs/trunk/; revision=18332
2009-11-12 08:58:16 +00:00
Marc Weber
173bdf6d2f
fix ghc-get-packages
...
svn path=/nixpkgs/trunk/; revision=18331
2009-11-12 07:11:03 +00:00
Sander van der Burg
ac64ef2275
Upgraded JBoss to 5.1.0
...
svn path=/nixpkgs/trunk/; revision=18329
2009-11-11 15:52:26 +00:00
Rob Vermaas
b325a34361
chrome 31663
...
svn path=/nixpkgs/trunk/; revision=18328
2009-11-11 15:34:21 +00:00
Ludovic Courtès
8799678836
GNU IceCat 3.5.5.
...
svn path=/nixpkgs/trunk/; revision=18327
2009-11-11 14:24:52 +00:00
Rob Vermaas
efe661ab0e
update chrome to version 31662 to let dropdownlists work properly again
...
svn path=/nixpkgs/trunk/; revision=18326
2009-11-11 14:06:57 +00:00
Pjotr Prins
84147f4477
Force gcc42 for arb (otherwise headers balk)
...
svn path=/nixpkgs/trunk/; revision=18324
2009-11-10 17:16:06 +00:00
Marco Maggesi
c0a6058122
Add package OpenAFS (added forgotten files)
...
svn path=/nixpkgs/trunk/; revision=18323
2009-11-10 16:00:52 +00:00
Marco Maggesi
849f42d7bc
Add package OpenAFS
...
svn path=/nixpkgs/trunk/; revision=18319
2009-11-10 14:59:39 +00:00
Pjotr Prins
5747c2194b
rxp requires CFLAG -D_GNU_SOURCE
...
svn path=/nixpkgs/trunk/; revision=18318
2009-11-10 14:25:26 +00:00
Rob Vermaas
a40d37b57b
other location for tarball
...
svn path=/nixpkgs/trunk/; revision=18317
2009-11-10 13:58:22 +00:00
Marco Maggesi
e2057ffe04
Add package ledger
...
svn path=/nixpkgs/trunk/; revision=18316
2009-11-10 11:02:45 +00:00
Lluís Batlle i Rossell
605b62da11
Enabling ipv6 at least as module in the zen5 arm kernel
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18315
2009-11-09 23:26:34 +00:00
Rob Vermaas
0e1a687233
revert previous change
...
svn path=/nixpkgs/trunk/; revision=18314
2009-11-09 15:05:45 +00:00
Rob Vermaas
83c57ed434
trying to make static linking work on darwin
...
svn path=/nixpkgs/trunk/; revision=18313
2009-11-09 15:00:24 +00:00
Rob Vermaas
85ee8e90b7
make static sdf2bundle
...
svn path=/nixpkgs/trunk/; revision=18312
2009-11-09 14:43:01 +00:00
Marco Maggesi
c0a1119f10
Reintroduced attribute scsh accidentally removed in revision 18299.
...
svn path=/nixpkgs/trunk/; revision=18311
2009-11-09 13:20:27 +00:00
Lluís Batlle i Rossell
de6aa89c45
Updating xchm.
...
svn path=/nixpkgs/trunk/; revision=18310
2009-11-09 11:55:31 +00:00
Lluís Batlle i Rossell
6d092c3371
Adding kvm88, although without the patches kvm86 had for some nix advantages (samba, ...),
...
because they don't apply directly.
svn path=/nixpkgs/trunk/; revision=18309
2009-11-09 11:55:23 +00:00
Rob Vermaas
f2f5176551
add static variant of sdf
...
svn path=/nixpkgs/trunk/; revision=18308
2009-11-09 09:57:59 +00:00
Rob Vermaas
28d59537c5
add static variant of sdf
...
svn path=/nixpkgs/trunk/; revision=18307
2009-11-09 09:56:06 +00:00
Rob Vermaas
0a56e71716
add static variant for sdf bundle
...
svn path=/nixpkgs/trunk/; revision=18306
2009-11-09 09:53:57 +00:00
Lluís Batlle i Rossell
4f906f38a8
Updating qemu to 0.11.0, and making it use stdenv with the usual gcc, and not an older.
...
svn path=/nixpkgs/trunk/; revision=18305
2009-11-09 09:15:58 +00:00
Wouter den Breejen
5fae957741
Added par2, unzip/rar as dependencies so they are not picked up from PATH
...
svn path=/nixpkgs/trunk/; revision=18304
2009-11-08 23:39:06 +00:00
Wouter den Breejen
3259101fc0
Added par2, unzip/rar as dependencies so they are not picked up from PATH
...
svn path=/nixpkgs/trunk/; revision=18303
2009-11-08 23:37:49 +00:00
Lluís Batlle i Rossell
6675f0a52c
Adding a check in the generic builder so it halts on the existence of
...
/homeless-shelter
svn path=/nixpkgs/branches/stdenv-updates/; revision=18302
2009-11-08 22:50:27 +00:00
Lluís Batlle i Rossell
96b4174b5a
Fixing the neverball expression: it relied on having a /homeless-shelter
...
svn path=/nixpkgs/trunk/; revision=18301
2009-11-08 22:35:19 +00:00
Michael Raskin
29b28dc3bb
Reduce fetchmtn verbosity
...
svn path=/nixpkgs/trunk/; revision=18300
2009-11-08 22:30:38 +00:00
Michael Raskin
6722c6c22f
A package to feed to HAL to get synaptics support
...
svn path=/nixpkgs/trunk/; revision=18299
2009-11-08 22:12:55 +00:00
Michael Raskin
24162c6b4a
Fix fetchmtn
...
svn path=/nixpkgs/trunk/; revision=18298
2009-11-08 22:12:14 +00:00
Lluís Batlle i Rossell
1b37fc42bb
Updating options for the versatileARM kernel, so it matches something
...
usable and buildable from a sheevaplug.
I took the additional settings from:
http://fedoraproject.org/wiki/Architectures/ARM/HowToQemu
svn path=/nixpkgs/branches/stdenv-updates/; revision=18296
2009-11-08 20:09:37 +00:00
Wouter den Breejen
d24e7434ec
Added sabnzbd usenet download tool :)
...
svn path=/nixpkgs/trunk/; revision=18295
2009-11-08 19:59:56 +00:00
Wouter den Breejen
123e595990
Added sabnzbd usenet download tool :)
...
svn path=/nixpkgs/trunk/; revision=18294
2009-11-08 19:55:37 +00:00
Wouter den Breejen
a83def2812
Added sabnzbd usenet download tool :)
...
svn path=/nixpkgs/trunk/; revision=18293
2009-11-08 19:53:54 +00:00
Lluís Batlle i Rossell
be2ff23280
Making the 'makeInitrd' expression use "platform"
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18292
2009-11-08 18:47:55 +00:00
Lluís Batlle i Rossell
7769ad11bd
Updating the logic to put the resulting kernel image into its store path.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18289
2009-11-08 17:19:46 +00:00
Lluís Batlle i Rossell
c28701c3d9
Fixing the xdriinfo build.
...
svn path=/nixpkgs/trunk/; revision=18287
2009-11-08 11:34:17 +00:00
Marco Maggesi
e3204aa407
New version of cryopid.
...
Update package cryopid to a new (unstable) version.
The old (stable) version of cryopid works only with old linux kernels.
svn path=/nixpkgs/trunk/; revision=18286
2009-11-08 10:38:07 +00:00
Marc Weber
edf78fcb6a
some fetchgit documentation
...
svn path=/nixpkgs/trunk/; revision=18283
2009-11-08 03:02:10 +00:00
Lluís Batlle i Rossell
5eeac0d52a
Merging from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates2/; revision=18280
2009-11-08 02:03:13 +00:00
Lluís Batlle i Rossell
896dc42662
Forgot some 'depth' regarding fetchgit still.
...
svn path=/nixpkgs/trunk/; revision=18279
2009-11-08 01:59:50 +00:00
Lluís Batlle i Rossell
4326d07c11
Updating from trunk
...
svn path=/nixpkgs/branches/stdenv-updates2/; revision=18278
2009-11-08 01:57:40 +00:00
Lluís Batlle i Rossell
f1ee14bfaf
Removing fetchgit --depth and its usage. It does not provide much advantages...
...
I think it takes the recent N commits into the repository, which says very little,
even for wanting master/HEAD.
svn path=/nixpkgs/trunk/; revision=18277
2009-11-08 01:51:20 +00:00