I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.
svn path=/nixpkgs/trunk/; revision=22814
properly on Amazon EC2.
* Always apply the CIFS timeout patch. It's rather annoying to have
to build a separate kernel for the VM tests.
svn path=/nixpkgs/trunk/; revision=22630
now has a flat directory structure (i.e. usr/lib, usr/share etc. are
gone), which makes installing everything in the right location
rather more tedious.
svn path=/nixpkgs/trunk/; revision=22628
prevented the nscd cache from being properly invalidated after a
change, so that e.g. `useradd x; id x' would fail.
svn path=/nixpkgs/trunk/; revision=22599
operations to 120s. This is necessary if the host is heavily
loaded. For instance, in the Hydra build farm, if there are many
concurrent jobs, VM builds often fail because they hit the timeout.
svn path=/nixpkgs/trunk/; revision=22347
as they become available (as determined by monitoring udev) and
emits Upstart events to inform other jobs that the filesystems are
mounted. This is very useful for NixOS (which currently ignores
filesystems in the job dependency chain - very bad).
Unfortunately, mountall depends on Plymouth (a boot splash
implementation). The patch allows mountall to build without
Plymouth. Since Plymouth is also used to inform users about failing
mounts and get responses, some more changes will be needed.
Probably mountall should emit a "mount-failed" event to trigger a
root shell on the console to allow the user to repair the problem.
svn path=/nixpkgs/trunk/; revision=22143
we will end up having MD5 passwords in passwd. pam_unix will fallback to md5 if the requested
hash algorithm is not available in crypt.
svn path=/nixpkgs/trunk/; revision=22141
coreutils:
- Don't remove variables such as $PATH and $SHELL from the calling
environment (from upstream).
- When su is invoked with command line arguments for the shell
(e.g. "su - -c 'cmd'"), set argv[0] in the shell to "-su" or
"-<basename>" (as determined by the SU_NAME option in
/etc/login.defs). This is necessary to make Bash compiled with
the NON_INTERACTIVE_LOGIN_SHELLS option to read startup files.
- Don't set $PATH to /bin:/usr/bin but inherit the $PATH of the
caller.
svn path=/nixpkgs/trunk/; revision=22140
useful on x86_64-linux to support i686 binaries: there we need the
NVIDIA OpenGL libraries, but not the kernel module or the
nvidia-settings program (which just cause a lot of unnecessary and
large dependencies).
svn path=/nixpkgs/trunk/; revision=22061
