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
