There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
Headers were disabled, probably because they caused a build error: the header files were being
copied to the store path of wxwidgets, but it failed with permission denied. With this commit,
the header files stay in the wxPython store path.
To point the builder of another derivation to the wxPython header files, some tweaking is
needed. E.g. for kicad: cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0" ]
I think what's happening is that the linker automatically adds DT_NEEDED dependencies to some libraries because it finds these libraries are being used directly, but
because they're not linked explicitly with -lflags, the gcc wrapper does not add them to RUNPATH.
a worthy goal to move the Python packages that are currently in
all-packages.nix into a single attribute set, but this doesn't
require moving python-packages.nix or the other changes made to that
file. The Python packages in all-packages.nix should simply be
moved to python-packages.nix, and ideally changed to use
buildPythonPackage.
svn path=/nixpkgs/trunk/; revision=21196
- cleanup python libraries:
* moving all python libraries into a attr set into a directory
so that expressions can be used for both: python 2.5 and 2.6 easily
* disabling packages which don't build
svn path=/nixpkgs/trunk/; revision=21142
builders. These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations. This is done
automatically now if setupHook is set.
* Deleted the initscripts package. NixOS doesn't use it anymore.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
Xinerama support. It gets libXinerama as an explicit build input,
but it checks for its existence in /usr/X11/include etc. This
caused Bittorrent to fail (NIXPKGS-61). Backported the builder
fixes from wxGTK 2.8.
svn path=/nixpkgs/trunk/; revision=8813
