JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,894 Commits 2 Branches 0 Tags 12 GiB
84339e448e
Commit Graph

131 Commits

Author SHA1 Message Date
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
Vladimír Čunát
3a2daeee0b libpng minor update 2013-01-29 13:19:06 +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
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
5c6a3faf4e Merge ^/nixpkgs/trunk 
svn tried to change libpng/default.nix version, I've changed libpng/12.nix
version manually.

svn path=/nixpkgs/branches/libpng15/; revision=32395
 2012-02-19 11:06:00 +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
2ebcb95219 Restore libpng-1.2.x 
svn path=/nixpkgs/branches/libpng15/; revision=31440
 2012-01-08 19:50:06 +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
Rob Vermaas
30e9cae7d2 added some python packages, add variant for libpng 1.2.44 as matplotlib does not compile with newer versions 
svn path=/nixpkgs/trunk/; revision=29366
 2011-09-19 21:00:37 +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
Michael Raskin
0d765e6673 Update description to mention APNG patch 
svn path=/nixpkgs/trunk/; revision=24189
 2010-10-08 19:11:15 +00:00
Michael Raskin
758a6aa848 Fixing libpng-apng source expression 
svn path=/nixpkgs/trunk/; revision=24170
 2010-10-08 05:59:40 +00:00
Michael Raskin
9e3af1a70a Giving libpng-APNG a distinct name 
svn path=/nixpkgs/trunk/; revision=24168
 2010-10-08 05:57:40 +00:00
Michael Raskin
dbca05712e Adding libpng-APNG (libpng with a patch for animated png support) 
svn path=/nixpkgs/trunk/; revision=24167
 2010-10-08 05:57:15 +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
Eelco Dolstra
b908adc778 * libpng 1.2.32. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13002
 2008-10-08 16:55:55 +00:00
Eelco Dolstra
cd60dc0ede * Various updates. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=12051
 2008-06-12 09:49:40 +00:00
Eelco Dolstra
537dc07161 * libpng 1.2.29. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=11805
 2008-05-09 16:12:46 +00:00
Eelco Dolstra
173ae78b85 * libpng 1.2.25. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10994
 2008-03-06 16:22:41 +00:00
Armijn Hemel
1c804d1017 update to 1.2.24, fixes some security bugs 
svn path=/nixpkgs/trunk/; revision=10031
 2007-12-31 22:47:39 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/. 
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
 2007-08-27 13:01:33 +00:00
Michael Raskin
474c738642 Updated libpng version. Vulnerability of kind "visit a page with a bad picture, browser fails". 
svn path=/nixpkgs/trunk/; revision=8955
 2007-07-07 13:33:39 +00:00
Eelco Dolstra
3e19819c28 * X11R7.2 and associated updates. 
svn path=/nixpkgs/trunk/; revision=8049
 2007-02-26 16:32:27 +00:00
Eelco Dolstra
ef9b025dbe * Remove a bunch of unused Nix expressions. 
svn path=/nixpkgs/trunk/; revision=6716
 2006-10-12 15:43:01 +00:00
Eelco Dolstra
ad897a7c96 * Update more URLs. 
svn path=/nixpkgs/trunk/; revision=6713
 2006-10-12 14:53:45 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=6711
 2006-10-12 13:50:54 +00:00
Eelco Dolstra
259d0dd9ee * Gnome 2.14.3. 
* GTK updates.
* Removed the bzip2 hack.

svn path=/nixpkgs/trunk/; revision=6104
 2006-08-11 22:26:55 +00:00
Armijn Hemel
3427d88e96 add new libpng 
svn path=/nixpkgs/trunk/; revision=5570
 2006-07-04 12:39:45 +00:00
Armijn Hemel
7b1649c62a fix download location for libpng 
svn path=/nixpkgs/trunk/; revision=5568
 2006-07-04 12:28:16 +00:00
Eelco Dolstra
12f0f1ad20 * Updated a few packages. 
svn path=/nixpkgs/trunk/; revision=5246
 2006-05-01 17:57:42 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=4623
 2006-01-30 16:04:03 +00:00
Martin Bravenboer
de58e076cb Use the autoconf distribution of libpng 
svn path=/nixpkgs/trunk/; revision=3414
 2005-07-23 20:55:52 +00:00
Eelco Dolstra
aac8011c8b * GTK 2.6 plus associated libraries. 
* Updated libtiff, libpng, libxml2, libxslt, gettext.

svn path=/nixpkgs/trunk/; revision=2238
 2005-02-15 16:22:20 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a 
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
 2005-02-15 14:44:19 +00:00
Eelco Dolstra
4088f51188 * Libpng updated to 1.2.7 (security fix!). 
svn path=/nixpkgs/trunk/; revision=1453
 2004-09-18 21:13:33 +00:00
Eelco Dolstra
de759967c8 * Update to GTK 2.4.0. 
svn path=/nixpkgs/trunk/; revision=906
 2004-04-02 13:58:55 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders. 
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
 2004-03-29 17:23:01 +00:00
Eelco Dolstra
2fcc5fdb08 * "!isNull x" -> "x != null". Done automatically. Hope nothing 
broke.

svn path=/nixpkgs/trunk/; revision=870
 2004-03-29 10:25:25 +00:00
Eelco Dolstra
5941f66f0e * The stdenv setup script now defines a generic builder that allows 
builders for typical Autoconf-style to be much shorten, e.g.,

    . $stdenv/setup
    genericBuild

  The generic builder does lots of stuff automatically:

  - Unpacks source archives specified by $src or $srcs (it knows about
    gzip, bzip2, tar, zip, and unpacked source trees).
  - Determines the source tree.
  - Applies patches specified by $patches.
  - Fixes libtool not to search for libraries in /lib etc.
  - Runs `configure'.
  - Runs `make'.
  - Runs `make install'.
  - Strips debug information from static libraries.
  - Writes nested log information (in the format accepted by
    `log2xml').

  There are also lots of hooks and variables to customise the generic
  builder.  See `stdenv/generic/docs.txt'.

* Adapted the base packages (i.e., the ones used by stdenv) to use the
  generic builder.

* We now use `curl' instead of `wget' to download files in `fetchurl'.

* Neither `curl' nor `wget' are part of stdenv.  We shouldn't
  encourage people to download stuff in builders (impure!).

* Updated some packages.

* `buildinputs' is now `buildInputs' (but the old name also works).

* `findInputs' in the setup script now prevents inputs from being
  processed multiple times (which could happen, e.g., if an input was
  a propagated input of several other inputs; this caused the size
  variables like $PATH to blow up exponentially in the worst case).

* Patched GNU Make to write nested log information in the format
  accepted by `log2xml'.  Also, prior to writing the build command,
  Make now writes a line `building X' to indicate what is being
  built.  This is unfortunately often obscured by the gigantic tool
  invocations in many Makefiles.  The actual build commands are marked
  `unimportant' so that they don't clutter pages generated by
  `log2html'.


svn path=/nixpkgs/trunk/; revision=845
 2004-03-19 16:53:04 +00:00
Eelco Dolstra
d74192ee38 * propagated-build-inputs should now be placed in $out/nix-support. 
svn path=/nixpkgs/trunk/; revision=823
 2004-03-09 10:59:55 +00:00
Eelco Dolstra
026ff9466a * Rename .fix -> .nix. 
svn path=/nixpkgs/trunk/; revision=511
 2003-11-18 12:12:56 +00:00
Eelco Dolstra
48c3faca51 * Renamed pkgs-ng to pkgs. 
svn path=/nixpkgs/trunk/; revision=502
 2003-11-14 09:59:13 +00:00