mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Code Issues Wiki Activity
81616 commits 233 branches 124 tags 7 GiB
Commit graph

26 commits

Author SHA1 Message Date
Vladimír Čunát 1858a39c9a apr: don't manually move apr-1-config 
Also refactor meta.
 2015-10-03 16:41:51 +02: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
William A. Kennington III 9d4e9aa79e apr: 1.5.1 -> 1.5.2 2015-05-01 15:06:39 -07: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 a600443bb3 fix obscure bug in apr on darwin 2015-02-03 23:11:44 -08: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
Eelco Dolstra 17336efdd8 apr: Update to 1.5.1 2014-04-28 14:45:54 +02:00
Eelco Dolstra f329865aa2 apr: Update to 1.5.0 2013-12-11 14:25:15 +01: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 ab7f2aea8e apr: Update to 1.4.8 
Also drop the accept4 hack because Linux 2.6.32 is now the minimal
kernel version supported by Nixpkgs.
 2013-07-31 15:02:23 +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
Peter Simons 2199730941 apr: strip trailing whitespace 2012-07-07 08:47:19 +02:00
Marco Maggesi 93f41f5ad3 Fix build of apr on darwin 
svn path=/nixpkgs/trunk/; revision=34374
 2012-06-06 21:44:20 +00: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
Eelco Dolstra ab5669146d * apr 1.4.2, Apache httpd 2.2.16. 
svn path=/nixpkgs/trunk/; revision=23046
 2010-08-08 20:29:23 +00:00
Eelco Dolstra 3beabfeb59 svn path=/nixpkgs/trunk/; revision=19904 2010-02-10 13:37:28 +00:00
Eelco Dolstra 31b1ba6b11 * apr: don't use accept4(), because it's not support on Linux < 
2.6.28.  It's rather unfortunate that the result of building apr
  depends on the capabilities of the kernel on which it's built...

svn path=/nixpkgs/trunk/; revision=19903
 2010-02-10 13:30:57 +00:00
Eelco Dolstra a066167a9e * Fix building apr on Cygwin. 
svn path=/nixpkgs/trunk/; revision=19766
 2010-02-02 16:49:07 +00:00
Eelco Dolstra fcf92435e3 * apr 1.3.9. 
svn path=/nixpkgs/trunk/; revision=17767
 2009-10-12 17:57:27 +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 f69ac73f3c * Added APR. 
svn path=/nixpkgs/trunk/; revision=6484
 2006-09-11 08:45:01 +00:00