mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity
15933 commits 312 branches 124 tags 6.5 GiB
Commit graph

73 commits

Author SHA1 Message Date
Shea Levy 01df54f5cc Merge from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
 2011-09-23 16:58:45 +00:00
Peter Simons d709ef5d30 openssl: avoid the need for a recursive expression 
svn path=/nixpkgs/trunk/; revision=29426
 2011-09-21 18:48:04 +00:00
Peter Simons 6fcd493d5f openssl: added myself as a maintainer 
svn path=/nixpkgs/trunk/; revision=29425
 2011-09-21 18:45:52 +00:00
Eelco Dolstra 17925a9d3c * OpenSSL: 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.

svn path=/nixpkgs/trunk/; revision=29224
 2011-09-12 16:57:34 +00:00
Eelco Dolstra 3e54387efd * 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.

svn path=/nixpkgs/trunk/; revision=29208
 2011-09-12 16:09:00 +00:00
Shea Levy 4d70ba6cc9 Merge from trunk up through r28790 
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
 2011-08-24 19:16:43 +00:00
Eelco Dolstra 35505a442e * Remove some dead files. 
svn path=/nixpkgs/trunk/; revision=27752
 2011-07-13 11:40:47 +00:00
Eelco Dolstra d924bbb775 * openssl: per Nixpkgs convention, don't install static libraries when 
building dynamic libraries.

svn path=/nixpkgs/branches/x-updates/; revision=25856
 2011-02-09 15:27:34 +00:00
Eelco Dolstra bafc1b5cb8 * While we're at it, bump OpenSSL to 1.0.0d (with a fix for 
CVE-2011-0014).

svn path=/nixpkgs/branches/x-updates/; revision=25827
 2011-02-09 11:02:24 +00:00
Lluís Batlle i Rossell 2d3cf91094 Updating openssl according to a security advisory in their web page. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25039
 2010-12-08 21:36:03 +00:00
Lluís Batlle i Rossell d7b494a2f4 Updating from trunk to get a security fix on openssl. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24759
 2010-11-18 20:00:39 +00:00
Rob Vermaas 5cf61c616b openssl: to make darwin build again, update darwin-arch.patch 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24629
 2010-11-09 14:09:22 +00:00
Lluís Batlle i Rossell 3f05ed581f Making fossil cross-build (it works for the nanonote). 
Removing some perl scripts from the openssl cross-built derivation, to avoid depending on it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23128
 2010-08-11 20:08:29 +00:00
Lluís Batlle i Rossell d5097ad3d3 Breaking dependencies on the cross-built gcc through the gcc-cross-wrapper. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23073
 2010-08-09 21:37:31 +00:00
Lluís Batlle i Rossell 6d15eabdc1 Merging from trunk (the callPackage change) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22915
 2010-08-03 08:14:13 +00:00
Lluís Batlle i Rossell 4b42d5f7a9 Fixing the openssl 1.0.0 cross build 
svn path=/nixpkgs/trunk/; revision=22910
 2010-08-02 22:10:42 +00:00
Lluís Batlle i Rossell 5417c720fd Merging from trunk. 
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
 2010-08-02 15:48:19 +00:00
Eelco Dolstra 4a6eb1183e * On x86_64-darwin, "./config" misdetects the system as 
"darwin-i386-cc" (http://hydra.nixos.org/build/498076).  So specify
  the system type explicitly.

svn path=/nixpkgs/branches/x-updates/; revision=22726
 2010-07-25 09:09:32 +00:00
Eelco Dolstra 3587a2f78e * Doh. 
svn path=/nixpkgs/branches/x-updates/; revision=22723
 2010-07-23 15:36:35 +00:00
Eelco Dolstra 07afe31016 * Doh, we already had OpenSSL 1.0.0. Use the updated Darwin patch. 
svn path=/nixpkgs/branches/x-updates/; revision=22722
 2010-07-23 15:05:20 +00:00
Eelco Dolstra 7d963c8bb3 * By default, OpenSSL on 64-bit platforms now installs libraries in 
$out/lib64, which is not what we want.

svn path=/nixpkgs/branches/x-updates/; revision=22661
 2010-07-19 10:27:46 +00:00
Eelco Dolstra d06a183365 * OpenSSL updated to 1.0.0a. 
svn path=/nixpkgs/branches/x-updates/; revision=22639
 2010-07-18 21:54:14 +00:00
Michael Raskin 7c5e566c5c Cleaned up the unspecified-extra-argument calls where there is no way to access extra arguments. Tarball and full instantiation checks passed. 
svn path=/nixpkgs/trunk/; revision=22539
 2010-07-08 19:22:50 +00:00
Michael Raskin ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense. 
svn path=/nixpkgs/trunk/; revision=22529
 2010-07-08 13:25:52 +00:00
Marc Weber f3e7f0fdf0 reverting my patch series adding -j -l support for make 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22336
 2010-06-19 15:52:28 +00:00
Marc Weber 2dafd54743 opt-out some failing phases 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22285
 2010-06-15 19:00:58 +00:00
Yury G. Kudryashov cc0b0b1c69 Add openssl1 back (but don't remove 0.9.8n) 
svn path=/nixpkgs/trunk/; revision=21466
 2010-04-30 20:40:33 +00:00
Rob Vermaas 69bfabd328 re-enabled darwin patch, gcc-darwin does not support -arch flag 
svn path=/nixpkgs/trunk/; revision=21412
 2010-04-29 08:19:13 +00:00
Lluís Batlle i Rossell e5ce3e5c8c Revert "OpenSSL-1.0.0" changes, due to the new API breaking too much packages, which still have 
not released new versions compatible with openssl 1.0.0

I downgraded to 0.9.8n, that also has the security hole fix.

svn path=/nixpkgs/trunk/; revision=21408
 2010-04-28 15:01:06 +00:00
Lluís Batlle i Rossell 6b8de64183 Revert "Install libraries to $out/lib instead of $out/lib64" 
This reverts commit 50429b2b63a3ad540e8fcd96be0cdaac46a27da2.

svn path=/nixpkgs/trunk/; revision=21407
 2010-04-28 15:01:02 +00:00
Yury G. Kudryashov d5601ee60e Install libraries to $out/lib instead of $out/lib64 
This should fix a lot of builds

svn path=/nixpkgs/trunk/; revision=21393
 2010-04-28 08:40:12 +00:00
Yury G. Kudryashov 375900a6e7 Add comment, use the patch for darwin 
svn path=/nixpkgs/trunk/; revision=21354
 2010-04-27 19:05:43 +00:00
Yury G. Kudryashov d2b3e548a1 OpenSSL-1.0.0 
Big rebuild (though not stdenv-update). Security update, do not revert, please.

svn path=/nixpkgs/trunk/; revision=21352
 2010-04-27 18:39:00 +00:00
Lluís Batlle i Rossell 997723ec9b Trying to make nixUnstable cross-build. 
It fails because it builds bin2c for the host system, instead of the build system.
I will wait for a fix upstream.

svn path=/nixpkgs/trunk/; revision=20445
 2010-03-05 23:22:36 +00:00
Eelco Dolstra 8e885c0a52 * openssl 0.9.8l 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19570
 2010-01-20 13:49:07 +00:00
Rob Vermaas 0b20c5c38f merged x86_64 changes back to trunk 
svn path=/nixpkgs/trunk/; revision=18773
 2009-12-02 21:03:02 +00:00
Rob Vermaas d8800474f7 x86_64 darwin related changes 
svn path=/nixpkgs/trunk/; revision=18665
 2009-11-27 10:16:42 +00:00
Eelco Dolstra dd2aba46bf svn path=/nixpkgs/trunk/; revision=16445 2009-07-23 21:22:13 +00:00
Rob Vermaas c0fbe9b7a3 temporary reinstate patch for darwin openssl 
svn path=/nixpkgs/trunk/; revision=16442
 2009-07-23 19:14:00 +00:00
Eelco Dolstra d4fb6f3a53 * Comment out; not clear if we'll actually need this with a properly 
built GCC.

svn path=/nixpkgs/trunk/; revision=16102
 2009-06-30 15:19:32 +00:00
Rob Vermaas ca6850d95e * removed -arch flag for i686-darwin for openssl 
svn path=/nixpkgs/trunk/; revision=16097
 2009-06-30 13:54:44 +00:00
Eelco Dolstra 1966dded62 * OpenSSL 0.9.8k. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15232
 2009-04-21 22:37:56 +00:00
Eelco Dolstra 581af921ea * Latest OpenSSL, Curl. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13817
 2009-01-21 14:11:22 +00:00
Eelco Dolstra 201d20db20 * openssl-0.9.8i. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13024
 2008-10-09 14:29:06 +00:00
Eelco Dolstra fc5eebdf8b * Merged the stdenv branch 
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
 2008-06-13 11:46:39 +00:00
Eelco Dolstra 09ab596e0f * Remove calls to fail(). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=11690
 2008-04-23 07:34:20 +00:00
Eelco Dolstra 7a424b47f6 * Revert the setup hook changes on the trunk (but they remain on the 
stdenv-updates branch).

svn path=/nixpkgs/trunk/; revision=9652
 2007-11-12 13:51:46 +00:00
Michael Raskin b39c62675d Added OpenSSL gmp propagation; libtool dependency to elinks 
svn path=/nixpkgs/trunk/; revision=9646
 2007-11-11 20:35:21 +00:00
Armijn Hemel 183d29946f security update 0.9.8g 
svn path=/nixpkgs/trunk/; revision=9510
 2007-10-22 20:14:22 +00:00
Armijn Hemel 8d72c826e2 new openssl 
svn path=/nixpkgs/trunk/; revision=8393
 2007-03-21 00:29:50 +00:00