Vladimír Čunát
80509ab287
libpng: fix on mingw by disabling doCheck
2016-04-23 10:52:03 +02:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Vladimír Čunát
8627b26874
libpng-1.2: security update 1.2.54 -> 1.2.55
...
It should finally fix #11030 and CVE-2015-8126 for 1.2.
2015-12-30 11:40:44 +01:00
Vladimír Čunát
04d993417f
libpng: security update
...
It should finally fix #11030 and CVE-2015-8126
2015-12-17 08:52:01 +01:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
baf30718ca
Merge branch 'master.upstream' into staging.upstream
2015-11-18 02:36:33 -08:00
Vladimír Čunát
31aa281919
libpng12: security update 1.2.53 -> 1.2.54
...
Part of fix for #11030 .
Also refactor meta.
2015-11-17 12:57:33 +01:00
Vladimír Čunát
cc86857601
libpng: security and maintenance 1.6.18 -> 1.6.19
...
Fixes #11030 , CVE-2015-{7981,8126}.
2015-11-16 08:12:08 +01:00
Tuomas Tynkkynen
796e36afeb
libpng12: Split into multiple outputs
2015-10-28 10:17:11 +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
William A. Kennington III
f30a8f78a8
libpng: 1.2.52 -> 1.2.53
2015-08-05 23:37:07 -07:00
William A. Kennington III
8164d28315
libpng: 1.6.16 -> 1.6.18
...
Also enable apng by default
2015-08-05 23:26:00 -07:00
Vladimír Čunát
e72b405104
libpng-1.2: maintenance update
...
Also drop xz input, as it isn't needed (stdenv unpacks xz by itself).
2015-07-30 13:48:59 +02:00
Vladimír Čunát
e942b5892d
libpng15: remove unused version
2015-07-30 13:48:58 +02: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
Vladimír Čunát
5d903d850a
libpng: security update (no CVE yet)
...
http://www.securitytracker.com/id/1031444
2014-12-25 11:36:21 +01:00
Vladimír Čunát
67c49ad3e3
libpng: bugfix update
...
This might fix the often-seen error messages.
2014-10-23 17:49:19 +02:00
Mateusz Kowalczyk
aafca4dd51
Add a few meta.branch to please monitor
2014-09-30 10:07:49 +01:00
Mateusz Kowalczyk
fe86a03a1c
libpng: use spdx licensing method
2014-09-21 18:53:20 +01:00
Mateusz Kowalczyk
56d9b3c4d8
libpng15: update from 1.5.18 to 1.5.19
2014-09-21 18:47:08 +01:00
Vladimír Čunát
8da52a642a
Merge branch 'staging' into v/modular
...
Conflicts (easy):
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Vladimír Čunát
20aacf89a3
libpng: code-cleanup update
2014-08-30 10:40:49 +02: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
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Vladimír Čunát
6de9700ccc
libpng: minor update 1.6.10 -> .12
2014-06-17 09:00:29 +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
Jaka Hudoklin
c3524a8dd6
optipng: use system libpng & zlib, fix cross builds and add support for static builds
2014-04-01 01:43:56 +02:00
Vladimír Čunát
ef32fbe6a4
libpng12, libpng15: minor updates of legacy versions
2014-03-13 22:32:17 +01:00
Vladimír Čunát
f5464c2982
libpng: update 1.6.9 -> .10 to fix CVE-2014-0333
2014-03-13 22:00:41 +01:00
aszlig
cdaced58ae
libpng12/cross: Don't add zlib for Darwin builds.
...
Cross builds for Darwin already include the CoreFoundation and the
libraries from XCode, so zlib already exists on that platform.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:48 +01:00
Vladimír Čunát
159144c1e9
libpng(_apng): maintenance update 1.6.8 -> .9
2014-02-10 19:01:37 +01:00
Mathijs Kwik
0bf0610d14
libpng: upgrade apng patch .7 -> .8
2013-12-24 10:52:42 +01:00
Vladimír Čunát
f4782016ed
libpng: minor update 1.6.7 -> .8
...
Fixes a potential segfault.
2013-12-21 15:14:05 +01:00
Vladimír Čunát
b98da7c273
libpng: several minor updates 1.6.4 -> 1.6.7
...
all seem unimportant
2013-11-25 22:24:13 +01:00
Mathijs Kwik
db83d9a35b
Merge branch 'master' into multiple-outputs
2013-11-01 08:29:09 +01:00
Vladimír Čunát
a189a68401
lipng_apng: fix via using the previous patch
2013-09-12 19:12:10 +02:00
Vladimír Čunát
117f2e6683
libpng: minor update 1.6.3 -> .4
...
Also make myself maintainer.
2013-09-12 17:19:27 +02:00
Mathijs Kwik
1a55c4b89f
Merge remote-tracking branch 'official/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/libpng/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/tools/typesetting/tex/texlive/default.nix
pkgs/top-level/all-packages.nix
2013-09-11 10:53:31 +02:00
Eelco Dolstra
c64a1332ec
libpng: Use multiple outputs
2013-08-23 10:01:31 +02:00
Vladimír Čunát
625f40151b
Merge branch 'master' into x-updates
...
Conflicts (a little tricky, I did some cleanup of interacting changes):
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/libpng/default.nix
pkgs/tools/package-management/nixops/default.nix
pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
Eelco Dolstra
11b5b06fbd
libpng: Update to 1.6.3
2013-07-29 21:39:56 +02:00
Mathijs Kwik
e78b013fe3
libpng: merge apng expression (keep patch disabled by default)
...
I made sure no rebuild will happen because of this.
Unfortunately this meant merging attrsets instead of just using an
optionalString for postPatch
2013-06-27 21:35:21 +02:00
Vladimír Čunát
2058d95eb4
non-Linux platforms: extend to some important pkgs
2013-06-18 22:03:35 +02:00
Vladimír Čunát
8a1392bd70
libpng: bugfix update 1.6.1 -> 1.6.2
2013-04-25 21:15:54 +02:00
Vladimír Čunát
69418c7418
libpng: minor updates to 1.6.1 and 1.5.15
2013-03-29 00:01:10 +01:00
Vladimír Čunát
0d72174dbd
Merge branch stdenv-updates into x-updates
...
x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Vladimír Čunát
64fd0379c8
libpng: reintroduce 1.5, some pkgs need older
2013-02-16 18:00:28 +01:00
Vladimír Čunát
364a853c99
libpng: major update to 1.6, enable the check phase
...
It builds on my machine, we'll see what other packages say on it.
2013-02-14 20:53:46 +01:00
