Commit graph

81 commits

Author SHA1 Message Date
Jan Malakhovski
7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Jan Tojnar
6e0cfc8f18
gtk3: add updateScript 2018-03-04 20:05:53 +01:00
Frederik Rietdijk
4f08b0fbac Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-26 10:50:18 +01:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Vladimír Čunát
01bf8381fd
gtk3: 3.22.26 -> 3.22.28 (maintenance) 2018-02-24 22:30:22 +01:00
Vladimír Čunát
f71dfabad3
Merge #31891: gtk3: propagate gsettings_desktop_schemas 2017-11-27 13:57:13 +01:00
Jan Tojnar
8e03cda691 gtk3: make GTK depend on gsettings_desktop_schemas
So dconf settings will be applied to GTK3 programs even if running outside of Gnome. See #31293
2017-11-24 09:50:03 +03:00
Nikolay Amiantov
88105ee018 gtk3: compute DPI properly when Xft options are not used
Taken from #25892

Fixes #25023
2017-11-17 20:45:49 +00:00
gnidorah
9c4d2b4f3d gtk3: 3.22.24 -> 3.22.26 2017-11-08 19:27:39 +03:00
Vladimír Čunát
15a12f7edb
gkt3: maintenance 3.22.21 -> 3.22.24 2017-10-08 18:24:12 +02:00
Vincent Laporte
2f70241e21 gtk+: 3.22.19 -> 3.22.21 2017-09-14 06:03:12 +00:00
Vladimír Čunát
3980abe191
gkt3: maintenance 3.22.18 -> 3.22.19 2017-09-03 10:53:27 +02:00
Frederik Rietdijk
62dac1bdd9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-14 09:34:10 +02:00
Vladimír Čunát
bbdb8f5cff
gkt3: maintenance 3.22.16 -> 3.22.18 2017-08-13 16:28:51 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Vladimír Čunát
5a03a05520
gtk3: maintenance 3.22.15 -> 3.22.16 2017-07-15 11:43:47 +02:00
Guillaume Koenig
60183a1177 gtk3: install gtk-launch 2017-06-16 13:10:42 +02:00
Vladimír Čunát
8779c108d4
gkt3: bugfix 3.22.12 -> 3.22.15 2017-06-11 15:15:26 +02:00
Vladimír Čunát
09fd617383
gtk3: maintenance 3.22.11 -> 3.22.12 2017-04-18 18:38:27 +02:00
Vladimír Čunát
6c153c55c3
gtk3: maintenance 3.22.8 -> 3.22.11 2017-04-01 13:27:17 +02:00
Vladimír Čunát
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
Vladimír Čunát
62c323bdff
gtk3: maintenance 3.22.7 -> 3.22.8 2017-02-20 21:30:12 +01:00
Vladimír Čunát
5887affc26
gtk3: maintenance 3.22.6 -> 3.22.7 2017-02-05 15:02:11 +01:00
Vladimír Čunát
df67f58fbf
gtk3: move gtk-update-icon-cache to the main output
This is basically what aa0fa19373 was for gtk2 and Xfce.
Fixes #20874, though I haven't tested it directly.
2017-01-22 22:57:52 +01:00
Vladimír Čunát
5ab9e23561
gtk3: maintenance 3.22.5 -> 3.22.6 2017-01-06 21:36:21 +01:00
Vladimír Čunát
c3d20b2e43
gtk3: maintenance 3.22.4 -> 3.22.5 2016-12-10 15:28:51 +01:00
Franz Pletz
a0f05feddf
gtk3: 3.22.1 -> 3.22.4
Fixes #19945.
2016-12-01 01:54:30 +01:00
Jörg Thalheim
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
Tuomas Tynkkynen
19225bf5cc Merge remote-tracking branch 'upstream/master' into staging 2016-10-02 10:36:47 +03:00
Tuomas Tynkkynen
5bf5de58ea treewide: Fix 'lib.optional' misuses
These add a singleton list of a package to buildInputs.
2016-10-01 23:38:06 +03:00
Alexander Ried
66727f8919 gtk+3: 3.22.0 -> 3.22.1 2016-10-01 11:42:43 +02:00
Alexander Ried
7871ca4024 gtk+3: 3.20.9 -> 3.22.0 2016-09-22 22:15:57 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
e646d2c07c
gnome3.gtk: fix build on darwin
The .la file does not exist on darwin.
2016-08-27 08:00:20 +00:00
Ram Kromberg
c60f1e9af5 gtk3: 3.20.8 -> 3.20.9 2016-08-19 21:08:25 +03:00
Vladimír Čunát
a1b0967fa0 gtk3: maintenance 3.20.6 -> 3.20.8 2016-08-06 18:47:51 +02:00
Vladimír Čunát
dcb950718a Merge #16617: gtk3: re-enable wayland support on Linux 2016-06-30 11:13:53 +02:00
Théophane Hufschmitt
d756aee6f6 Gtk : Enable wayland support on Linux 2016-06-30 10:06:20 +02:00
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
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
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
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