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
Yury G. Kudryashov
a14e9f7c0f
gtk+-2.24.10
...
svn path=/nixpkgs/trunk/; revision=32936
2012-03-08 23:29:27 +00:00
Yury G. Kudryashov
b0aa85371b
Use pango-1.29
...
svn path=/nixpkgs/trunk/; revision=32935
2012-03-08 23:25:52 +00:00
Yury G. Kudryashov
5144a19987
svn merge ^/nixpkgs/trunk
...
There were a few merge conflicts due to ensureDir->mkdir -p migration
svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Yury G. Kudryashov
a8dba7888b
Move gtkLibs3x to top-level namespace, gtk+-3.2.3
...
Cherry-pick /nixpkgs/branches/glib-2.30@32044
svn path=/nixpkgs/trunk/; revision=32129
2012-02-07 21:03:16 +00:00
Yury G. Kudryashov
215a07c1a9
svn merge ^/nixpkgs/trunk
...
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)
The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Yury G. Kudryashov
9d67ff2a48
Remove glib-1.x and its reverse dependencies
...
Nobody told me that he uses generator or xmms, so I'm removing this old stuff.
svn path=/nixpkgs/trunk/; revision=31907
2012-01-28 13:06:07 +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
8ba7a53129
gtk-2.x libs patchlevel upgrades
...
svn path=/nixpkgs/trunk/; revision=31383
2012-01-06 23:03:37 +00:00
Yury G. Kudryashov
cee470de5a
Remove gtk+-2.16
...
svn path=/nixpkgs/trunk/; revision=31370
2012-01-06 19:02:07 +00:00
Yury G. Kudryashov
32dd8c0854
gtkLibx3x update
...
svn path=/nixpkgs/trunk/; revision=29726
2011-10-09 08:38:34 +00:00
Yury G. Kudryashov
de89582238
Add gtk-3.x libraries
...
Let hydra build it but do not show in nix-env -qa
svn path=/nixpkgs/trunk/; revision=29398
2011-09-20 16:18:12 +00:00
Yury G. Kudryashov
8d5fecc4f7
gtk-2.24.6 + some review
...
svn path=/nixpkgs/trunk/; revision=29384
2011-09-20 06:22:51 +00:00
Yury G. Kudryashov
83a44e5a65
wxGTK: rely on gtk.propagatedBuildInputs
...
gtkLibs224.gtk actually propagates libpng etc. through gdk_pixbuf,
so using gtk.libpng etc. makes no sense.
Remove unused 'inherit lib*;' in gtk.
svn path=/nixpkgs/trunk/; revision=29383
2011-09-20 06:22:39 +00:00
Yury G. Kudryashov
071700bcbc
Remove unused files
...
svn path=/nixpkgs/trunk/; revision=29343
2011-09-19 10:03:14 +00:00
Eelco Dolstra
049191511c
* GTK+ updated to 2.24.5.
...
svn path=/nixpkgs/branches/kde-4.7/; revision=27625
2011-07-07 15:43:48 +00:00
Eelco Dolstra
60510f2145
* One last glib/gtk update.
...
svn path=/nixpkgs/branches/x-updates/; revision=26309
2011-03-15 08:43:06 +00:00
Eelco Dolstra
927a41492d
* Updated dbus, glib, gtk+.
...
svn path=/nixpkgs/branches/x-updates/; revision=26156
2011-03-04 11:59:04 +00:00
Eelco Dolstra
5042a81534
* Fix broken icons such as the back/forward buttons in Firefox.
...
svn path=/nixpkgs/branches/x-updates/; revision=25944
2011-02-13 23:38:28 +00:00
Eelco Dolstra
4b45a4c4cb
* Build GTK+ with Xinput support, necessary for tablet support in Gimp
...
and Inkscape (suggested by Cillian de Róiste).
svn path=/nixpkgs/branches/x-updates/; revision=25919
2011-02-12 13:38:30 +00:00
Eelco Dolstra
6a59d1a98f
* Latest Glib, ATK, Pango and GTK+.
...
* Added gdk-pixbuf, which has been revived and is required by GTK+.
* Don't install the documentation of aforementioned packages. This
cuts 56 MiB off the closure of GTK+-based packages. It wasn't
really useful anyway because it's not installed in a way that allows
users to find it easily on NixOS. And if you want it, it's faster
to Google it.
svn path=/nixpkgs/branches/x-updates/; revision=25853
2011-02-09 15:09:29 +00:00
Eelco Dolstra
51fe520113
* Fix the GTK+ build. It depends directly on libXrender, but probably
...
we didn't notice because some other X package used to have it as a
propagated dependency.
svn path=/nixpkgs/branches/x-updates/; revision=25831
2011-02-09 12:36:08 +00:00
Eelco Dolstra
b705289759
* Remove gtkLibs218 and an old Cairo.
...
svn path=/nixpkgs/branches/x-updates/; revision=25824
2011-02-09 10:49:20 +00:00
Eelco Dolstra
0695a9707c
* GTK+ 2.20, Glib 2.24 etc.
...
svn path=/nixpkgs/branches/x-updates/; revision=22652
2010-07-18 23:22:59 +00:00
Eelco Dolstra
26521d42e2
* gtkLibs218 updated (glib-2.22.5, gtk+-2.18.9).
...
svn path=/nixpkgs/branches/x-updates/; revision=22645
2010-07-18 21:56:12 +00:00
Lluís Batlle i Rossell
d47aead668
Setting the difference buildInputs/buildNativeInputs in some gtk related packages.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19620
2010-01-22 18:49:16 +00:00
Eelco Dolstra
35257ada4e
* Updated gtk+, glib, pango.
...
svn path=/nixpkgs/trunk/; revision=19388
2010-01-13 12:11:06 +00:00
Eelco Dolstra
78648561c5
* Updated CUPS to 1.4.1.
...
svn path=/nixpkgs/branches/xorg-7.5/; revision=18048
2009-10-30 09:46:51 +00:00
Eelco Dolstra
5682b2e9ea
* Finished getting rid of gtk-libs.
...
svn path=/nixpkgs/trunk/; revision=18010
2009-10-29 10:53:54 +00:00
Eelco Dolstra
82baac23a7
* Idem for gtk-libs/2.16.
...
svn path=/nixpkgs/trunk/; revision=17993
2009-10-28 15:31:52 +00:00
Eelco Dolstra
5398eceff3
* Getting rid of gtk-libs by moving the packages in gtk-libs to
...
development/libraries/{glib,gtk+,pango,atk,...}. Done for glib/gtk+
1.2. Also deleted some obsolete, unused versions (gtkLibs 2.10,
2.12, and 2.14).
svn path=/nixpkgs/trunk/; revision=17992
2009-10-28 15:06:18 +00:00
Eelco Dolstra
a1ddfbc3a5
* Some renaming.
...
svn path=/nixpkgs/trunk/; revision=914
2004-04-05 13:42:41 +00:00
Eelco Dolstra
0233bc614d
* Factor groups of strongly related packages out of
...
`all-packages-generic.nix'.
svn path=/nixpkgs/trunk/; revision=913
2004-04-05 13:34:13 +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
36356d7694
* More sed breakage.
...
svn path=/nixpkgs/trunk/; revision=903
2004-04-01 20:36:40 +00:00
Eelco Dolstra
00004fa6da
* More freedesktop.org X11 modules.
...
* Cleaned up some packages.
svn path=/nixpkgs/trunk/; revision=883
2004-03-30 17:28:41 +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