John Ericson
e5567bae2d
treewide: Do not limit hardenging because gcc 4.9 in bootstrap
...
Bootstrap tools has since been bumped
2017-09-14 10:27:13 -04:00
John Ericson
95c8277701
misc pkgs: Remove unneeded *Platform == *Platform comparisons
...
PR #26007 used these to avoid causing a mass rebuild. Now that we know
things work, we do that to clean up.
2017-06-30 10:09:31 -04:00
John Ericson
16be434b0b
Merge accepted cross compilation PRs into staging
2017-06-28 23:17:21 -04:00
John Ericson
da668f66c7
zlib: cc-wrapper can be relied on to export this env var
2017-06-28 18:31:37 -04:00
David McFarland
cbc0db08f9
zlib: fix cygwin build
2017-06-26 09:33:25 -03:00
Ross MacLeod
f63f96ae35
zlib: don't really override CC at ay point
...
but leave the preConfigure script as it was when not cross building in order to avoid hash breakage
2017-06-22 17:53:52 -04:00
John Ericson
594d264205
cross stdenv adaptor: Support --host --build --target across the board
...
Packages get --host and --target by default, but can explicitly request
any subset to be passed as needed. See docs for more info.
rustc: Avoid hash breakage by using the old (ignored)
dontSetConfigureCross when not cross building
2017-06-22 17:52:28 -04:00
Vladimír Čunát
150cddca6f
zlib: 1.2.10 -> 1.2.11
2017-02-05 13:30:44 +01:00
Daiderd Jordan
bba12a6c90
Merge branch 'master' into staging
2017-01-09 23:57:47 +01:00
Sebastian Hagen
d042abef26
zlib: Fix zlib.net URL. ( #21753 )
...
Look for primary source file below
http://zlib.net/fossils/ as opposed to
http://zlib.net/
. zlib-1.2.8.tar.gz is still available at the former location, and will likely
remain there. In addition, it's important that the first URL work since zlib
is in the bootstrap path, and 16.09 (at least) bootstrap doesn't try to fetch
from later ones.
2017-01-08 18:09:57 +01:00
Vladimír Čunát
948e9edce6
zlib: maintenance 1.2.8 -> 1.2.10
...
The removed CVEs should be fixed in the release.
2017-01-06 21:45:20 +01:00
Graham Christensen
41f55691a9
zlib: patch for CVE-2016-9840, CVE-2016-9841, CVE-9842, CVE-9843
2016-12-21 17:15:52 -05:00
Tuomas Tynkkynen
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
Vladimír Čunát
1dc36904d8
Merge #14920 : windows improvements, mainly mingw
2016-05-05 08:30:19 +02:00
Vladimír Čunát
c7377b0e4a
zlib, bash: mass-rebuild cleanup
2016-04-25 17:12:49 +02:00
Vladimír Čunát
321ecde8a1
zlib: on mingw, add another DLL link
...
Also clean up the expression a little.
It fixes at least libpng's DLL.
2016-04-23 10:52:03 +02:00
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
Franz Pletz
aff1f4ab94
Use general hardening flag toggle lists
...
The following parameters are now available:
* hardeningDisable
To disable specific hardening flags
* hardeningEnable
To enable specific hardening flags
Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.
cc-wrapper supports the following flags:
* fortify
* stackprotector
* pie (disabled by default)
* pic
* strictoverflow
* format
* relro
* bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
402d57ee8e
bootstrap env: disable stackprotector hardening until gcc >=4.9
2016-02-22 18:32:53 +00:00
Robin Gloster
acb408646e
remove local pic flags, now set by hardened stdenv
2016-01-30 16:36:57 +00:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
janus
55aa9163cc
FreeBSD: minor fixes, add notes and make stdenv more robust
2016-01-01 17:01:13 +00:00
janus
f351aaaf85
FreeBSD: use own stdenv, do not run libtiff tests, use PIC for zlib
2016-01-01 17:01:13 +00:00
Luca Bruno
e289717414
rename moveToOutput and propagatedBuildInputs
2015-12-02 10:05:36 +01:00
Vladimír Čunát
302b27f64b
zlib: don't split the tiny man page
2015-10-28 10:09:33 +01:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Jude Taylor
fa9c81f694
pure darwin stdenv
2015-06-18 12:37:41 -07:00
Florian Friesdorf
d2da94cc0b
cygwin: zlib - we do not --disable-shared
2015-05-28 10:53:36 +02:00
Vladimír Čunát
2be435422c
zlib: refactor (and darwin fix), add meta.platforms
2015-05-05 11:56:30 +02:00
Vladimír Čunát
375bc8def7
Merge staging into closure-size
2015-05-05 11:49:03 +02:00
William A. Kennington III
21fea99191
Fix some meta
2015-05-01 15:06:39 -07:00
William A. Kennington III
faa9354de7
zlib: Add platforms
2015-04-28 18:27:39 -07:00
Vladimír Čunát
bf414c9d4f
Merge 'staging' into closure-size
...
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Michael Raskin
4bbfa27e5c
Make the Darwin fix in zlib keep Linux hash
2015-01-07 18:23:18 +03:00
John Wiegley
f8bd5bb401
zlib: on darwin, correctly set the RPATH for libzlib
2015-01-06 14:52:58 -06:00
Vladimír Čunát
a70180ba73
mutiout: make it builtin
2014-08-30 08:27:43 +02:00
Vladimír Čunát
fb59f27a43
WIP: getting good
2014-08-27 01:14:09 +02:00
Bjørn Forsman
b5cd66487a
zlib: add description and license info
2014-06-23 13:28:58 +02:00
John Wiegley
195800e881
Do not use static-libgcc flag on Darwin
2014-06-16 14:26:40 -07: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
aszlig
33acfbe917
minizip: New package based on zlib derivation.
...
This is needed by Chromium and is part of the zlib source tree in
contrib/, so let's propagate the version of zlib and use the same source
tree.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:40 +02:00
aszlig
8c053312b5
zlib/cross: Fix build for Darwin.
...
Provide the correct cross ranlib, because native ranlib will fail.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:47 +01:00
Vladimír Čunát
3e3f70713f
zlib: minor update 1.2.7 -> 1.2.8
2013-04-30 09:15:15 +02:00
Eelco Dolstra
88b11196c1
Clean up redundant "if condition then true else false"
2012-12-28 19:57:47 +01:00
Eelco Dolstra
b5fa2175db
* Zlib updated to 1.2.7.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=34009
2012-05-07 20:10:50 +00:00
Eelco Dolstra
a753c4a170
* GCC 4.6.3 and 4.5.3.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32734
2012-03-01 23:15:21 +00:00
Eelco Dolstra
11d1104a88
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
2012-03-01 22:22:24 +00:00
Eelco Dolstra
d575666a12
* Fix building zlib on Cygwin.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32358
2012-02-17 17:02:18 +00:00
Yury G. Kudryashov
0de0994bc4
zlib: largefile_source problem fixed upstream
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32135
2012-02-08 05:05:46 +00:00