mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
Code Issues Wiki Activity
70576 commits 346 branches 124 tags 6.9 GiB
Commit graph

148 commits

Author SHA1 Message Date
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
 2015-10-06 15:24:20 +02:00
Jude Taylor 0a32eab91e fix LLVM packages to work in darwin stdenv 2015-10-05 08:46:56 -07:00
William A. Kennington III eae9889b82 openssl: Major bump 1.0.1 -> 1.0.2 2015-09-15 12:14:12 -07:00
Eelco Dolstra e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
Eelco Dolstra 5e156b9db7 openssl: Update to 1.0.2d 2015-07-09 15:17:14 +02:00
Eelco Dolstra 9539db1ec3 openssl: Update to 1.0.1p 2015-07-09 15:15:52 +02:00
William A. Kennington III 7f9a4957ee openssl: Make 1.0.2 conform to the 1.0.1 derivation 2015-06-22 20:00:44 -07:00
William A. Kennington III c6e512b80c Merge branch 'master.upstream' into staging.upstream 2015-06-22 12:43:12 -07:00
Mike Sperber bd003198b3 openssl: patch not needed anymore for darwin platform, closes #8456 
The darwin-arch.patch that was needed for previous releases doesn't
apply, and also doesn't work anymore. It builds fine without.
 2015-06-22 19:59:28 +02:00
William A. Kennington III 282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
William A. Kennington III 507bb016cc openssl: Clean up the cross compile arguments 
Also add a check to make sure we don't depend on perl in the output
 2015-06-20 14:30:18 -07:00
Vladimír Čunát f5cae29005 openssl-1.0.2: bug+security upate (Fixes #8415) 2015-06-20 09:10:54 +02:00
Peter Simons b333a2cb19 openssl: remove some cruft 2015-06-16 14:19:25 +02:00
Eelco Dolstra a4178b1b8a openssl: Update to 1.0.1o 
From https://www.openssl.org/news/openssl-1.0.1-notes.html:

"Fix HMAC ABI incompatibility"
 2015-06-16 14:16:08 +02:00
Eelco Dolstra 415407bd93 openssl: Update to 1.0.1n 
CVE-2015-4000, CVE-2015-1788, CVE-2015-1789, CVE-2015-1790, CVE-2015-1792, CVE-2015-1791, CVE-2014-8176
 2015-06-11 18:32:13 +02:00
Eelco Dolstra 3aee39bb83 openssl: Fix removal of the ssl/misc scripts 
This drops the dependency of $out on Perl.

(cherry picked from commit a5fb18473e)
Signed-off-by: Domen Kožar <domen@dev.si>

Conflicts:
	pkgs/development/libraries/openssl/default.nix
 2015-06-01 11:01:57 +02:00
William A. Kennington III 867d2c5c46 openssl: Remove References to OPENSSL_X509_CERT_FILE 2015-05-31 15:50:51 -07:00
William A. Kennington III afa5859716 openssl: Cleanup some old, untested patches 2015-05-29 16:08:27 -07:00
Peter Simons d9cc38757a openssl: add version 1.0.2a as attribute 'openssl_1_0_2' 
We'll try switching our default version after the 15.06 release has been
branched off. Resolves https://github.com/NixOS/nixpkgs/issues/7970.
 2015-05-29 09:52:29 +02:00
Marko Durkovic 3f6949c3ef cygwin: openssl for x86_64 2015-05-28 10:53:35 +02:00
Russell O'Connor e2e4c1182e Update OpenSSL dependency of bitcoin to be the latest OpenSSL. 
Purge OpenSSL version 1.0.1j.
 2015-03-21 17:49:42 -04:00
Vladimír Čunát cd97c58110 openssl_1_0_1j: fix after updating the main version 2015-03-19 20:28:35 +01:00
Eelco Dolstra 2fe351c7e3 openssl: Update to 1.0.1m 
Fixes various "Moderate" / "Low" CVEs:
http://openssl.org/news/secadv_20150319.txt
 2015-03-19 15:57:17 +01:00
Domen Kožar 1fb78f8994 openssl: 1.0.1k -> 1.0.1l 2015-02-27 12:59:59 +01:00
Russell O'Connor af3c4a2744 Bitcoin 0.9.3 won't work with OpenSSL 1.0.1k. 
This patch restores OpenSSL 1.0.1j and builds Bitcoin against it.
 2015-02-05 11:40:57 -05:00
Domen Kožar dbbd849ce8 openssl: 1.0.1j -> 1.0.1k 
(cherry picked from commit 70a7d4bd16)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-01-09 20:22:02 +01:00
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
 2014-10-16 15:16:50 +02:00
Domen Kožar c758ec756b openssl: 1.0.1i -> 1.0.1j (CVE-2014-3513, CVE-2014-3567, CVE-2014-3568) 2014-10-15 16:12:23 +02:00
Alexander Kjeldaas e431a3e0b5 openssl: make it deterministic 2014-09-13 15:05:27 +02:00
Vladimír Čunát d1ed0f44cd Merge #2823: better cygwin support, also add x86_64 
Conflicts (easy):
	pkgs/development/interpreters/perl/5.16/default.nix
 2014-08-14 20:38:09 +02:00
Peter Simons 5c276c4f68 openssl: update to version 1.0.1i 
See https://www.openssl.org/news/secadv_20140806.txt for a long list of CVE numbers.
Fixes <https://github.com/NixOS/nixpkgs/issues/3485>.
 2014-08-08 09:46:57 +02:00
Domen Kožar 15f092d7a7 openssl: 1.0.1g -> 1.0.1h 
CVE-2014-0224
CVE-2014-0221
CVE-2014-0195
CVE-2014-0198
CVE-2010-5298
CVE-2014-3470
 2014-06-05 14:32:11 +02:00
Sander van der Burg 9ec52d6323 Fixes to make basic builds on Cygwin work again + additions to support x86_64-cygwin 2014-05-29 14:47:07 +02:00
aszlig 625d7b9043
Merge pull request #1928 from 'cross-win-osx'. 
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
 2014-04-21 10:00:35 +02:00
Domen Kožar 1140f06e0f openssl: 1.0.1f -> 1.0.1g 
CVE-2014-0160, CVE-2014-0076
 2014-04-07 20:33:38 +02:00
aszlig c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx. 
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
 2014-03-12 10:16:51 +01:00
aszlig 5e95800f26
openssl: Use Darwin patch for cross-builds too. 
Might be better to have something like stdenv.isDarwinTarget, which can
be used to test for native Darwin _and_ cross-built Darwin as a target.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-03-12 10:00:47 +01:00
aszlig 30962765e0
openssl/cross: Fix build for Darwin. 
This is just a minor fix, because when using "darwin64-x86_64-cc" for
config.openssl.system, the OpenSSL build scripts try to compile with
$prefix-cc, which is not available with the gcc-cross-wrapper.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-03-12 10:00:47 +01:00
aszlig 60a2fc1fec
openssl: Fix Windows compat in cert-file.patch. 
In Windows there is no get(e)uid() call available, so the build fails.

The patch now checks whether OPENSSL_SYS_WINDOWS is defined and only
uses those calls if _not_ on Windows.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-02-24 07:26:22 +01:00
Eelco Dolstra 340b6ab649 openssl: Update to 1.0.1f 
CVE-2013-6449, CVE-2013-6450, CVE-2013-4353.
 2014-01-07 09:40:35 +01:00
Danny Wilson cf42601f92 Coreutils update and Illumos compatibility fixes. 
- GNU Coreutils 8.21
- Add is64Bit checks to stdenv for Solaris.
- Fix OpenSSL Illumos build.
 2013-02-28 20:04:01 +01:00
Peter Simons e259e52a7d openssl: update to version 1.0.1e 2013-02-18 11:53:57 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Eelco Dolstra 88f7000aa4 openssl: Fix building on Darwin 
http://hydra.nixos.org/build/3491716
 2012-12-18 18:03:26 +01:00
Eelco Dolstra e5497ca043 openssl: Install config files in $out/etc/ssl in $out/ssl 2012-11-23 17:29:06 +01:00
Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. 
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
 2012-11-21 16:20:36 +01:00
Peter Simons 02cd9a906e openssl: strip trailing whitespace 2012-10-23 18:36:02 +02:00
Peter Simons 8d469a5bbc openssl: update to version 1.0.1c 2012-10-23 18:35:51 +02:00
Lluís Batlle i Rossell 57b578189b Adding cryptodev-linux, and made openssl use it optionally. 
I'm trying to get the CESA of the sheevaplug available to openssl.
 2012-09-23 20:51:15 +02:00
Peter Simons d5677fe6c7 stdenv-updates: merge updates from 'master' branch 2012-09-11 16:48:41 +02:00