From 2833652d5ae9568eaffeeb9eca2e35e62a15a07a Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 3 Jan 2012 14:31:11 +0000 Subject: Moving openssl 1.0.0e.nix to default.nix, as Eelco suggests. The 1.0.0e expression was moremaintained. When I updated openssl, I didn't know there was such a file. svn path=/nixpkgs/trunk/; revision=31233 --- pkgs/development/libraries/openssl/1.0.0e.nix | 74 -------------------------- pkgs/development/libraries/openssl/default.nix | 30 +++++------ 2 files changed, 12 insertions(+), 92 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/1.0.0e.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/openssl/1.0.0e.nix b/pkgs/development/libraries/openssl/1.0.0e.nix deleted file mode 100644 index 01f9eca15bb9..000000000000 --- a/pkgs/development/libraries/openssl/1.0.0e.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv, fetchurl, perl }: - -let - name = "openssl-1.0.0e"; - - opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] - (throw "openssl needs its platform name cross building" null) - stdenv.cross; -in - -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - url = "http://www.openssl.org/source/${name}.tar.gz"; - sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3"; - }; - - patches = - [ # Allow the location of the X509 certificate file (the CA - # bundle) to be set through the environment variable - # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the - # default location ($out/ssl/cert.pem) doesn't exist, and - # hardcoding something like /etc/ssl/cert.pem is impure and - # cannot be overriden per-process. For security, the - # environment variable is ignored for setuid binaries. - ./cert-file.patch - ] - ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; - - buildNativeInputs = [ perl ]; - - # On x86_64-darwin, "./config" misdetects the system as - # "darwin-i386-cc". So specify the system type explicitly. - configureScript = - if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config"; - - configureFlags = "shared --libdir=lib"; - - makeFlags = "MANDIR=$(out)/share/man"; - - postInstall = - '' - # If we're building dynamic libraries, then don't install static - # libraries. - if [ -n "$(echo $out/lib/*.so)" ]; then - rm $out/lib/*.a - fi - ''; # */ - - crossAttrs = { - preConfigure='' - # It's configure does not like --build or --host - export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" - ''; - - postInstall = '' - # Openssl installs readonly files, which otherwise we can't strip. - # This could at some stdenv hash change be put out of crossAttrs, too - chmod -R +w $out - - # Remove references to perl, to avoid depending on it at runtime - rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget - ''; - configureScript = "./Configure"; - }; - - meta = { - homepage = http://www.openssl.org/; - description = "A cryptographic library that implements the SSL and TLS protocols"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; -} diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5188417c3dc5..01f9eca15bb9 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -6,11 +6,6 @@ let opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) stdenv.cross; - - hurdGNUSourcePatch = fetchurl { - url = http://patch-tracker.debian.org/patch/series/dl/openssl/1.0.0e-2.1/gnu_source.patch; - sha256 = "0zp4x8bql92fbqywnigqfsfj2vvabb66wv6g6zgzh0y6js1ic4pn"; - }; in stdenv.mkDerivation { @@ -22,8 +17,16 @@ stdenv.mkDerivation { }; patches = - stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch - ++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd") ./freebsd-x86_64-asm.patch; + [ # Allow the location of the X509 certificate file (the CA + # bundle) to be set through the environment variable + # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the + # default location ($out/ssl/cert.pem) doesn't exist, and + # hardcoding something like /etc/ssl/cert.pem is impure and + # cannot be overriden per-process. For security, the + # environment variable is ignored for setuid binaries. + ./cert-file.patch + ] + ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; buildNativeInputs = [ perl ]; @@ -34,6 +37,8 @@ stdenv.mkDerivation { configureFlags = "shared --libdir=lib"; + makeFlags = "MANDIR=$(out)/share/man"; + postInstall = '' # If we're building dynamic libraries, then don't install static @@ -49,17 +54,6 @@ stdenv.mkDerivation { export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" ''; - patches = stdenv.lib.optionals (opensslCrossSystem == "hurd-x86") [ - # OpenSSL only defines _GNU_SOURCE on Linux, but we need it on GNU - hurdGNUSourcePatch - - # Use the target settings from Debian's "debian-hurd-i386" target. - # see http://patch-tracker.debian.org/patch/series/view/openssl/1.0.0e-2.1/debian-targets.patch - # In particular, this sets the shared library extension properly so that - # make install succeeds - ./hurd-target.patch - ]; - postInstall = '' # Openssl installs readonly files, which otherwise we can't strip. # This could at some stdenv hash change be put out of crossAttrs, too -- cgit 1.4.1 From 5321904c4eed35a4299ef709e8e89e74f858966b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 3 Jan 2012 15:39:05 +0000 Subject: ortp-0.18.0 svn path=/nixpkgs/trunk/; revision=31238 --- pkgs/development/libraries/ortp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 88902627f4ec..255d91981050 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ortp-0.16.4"; + name = "ortp-0.18.0"; src = fetchurl { url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz"; - sha256 = "0yb835l9spic4518ghb28jlwc0ihqjzpd0bgysgjf7z3bbg7km90"; + sha256 = "1cgx9xid0abk3cad3xjdvx7p9whinlhrviphyrd9zkhhx7ddkih2"; }; meta = { -- cgit 1.4.1