renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
- 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
`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
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
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
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
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
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
* Dropped "nolongdouble.patch". The patch no longer applies to Python 2.6, and
apparently isn't required anymore either.
* Added access to native Darwin arch utility. Python tries to run 'arch' in
the configure stage, but that binary reside in /usr/bin. To make it
available to the expression, the small wrapper darwinArchUtility is added as
a buildInput if appropriate.
* Don't pass --enable-shared. The build fails if we try to enable building of
shared libraries, apparently because some required libraries aren't linked,
i.e. the linker call isn't right.
TODO:
* Figure out how to enable shared linking.
* The resulting binary on Darwin seem to lack the binascii module.
svn path=/nixpkgs/trunk/; revision=17894
I found no benefit from it. This card worked at most at 500KB/s for me at bitrate 54Mb/s,
and it works the same way with the fw 3.1.
svn path=/nixpkgs/trunk/; revision=17812
buildDefs doesn't like buildInputs containing nulls.
* In all-packages.nix: xfsProgs -> xfsprogs, jfsUtils -> jfsutils to
match the upstream name.
svn path=/nixpkgs/trunk/; revision=17726
configure script prints out this ominous warning:
WARNING: PolicyKit is disabled. You need to manually edit the hal.conf
file to lock down the service. Failure to do so allows any
caller to make hald do work on their behalf which may be
a huge SECURITY HOLE. I repeat: YOU NEED TO EDIT THE FILE
hal.conf to match your distro/site to avoid NASTY SECURITY HOLES.
Note that HAL only builds with the old PolicyKit (it looks for
polkit.pc). Reverted ConsoleKit to the last version that used the
old PolicyKit for this reason.
svn path=/nixpkgs/trunk/; revision=17432
the remote address / port to something sensible. Otherwise
simultaneous connections to the same guest port don't work properly.
svn path=/nixpkgs/trunk/; revision=16805
since we don't need it anymore. Patched the udev rules/helper
programs for CD-ROM symlink generation and firmware loading so that
we don't have to provide our own.
svn path=/nixpkgs/trunk/; revision=16684
anymore since the build process was very hacky. Instead
mount/umount looks for mount helpers in
/var/run/current-system/sw/sbin. It would be better to use an
environment variable, but that would be risky if mount is setuid
root.
* e2fsprogs: updated to 1.41.8. Don't build libuuid, libblkid
etc. anymore, since they have been moved to util-linux-ng.
* nfs-utils: updated to 1.2.0.
svn path=/nixpkgs/trunk/; revision=16682
the host to a TCP port on the guest. This will be useful for
automated testing using QEMU virtual machines. Using TCP ports on
the host is insecure and hard to manage (since you need to pick an
available host port).
For example:
$ qemu-system-x86_64 ... -redir tcp:65535::514
creates a Unix domain socket `./65535.socket' on the host. (There
is no proper syntax yet, so as a hack all host "ports" above 0xff00
are treated in this way.) Connections to that socket are then
forwarded to TCP port 514 on the guest. So the guest can do
$ nc -l -p 514 -e /bin/sh
to execute a shell for incoming connections on port 514, and then
the host can do
$ socat stdio ./65535.socket
to run a shell on the guest.
svn path=/nixpkgs/trunk/; revision=16593
I thought I didn't change stdenv, but I did. This will go soon into the stdenv
branch then.
Reverse-merging r16467 through r16465.
svn path=/nixpkgs/trunk/; revision=16468
