Commit Graph

29 Commits

Author SHA1 Message Date
obadz
57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
Benjamin Herr
dbae71570f gitg: use wrapGAppsHook, pull in dconf (#18040)
Without dconf, gitg doesn't remember preferences such as window size.
2016-08-28 07:55:51 +00:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
fe0f39113e treewide: Fix output references to gtk3 2016-08-23 04:53:13 +03:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Ram Kromberg
c5204e5374 pomodoro: vala -> vala_0_32 2016-08-21 20:02:15 +03:00
Ram Kromberg
168d8c6b1b libgit2-glib: vala -> vala_0_32 2016-08-21 20:02:14 +03:00
Ram Kromberg
16e9360a06 gpaste: vala -> vala_0_32 2016-08-21 20:02:14 +03:00
Ram Kromberg
7d210a49ad gitg: vala -> vala_0_32 2016-08-21 20:02:14 +03:00
Ram Kromberg
1da4a65fc4 geary: vala -> vala_0_32 2016-08-21 20:02:13 +03:00
Ram Kromberg
b41fda2ab0 california: vala -> vala_0_32 2016-08-21 20:02:13 +03:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Damien Cassou
f705431933 gitg: 3.20.0 -> 3.20.1 2016-07-19 07:01:37 +02:00
Damien Cassou
d90809aba0 Merge pull request #17030 from DamienCassou/update-some-gnome-packages
Update some gnome packages
2016-07-18 08:59:55 +02:00
Damien Cassou
afba229b20 pidgin-im-gnome-shell-extension: 1.0 -> 1.0.1 2016-07-18 06:59:40 +02:00
Damien Cassou
b9db440516 gspell: 1.0.0 -> 1.0.3 2016-07-17 10:37:40 +02:00
Joachim F
ed50ef318b Merge pull request #15848 from matthewbauer/packagekit
Add in PackageKit
2016-07-16 13:29:08 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Damien Cassou
a347b944d9 gnome-tweak-tools: fix missing gi module
I changed from python3Packages to python2Packages because I couldn't
make it work with python3Packages. This seems similar to:
https://github.com/NixOS/nixpkgs/pull/16747#discussion_r69937281
2016-07-12 16:50:56 +02:00
Damien Cassou
7921e68734 Merge pull request #16747 from DamienCassou/move-gnome3.18-to-3.20
Move some fixes from Gnome 3.18 to 3.20
2016-07-08 19:32:13 +02:00
Tuomas Tynkkynen
8cad701fc5 treewide: Make explicit that 'dev' output of glib is used 2016-07-08 17:26:15 +02:00
Damien Cassou
ed9f4e16f3 pidgin-im-gnome-shell-extension: init at 1.0 2016-07-08 17:26:15 +02:00
Matthew Bauer
e7cd45b6e6 gnome3.20: add gnome-packagekit, gnome-software
Previously the two were just in gnome-3.18. This adds them as
optionalPackages in gnome3.20.
2016-07-05 20:27:28 +00:00
Damien Cassou
24226031d9 gpaste: 3.20 -> 3.20.4 2016-07-05 10:30:06 +02:00
Tobias Geerinckx-Rice
aa18ee6a73
geary 0.10: remove unused disable_valadoc.patch 2016-06-22 02:10:49 +02:00
Robin Gloster
0761573507 gnome3_20.libgda: disable format hardening flag 2016-06-18 11:50:23 +00:00
Nikolay Amiantov
66077b9a36 gpaste: fix evaluation 2016-06-07 17:23:19 +03:00
Damien Cassou
da62589d8e gnome3_20: Add GNOME 3.20 package set 2016-06-06 20:33:58 +02:00