Author: eelco
Date: Mon Sep 12 16:09:00 2011
New Revision: 29208
URL: https://ssl.nixos.org/websvn/nix/?rev=29208&sc=1
Log:
* Added OpenSSL 1.0.0e (not updating the default yet because a lot
depends on it). Also, install the manpages in $out/share/man rather
than $out/ssl/man.
Added:
nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix
- copied, changed from r29119,
nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix (from r29119,
nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix Fri Sep
9 09:03:37 2011 (r29119, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix Mon Sep 12
16:09:00 2011 (r29208)
@@ -7,11 +7,11 @@
in
stdenv.mkDerivation rec {
- name = "openssl-1.0.0d";
+ name = "openssl-1.0.0e";
src = fetchurl {
url = "http://www.openssl.org/source/${name}.tar.gz";;
- sha256 = "1nr0cf6pf8i4qsnx31kqhiqv402xgn76yhjhlbdri8ma1hgislcj";
+ sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3";
};
patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
@@ -25,6 +25,8 @@
configureFlags = "shared --libdir=lib";
+ makeFlags = "MANDIR=$(out)/share/man";
+
postInstall =
''
# If we're building dynamic libraries, then don't install static
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 12 13:02:54
2011 (r29207)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 12 16:09:00
2011 (r29208)
@@ -4253,6 +4253,8 @@
fetchurl = fetchurlBoot;
};
+ opensslNew = callPackage ../development/libraries/openssl/1.0.0e.nix { };
+
ortp = callPackage ../development/libraries/ortp { };
pangoxsl = callPackage ../development/libraries/pangoxsl {
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
