Vladimír Čunát
ae08fdd84e
pango: maintenance 1.40.3 -> 1.40.4
2017-04-01 13:27:18 +02:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud
...
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Johannes Bornhold
354c91df2e
pango: Add darwin frameworks for fond rendering
2017-01-07 17:31:10 +01:00
Vladimír Čunát
34e2d681a0
pango: 1.40.2 -> 1.40.3
2016-12-03 12:22:42 +01:00
Vladimír Čunát
f63668b75e
pango: maintenance 1.40.1 -> 1.40.2
2016-09-10 11:38:35 +02:00
Eelco Dolstra
8172cd734c
docdev -> devdoc
...
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Tuomas Tynkkynen
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Vladimír Čunát
3d82d58d9b
pango: update 1.38.1 -> 1.40.1
2016-05-22 12:10:40 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Ryan Trinkle
8605dab964
webkitgtk: add darwin support
2016-03-30 09:40:36 +02:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Vladimír Čunát
343e7af697
pango: maintenance update 1.18.0 -> 1.18.1
2015-12-30 11:48:30 +01:00
Vladimír Čunát
787f322540
$docdev fixups: mostly to avoid empty output
...
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
2015-10-28 18:58:06 +01:00
Vladimír Čunát
339926031e
pango: get rid of xlibs-wrapper and simplify
2015-10-13 20:18:50 +02: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
d3f4ba9d6f
Merge branch 'master.upstream' into staging.upstream
2015-09-23 14:44:21 -07:00
Vladimír Čunát
cd7c494bb2
pango: feature update 1.36.8 -> 1.38.0
...
Tested rebuilding the most important pango users, without any problems.
2015-09-23 14:43:30 +02:00
Vladimír Čunát
21e3ff658a
x11: replace its usage by xlibsWrapper directly
...
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +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
Spencer Whitt
f55393de94
pango: compile with gobjectIntrospection on Darwin
...
Required to make .gir files needed by gtk3
2015-03-31 16:41:50 -04:00
Vladimír Čunát
ffc2c539b4
pango: fix eval on darwin
...
This was a cherry-pick silent conflict.
The gettext is provided by libintlOrEmpty where needed.
2014-10-23 18:45:37 +02:00
Vladimír Čunát
d7a57963fa
pango: big update; it was waiting on fontconfig-2.11
2014-10-23 10:51:54 +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
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
John Wiegley
61b94dff81
Get glib, gtk+, harfbuzz and pango working on Darwin
2014-05-12 16:53:11 -05:00
Vladimír Čunát
8c12816d59
pango on darwin: amend the wrong fix
...
I didn't realize pango doesn't depend on flex directly,
only through introspection which caused build problems by itself, too.
2014-04-11 09:57:26 +02:00
Vladimír Čunát
297bcd2088
pango on darwin: attempt to fix build
...
Supply older flex (new doesn't build), and disable introspection.
2014-04-10 20:37:52 +02:00
Vladimír Čunát
2cf1f0b229
Revert "pango: major update 1.32.5 -> 1.36.1"
...
This reverts commit 9c4d6561029aebd8e7ad96f24e256d0de7ae8097 (modified).
We can't have newer pango with fontconfig-2.10.*
2014-02-20 21:35:42 +01:00
Vladimír Čunát
8e4665a634
pango: disable tests (fail to find config in chroot)
2014-02-02 13:31:36 +01:00
Vladimír Čunát
9c4d656102
pango: major update 1.32.5 -> 1.36.1, enable tests
...
Also propagate stuff in *.pc dependencies.
2014-02-02 11:01:13 +01:00
Peter Simons
48f24712dc
Fix a lots of evaluation errors on Hydra.
2013-12-10 23:20:23 +01:00
Eelco Dolstra
da426c7df5
Fix some meta.platforms attributes to build more stuff on Darwin
2013-11-05 10:46:59 +01: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
Vladimír Čunát
7fbcc56260
add introspection into GTK libs (part of #517 )
...
This is all work of Marc Weber <marco-oweber@gmx.de>, except for a few nitpicks.
Tested space blowup: IMHO negligible to headers and similar stuff,
e.g. the firefox closure (reported by du) grows from 560 to 579 MB.
Saving space should be handled separately,
e.g. we have the multiple-outputs branch.
2013-08-04 21:11:24 +02:00
Vladimír Čunát
98f3716650
clean some include flags that weren't really needed
...
Tested the builds still work (x86_64-linux).
2013-08-03 10:45:13 +02:00
Vladimír Čunát
d374527509
GTK-related minor updates
2013-08-03 09:45:22 +02:00
Eelco Dolstra
552fd3d599
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/gmime/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/servers/x11/xorg/default.nix
pkgs/top-level/all-packages.nix
2013-06-25 18:42:56 +02:00
Vladimír Čunát
4255b343e8
pango, gtk3: non-Linux attempts to fix
2013-06-19 09:00:06 +02:00
Michael Raskin
19530856ed
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/gtk+/2.x.nix
pkgs/misc/ghostscript/default.nix
pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Jason "Don" O'Conal
8232b0eef1
pango: add correct cairo include path
2013-06-13 18:11:36 +10:00
Eelco Dolstra
99b88cfb53
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/acl/default.nix
pkgs/development/libraries/atk/2.6.x.nix
pkgs/development/libraries/attr/default.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/2.34.x.nix
pkgs/development/libraries/gtk+/2.24.x.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/openssl/default.nix
pkgs/development/libraries/pango/1.30.x.nix
pkgs/misc/cups/default.nix
pkgs/os-specific/linux/util-linux/default.nix
pkgs/servers/x11/xorg/builder.sh
pkgs/servers/x11/xorg/default.nix
pkgs/top-level/all-packages.nix
2013-06-09 00:41:27 +02:00
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing
changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
b1eeae8cac
Merge branch 'master' into x-updates
...
Conflicts (easy):
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Sander van der Burg
ccb2c7ebb7
Removed Xrender from cairo and add fontconfig to pango on Darwin: this fixes the compilation of graphviz and imagemagick on these platforms
2013-03-14 15:18:55 +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
6331d32267
rename the expressions of some gtk-related libraries
...
now the default (and usually only) version is called default
2013-01-29 16:48:23 +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
62cd9ea869
pango: Update to 1.30.1
2012-09-26 15:17:31 -04:00
Eelco Dolstra
61129e1ee9
Split some GTK/X11-related packages
...
The closure of the Pan newsreader is now down from 344 MiB to 195 MiB.
2012-08-26 22:53:19 -04:00
Eelco Dolstra
277bd69fa9
* Glib/ATK/Pango/GTK+ updates.
...
svn path=/nixpkgs/branches/x-updates/; revision=34145
2012-05-16 21:58:57 +00:00
