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
62c323bdff
gtk3: maintenance 3.22.7 -> 3.22.8
2017-02-20 21:30:12 +01:00
5887affc26
gtk3: maintenance 3.22.6 -> 3.22.7
2017-02-05 15:02:11 +01:00
df67f58fbf
gtk3: move gtk-update-icon-cache to the main output
...
This is basically what aa0fa19373Fixes #20874 , though I haven't tested it directly.
2017-01-22 22:57:52 +01:00
8a7d373795
Darwin gtk quartz follow up ( #21883 )
...
* gtk2-x11: Add gtk2 configuration with X11 backend
After making quartz the default for darwin, some builds started to fail since
they only support gtk with the X11 backend.
* apvlv: Use gtk2-x11 on darwin
* gpicview: Use gtk2-x11 for darwin
* lxappearance: Use gtk2-x11 for darwin
* fontforge-gtk: Use gtk2-x11 for darwin
* gbdfed: Use gtk2-x11 for darwin
2017-01-14 22:53:56 +00:00
309c63c542
Merge branch 'master' into staging
2017-01-08 14:27:01 +01:00
5a572f8018
gtk2: Use quartz backend on darwin
2017-01-07 17:35:09 +01:00
5ab9e23561
gtk3: maintenance 3.22.5 -> 3.22.6
2017-01-06 21:36:21 +01:00
7d4e04c795
Merge pull request #21400 from johbo/darwin-xournal
...
Xournal: Darwin support
2016-12-27 20:23:18 +01:00
febab15b01
gtk2: Enable xinput for Darwin
2016-12-27 14:19:26 +01:00
c3d20b2e43
gtk3: maintenance 3.22.4 -> 3.22.5
2016-12-10 15:28:51 +01:00
a0f05feddf
gtk3: 3.22.1 -> 3.22.4
...
Fixes #19945 .
2016-12-01 01:54:30 +01:00
26e39566af
Merge pull request #19120 from groxxda/gtk+
...
gtk+3: 3.22.0 -> 3.22.1 [=> staging]
2016-10-03 10:36:08 +02:00
19225bf5cc
Merge remote-tracking branch 'upstream/master' into staging
2016-10-02 10:36:47 +03:00
5bf5de58ea
treewide: Fix 'lib.optional' misuses
...
These add a singleton list of a package to buildInputs.
2016-10-01 23:38:06 +03:00
66727f8919
gtk+3: 3.22.0 -> 3.22.1
2016-10-01 11:42:43 +02:00
7871ca4024
gtk+3: 3.20.9 -> 3.22.0
2016-09-22 22:15:57 +02:00
aa0fa19373
gtk2: move gtk-update-icon-cache to gtk2.out
...
... to be useful for regeneration when building nixos environments.
Fixes #18536 (hopefully).
2016-09-13 23:51:57 +02:00
d03a746b88
gtk2: maintenance 2.24.30 -> 2.24.31
2016-09-10 11:36:51 +02:00
8172cd734c
docdev -> devdoc
...
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
e646d2c07c
gnome3.gtk: fix build on darwin
...
The .la file does not exist on darwin.
2016-08-27 08:00:20 +00:00
c60f1e9af5
gtk3: 3.20.8 -> 3.20.9
2016-08-19 21:08:25 +03:00
a1b0967fa0
gtk3: maintenance 3.20.6 -> 3.20.8
2016-08-06 18:47:51 +02:00
dcb950718a
Merge #16617 : gtk3: re-enable wayland support on Linux
2016-06-30 11:13:53 +02:00
d756aee6f6
Gtk : Enable wayland support on Linux
2016-06-30 10:06:20 +02:00
86e2b0e52b
gtk3: 3.20.5 -> 3.20.6
2016-06-30 09:10:44 +02:00
3c46131169
gtk3: maintenance update 3.20.3 -> 3.20.5
2016-05-22 12:10:41 +02:00
7875b6ae3a
gtk2: maintenance update 2.24.29 -> 2.24.30
2016-05-22 12:10:40 +02:00
c99b050af0
Merge commit 'refs/pull/14568/head' of git://github.com/NixOS/nixpkgs into staging
2016-05-07 03:44:06 +03:00
802f830b2a
gtk3: maintenance update 3.20.0 -> 3.20.3
2016-04-20 16:46:01 +02:00
325cfb2192
gtk3: 3.18.5 -> 3.20.0
2016-04-20 16:46:00 +02:00
3e2318ec3e
gtk2: make gtk2 look for immodule cache in $NIX_PROFILE
2016-04-16 17:51:32 +09:00
77c4139262
gtk3: make gtk3 look for immodule cache in $NIX_PROFILE
2016-04-16 17:51:32 +09:00
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
8605dab964
webkitgtk: add darwin support
2016-03-30 09:40:36 +02:00
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
b01ae3cee0
gtk2: maintenance update 2.24.28 -> 2.24.29
2015-12-30 11:58:06 +01:00
e289717414
rename moveToOutput and propagatedBuildInputs
2015-12-02 10:05:36 +01:00
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
6e9f0df8bd
gtk: 3.18.4 -> 3.18.5
2015-11-17 21:11:53 -08:00
cdf65ba19e
gtk3: 3.18.3 -> 3.18.4
2015-11-13 15:55:33 -08:00
cb21b77ff1
gtk3: 3.18.0 -> 3.18.3
2015-11-10 18:25:47 -08:00
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
8e73a7bf53
gtk3: revise dependencies, xlibs -> xorg
2015-10-28 12:07:52 +01:00
148e03b2f1
gmp: split into multiple outputs
2015-10-28 10:15:49 +01:00
a6e4c87391
gtk3: split into multiple outputs
...
All references OK, hopefully. Seems surprisingly smooth.
2015-10-13 20:18:45 +02:00
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
45b1f5858c
Merge branch 'gnome' into staging
2015-09-25 10:51:50 +02:00
48ac26f512
gtk+: 3.16.6 -> 3.18.0
2015-09-25 10:48:41 +02:00
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
a5b0136b1a
gkt3: maintenance update 3.16.6 -> 3.16.7
2015-09-20 09:09:19 +02:00
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
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
85383d8b24
gtk3: maintenance update
2015-07-23 14:42:59 +02:00
57edfb5133
gtk3: Fix hash in ed0d387a6d
2015-07-09 10:45:17 -07:00
ed0d387a6d
gtk3: 3.16.4 -> 3.16.5
2015-07-09 10:29:19 -07:00
2e0373ee66
gtk3: maintenance update
2015-06-11 22:13:07 +02:00
c4f1011cab
gtk+ stack: maintenance updates
2015-05-27 22:05:42 +02:00
ffcea6546d
gtk3: fix on Darwin
2015-05-22 20:11:09 -04:00
2ebe0fc88b
gtk3: Mark as linux only temporarily
2015-05-22 14:20:29 -07:00
25f9555599
Drop GNOME 3.12
2015-05-18 12:24:08 +02:00
375bc8def7
Merge staging into closure-size
2015-05-05 11:49:03 +02:00
db3b86560f
GNOME 3.16.1, closes #7357
2015-04-25 12:02:33 +02:00
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
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
759d55dc94
gtk3: fix Darwin build
2015-04-01 16:45:37 -04:00
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
c01dd4ab57
gtk2: small maintenance update
2015-02-26 20:06:02 +01:00
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
6985461c80
gtk3: maintenance update
2014-11-10 21:34:03 +01:00
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
b9b5cb5858
gtk2: bugfix update
2014-10-19 19:31:58 +02:00
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
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
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
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
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
a0c91d66f1
uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt
2014-07-14 21:33:05 +09:00
e993219be7
gtk2: maintenance update
2014-06-26 18:22:49 +02:00
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
f1ded0d7bd
gtk3: bugfix update 3.12.1 -> .2
2014-05-15 21:02:28 +02:00
61b94dff81
Get glib, gtk+, harfbuzz and pango working on Darwin
2014-05-12 16:53:11 -05:00
1ae918b0d2
gtk3: bugfix update 3.12.0 -> .1
2014-04-12 20:25:15 +02:00
151ac5ab9e
gtk+3 core stack: update to 3.12
2014-03-27 20:53:50 +01:00
aa48fc9b28
gtk2: bugfix update 2.24.22 -> .23
2014-03-21 10:34:19 +01:00
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
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
ac07b3d37f
gtk3: bugfix update 3.10.5 -> .6
2014-01-25 21:01:40 +01:00
7a3ae83a97
gtk3: bugfix update 3.10.4 -> .5
2013-12-10 12:46:11 +01:00
6c193c7053
gtk3: bugfix updates 3.10.0 -> .4
2013-11-17 14:43:32 +01:00
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
cf568b6883
gtk2: minor update .20 -> .22
2013-11-01 10:32:23 +01:00
db83d9a35b
Merge branch 'master' into multiple-outputs
2013-11-01 08:29:09 +01:00
e1e0a11f86
gtk3: update 3.8.4 -> 3.10.0
2013-10-05 21:27:45 +02:00
346ad74277
gtk2: minor update .20 -> .21
2013-10-05 21:27:08 +02:00
56c2ee8dcf
gtk3: bugfix update 3.8.2 -> .4
2013-09-12 18:11:00 +02:00
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
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
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
Johannes Bornhold
Johannes Bornhold
Daiderd Jordan
Franz Pletz
Jörg Thalheim
Tuomas Tynkkynen
Alexander Ried
Eelco Dolstra
Robin Gloster
Ram Kromberg
Théophane Hufschmitt
Kranium Gikos Mendoza
Nikolay Amiantov
Damien Cassou
Eric Sagnes
Ryan Trinkle
Luca Bruno
William A. Kennington III
Spencer Whitt
Michael Raskin
Mateusz Kowalczyk
taku0
Peter Simons
John Wiegley
Mathijs Kwik