summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2006-09-11 08:45:01 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2006-09-11 08:45:01 +0000
commitf69ac73f3c946ca53c28f9f65bb734148458b33f (patch)
tree69dffc9f6e74d92e1fda5cac25a65850411e8392 /pkgs
parent6412133453d8737bac1d4318542c5168fa9fd097 (diff)
* Added APR.
svn path=/nixpkgs/trunk/; revision=6484
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/apr/default.nix9
-rw-r--r--pkgs/top-level/all-packages.nix12
2 files changed, 17 insertions, 4 deletions
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
new file mode 100644
index 0000000000000..a42699063c504
--- /dev/null
+++ b/pkgs/development/libraries/apr/default.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "apr-1.2.7";
+  src = fetchurl {
+    url = http://archive.apache.org/dist/apr/apr-1.2.7.tar.bz2;
+    md5 = "e77887dbafc515c63feac84686bcb3bc";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 426fbe7081272..b0027c652c32a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -911,10 +911,10 @@ rec {
   };
 
   ghcWrapper = assert uulib.ghc == ghc;
-               (import ../development/compilers/ghc-wrapper) {
-                   inherit stdenv ghc;
-                   libraries = [ uulib ];
-  };
+    (import ../development/compilers/ghc-wrapper) {
+      inherit stdenv ghc;
+      libraries = [ uulib ];
+    };
 
   uuagc = (import ../development/tools/haskell/uuagc) {
     inherit fetchurl stdenv ghc uulib;
@@ -1529,6 +1529,10 @@ rec {
     inherit fetchurl stdenv python;
   };
 
+  apr = import ../development/libraries/apr {
+    inherit fetchurl stdenv;
+  };
+
   ### DEVELOPMENT / LIBRARIES / JAVA
 
   saxon = (import ../development/libraries/java/saxon) {