Commit graph

191 commits

Author SHA1 Message Date
Eric Sagnes 3e2318ec3e gtk2: make gtk2 look for immodule cache in $NIX_PROFILE 2016-04-16 17:51:32 +09:00
Eric Sagnes 77c4139262 gtk3: make gtk3 look for immodule cache in $NIX_PROFILE 2016-04-16 17:51:32 +09: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 b01ae3cee0 gtk2: maintenance update 2.24.28 -> 2.24.29 2015-12-30 11:58:06 +01:00
Luca Bruno e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +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 6e9f0df8bd gtk: 3.18.4 -> 3.18.5 2015-11-17 21:11:53 -08:00
William A. Kennington III cdf65ba19e gtk3: 3.18.3 -> 3.18.4 2015-11-13 15:55:33 -08:00
William A. Kennington III cb21b77ff1 gtk3: 3.18.0 -> 3.18.3 2015-11-10 18:25:47 -08: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 8e73a7bf53 gtk3: revise dependencies, xlibs -> xorg 2015-10-28 12:07:52 +01:00
Vladimír Čunát 148e03b2f1 gmp: split into multiple outputs 2015-10-28 10:15:49 +01:00
Vladimír Čunát a6e4c87391 gtk3: split into multiple outputs
All references OK, hopefully. Seems surprisingly smooth.
2015-10-13 20:18:45 +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
Luca Bruno 45b1f5858c Merge branch 'gnome' into staging 2015-09-25 10:51:50 +02:00
Luca Bruno 48ac26f512 gtk+: 3.16.6 -> 3.18.0 2015-09-25 10:48:41 +02:00
William A. Kennington III 5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Vladimír Čunát a5b0136b1a gkt3: maintenance update 3.16.6 -> 3.16.7 2015-09-20 09:09:19 +02:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +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 85383d8b24 gtk3: maintenance update 2015-07-23 14:42:59 +02:00
William A. Kennington III 57edfb5133 gtk3: Fix hash in ed0d387a6d 2015-07-09 10:45:17 -07:00
William A. Kennington III ed0d387a6d gtk3: 3.16.4 -> 3.16.5 2015-07-09 10:29:19 -07:00
Vladimír Čunát 2e0373ee66 gtk3: maintenance update 2015-06-11 22:13:07 +02:00
Vladimír Čunát c4f1011cab gtk+ stack: maintenance updates 2015-05-27 22:05:42 +02:00
Spencer Whitt ffcea6546d gtk3: fix on Darwin 2015-05-22 20:11:09 -04:00
William A. Kennington III 2ebe0fc88b gtk3: Mark as linux only temporarily 2015-05-22 14:20:29 -07:00
Luca Bruno 25f9555599 Drop GNOME 3.12 2015-05-18 12:24:08 +02:00
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Luca Bruno db3b86560f GNOME 3.16.1, closes #7357 2015-04-25 12:02:33 +02:00
Vladimír Čunát d24b3aec91 gtk2: fixup splitting
I forgot these changes were needed to make it build.
Leaving gtk3 and gnome stuff after 3.16.
2015-04-20 20:24:47 +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 759d55dc94 gtk3: fix Darwin build 2015-04-01 16:45:37 -04:00
Vladimír Čunát 2485055a96 gtk2: maintenance update
Perhaps a bugfix important for us:
745052 Icon theme code assumes directories with mtime 0 don't exist
2015-03-04 22:02:45 +01:00
Vladimír Čunát c01dd4ab57 gtk2: small maintenance update 2015-02-26 20:06:02 +01:00
Vladimír Čunát 5ad9db0473 gtk3: use 3.12 branch for now
This is for better CSS compatibility in the upcoming release.
We also plan to ship gnome-3.12 as the default in there. Details:
https://github.com/NixOS/nixpkgs/issues/247#issuecomment-63036271
2014-11-14 14:25:02 +01:00
Vladimír Čunát 6985461c80 gtk3: maintenance update 2014-11-10 21:34:03 +01:00
Vladimír Čunát 3ecd4dcf72 gtk3 stack libs: update all to gnome-3.14 branches
All NEWS look safe and relatively quiet.
2014-10-23 10:51:54 +02:00
Vladimír Čunát b9b5cb5858 gtk2: bugfix update 2014-10-19 19:31:58 +02: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
Michael Raskin e8badf3c3b Merge pull request #3275 from taku0/gtk-env
uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt
2014-08-29 01:35:38 +04: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 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
taku0 a0c91d66f1 uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt 2014-07-14 21:33:05 +09:00
Vladimír Čunát e993219be7 gtk2: maintenance update 2014-06-26 18:22:49 +02:00
Peter Simons 07151095a7 Merge pull request #2532 from jwiegley/gtk
Get glib, gtk+, harfbuzz and pango working on Darwin
2014-05-23 16:37:00 +02:00
Vladimír Čunát f1ded0d7bd gtk3: bugfix update 3.12.1 -> .2 2014-05-15 21:02:28 +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 1ae918b0d2 gtk3: bugfix update 3.12.0 -> .1 2014-04-12 20:25:15 +02:00
Vladimír Čunát 151ac5ab9e gtk+3 core stack: update to 3.12 2014-03-27 20:53:50 +01:00
Vladimír Čunát aa48fc9b28 gtk2: bugfix update 2.24.22 -> .23 2014-03-21 10:34:19 +01:00
Vladimír Čunát fbff019f08 gtk3: bugfix update 3.10.6 -> .7, fix bad URI
The bad URI was introduced by changing the name in 4881100.
2014-02-02 10:42:11 +01:00
Vladimír Čunát 48811001c4 gtk3: change name to gtk+3-3.*, don't lower priority
This is to allow alongside installation of gtk2 and gtk3 in user envs.
Therefore, decreasing the priority of gtk3 was superfluous now.
2014-01-29 15:13:02 +01:00
Vladimír Čunát ac07b3d37f gtk3: bugfix update 3.10.5 -> .6 2014-01-25 21:01:40 +01:00
Vladimír Čunát 7a3ae83a97 gtk3: bugfix update 3.10.4 -> .5 2013-12-10 12:46:11 +01:00
Vladimír Čunát 6c193c7053 gtk3: bugfix updates 3.10.0 -> .4 2013-11-17 14:43:32 +01:00
Vladimír Čunát f448cc022b changes proposed for 'release-13.10' into x-updates
Conflicts (simple, taking whole higher/later versions):
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/polkit/default.nix
2013-11-05 08:38:15 +01:00
Vladimír Čunát cf568b6883 gtk2: minor update .20 -> .22 2013-11-01 10:32:23 +01:00
Mathijs Kwik db83d9a35b Merge branch 'master' into multiple-outputs 2013-11-01 08:29:09 +01:00
Vladimír Čunát e1e0a11f86 gtk3: update 3.8.4 -> 3.10.0 2013-10-05 21:27:45 +02:00
Vladimír Čunát 346ad74277 gtk2: minor update .20 -> .21 2013-10-05 21:27:08 +02:00
Vladimír Čunát 56c2ee8dcf gtk3: bugfix update 3.8.2 -> .4 2013-09-12 18:11:00 +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 10cb4a8cf2 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix
2013-08-21 17:05:30 +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 d374527509 GTK-related minor updates 2013-08-03 09:45:22 +02:00
Jason \"Don\" O'Conal 75dedeb8bd gtk2: fix build on darwin (close #749)
* add xlibs.libXi to build inputs
2013-07-27 20:01:08 +02:00
Shea Levy e193a4f898 Fix gtk2 build
libintlOrEmpty is [], not null, when libintl isn't needed

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-13 16:01:06 -04:00
Jason \"Don\" O'Conal 7573056652 gtk++: fix build on darwin
* add -lintl to CFLAGS
2013-07-12 16:26:44 +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
Vladimír Čunát 1f81984293 non-Linux: more adjustments
Also reordered stuff in all-packages.nix.
2013-06-18 23:59:23 +02:00
Vladimír Čunát 2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Mathijs Kwik 4d19da7e99 gtk-2: remove unneeded argument 2013-06-14 13:49:35 +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 dc0c630e54 gtk2: fix compilation on darwin
* add libintlOrEmpty to build inputs
* allow cups to be disabled by setting config.gtk2.cups to false
2013-06-13 18:10:53 +10:00
Song Wenwu 92ba0a0913 gtk+: enable NLS support (merge #611)
@vcunat: add minor refactorings like file-naming style unification.
ToDo: we get 2*20MB of locale, perhaps it's worth splitting one day.
2013-06-12 10:18:38 +02: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 10b79927ba gtk2/3: bugfix updates 2013-05-16 17:07:06 +02:00
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Song Wenwu 3b01d244c3 gtk+: enable xcursor support, fixes #469
@vcunat also reorganized the build input lists a bit
2013-04-18 16:14:44 +02:00
Vladimír Čunát 23cde66a4a gtk3: propagate dependencies from the closure 2013-04-05 10:27:11 +02:00
Vladimír Čunát 8406a62973 gtk3: core platform update (versions from GNOME 3.8) 2013-03-29 02:22:29 +01:00
Vladimír Čunát 4e7741d694 gtk2 platform: minor updates
Also make glib use libelf (a few hudred kBs).
2013-03-29 02:01:03 +01:00
Vladimír Čunát 811605c3a4 gtk3: major update to 3.6.4 2013-02-21 18:17:05 +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 0cddd5787f gtk2: bugfix update 2013-02-19 17:08:31 +01:00
Vladimír Čunát 55bf1376af gtk2: minor bugfix update 2013-02-10 17:17:35 +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
Vladimír Čunát 515f2af7d6 gtk2: minor update 2013-01-29 14:55:15 +01:00
Vladimír Čunát 56c7b96844 gtk2: a minor update 2013-01-10 22:53:46 +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 1c3ed1b8d4 gtk+: Update to 3.2.4 2012-10-08 14:20:30 -04:00
Eelco Dolstra f021420036 Revert "gtk+: Update to 3.6.0"
This reverts commit 6cbb674895.
2012-09-27 17:42:46 -04:00
Eelco Dolstra 6cbb674895 gtk+: Update to 3.6.0 2012-09-27 17:22:56 -04:00
Eelco Dolstra 2122279858 gtk+: Update to 2.24.13 2012-09-26 15:39:32 -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