1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 21:17:46 +00:00
Commit graph

196 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 720f498d7a
gtk2: 2.24.31 -> 2.24.32 (maintenance) 2018-01-21 16:13:03 +01:00
Jan Tojnar 987d4595ba
gtk2: add gobject introspection dependency 2017-12-22 23:27:35 +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
Jörg Thalheim 1810b3f64b
gtk2: search for themes in XDG_DATA_DIRS
This patch was adapted from GUIX.
At the moment we still have to rely on GTK_DATA_PREFIX, which can only
point to one profile at the time and is also not set in all desktop
environments. This patch makes it possible to use installed themes, no
matter if system-wide or by in a user profile.
2017-05-18 06:32:45 +01: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
Johannes Bornhold 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
Vladimír Čunát 309c63c542
Merge branch 'master' into staging 2017-01-08 14:27:01 +01:00
Johannes Bornhold 5a572f8018 gtk2: Use quartz backend on darwin 2017-01-07 17:35:09 +01:00
Vladimír Čunát 5ab9e23561
gtk3: maintenance 3.22.5 -> 3.22.6 2017-01-06 21:36:21 +01:00
Daiderd Jordan 7d4e04c795 Merge pull request #21400 from johbo/darwin-xournal
Xournal: Darwin support
2016-12-27 20:23:18 +01:00
Johannes Bornhold febab15b01 gtk2: Enable xinput for Darwin 2016-12-27 14:19:26 +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
Vladimír Čunát 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
Vladimír Čunát d03a746b88 gtk2: maintenance 2.24.30 -> 2.24.31 2016-09-10 11:36:51 +02:00
Eelco Dolstra 8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +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