jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,989 Commits 266 Branches 122 Tags 5.3 GiB
bf414c9d4f
Commit Graph

71 Commits

Author SHA1 Message Date
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
fe86a03a1c libpng: use spdx licensing method 2014-09-21 18:53:20 +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
Vladimír Čunát
f5464c2982 libpng: update 1.6.9 -> .10 to fix CVE-2014-0333 2014-03-13 22:00:41 +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
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
Vladimír Čunát
3a2daeee0b libpng minor update 2013-01-29 13:19:06 +01:00
Eelco Dolstra
fae22cb3e9 libpng: Update to 1.5.13 2012-10-16 11:56:31 -04:00
Eelco Dolstra
3aae4ccffa libpng: Update to 1.2.50 and 1.5.12 
Addresses CVE-2012-3386.
 2012-07-25 11:04:47 -04:00
Eelco Dolstra
32649ce94c * libpng 1.5.10, which includes a fix for CVE-2011-3048. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=34010
 2012-05-07 20:12:53 +00:00
Yury G. Kudryashov
57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Yury G. Kudryashov
61e7d39e05 libpng-1.5.9 (see CVE 2011-3026) 
svn path=/nixpkgs/branches/libpng15/; revision=32398
 2012-02-19 11:23:05 +00:00
Yury G. Kudryashov
313a029f16 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
 2012-02-19 11:16:24 +00:00
Yury G. Kudryashov
668a505214 libpng-1.2.47 (see CVE 2011-3026) 
svn path=/nixpkgs/trunk/; revision=32394
 2012-02-19 10:59:31 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Yury G. Kudryashov
e957de48b8 libpng-1.5.7 
svn path=/nixpkgs/branches/libpng15/; revision=31439
 2012-01-08 19:49:56 +00:00
Yury G. Kudryashov
e66134d1fc libpng-1.5.5 
svn path=/nixpkgs/branches/libpng15/; revision=29652
 2011-10-05 08:13:16 +00:00
Yury G. Kudryashov
bfc84fec9b Add a notice about libpng branch 
svn path=/nixpkgs/trunk/; revision=29474
 2011-09-24 20:44:11 +00:00
Yury G. Kudryashov
71b331103e libpng-1.5.4 
svn path=/nixpkgs/branches/libpng15/; revision=29391
 2011-09-20 06:52:43 +00:00
Yury G. Kudryashov
c67fde4a47 Sorry, this is the hash of .tar.xz 
svn path=/nixpkgs/trunk/; revision=29376
 2011-09-20 06:14:29 +00:00
Yury G. Kudryashov
ab81388587 libpng-1.2.46 
OK, libpng-1.5.x breaks stuff but why revert to a version with security holes?

svn path=/nixpkgs/trunk/; revision=29375
 2011-09-20 06:13:39 +00:00
Rob Vermaas
2c33be2d8b revert previous commits related to libpng 1.2.44, until we are able to build 1.2.45 
svn path=/nixpkgs/trunk/; revision=29373
 2011-09-19 23:05:02 +00:00
Yury G. Kudryashov
0297229504 libpng-1.5 
See CVE-2011-269{0,1,2}

svn path=/nixpkgs/trunk/; revision=29363
 2011-09-19 19:01:40 +00:00
Eelco Dolstra
9909fdbbd6 * Fix evaluation problems. 
svn path=/nixpkgs/branches/x-updates/; revision=22668
 2010-07-19 22:24:26 +00:00
Eelco Dolstra
6b79040a0b * libpng updated to 1.2.44. 
svn path=/nixpkgs/branches/x-updates/; revision=22641
 2010-07-18 21:54:42 +00:00
Eelco Dolstra
ede6283180 * Revert libpng to 1.2.x because 1.4 breaks too many things. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19641
 2010-01-24 23:14:26 +00:00
Eelco Dolstra
ed3ebb7c2c * libjpeg updated to version 8. 
* libpng updated to 1.4.0.
* For libjpegStatic, use a stdenv adapter to build a static library.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19605
 2010-01-21 21:42:17 +00:00
Eelco Dolstra
843617bac9 * libpng 1.2.40. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18026
 2009-10-29 14:19:39 +00:00
Eelco Dolstra
7db732b8a9 * libpng 1.2.35 (addresses CVE-2009-0040). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14347
 2009-03-05 14:09:43 +00:00