1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 19:45:54 +00:00
Commit graph

43 commits

Author SHA1 Message Date
Eelco Dolstra 6abfb2bd64 apr-util: Drop dependency on openssl.dev in out 2016-09-26 19:57:41 +02:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Tuomas Tynkkynen 8bbc3fe801 treewide: Make explicit that 'dev' output of expat is used 2016-05-19 10:00:30 +02:00
Tuomas Tynkkynen 29694b43b6 treewide: Make explicit that 'dev' output of apr is used 2016-05-19 10:00:24 +02:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát aa4562596f apr-util: refactor options 2016-01-05 09:42:56 +01:00
janus a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
Tuomas Tynkkynen 44742f836d apr-util: Split into multiple outputs
Also fixup more .la files to avoid unnecessary -dev dependencies.
2015-10-28 10:22:59 +01:00
Tuomas Tynkkynen 1a66da9757 apr-util: Fix path to expat in .la file 2015-10-28 10:17:09 +01:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Rok Garbas dbdc9eee05 cygwin: apr-util now also building on cygwin 2015-06-24 15:49:59 +02:00
Rok Garbas 7c67c350a3 cygwin: turn off ldap and crypt for apr-util to make it build 2015-06-12 12:17:12 +02:00
Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size
- 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.
2015-04-18 11:22:20 +02:00
Eric Seidel e08b9ab8d3 kill libiconvOr*
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
2015-02-07 20:29:28 -08:00
Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Eelco Dolstra 64982966dc apr-util: Update to 1.5.4 2014-09-24 21:03:40 +02:00
Eelco Dolstra a007647bfb apr-util: Purify iconv dependency on Darwin 2014-09-24 18:46:08 +02:00
Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs
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
2014-08-23 16:04:53 +02:00
William A. Kennington III bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
William A. Kennington III 844ab16b90 apr-util: Cleanup
Add the required packages to buildInputs. Create a wrapper around
apr-1-config so that internal sed commands succeed.
2013-12-31 08:00:21 -06:00
Nixpkgs Monitor 7375a3f7dd aprutil: update from 1.5.2 to 1.5.3 2013-12-09 10:48:41 +02:00
Eelco Dolstra 10cb4a8cf2 Merge remote-tracking branch 'origin/master' into multiple-outputs
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
2013-08-21 17:05:30 +02:00
Eelco Dolstra 32b036a430 apr-util: Update to 1.5.2 2013-07-31 15:02:54 +02:00
Eelco Dolstra edff23e591 apr: Split into multiple outputs
This is important because apr stores a copy of libtool, which in turn
contains a reference to GCC.
2013-06-13 11:32:55 +02:00
Eelco Dolstra 8497455143 apr-util: Update to 1.5.1 2013-01-14 14:38:24 +01:00
Sander van der Burg eecb135cad apr-util: Reenabling openldap support again 2013-01-07 16:58:09 +01:00
Sander van der Burg 5b0ca88d97 - Added xcodeenv: experimental support to build iOS apps through Nix
- Moved mobile development tools into a separate folder
2013-01-07 16:52:42 +01:00
Peter Simons 2659c3be45 apr-util: enable SSL support by default and enable ldapSupport on Darwin, too 2012-07-07 08:47:19 +02:00
Eelco Dolstra 0b0f44b117 * Updated apr to 1.4.6 and apr-util to 1.4.1.
svn path=/nixpkgs/trunk/; revision=32303
2012-02-15 16:21:33 +00:00
Eelco Dolstra c81069e9d5 * apr updated to 1.4.5.
* apr-util updated to 1.3.12.
* httpd updated to 2.2.19.

svn path=/nixpkgs/trunk/; revision=27487
2011-06-16 15:19:53 +00:00
Marco Maggesi 3c99107e82 Fix compilation of apr-util on darwin by removing dependence on openldap
svn path=/nixpkgs/trunk/; revision=27283
2011-05-20 17:00:49 +00:00
Lluís Batlle i Rossell ccd2316471 Fixing the builds of apr, apache, subversion and friends when having enabled the ldap support.
svn path=/nixpkgs/trunk/; revision=26764
2011-04-09 14:59:06 +00:00
Lluís Batlle i Rossell 450ef3730c Adding ldap support to apache (true by default).
I imagine noone would mind this 'addon' in their nixos apache installations.


svn path=/nixpkgs/trunk/; revision=26763
2011-04-09 14:24:25 +00:00
Eelco Dolstra 528a471aa8 * apr-util updated to 1.3.10.
svn path=/nixpkgs/trunk/; revision=25000
2010-12-06 13:34:00 +00:00
Eelco Dolstra 223bce6491 * Latest httpd, apr, apr-util.
svn path=/nixpkgs/trunk/; revision=16615
2009-08-07 15:26:13 +00:00
Eelco Dolstra 781bb5a6e1 * Apache httpd: build against apr, aputil and pcre instead of using
its own copies.

svn path=/nixpkgs/trunk/; revision=12971
2008-10-06 13:38:45 +00:00
Eelco Dolstra cb0c387ce2 * Updated Apache-related packages.
svn path=/nixpkgs/trunk/; revision=10502
2008-02-05 11:41:49 +00:00
Eelco Dolstra a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
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
2007-08-24 12:32:36 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra 66947ee7af * Subversion 1.4.0. Note: Subversion 1.4 upgrades your working
copies, so it's hard to go back to 1.3.

svn path=/nixpkgs/trunk/; revision=6486
2006-09-11 09:47:58 +00:00
Eelco Dolstra 6d2f25e5f0 * Added apr-util.
svn path=/nixpkgs/trunk/; revision=6485
2006-09-11 09:17:28 +00:00