Kranium Gikos Mendoza
86e2b0e52b
gtk3: 3.20.5 -> 3.20.6
2016-06-30 09:10:44 +02:00
Vladimír Čunát
3c46131169
gtk3: maintenance update 3.20.3 -> 3.20.5
2016-05-22 12:10:41 +02:00
Vladimír Čunát
7875b6ae3a
gtk2: maintenance update 2.24.29 -> 2.24.30
2016-05-22 12:10:40 +02:00
Nikolay Amiantov
c99b050af0
Merge commit 'refs/pull/14568/head' of git://github.com/NixOS/nixpkgs into staging
2016-05-07 03:44:06 +03:00
Vladimír Čunát
802f830b2a
gtk3: maintenance update 3.20.0 -> 3.20.3
2016-04-20 16:46:01 +02:00
Damien Cassou
325cfb2192
gtk3: 3.18.5 -> 3.20.0
2016-04-20 16:46:00 +02:00
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
