mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Code Issues Wiki Activity
90137 commits 262 branches 124 tags 6.9 GiB
Commit graph

69 commits

Author SHA1 Message Date
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
Yury G. Kudryashov 3fa0cbb011 zlib_latest == zlib, so remove zlib/latest.nix 
svn path=/nixpkgs/trunk/; revision=32828
 2012-03-06 14:35:37 +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
Yury G. Kudryashov 0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Lluís Batlle i Rossell cb5bbe00fe Adding the latest zlib, otherwise vlc does not build. 
This also could be used for a newer cmake, or some trouble there was with libxml2.


svn path=/nixpkgs/trunk/; revision=32598
 2012-02-26 20:06:01 +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
Lluís Batlle i Rossell 1f3f0e6b65 Updating zlib. The zlib.net site is down, but I could pick the file from a gentoo distfiles mirror. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32133
 2012-02-07 21:51:03 +00:00
Eelco Dolstra ef7b97bade * Fix the zlib build (the patch didn't apply). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30847
 2011-12-12 13:45:24 +00:00
Lluís Batlle i Rossell 32b3de1f96 Updating the zlib patch to the patch proposed in the zlib-devel list regarding this issue. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30349
 2011-11-08 22:51:11 +00:00
Eelco Dolstra 0880b96a3d * Apply the zlib/cmake updates from the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30309
 2011-11-07 22:54:45 +00:00
Eelco Dolstra bb889c3605 * Revert both r30278 (cmake upgrade) and r30307 (zlib fix to get cmake 
to build).  These are more appropriate to the stdenv branch.  I'll
  apply them there.

svn path=/nixpkgs/trunk/; revision=30308
 2011-11-07 22:05:46 +00:00
David Guibert f5a2998c03 fix _LARGEFILE64_SOURCE in zlib 
svn path=/nixpkgs/trunk/; revision=30307
 2011-11-07 21:33:37 +00:00
Lluís Batlle i Rossell 706b80c282 I wrote bad my attempt at -static-libgcc. Retrying. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30024
 2011-10-25 18:52:32 +00:00
Lluís Batlle i Rossell 3fa51ac56a Trying to disable the references to the bootstrap-tools libgcc 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30022
 2011-10-25 18:35:17 +00:00
Yury G. Kudryashov 0bfc84b0aa Cross-compile zlib for Windows 
svn path=/nixpkgs/trunk/; revision=26928
 2011-04-23 06:59:04 +00:00
Eelco Dolstra 3c57f1fd8a * Fix zlib 1.2.5 on Cygwin. (The Makefile doesn't support building 
just a static library.)

svn path=/nixpkgs/trunk/; revision=22748
 2010-07-27 11:37:29 +00:00