| Commit message (Collapse) | Author | Age |
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
apu-1-config --ldflags is giving broken output on the fixed-output
dependencies. This broke serf build since db was split to multiple
outputs.
https://nix-cache.s3.amazonaws.com/log/q35s5jba6p6dpdqlfn9qgy5w0hpa506v-serf-1.3.9.drv
|
|
|
|
|
|
|
| |
This fixes a regression introduced in 4b06383.
[dezgeg squashed in to fit the changes introduced in "db: Use more
conventional outputs, also split bin", also patch .la file]
|
| |
|
| |
|
| |
|
|
|
|
| |
Make either 'bin' or 'out' the first output.
|
|
|
|
| |
Build-tested on x86_64 Linux & Mac.
|
| |
|
| |
|
| |
|
|\ |
|
| | |
|
| |
| |
| |
| | |
libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep
|
| |
| |
| |
| | |
Also fixup more .la files to avoid unnecessary -dev dependencies.
|
| | |
|
|\|
| |
| |
| | |
Many non-conflict problems weren't (fully) resolved in this commit yet.
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| | |
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
pkgs/applications/networking/mailreaders/sup/default.nix
pkgs/development/compilers/ghc/7.8.3-binary.nix
pkgs/development/interpreters/php/5.3.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/poppler/default.nix
pkgs/top-level/all-packages.nix
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
pkgs/tools/security/gnupg/default.nix
|
| | | |
|
| |/ |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
|
| | |
|
| |
| |
| |
| |
| | |
Add the required packages to buildInputs. Create a wrapper around
apr-1-config so that internal sed commands succeed.
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libsndfile/default.nix
pkgs/misc/cups/default.nix
pkgs/top-level/all-packages.nix
|
| | |
|
|/
|
|
|
| |
This is important because apr stores a copy of libtool, which in turn
contains a reference to GCC.
|
| |
|
| |
|
|
|
|
| |
- Moved mobile development tools into a separate folder
|
| |
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=32303
|
|
|
|
|
|
|
| |
* apr-util updated to 1.3.12.
* httpd updated to 2.2.19.
svn path=/nixpkgs/trunk/; revision=27487
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=27283
|
|
|
|
|
|
| |
the ldap support.
svn path=/nixpkgs/trunk/; revision=26764
|
|
|
|
|
|
|
| |
I imagine noone would mind this 'addon' in their nixos apache installations.
svn path=/nixpkgs/trunk/; revision=26763
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=25000
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=16615
|
|
|
|
|
|
| |
its own copies.
svn path=/nixpkgs/trunk/; revision=12971
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=10502
|
|
|
|
|
|
|
|
|
| |
URLs to http://nix.cs.uu.nl/dist/tarballs. With content-addressable
mirror support (r9190, NIXPKGS-70) this is no longer necessary:
fetchurl will try to download from that location automatically. So
we can keep the original URLs.
svn path=/nixpkgs/trunk/; revision=9192
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=6711
|