public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 'staging' into multiple-outputs

Browse Source 
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
This commit is contained in:
Vladimír Čunát
2014-08-23 16:04:53 +02:00
parent db83d9a35b 084626deec
commit 96cec2a7bd
6628 changed files with 165219 additions and 65293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/apr/default.nix
+5 -7
View File
@@ -1,18 +1,14 @@
{ stdenv, fetchurl }:
let
inherit (stdenv.lib) optionals;
in
stdenv.mkDerivation rec {
name = "apr-1.4.8";
name = "apr-1.5.1";
src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
md5 = "ce2ab01a0c3cdb71cf0a6326b8654f41";
sha256 = "1b4qw686bwjn19iyb0lg918q23xxd6s2gnyczhjq992d3m1vwjp9";
};
patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
outputs = [ "dev" "out" ];
@@ -38,5 +34,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://apr.apache.org/;
description = "The Apache Portable Runtime library";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}